Skip to content

Commit 19c579e

Browse files
committed
Bump versions of dependencies (#12252)
Notably, protobuf to 3.25.8, opentelemetry to 1.52.0. Protobuf in Bazel has 25.5 in the BCR and it seems better to align the WORKSPACE with that version. But we can't actually use 25.5 in BCR because it is incompatible with Bazel 7.
1 parent d947c80 commit 19c579e

File tree

28 files changed

+53
-51
lines changed

28 files changed

+53
-51
lines changed

MODULE.bazel

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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.51.0",
11+
"com.google.api.grpc:proto-google-common-protos:2.59.2",
1212
"com.google.auth:google-auth-library-credentials:1.24.1",
1313
"com.google.auth:google-auth-library-oauth2-http:1.24.1",
1414
"com.google.auto.value:auto-value-annotations:1.11.0",
@@ -19,7 +19,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1919
"com.google.guava:failureaccess:1.0.1",
2020
"com.google.guava:guava:33.3.1-android",
2121
"com.google.re2j:re2j:1.8",
22-
"com.google.s2a.proto.v2:s2a-proto:0.1.1",
22+
"com.google.s2a.proto.v2:s2a-proto:0.1.2",
2323
"com.google.truth:truth:1.4.2",
2424
"com.squareup.okhttp:okhttp:2.7.5",
2525
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
@@ -50,7 +50,8 @@ bazel_dep(name = "bazel_jar_jar", version = "0.1.7")
5050
bazel_dep(name = "bazel_skylib", version = "1.7.1")
5151
bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5")
5252
bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58")
53-
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")
53+
# Protobuf 25.5+ is incompatible with Bazel 7 with bzlmod
54+
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "24.4")
5455
bazel_dep(name = "rules_cc", version = "0.0.9")
5556
bazel_dep(name = "rules_java", version = "5.3.5")
5657
bazel_dep(name = "rules_jvm_external", version = "6.0")

examples/MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
bazel_dep(name = "googleapis", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5")
21
bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java", version = "1.75.0-SNAPSHOT") # CURRENT_GRPC_VERSION
32
bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58")
43
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")

examples/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ java {
2222
// Feel free to delete the comment at the next line. It is just for safely
2323
// updating the version in our release process.
2424
def grpcVersion = '1.75.0-SNAPSHOT' // CURRENT_GRPC_VERSION
25-
def protobufVersion = '3.25.5'
25+
def protobufVersion = '3.25.8'
2626
def protocVersion = protobufVersion
2727

2828
dependencies {

examples/example-alts/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ java {
2222
// Feel free to delete the comment at the next line. It is just for safely
2323
// updating the version in our release process.
2424
def grpcVersion = '1.75.0-SNAPSHOT' // CURRENT_GRPC_VERSION
25-
def protocVersion = '3.25.5'
25+
def protocVersion = '3.25.8'
2626

2727
dependencies {
2828
// grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub

examples/example-debug/build.gradle

Lines changed: 1 addition & 1 deletion
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.75.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.5'
27+
def protobufVersion = '3.25.8'
2828

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

examples/example-debug/pom.xml

Lines changed: 1 addition & 1 deletion
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.75.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.5</protoc.version>
16+
<protoc.version>3.25.8</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-dualstack/build.gradle

Lines changed: 1 addition & 1 deletion
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.75.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.5'
27+
def protobufVersion = '3.25.8'
2828

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

examples/example-dualstack/pom.xml

Lines changed: 1 addition & 1 deletion
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.75.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.5</protoc.version>
16+
<protoc.version>3.25.8</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-gauth/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ java {
2222
// Feel free to delete the comment at the next line. It is just for safely
2323
// updating the version in our release process.
2424
def grpcVersion = '1.75.0-SNAPSHOT' // CURRENT_GRPC_VERSION
25-
def protobufVersion = '3.25.5'
25+
def protobufVersion = '3.25.8'
2626
def protocVersion = protobufVersion
2727

2828

examples/example-gauth/pom.xml

Lines changed: 1 addition & 1 deletion
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.75.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protobuf.version>3.25.5</protobuf.version>
16+
<protobuf.version>3.25.8</protobuf.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>

0 commit comments

Comments
 (0)