Skip to content

Commit 5fd23d9

Browse files
committed
Upgrade Gradle wrapper, dependencies, Bazel configs, and GitHub workflows
- Upgrade Gradle wrapper to 8.14.6 in root and examples - Upgrade regular dependencies in gradle/libs.versions.toml (OTel 1.67.0, Guava 33.7.2, CEL 0.15.0, Conscrypt 2.8.0, Tomcat, Jetty, Undertow, Gson, Animal Sniffer) - Sync updated versions to MODULE.bazel, repositories.bzl, and examples/ - Upgrade actions/setup-java to v6 in GitHub workflows - Add targeted deprecation suppressions for OTel and CEL APIs to satisfy -Werror - Update Tomcat tests to use addServletMapping instead of deprecated addServletMappingDecoded TAG=agy CONV=47219e81-0cc8-4e51-a537-f813927351c7
1 parent 15d64a4 commit 5fd23d9

17 files changed

Lines changed: 62 additions & 49 deletions

File tree

‎.github/workflows/branch-testing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v7
24-
- uses: actions/setup-java@v5
24+
- uses: actions/setup-java@v6
2525
with:
2626
java-version: ${{ matrix.jre }}
2727
distribution: 'temurin'

‎.github/workflows/testing.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- uses: actions/checkout@v7
25-
- uses: actions/setup-java@v5
25+
- uses: actions/setup-java@v6
2626
with:
2727
java-version: ${{ matrix.jre }}
2828
distribution: 'temurin'

‎MODULE.bazel‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1313
"com.google.auto.value:auto-value-annotations:1.11.0",
1414
"com.google.auto.value:auto-value:1.11.0",
1515
"com.google.code.findbugs:jsr305:3.0.2",
16-
"com.google.code.gson:gson:2.14.0",
17-
"com.google.errorprone:error_prone_annotations:2.50.0",
16+
"com.google.code.gson:gson:2.15.0",
17+
"com.google.errorprone:error_prone_annotations:2.51.0",
1818
"com.google.guava:failureaccess:1.0.1",
19-
"com.google.guava:guava:33.6.0-android",
19+
"com.google.guava:guava:33.7.2-android",
2020
"com.google.re2j:re2j:1.8",
2121
"com.google.s2a.proto.v2:s2a-proto:0.1.3",
2222
"com.google.truth:truth:1.4.5",
23-
"dev.cel:runtime:0.13.1",
24-
"dev.cel:protobuf:0.13.1",
25-
"dev.cel:common:0.13.1",
23+
"dev.cel:runtime:0.15.0",
24+
"dev.cel:protobuf:0.15.0",
25+
"dev.cel:common:0.15.0",
2626
"com.squareup.okhttp:okhttp:2.7.5",
2727
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
2828
"io.netty:netty-buffer:4.2.17.Final",
@@ -45,7 +45,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
4545
"junit:junit:4.13.2",
4646
"org.mockito:mockito-core:4.4.0",
4747
"org.checkerframework:checker-qual:3.49.5",
48-
"org.codehaus.mojo:animal-sniffer-annotations:1.27",
48+
"org.codehaus.mojo:animal-sniffer-annotations:1.28",
4949
]
5050
# GRPC_DEPS_END
5151

‎examples/example-gauth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency><!-- upgrade version from google-auth-library-oauth2-http -->
3232
<groupId>com.google.code.gson</groupId>
3333
<artifactId>gson</artifactId>
34-
<version>2.14.0</version>
34+
<version>2.15.0</version>
3535
</dependency>
3636
</dependencies>
3737
</dependencyManagement>

‎examples/example-gcp-csm-observability/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ java {
2424
// updating the version in our release process.
2525
def grpcVersion = '1.86.0-SNAPSHOT' // CURRENT_GRPC_VERSION
2626
def protocVersion = '3.25.8'
27-
def openTelemetryVersion = '1.64.0'
28-
def openTelemetryPrometheusVersion = '1.64.0-alpha'
27+
def openTelemetryVersion = '1.67.0'
28+
def openTelemetryPrometheusVersion = '1.67.0-alpha'
2929

3030
dependencies {
3131
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

‎examples/example-oauth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency><!-- upgrade version from google-auth-library-oauth2-http -->
3434
<groupId>com.google.code.gson</groupId>
3535
<artifactId>gson</artifactId>
36-
<version>2.14.0</version>
36+
<version>2.15.0</version>
3737
</dependency>
3838
</dependencies>
3939
</dependencyManagement>

‎examples/example-opentelemetry/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ java {
2323
// updating the version in our release process.
2424
def grpcVersion = '1.86.0-SNAPSHOT' // CURRENT_GRPC_VERSION
2525
def protocVersion = '3.25.8'
26-
def openTelemetryVersion = '1.64.0'
27-
def openTelemetryPrometheusVersion = '1.64.0-alpha'
26+
def openTelemetryVersion = '1.67.0'
27+
def openTelemetryPrometheusVersion = '1.67.0-alpha'
2828

2929
dependencies {
3030
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradle/libs.versions.toml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ androidx-test-core = "androidx.test:core:1.7.0"
2222
androidx-test-ext-junit = "androidx.test.ext:junit:1.3.0"
2323
androidx-test-rules = "androidx.test:rules:1.7.0"
2424
androidx-test-runner = "androidx.test:runner:1.7.0"
25-
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.27"
26-
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.27"
25+
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.28"
26+
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.28"
2727
assertj-core = "org.assertj:assertj-core:3.27.7"
2828
# 1.11.1 started converting jsr305 @Nullable to jspecify
2929
# checkForUpdates: auto-value:1.11.0
@@ -37,18 +37,18 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.26.1"
3737
# checkstyle 10.0+ requires Java 11+
3838
# See https://checkstyle.sourceforge.io/releasenotes_old_8-35_10-26.html#Release_10.0
3939
# checkForUpdates: checkstylejava8:9.+
40-
cel-runtime = "dev.cel:runtime:0.13.1"
41-
cel-protobuf = "dev.cel:protobuf:0.13.1"
42-
cel-compiler = "dev.cel:compiler:0.13.1"
40+
cel-runtime = "dev.cel:runtime:0.15.0"
41+
cel-protobuf = "dev.cel:protobuf:0.15.0"
42+
cel-compiler = "dev.cel:compiler:0.15.0"
4343
checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3"
4444
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
45-
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.6.1"
45+
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.8.0"
4646
# 141.7340.3+ requires Java 17+
4747
# checkForUpdates: cronet-api:119.6045.31
4848
cronet-api = "org.chromium.net:cronet-api:119.6045.31"
4949
# checkForUpdates: cronet-embedded:119.6045.31
5050
cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31"
51-
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.50.0"
51+
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.51.0"
5252
# 2.32.0+ requires Java 17+
5353
# checkForUpdates: errorprone-core:2.31.+
5454
errorprone-core = "com.google.errorprone:error_prone_core:2.31.0"
@@ -67,13 +67,13 @@ google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.42.1
6767
# 3.23.11+ require protobuf 4.x
6868
# checkForUpdates: google-cloud-logging:3.23.10
6969
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.23.10"
70-
gson = "com.google.code.gson:gson:2.14.0"
71-
guava = "com.google.guava:guava:33.6.0-android"
70+
gson = "com.google.code.gson:gson:2.15.0"
71+
guava = "com.google.guava:guava:33.7.2-android"
7272
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
73-
guava-testlib = "com.google.guava:guava-testlib:33.6.0-android"
73+
guava-testlib = "com.google.guava:guava-testlib:33.7.2-android"
7474
# JRE version is needed for projects where its a transitive dependency, f.e. gcp-observability.
7575
# May be different from the -android version.
76-
guava-jre = "com.google.guava:guava:33.6.0-jre"
76+
guava-jre = "com.google.guava:guava:33.7.2-jre"
7777
hdrhistogram = "org.hdrhistogram:HdrHistogram:2.2.2"
7878
# 6.0.0+ use java.lang.Deprecated forRemoval and since from Java 9
7979
# checkForUpdates: jakarta-servlet-api:5.+
@@ -82,11 +82,11 @@ javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
8282
# 12.0.0+ require Java 17+
8383
# checkForUpdates: jetty-client:11.+
8484
jetty-client = "org.eclipse.jetty:jetty-client:11.0.26"
85-
jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.11"
85+
jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.14"
8686
# 10.0.25+ uses uses @Deprecated(since=/forRemoval=) from Java 9
8787
# checkForUpdates: jetty-http2-server10:10.0.24
8888
jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.24"
89-
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.11"
89+
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.14"
9090
# checkForUpdates: jetty-servlet10:10.0.24
9191
jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.24"
9292
jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
@@ -119,12 +119,12 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g
119119
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
120120
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
121121
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
122-
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.64.0"
123-
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.64.0-alpha"
124-
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.59.0-alpha"
125-
opentelemetry-exporter-otlp = "io.opentelemetry:opentelemetry-exporter-otlp:1.64.0"
126-
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.64.0"
127-
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.64.0"
122+
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.67.0"
123+
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.67.0-alpha"
124+
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.61.0-alpha"
125+
opentelemetry-exporter-otlp = "io.opentelemetry:opentelemetry-exporter-otlp:1.67.0"
126+
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.67.0"
127+
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.67.0"
128128
perfmark-api = "io.perfmark:perfmark-api:0.27.0"
129129
# Not upgrading to 4.x as it is not yet ABI compatible.
130130
# https://github.com/protocolbuffers/protobuf/issues/17247
@@ -143,11 +143,11 @@ signature-android = "net.sf.androidscents.signature:android-api-level-24:7.0_r2"
143143
signature-java = "org.codehaus.mojo.signature:java18:1.0"
144144
# 11.0.0+ require Java 17+
145145
# checkForUpdates: tomcat-embed-core:10.+
146-
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.57"
146+
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.61"
147147
# checkForUpdates: tomcat-embed-core9:9.+
148-
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.120"
148+
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.123"
149149
truth = "com.google.truth:truth:1.4.5"
150150
# checkForUpdates: undertow-servlet22:2.2.+
151-
undertow-servlet22 = "io.undertow:undertow-servlet:2.2.40.Final"
151+
undertow-servlet22 = "io.undertow:undertow-servlet:2.2.41.Final"
152152
# checkForUpdates: undertow-servlet:2.3.+
153-
undertow-servlet = "io.undertow:undertow-servlet:2.3.26.Final"
153+
undertow-servlet = "io.undertow:undertow-servlet:2.3.27.Final"

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.6-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)