From d477f7c139674805adc0192534c11006b76e2ef0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:10:44 +0000 Subject: [PATCH 1/2] [CORE-69]: Bump the minor-patch-dependencies group across 1 directory with 14 updates Bumps the minor-patch-dependencies group with 14 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.0` | | [org.springframework.boot:spring-boot-starter-data-jdbc](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.0` | | [org.springframework.boot:spring-boot-starter-web](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.0` | | [org.springframework.boot:spring-boot-configuration-processor](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.0` | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.0` | | [com.nimbusds:nimbus-jose-jwt](https://bitbucket.org/connect2id/nimbus-jose-jwt) | `9.46` | `9.47` | | [io.projectreactor.netty:reactor-netty-http](https://github.com/reactor/reactor-netty) | `1.1.23` | `1.2.0` | | [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) | `2.18.1` | `2.18.2` | | bio.terra:terra-common-lib | `1.1.20-SNAPSHOT` | `1.1.24-SNAPSHOT` | | [com.google.cloud:google-cloud-pubsub](https://github.com/googleapis/java-pubsub) | `1.134.1` | `1.134.2` | | [com.fasterxml.jackson.dataformat:jackson-dataformat-yaml](https://github.com/FasterXML/jackson-dataformats-text) | `2.18.1` | `2.18.2` | | io.swagger.core.v3:swagger-annotations | `2.2.25` | `2.2.26` | | com.fasterxml.jackson.datatype:jackson-datatype-jsr310 | `2.18.1` | `2.18.2` | | com.google.auth:google-auth-library-oauth2-http | `1.29.0` | `1.30.0` | Updates `org.springframework.boot:spring-boot-starter-test` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `org.springframework.boot:spring-boot-starter-data-jdbc` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `org.springframework.boot:spring-boot-starter-web` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `org.springframework.boot:spring-boot-configuration-processor` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `org.springframework.boot` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `com.nimbusds:nimbus-jose-jwt` from 9.46 to 9.47 - [Changelog](https://bitbucket.org/connect2id/nimbus-jose-jwt/src/master/CHANGELOG.txt) - [Commits](https://bitbucket.org/connect2id/nimbus-jose-jwt/branches/compare/9.47..9.46) Updates `io.projectreactor.netty:reactor-netty-http` from 1.1.23 to 1.2.0 - [Release notes](https://github.com/reactor/reactor-netty/releases) - [Commits](https://github.com/reactor/reactor-netty/compare/v1.1.23...v1.2.0) Updates `com.fasterxml.jackson:jackson-bom` from 2.18.1 to 2.18.2 - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.18.1...jackson-bom-2.18.2) Updates `bio.terra:terra-common-lib` from 1.1.20-SNAPSHOT to 1.1.24-SNAPSHOT Updates `com.google.cloud:google-cloud-pubsub` from 1.134.1 to 1.134.2 - [Release notes](https://github.com/googleapis/java-pubsub/releases) - [Changelog](https://github.com/googleapis/java-pubsub/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/java-pubsub/compare/v1.134.1...v1.134.2) Updates `org.springframework.boot:spring-boot-starter-data-jdbc` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `org.springframework.boot:spring-boot-starter-web` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) 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 `io.swagger.core.v3:swagger-annotations` from 2.2.25 to 2.2.26 Updates `org.springframework.boot:spring-boot-configuration-processor` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `org.springframework.boot` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.1 to 2.18.2 Updates `com.google.auth:google-auth-library-oauth2-http` from 1.29.0 to 1.30.0 --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot:spring-boot-starter-data-jdbc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot:spring-boot-configuration-processor dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.nimbusds:nimbus-jose-jwt dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: io.projectreactor.netty:reactor-netty-http dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: bio.terra:terra-common-lib dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: com.google.cloud:google-cloud-pubsub dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot:spring-boot-starter-data-jdbc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: io.swagger.core.v3:swagger-annotations dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot:spring-boot-configuration-processor dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: com.google.auth:google-auth-library-oauth2-http dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies ... Signed-off-by: dependabot[bot] --- buffer-clienttests/build.gradle | 4 ++-- build.gradle | 16 ++++++++-------- terra-resource-buffer-client/build.gradle | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/buffer-clienttests/build.gradle b/buffer-clienttests/build.gradle index 352ce46b..8de11f83 100644 --- a/buffer-clienttests/build.gradle +++ b/buffer-clienttests/build.gradle @@ -18,14 +18,14 @@ dependencies { apacheMath = '3.6.1' findbugsAnnotations = "3.0.1u2" guava = "33.3.1-jre" - jackson = "2.18.1" + jackson = "2.18.2" jersey = "3.1.9" kubernetesClient = "21.0.2" logback = "1.5.12" slf4j = "2.0.16" hamcrest = "3.0" - googleOauth2 = "1.29.0" + googleOauth2 = "1.30.0" bufferServiceClient = "0.4.3-SNAPSHOT" testRunner = "0.2.0-SNAPSHOT" diff --git a/build.gradle b/build.gradle index e5dd02fb..50714160 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Build Script Classpath buildscript { ext { - springBootVersion = '3.3.5' + springBootVersion = '3.4.0' } dependencies { // jib build requires this dependency; @@ -64,7 +64,7 @@ repositories { dependencies { // Terra deps - we get Stairway via TCL - implementation group: 'bio.terra', name: 'terra-common-lib', version: '1.1.20-SNAPSHOT' + implementation group: 'bio.terra', name: 'terra-common-lib', version: '1.1.24-SNAPSHOT' implementation group: 'bio.terra', name: 'terra-cloud-resource-lib', version: '1.2.31-SNAPSHOT' implementation group: 'bio.terra', name: 'terra-resource-janitor-client', version: '0.113.38-SNAPSHOT' @@ -72,7 +72,7 @@ dependencies { implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '5.16.0' implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '5.16.0' 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.134.1' + implementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.134.2' implementation group: 'com.google.guava', name: 'guava', version: '33.3.1-jre' implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.0' implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.30.0' @@ -93,9 +93,9 @@ dependencies { implementation group: 'org.springframework.retry', name: 'spring-retry', version: '2.0.10' // Swagger deps - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.18.1' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.18.2' implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.14' - implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.25' + implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.26' runtimeOnly group: 'org.webjars.npm', name: 'swagger-ui-dist', version: '5.18.2' swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.61' @@ -113,9 +113,9 @@ dependencies { // transitive dependencies. constraints { implementation('org.yaml:snakeyaml:2.3') - implementation('com.nimbusds:nimbus-jose-jwt:9.46') - implementation('io.projectreactor.netty:reactor-netty-http:1.1.23') - implementation('com.fasterxml.jackson:jackson-bom:2.18.1') + implementation('com.nimbusds:nimbus-jose-jwt:9.47') + implementation('io.projectreactor.netty:reactor-netty-http:1.2.0') + implementation('com.fasterxml.jackson:jackson-bom:2.18.2') } } diff --git a/terra-resource-buffer-client/build.gradle b/terra-resource-buffer-client/build.gradle index e0460c80..22af74d7 100644 --- a/terra-resource-buffer-client/build.gradle +++ b/terra-resource-buffer-client/build.gradle @@ -14,12 +14,12 @@ repositories { dependencies { swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.61' - implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.25' + implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.26' implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.14' implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '3.1.9' implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: '3.1.9' implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '3.1.9' - implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.18.1' + implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.18.2' implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '3.0.0' implementation group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '4.0.0' } From 7586ba61955c0774037e9cc7e4043948f0097560 Mon Sep 17 00:00:00 2001 From: Marcus Talbott Date: Mon, 2 Dec 2024 18:48:03 -0500 Subject: [PATCH 2/2] try bumping gradle wrapper version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae08049..81aa1c04 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists