Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ updates:
# As of this writing, Jib requires this specific version, and we want Dependabot
# to leave it alone. All other instances of jackson-bom are already updated to 2.20.0
- dependency-name: "com.fasterxml.jackson:jackson-bom"
versions: [ "2.20.0" ]
versions: [ ">=2.20.0" ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to peg to 2.19.2, then this needs to ignore version 2.20.0 and above. However, do we want to keep it at 2.19.2 forever or should we do some work to enable this to upgrade?

6 changes: 3 additions & 3 deletions buffer-clienttests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ dependencies {
apacheMath = '3.6.1'
findbugsAnnotations = "3.0.1u2"
guava = "33.5.0-jre"
jackson = "2.20.0"
jackson = "2.20.1"
jersey = "3.1.10"
kubernetesClient = "24.0.0-legacy"
logback = "1.5.19"
logback = "1.5.20"
slf4j = "2.0.17"
hamcrest = "3.0"

googleOauth2 = "1.39.1"
googleOauth2 = "1.40.0"

bufferServiceClient = "0.4.3-SNAPSHOT"
testRunner = "0.2.2-SNAPSHOT"
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Build Script Classpath
buildscript {
ext {
springBootVersion = '3.5.6'
springBootVersion = '3.5.7'
}
dependencies {
// jib build requires this dependency;
Expand Down Expand Up @@ -65,18 +65,18 @@ repositories {

dependencies {
// Terra deps - we get Stairway via TCL
implementation group: 'bio.terra', name: 'terra-common-lib', version: '1.1.56-SNAPSHOT'
implementation group: 'bio.terra', name: 'terra-common-lib', version: '1.1.61-SNAPSHOT'
implementation(group: 'bio.terra', name: 'terra-cloud-resource-lib', version: '1.2.41-SNAPSHOT') {
exclude(group: 'com.microsoft.azure')
exclude(group: 'com.azure')
}
implementation group: 'bio.terra', name: 'terra-resource-janitor-client', version: '0.113.50-SNAPSHOT'
implementation group: 'bio.terra', name: 'terra-resource-janitor-client', version: '0.113.51-SNAPSHOT'

// Versioned direct deps
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '6.10.0'
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '6.10.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.141.5'
implementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.143.0'
implementation group: 'com.google.guava', name: 'guava', version: '33.5.0-jre'
implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.1'
implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.33.0'
Expand All @@ -97,10 +97,10 @@ dependencies {
implementation group: 'org.springframework.retry', name: 'spring-retry', version: '2.0.12'

// Swagger deps
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.20.0'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.20.1'
implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.16'
implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.38'
runtimeOnly group: 'org.webjars.npm', name: 'swagger-ui-dist', version: '5.29.1'
implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.40'
runtimeOnly group: 'org.webjars.npm', name: 'swagger-ui-dist', version: '5.30.2'
swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.61'

// Test deps
Expand All @@ -118,8 +118,8 @@ dependencies {
constraints {
implementation('org.yaml:snakeyaml:2.5')
implementation('com.nimbusds:nimbus-jose-jwt:10.5')
implementation('io.projectreactor.netty:reactor-netty-http:1.2.10')
implementation('com.fasterxml.jackson:jackson-bom:2.20.0')
implementation('io.projectreactor.netty:reactor-netty-http:1.2.11')
implementation('com.fasterxml.jackson:jackson-bom:2.20.1')
}
}

Expand Down
4 changes: 2 additions & 2 deletions terra-resource-buffer-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.38'
implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.40'
implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.16'
implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '3.1.10'
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: '3.1.10'
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '3.1.10'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.20.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.20.1'
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'
}
Expand Down
Loading