grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump Protobuf to 3.21.7

This commit is contained in:
Eric Anderson 2022-09-30 09:23:26 -07:00
parent ba8cd04191
commit 85bdca45fa
20 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
COMPILING.md
View File

@ -44,11 +44,11 @@ This section is only necessary if you are making changes to the code
generation. Most users only need to use `skipCodegen=true` as discussed above. generation. Most users only need to use `skipCodegen=true` as discussed above.
### Build Protobuf ### Build Protobuf
The codegen plugin is C++ code and requires protobuf 3.21.1 or later. The codegen plugin is C++ code and requires protobuf 3.21.7 or later.
For Linux, Mac and MinGW: For Linux, Mac and MinGW:
``` ```
$ PROTOBUF_VERSION=3.21.1 $ PROTOBUF_VERSION=3.21.7
$ curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VERSION/protobuf-all-$PROTOBUF_VERSION.tar.gz $ curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VERSION/protobuf-all-$PROTOBUF_VERSION.tar.gz
$ tar xzf protobuf-all-$PROTOBUF_VERSION.tar.gz $ tar xzf protobuf-all-$PROTOBUF_VERSION.tar.gz
$ cd protobuf-$PROTOBUF_VERSION $ cd protobuf-$PROTOBUF_VERSION

2
examples/android/clientcache/app/build.gradle
View File

@ -32,7 +32,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.21.1' } protoc { artifact = 'com.google.protobuf:protoc:3.21.7' }
plugins { plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }

2
examples/android/helloworld/app/build.gradle
View File

@ -30,7 +30,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.21.1' } protoc { artifact = 'com.google.protobuf:protoc:3.21.7' }
plugins { plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }

2
examples/android/routeguide/app/build.gradle
View File

@ -30,7 +30,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.21.1' } protoc { artifact = 'com.google.protobuf:protoc:3.21.7' }
plugins { plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }

2
examples/android/strictmode/app/build.gradle
View File

@ -31,7 +31,7 @@ android {
} }
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.21.1' } protoc { artifact = 'com.google.protobuf:protoc:3.21.7' }
plugins { plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }

2
examples/build.gradle
View File

@ -23,7 +23,7 @@ targetCompatibility = 1.8
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.21.1' def protobufVersion = '3.21.7'
def protocVersion = protobufVersion def protocVersion = protobufVersion
dependencies { dependencies {

2
examples/example-alts/build.gradle
View File

@ -24,7 +24,7 @@ targetCompatibility = 1.8
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.21.1' def protocVersion = '3.21.7'
dependencies { dependencies {
// grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub // grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub

2
examples/example-gauth/build.gradle
View File

@ -24,7 +24,7 @@ targetCompatibility = 1.8
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.21.1' def protobufVersion = '3.21.7'
def protocVersion = protobufVersion def protocVersion = protobufVersion

2
examples/example-gauth/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.21.1</protobuf.version> <protobuf.version>3.21.7</protobuf.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>

2
examples/example-hostname/build.gradle
View File

@ -22,7 +22,7 @@ targetCompatibility = 1.8
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.21.1' def protobufVersion = '3.21.7'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-hostname/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.21.1</protoc.version> <protoc.version>3.21.7</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>

2
examples/example-jwt-auth/build.gradle
View File

@ -23,7 +23,7 @@ targetCompatibility = 1.8
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.21.1' def protobufVersion = '3.21.7'
def protocVersion = protobufVersion def protocVersion = protobufVersion
dependencies { dependencies {

4
examples/example-jwt-auth/pom.xml
View File

@ -14,8 +14,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.21.1</protobuf.version> <protobuf.version>3.21.7</protobuf.version>
<protoc.version>3.21.1</protoc.version> <protoc.version>3.21.7</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>

2
examples/example-orca/build.gradle
View File

@ -18,7 +18,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.21.1' def protocVersion = '3.21.7'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-tls/build.gradle
View File

@ -24,7 +24,7 @@ targetCompatibility = 1.8
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.21.1' def protocVersion = '3.21.7'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-tls/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.21.1</protoc.version> <protoc.version>3.21.7</protoc.version>
<netty.tcnative.version>2.0.54.Final</netty.tcnative.version> <netty.tcnative.version>2.0.54.Final</netty.tcnative.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>

2
examples/example-xds/build.gradle
View File

@ -24,7 +24,7 @@ targetCompatibility = 1.8
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.51.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def nettyTcNativeVersion = '2.0.31.Final' def nettyTcNativeVersion = '2.0.31.Final'
def protocVersion = '3.21.1' def protocVersion = '3.21.7'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

4
examples/pom.xml
View File

@ -13,8 +13,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.51.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.21.1</protobuf.version> <protobuf.version>3.21.7</protobuf.version>
<protoc.version>3.21.1</protoc.version> <protoc.version>3.21.7</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>

2
gradle/libs.versions.toml
View File

@ -8,7 +8,7 @@ guava = "31.1-android"
netty = '4.1.79.Final' netty = '4.1.79.Final'
nettytcnative = '2.0.54.Final' nettytcnative = '2.0.54.Final'
opencensus = "0.31.0" opencensus = "0.31.0"
protobuf = "3.21.1" protobuf = "3.21.7"
[libraries] [libraries]
android-annotations = "com.google.android:annotations:4.1.1.4" android-annotations = "com.google.android:annotations:4.1.1.4"

12
repositories.bzl
View File

@ -150,18 +150,18 @@ def com_google_protobuf():
# This statement defines the @com_google_protobuf repo. # This statement defines the @com_google_protobuf repo.
http_archive( http_archive(
name = "com_google_protobuf", name = "com_google_protobuf",
sha256 = "2d9084d3dd13b86ca2e811d2331f780eb86f6d7cb02b405426e3c80dcbfabf25", sha256 = "c72840a5081484c4ac20789ea5bb5d5de6bc7c477ad76e7109fda2bc4e630fe6",
strip_prefix = "protobuf-3.21.1", strip_prefix = "protobuf-3.21.7",
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.1.zip"], urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.7.zip"],
) )
def com_google_protobuf_javalite(): def com_google_protobuf_javalite():
# java_lite_proto_library rules implicitly depend on @com_google_protobuf_javalite # java_lite_proto_library rules implicitly depend on @com_google_protobuf_javalite
http_archive( http_archive(
name = "com_google_protobuf_javalite", name = "com_google_protobuf_javalite",
sha256 = "2d9084d3dd13b86ca2e811d2331f780eb86f6d7cb02b405426e3c80dcbfabf25", sha256 = "c72840a5081484c4ac20789ea5bb5d5de6bc7c477ad76e7109fda2bc4e630fe6",
strip_prefix = "protobuf-3.21.1", strip_prefix = "protobuf-3.21.7",
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.1.zip"], urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.7.zip"],
) )
def io_grpc_grpc_proto(): def io_grpc_grpc_proto():