Skip to content

Commit a977385

Browse files
ejona86ejona86
authoredJul 11, 2024··
Upgrade dependencies
The GSON upgrade slightly changed an error string, so the test was updated to be less of a change detector. Some OpenTelemetry dependencies are alpha versions, so needed an adjustment in build.gradle to accept the versions. Similarly, Undertow includes Final in its version numbers which needs to be accepted.
·
v1.71.0v1.66.0
1 parent 6dd6ca9 commit a977385

File tree

29 files changed

+124
-123
lines changed

29 files changed

+124
-123
lines changed
 

‎MODULE.bazel

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ module(
99
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1010
"com.google.android:annotations:4.1.1.4",
1111
"com.google.api.grpc:proto-google-common-protos:2.29.0",
12-
"com.google.auth:google-auth-library-credentials:1.22.0",
13-
"com.google.auth:google-auth-library-oauth2-http:1.22.0",
14-
"com.google.auto.value:auto-value-annotations:1.10.4",
15-
"com.google.auto.value:auto-value:1.10.4",
12+
"com.google.auth:google-auth-library-credentials:1.23.0",
13+
"com.google.auth:google-auth-library-oauth2-http:1.23.0",
14+
"com.google.auto.value:auto-value-annotations:1.11.0",
15+
"com.google.auto.value:auto-value:1.11.0",
1616
"com.google.code.findbugs:jsr305:3.0.2",
17-
"com.google.code.gson:gson:2.10.1",
18-
"com.google.errorprone:error_prone_annotations:2.23.0",
17+
"com.google.code.gson:gson:2.11.0",
18+
"com.google.errorprone:error_prone_annotations:2.28.0",
1919
"com.google.guava:failureaccess:1.0.1",
20-
"com.google.guava:guava:32.1.3-android",
20+
"com.google.guava:guava:33.2.1-android",
2121
"com.google.re2j:re2j:1.7",
22-
"com.google.truth:truth:1.1.5",
22+
"com.google.truth:truth:1.4.2",
2323
"com.squareup.okhttp:okhttp:2.7.5",
2424
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
2525
"io.netty:netty-buffer:4.1.100.Final",
@@ -38,10 +38,10 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
3838
"io.netty:netty-transport:4.1.100.Final",
3939
"io.opencensus:opencensus-api:0.31.0",
4040
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
41-
"io.perfmark:perfmark-api:0.26.0",
41+
"io.perfmark:perfmark-api:0.27.0",
4242
"junit:junit:4.13.2",
4343
"org.apache.tomcat:annotations-api:6.0.53",
44-
"org.codehaus.mojo:animal-sniffer-annotations:1.23",
44+
"org.codehaus.mojo:animal-sniffer-annotations:1.24",
4545
]
4646
# GRPC_DEPS_END
4747

‎authz/src/test/java/io/grpc/authz/AuthorizationPolicyTranslatorTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ public void invalidPolicy() throws Exception {
4545
AuthorizationPolicyTranslator.translate(policy);
4646
fail("exception expected");
4747
} catch (IOException ioe) {
48-
assertThat(ioe).hasMessageThat().isEqualTo(
49-
"Use JsonReader.setLenient(true) to accept malformed JSON"
50-
+ " at line 1 column 18 path $.name");
48+
assertThat(ioe).hasMessageThat().contains("malformed JSON");
49+
assertThat(ioe).hasMessageThat().contains("at line 1 column 18 path $.name");
5150
}
5251
}
5352

‎authz/src/test/java/io/grpc/authz/AuthorizationServerInterceptorTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ public void invalidPolicyFailsStaticAuthzInterceptorCreation() throws Exception
3535
AuthorizationServerInterceptor.create(policy);
3636
fail("exception expected");
3737
} catch (IOException ioe) {
38-
assertThat(ioe).hasMessageThat().isEqualTo(
39-
"Use JsonReader.setLenient(true) to accept malformed JSON"
40-
+ " at line 1 column 18 path $.name");
38+
assertThat(ioe).hasMessageThat().contains("malformed JSON");
39+
assertThat(ioe).hasMessageThat().contains("at line 1 column 18 path $.name");
4140
}
4241
}
4342

‎build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,14 @@ def isAcceptableVersion(ModuleComponentIdentifier candidate) {
474474
return true
475475
if (group == 'io.netty' && version.contains('Final'))
476476
return true
477+
if (group == 'io.undertow' && version.contains('Final'))
478+
return true
477479
if (module == 'android-api-level-19')
478480
return true
481+
if (module == 'opentelemetry-exporter-prometheus')
482+
return true
483+
if (module == 'opentelemetry-gcp-resources')
484+
return true
479485
return version ==~ /^[0-9]+(\.[0-9]+)+$/
480486
}
481487

‎buildSrc/src/main/java/io/grpc/gradle/CheckForUpdatesTask.java

+10-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@
2828
import org.gradle.api.artifacts.ModuleVersionIdentifier;
2929
import org.gradle.api.artifacts.VersionCatalog;
3030
import org.gradle.api.artifacts.VersionCatalogsExtension;
31+
import org.gradle.api.artifacts.result.DependencyResult;
3132
import org.gradle.api.artifacts.result.ResolvedComponentResult;
3233
import org.gradle.api.artifacts.result.ResolvedDependencyResult;
34+
import org.gradle.api.artifacts.result.UnresolvedDependencyResult;
3335
import org.gradle.api.provider.Provider;
3436
import org.gradle.api.tasks.Input;
3537
import org.gradle.api.tasks.Nested;
@@ -88,8 +90,14 @@ protected Set<Library> getLibraries() {
8890
public void checkForUpdates() {
8991
for (Library lib : libraries) {
9092
String name = lib.getName();
91-
ModuleVersionIdentifier oldId = ((ResolvedDependencyResult) lib.getOldResult().get()
92-
.getDependencies().iterator().next()).getSelected().getModuleVersion();
93+
DependencyResult oldResult = lib.getOldResult().get().getDependencies().iterator().next();
94+
if (oldResult instanceof UnresolvedDependencyResult) {
95+
System.out.println(String.format(
96+
"- Current version of libs.%s not resolved", name));
97+
continue;
98+
}
99+
ModuleVersionIdentifier oldId =
100+
((ResolvedDependencyResult) oldResult).getSelected().getModuleVersion();
93101
ModuleVersionIdentifier newId = ((ResolvedDependencyResult) lib.getNewResult().get()
94102
.getDependencies().iterator().next()).getSelected().getModuleVersion();
95103
if (oldId != newId) {

‎examples/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.1'
27+
def protobufVersion = '3.25.3'
2828
def protocVersion = protobufVersion
2929

3030
dependencies {

‎examples/example-alts/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ java {
2525
// Feel free to delete the comment at the next line. It is just for safely
2626
// updating the version in our release process.
2727
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
28-
def protocVersion = '3.25.1'
28+
def protocVersion = '3.25.3'
2929

3030
dependencies {
3131
// grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub

‎examples/example-debug/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ java {
2626
// Feel free to delete the comment at the next line. It is just for safely
2727
// updating the version in our release process.
2828
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
29-
def protobufVersion = '3.25.1'
29+
def protobufVersion = '3.25.3'
3030

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

‎examples/example-debug/pom.xml

+4-9
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.1</protoc.version>
16+
<protoc.version>3.25.3</protoc.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>
@@ -34,15 +34,15 @@
3434
<dependencies>
3535
<dependency>
3636
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-protobuf</artifactId>
37+
<artifactId>grpc-services</artifactId>
3838
</dependency>
3939
<dependency>
4040
<groupId>io.grpc</groupId>
41-
<artifactId>grpc-stub</artifactId>
41+
<artifactId>grpc-protobuf</artifactId>
4242
</dependency>
4343
<dependency>
4444
<groupId>io.grpc</groupId>
45-
<artifactId>grpc-services</artifactId>
45+
<artifactId>grpc-stub</artifactId>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.apache.tomcat</groupId>
@@ -55,11 +55,6 @@
5555
<artifactId>grpc-netty-shaded</artifactId>
5656
<scope>runtime</scope>
5757
</dependency>
58-
<dependency> <!-- prevent downgrade of version in protobuf-java-util from grpc-services -->
59-
<groupId>com.google.guava</groupId>
60-
<artifactId>guava</artifactId>
61-
<version>32.1.3-jre</version>
62-
</dependency>
6358
<dependency>
6459
<groupId>junit</groupId>
6560
<artifactId>junit</artifactId>

‎examples/example-gauth/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ java {
2525
// Feel free to delete the comment at the next line. It is just for safely
2626
// updating the version in our release process.
2727
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
28-
def protobufVersion = '3.25.1'
28+
def protobufVersion = '3.25.3'
2929
def protocVersion = protobufVersion
3030

3131

@@ -34,7 +34,7 @@ dependencies {
3434
implementation "io.grpc:grpc-stub:${grpcVersion}"
3535
implementation "io.grpc:grpc-auth:${grpcVersion}"
3636
compileOnly "org.apache.tomcat:annotations-api:6.0.53"
37-
implementation "com.google.auth:google-auth-library-oauth2-http:1.4.0"
37+
implementation "com.google.auth:google-auth-library-oauth2-http:1.23.0"
3838
implementation "com.google.api.grpc:grpc-google-cloud-pubsub-v1:0.1.24"
3939
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
4040
}

‎examples/example-gauth/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protobuf.version>3.25.1</protobuf.version>
16+
<protobuf.version>3.25.3</protobuf.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.google.auth</groupId>
6565
<artifactId>google-auth-library-oauth2-http</artifactId>
66-
<version>1.4.0</version>
66+
<version>1.23.0</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>com.google.api.grpc</groupId>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ java {
2626
// Feel free to delete the comment at the next line. It is just for safely
2727
// updating the version in our release process.
2828
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
29-
def protocVersion = '3.25.1'
30-
def openTelemetryVersion = '1.39.0'
31-
def openTelemetryPrometheusVersion = '1.39.0-alpha'
29+
def protocVersion = '3.25.3'
30+
def openTelemetryVersion = '1.40.0'
31+
def openTelemetryPrometheusVersion = '1.40.0-alpha'
3232

3333
dependencies {
3434
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ java {
2626
// Feel free to delete the comment at the next line. It is just for safely
2727
// updating the version in our release process.
2828
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
29-
def protocVersion = '3.25.1'
29+
def protocVersion = '3.25.3'
3030

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

‎examples/example-hostname/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.1'
27+
def protobufVersion = '3.25.3'
2828

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

‎examples/example-hostname/pom.xml

+4-9
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.1</protoc.version>
16+
<protoc.version>3.25.3</protoc.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>
@@ -34,15 +34,15 @@
3434
<dependencies>
3535
<dependency>
3636
<groupId>io.grpc</groupId>
37-
<artifactId>grpc-protobuf</artifactId>
37+
<artifactId>grpc-services</artifactId>
3838
</dependency>
3939
<dependency>
4040
<groupId>io.grpc</groupId>
41-
<artifactId>grpc-stub</artifactId>
41+
<artifactId>grpc-protobuf</artifactId>
4242
</dependency>
4343
<dependency>
4444
<groupId>io.grpc</groupId>
45-
<artifactId>grpc-services</artifactId>
45+
<artifactId>grpc-stub</artifactId>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.apache.tomcat</groupId>
@@ -55,11 +55,6 @@
5555
<artifactId>grpc-netty-shaded</artifactId>
5656
<scope>runtime</scope>
5757
</dependency>
58-
<dependency> <!-- prevent downgrade of version in protobuf-java-util from grpc-services -->
59-
<groupId>com.google.guava</groupId>
60-
<artifactId>guava</artifactId>
61-
<version>32.1.3-jre</version>
62-
</dependency>
6358
<dependency>
6459
<groupId>junit</groupId>
6560
<artifactId>junit</artifactId>

‎examples/example-jwt-auth/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.1'
27+
def protobufVersion = '3.25.3'
2828
def protocVersion = protobufVersion
2929

3030
dependencies {

‎examples/example-jwt-auth/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
17-
<protobuf.version>3.25.1</protobuf.version>
18-
<protoc.version>3.25.1</protoc.version>
17+
<protobuf.version>3.25.3</protobuf.version>
18+
<protoc.version>3.25.3</protoc.version>
1919
<!-- required for jdk9 -->
2020
<maven.compiler.source>1.8</maven.compiler.source>
2121
<maven.compiler.target>1.8</maven.compiler.target>

‎examples/example-oauth/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.1'
27+
def protobufVersion = '3.25.3'
2828
def protocVersion = protobufVersion
2929

3030
dependencies {
3131
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
3232
implementation "io.grpc:grpc-stub:${grpcVersion}"
3333
implementation "io.grpc:grpc-auth:${grpcVersion}"
34-
implementation "com.google.auth:google-auth-library-oauth2-http:1.18.0"
34+
implementation "com.google.auth:google-auth-library-oauth2-http:1.23.0"
3535

3636
compileOnly "org.apache.tomcat:annotations-api:6.0.53"
3737

‎examples/example-oauth/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
17-
<protobuf.version>3.25.1</protobuf.version>
18-
<protoc.version>3.25.1</protoc.version>
17+
<protobuf.version>3.25.3</protobuf.version>
18+
<protoc.version>3.25.3</protoc.version>
1919
<!-- required for jdk9 -->
2020
<maven.compiler.source>1.8</maven.compiler.source>
2121
<maven.compiler.target>1.8</maven.compiler.target>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>com.google.auth</groupId>
6262
<artifactId>google-auth-library-oauth2-http</artifactId>
63-
<version>1.18.0</version>
63+
<version>1.23.0</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.apache.tomcat</groupId>

‎examples/example-opentelemetry/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ java {
2525
// Feel free to delete the comment at the next line. It is just for safely
2626
// updating the version in our release process.
2727
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
28-
def protocVersion = '3.25.1'
29-
def openTelemetryVersion = '1.39.0'
30-
def openTelemetryPrometheusVersion = '1.39.0-alpha'
28+
def protocVersion = '3.25.3'
29+
def openTelemetryVersion = '1.40.0'
30+
def openTelemetryPrometheusVersion = '1.40.0-alpha'
3131

3232
dependencies {
3333
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

‎examples/example-orca/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ java {
1919
}
2020

2121
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
22-
def protocVersion = '3.25.1'
22+
def protocVersion = '3.25.3'
2323

2424
dependencies {
2525
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

‎examples/example-reflection/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ java {
1919
}
2020

2121
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
22-
def protocVersion = '3.25.1'
22+
def protocVersion = '3.25.3'
2323

2424
dependencies {
2525
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

‎examples/example-servlet/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ java {
1717
}
1818

1919
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
20-
def protocVersion = '3.25.1'
20+
def protocVersion = '3.25.3'
2121

2222
dependencies {
2323
implementation "io.grpc:grpc-protobuf:${grpcVersion}",

‎examples/example-tls/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ java {
2525
// Feel free to delete the comment at the next line. It is just for safely
2626
// updating the version in our release process.
2727
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
28-
def protocVersion = '3.25.1'
28+
def protocVersion = '3.25.3'
2929

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

‎examples/example-tls/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.1</protoc.version>
16+
<protoc.version>3.25.3</protoc.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>

‎examples/example-xds/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protocVersion = '3.25.1'
27+
def protocVersion = '3.25.3'
2828

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

‎examples/pom.xml

+6-11
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protobuf.version>3.25.1</protobuf.version>
17-
<protoc.version>3.25.1</protoc.version>
16+
<protobuf.version>3.25.3</protobuf.version>
17+
<protoc.version>3.25.3</protoc.version>
1818
<!-- required for JDK 8 -->
1919
<maven.compiler.source>1.8</maven.compiler.source>
2020
<maven.compiler.target>1.8</maven.compiler.target>
@@ -35,16 +35,16 @@
3535
<dependencies>
3636
<dependency>
3737
<groupId>io.grpc</groupId>
38-
<artifactId>grpc-netty-shaded</artifactId>
39-
<scope>runtime</scope>
38+
<artifactId>grpc-services</artifactId>
4039
</dependency>
4140
<dependency>
4241
<groupId>io.grpc</groupId>
43-
<artifactId>grpc-protobuf</artifactId>
42+
<artifactId>grpc-netty-shaded</artifactId>
43+
<scope>runtime</scope>
4444
</dependency>
4545
<dependency>
4646
<groupId>io.grpc</groupId>
47-
<artifactId>grpc-services</artifactId>
47+
<artifactId>grpc-protobuf</artifactId>
4848
</dependency>
4949
<dependency>
5050
<groupId>io.grpc</groupId>
@@ -55,11 +55,6 @@
5555
<artifactId>protobuf-java-util</artifactId>
5656
<version>${protobuf.version}</version>
5757
</dependency>
58-
<dependency>
59-
<groupId>com.google.guava</groupId>
60-
<artifactId>guava</artifactId>
61-
<version>32.1.3-jre</version> <!-- prevent downgrade of version in protobuf-java-util -->
62-
</dependency>
6358
<dependency>
6459
<groupId>org.apache.tomcat</groupId>
6560
<artifactId>annotations-api</artifactId>

‎gradle/libs.versions.toml

+41-37
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,60 @@
11
[versions]
2-
googleauth = "1.22.0"
32
netty = '4.1.100.Final'
43
# Keep the following references of tcnative version in sync whenever it's updated:
54
# SECURITY.md
65
nettytcnative = '2.0.61.Final'
76
opencensus = "0.31.1"
8-
protobuf = "3.25.1"
7+
# Not upgrading to 4.x as it is not yet ABI compatible.
8+
# https://github.com/protocolbuffers/protobuf/issues/17247
9+
protobuf = "3.25.3"
910

1011
[libraries]
1112
android-annotations = "com.google.android:annotations:4.1.1.4"
12-
androidx-annotation = "androidx.annotation:annotation:1.7.0"
13-
androidx-core = "androidx.core:core:1.12.0"
14-
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.6.2"
15-
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.6.2"
16-
androidx-test-core = "androidx.test:core:1.5.0"
17-
androidx-test-ext-junit = "androidx.test.ext:junit:1.1.5"
18-
androidx-test-rules = "androidx.test:rules:1.5.0"
19-
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.23"
20-
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.23"
21-
assertj-core = "org.assertj:assertj-core:3.24.2"
22-
auto-value = "com.google.auto.value:auto-value:1.10.4"
23-
auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.10.4"
13+
androidx-annotation = "androidx.annotation:annotation:1.8.0"
14+
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"
17+
androidx-test-core = "androidx.test:core:1.6.1"
18+
androidx-test-ext-junit = "androidx.test.ext:junit:1.2.1"
19+
androidx-test-rules = "androidx.test:rules:1.6.1"
20+
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.24"
21+
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.24"
22+
assertj-core = "org.assertj:assertj-core:3.26.0"
23+
auto-value = "com.google.auto.value:auto-value:1.11.0"
24+
auto-value-annotations = "com.google.auto.value:auto-value-annotations:1.11.0"
2425
checkstyle = "com.puppycrawl.tools:checkstyle:10.17.0"
2526
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
2627
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
2728
cronet-api = "org.chromium.net:cronet-api:119.6045.31"
2829
cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31"
29-
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.23.0"
30+
errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.28.0"
3031
errorprone-core = "com.google.errorprone:error_prone_core:2.23.0"
31-
google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.29.0"
32-
google-auth-credentials = { module = "com.google.auth:google-auth-library-credentials", version.ref = "googleauth" }
33-
google-auth-oauth2Http = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "googleauth" }
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"
3435
# Release notes: https://cloud.google.com/logging/docs/release-notes
35-
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.15.14"
36-
gson = "com.google.code.gson:gson:2.10.1"
37-
guava = "com.google.guava:guava:32.1.3-android"
36+
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.19.0"
37+
gson = "com.google.code.gson:gson:2.11.0"
38+
guava = "com.google.guava:guava:33.2.1-android"
3839
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
39-
guava-testlib = "com.google.guava:guava-testlib:32.1.3-android"
40+
guava-testlib = "com.google.guava:guava-testlib:33.2.1-android"
4041
# JRE version is needed for projects where its a transitive dependency, f.e. gcp-observability.
4142
# May be different from the -android version.
42-
guava-jre = "com.google.guava:guava:32.1.3-jre"
43-
hdrhistogram = "org.hdrhistogram:HdrHistogram:2.1.12"
44-
j2objc-annotations = " com.google.j2objc:j2objc-annotations:2.8"
43+
guava-jre = "com.google.guava:guava:33.2.1-jre"
44+
hdrhistogram = "org.hdrhistogram:HdrHistogram:2.2.2"
45+
j2objc-annotations = " com.google.j2objc:j2objc-annotations:3.0.0"
4546
jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:5.0.0"
4647
javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
4748
javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
4849
jetty-client = "org.eclipse.jetty:jetty-client:10.0.20"
49-
jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.20"
50+
jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.22"
5051
jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.20"
51-
jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.20"
52+
jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.22"
5253
jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.20"
5354
jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
5455
junit = "junit:junit:4.13.2"
55-
lincheck = "org.jetbrains.kotlinx:lincheck:2.14.1"
56+
# 2.17+ require Java 11+ (not mentioned in release notes)
57+
lincheck = "org.jetbrains.kotlinx:lincheck:2.16"
5658
# Update notes / 2023-07-19 sergiitk:
5759
# Couldn't update to 5.4.0, updated to the last in 4.x line. Version 5.x breaks some tests.
5860
# Error log: https://github.com/grpc/grpc-java/pull/10359#issuecomment-1632834435
@@ -75,25 +77,27 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g
7577
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
7678
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
7779
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
78-
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.39.0"
79-
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.39.0-alpha"
80+
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.40.0"
81+
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.40.0-alpha"
8082
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.36.0-alpha"
81-
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.39.0"
82-
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.39.0"
83-
perfmark-api = "io.perfmark:perfmark-api:0.26.0"
83+
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.40.0"
84+
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.40.0"
85+
perfmark-api = "io.perfmark:perfmark-api:0.27.0"
8486
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
8587
protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf" }
8688
protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf" }
8789
protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
8890
re2j = "com.google.re2j:re2j:1.7"
89-
robolectric = "org.robolectric:robolectric:4.11.1"
91+
robolectric = "org.robolectric:robolectric:4.13"
9092
signature-android = "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4"
9193
signature-java = "org.codehaus.mojo.signature:java18:1.0"
92-
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.23"
94+
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.25"
9395
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.89"
94-
truth = "com.google.truth:truth:1.1.5"
96+
# 1.4.3+ causes "unknown enum constant ElementType.MODULE" warning.
97+
# https://github.com/google/truth/issues/1320
98+
truth = "com.google.truth:truth:1.4.2"
9599
undertow-servlet = "io.undertow:undertow-servlet:2.2.32.Final"
96-
undertow-servlet-jakartaee9 = "io.undertow:undertow-servlet:2.3.13.Final"
100+
undertow-servlet-jakartaee9 = "io.undertow:undertow-servlet:2.3.14.Final"
97101

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

‎repositories.bzl

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1313
IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1414
"com.google.android:annotations:4.1.1.4",
1515
"com.google.api.grpc:proto-google-common-protos:2.29.0",
16-
"com.google.auth:google-auth-library-credentials:1.22.0",
17-
"com.google.auth:google-auth-library-oauth2-http:1.22.0",
18-
"com.google.auto.value:auto-value-annotations:1.10.4",
19-
"com.google.auto.value:auto-value:1.10.4",
16+
"com.google.auth:google-auth-library-credentials:1.23.0",
17+
"com.google.auth:google-auth-library-oauth2-http:1.23.0",
18+
"com.google.auto.value:auto-value-annotations:1.11.0",
19+
"com.google.auto.value:auto-value:1.11.0",
2020
"com.google.code.findbugs:jsr305:3.0.2",
21-
"com.google.code.gson:gson:2.10.1",
22-
"com.google.errorprone:error_prone_annotations:2.23.0",
21+
"com.google.code.gson:gson:2.11.0",
22+
"com.google.errorprone:error_prone_annotations:2.28.0",
2323
"com.google.guava:failureaccess:1.0.1",
24-
"com.google.guava:guava:32.1.3-android",
24+
"com.google.guava:guava:33.2.1-android",
2525
"com.google.re2j:re2j:1.7",
26-
"com.google.truth:truth:1.1.5",
26+
"com.google.truth:truth:1.4.2",
2727
"com.squareup.okhttp:okhttp:2.7.5",
2828
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
2929
"io.netty:netty-buffer:4.1.100.Final",
@@ -42,10 +42,10 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
4242
"io.netty:netty-transport:4.1.100.Final",
4343
"io.opencensus:opencensus-api:0.31.0",
4444
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
45-
"io.perfmark:perfmark-api:0.26.0",
45+
"io.perfmark:perfmark-api:0.27.0",
4646
"junit:junit:4.13.2",
4747
"org.apache.tomcat:annotations-api:6.0.53",
48-
"org.codehaus.mojo:animal-sniffer-annotations:1.23",
48+
"org.codehaus.mojo:animal-sniffer-annotations:1.24",
4949
]
5050
# GRPC_DEPS_END
5151

0 commit comments

Comments
 (0)
Please sign in to comment.