Update third_party/protobuf to v3.19.4 (#28842)

* Update third_party/protobuf * run tools/distrib/python/make_grpcio_tools.py * update build_handwritten.yaml * regenerate projects
3 years ago · fc6f0277a4
parent e324bf5eee
commit fc6f0277a4
12 changed files with 15 additions and 15 deletions
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -213,11 +213,11 @@ def grpc_deps():
    if "com_google_protobuf" not in native.existing_rules():
        http_archive(
            name = "com_google_protobuf",
-            sha256 = "1f11c0cb85d5006da7032ac588f87e2e3eb28e9b095f81aba8956cb3635c8d4e",
-            strip_prefix = "protobuf-cb46755e6405e083b45481f5ea4754b180705529",
+            sha256 = "bab1685f92cc4ea5b6420026eef6c7973ae96fc21f4f1a3ee626dc6ca6d77c12",
+            strip_prefix = "protobuf-22d0e265de7d2b3d2e9a00d071313502e7d4cccf",
            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/cb46755e6405e083b45481f5ea4754b180705529.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/cb46755e6405e083b45481f5ea4754b180705529.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/22d0e265de7d2b3d2e9a00d071313502e7d4cccf.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/22d0e265de7d2b3d2e9a00d071313502e7d4cccf.tar.gz",
            ],
            patches = ["@com_github_grpc_grpc//third_party:protobuf.patch"],
            patch_args = ["-p1"],
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@ -15,7 +15,7 @@ settings:
  core_version: 22.0.0
  csharp_major_version: 2
  g_stands_for: gravity
-  protobuf_version: 3.19.2
+  protobuf_version: 3.19.4
  version: 1.45.0-dev
 targets:
 - name: check_epollexclusive
--- a/src/csharp/build/dependencies.props
+++ b/src/csharp/build/dependencies.props
@ -2,6 +2,6 @@
 <Project>
  <PropertyGroup>
    <GrpcCsharpVersion>2.45.0-dev</GrpcCsharpVersion>
-    <GoogleProtobufVersion>3.19.2</GoogleProtobufVersion>
+    <GoogleProtobufVersion>3.19.4</GoogleProtobufVersion>
  </PropertyGroup>
 </Project>
--- 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.19.2'
+  s.dependency '!ProtoCompiler', '3.19.4'
  # For the Protobuf dependency not to complain:
  s.ios.deployment_target = '9.0'
  s.osx.deployment_target = '10.10'
--- 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.19.2'
+  s.dependency '!ProtoCompiler', '3.19.4'
  # For the Protobuf dependency not to complain:
  s.ios.deployment_target = '9.0'
  s.osx.deployment_target = '10.10'
--- 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.19.2'
+  v = '3.19.4'
  s.version  = v
  s.summary  = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
  s.description = <<-DESC
--- a/third_party/protobuf
+++ b/third_party/protobuf
@ -1 +1 @@
-Subproject commit cb46755e6405e083b45481f5ea4754b180705529
+Subproject commit 22d0e265de7d2b3d2e9a00d071313502e7d4cccf
--- 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__ = '3.19.2'
+ __version__ = '3.19.4'
 +
 +if __name__ != '__main__':
 +  try:
--- 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.45.0.dev0'
-PROTOBUF_VERSION = '3.19.2'
+PROTOBUF_VERSION = '3.19.4'
--- 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.45.0.dev0'
-PROTOBUF_VERSION = '3.19.2'
+PROTOBUF_VERSION = '3.19.4'
--- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
@ -20,4 +20,4 @@ PROTO_FILES=['google/protobuf/wrappers.proto', 'google/protobuf/type.proto', 'go
 CC_INCLUDE='third_party/protobuf/src'
 PROTO_INCLUDE='third_party/protobuf/src'

-PROTOBUF_SUBMODULE_VERSION="cb46755e6405e083b45481f5ea4754b180705529"
+PROTOBUF_SUBMODULE_VERSION="22d0e265de7d2b3d2e9a00d071313502e7d4cccf"
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@ -36,7 +36,7 @@ third_party/googletest c9ccac7cb7345901884aabf5d1a786cfa6e2f397
 third_party/libuv 02a9e1be252b623ee032a3137c0b0c94afbe6809
 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
-third_party/protobuf cb46755e6405e083b45481f5ea4754b180705529
+third_party/protobuf 22d0e265de7d2b3d2e9a00d071313502e7d4cccf
 third_party/protoc-gen-validate 59da36e59fef2267fc2b1849a05159e3ecdf24f3
 third_party/re2 8e08f47b11b413302749c0d8b17a1c94777495d5
 third_party/xds cb28da3451f158a947dfc45090fe92b07b243bc1