Update protobuf submodule to 3.21.5 (grpc#30548)

* Update third_party/protobuf * run tools/distrib/python/make_grpcio_tools.py * regenerate protos for ruby, php * update build_handwritten.yaml * regenerate projects
apenn-msft · Aug 10, 2022 · 27a9bde · 27a9bde
1 parent 07c4b40
commit 27a9bde
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 15 deletions.
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
@@ -208,11 +208,11 @@ def grpc_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "fc4e76d540ade9a3a45cc6baf6d7c60eae2a414e2a454529b97b5364b9141ea9",
-            strip_prefix = "protobuf-c9869dc7803eb0a21d7e589c40ff4f9288cd34ae",
+            sha256 = "6b6c30c00eacbc888414916c9784fd2159b5f4a7b7200d947a19dfdf70eef6ff",
+            strip_prefix = "protobuf-ab840345966d0fa8e7100d771c92a73bfbadd25c",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/c9869dc7803eb0a21d7e589c40ff4f9288cd34ae.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/c9869dc7803eb0a21d7e589c40ff4f9288cd34ae.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/ab840345966d0fa8e7100d771c92a73bfbadd25c.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/ab840345966d0fa8e7100d771c92a73bfbadd25c.tar.gz",
             ],
             patches = ["@com_github_grpc_grpc//third_party:protobuf.patch"],
             patch_args = ["-p1"],

diff --git a/build_handwritten.yaml b/build_handwritten.yaml
@@ -15,7 +15,7 @@ settings:
   core_version: 26.0.0
   csharp_major_version: 2
   g_stands_for: gamma
-  protobuf_version: 3.21.4
+  protobuf_version: 3.21.5
   version: 1.49.0-dev
 targets:
 - name: gen_hpack_tables

diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props
@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <GrpcCsharpVersion>2.49.0-dev</GrpcCsharpVersion>
-    <GoogleProtobufVersion>3.21.4</GoogleProtobufVersion>
+    <GoogleProtobufVersion>3.21.5</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
@@ -100,7 +100,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = plugin
 
   # Restrict the protoc version to the one supported by this plugin.
-  s.dependency '!ProtoCompiler', '3.21.4'
+  s.dependency '!ProtoCompiler', '3.21.5'
   # For the Protobuf dependency not to complain:
   s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'

diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@@ -102,7 +102,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = plugin
 
   # Restrict the protoc version to the one supported by this plugin.
-  s.dependency '!ProtoCompiler', '3.21.4'
+  s.dependency '!ProtoCompiler', '3.21.5'
   # For the Protobuf dependency not to complain:
   s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'

diff --git a/src/objective-c/!ProtoCompiler.podspec b/src/objective-c/!ProtoCompiler.podspec
@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
   # before them.
   s.name     = '!ProtoCompiler'
-  v = '3.21.4'
+  v = '3.21.5'
   s.version  = v
   s.summary  = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
   s.description = <<-DESC

diff --git a/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Messages.php b/src/php/tests/interop/GPBMetadata/Src/Proto/Grpc/Testing/Messages.php
diff --git a/src/php/tests/interop/Grpc/Testing/MemorySize.php b/src/php/tests/interop/Grpc/Testing/MemorySize.php
diff --git a/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb b/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb
diff --git a/src/ruby/qps/src/proto/grpc/testing/benchmark_service_services_pb.rb b/src/ruby/qps/src/proto/grpc/testing/benchmark_service_services_pb.rb
diff --git a/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb b/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb
diff --git a/third_party/protobuf b/third_party/protobuf
diff --git a/third_party/protobuf.patch b/third_party/protobuf.patch
@@ -5,7 +5,7 @@ index 97ac28028..8b7585d9d 100644
 @@ -31,3 +31,9 @@
  # Copyright 2007 Google Inc. All Rights Reserved.
 
- __version__ = '4.21.4'
+ __version__ = '4.21.5'
 +
 +if __name__ != '__main__':
 +  try:

diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py
@@ -15,4 +15,4 @@
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
 VERSION = '1.49.0.dev0'
-PROTOBUF_VERSION = '3.21.4'
+PROTOBUF_VERSION = '3.21.5'
diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -15,4 +15,4 @@
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
 VERSION = '1.49.0.dev0'
-PROTOBUF_VERSION = '3.21.4'
+PROTOBUF_VERSION = '3.21.5'
diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
@@ -20,4 +20,4 @@
 CC_INCLUDE='third_party/protobuf/src'
 PROTO_INCLUDE='third_party/protobuf/src'
 
-PROTOBUF_SUBMODULE_VERSION="c9869dc7803eb0a21d7e589c40ff4f9288cd34ae"
+PROTOBUF_SUBMODULE_VERSION="ab840345966d0fa8e7100d771c92a73bfbadd25c"
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
@@ -36,7 +36,7 @@ third_party/googletest 0e402173c97aea7a00749e825b194bfede4f2e45
 third_party/libuv 02a9e1be252b623ee032a3137c0b0c94afbe6809
 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
-third_party/protobuf c9869dc7803eb0a21d7e589c40ff4f9288cd34ae
+third_party/protobuf ab840345966d0fa8e7100d771c92a73bfbadd25c
 third_party/re2 8e08f47b11b413302749c0d8b17a1c94777495d5
 third_party/xds cb28da3451f158a947dfc45090fe92b07b243bc1
 third_party/zlib 21767c654d31d2dccdde4330529775c6c5fd5389
+16 −0		CHANGES.txt
+1 −1		Protobuf-C++.podspec
+1 −1		Protobuf.podspec
+1 −1		configure.ac
+1 −1		csharp/Google.Protobuf.Tools.nuspec
+1 −1		csharp/src/Google.Protobuf/Google.Protobuf.csproj
+3 −3		java/README.md
+1 −1		java/bom/pom.xml
+1 −1		java/core/pom.xml
+1 −1		java/kotlin-lite/pom.xml
+1 −1		java/kotlin/pom.xml
+1 −1		java/lite.md
+1 −1		java/lite/pom.xml
+1 −1		java/pom.xml
+1 −1		java/util/pom.xml
+41 −0		php/ext/google/protobuf/def.c
+19 −4		php/ext/google/protobuf/package.xml
+1 −1		php/ext/google/protobuf/protobuf.h
+18 −2		php/tests/DescriptorsTest.php
+1 −0		php/tests/GeneratedClassTest.php
+1 −0		php/tests/proto/test_descriptors.proto
+2 −0		php/tests/proto/test_php_namespace.proto
+2 −2		protobuf_deps.bzl
+3 −3		protobuf_version.bzl
+1 −1		protoc-artifacts/pom.xml
+1 −1		python/google/protobuf/__init__.py
+1 −1		ruby/google-protobuf.gemspec
+2 −2		ruby/pom.xml
+1 −1		src/Makefile.am
+1 −1		src/google/protobuf/any.pb.h
+1 −1		src/google/protobuf/api.pb.h
+25 −8		src/google/protobuf/compiler/php/php_generator.cc
+1 −1		src/google/protobuf/compiler/plugin.pb.h
+1 −1		src/google/protobuf/descriptor.pb.h
+1 −1		src/google/protobuf/duration.pb.h
+1 −1		src/google/protobuf/empty.pb.h
+1 −1		src/google/protobuf/field_mask.pb.h
+1 −1		src/google/protobuf/port_def.inc
+1 −1		src/google/protobuf/source_context.pb.h
+1 −1		src/google/protobuf/struct.pb.h
+1 −1		src/google/protobuf/stubs/common.h
+1 −1		src/google/protobuf/timestamp.pb.h
+1 −1		src/google/protobuf/type.pb.h
+1 −1		src/google/protobuf/wrappers.pb.h
+10 −10		version.json