Merge pull request #17592 from protocolbuffers/25.x-202407241710

Merge release commits to 25.x
cp-segv
zhangskz 4 months ago committed by GitHub
commit 5d47e0a372
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      CMakeLists.txt
  2. 2
      Protobuf-C++.podspec
  3. 2
      Protobuf.podspec
  4. 2
      csharp/Google.Protobuf.Tools.nuspec
  5. 2
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  6. 2
      java/bom/pom.xml
  7. 2
      java/core/pom.xml
  8. 2
      java/kotlin-lite/pom.xml
  9. 2
      java/kotlin/pom.xml
  10. 2
      java/lite/pom.xml
  11. 2
      java/pom.xml
  12. 2
      java/protoc/pom.xml
  13. 2
      java/util/pom.xml
  14. 2
      php/ext/google/protobuf/protobuf.h
  15. 10
      protobuf_version.bzl
  16. 2
      python/google/protobuf/__init__.py
  17. 2
      ruby/google-protobuf.gemspec
  18. 4
      ruby/pom.xml
  19. 4
      src/google/protobuf/any.pb.h
  20. 4
      src/google/protobuf/api.pb.h
  21. 4
      src/google/protobuf/compiler/java/java_features.pb.h
  22. 4
      src/google/protobuf/compiler/plugin.pb.h
  23. 6
      src/google/protobuf/compiler/versions.h
  24. 4
      src/google/protobuf/cpp_features.pb.h
  25. 4
      src/google/protobuf/descriptor.pb.h
  26. 4
      src/google/protobuf/duration.pb.h
  27. 4
      src/google/protobuf/empty.pb.h
  28. 4
      src/google/protobuf/field_mask.pb.h
  29. 2
      src/google/protobuf/port_def.inc
  30. 4
      src/google/protobuf/source_context.pb.h
  31. 4
      src/google/protobuf/struct.pb.h
  32. 2
      src/google/protobuf/stubs/common.h
  33. 4
      src/google/protobuf/timestamp.pb.h
  34. 4
      src/google/protobuf/type.pb.h
  35. 4
      src/google/protobuf/wrappers.pb.h
  36. 20
      version.json

@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
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")

@ -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'

@ -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'

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

@ -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.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:

@ -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"

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

@ -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"

@ -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>

@ -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."

@ -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."

@ -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."

@ -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."

@ -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__

@ -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."

@ -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."

@ -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."

@ -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."

@ -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."

@ -204,7 +204,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#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

@ -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."

@ -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."

@ -44,7 +44,7 @@ namespace internal {
// 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"

@ -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."

@ -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."

@ -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."

@ -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"
}
}
}
Loading…
Cancel
Save