Merge pull request #13430 from protocolbuffers/24.x-202308011841

24.x 202308011841
protocolbuffers · Aug 1, 2023 · e48f6f7 · e48f6f7
2 parents e916bf6 + e82fc05
commit e48f6f7
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
 endif ()
 
 # Version metadata
-set(protobuf_VERSION_STRING "4.24.0-rc-2")
+set(protobuf_VERSION_STRING "4.24.0-rc-3")
 set(protobuf_DESCRIPTION "Protocol Buffers")
 set(protobuf_CONTACT "[email protected]")
 

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  = '4.24.0-rc2'
+  s.version  = '4.24.0-rc3'
   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.24.0-rc2'
+  s.version  = '3.24.0-rc3'
   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.24.0-rc2</version>
+    <version>3.24.0-rc3</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.24.0-rc2</VersionPrefix>
+    <VersionPrefix>3.24.0-rc3</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Google Inc.</Authors>
     <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

diff --git a/java/README.md b/java/README.md
@@ -23,7 +23,7 @@ If you are using Maven, use the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java</artifactId>
-  <version>3.24.0-rc-2</version>
+  <version>3.24.0-rc-3</version>
 </dependency>
 ```
 
@@ -37,14 +37,14 @@ protobuf-java-util package:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java-util</artifactId>
-  <version>3.24.0-rc-2</version>
+  <version>3.24.0-rc-3</version>
 </dependency>
 ```
 
 ### Gradle
 
 If you are using Gradle, add the following to your `build.gradle` file's
-dependencies: `implementation 'com.google.protobuf:protobuf-java:3.24.0-rc-2'` Again,
+dependencies: `implementation 'com.google.protobuf:protobuf-java:3.24.0-rc-3'` Again,
 be sure to check that the version number matches (or is newer than) the version
 number of protoc that you are using.
 

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>3.24.0-RC2</version>
+  <version>3.24.0-RC3</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

diff --git a/java/core/pom.xml b/java/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.24.0-RC2</version>
+    <version>3.24.0-RC3</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

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

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>3.24.0-RC2</version>
+    <version>3.24.0-RC3</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

diff --git a/java/lite.md b/java/lite.md
@@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-javalite</artifactId>
-  <version>3.24.0-rc-2</version>
+  <version>3.24.0-rc-3</version>
 </dependency>
 ```
 

diff --git a/java/lite/pom.xml b/java/lite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.24.0-RC2</version>
+    <version>3.24.0-RC3</version>
   </parent>
 
   <artifactId>protobuf-javalite</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>3.24.0-RC2</version>
+  <version>3.24.0-RC3</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>3.24.0-RC2</version>
+  <version>3.24.0-RC3</version>
   <packaging>pom</packaging>
   <name>Protobuf Compiler</name>
   <description>

diff --git a/java/util/pom.xml b/java/util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.24.0-RC2</version>
+    <version>3.24.0-RC3</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
@@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-#define PHP_PROTOBUF_VERSION "3.24.0RC2"
+#define PHP_PROTOBUF_VERSION "3.24.0RC3"
 
 // 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,6 +1,6 @@
 """ Contains version numbers to be used in other bzl files """
-PROTOC_VERSION = "24.0-rc-2"
-PROTOBUF_JAVA_VERSION = "3.24.0-RC2"
-PROTOBUF_PYTHON_VERSION = "4.24.0rc2"
-PROTOBUF_PHP_VERSION = "3.24.0RC2"
-PROTOBUF_RUBY_VERSION = "3.24.0.rc.2"
+PROTOC_VERSION = "24.0-rc-3"
+PROTOBUF_JAVA_VERSION = "3.24.0-RC3"
+PROTOBUF_PYTHON_VERSION = "4.24.0rc3"
+PROTOBUF_PHP_VERSION = "3.24.0RC3"
+PROTOBUF_RUBY_VERSION = "3.24.0.rc.3"
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
@@ -30,4 +30,4 @@
 
 # Copyright 2007 Google Inc. All Rights Reserved.
 
-__version__ = '4.24.0rc2'
+__version__ = '4.24.0rc3'
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     = "3.24.0.rc.2"
+  s.version     = "3.24.0.rc.3"
   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>3.24.0-RC2</version>
+    <version>3.24.0-RC3</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>3.24.0-RC2</version>
+          <version>3.24.0-RC3</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>

diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -270,7 +270,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #ifdef PROTOBUF_VERSION_SUFFIX
 #error PROTOBUF_VERSION_SUFFIX was previously defined
 #endif
-#define PROTOBUF_VERSION_SUFFIX "-rc2"
+#define PROTOBUF_VERSION_SUFFIX "-rc3"
 
 #ifdef PROTOBUF_ALWAYS_INLINE
 #error PROTOBUF_ALWAYS_INLINE was previously defined

diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
@@ -69,7 +69,7 @@ namespace internal {
 #define GOOGLE_PROTOBUF_VERSION 4024000
 
 // A suffix string for alpha, beta or rc releases. Empty for stable releases.
-#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2"
+#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc3"
 
 // The minimum header version which works with the current version of
 // the library.  This constant should only be used by protoc's C++ code

diff --git a/version.json b/version.json
@@ -2,7 +2,7 @@
     "24.x": {
         "protoc_version": "24.0-dev",
         "lts": false,
-        "date": "2023-07-18",
+        "date": "2023-08-01",
         "languages": {
             "cpp": "4.24.0-dev",
             "csharp": "3.24.0-dev",