Upgrade protobuf-java and protoc to 3.24.0

grpc · Aug 14, 2023 · f8baa9c · f8baa9c
1 parent cebb465
commit f8baa9c
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.58.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protoc.version>3.23.4</protoc.version>
+    <protoc.version>3.24.0</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>

diff --git 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
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.58.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protobuf.version>3.23.4</protobuf.version>
+    <protobuf.version>3.24.0</protobuf.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>

diff --git 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
@@ -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
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.58.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protoc.version>3.23.4</protoc.version>
+    <protoc.version>3.24.0</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>

diff --git 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
@@ -14,8 +14,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.58.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protobuf.version>3.23.4</protobuf.version>
-    <protoc.version>3.23.4</protoc.version>
+    <protobuf.version>3.24.0</protobuf.version>
+    <protoc.version>3.24.0</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.58.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protoc.version>3.23.4</protoc.version>
+    <protoc.version>3.24.0</protoc.version>
     <!-- required for jdk9 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>

diff --git 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
@@ -13,8 +13,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.58.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
-    <protobuf.version>3.23.4</protobuf.version>
-    <protoc.version>3.23.4</protoc.version>
+    <protobuf.version>3.24.0</protobuf.version>
+    <protoc.version>3.24.0</protoc.version>
     <!-- required for JDK 8 -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>

diff --git 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
@@ -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():