merge 25.x to main (#14617)

Closes #14617

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14617 from anandolee:25.x ac86c5ef32
PiperOrigin-RevId: 578996979

CMakeLists.txt

@@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
 endif ()
 
 # Version metadata
-set(protobuf_VERSION_STRING "4.24.0")
+set(protobuf_VERSION_STRING "4.25.0")
 set(protobuf_DESCRIPTION "Protocol Buffers")
 set(protobuf_CONTACT "protobuf@googlegroups.com")
 

Protobuf-C++.podspec

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

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'
+  s.version  = '3.25.0'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = 'BSD-3-Clause'

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</version>
+    <version>3.25.0</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

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</VersionPrefix>
+    <VersionPrefix>3.25.0</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Google Inc.</Authors>
     <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

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</version>
+  <version>3.25.0</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</version>
+  <version>3.25.0</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'` Again,
+dependencies: `implementation 'com.google.protobuf:protobuf-java:3.25.0'` Again,
 be sure to check that the version number matches (or is newer than) the version
 number of protoc that you are using.
 

java/bom/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.24.0</version>
+  <version>3.25.0</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

java/core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.24.0</version>
+    <version>3.25.0</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

java/kotlin-lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.24.0</version>
+    <version>3.25.0</version>
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>

java/kotlin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.24.0</version>
+    <version>3.25.0</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

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</version>
+  <version>3.25.0</version>
 </dependency>
 ```
 

java/lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.24.0</version>
+    <version>3.25.0</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

java/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.24.0</version>
+  <version>3.25.0</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>

java/protoc/pom.xml

@@ -8,7 +8,7 @@
   </parent>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protoc</artifactId>
-  <version>3.24.0</version>
+  <version>3.25.0</version>
   <packaging>pom</packaging>
   <name>Protobuf Compiler</name>
   <description>

java/util/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.24.0</version>
+    <version>3.25.0</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

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 "3.24.0"
+#define PHP_PROTOBUF_VERSION "3.25.0"
 
 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:

protobuf_version.bzl

@@ -1,6 +1,6 @@
 """ Contains version numbers to be used in other bzl files """
-PROTOC_VERSION = "24.0"
-PROTOBUF_JAVA_VERSION = "3.24.0"
-PROTOBUF_PYTHON_VERSION = "4.24.0"
-PROTOBUF_PHP_VERSION = "3.24.0"
-PROTOBUF_RUBY_VERSION = "3.24.0"
+PROTOC_VERSION = "25.0"
+PROTOBUF_JAVA_VERSION = "3.25.0"
+PROTOBUF_PYTHON_VERSION = "4.25.0"
+PROTOBUF_PHP_VERSION = "3.25.0"
+PROTOBUF_RUBY_VERSION = "3.25.0"

python/google/protobuf/__init__.py

@@ -7,4 +7,4 @@
 
 # Copyright 2007 Google Inc. All Rights Reserved.
 
-__version__ = '4.24.0'
+__version__ = '4.25.0'

ruby/google-protobuf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google-protobuf"
-  s.version     = "3.24.0"
+  s.version     = "3.25.0"
   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"

ruby/pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>com.google.protobuf.jruby</groupId>
     <artifactId>protobuf-jruby</artifactId>
-    <version>3.24.0</version>
+    <version>3.25.0</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</version>
+          <version>3.25.0</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>

src/google/protobuf/compiler/java/java_features.pb.h

@@ -11,13 +11,13 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4024000
+#if PROTOBUF_VERSION < 4025000
 #error "This file was generated by a newer version of protoc which is"
 #error "incompatible with your Protocol Buffer headers. Please update"
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4024000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
 #error "This file was generated by an older version of protoc which is"
 #error "incompatible with your Protocol Buffer headers. Please"
 #error "regenerate this file with a newer version of protoc."

src/google/protobuf/compiler/plugin.pb.h

@@ -11,13 +11,13 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4024000
+#if PROTOBUF_VERSION < 4025000
 #error "This file was generated by a newer version of protoc which is"
 #error "incompatible with your Protocol Buffer headers. Please update"
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4024000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
 #error "This file was generated by an older version of protoc which is"
 #error "incompatible with your Protocol Buffer headers. Please"
 #error "regenerate this file with a newer version of protoc."

src/google/protobuf/cpp_features.pb.h

@@ -11,13 +11,13 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4024000
+#if PROTOBUF_VERSION < 4025000
 #error "This file was generated by a newer version of protoc which is"
 #error "incompatible with your Protocol Buffer headers. Please update"
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4024000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
 #error "This file was generated by an older version of protoc which is"
 #error "incompatible with your Protocol Buffer headers. Please"
 #error "regenerate this file with a newer version of protoc."

src/google/protobuf/descriptor.pb.h

@@ -11,13 +11,13 @@
 #include <utility>
 
 #include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4024000
+#if PROTOBUF_VERSION < 4025000
 #error "This file was generated by a newer version of protoc which is"
 #error "incompatible with your Protocol Buffer headers. Please update"
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4024000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
 #error "This file was generated by an older version of protoc which is"
 #error "incompatible with your Protocol Buffer headers. Please"
 #error "regenerate this file with a newer version of protoc."

src/google/protobuf/port_def.inc

@@ -204,17 +204,17 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #ifdef PROTOBUF_VERSION
 #error PROTOBUF_VERSION was previously defined
 #endif
-#define PROTOBUF_VERSION 4024000
+#define PROTOBUF_VERSION 4025000
 
 #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
 #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
 #endif
-#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 4024000
+#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 4025000
 
 #ifdef PROTOBUF_MIN_PROTOC_VERSION
 #error PROTOBUF_MIN_PROTOC_VERSION was previously defined
 #endif
-#define PROTOBUF_MIN_PROTOC_VERSION 4024000
+#define PROTOBUF_MIN_PROTOC_VERSION 4025000
 
 #ifdef PROTOBUF_VERSION_SUFFIX
 #error PROTOBUF_VERSION_SUFFIX was previously defined
@@ -330,7 +330,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 
 // The minimum library version which works with the current version of the
 // headers.
-#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 4024000
+#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 4025000
 
 #ifdef PROTOBUF_RTTI
 #error PROTOBUF_RTTI was previously defined

version.json

@@ -1,17 +1,17 @@
 {
-    "main": {
-        "protoc_version": "26-dev",
-        "lts": false,
-        "date": "2023-10-16",
-        "languages": {
-            "cpp": "4.26-dev",
-            "csharp": "3.26-dev",
-            "java": "3.26-dev",
-            "javascript": "3.26-dev",
-            "objectivec": "3.26-dev",
-            "php": "3.26-dev",
-            "python": "4.26-dev",
-            "ruby": "3.26-dev"
-        }
+  "25.x": {
+    "protoc_version": "25.0-dev",
+    "lts": false,
+    "date": "2023-11-01",
+    "languages": {
+      "cpp": "4.25.0-dev",
+      "csharp": "3.25.0-dev",
+      "java": "3.25.0-dev",
+      "javascript": "3.25.0-dev",
+      "objectivec": "3.25.0-dev",
+      "php": "3.25.0-dev",
+      "python": "4.25.0-dev",
+      "ruby": "3.25.0-dev"
     }
-}
+  }
+}