Skip to content

Commit 16e17ab

Browse files
authored
Upgrade Dependencies (#12719)
1 parent 6a2028c commit 16e17ab

File tree

5 files changed

+38
-31
lines changed

5 files changed

+38
-31
lines changed

MODULE.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ module(
88
# GRPC_DEPS_START
99
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1010
"com.google.android:annotations:4.1.1.4",
11-
"com.google.api.grpc:proto-google-common-protos:2.63.2",
12-
"com.google.auth:google-auth-library-credentials:1.41.0",
13-
"com.google.auth:google-auth-library-oauth2-http:1.41.0",
11+
"com.google.api.grpc:proto-google-common-protos:2.64.1",
12+
"com.google.auth:google-auth-library-credentials:1.42.1",
13+
"com.google.auth:google-auth-library-oauth2-http:1.42.1",
1414
"com.google.auto.value:auto-value-annotations:1.11.0",
1515
"com.google.auto.value:auto-value:1.11.0",
1616
"com.google.code.findbugs:jsr305:3.0.2",
1717
"com.google.code.gson:gson:2.13.2",
18-
"com.google.errorprone:error_prone_annotations:2.45.0",
18+
"com.google.errorprone:error_prone_annotations:2.48.0",
1919
"com.google.guava:failureaccess:1.0.1",
2020
"com.google.guava:guava:33.5.0-android",
2121
"com.google.re2j:re2j:1.8",
@@ -43,7 +43,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
4343
"junit:junit:4.13.2",
4444
"org.mockito:mockito-core:4.4.0",
4545
"org.checkerframework:checker-qual:3.49.5",
46-
"org.codehaus.mojo:animal-sniffer-annotations:1.26",
46+
"org.codehaus.mojo:animal-sniffer-annotations:1.27",
4747
]
4848
# GRPC_DEPS_END
4949

examples/example-gauth/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
3131
implementation "io.grpc:grpc-stub:${grpcVersion}"
3232
implementation "io.grpc:grpc-auth:${grpcVersion}"
33-
implementation "com.google.auth:google-auth-library-oauth2-http:1.41.0"
33+
implementation "com.google.auth:google-auth-library-oauth2-http:1.42.1"
3434
implementation "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24"
3535
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
3636
}

examples/example-oauth/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
3030
implementation "io.grpc:grpc-stub:${grpcVersion}"
3131
implementation "io.grpc:grpc-auth:${grpcVersion}"
32-
implementation "com.google.auth:google-auth-library-oauth2-http:1.41.0"
32+
implementation "com.google.auth:google-auth-library-oauth2-http:1.42.1"
3333

3434
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
3535

gradle/libs.versions.toml

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ 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.26"
26-
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.26"
27-
assertj-core = "org.assertj:assertj-core:3.27.6"
25+
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.27"
26+
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.27"
27+
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
3030
auto-value = "com.google.auto.value:auto-value:1.11.0"
@@ -45,18 +45,25 @@ conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
4545
cronet-api = "org.chromium.net:cronet-api:119.6045.31"
4646
# checkForUpdates: cronet-embedded:119.6045.31
4747
cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31"
48-
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.45.0"
48+
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.48.0"
4949
# 2.32.0+ requires Java 17+
5050
# checkForUpdates: errorprone-core:2.31.+
5151
errorprone-core = "com.google.errorprone:error_prone_core:2.31.0"
5252
# 2.11.0+ requires JDK 11+ (See https://github.com/google/error-prone/releases/tag/v2.11.0)
5353
# checkForUpdates: errorprone-corejava8:2.10.+
5454
errorprone-corejava8 = "com.google.errorprone:error_prone_core:2.10.0"
55-
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.63.2"
56-
google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.41.0"
57-
google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.41.0"
55+
# 2.65.0+ requires protobuf 4.x
56+
# checkForUpdates: google-api-protos:2.64.+
57+
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.64.1"
58+
# 1.43.0+ versions of google-auth-library requires protobuf 4.x
59+
# checkForUpdates: google-auth-credentials:1.42.+
60+
google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.42.1"
61+
# checkForUpdates: google-auth-oauth2Http:1.42.+
62+
google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.42.1"
5863
# Release notes: https://cloud.google.com/logging/docs/release-notes
59-
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.23.9"
64+
# 3.23.11+ require protobuf 4.x
65+
# checkForUpdates: google-cloud-logging:3.23.10
66+
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.23.10"
6067
gson = "com.google.code.gson:gson:2.13.2"
6168
guava = "com.google.guava:guava:33.5.0-android"
6269
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
@@ -72,16 +79,16 @@ javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
7279
# 12.0.0+ require Java 17+
7380
# checkForUpdates: jetty-client:11.+
7481
jetty-client = "org.eclipse.jetty:jetty-client:11.0.26"
75-
jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.5"
82+
jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.7"
7683
# 10.0.25+ uses uses @Deprecated(since=/forRemoval=) from Java 9
7784
# checkForUpdates: jetty-http2-server10:10.0.24
7885
jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.24"
79-
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.5"
86+
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.7"
8087
# checkForUpdates: jetty-servlet10:10.0.24
8188
jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.24"
8289
jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
8390
junit = "junit:junit:4.13.2"
84-
lincheck = "org.jetbrains.lincheck:lincheck:3.3.2"
91+
lincheck = "org.jetbrains.lincheck:lincheck:3.4"
8592
# Update notes / 2023-07-19 sergiitk:
8693
# Couldn't update to 5.4.0, updated to the last in 4.x line. Version 5.x breaks some tests.
8794
# Error log: https://github.com/grpc/grpc-java/pull/10359#issuecomment-1632834435
@@ -114,11 +121,11 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g
114121
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
115122
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
116123
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
117-
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.57.0"
118-
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.57.0-alpha"
119-
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.52.0-alpha"
120-
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.57.0"
121-
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.57.0"
124+
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.60.1"
125+
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.60.1-alpha"
126+
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.54.0-alpha"
127+
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.60.1"
128+
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.60.1"
122129
perfmark-api = "io.perfmark:perfmark-api:0.27.0"
123130
# Not upgrading to 4.x as it is not yet ABI compatible.
124131
# https://github.com/protocolbuffers/protobuf/issues/17247
@@ -131,15 +138,15 @@ protobuf-javalite = "com.google.protobuf:protobuf-javalite:3.25.8"
131138
# checkForUpdates: protobuf-protoc:3.+
132139
protobuf-protoc = "com.google.protobuf:protoc:3.25.8"
133140
re2j = "com.google.re2j:re2j:1.8"
134-
robolectric = "org.robolectric:robolectric:4.16"
141+
robolectric = "org.robolectric:robolectric:4.16.1"
135142
s2a-proto = "com.google.s2a.proto.v2:s2a-proto:0.1.3"
136143
signature-android = "net.sf.androidscents.signature:android-api-level-21:5.0.1_r2"
137144
signature-java = "org.codehaus.mojo.signature:java18:1.0"
138145
# 11.0.0+ require Java 17+
139146
# checkForUpdates: tomcat-embed-core:10.+
140-
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.50"
147+
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.52"
141148
# checkForUpdates: tomcat-embed-core9:9.+
142-
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.113"
149+
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.115"
143150
truth = "com.google.truth:truth:1.4.5"
144151
# checkForUpdates: undertow-servlet22:2.2.+
145152
undertow-servlet22 = "io.undertow:undertow-servlet:2.2.38.Final"

repositories.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1212
# GRPC_DEPS_START
1313
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1414
"com.google.android:annotations:4.1.1.4",
15-
"com.google.api.grpc:proto-google-common-protos:2.63.2",
16-
"com.google.auth:google-auth-library-credentials:1.41.0",
17-
"com.google.auth:google-auth-library-oauth2-http:1.41.0",
15+
"com.google.api.grpc:proto-google-common-protos:2.64.1",
16+
"com.google.auth:google-auth-library-credentials:1.42.1",
17+
"com.google.auth:google-auth-library-oauth2-http:1.42.1",
1818
"com.google.auto.value:auto-value-annotations:1.11.0",
1919
"com.google.auto.value:auto-value:1.11.0",
2020
"com.google.code.findbugs:jsr305:3.0.2",
2121
"com.google.code.gson:gson:2.13.2",
22-
"com.google.errorprone:error_prone_annotations:2.45.0",
22+
"com.google.errorprone:error_prone_annotations:2.48.0",
2323
"com.google.guava:failureaccess:1.0.1",
2424
"com.google.guava:guava:33.5.0-android",
2525
"com.google.re2j:re2j:1.8",
@@ -47,7 +47,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
4747
"junit:junit:4.13.2",
4848
"org.mockito:mockito-core:4.4.0",
4949
"org.checkerframework:checker-qual:3.49.5",
50-
"org.codehaus.mojo:animal-sniffer-annotations:1.26",
50+
"org.codehaus.mojo:animal-sniffer-annotations:1.27",
5151
]
5252
# GRPC_DEPS_END
5353

0 commit comments

Comments
 (0)