Skip to content

Commit 1993e68

Browse files
authoredNov 1, 2024··
Upgrade depedencies (#11655)
1 parent ef1fe87 commit 1993e68

File tree

12 files changed

+61
-45
lines changed

12 files changed

+61
-45
lines changed
 

‎MODULE.bazel

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ 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.29.0",
12-
"com.google.auth:google-auth-library-credentials:1.23.0",
13-
"com.google.auth:google-auth-library-oauth2-http:1.23.0",
11+
"com.google.api.grpc:proto-google-common-protos:2.48.0",
12+
"com.google.auth:google-auth-library-credentials:1.24.1",
13+
"com.google.auth:google-auth-library-oauth2-http:1.24.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.11.0",
18-
"com.google.errorprone:error_prone_annotations:2.28.0",
18+
"com.google.errorprone:error_prone_annotations:2.30.0",
1919
"com.google.guava:failureaccess:1.0.1",
20-
"com.google.guava:guava:33.2.1-android",
20+
"com.google.guava:guava:33.3.1-android",
2121
"com.google.re2j:re2j:1.7",
2222
"com.google.truth:truth:1.4.2",
2323
"com.squareup.okhttp:okhttp:2.7.5",

‎api/src/main/java/io/grpc/ClientCall.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
* manner, and notifies gRPC library to receive additional response after one is consumed by
6868
* a fictional <code>processResponse()</code>.
6969
*
70-
* <p><pre>
70+
* <pre>
7171
* call = channel.newCall(bidiStreamingMethod, callOptions);
7272
* listener = new ClientCall.Listener&lt;FooResponse&gt;() {
7373
* &#64;Override

‎api/src/main/java/io/grpc/LoadBalancer.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -1033,8 +1033,8 @@ public Subchannel createSubchannel(CreateSubchannelArgs args) {
10331033
}
10341034

10351035
/**
1036-
* Out-of-band channel for LoadBalancer’s own RPC needs, e.g., talking to an external
1037-
* load-balancer service.
1036+
* Create an out-of-band channel for the LoadBalancer’s own RPC needs, e.g., talking to an
1037+
* external load-balancer service.
10381038
*
10391039
* <p>The LoadBalancer is responsible for closing unused OOB channels, and closing all OOB
10401040
* channels within {@link #shutdown}.
@@ -1044,7 +1044,12 @@ public Subchannel createSubchannel(CreateSubchannelArgs args) {
10441044
public abstract ManagedChannel createOobChannel(EquivalentAddressGroup eag, String authority);
10451045

10461046
/**
1047-
* Accept a list of EAG for multiple authorities: https://github.com/grpc/grpc-java/issues/4618
1047+
* Create an out-of-band channel for the LoadBalancer's own RPC needs, e.g., talking to an
1048+
* external load-balancer service. This version of the method allows multiple EAGs, so different
1049+
* addresses can have different authorities.
1050+
*
1051+
* <p>The LoadBalancer is responsible for closing unused OOB channels, and closing all OOB
1052+
* channels within {@link #shutdown}.
10481053
* */
10491054
public ManagedChannel createOobChannel(List<EquivalentAddressGroup> eag,
10501055
String authority) {

‎core/src/test/java/io/grpc/internal/AbstractServerStreamTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void setUp() {
8585
}
8686

8787
/**
88-
* Test for issue https://github.com/grpc/grpc-java/issues/1795
88+
* Test for issue https://github.com/grpc/grpc-java/issues/1795 .
8989
*/
9090
@Test
9191
public void frameShouldBeIgnoredAfterDeframerClosed() {
@@ -212,7 +212,7 @@ public void closed(Status status) {
212212
}
213213

214214
/**
215-
* Test for issue https://github.com/grpc/grpc-java/issues/615
215+
* Test for issue https://github.com/grpc/grpc-java/issues/615 .
216216
*/
217217
@Test
218218
public void completeWithoutClose() {

‎core/src/testFixtures/java/io/grpc/internal/AbstractTransportTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ protected long fakeCurrentTimeNanos() {
269269
// (and maybe exceptions handled)
270270

271271
/**
272-
* Test for issue https://github.com/grpc/grpc-java/issues/1682
272+
* Test for issue https://github.com/grpc/grpc-java/issues/1682 .
273273
*/
274274
@Test
275275
public void frameAfterRstStreamShouldNotBreakClientChannel() throws Exception {

‎gcp-observability/src/test/java/io/grpc/gcp/observability/LoggingTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class LoggingTest {
7373
/**
7474
* Cloud logging test using global interceptors.
7575
*
76-
* <p> Ignoring test, because it calls external Cloud Logging APIs.
76+
* <p>Ignoring test, because it calls external Cloud Logging APIs.
7777
* To test cloud logging setup locally,
7878
* 1. Set up Cloud auth credentials
7979
* 2. Assign permissions to service account to write logs to project specified by

‎gradle/libs.versions.toml

+34-24
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,54 @@ protobuf = "3.25.5"
1010

1111
[libraries]
1212
android-annotations = "com.google.android:annotations:4.1.1.4"
13-
androidx-annotation = "androidx.annotation:annotation:1.8.0"
13+
androidx-annotation = "androidx.annotation:annotation:1.9.0"
1414
androidx-core = "androidx.core:core:1.13.1"
15-
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.8.3"
16-
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.8.3"
15+
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.8.6"
16+
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.8.6"
1717
androidx-test-core = "androidx.test:core:1.6.1"
1818
androidx-test-ext-junit = "androidx.test.ext:junit:1.2.1"
1919
androidx-test-rules = "androidx.test:rules:1.6.1"
2020
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.24"
2121
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.24"
22-
assertj-core = "org.assertj:assertj-core:3.26.0"
22+
assertj-core = "org.assertj:assertj-core:3.26.3"
2323
auto-value = "com.google.auto.value:auto-value:1.11.0"
2424
auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.11.0"
25-
checkstyle = "com.puppycrawl.tools:checkstyle:10.17.0"
25+
checkstyle = "com.puppycrawl.tools:checkstyle:10.19.0"
2626
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
2727
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
2828
cronet-api = "org.chromium.net:cronet-api:119.6045.31"
2929
cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31"
30-
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.28.0"
31-
errorprone-core = "com.google.errorprone:error_prone_core:2.28.0"
32-
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.41.0"
33-
google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.23.0"
34-
google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.23.0"
30+
# error-prone 2.31.0+ blocked on https://github.com/grpc/grpc-java/issues/10152
31+
# It breaks Bazel (ArrayIndexOutOfBoundsException in turbine) and Dexing ("D8:
32+
# java.lang.NullPointerException"). We can trivially upgrade the Bazel CI to
33+
# 6.3.0+ (https://github.com/bazelbuild/bazel/issues/18743).
34+
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.30.0"
35+
# error-prone 2.32.0+ require Java 17+
36+
errorprone-core = "com.google.errorprone:error_prone_core:2.31.0"
37+
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.48.0"
38+
# google-auth-library 1.25.0+ requires error_prone_annotations 2.31.0+, which
39+
# breaks the Android build
40+
google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.24.1"
41+
google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.24.1"
3542
# Release notes: https://cloud.google.com/logging/docs/release-notes
36-
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.19.0"
43+
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.20.6"
3744
gson = "com.google.code.gson:gson:2.11.0"
38-
guava = "com.google.guava:guava:33.2.1-android"
45+
guava = "com.google.guava:guava:33.3.1-android"
3946
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
40-
guava-testlib = "com.google.guava:guava-testlib:33.2.1-android"
47+
guava-testlib = "com.google.guava:guava-testlib:33.3.1-android"
4148
# JRE version is needed for projects where its a transitive dependency, f.e. gcp-observability.
4249
# May be different from the -android version.
43-
guava-jre = "com.google.guava:guava:33.2.1-jre"
50+
guava-jre = "com.google.guava:guava:33.3.1-jre"
4451
hdrhistogram = "org.hdrhistogram:HdrHistogram:2.2.2"
52+
# 6.0.0+ use java.lang.Deprecated forRemoval and since from Java 9
4553
jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:5.0.0"
4654
javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
4755
javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
48-
jetty-client = "org.eclipse.jetty:jetty-client:10.0.20"
49-
jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.22"
56+
# 12.0.0+ require Java 17+
57+
jetty-client = "org.eclipse.jetty:jetty-client:11.0.24"
58+
jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.24"
5059
jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.20"
51-
jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.22"
60+
jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.24"
5261
jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.20"
5362
jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
5463
junit = "junit:junit:4.13.2"
@@ -76,11 +85,11 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g
7685
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
7786
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
7887
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
79-
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.40.0"
80-
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.40.0-alpha"
81-
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.36.0-alpha"
82-
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.40.0"
83-
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.40.0"
88+
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.43.0"
89+
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.43.0-alpha"
90+
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.40.0-alpha"
91+
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.43.0"
92+
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.43.0"
8493
perfmark-api = "io.perfmark:perfmark-api:0.27.0"
8594
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
8695
protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf" }
@@ -90,11 +99,12 @@ re2j = "com.google.re2j:re2j:1.7"
9099
robolectric = "org.robolectric:robolectric:4.13"
91100
signature-android = "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4"
92101
signature-java = "org.codehaus.mojo.signature:java18:1.0"
93-
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.25"
102+
# 11.0.0+ require Java 17+
103+
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.31"
94104
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.89"
95105
truth = "com.google.truth:truth:1.4.4"
96106
undertow-servlet22 = "io.undertow:undertow-servlet:2.2.32.Final"
97-
undertow-servlet = "io.undertow:undertow-servlet:2.3.14.Final"
107+
undertow-servlet = "io.undertow:undertow-servlet:2.3.18.Final"
98108

99109
# Do not update: Pinned to the last version supporting Java 8.
100110
# See https://checkstyle.sourceforge.io/releasenotes.html#Release_10.1

‎inprocess/src/main/java/io/grpc/inprocess/InProcessTransport.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ public void close(Status status, Metadata trailers) {
606606
notifyClientClose(status, trailers);
607607
}
608608

609-
/** clientStream.serverClosed() must be called before this method */
609+
/** clientStream.serverClosed() must be called before this method. */
610610
private void notifyClientClose(Status status, Metadata trailers) {
611611
Status clientStatus = cleanStatus(status, includeCauseWithStatus);
612612
synchronized (this) {

‎interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
/**
134134
* Abstract base class for all GRPC transport tests.
135135
*
136-
* <p> New tests should avoid using Mockito to support running on AppEngine.</p>
136+
* <p>New tests should avoid using Mockito to support running on AppEngine.
137137
*/
138138
public abstract class AbstractInteropTest {
139139
private static Logger logger = Logger.getLogger(AbstractInteropTest.class.getName());

‎repositories.bzl

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ 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.29.0",
16-
"com.google.auth:google-auth-library-credentials:1.23.0",
17-
"com.google.auth:google-auth-library-oauth2-http:1.23.0",
15+
"com.google.api.grpc:proto-google-common-protos:2.48.0",
16+
"com.google.auth:google-auth-library-credentials:1.24.1",
17+
"com.google.auth:google-auth-library-oauth2-http:1.24.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.11.0",
22-
"com.google.errorprone:error_prone_annotations:2.28.0",
22+
"com.google.errorprone:error_prone_annotations:2.30.0",
2323
"com.google.guava:failureaccess:1.0.1",
24-
"com.google.guava:guava:33.2.1-android",
24+
"com.google.guava:guava:33.3.1-android",
2525
"com.google.re2j:re2j:1.7",
2626
"com.google.truth:truth:1.4.2",
2727
"com.squareup.okhttp:okhttp:2.7.5",

‎util/src/testFixtures/java/io/grpc/util/AbstractTestHelper.java

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
* To use it replace <br>
5656
* \@mock Helper mockHelper<br>
5757
* with<br>
58+
*
5859
* <p>Helper mockHelper = mock(Helper.class, delegatesTo(new TestHelper()));</p>
5960
* <br>
6061
* TestHelper will need to define accessors for the maps that information is store within as

‎xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3173,7 +3173,7 @@ public void canonifyResourceName() {
31733173

31743174
/**
31753175
* Tests compliance with RFC 3986 section 3.3
3176-
* https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
3176+
* https://datatracker.ietf.org/doc/html/rfc3986#section-3.3 .
31773177
*/
31783178
@Test
31793179
public void percentEncodePath() {

0 commit comments

Comments
 (0)
Please sign in to comment.