diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index f64457d7b01..ee2a6ae8bc0 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -243,12 +243,12 @@ def grpc_deps(): if "com_google_protobuf" not in native.existing_rules(): http_archive( name = "com_google_protobuf", - sha256 = "1b46d45d9f5fff721a099bd6cd3be6717b8fa7ee3816a419f7d048ee55f9ae4c", - strip_prefix = "protobuf-54a2e5caa9d1a0a714fb2aa99753a1444414292a", + sha256 = "c580129f1db37f0ba8b80808b530593b89187b0d5573e9471396d0513aacfee4", + strip_prefix = "protobuf-0d22de520bf3fdb0978a962ae90b72db2f560cef", urls = [ - # https://github.com/protocolbuffers/protobuf/commits/v24.2 - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/54a2e5caa9d1a0a714fb2aa99753a1444414292a.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/54a2e5caa9d1a0a714fb2aa99753a1444414292a.tar.gz", + # https://github.com/protocolbuffers/protobuf/commits/v24.3 + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/0d22de520bf3fdb0978a962ae90b72db2f560cef.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/0d22de520bf3fdb0978a962ae90b72db2f560cef.tar.gz", ], patches = [ "@com_github_grpc_grpc//third_party:protobuf.patch", @@ -383,12 +383,12 @@ def grpc_deps(): if "upb" not in native.existing_rules(): http_archive( name = "upb", - sha256 = "af3f2651b8f27d92d086fc373af6194d4ba702e29e27cbc691fa8926561aa056", - strip_prefix = "upb-cc36926cffb00f0e8dd33bc9511c8e7354f09d0c", + sha256 = "5147e0ab6a28421d1e49004f4a205d84f06b924585e15eaa884cfe13289165b7", + strip_prefix = "upb-42cd08932e364a4cde35033b73f15c30250d7c2e", urls = [ # https://github.com/protocolbuffers/upb/commits/24.x - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/cc36926cffb00f0e8dd33bc9511c8e7354f09d0c.tar.gz", - "https://github.com/protocolbuffers/upb/archive/cc36926cffb00f0e8dd33bc9511c8e7354f09d0c.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/42cd08932e364a4cde35033b73f15c30250d7c2e.tar.gz", + "https://github.com/protocolbuffers/upb/archive/42cd08932e364a4cde35033b73f15c30250d7c2e.tar.gz", ], ) diff --git a/build_handwritten.yaml b/build_handwritten.yaml index 6e25dca06db..3d05d40fe1a 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -15,7 +15,7 @@ settings: core_version: 35.0.0 csharp_major_version: 2 g_stands_for: generative - protobuf_version: 3.24.2 + protobuf_version: 3.24.3 version: 1.59.0-dev configs: asan: diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props index 92af294c191..3c96516f2b2 100644 --- a/src/csharp/build/dependencies.props +++ b/src/csharp/build/dependencies.props @@ -2,6 +2,6 @@ 2.59.0-dev - 3.24.2 + 3.24.3 diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec index 4ab35f49124..a603ec74f8d 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.24.2' + s.dependency '!ProtoCompiler', '3.24.3' s.ios.deployment_target = '10.0' s.osx.deployment_target = '10.12' diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index b19fddca166..6e5e305d0a1 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.24.2' + s.dependency '!ProtoCompiler', '3.24.3' s.ios.deployment_target = '10.0' s.osx.deployment_target = '10.12' diff --git a/src/objective-c/!ProtoCompiler.podspec b/src/objective-c/!ProtoCompiler.podspec index 609d125c7a9..3644ca6580e 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.24.2' + v = '3.24.3' s.version = v s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files' s.description = <<-DESC diff --git a/third_party/protobuf b/third_party/protobuf index 54a2e5caa9d..0d22de520bf 160000 --- a/third_party/protobuf +++ b/third_party/protobuf @@ -1 +1 @@ -Subproject commit 54a2e5caa9d1a0a714fb2aa99753a1444414292a +Subproject commit 0d22de520bf3fdb0978a962ae90b72db2f560cef diff --git a/third_party/protobuf.patch b/third_party/protobuf.patch index dfe4078a7aa..1b870a305e9 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__ = '4.24.2' + __version__ = '4.24.3' + +if __name__ != '__main__': + try: diff --git a/third_party/upb b/third_party/upb index cc36926cffb..42cd08932e3 160000 --- a/third_party/upb +++ b/third_party/upb @@ -1 +1 @@ -Subproject commit cc36926cffb00f0e8dd33bc9511c8e7354f09d0c +Subproject commit 42cd08932e364a4cde35033b73f15c30250d7c2e diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py index cfdf5f71ccb..8466e040670 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.59.0.dev0' -PROTOBUF_VERSION = '3.24.2' +PROTOBUF_VERSION = '3.24.3' diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 0f7b5458b68..7f0b2a36d30 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.59.0.dev0' -PROTOBUF_VERSION = '3.24.2' +PROTOBUF_VERSION = '3.24.3' diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index e6d4e8849d1..d221cfb9734 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -315,4 +315,4 @@ CC_INCLUDES=[ ] PROTO_INCLUDE='third_party/protobuf/src' -PROTOBUF_SUBMODULE_VERSION="54a2e5caa9d1a0a714fb2aa99753a1444414292a" +PROTOBUF_SUBMODULE_VERSION="0d22de520bf3fdb0978a962ae90b72db2f560cef" diff --git a/tools/distrib/python/xds_protos/grpc_version.py b/tools/distrib/python/xds_protos/grpc_version.py index 10ffda07801..e20df66c447 100644 --- a/tools/distrib/python/xds_protos/grpc_version.py +++ b/tools/distrib/python/xds_protos/grpc_version.py @@ -15,4 +15,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! VERSION = '1.59.0.dev0' -PROTOBUF_VERSION = '3.24.2' +PROTOBUF_VERSION = '3.24.3' diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index d21a2cac2f4..84e958181be 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -35,10 +35,10 @@ third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92 third_party/googletest 0e402173c97aea7a00749e825b194bfede4f2e45 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df -third_party/protobuf 54a2e5caa9d1a0a714fb2aa99753a1444414292a +third_party/protobuf 0d22de520bf3fdb0978a962ae90b72db2f560cef third_party/protoc-gen-validate fab737efbb4b4d03e7c771393708f75594b121e4 third_party/re2 0c5616df9c0aaa44c9440d87422012423d91c7d1 -third_party/upb cc36926cffb00f0e8dd33bc9511c8e7354f09d0c +third_party/upb 42cd08932e364a4cde35033b73f15c30250d7c2e third_party/xds e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7 third_party/zlib 04f42ceca40f73e2978b50e93806c2a18c1281fc EOF