From 3487ae0c01af9130d2ee6436de142cfff9311aba Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 1 Aug 2023 10:27:01 -0700 Subject: [PATCH 1/2] Updating version.json and repo version numbers to: 24.0-rc3 --- 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/port_def.inc | 2 +- src/google/protobuf/stubs/common.h | 2 +- version.json | 20 +++++++++---------- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9bc45674ea5..38bfd46b035a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "4.24.0-rc-2") +set(protobuf_VERSION_STRING "4.24.0-rc-3") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 883da24bf629..e907cfa29701 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.24.0-rc2' + s.version = '4.24.0-rc3' 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 b782562bda99..40fbc87c469b 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.24.0-rc2' + s.version = '3.24.0-rc3' 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 1f4ae8df25a9..030074e6599f 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.24.0-rc2 + 3.24.0-rc3 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 7dfdee3b3cbc..b0e256b822a7 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.24.0-rc2 + 3.24.0-rc3 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/README.md b/java/README.md index 9c5bd980ac23..1d3eb6089010 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.24.0-rc-2 + 3.24.0-rc-3 ``` @@ -37,14 +37,14 @@ protobuf-java-util package: com.google.protobuf protobuf-java-util - 3.24.0-rc-2 + 3.24.0-rc-3 ``` ### 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-rc-2'` Again, +dependencies: `implementation 'com.google.protobuf:protobuf-java:3.24.0-rc-3'` 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 08d526dbfe38..29006712477c 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.24.0-RC2 + 3.24.0-RC3 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 24abc5c09750..17209e11e78d 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC2 + 3.24.0-RC3 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index fb220c8af694..8e4e52dcd33e 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC2 + 3.24.0-RC3 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index c30bde000e9b..4ed7a2e06e63 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC2 + 3.24.0-RC3 protobuf-kotlin diff --git a/java/lite.md b/java/lite.md index f2f09c431e79..b96668d42150 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.24.0-rc-2 + 3.24.0-rc-3 ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 8ce0235df8eb..d1475c0ef497 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC2 + 3.24.0-RC3 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index b47ceec9a111..d0ed278579b1 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC2 + 3.24.0-RC3 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index a19ed57a2d02..eb72093110e9 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.24.0-RC2 + 3.24.0-RC3 pom Protobuf Compiler diff --git a/java/util/pom.xml b/java/util/pom.xml index cab90cf4026e..304b2d9eebd8 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC2 + 3.24.0-RC3 protobuf-java-util diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 652901bc538c..b55185b3103b 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -127,7 +127,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.0RC2" +#define PHP_PROTOBUF_VERSION "3.24.0RC3" // 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 a359f161b9c2..4a66fac11e3c 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-rc-2" -PROTOBUF_JAVA_VERSION = "3.24.0-RC2" -PROTOBUF_PYTHON_VERSION = "4.24.0rc2" -PROTOBUF_PHP_VERSION = "3.24.0RC2" -PROTOBUF_RUBY_VERSION = "3.24.0.rc.2" +PROTOC_VERSION = "24.0-rc-3" +PROTOBUF_JAVA_VERSION = "3.24.0-RC3" +PROTOBUF_PYTHON_VERSION = "4.24.0rc3" +PROTOBUF_PHP_VERSION = "3.24.0RC3" +PROTOBUF_RUBY_VERSION = "3.24.0.rc.3" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 92b48cad7b80..cd097d191a30 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,4 +30,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '4.24.0rc2' +__version__ = '4.24.0rc3' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 5d7bf9238fe9..c0256d07aacc 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.24.0.rc.2" + s.version = "3.24.0.rc.3" 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 2be168f6beb7..ae8735c2691f 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 3.24.0-RC2 + 3.24.0-RC3 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.24.0-RC2 + 3.24.0-RC3 org.jruby diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index cdfdd2275b1b..deefe5b518b9 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -270,7 +270,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), #ifdef PROTOBUF_VERSION_SUFFIX #error PROTOBUF_VERSION_SUFFIX was previously defined #endif -#define PROTOBUF_VERSION_SUFFIX "-rc2" +#define PROTOBUF_VERSION_SUFFIX "-rc3" #ifdef PROTOBUF_ALWAYS_INLINE #error PROTOBUF_ALWAYS_INLINE was previously defined diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 564ed19db156..f7e80dc8e1fd 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -69,7 +69,7 @@ namespace internal { #define GOOGLE_PROTOBUF_VERSION 4024000 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc3" // 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/version.json b/version.json index 79094ed5ac84..10f72ab07c32 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "24.x": { - "protoc_version": "24.0-dev", + "protoc_version": "24.0-rc3", "lts": false, - "date": "2023-07-18", + "date": "2023-08-01", "languages": { - "cpp": "4.24.0-dev", - "csharp": "3.24.0-dev", - "java": "3.24.0-dev", - "javascript": "3.24.0-dev", - "objectivec": "3.24.0-dev", - "php": "3.24.0-dev", - "python": "4.24.0-dev", - "ruby": "3.24.0-dev" + "cpp": "4.24.0-rc3", + "csharp": "3.24.0-rc3", + "java": "3.24.0-rc3", + "javascript": "3.24.0-rc3", + "objectivec": "3.24.0-rc3", + "php": "3.24.0-rc3", + "python": "4.24.0-rc3", + "ruby": "3.24.0-rc3" } } } \ No newline at end of file From e82fc05571ad03112fa36e656a76a3128944111e Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 1 Aug 2023 10:27:01 -0700 Subject: [PATCH 2/2] Updating version.json to: 24.0-dev --- version.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/version.json b/version.json index 10f72ab07c32..4b1dd6217f61 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "24.x": { - "protoc_version": "24.0-rc3", + "protoc_version": "24.0-dev", "lts": false, "date": "2023-08-01", "languages": { - "cpp": "4.24.0-rc3", - "csharp": "3.24.0-rc3", - "java": "3.24.0-rc3", - "javascript": "3.24.0-rc3", - "objectivec": "3.24.0-rc3", - "php": "3.24.0-rc3", - "python": "4.24.0-rc3", - "ruby": "3.24.0-rc3" + "cpp": "4.24.0-dev", + "csharp": "3.24.0-dev", + "java": "3.24.0-dev", + "javascript": "3.24.0-dev", + "objectivec": "3.24.0-dev", + "php": "3.24.0-dev", + "python": "4.24.0-dev", + "ruby": "3.24.0-dev" } } } \ No newline at end of file