From f8baa9ca1dc02559686fe69bc5442c596597971c Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 10 Aug 2023 11:02:12 -0700 Subject: [PATCH] Upgrade protobuf-java and protoc to 3.24.0 --- examples/android/clientcache/app/build.gradle | 2 +- examples/android/helloworld/app/build.gradle | 2 +- examples/android/routeguide/app/build.gradle | 2 +- examples/android/strictmode/app/build.gradle | 2 +- examples/build.gradle | 2 +- examples/example-alts/build.gradle | 2 +- examples/example-debug/build.gradle | 2 +- examples/example-debug/pom.xml | 2 +- examples/example-gauth/build.gradle | 2 +- examples/example-gauth/pom.xml | 2 +- examples/example-gcp-observability/build.gradle | 2 +- examples/example-hostname/build.gradle | 2 +- examples/example-hostname/pom.xml | 2 +- examples/example-jwt-auth/build.gradle | 2 +- examples/example-jwt-auth/pom.xml | 4 ++-- examples/example-orca/build.gradle | 2 +- examples/example-reflection/build.gradle | 2 +- examples/example-servlet/build.gradle | 2 +- examples/example-tls/build.gradle | 2 +- examples/example-tls/pom.xml | 2 +- examples/example-xds/build.gradle | 2 +- examples/pom.xml | 4 ++-- gradle/libs.versions.toml | 2 +- repositories.bzl | 12 ++++++------ 24 files changed, 31 insertions(+), 31 deletions(-) diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle index 1a481266956..e2fead073a0 100644 --- a/examples/android/clientcache/app/build.gradle +++ b/examples/android/clientcache/app/build.gradle @@ -32,7 +32,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.23.4' } + protoc { artifact = 'com.google.protobuf:protoc:3.24.0' } plugins { grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle index 4cc2100d23c..0ec3da6410c 100644 --- a/examples/android/helloworld/app/build.gradle +++ b/examples/android/helloworld/app/build.gradle @@ -30,7 +30,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.23.4' } + protoc { artifact = 'com.google.protobuf:protoc:3.24.0' } plugins { grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/routeguide/app/build.gradle b/examples/android/routeguide/app/build.gradle index acadd301b51..92af8f3706d 100644 --- a/examples/android/routeguide/app/build.gradle +++ b/examples/android/routeguide/app/build.gradle @@ -30,7 +30,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.23.4' } + protoc { artifact = 'com.google.protobuf:protoc:3.24.0' } plugins { grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/android/strictmode/app/build.gradle b/examples/android/strictmode/app/build.gradle index e8eb82e1373..031140f16ce 100644 --- a/examples/android/strictmode/app/build.gradle +++ b/examples/android/strictmode/app/build.gradle @@ -31,7 +31,7 @@ android { } protobuf { - protoc { artifact = 'com.google.protobuf:protoc:3.23.4' } + protoc { artifact = 'com.google.protobuf:protoc:3.24.0' } plugins { grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION } diff --git a/examples/build.gradle b/examples/build.gradle index 79ac3074aaf..fb799b42eda 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -24,7 +24,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.23.4' +def protobufVersion = '3.24.0' def protocVersion = protobufVersion dependencies { diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 7830538a766..953e53a829c 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -26,7 +26,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.23.4' +def protocVersion = '3.24.0' dependencies { // grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub diff --git a/examples/example-debug/build.gradle b/examples/example-debug/build.gradle index 84463a0ed44..90922ab1f5e 100644 --- a/examples/example-debug/build.gradle +++ b/examples/example-debug/build.gradle @@ -26,7 +26,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.23.4' +def protobufVersion = '3.24.0' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-debug/pom.xml b/examples/example-debug/pom.xml index 95ac88c813f..71d085d1559 100644 --- a/examples/example-debug/pom.xml +++ b/examples/example-debug/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.58.0-SNAPSHOT - 3.23.4 + 3.24.0 1.8 1.8 diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index c2b23d41a90..2f1a0a8a3b1 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -26,7 +26,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.23.4' +def protobufVersion = '3.24.0' def protocVersion = protobufVersion diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index 3edbf030179..a92db60b1a9 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.58.0-SNAPSHOT - 3.23.4 + 3.24.0 1.8 1.8 diff --git a/examples/example-gcp-observability/build.gradle b/examples/example-gcp-observability/build.gradle index 67242246305..9df847277dd 100644 --- a/examples/example-gcp-observability/build.gradle +++ b/examples/example-gcp-observability/build.gradle @@ -27,7 +27,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.23.4' +def protocVersion = '3.24.0' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index bd60e8b77d2..e940e756801 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -24,7 +24,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.23.4' +def protobufVersion = '3.24.0' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-hostname/pom.xml b/examples/example-hostname/pom.xml index 1cec5319423..422bc6a554c 100644 --- a/examples/example-hostname/pom.xml +++ b/examples/example-hostname/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.58.0-SNAPSHOT - 3.23.4 + 3.24.0 1.8 1.8 diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index d6ebdb0f161..3964e0a6276 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -25,7 +25,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protobufVersion = '3.23.4' +def protobufVersion = '3.24.0' def protocVersion = protobufVersion dependencies { diff --git a/examples/example-jwt-auth/pom.xml b/examples/example-jwt-auth/pom.xml index 0ed7b4cc032..d955518a8cf 100644 --- a/examples/example-jwt-auth/pom.xml +++ b/examples/example-jwt-auth/pom.xml @@ -14,8 +14,8 @@ UTF-8 1.58.0-SNAPSHOT - 3.23.4 - 3.23.4 + 3.24.0 + 3.24.0 1.8 1.8 diff --git a/examples/example-orca/build.gradle b/examples/example-orca/build.gradle index 852403fe240..c32e5ca03b5 100644 --- a/examples/example-orca/build.gradle +++ b/examples/example-orca/build.gradle @@ -20,7 +20,7 @@ java { } def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.23.4' +def protocVersion = '3.24.0' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-reflection/build.gradle b/examples/example-reflection/build.gradle index c4499953827..2b9971981d5 100644 --- a/examples/example-reflection/build.gradle +++ b/examples/example-reflection/build.gradle @@ -20,7 +20,7 @@ java { } def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.23.4' +def protocVersion = '3.24.0' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-servlet/build.gradle b/examples/example-servlet/build.gradle index 1563a88633a..54e65ead77e 100644 --- a/examples/example-servlet/build.gradle +++ b/examples/example-servlet/build.gradle @@ -18,7 +18,7 @@ java { } def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.23.4' +def protocVersion = '3.24.0' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}", diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index ffa42d8bfe2..1144bf04c6c 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -26,7 +26,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.23.4' +def protocVersion = '3.24.0' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 371d3bce03f..cd0cb87d2a2 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.58.0-SNAPSHOT - 3.23.4 + 3.24.0 1.8 1.8 diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index 9222ce2d7fc..74175c2ba07 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -25,7 +25,7 @@ java { // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.58.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def protocVersion = '3.23.4' +def protocVersion = '3.24.0' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/pom.xml b/examples/pom.xml index 793604cd804..3563d599851 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -13,8 +13,8 @@ UTF-8 1.58.0-SNAPSHOT - 3.23.4 - 3.23.4 + 3.24.0 + 3.24.0 1.8 1.8 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5a248478f08..9ed986c9aa2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ netty = '4.1.93.Final' # SECURITY.md nettytcnative = '2.0.61.Final' opencensus = "0.31.1" -protobuf = "3.23.4" +protobuf = "3.24.0" [libraries] android-annotations = "com.google.android:annotations:4.1.1.4" diff --git a/repositories.bzl b/repositories.bzl index ce86fbd68c0..d9a383a3e89 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -143,18 +143,18 @@ def com_google_protobuf(): # This statement defines the @com_google_protobuf repo. http_archive( name = "com_google_protobuf", - sha256 = "ac3fd4e97af55405d8bfba43c22d8a7e464a371bb6bc9e706627b745c1022dbf", - strip_prefix = "protobuf-23.4", - urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protobuf-23.4.zip"], + sha256 = "5980276108f948e1ada091475549a8c75dc83c193129aab0e986ceaac3e97131", + strip_prefix = "protobuf-24.0", + urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v24.0/protobuf-24.0.zip"], ) def com_google_protobuf_javalite(): # java_lite_proto_library rules implicitly depend on @com_google_protobuf_javalite http_archive( name = "com_google_protobuf_javalite", - sha256 = "ac3fd4e97af55405d8bfba43c22d8a7e464a371bb6bc9e706627b745c1022dbf", - strip_prefix = "protobuf-23.4", - urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protobuf-23.4.zip"], + sha256 = "5980276108f948e1ada091475549a8c75dc83c193129aab0e986ceaac3e97131", + strip_prefix = "protobuf-24.0", + urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v24.0/protobuf-24.0.zip"], ) def io_grpc_grpc_proto():