From 2aec4b993e52b3ad9555af28154ff3a57a00f754 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 09:13:06 +0000 Subject: [PATCH 01/19] Bump com.azure.spring:spring-cloud-azure-dependencies in /auth Bumps [com.azure.spring:spring-cloud-azure-dependencies](https://github.com/Azure/azure-sdk-for-java) from 5.18.0 to 5.19.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/spring-cloud-azure_5.18.0...spring-cloud-azure_5.19.0) --- updated-dependencies: - dependency-name: com.azure.spring:spring-cloud-azure-dependencies dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- auth/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts index e3265185757..df9aabf82a1 100644 --- a/auth/build.gradle.kts +++ b/auth/build.gradle.kts @@ -48,7 +48,7 @@ configurations.all { dependencyManagement { imports { - mavenBom("com.azure.spring:spring-cloud-azure-dependencies:5.18.0") + mavenBom("com.azure.spring:spring-cloud-azure-dependencies:5.19.0") mavenBom("org.springframework.cloud:spring-cloud-dependencies:2024.0.0") } } From 0f5f0f45afb3ba85470713c69cfa26f6d7e69cb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 09:12:52 +0000 Subject: [PATCH 02/19] Bump org.springframework.boot from 3.4.0 to 3.4.1 in /auth Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- auth/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts index df9aabf82a1..c9c22046701 100644 --- a/auth/build.gradle.kts +++ b/auth/build.gradle.kts @@ -1,7 +1,7 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) plugins { - id("org.springframework.boot") version "3.4.0" + id("org.springframework.boot") version "3.4.1" id("io.spring.dependency-management") version "1.1.6" id("reportstream.project-conventions") kotlin("plugin.spring") version "2.0.21" From 6b0ddc90f86aeb58fb39fb16234df9a01c29f345 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 09:12:49 +0000 Subject: [PATCH 03/19] Bump io.spring.dependency-management from 1.1.6 to 1.1.7 in /auth Bumps [io.spring.dependency-management](https://github.com/spring-gradle-plugins/dependency-management-plugin) from 1.1.6 to 1.1.7. - [Release notes](https://github.com/spring-gradle-plugins/dependency-management-plugin/releases) - [Commits](https://github.com/spring-gradle-plugins/dependency-management-plugin/compare/v1.1.6...v1.1.7) --- updated-dependencies: - dependency-name: io.spring.dependency-management dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- auth/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts index c9c22046701..63dc647ef3f 100644 --- a/auth/build.gradle.kts +++ b/auth/build.gradle.kts @@ -2,7 +2,7 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) plugins { id("org.springframework.boot") version "3.4.1" - id("io.spring.dependency-management") version "1.1.6" + id("io.spring.dependency-management") version "1.1.7" id("reportstream.project-conventions") kotlin("plugin.spring") version "2.0.21" } From 099a3cceac02efc37d8ab1d9ef86ac91720b6e49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 09:12:25 +0000 Subject: [PATCH 04/19] Bump org.springframework.boot from 3.4.0 to 3.4.1 in /submissions Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- submissions/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submissions/build.gradle.kts b/submissions/build.gradle.kts index 5138b4bcee5..73b00442d67 100644 --- a/submissions/build.gradle.kts +++ b/submissions/build.gradle.kts @@ -1,7 +1,7 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) plugins { - id("org.springframework.boot") version "3.4.0" + id("org.springframework.boot") version "3.4.1" id("io.spring.dependency-management") version "1.1.6" id("reportstream.project-conventions") kotlin("plugin.spring") version "2.0.21" From a23c0208dc701a3b36e34febf899605dd94ee820 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 09:12:22 +0000 Subject: [PATCH 05/19] Bump com.azure.spring:spring-cloud-azure-dependencies in /submissions Bumps [com.azure.spring:spring-cloud-azure-dependencies](https://github.com/Azure/azure-sdk-for-java) from 5.18.0 to 5.19.0. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/spring-cloud-azure_5.18.0...spring-cloud-azure_5.19.0) --- updated-dependencies: - dependency-name: com.azure.spring:spring-cloud-azure-dependencies dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- submissions/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submissions/build.gradle.kts b/submissions/build.gradle.kts index 73b00442d67..09201e2db40 100644 --- a/submissions/build.gradle.kts +++ b/submissions/build.gradle.kts @@ -40,7 +40,7 @@ configurations.all { dependencyManagement { imports { - mavenBom("com.azure.spring:spring-cloud-azure-dependencies:5.18.0") + mavenBom("com.azure.spring:spring-cloud-azure-dependencies:5.19.0") } } From ec8304082941a6c37d42cb2ee78a5eaffbae7028 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 09:12:07 +0000 Subject: [PATCH 06/19] Bump io.spring.dependency-management from 1.1.6 to 1.1.7 in /submissions Bumps [io.spring.dependency-management](https://github.com/spring-gradle-plugins/dependency-management-plugin) from 1.1.6 to 1.1.7. - [Release notes](https://github.com/spring-gradle-plugins/dependency-management-plugin/releases) - [Commits](https://github.com/spring-gradle-plugins/dependency-management-plugin/compare/v1.1.6...v1.1.7) --- updated-dependencies: - dependency-name: io.spring.dependency-management dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- submissions/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submissions/build.gradle.kts b/submissions/build.gradle.kts index 09201e2db40..cbeff9f0866 100644 --- a/submissions/build.gradle.kts +++ b/submissions/build.gradle.kts @@ -2,7 +2,7 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) plugins { id("org.springframework.boot") version "3.4.1" - id("io.spring.dependency-management") version "1.1.6" + id("io.spring.dependency-management") version "1.1.7" id("reportstream.project-conventions") kotlin("plugin.spring") version "2.0.21" } From b6498d6feba3e66a9254c6ba5cce086af4698828 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 09:12:06 +0000 Subject: [PATCH 07/19] Bump org.springframework.security:spring-security-oauth2-jose Bumps [org.springframework.security:spring-security-oauth2-jose](https://github.com/spring-projects/spring-security) from 6.3.4 to 6.4.2. - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/6.3.4...6.4.2) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-oauth2-jose dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- submissions/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submissions/build.gradle.kts b/submissions/build.gradle.kts index cbeff9f0866..c6565da2d62 100644 --- a/submissions/build.gradle.kts +++ b/submissions/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server") - implementation("org.springframework.security:spring-security-oauth2-jose:6.3.4") + implementation("org.springframework.security:spring-security-oauth2-jose:6.4.2") implementation("com.azure.spring:spring-cloud-azure-starter-storage") implementation("com.microsoft.azure:applicationinsights-runtime-attach:3.6.2") From 9b6b454af08e1abeb338c669590141fa64782b7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 09:54:29 +0000 Subject: [PATCH 08/19] Bump plugin.spring from 2.0.21 to 2.1.0 in /auth Bumps [plugin.spring](https://github.com/JetBrains/kotlin) from 2.0.21 to 2.1.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) --- updated-dependencies: - dependency-name: plugin.spring dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- auth/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts index 63dc647ef3f..9eda0d42d55 100644 --- a/auth/build.gradle.kts +++ b/auth/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("org.springframework.boot") version "3.4.1" id("io.spring.dependency-management") version "1.1.7" id("reportstream.project-conventions") - kotlin("plugin.spring") version "2.0.21" + kotlin("plugin.spring") version "2.1.0" } group = "gov.cdc.prime" From 8e619248b45428e9f49bce0cc36e1c5a94e80d1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 09:53:53 +0000 Subject: [PATCH 09/19] Bump org.springframework.cloud:spring-cloud-dependencies in /auth Bumps [org.springframework.cloud:spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release) from 2023.0.3 to 2023.0.4. - [Release notes](https://github.com/spring-cloud/spring-cloud-release/releases) - [Commits](https://github.com/spring-cloud/spring-cloud-release/compare/v2023.0.3...v2023.0.4) --- updated-dependencies: - dependency-name: org.springframework.cloud:spring-cloud-dependencies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] From b1b9ed2863dc52e1d0046b0b1654d57bfd556080 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 09:41:31 +0000 Subject: [PATCH 10/19] Bump plugin.spring from 2.0.21 to 2.1.0 in /submissions Bumps [plugin.spring](https://github.com/JetBrains/kotlin) from 2.0.21 to 2.1.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v2.1.0/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) --- updated-dependencies: - dependency-name: plugin.spring dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- submissions/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submissions/build.gradle.kts b/submissions/build.gradle.kts index c6565da2d62..39a3c477996 100644 --- a/submissions/build.gradle.kts +++ b/submissions/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("org.springframework.boot") version "3.4.1" id("io.spring.dependency-management") version "1.1.7" id("reportstream.project-conventions") - kotlin("plugin.spring") version "2.0.21" + kotlin("plugin.spring") version "2.1.0" } group = "gov.cdc.prime" From 4249ffe9b87d121882c0f42add67c3d6d9d82ab9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 08:18:38 +0000 Subject: [PATCH 11/19] Bump io.github.oshai:kotlin-logging-jvm in /prime-router Bumps [io.github.oshai:kotlin-logging-jvm](https://github.com/oshai/kotlin-logging) from 7.0.0 to 7.0.3. - [Release notes](https://github.com/oshai/kotlin-logging/releases) - [Changelog](https://github.com/oshai/kotlin-logging/blob/master/ChangeLog-old.md) - [Commits](https://github.com/oshai/kotlin-logging/commits) --- updated-dependencies: - dependency-name: io.github.oshai:kotlin-logging-jvm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- prime-router/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index d489a8564d7..752d062b061 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -882,7 +882,7 @@ dependencies { implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.0") implementation("org.apache.logging.log4j:log4j-layout-template-json:2.24.0") implementation("org.apache.logging.log4j:log4j-api-kotlin:1.5.0") - implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.3") implementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.10.0") implementation("tech.tablesaw:tablesaw-core:0.43.1") implementation("com.github.ajalt.clikt:clikt-jvm:4.4.0") From 3eb32342bcc1d58c3268a6ae0508878054e6c1d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 08:18:32 +0000 Subject: [PATCH 12/19] Bump com.networknt:json-schema-validator in /prime-router Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.5.2 to 1.5.4. - [Release notes](https://github.com/networknt/json-schema-validator/releases) - [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md) - [Commits](https://github.com/networknt/json-schema-validator/compare/1.5.2...1.5.4) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- prime-router/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index 752d062b061..af3f794fc8c 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -979,7 +979,7 @@ dependencies { implementation("xalan:xalan:2.7.3") // validations - implementation("com.networknt:json-schema-validator:1.5.2") + implementation("com.networknt:json-schema-validator:1.5.4") implementation("io.konform:konform-jvm:0.4.0") runtimeOnly("com.okta.jwt:okta-jwt-verifier-impl:0.5.7") From 83445892e4b4fab52db2f18dd4a3a8eb4d5fe9d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 08:18:22 +0000 Subject: [PATCH 13/19] Bump jacksonVersion from 2.18.1 to 2.18.2 in /prime-router Bumps `jacksonVersion` from 2.18.1 to 2.18.2. Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-yaml` from 2.18.1 to 2.18.2 - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.18.1...jackson-dataformats-text-2.18.2) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.1 to 2.18.2 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- prime-router/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index af3f794fc8c..eca42ea8105 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -75,7 +75,7 @@ val javaVersion = when (appJvmTarget) { } val ktorVersion = "2.3.12" val kotlinVersion by System.getProperties() -val jacksonVersion = "2.18.1" +val jacksonVersion = "2.18.2" jacoco.toolVersion = "0.8.12" // Local database information, first one wins: From b24782b555513a8dc7f9450da0f452a7ed9d2250 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 09:53:47 +0000 Subject: [PATCH 14/19] Bump org.springdoc:springdoc-openapi-starter-webflux-ui in /auth Bumps [org.springdoc:springdoc-openapi-starter-webflux-ui](https://github.com/springdoc/springdoc-openapi) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v2.6.0...v2.7.0) --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-starter-webflux-ui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- auth/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts index 9eda0d42d55..043426387a5 100644 --- a/auth/build.gradle.kts +++ b/auth/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { runtimeOnly("com.okta.sdk:okta-sdk-impl:20.0.0") // Swagger - implementation("org.springdoc:springdoc-openapi-starter-webflux-ui:2.6.0") + implementation("org.springdoc:springdoc-openapi-starter-webflux-ui:2.7.0") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.security:spring-security-test") From 290274133cf83cce81a5f46afc1d0aaec1458301 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 08:18:11 +0000 Subject: [PATCH 15/19] Bump com.zaxxer:HikariCP from 6.2.0 to 6.2.1 in /prime-router Bumps [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) from 6.2.0 to 6.2.1. - [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES) - [Commits](https://github.com/brettwooldridge/HikariCP/compare/HikariCP-6.2.0...HikariCP-6.2.1) --- updated-dependencies: - dependency-name: com.zaxxer:HikariCP dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- prime-router/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index eca42ea8105..b08800858ae 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -923,7 +923,7 @@ dependencies { implementation("commons-codec:commons-codec:1.17.1") implementation("commons-io:commons-io:2.17.0") implementation("org.postgresql:postgresql:42.7.4") - implementation("com.zaxxer:HikariCP:6.2.0") + implementation("com.zaxxer:HikariCP:6.2.1") implementation("org.flywaydb:flyway-core:10.21.0") implementation("org.flywaydb:flyway-database-postgresql:10.21.0") implementation("org.commonmark:commonmark:0.24.0") From a55ad6765b64be68f655755f095b2ed2e86283fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 08:18:13 +0000 Subject: [PATCH 16/19] Bump commons-io:commons-io from 2.17.0 to 2.18.0 in /prime-router Bumps commons-io:commons-io from 2.17.0 to 2.18.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- prime-router/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index b08800858ae..fdd99803a46 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -921,7 +921,7 @@ dependencies { implementation("org.apache.commons:commons-lang3:3.15.0") implementation("org.apache.commons:commons-text:1.12.0") implementation("commons-codec:commons-codec:1.17.1") - implementation("commons-io:commons-io:2.17.0") + implementation("commons-io:commons-io:2.18.0") implementation("org.postgresql:postgresql:42.7.4") implementation("com.zaxxer:HikariCP:6.2.1") implementation("org.flywaydb:flyway-core:10.21.0") @@ -951,7 +951,7 @@ dependencies { implementation("org.apache.poi:poi:5.3.0") implementation("org.apache.poi:poi-ooxml:5.3.0") implementation("org.apache.commons:commons-compress:1.27.1") - implementation("commons-io:commons-io:2.17.0") + implementation("commons-io:commons-io:2.18.0") implementation("com.anyascii:anyascii:0.3.2") // force jsoup since skrapeit-html-parser@1.2.1+ has not updated implementation("org.jsoup:jsoup:1.18.1") From e9341a2c8a63e3c0178490d8d801e4298e3576ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 08:18:15 +0000 Subject: [PATCH 17/19] Bump io.github.java-diff-utils:java-diff-utils in /prime-router Bumps [io.github.java-diff-utils:java-diff-utils](https://github.com/java-diff-utils/java-diff-utils) from 4.11 to 4.15. - [Release notes](https://github.com/java-diff-utils/java-diff-utils/releases) - [Changelog](https://github.com/java-diff-utils/java-diff-utils/blob/master/CHANGELOG.md) - [Commits](https://github.com/java-diff-utils/java-diff-utils/compare/java-diff-utils-parent-4.11...java-diff-utils-parent-4.15) --- updated-dependencies: - dependency-name: io.github.java-diff-utils:java-diff-utils dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- prime-router/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index fdd99803a46..ce856367cf4 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -937,7 +937,7 @@ dependencies { implementation("com.cronutils:cron-utils:9.2.1") implementation("io.jsonwebtoken:jjwt-api:0.11.5") implementation("de.m3y.kformat:kformat:0.11") - implementation("io.github.java-diff-utils:java-diff-utils:4.11") + implementation("io.github.java-diff-utils:java-diff-utils:4.15") implementation("io.ktor:ktor-client-core:$ktorVersion") implementation("io.ktor:ktor-client-cio:$ktorVersion") implementation("io.ktor:ktor-client-apache:$ktorVersion") From 166ac13f3e6e44d38a1c2313dbb0281a6662a721 Mon Sep 17 00:00:00 2001 From: Jack Wang Date: Thu, 26 Dec 2024 04:53:44 -0500 Subject: [PATCH 18/19] disambiguate argument type in sshj mocks --- .../transport/SftpTransportIntegrationTests.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/prime-router/src/testIntegration/kotlin/transport/SftpTransportIntegrationTests.kt b/prime-router/src/testIntegration/kotlin/transport/SftpTransportIntegrationTests.kt index 92cfbb6b48d..578f3997a6d 100644 --- a/prime-router/src/testIntegration/kotlin/transport/SftpTransportIntegrationTests.kt +++ b/prime-router/src/testIntegration/kotlin/transport/SftpTransportIntegrationTests.kt @@ -32,6 +32,7 @@ import io.mockk.spyk import io.mockk.unmockkAll import net.schmizz.sshj.SSHClient import net.schmizz.sshj.connection.ConnectionException +import net.schmizz.sshj.sftp.RemoteResourceFilter import net.schmizz.sshj.sftp.RemoteResourceInfo import net.schmizz.sshj.sftp.SFTPClient import net.schmizz.sshj.transport.verification.HostKeyVerifier @@ -456,10 +457,11 @@ class SftpTransportIntegrationTests : TransportIntegrationTests() { @Test fun `ls happy path`() { val f = Fixture() + val nullRemoteResourceFilter: RemoteResourceFilter? = null every { f.mockSSHClient.newSFTPClient() } returns f.mockSFTPClient // mock a successful ls on the remote SFTP server - every { f.mockSFTPClient.ls(f.lsPath, null) } returns f.remoteResourceInfos + every { f.mockSFTPClient.ls(f.lsPath, nullRemoteResourceFilter) } returns f.remoteResourceInfos every { f.mockSFTPClient.close() } just runs every { f.mockSSHClient.close() } just runs every { f.mockSSHClient.disconnect() } just runs @@ -473,10 +475,11 @@ class SftpTransportIntegrationTests : TransportIntegrationTests() { @Test fun `ls connection error`() { val f = Fixture() + val nullRemoteResourceFilter: RemoteResourceFilter? = null every { f.mockSSHClient.newSFTPClient() } returns f.mockSFTPClient // throw a connection exception on ls - every { f.mockSFTPClient.ls(f.lsPath, null) } throws ConnectionException("oops") + every { f.mockSFTPClient.ls(f.lsPath, nullRemoteResourceFilter) } throws ConnectionException("oops") every { f.mockSFTPClient.close() } just runs every { f.mockSSHClient.close() } just runs every { f.mockSSHClient.disconnect() } just runs @@ -490,10 +493,14 @@ class SftpTransportIntegrationTests : TransportIntegrationTests() { @Test fun `ls ignore timeout error`() { val f = Fixture() + val nullRemoteResourceFilter: RemoteResourceFilter? = null every { f.mockSSHClient.newSFTPClient() } returns f.mockSFTPClient // throw a ConnectionException on ls with TimeoutException as a cause - every { f.mockSFTPClient.ls(f.lsPath, null) } throws ConnectionException("oops", TimeoutException()) + every { f.mockSFTPClient.ls(f.lsPath, nullRemoteResourceFilter) } throws ConnectionException( + "oops", + TimeoutException() + ) every { f.mockSFTPClient.close() } just runs every { f.mockSSHClient.close() } just runs every { f.mockSSHClient.disconnect() } just runs From a9ecd2dde84b9a972194f1b442629ea173b17360 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Dec 2024 07:48:09 +0000 Subject: [PATCH 19/19] Bump com.hierynomus:sshj from 0.38.0 to 0.39.0 in /prime-router Bumps [com.hierynomus:sshj](https://github.com/hierynomus/sshj) from 0.38.0 to 0.39.0. - [Commits](https://github.com/hierynomus/sshj/compare/v0.38.0...v0.39.0) --- updated-dependencies: - dependency-name: com.hierynomus:sshj dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- prime-router/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index ce856367cf4..ad8ffb8bd27 100644 --- a/prime-router/build.gradle.kts +++ b/prime-router/build.gradle.kts @@ -914,7 +914,7 @@ dependencies { implementation("com.okta.jwt:okta-jwt-verifier:0.5.7") implementation("org.json:json:20240303") // DO NOT INCREMENT SSHJ to a newer version without first thoroughly testing it locally. - implementation("com.hierynomus:sshj:0.38.0") + implementation("com.hierynomus:sshj:0.39.0") implementation("com.jcraft:jsch:0.1.55") implementation("org.apache.poi:poi:5.3.0") implementation("org.apache.commons:commons-csv:1.12.0")