From ba1aab2baf19e83cc8c5532f98e5f90bd6d21fd5 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 18 Oct 2023 09:57:30 -0700 Subject: [PATCH 1/2] Updating version.json and repo version numbers to: 25.0-rc2 --- CMakeLists.txt | 2 +- Protobuf-C++.podspec | 2 +- Protobuf.podspec | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/README.md | 6 +++--- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/kotlin-lite/pom.xml | 2 +- java/kotlin/pom.xml | 2 +- java/lite.md | 2 +- java/lite/pom.xml | 2 +- java/pom.xml | 2 +- java/protoc/pom.xml | 2 +- java/util/pom.xml | 2 +- php/ext/google/protobuf/protobuf.h | 2 +- protobuf_version.bzl | 10 +++++----- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- ruby/pom.xml | 4 ++-- src/google/protobuf/any.pb.h | 2 +- src/google/protobuf/api.pb.h | 2 +- .../protobuf/compiler/java/java_features.pb.h | 2 +- src/google/protobuf/compiler/plugin.pb.h | 2 +- .../protobuf/compiler/versions_suffix.h | 2 +- src/google/protobuf/cpp_features.pb.h | 2 +- src/google/protobuf/descriptor.pb.h | 2 +- src/google/protobuf/duration.pb.h | 2 +- src/google/protobuf/empty.pb.h | 2 +- src/google/protobuf/field_mask.pb.h | 2 +- src/google/protobuf/port_def.inc | 2 +- src/google/protobuf/source_context.pb.h | 2 +- src/google/protobuf/struct.pb.h | 2 +- src/google/protobuf/stubs/common.h | 2 +- src/google/protobuf/timestamp.pb.h | 2 +- src/google/protobuf/type.pb.h | 2 +- src/google/protobuf/wrappers.pb.h | 2 +- version.json | 20 +++++++++---------- 38 files changed, 54 insertions(+), 54 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b4f36893d..868674460e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "4.25.0-rc-1") +set(protobuf_VERSION_STRING "4.25.0-rc-2") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 29c49d02f9..4f7ce1f7ee 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.0-rc1' + s.version = '4.25.0-rc2' 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 ef3b315579..6852f2d265 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.0-rc1' + s.version = '3.25.0-rc2' 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 9b1508c2f1..4cd5e49707 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.25.0-rc1 + 3.25.0-rc2 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/main/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 447b824173..1623bd1e2c 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -5,7 +5,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.25.0-rc1 + 3.25.0-rc2 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/README.md b/java/README.md index 45e5edd18b..acbdb00051 100644 --- a/java/README.md +++ b/java/README.md @@ -23,7 +23,7 @@ If you are using Maven, use the following: com.google.protobuf protobuf-java - 3.25.0-rc-1 + 3.25.0-rc-2 ``` @@ -37,14 +37,14 @@ protobuf-java-util package: com.google.protobuf protobuf-java-util - 3.25.0-rc-1 + 3.25.0-rc-2 ``` ### Gradle If you are using Gradle, add the following to your `build.gradle` file's -dependencies: `implementation 'com.google.protobuf:protobuf-java:3.25.0-rc-1'` Again, +dependencies: `implementation 'com.google.protobuf:protobuf-java:3.25.0-rc-2'` Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index aa715919f6..24a7ba1d42 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.25.0-RC1 + 3.25.0-RC2 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 794cfc6aac..8942e32b59 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.25.0-RC1 + 3.25.0-RC2 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index 2cfe928a4f..0074e6f7fa 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.25.0-RC1 + 3.25.0-RC2 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index 8b2c2a82f0..b7dd892c10 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.25.0-RC1 + 3.25.0-RC2 protobuf-kotlin diff --git a/java/lite.md b/java/lite.md index d7a07b3968..910546619b 100644 --- a/java/lite.md +++ b/java/lite.md @@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following: com.google.protobuf protobuf-javalite - 3.25.0-rc-1 + 3.25.0-rc-2 ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index d88eff6343..9d4ab79be5 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.25.0-RC1 + 3.25.0-RC2 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index 9794219de4..44dda53871 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.25.0-RC1 + 3.25.0-RC2 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index b9d1f9b679..f3002179fb 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.25.0-RC1 + 3.25.0-RC2 pom Protobuf Compiler diff --git a/java/util/pom.xml b/java/util/pom.xml index 686a8b6f9e..d374d425c9 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.25.0-RC1 + 3.25.0-RC2 protobuf-java-util diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 81bb489a9e..ad138218b8 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/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.25.0RC1" +#define PHP_PROTOBUF_VERSION "3.25.0RC2" // 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 a0660c18a6..ed03f12247 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.0-rc-1" -PROTOBUF_JAVA_VERSION = "3.25.0-RC1" -PROTOBUF_PYTHON_VERSION = "4.25.0rc1" -PROTOBUF_PHP_VERSION = "3.25.0RC1" -PROTOBUF_RUBY_VERSION = "3.25.0.rc.1" +PROTOC_VERSION = "25.0-rc-2" +PROTOBUF_JAVA_VERSION = "3.25.0-RC2" +PROTOBUF_PYTHON_VERSION = "4.25.0rc2" +PROTOBUF_PHP_VERSION = "3.25.0RC2" +PROTOBUF_RUBY_VERSION = "3.25.0.rc.2" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 5e1fbecb5f..09f7a3d8b6 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.0rc1' +__version__ = '4.25.0rc2' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 4eb0d5aee8..ecfa8f97c3 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.0.rc.1" + s.version = "3.25.0.rc.2" 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 a2bf3069c9..4f60d02c19 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 3.25.0-RC1 + 3.25.0-RC2 Protocol Buffer JRuby native extension Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ com.google.protobuf protobuf-java-util - 3.25.0-RC1 + 3.25.0-RC2 org.jruby diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 02c0fd0e13..89cb011789 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 0528fd486b..a778c373bd 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 120c7e4def..64297ead99 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.24.0-main +// Protobuf C++ Version: 4.25.0-rc2 #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 diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 793da14114..459abfcbe8 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh diff --git a/src/google/protobuf/compiler/versions_suffix.h b/src/google/protobuf/compiler/versions_suffix.h index 3a3638340b..0210cb7dff 100644 --- a/src/google/protobuf/compiler/versions_suffix.h +++ b/src/google/protobuf/compiler/versions_suffix.h @@ -21,6 +21,6 @@ // // Please avoid changing it manually, as they should be updated automatically by // the Protobuf release process. -#define PROTOBUF_GENCODE_VERSION_SUFFIX "-rc1" +#define PROTOBUF_GENCODE_VERSION_SUFFIX "-rc2" #endif // GOOGLE_PROTOBUF_COMPILER_VERSIONS_SUFFIX_H__ diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index cf71ba5475..3898235022 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 57d3aac804..560e66c459 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 4fbcf72481..a306db4f7a 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 01038538ef..91ef8c784b 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 1219edf5b9..bb2ca71253 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 5e2e67b580..a89add5912 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -219,7 +219,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), #ifdef PROTOBUF_VERSION_SUFFIX #error PROTOBUF_VERSION_SUFFIX was previously defined #endif -#define PROTOBUF_VERSION_SUFFIX "-rc1" +#define PROTOBUF_VERSION_SUFFIX "-rc2" #ifdef PROTOBUF_MINIMUM_EDITION #error PROTOBUF_MINIMUM_EDITION was previously defined diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index ce751aae5c..066c0a45d6 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index cd46e36068..e50cf53b32 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 869a1c0d7e..cfd72f171c 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -47,7 +47,7 @@ namespace internal { #define GOOGLE_PROTOBUF_VERSION 4025000 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2" // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 31b2fa99fc..0c513a27a9 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 2dac8b88e6..362165804d 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 40c030635d..224ccd5c4a 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.0-rc1 +// Protobuf C++ Version: 4.25.0-rc2 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh diff --git a/version.json b/version.json index 5c3c0557ea..c8a1223a46 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "25.x": { - "protoc_version": "25.0-dev", + "protoc_version": "25.0-rc2", "lts": false, - "date": "2023-10-16", + "date": "2023-10-18", "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" + "cpp": "4.25.0-rc2", + "csharp": "3.25.0-rc2", + "java": "3.25.0-rc2", + "javascript": "3.25.0-rc2", + "objectivec": "3.25.0-rc2", + "php": "3.25.0-rc2", + "python": "4.25.0-rc2", + "ruby": "3.25.0-rc2" } } } \ No newline at end of file From 08b6c404af3cba3e054bec05221faa296584dba9 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 18 Oct 2023 09:57:30 -0700 Subject: [PATCH 2/2] Updating version.json to: 25.0-dev --- version.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/version.json b/version.json index c8a1223a46..4263fdcd3a 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "25.x": { - "protoc_version": "25.0-rc2", + "protoc_version": "25.0-dev", "lts": false, "date": "2023-10-18", "languages": { - "cpp": "4.25.0-rc2", - "csharp": "3.25.0-rc2", - "java": "3.25.0-rc2", - "javascript": "3.25.0-rc2", - "objectivec": "3.25.0-rc2", - "php": "3.25.0-rc2", - "python": "4.25.0-rc2", - "ruby": "3.25.0-rc2" + "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" } } } \ No newline at end of file