Merge with main to fix unrelated tests.

.github/workflows/janitor.yml

@@ -28,3 +28,47 @@ jobs:
             echo "Closing #$pr..."
             gh pr close --comment "Auto-closing Copybara pull request" --delete-branch "$pr"
           done
+
+  stale-others:
+    name: Close stale non-copybara PRs and issues
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@b69b346013879cedbf50c69f572cd85439a41936
+        with:
+          stale-issue-message: >
+            We triage inactive PRs and issues in order to make it easier to find
+            active work. If this issue should remain active or becomes active
+            again, please add a comment.
+
+
+            This issue is labeled `inactive` because the last activity was over
+            90 days ago.
+          close-pr-message: >
+            We triage inactive PRs and issues in order to make it easier to find
+            active work. If this issue should remain active or becomes active
+            again, please reopen it.
+
+
+            This issue was closed and archived because there has been no new
+            activity in the 14 days since the `inactive` label was added.
+          stale-pr-message: >
+            We triage inactive PRs and issues in order to make it easier to find
+            active work. If this PR should remain active, please add a comment.
+
+
+            This PR is labeled `inactive` because the last activity was over 90
+            days ago. This PR will be closed and archived after 14 additional
+            days without activity.
+          close-pr-message: >
+            We triage inactive PRs and issues in order to make it easier to find
+            active work. If this PR should remain active or becomes active
+            again, please reopen it.
+
+
+            This PR was closed and archived because there has been no new
+            activity in the 14 days since the `inactive` label was added.
+          stale-issue-label: 'inactive'
+          stale-pr-label: 'inactive'
+          days-before-stale: 90
+          days-before-close: 14
+          operations-per-run: 100

.github/workflows/staleness_check.yml

@@ -54,6 +54,7 @@ jobs:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: staleness
           bash: >
+            set -ex;
             if [[ -z $COMMIT_TRIGGERED_RUN || -z $MAIN_RUN ]]; then
             bazel query 'attr(tags, "staleness_test", //...)' | xargs bazel test $BAZEL_FLAGS ||
             echo "Please run ./regenerate_stale_files.sh to regenerate stale files";

.github/workflows/staleness_refresh.yml

@@ -30,10 +30,6 @@ jobs:
           # failing then you may need to generate a fresh token.
           token: ${{ secrets.BOT_ACCESS_TOKEN }}
       - name: Configure name and email address in Git
-        run: git config user.name "Protobuf Team Bot" && git config user.email "[email protected]"
+        run: cd ${{ github.workspace }} && git config user.name "Protobuf Team Bot" && git config user.email "[email protected]"
       - name: Commit and push update
-        uses: protocolbuffers/protobuf-ci/bazel@v2
-        with:
-          credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
-          bazel-cache: staleness
-          bash: ci/push_auto_update.sh
+        run: cd ${{ github.workspace }} && ./ci/push_auto_update.sh

.github/workflows/test_upb.yml

@@ -100,6 +100,7 @@ jobs:
         with:
           cache: pip
           cache-dependency-path: 'python/requirements.txt'
+          python-version: '3.11' # 3.12 doesn't have setuptools
       - name: Run tests
         uses: protocolbuffers/protobuf-ci/bazel@v2
         with:

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 "[email protected]")
 

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'

WORKSPACE

@@ -1,5 +1,10 @@
 workspace(name = "com_google_protobuf")
 
+# An explicit self-reference to work around changes in Bazel 7.0
+# See https://github.com/bazelbuild/bazel/issues/19973#issuecomment-1787814450
+# buildifier: disable=duplicated-name
+local_repository(name = "com_google_protobuf", path = ".")
+
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 local_repository(

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>

docs/third_party.md

@@ -169,49 +169,58 @@ Inactive:
 * https://github.com/thesamet/rpcz (C++/Python, based on ZeroMQ)
 * https://github.com/w359405949/libmaid (C++, Python)
 
-## Other Utilities
-
-There are miscellaneous other things you may find useful as a Protocol Buffers developer.
+## Build
 
 *   [Bazel Build](https://bazel.build)
     *   [rules_closure](https://github.com/bazelbuild/rules_closure)
         `js-closure`
     *   [rules_go](https://github.com/bazelbuild/rules_go) `go`
     *   [rules_protobuf](https://github.com/pubref/rules_protobuf) `java` `c++`
         `c#` `go` `js-closure` `js-node` `python` `ruby`
-*   [NetBeans IDE plugin](https://code.google.com/p/protobuf-netbeans-plugin/)
-*   [Wireshark/Ethereal packet sniffer plugin](https://code.google.com/p/protobuf-wireshark/)
-*   [Alternate encodings (JSON, XML, HTML) for Java protobufs](https://code.google.com/p/protobuf-java-format/)
-*   [Another JSON encoder/decoder for Java](https://github.com/sijuv/protobuf-codec)
-*   [Editor for serialized protobufs](https://code.google.com/p/protobufeditor/)
-*   [IntelliJ IDEA plugin](http://github.com/jvolkman/intellij-protobuf-editor)
-*   [IntelliJ Protobuf Plugin](https://github.com/devkanro/intellij-protobuf-plugin)
-*   [TextMate syntax highlighting](http://github.com/michaeledgar/protobuf-tmbundle)
-*   [Oracle PL SQL plugin](https://code.google.com/p/protocol-buffer-plsql/)
-*   [Eclipse editor for protobuf (from Google)](https://code.google.com/p/protobuf-dt/)
-*   [C++ Builder compatible protobuf](https://github.com/saadware/protobuf-cppbuilder)
 *   Maven Protobuf Compiler Plugin
     *   By xolstice.org
         ([Documentation](https://www.xolstice.org/protobuf-maven-plugin/))
         ([Source](https://github.com/xolstice/protobuf-maven-plugin/))
         [![Maven Central](https://img.shields.io/maven-central/v/org.xolstice.maven.plugins/protobuf-maven-plugin.svg)](https://repo1.maven.org/maven2/org/xolstice/maven/plugins/protobuf-maven-plugin/)
     *   https://code.google.com/p/maven-protoc-plugin/
     *   https://github.com/os72/protoc-jar-maven-plugin
+*   [Protobuf Plugin for Gradle](https://github.com/google/protobuf-gradle-plugin)
+*   [Sbt plugin for Protocol Buffers](https://github.com/Atry/sbt-cppp)
+
+## IDE
+
+*   [Visual Studio Code Support for Protocol Buffers](https://marketplace.visualstudio.com/items?itemName=zxh404.vscode-proto3)
+*   [Visual Studio Language Service support for Protocol Buffers](http://visualstudiogallery.msdn.microsoft.com/4bc0f38c-b058-4e05-ae38-155e053c19c5)
+*   [IntelliJ IDEA plugin](http://github.com/jvolkman/intellij-protobuf-editor)
+*   [IntelliJ Protobuf Plugin](https://github.com/devkanro/intellij-protobuf-plugin)
+*   [TextMate syntax highlighting](http://github.com/michaeledgar/protobuf-tmbundle)
+*   [Notepad++ Syntax Highlighting for .proto files](https://github.com/chai2010/notepadplus-protobuf)
+*   [Eclipse editor for protobuf (from Google)](https://code.google.com/p/protobuf-dt/)
+*   [NetBeans IDE plugin](https://code.google.com/p/protobuf-netbeans-plugin/)
+*   [Editor for serialized protobufs](https://code.google.com/p/protobufeditor/)
+
+## Documentation
+
 *   [Documentation generator plugin (Markdown/HTML/DocBook/...)](https://github.com/pseudomuto/protoc-gen-doc)
 *   [DocBook generator for .proto files](https://code.google.com/p/protoc-gen-docbook/)
+
+## Other Utilities
+
+There are miscellaneous other things you may find useful as a Protocol Buffers developer.
+
+*   [Wireshark/Ethereal packet sniffer plugin](https://code.google.com/p/protobuf-wireshark/)
+*   [Alternate encodings (JSON, XML, HTML) for Java protobufs](https://code.google.com/p/protobuf-java-format/)
+*   [Another JSON encoder/decoder for Java](https://github.com/sijuv/protobuf-codec)
+*   [Oracle PL SQL plugin](https://code.google.com/p/protocol-buffer-plsql/)
+*   [C++ Builder compatible protobuf](https://github.com/saadware/protobuf-cppbuilder)
 *   [Protobuf for nginx module](https://github.com/dbcode/protobuf-nginx/)
 *   [RSpec matchers and Cucumber step defs for testing Protocol Buffers](https://github.com/connamara/protobuf_spec)
-*   [Sbt plugin for Protocol Buffers](https://github.com/Atry/sbt-cppp)
-*   [Protobuf Plugin for Gradle](https://github.com/google/protobuf-gradle-plugin)
 *   [Multi-platform executable JAR and Java API for protoc](https://github.com/os72/protoc-jar)
 *   [Python scripts to convert between Protocol Buffers and JSON](https://github.com/NextTuesday/py-pb-converters)
-*   [Visual Studio Language Service support for Protocol Buffers](http://visualstudiogallery.msdn.microsoft.com/4bc0f38c-b058-4e05-ae38-155e053c19c5)
-*   [Visual Studio Code Support for Protocol Buffers](https://marketplace.visualstudio.com/items?itemName=zxh404.vscode-proto3)
 *   [C++ library for serialization/de-serialization between Protocol Buffers and
     JSON.](https://github.com/yinqiwen/pbjson)
 *   [ProtoBuf with Java EE7 Expression Language 3.0; pure Java ProtoBuf Parser
     and Builder.](https://github.com/protobufel/protobuf-el)
-*   [Notepad++ Syntax Highlighting for .proto files](https://github.com/chai2010/notepadplus-protobuf)
 *   [Linter for .proto files](https://github.com/ckaznocha/protoc-gen-lint)
 *   [Protocol Buffers Dynamic Schema - create protobuf schemas programmatically
     (Java)](https://github.com/os72/protobuf-dynamic)

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/php-upb.h

@@ -10735,12 +10735,11 @@ bool _upb_DefPool_LoadDefInitEx(upb_DefPool* s, const _upb_DefPool_Init* init,
 
 
 #endif /* UPB_REFLECTION_DEF_POOL_INTERNAL_H_ */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-
 extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
 
 UPB_INLINE const upb_MessageDef *google_protobuf_FileDescriptorSet_getmsgdef(upb_DefPool *s) {

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/file_lists.cmake

@@ -117,6 +117,7 @@ set(libprotobuf_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.pb.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_database.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_legacy.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_lite.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_visitor.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/dynamic_message.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/endian.h
@@ -242,6 +243,7 @@ set(libprotobuf_lite_hdrs
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_cleanup.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler.h
+  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_lite.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/endian.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/explicitly_constructed.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set.h