diff --git a/buffer-clienttests/build.gradle b/buffer-clienttests/build.gradle index 38663518..33d9eb1d 100644 --- a/buffer-clienttests/build.gradle +++ b/buffer-clienttests/build.gradle @@ -18,12 +18,12 @@ dependencies { apacheMath = '3.6.1' findbugsAnnotations = "3.0.1" guava = "31.1-jre" - jackson = "2.15.2" - jersey = "3.1.3" + jackson = "2.17.1" + jersey = "3.1.7" kubernetesClient = "14.0.1" - logback = "1.4.8" - slf4j = "2.0.7" - hamcrest = "2.1" + logback = "1.5.6" + slf4j = "2.0.13" + hamcrest = "2.2" googleOauth2 = "0.25.5" diff --git a/build.gradle b/build.gradle index 124801a3..4b113ea9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Build Script Classpath buildscript { ext { - springBootVersion = '3.2.5' + springBootVersion = '3.3.1' } } @@ -10,11 +10,11 @@ plugins { id 'jacoco' id 'java' - id 'com.diffplug.spotless' version '6.16.0' - id 'com.github.ben-manes.versions' version '0.42.0' + id 'com.diffplug.spotless' version '6.25.0' + id 'com.github.ben-manes.versions' version '0.51.0' id 'com.github.spotbugs' version '5.0.13' - id 'com.google.cloud.tools.jib' version '3.2.1' - id 'de.undercouch.download' version '5.1.0' + id 'com.google.cloud.tools.jib' version '3.4.3' + id 'de.undercouch.download' version '5.6.0' id 'org.hidetake.swagger.generator' version '2.19.2' id 'org.sonarqube' version '4.0.0.2929' id 'org.springframework.boot' version "${springBootVersion}" @@ -60,17 +60,17 @@ repositories { dependencies { // Terra deps - we get Stairway via TCL - implementation group: 'bio.terra', name: 'terra-common-lib', version: '1.1.11-SNAPSHOT' + implementation group: 'bio.terra', name: 'terra-common-lib', version: '1.1.13-SNAPSHOT' implementation group: 'bio.terra', name: 'terra-cloud-resource-lib', version: '1.2.30-SNAPSHOT' - implementation group: 'bio.terra', name: 'terra-resource-janitor-client', version: '0.113.31-SNAPSHOT' + implementation group: 'bio.terra', name: 'terra-resource-janitor-client', version: '0.114.0-SNAPSHOT' // Versioned direct deps - implementation group: 'com.google.auto.value', name: 'auto-value-annotations', version: '1.9' - implementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.120.11' + implementation group: 'com.google.auto.value', name: 'auto-value-annotations', version: '1.11.0' + implementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.131.0' implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre' - implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.0.2' - implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.22.0' - implementation group: 'org.webjars', name: 'webjars-locator-core', version: '0.52' + implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.0' + implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.28.0' + implementation group: 'org.webjars', name: 'webjars-locator-core', version: '0.59' runtimeOnly group: 'org.postgresql', name: 'postgresql' // OpenTelemetry @@ -79,39 +79,39 @@ dependencies { implementation "io.opentelemetry:opentelemetry-sdk:${openTelemetryVersion}" implementation "io.opentelemetry:opentelemetry-sdk-metrics:${openTelemetryVersion}" implementation "io.opentelemetry:opentelemetry-exporter-logging:${openTelemetryVersion}" - implementation "io.opentelemetry.semconv:opentelemetry-semconv:1.21.0-alpha" + implementation "io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha" implementation "io.opentelemetry.instrumentation:opentelemetry-spring-webmvc-6.0:${openTelemetryVersion}-alpha" implementation "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:${openTelemetryVersion}" implementation "io.opentelemetry.instrumentation:opentelemetry-spring-boot:${openTelemetryVersion}-alpha" implementation "io.opentelemetry:opentelemetry-exporter-prometheus:${openTelemetryVersion}-alpha" // Google cloud open telemetry exporters - var gcpOpenTelemetryExporterVersion = '0.25.2' + var gcpOpenTelemetryExporterVersion = '0.30.0' implementation "com.google.cloud.opentelemetry:exporter-trace:${gcpOpenTelemetryExporterVersion}" implementation "com.google.cloud.opentelemetry:exporter-metrics:${gcpOpenTelemetryExporterVersion}" // Deps whose versions are controlled by Spring - implementation group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.9.0' - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0' - implementation group: 'org.apache.commons', name: 'commons-pool2', version: '2.11.1' + implementation group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.12.0' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0' + implementation group: 'org.apache.commons', name: 'commons-pool2', version: '2.12.0' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jdbc', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}" implementation group: 'org.springframework.retry', name: 'spring-retry', version: '2.0.6' // Swagger deps - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.3' - implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.6' - implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.2' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.17.1' + implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.14' + implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.22' runtimeOnly group: 'org.webjars.npm', name: 'swagger-ui-dist', version: '3.36.2' - swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.47' + swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.57' // Test deps - testImplementation 'org.awaitility:awaitility:4.2.0' + testImplementation 'org.awaitility:awaitility:4.2.1' testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - annotationProcessor group: 'com.google.auto.value', name: 'auto-value', version: '1.9' + annotationProcessor group: 'com.google.auto.value', name: 'auto-value', version: '1.11.0' annotationProcessor group: 'org.springframework.boot', name: 'spring-boot-configuration-processor', version: "${springBootVersion}" // Transitive dependency constraints due to security vulnurabilities in prior versions. @@ -120,10 +120,10 @@ dependencies { constraints { implementation('com.google.protobuf:protobuf-java:3.21.10') implementation('org.yaml:snakeyaml:1.33') - implementation('com.nimbusds:nimbus-jose-jwt:9.25.6') - implementation('io.projectreactor.netty:reactor-netty-http:1.1.12') - implementation('com.fasterxml.jackson:jackson-bom:2.14.2') - spotbugs('org.apache.bcel:bcel:6.6.1') + implementation('com.nimbusds:nimbus-jose-jwt:9.40') + implementation('io.projectreactor.netty:reactor-netty-http:1.1.20') + implementation('com.fasterxml.jackson:jackson-bom:2.17.1') + spotbugs('org.apache.bcel:bcel:6.9.0') } } diff --git a/terra-resource-buffer-client/build.gradle b/terra-resource-buffer-client/build.gradle index 3fe4111e..d3e04dd1 100644 --- a/terra-resource-buffer-client/build.gradle +++ b/terra-resource-buffer-client/build.gradle @@ -13,13 +13,13 @@ repositories { } dependencies { - swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.47' - implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.2' - implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.12' - implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '3.1.3' - implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: '3.1.3' - implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '3.1.3' - implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.4' + swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.57' + implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.22' + implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.14' + implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '3.1.7' + implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: '3.1.7' + implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '3.1.7' + implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.17.1' implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '2.1.1' implementation group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.0.0' }