diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts index e3265185757..043426387a5 100644 --- a/auth/build.gradle.kts +++ b/auth/build.gradle.kts @@ -1,10 +1,10 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) plugins { - id("org.springframework.boot") version "3.4.0" - id("io.spring.dependency-management") version "1.1.6" + 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" @@ -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") @@ -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") } } diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts index d489a8564d7..ad8ffb8bd27 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: @@ -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") @@ -914,16 +914,16 @@ 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") 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.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") @@ -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") @@ -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") @@ -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") 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 diff --git a/submissions/build.gradle.kts b/submissions/build.gradle.kts index 5138b4bcee5..39a3c477996 100644 --- a/submissions/build.gradle.kts +++ b/submissions/build.gradle.kts @@ -1,10 +1,10 @@ apply(from = rootProject.file("buildSrc/shared.gradle.kts")) plugins { - id("org.springframework.boot") version "3.4.0" - id("io.spring.dependency-management") version "1.1.6" + 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" @@ -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") @@ -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") } }