diff --git a/CMakeLists.txt b/CMakeLists.txt index 266b01b322b2..1b628a818d8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "4.23.0-rc-1") +set(protobuf_VERSION_STRING "4.23.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 249dad51f1a4..baafd5f3ecac 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.23.0-rc1' + s.version = '4.23.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 6f35be69f281..6bd42607d0b5 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.23.0-rc1' + s.version = '3.23.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 2655b87eb8f4..163ff3121323 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.23.0-rc1 + 3.23.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 b1fc5717f5c9..e908b6f29683 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.23.0-rc1 + 3.23.0-rc2 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/README.md b/java/README.md index 32ad5850c473..fd761dc7e85d 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.23.0-rc-1 + 3.23.0-rc-2 ``` @@ -37,14 +37,14 @@ protobuf-java-util package: com.google.protobuf protobuf-java-util - 3.23.0-rc-1 + 3.23.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.23.0-rc-1'` Again, +dependencies: `implementation 'com.google.protobuf:protobuf-java:3.23.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 9e0190766dc2..9c4c533604bd 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.23.0-RC1 + 3.23.0-RC2 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 80afa2e77787..adace564543f 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.23.0-RC1 + 3.23.0-RC2 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index a0ad298cdeca..85509cb5967c 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.23.0-RC1 + 3.23.0-RC2 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index 09849a8f33f9..2562e12e336a 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.23.0-RC1 + 3.23.0-RC2 protobuf-kotlin diff --git a/java/lite.md b/java/lite.md index 7d392e44eebf..1d677b5b4c92 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.23.0-rc-1 + 3.23.0-rc-2 ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 76db105dabf4..10e98f550c33 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.23.0-RC1 + 3.23.0-RC2 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index fd83571fceee..0194e661a17c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.23.0-RC1 + 3.23.0-RC2 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index ca46caa29640..34165fe67f58 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.23.0-RC1 + 3.23.0-RC2 pom Protobuf Compiler diff --git a/java/util/pom.xml b/java/util/pom.xml index aeb307e9d76a..7d9b6c0735ea 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.23.0-RC1 + 3.23.0-RC2 protobuf-java-util diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index cde54a30e168..f5c4c70d3a63 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.23.0RC1" +#define PHP_PROTOBUF_VERSION "3.23.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 68548e5d4c77..2f9a9f5d968e 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 = "23.0-rc-1" -PROTOBUF_JAVA_VERSION = "3.23.0-RC1" -PROTOBUF_PYTHON_VERSION = "4.23.0rc1" -PROTOBUF_PHP_VERSION = "3.23.0RC1" -PROTOBUF_RUBY_VERSION = "3.23.0.rc.1" +PROTOC_VERSION = "23.0-rc-2" +PROTOBUF_JAVA_VERSION = "3.23.0-RC2" +PROTOBUF_PYTHON_VERSION = "4.23.0rc2" +PROTOBUF_PHP_VERSION = "3.23.0RC2" +PROTOBUF_RUBY_VERSION = "3.23.0.rc.2" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 1af0fe8ab08f..47fc9b3421a4 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.23.0rc1' +__version__ = '4.23.0rc2' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 49fcd6fa9404..937ab3e25d3f 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.23.0.rc.1" + s.version = "3.23.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 c2d3263bf8a9..0025923264cc 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 3.23.0-RC1 + 3.23.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.23.0-RC1 + 3.23.0-RC2 org.jruby diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 17b1b5e68dce..12f0b4991dfa 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -246,7 +246,7 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and #ifdef PROTOBUF_VERSION_SUFFIX #error PROTOBUF_VERSION_SUFFIX was previously defined #endif -#define PROTOBUF_VERSION_SUFFIX "-rc1" +#define PROTOBUF_VERSION_SUFFIX "-rc2" #if defined(PROTOBUF_NAMESPACE) || defined(PROTOBUF_NAMESPACE_ID) #error PROTOBUF_NAMESPACE or PROTOBUF_NAMESPACE_ID was previously defined diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index a35696a3b033..67d476ed3ecc 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 4023000 // 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/version.json b/version.json index 77301baf906b..4e996cec68b1 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "23.x": { - "protoc_version": "23.0-dev", + "protoc_version": "23.0-rc2", "lts": false, - "date": "2023-04-25", + "date": "2023-04-28", "languages": { - "cpp": "4.23.0-dev", - "csharp": "3.23.0-dev", - "java": "3.23.0-dev", - "javascript": "3.23.0-dev", - "objectivec": "3.23.0-dev", - "php": "3.23.0-dev", - "python": "4.23.0-dev", - "ruby": "3.23.0-dev" + "cpp": "4.23.0-rc2", + "csharp": "3.23.0-rc2", + "java": "3.23.0-rc2", + "javascript": "3.23.0-rc2", + "objectivec": "3.23.0-rc2", + "php": "3.23.0-rc2", + "python": "4.23.0-rc2", + "ruby": "3.23.0-rc2" } } } \ No newline at end of file