Merge pull request #17592 from protocolbuffers/25.x-202407241710
Merge release commits to 25.x
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1938195..b2e6411 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@
endif ()
# Version metadata
-set(protobuf_VERSION_STRING "4.25.4")
+set(protobuf_VERSION_STRING "4.25.5")
set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com")
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
index 48ad906..70d8357 100644
--- a/Protobuf-C++.podspec
+++ b/Protobuf-C++.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
- s.version = '4.25.4'
+ s.version = '4.25.5'
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
index 3f4a0f7..8d8509a 100644
--- 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.25.4'
+ s.version = '3.25.5'
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
index 48bead1..00f4db6 100644
--- 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.25.4</version>
+ <version>3.25.5</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
index a40da49..a1f9bb4 100644
--- 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.25.4</VersionPrefix>
+ <VersionPrefix>3.25.5</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
index d34c4db..7d89023 100644
--- 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.25.4</version>
+ <version>3.25.5</version>
<packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 69642b7..644a4a7 100644
--- 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.25.4</version>
+ <version>3.25.5</version>
</parent>
<artifactId>protobuf-java</artifactId>
diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index afe6799..882e4e1 100644
--- 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.25.4</version>
+ <version>3.25.5</version>
</parent>
<artifactId>protobuf-kotlin-lite</artifactId>
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index 575b40e..5ef4b36 100644
--- 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.25.4</version>
+ <version>3.25.5</version>
</parent>
<artifactId>protobuf-kotlin</artifactId>
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index 15df41b..d64fa31 100644
--- 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.25.4</version>
+ <version>3.25.5</version>
</parent>
<artifactId>protobuf-javalite</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index 42a08a3..b59d267 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.25.4</version>
+ <version>3.25.5</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>
diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml
index 88516a4..2058f8b 100644
--- 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.25.4</version>
+ <version>3.25.5</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index 4a68d85..9d0581c 100644
--- 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.25.4</version>
+ <version>3.25.5</version>
</parent>
<artifactId>protobuf-java-util</artifactId>
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index 6302699..87e9c23 100644
--- a/php/ext/google/protobuf/protobuf.h
+++ b/php/ext/google/protobuf/protobuf.h
@@ -32,7 +32,7 @@
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()
-#define PHP_PROTOBUF_VERSION "3.25.4"
+#define PHP_PROTOBUF_VERSION "3.25.5"
// 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
index ff50d94..201cb41 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 = "25.4"
-PROTOBUF_JAVA_VERSION = "3.25.4"
-PROTOBUF_PYTHON_VERSION = "4.25.4"
-PROTOBUF_PHP_VERSION = "3.25.4"
-PROTOBUF_RUBY_VERSION = "3.25.4"
+PROTOC_VERSION = "25.5"
+PROTOBUF_JAVA_VERSION = "3.25.5"
+PROTOBUF_PYTHON_VERSION = "4.25.5"
+PROTOBUF_PHP_VERSION = "3.25.5"
+PROTOBUF_RUBY_VERSION = "3.25.5"
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index 0b79c17..f24f663 100755
--- a/python/google/protobuf/__init__.py
+++ b/python/google/protobuf/__init__.py
@@ -7,4 +7,4 @@
# Copyright 2007 Google Inc. All Rights Reserved.
-__version__ = '4.25.4'
+__version__ = '4.25.5'
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 7c5b528..8a3670e 100644
--- 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.25.4"
+ s.version = "3.25.5"
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
index 80c7b18..9c2228e 100644
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
- <version>3.25.4</version>
+ <version>3.25.5</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.25.4</version>
+ <version>3.25.5</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index d355e14..7c5a241 100644
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/any.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index be5bc72..de161f1 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/api.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h
index 7e8fa0e..943d6bb 100644
--- a/src/google/protobuf/compiler/java/java_features.pb.h
+++ b/src/google/protobuf/compiler/java/java_features.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/compiler/java/java_features.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
index bf91ebe..8e0cb7d 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/compiler/plugin.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/compiler/versions.h b/src/google/protobuf/compiler/versions.h
index 2900448..1a7680f 100644
--- a/src/google/protobuf/compiler/versions.h
+++ b/src/google/protobuf/compiler/versions.h
@@ -46,8 +46,8 @@
//
// Please avoid changing them manually, as they should be updated automatically
// by Protobuf release process.
-#define PROTOBUF_CPP_VERSION_STRING "4.25.4-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
-#define PROTOBUF_JAVA_VERSION_STRING "3.25.4-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
-#define PROTOBUF_PYTHON_VERSION_STRING "4.25.4-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
+#define PROTOBUF_CPP_VERSION_STRING "4.25.5-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
+#define PROTOBUF_JAVA_VERSION_STRING "3.25.5-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
+#define PROTOBUF_PYTHON_VERSION_STRING "4.25.5-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
#endif // GOOGLE_PROTOBUF_VERSIONS_H__
diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h
index a89d7f5..3a92ad5 100644
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/cpp_features.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index bc21c67..8cc3440 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/descriptor.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index c87afae..37b9b49 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/duration.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index dee282f..2dc6b75 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/empty.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index 5890923..4ae755e 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/field_mask.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index c70c7a6..f6b1060 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -204,7 +204,7 @@
#ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined
#endif
-#define PROTOBUF_VERSION 4025004
+#define PROTOBUF_VERSION 4025005
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
index 7b1dac1..be83579 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/source_context.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index e8c2d8c..67ccb9c 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/struct.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index d7ff557..2c5d5be 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -44,7 +44,7 @@
// The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro
-#define GOOGLE_PROTOBUF_VERSION 4025004
+#define GOOGLE_PROTOBUF_VERSION 4025005
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-dev"
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index e1d0768..e76fabe 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/timestamp.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index dbd190b..b185e07 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/type.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index be24ae0..ba28f1b 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/wrappers.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.5-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
@@ -17,7 +17,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4025004 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4025005 < 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."
diff --git a/version.json b/version.json
index 78ecab8..8ed7dcc 100644
--- a/version.json
+++ b/version.json
@@ -1,17 +1,17 @@
{
"25.x": {
- "protoc_version": "25.4-dev",
+ "protoc_version": "25.5-dev",
"lts": false,
- "date": "2024-02-15",
+ "date": "2024-07-24",
"languages": {
- "cpp": "4.25.4-dev",
- "csharp": "3.25.4-dev",
- "java": "3.25.4-dev",
- "javascript": "3.25.4-dev",
- "objectivec": "3.25.4-dev",
- "php": "3.25.4-dev",
- "python": "4.25.4-dev",
- "ruby": "3.25.4-dev"
+ "cpp": "4.25.5-dev",
+ "csharp": "3.25.5-dev",
+ "java": "3.25.5-dev",
+ "javascript": "3.25.5-dev",
+ "objectivec": "3.25.5-dev",
+ "php": "3.25.5-dev",
+ "python": "4.25.5-dev",
+ "ruby": "3.25.5-dev"
}
}
}
\ No newline at end of file
