commit 1231af10c7e55c303fc1260c4ed79f43a294adbb
author Jie Luo <anandolee@gmail.com> Thu Nov 02 15:28:01 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Nov 02 15:29:36 2023 -0700
tree a540b86aa93770e950d1c4a7e46fe0390ec410e8
parent 1c549200ffb09659354845e8c60cb686bd8949fd

merge 25.x to main (#14617)

Closes #14617

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

protobuf_version.bzl

diff --git a/protobuf_version.bzl b/protobuf_version.bzl
index e428407..a122dc3 100644
--- 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"
-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"