Update protobuf to v21.6 (#31015)

* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* update build_handwritten.yaml

* regenerate projects

* Update Python version floor

bazel/grpc_deps.bzl

@@ -218,11 +218,11 @@ def grpc_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "6b6c30c00eacbc888414916c9784fd2159b5f4a7b7200d947a19dfdf70eef6ff",
-            strip_prefix = "protobuf-ab840345966d0fa8e7100d771c92a73bfbadd25c",
+            sha256 = "63c5539a8506dc6bccd352a857cea106e0a389ce047a3ff0a78fe3f8fede410d",
+            strip_prefix = "protobuf-24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/ab840345966d0fa8e7100d771c92a73bfbadd25c.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/ab840345966d0fa8e7100d771c92a73bfbadd25c.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb.tar.gz",
             ],
             patches = ["@com_github_grpc_grpc//third_party:protobuf.patch"],
             patch_args = ["-p1"],

build_handwritten.yaml

@@ -15,7 +15,7 @@ settings:
   core_version: 27.0.0
   csharp_major_version: 2
   g_stands_for: galley
-  protobuf_version: 3.21.5
+  protobuf_version: 3.21.6
   version: 1.50.0-dev
 configs:
   asan:

src/csharp/build/dependencies.props

@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <GrpcCsharpVersion>2.50.0-dev</GrpcCsharpVersion>
-    <GoogleProtobufVersion>3.21.5</GoogleProtobufVersion>
+    <GoogleProtobufVersion>3.21.6</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>

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.5'
+  s.dependency '!ProtoCompiler', '3.21.6'
   # For the Protobuf dependency not to complain:
   s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'

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.5'
+  s.dependency '!ProtoCompiler', '3.21.6'
   # For the Protobuf dependency not to complain:
   s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'

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.5'
+  v = '3.21.6'
   s.version  = v
   s.summary  = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
   s.description = <<-DESC

src/python/grpcio_channelz/setup.py

@@ -64,7 +64,7 @@ PACKAGE_DIRECTORIES = {
 }
 
 INSTALL_REQUIRES = (
-    'protobuf>=4.21.3',
+    'protobuf>=4.21.6',
     'grpcio>={version}'.format(version=grpc_version.VERSION),
 )
 

src/python/grpcio_csds/setup.py

@@ -39,7 +39,7 @@ PACKAGE_DIRECTORIES = {
 }
 
 INSTALL_REQUIRES = (
-    'protobuf>=4.21.3',
+    'protobuf>=4.21.6',
     'xds-protos>=0.0.7',
     'grpcio>={version}'.format(version=grpc_version.VERSION),
 )

src/python/grpcio_health_checking/setup.py

@@ -63,7 +63,7 @@ PACKAGE_DIRECTORIES = {
 }
 
 INSTALL_REQUIRES = (
-    'protobuf>=4.21.3',
+    'protobuf>=4.21.6',
     'grpcio>={version}'.format(version=grpc_version.VERSION),
 )
 

src/python/grpcio_reflection/setup.py

@@ -64,7 +64,7 @@ PACKAGE_DIRECTORIES = {
 }
 
 INSTALL_REQUIRES = (
-    'protobuf>=4.21.3',
+    'protobuf>=4.21.6',
     'grpcio>={version}'.format(version=grpc_version.VERSION),
 )
 

src/python/grpcio_status/setup.py

@@ -63,7 +63,7 @@ PACKAGE_DIRECTORIES = {
 }
 
 INSTALL_REQUIRES = (
-    'protobuf>=4.21.3',
+    'protobuf>=4.21.6',
     'grpcio>={version}'.format(version=grpc_version.VERSION),
     'googleapis-common-protos>=1.5.5',
 )

src/python/grpcio_testing/setup.py

@@ -49,7 +49,7 @@ PACKAGE_DIRECTORIES = {
 }
 
 INSTALL_REQUIRES = (
-    'protobuf>=4.21.3',
+    'protobuf>=4.21.6',
     'grpcio>={version}'.format(version=grpc_version.VERSION),
 )
 

src/python/grpcio_tests/setup.py

@@ -42,7 +42,7 @@ INSTALL_REQUIRES = (
     'grpcio-status>={version}'.format(version=grpc_version.VERSION),
     'grpcio-tools>={version}'.format(version=grpc_version.VERSION),
     'grpcio-health-checking>={version}'.format(version=grpc_version.VERSION),
-    'oauth2client>=1.4.7', 'protobuf>=4.21.3', 'six>=1.10',
+    'oauth2client>=1.4.7', 'protobuf>=4.21.6', 'six>=1.10',
     'google-auth>=1.17.2', 'requests>=2.14.2')
 
 if not PY3:

third_party/protobuf

@@ -1 +1 @@
-Subproject commit ab840345966d0fa8e7100d771c92a73bfbadd25c
+Subproject commit 24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb

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.5'
+ __version__ = '4.21.6'
 +
 +if __name__ != '__main__':
 +  try:

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.50.0.dev0'
-PROTOBUF_VERSION = '3.21.5'
+PROTOBUF_VERSION = '3.21.6'

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.50.0.dev0'
-PROTOBUF_VERSION = '3.21.5'
+PROTOBUF_VERSION = '3.21.6'

tools/distrib/python/grpcio_tools/setup.py

@@ -290,7 +290,7 @@ setuptools.setup(name='grpcio-tools',
                  packages=setuptools.find_packages('.'),
                  python_requires='>=3.7',
                  install_requires=[
-                     'protobuf>=4.21.3,<5.0dev',
+                     'protobuf>=4.21.6,<5.0dev',
                      'grpcio>={version}'.format(version=grpc_version.VERSION),
                      'setuptools',
                  ],

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 ab840345966d0fa8e7100d771c92a73bfbadd25c
+third_party/protobuf 24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb
 third_party/re2 8e08f47b11b413302749c0d8b17a1c94777495d5
 third_party/xds cb28da3451f158a947dfc45090fe92b07b243bc1
 third_party/zlib 21767c654d31d2dccdde4330529775c6c5fd5389