Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PF-2983]: Bump the minor-patch-dependencies group with 7 updates #217

Merged
merged 4 commits into from
Feb 4, 2025
Merged

[PF-2983]: Bump the minor-patch-dependencies group with 7 updates #217

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
355073a
[PF-2983]: Bump the minor-patch-dependencies group with 7 updates
dependabot[bot] Feb 1, 2025
7a26968
update upload-artifact to v4
LizBaldo Feb 3, 2025
a695746
Merge branch 'develop' into dependabot/gradle/develop/minor-patch-dep…
mmorgantaylor Feb 4, 2025
b8ce7f3
update comments about spring boot and opentelemetry versions
mmorgantaylor Feb 4, 2025
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
17 changes: 9 additions & 8 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ plugins {
id 'maven-publish'

id 'com.diffplug.spotless' version '7.0.2'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'com.github.ben-manes.versions' version '0.52.0'
id 'com.jfrog.artifactory' version '5.2.5'
id 'org.sonarqube' version '6.0.1.5171'
id 'io.spring.dependency-management' version '1.1.7'
id 'org.springframework.boot' version '3.4.1'
// when updating spring boot version, check whether any changes are needed in the opentelemetry-bom version below
id 'org.springframework.boot' version '3.4.2'
id 'com.srcclr.gradle' version '3.1.12'
}

Expand Down Expand Up @@ -54,7 +55,7 @@ dependencies {
// Misc. Services
implementation group: 'io.kubernetes', name: 'client-java', version: '22.0.0'
constraints {
implementation('org.bouncycastle:bcprov-jdk18on:1.79') {
implementation('org.bouncycastle:bcprov-jdk18on:1.80') {
because 'https://broadworkbench.atlassian.net/browse/DCJ-275'
}
}
Expand All @@ -63,7 +64,7 @@ dependencies {

// Google dependencies
// use common bom
implementation platform('com.google.cloud:libraries-bom:26.52.0')
implementation platform('com.google.cloud:libraries-bom:26.53.0')
implementation group: 'com.google.cloud', name: 'google-cloud-core'
implementation group: 'com.google.cloud', name: 'google-cloud-pubsub'
api group: 'com.google.guava', name: 'guava'
Expand All @@ -74,7 +75,7 @@ dependencies {

// Terra libraries
implementation group: 'org.broadinstitute.dsde.workbench', name: 'sam-client_2.13', version: 'v0.0.329'
var stairwayVersion= '1.1.17-SNAPSHOT'
var stairwayVersion= '1.1.18-SNAPSHOT'
api "bio.terra:stairway-gcp:${stairwayVersion}"
implementation "bio.terra:stairway-azure:${stairwayVersion}"

Expand All @@ -84,10 +85,10 @@ dependencies {
implementation group: 'ch.qos.logback.contrib', name: 'logback-jackson', version: '0.1.5'

// OpenTelemetry dependencies:
// Spring Boot 3.4.0 pulls in opentelemetry-bom 1.43.0.
// We choose opentelemetry-instrumentation-bom-alpha:2.9.0-alpha because otel-instrumentation 2.9.0 targets otel 1.43.0.
// Spring Boot 3.4.2 pulls in opentelemetry-bom 1.43.0.
// Note that opentelemetry-instrumentation-bom-alpha:2.12.0-alpha targets opentelemetry 1.46.0.
Copy link
Contributor

Choose a reason for hiding this comment

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

@LizBaldo I'm not sure if it's a problem to be diverging here in terms of what the Spring Boot plugin and the opentelemetry bom each define. It was a problem in the past as I recall (hence these comments) but I think that if it builds and tests succeed we're ok.

// When upgrading Spring Boot, re-check these versions.
implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha")
implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha")
// ... versioned by Spring Boot
api 'io.opentelemetry:opentelemetry-api'
implementation 'io.opentelemetry:opentelemetry-exporter-logging'
Expand Down