diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 1f1fad9a236a5..a463d01bfc118 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -179,11 +179,11 @@ def grpc_deps(): if "com_google_protobuf" not in native.existing_rules(): http_archive( name = "com_google_protobuf", - sha256 = "09709ea1a25dc2f02e281e11f559dd979139ba2a1ddb24c489ea6bea9e3ad8bc", - strip_prefix = "protobuf-d7e943b8d2bc444a8c770644e73d090b486f8b37", + sha256 = "cf63d46ef743f4c30b0e36a562caf83cabed3f10e6ca49eb476913c4655394d5", + strip_prefix = "protobuf-436bd7880e458532901c58f4d9d1ea23fa7edd52", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/d7e943b8d2bc444a8c770644e73d090b486f8b37.tar.gz", - "https://github.com/google/protobuf/archive/d7e943b8d2bc444a8c770644e73d090b486f8b37.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/436bd7880e458532901c58f4d9d1ea23fa7edd52.tar.gz", + "https://github.com/google/protobuf/archive/436bd7880e458532901c58f4d9d1ea23fa7edd52.tar.gz", ], patches = ["@com_github_grpc_grpc//third_party:protobuf.patch"], patch_args = ["-p1"], diff --git a/build_handwritten.yaml b/build_handwritten.yaml index 20c70134712fe..8aac341e9255c 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -15,7 +15,7 @@ settings: core_version: 16.0.0 csharp_major_version: 2 g_stands_for: guadalupe_river_park_conservancy - protobuf_version: 3.15.2 + protobuf_version: 3.15.8 version: 1.38.0-dev targets: - name: check_epollexclusive diff --git a/src/cpp/Protobuf-C++.podspec b/src/cpp/Protobuf-C++.podspec index addc526bea2ed..7b239a6b2b0b1 100644 --- a/src/cpp/Protobuf-C++.podspec +++ b/src/cpp/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '3.15.2' + s.version = '3.15.8' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = '3-Clause BSD License' diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props index 897efdb21ebb3..0bc64a90e59b3 100644 --- a/src/csharp/build/dependencies.props +++ b/src/csharp/build/dependencies.props @@ -2,6 +2,6 @@ 2.38.0-dev - 3.15.2 + 3.15.8 diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec index ecdd76961f14b..b172cf8543d49 100644 --- 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.15.2' + s.dependency '!ProtoCompiler', '3.15.8' # 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 index e3ddd65e19c01..a810b01b1c2f7 100644 --- 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.15.2' + s.dependency '!ProtoCompiler', '3.15.8' # 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 index e6db8f7ac24a6..0a86fe7421e50 100644 --- 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.15.2' + v = '3.15.8' s.version = v s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files' s.description = <<-DESC diff --git a/src/ruby/bin/math_services_pb.rb b/src/ruby/bin/math_services_pb.rb index 961117ccfaf6b..c4b908fd0e7c6 100644 --- a/src/ruby/bin/math_services_pb.rb +++ b/src/ruby/bin/math_services_pb.rb @@ -23,7 +23,7 @@ module Math module Math class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode diff --git a/src/ruby/pb/grpc/health/v1/health_services_pb.rb b/src/ruby/pb/grpc/health/v1/health_services_pb.rb index 351e7e150a59e..9ddc0ac7a965f 100644 --- a/src/ruby/pb/grpc/health/v1/health_services_pb.rb +++ b/src/ruby/pb/grpc/health/v1/health_services_pb.rb @@ -28,7 +28,7 @@ module V1 module Health class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode diff --git a/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb b/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb index 19e6df7c72414..55837a6dcffcc 100644 --- a/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb +++ b/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb @@ -29,7 +29,7 @@ module TestService # performance with various types of payload. class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode @@ -70,7 +70,7 @@ module UnimplementedService # that case. class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode @@ -86,7 +86,7 @@ module ReconnectService # A service used to control reconnect server. class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode @@ -102,7 +102,7 @@ module LoadBalancerStatsService # A service used to obtain stats for verifying LB behavior. class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode @@ -120,7 +120,7 @@ module XdsUpdateHealthService # A service to remotely control health status of an xDS test server. class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode @@ -136,7 +136,7 @@ module XdsUpdateClientConfigureService # A service to dynamically update the configuration of an xDS test client. class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode 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 index 63e2d5d20fa04..9439fe5029354 100644 --- 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 @@ -26,7 +26,7 @@ module Testing module BenchmarkService class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode diff --git a/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_services_pb.rb b/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_services_pb.rb index 5e41cfeead190..5f50fb18fbf77 100644 --- a/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_services_pb.rb +++ b/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_services_pb.rb @@ -26,7 +26,7 @@ module Testing module ReportQpsScenarioService class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode diff --git a/src/ruby/qps/src/proto/grpc/testing/worker_service_services_pb.rb b/src/ruby/qps/src/proto/grpc/testing/worker_service_services_pb.rb index 049db477789c9..f5584c65d38cd 100644 --- a/src/ruby/qps/src/proto/grpc/testing/worker_service_services_pb.rb +++ b/src/ruby/qps/src/proto/grpc/testing/worker_service_services_pb.rb @@ -26,7 +26,7 @@ module Testing module WorkerService class Service - include GRPC::GenericService + include ::GRPC::GenericService self.marshal_class_method = :encode self.unmarshal_class_method = :decode diff --git a/third_party/protobuf b/third_party/protobuf index d7e943b8d2bc4..436bd7880e458 160000 --- a/third_party/protobuf +++ b/third_party/protobuf @@ -1 +1 @@ -Subproject commit d7e943b8d2bc444a8c770644e73d090b486f8b37 +Subproject commit 436bd7880e458532901c58f4d9d1ea23fa7edd52 diff --git a/third_party/protobuf.patch b/third_party/protobuf.patch index 79220868e4a9d..f7ff1dd667a60 100644 --- 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.15.2' + __version__ = '3.15.8' + +if __name__ != '__main__': + try: diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py index 8137d9684f01e..b0c68f777af84 100644 --- 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.38.0.dev0' -PROTOBUF_VERSION = '3.15.2' +PROTOBUF_VERSION = '3.15.8' diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 29e84cd27f8da..45bed0f5f989f 100644 --- 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.38.0.dev0' -PROTOBUF_VERSION = '3.15.2' +PROTOBUF_VERSION = '3.15.8' diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index abdd9a7d6dc84..66b5270e7d9bc 100644 --- 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="d7e943b8d2bc444a8c770644e73d090b486f8b37" +PROTOBUF_SUBMODULE_VERSION="436bd7880e458532901c58f4d9d1ea23fa7edd52" diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 09e36d1484a8c..530c5bf0406f3 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -36,7 +36,7 @@ third_party/googleapis 82944da21578a53b74e547774cf62ed31a05b841 third_party/googletest c9ccac7cb7345901884aabf5d1a786cfa6e2f397 third_party/libuv 15ae750151ac9341e5945eb38f8982d59fb99201 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89 -third_party/protobuf d7e943b8d2bc444a8c770644e73d090b486f8b37 +third_party/protobuf 436bd7880e458532901c58f4d9d1ea23fa7edd52 third_party/protoc-gen-validate 872b28c457822ed9c2a5405da3c33f386ac0e86f third_party/re2 aecba11114cf1fac5497aeb844b6966106de3eb6 third_party/udpa cc1b757b3eddccaaaf0743cbb107742bb7e3ee4f