aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anderson <ejona@google.com>2023-08-10 11:02:12 -0700
committerEric Anderson <ejona@google.com>2023-08-14 09:20:39 -0700
commitf8baa9ca1dc02559686fe69bc5442c596597971c (patch)
tree40d0d00f8caed4365bc5542d4d175c9b1ddb3011
parentcebb4659a1b3b5d484749f4c488ddde470bcccc0 (diff)
downloadgrpc-grpc-java-f8baa9ca1dc02559686fe69bc5442c596597971c.tar.gz
Upgrade protobuf-java and protoc to 3.24.0
-rw-r--r--examples/android/clientcache/app/build.gradle2
-rw-r--r--examples/android/helloworld/app/build.gradle2
-rw-r--r--examples/android/routeguide/app/build.gradle2
-rw-r--r--examples/android/strictmode/app/build.gradle2
-rw-r--r--examples/build.gradle2
-rw-r--r--examples/example-alts/build.gradle2
-rw-r--r--examples/example-debug/build.gradle2
-rw-r--r--examples/example-debug/pom.xml2
-rw-r--r--examples/example-gauth/build.gradle2
-rw-r--r--examples/example-gauth/pom.xml2
-rw-r--r--examples/example-gcp-observability/build.gradle2
-rw-r--r--examples/example-hostname/build.gradle2
-rw-r--r--examples/example-hostname/pom.xml2
-rw-r--r--examples/example-jwt-auth/build.gradle2
-rw-r--r--examples/example-jwt-auth/pom.xml4
-rw-r--r--examples/example-orca/build.gradle2
-rw-r--r--examples/example-reflection/build.gradle2
-rw-r--r--examples/example-servlet/build.gradle2
-rw-r--r--examples/example-tls/build.gradle2
-rw-r--r--examples/example-tls/pom.xml2
-rw-r--r--examples/example-xds/build.gradle2
-rw-r--r--examples/pom.xml4
-rw-r--r--gradle/libs.versions.toml2
-rw-r--r--repositories.bzl12
24 files changed, 31 insertions, 31 deletions
diff --git a/examples/android/clientcache/app/build.gradle b/examples/android/clientcache/app/build.gradle
index 1a4812669..e2fead073 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 4cc2100d2..0ec3da641 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 acadd301b..92af8f370 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 e8eb82e13..031140f16 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 79ac3074a..fb799b42e 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 7830538a7..953e53a82 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 84463a0ed..90922ab1f 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 95ac88c81..71d085d15 100644
--- 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
index c2b23d41a..2f1a0a8a3 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 3edbf0301..a92db60b1 100644
--- 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
index 672422463..9df847277 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 bd60e8b77..e940e7568 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 1cec53194..422bc6a55 100644
--- 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
index d6ebdb0f1..3964e0a62 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 0ed7b4cc0..d955518a8 100644
--- 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
index 852403fe2..c32e5ca03 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 c44999538..2b9971981 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 1563a8863..54e65ead7 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 ffa42d8bf..1144bf04c 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 371d3bce0..cd0cb87d2 100644
--- 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
index 9222ce2d7..74175c2ba 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 793604cd8..3563d5998 100644
--- 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
index 5a248478f..9ed986c9a 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 ce86fbd68..d9a383a3e 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():