[Deps] Update protobuf & upb to 3.25.1 (grpc#35315)

On top of grpc#35285, upb is also upgraded in this PR. Closes grpc#35315 PiperOrigin-RevId: 592672254
ctiller · Dec 20, 2023 · 769b274 · 769b274
1 parent 2d7b751
commit 769b274
Show file tree

Hide file tree

Showing 26 changed files with 21 additions and 463 deletions.
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
@@ -258,12 +258,12 @@ def grpc_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "7ed5fc41fe1614e551025f8e14b79b026a015b3ed337d38920c586f3ea35d818",
-            strip_prefix = "protobuf-6b5d8db01fe47478e8d400f550e797e6230d464e",
+            sha256 = "70f480fe9cb0c6829dbf6be3c388103313aacb65de667b86d981bbc9eaedb905",
+            strip_prefix = "protobuf-7f94235e552599141950d7a4a3eaf93bc87d1b22",
             urls = [
                 # https://github.com/protocolbuffers/protobuf/commits/v25.0
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/6b5d8db01fe47478e8d400f550e797e6230d464e.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/6b5d8db01fe47478e8d400f550e797e6230d464e.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/7f94235e552599141950d7a4a3eaf93bc87d1b22.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/7f94235e552599141950d7a4a3eaf93bc87d1b22.tar.gz",
             ],
             patches = [
                 "@com_github_grpc_grpc//third_party:protobuf.patch",

diff --git a/build_handwritten.yaml b/build_handwritten.yaml
@@ -15,7 +15,7 @@ settings:
   core_version: 37.0.0
   csharp_major_version: 2
   g_stands_for: grand
-  protobuf_version: 3.25.0
+  protobuf_version: 3.25.1
   version: 1.61.0-dev
 configs:
   asan:

diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props
@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <GrpcCsharpVersion>2.61.0-dev</GrpcCsharpVersion>
-    <GoogleProtobufVersion>3.25.0</GoogleProtobufVersion>
+    <GoogleProtobufVersion>3.25.1</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.25.0'
+  s.dependency '!ProtoCompiler', '3.25.1'
 
   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
@@ -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.25.0'
+  s.dependency '!ProtoCompiler', '3.25.1'
 
   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
@@ -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.25.0'
+  v = '3.25.1'
   s.version  = v
   s.summary  = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
   s.description = <<-DESC

diff --git a/third_party/README.md b/third_party/README.md
@@ -123,10 +123,10 @@ In addition, please perform the following two steps to generate the Python `xds-
 Since upb is vendored in the gRPC repo, you cannot use submodule to update it. Please follow the steps below;
 1. Update third_party/upb directory by running
    - `export GRPC_ROOT=~/git/grpc`
-   - `wget https://github.com/protocolbuffers/upb/archive/refs/heads/main.zip`
+   - `wget https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.zip`
    - `rm -rf $GRPC_ROOT/third_party/upb`
-   - `unzip main.zip -d $GRPC_ROOT/third_party`
-   - `mv $GRPC_ROOT/third_party/upb-main $GRPC_ROOT/third_party/upb`
+   - `unzip protobuf-25.1.zip -d /tmp/protobuf`
+   - `cp -r /tmp/protobuf/protobuf-25.1/upb $GRPC_ROOT/third_party/upb`
 2. Update the dependency in `grpc_deps.bzl` to the same commit
 3. Populate the bazel download mirror by running `bazel/update_mirror.sh`
 4. Run `tools/buildgen/generate_projects.sh` to regenerate the generated files

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 45a6c20c5..c28dd8852 100755
 @@ -8,3 +8,9 @@
  # Copyright 2007 Google Inc. All Rights Reserved.
 
- __version__ = '4.25.0'
+ __version__ = '4.25.1'
 +
 +if __name__ != '__main__':
 +  try:

diff --git a/third_party/upb/.bazelci/presubmit.yml b/third_party/upb/.bazelci/presubmit.yml
diff --git a/third_party/upb/.bazelignore b/third_party/upb/.bazelignore
diff --git a/third_party/upb/.bazelrc b/third_party/upb/.bazelrc
diff --git a/third_party/upb/.clang-format b/third_party/upb/.clang-format
diff --git a/third_party/upb/.github/actions/setup-bazel-cache/action.yml b/third_party/upb/.github/actions/setup-bazel-cache/action.yml
diff --git a/third_party/upb/.github/workflows/bazel_tests.yml b/third_party/upb/.github/workflows/bazel_tests.yml
diff --git a/third_party/upb/.github/workflows/clang_format.yml b/third_party/upb/.github/workflows/clang_format.yml
diff --git a/third_party/upb/.github/workflows/generate_files.yml b/third_party/upb/.github/workflows/generate_files.yml
diff --git a/third_party/upb/.github/workflows/mergeable.yml b/third_party/upb/.github/workflows/mergeable.yml
+1 −0		.github/workflows/staleness_check.yml
+31 −18		.github/workflows/test_cpp.yml
+1 −1		.github/workflows/test_php.yml
+1 −0		.github/workflows/test_python.yml
+12 −3		.github/workflows/test_upb.yml
+1 −1		CMakeLists.txt
+1 −1		Protobuf-C++.podspec
+1 −1		Protobuf.podspec
+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/protoc/pom.xml
+1 −1		java/util/pom.xml
+1 −1		php/ext/google/protobuf/protobuf.h
+2 −2		pkg/cc_dist_library.bzl
+5 −5		protobuf_version.bzl
+0 −0		python/BUILD.bazel
+1 −1		python/build_targets.bzl
+10 −0		python/descriptor.c
+1 −1		python/google/protobuf/__init__.py
+23 −5		python/google/protobuf/descriptor.py
+10 −0		python/google/protobuf/pyext/descriptor.cc
+139 −4		ruby/ext/google/protobuf_c/defs.c
+37 −2		ruby/ext/google/protobuf_c/glue.c
+20 −0		ruby/ext/google/protobuf_c/map.c
+3 −0		ruby/ext/google/protobuf_c/map.h
+46 −8		ruby/ext/google/protobuf_c/message.c
+7 −0		ruby/ext/google/protobuf_c/message.h
+19 −0		ruby/ext/google/protobuf_c/repeated_field.c
+3 −0		ruby/ext/google/protobuf_c/repeated_field.h
+1 −1		ruby/google-protobuf.gemspec
+11 −0		ruby/lib/google/protobuf/ffi/descriptor.rb
+14 −9		ruby/lib/google/protobuf/ffi/descriptor_pool.rb
+11 −1		ruby/lib/google/protobuf/ffi/enum_descriptor.rb
+25 −15		ruby/lib/google/protobuf/ffi/field_descriptor.rb
+11 −0		ruby/lib/google/protobuf/ffi/file_descriptor.rb
+11 −0		ruby/lib/google/protobuf/ffi/map.rb
+23 −2		ruby/lib/google/protobuf/ffi/message.rb
+18 −11		ruby/lib/google/protobuf/ffi/oneof_descriptor.rb
+12 −132		ruby/lib/google/protobuf/ffi/repeated_field.rb
+2 −2		ruby/pom.xml
+17 −0		ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
+28 −2		ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java
+20 −3		ruby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java
+26 −1		ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
+17 −0		ruby/src/main/java/com/google/protobuf/jruby/RubyFileDescriptor.java
+10 −0		ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java
+44 −4		ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
+17 −0		ruby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java
+16 −0		ruby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java
+76 −0		ruby/tests/basic.rb
+52 −0		ruby/tests/basic_proto2.rb
+40 −6		ruby/tests/basic_test.proto
+45 −2		ruby/tests/basic_test_proto2.proto
+2 −2		src/google/protobuf/any.pb.h
+2 −2		src/google/protobuf/api.pb.h
+2 −2		src/google/protobuf/compiler/java/java_features.pb.h
+2 −2		src/google/protobuf/compiler/plugin.pb.h
+19 −32		src/google/protobuf/compiler/ruby/ruby_generator.cc
+3 −3		src/google/protobuf/compiler/versions.h
+2 −2		src/google/protobuf/cpp_features.pb.h
+2 −2		src/google/protobuf/descriptor.pb.h
+2 −2		src/google/protobuf/duration.pb.h
+2 −2		src/google/protobuf/empty.pb.h
+2 −2		src/google/protobuf/field_mask.pb.h
+1 −1		src/google/protobuf/port_def.inc
+2 −2		src/google/protobuf/source_context.pb.h
+2 −2		src/google/protobuf/struct.pb.h
+1 −1		src/google/protobuf/stubs/common.h
+2 −2		src/google/protobuf/timestamp.pb.h
+2 −2		src/google/protobuf/type.pb.h
+2 −2		src/google/protobuf/wrappers.pb.h
+2 −2		upb/reflection/def_pool.h
+10 −10		version.json