Merge pull request #19506 from protocolbuffers/29.x-202412032207

Merge release commits to 29.x
protocolbuffers · Dec 3, 2024 · d7d3da6 · d7d3da6
2 parents ba6da44 + a3e9db8
commit d7d3da6
Show file tree

Hide file tree

Showing 49 changed files with 79 additions and 79 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,7 +84,7 @@ if (protobuf_BUILD_SHARED_LIBS)
 endif ()
 
 # Version metadata
-set(protobuf_VERSION_STRING "5.29.1")
+set(protobuf_VERSION_STRING "5.29.2")
 set(protobuf_DESCRIPTION "Protocol Buffers")
 set(protobuf_CONTACT "protobuf@googlegroups.com")
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -3,7 +3,7 @@
 
 module(
     name = "protobuf",
-    version = "29.1-dev",  # Automatically updated on release
+    version = "29.2-dev",  # Automatically updated on release
     compatibility_level = 1,
     repo_name = "com_google_protobuf",
 )

diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
-  s.version  = '5.29.1'
+  s.version  = '5.29.2'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = 'BSD-3-Clause'

diff --git a/Protobuf.podspec b/Protobuf.podspec
@@ -5,7 +5,7 @@
 # dependent projects use the :git notation to refer to the library.
 Pod::Spec.new do |s|
   s.name     = 'Protobuf'
-  s.version  = '3.29.1'
+  s.version  = '3.29.2'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = 'BSD-3-Clause'

diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
@@ -5,7 +5,7 @@
     <title>Google Protocol Buffers tools</title>
     <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
     <description>See project site for more info.</description>
-    <version>3.29.1</version>
+    <version>3.29.2</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -5,7 +5,7 @@
     <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
     <Copyright>Copyright 2015, Google Inc.</Copyright>
     <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
-    <VersionPrefix>3.29.1</VersionPrefix>
+    <VersionPrefix>3.29.2</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Google Inc.</Authors>
     <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

diff --git a/java/bom/pom.xml b/java/bom/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>4.29.1</version>
+  <version>4.29.2</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

diff --git a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java
@@ -28,7 +28,7 @@ public enum RuntimeDomain {
   public static final RuntimeDomain OSS_DOMAIN = RuntimeDomain.PUBLIC;
   public static final int OSS_MAJOR = 4;
   public static final int OSS_MINOR = 29;
-  public static final int OSS_PATCH = 1;
+  public static final int OSS_PATCH = 2;
   public static final String OSS_SUFFIX = "-dev";
 
   public static final RuntimeDomain DOMAIN = OSS_DOMAIN;

diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>4.29.1</version>
+    <version>4.29.2</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

diff --git a/java/pom.xml b/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>4.29.1</version>
+  <version>4.29.2</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>

diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml
@@ -8,7 +8,7 @@
   </parent>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protoc</artifactId>
-  <version>4.29.1</version>
+  <version>4.29.2</version>
   <packaging>pom</packaging>
   <name>Protobuf Compiler</name>
   <description>

diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
@@ -32,7 +32,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
 ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-#define PHP_PROTOBUF_VERSION "4.29.1"
+#define PHP_PROTOBUF_VERSION "4.29.2"
 
 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:

diff --git a/protobuf_version.bzl b/protobuf_version.bzl
@@ -1,7 +1,7 @@
 """ Contains version numbers to be used in other bzl files """
-PROTOC_VERSION = "29.1"
-PROTOBUF_JAVA_VERSION = "4.29.1"
-PROTOBUF_PYTHON_VERSION = "5.29.1"
-PROTOBUF_PHP_VERSION = "4.29.1"
-PROTOBUF_RUBY_VERSION = "4.29.1"
+PROTOC_VERSION = "29.2"
+PROTOBUF_JAVA_VERSION = "4.29.2"
+PROTOBUF_PYTHON_VERSION = "5.29.2"
+PROTOBUF_PHP_VERSION = "4.29.2"
+PROTOBUF_RUBY_VERSION = "4.29.2"
 PROTOBUF_PREVIOUS_RELEASE = "28.0-rc1"
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
@@ -7,4 +7,4 @@
 
 # Copyright 2007 Google Inc. All Rights Reserved.
 
-__version__ = '5.29.1'
+__version__ = '5.29.2'
diff --git a/python/google/protobuf/runtime_version.py b/python/google/protobuf/runtime_version.py
@@ -29,7 +29,7 @@ class Domain(Enum):
 OSS_DOMAIN = Domain.PUBLIC
 OSS_MAJOR = 5
 OSS_MINOR = 29
-OSS_PATCH = 1
+OSS_PATCH = 2
 OSS_SUFFIX = '-dev'
 
 DOMAIN = OSS_DOMAIN

diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google-protobuf"
-  s.version     = "4.29.1"
+  s.version     = "4.29.2"
   git_tag       = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
   s.licenses    = ["BSD-3-Clause"]
   s.summary     = "Protocol Buffers"

diff --git a/ruby/pom.xml b/ruby/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>com.google.protobuf.jruby</groupId>
     <artifactId>protobuf-jruby</artifactId>
-    <version>4.29.1</version>
+    <version>4.29.2</version>
     <name>Protocol Buffer JRuby native extension</name>
     <description>
       Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -76,7 +76,7 @@
         <dependency>
           <groupId>com.google.protobuf</groupId>
           <artifactId>protobuf-java-util</artifactId>
-          <version>4.29.1</version>
+          <version>4.29.2</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>

diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc
diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h
diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
diff --git a/src/google/protobuf/compiler/versions.h b/src/google/protobuf/compiler/versions.h
@@ -53,9 +53,9 @@
 //
 // Please avoid changing them manually, as they should be updated automatically
 // by Protobuf release process.
-#define PROTOBUF_CPP_VERSION_STRING "5.29.1-dev"
-#define PROTOBUF_JAVA_VERSION_STRING "4.29.1-dev"
-#define PROTOBUF_PYTHON_VERSION_STRING "5.29.1-dev"
+#define PROTOBUF_CPP_VERSION_STRING "5.29.2-dev"
+#define PROTOBUF_JAVA_VERSION_STRING "4.29.2-dev"
+#define PROTOBUF_PYTHON_VERSION_STRING "5.29.2-dev"
 
 
 namespace google {

diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc
diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@

		# Copyright 2007 Google Inc. All Rights Reserved.

		__version__ = '5.29.1'
		__version__ = '5.29.2'