diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
index 9d8815a8c8..1297ad3e82 100644
--- a/Protobuf-C++.podspec
+++ b/Protobuf-C++.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
- s.version = '3.21.0-rc1'
+ s.version = '3.21.0-rc2'
s.summary = 'Protocol Buffers v3 runtime library for C++.'
s.homepage = 'https://github.com/google/protobuf'
s.license = 'BSD-3-Clause'
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.cocoapods_version = '>= 1.0'
s.source = { :git => 'https://github.com/google/protobuf.git',
- :tag => "v#{s.version}" }
+ :tag => "v21.0-rc2" }
s.source_files = 'src/google/protobuf/*.{h,cc,inc}',
'src/google/protobuf/stubs/*.{h,cc}',
diff --git a/Protobuf.podspec b/Protobuf.podspec
index 37d7fc9a9d..643635d8bd 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.21.0-rc1'
+ s.version = '3.21.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'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.cocoapods_version = '>= 1.0'
s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git',
- :tag => "v#{s.version}" }
+ :tag => "v21.0-rc2" }
s.source_files = 'objectivec/*.{h,m}',
'objectivec/google/protobuf/Any.pbobjc.h',
diff --git a/configure.ac b/configure.ac
index 7cf520012a..61246b27be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_PREREQ(2.59)
# In the SVN trunk, the version should always be the next anticipated release
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
# the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[3.21.0-rc-1],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.21.0-rc-2],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable])
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
index 25c0609b40..92a860ee81 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.21.0-rc1
+ 3.21.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 40986da945..d634551328 100644
--- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj
+++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -4,7 +4,7 @@
C# runtime library for Protocol Buffers - Google's data interchange format.
Copyright 2015, Google Inc.
Google Protocol Buffers
- 3.21.0-rc1
+ 3.21.0-rc2
7.2
Google Inc.
diff --git a/java/README.md b/java/README.md
index 41cbc869e9..1fbc624c53 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.21.0-rc-1
+ 3.21.0-rc-2
```
@@ -37,7 +37,7 @@ protobuf-java-util package:
com.google.protobuf
protobuf-java-util
- 3.21.0-rc-1
+ 3.21.0-rc-2
```
@@ -45,7 +45,7 @@ protobuf-java-util package:
If you are using Gradle, add the following to your `build.gradle` file's dependencies:
```
- implementation 'com.google.protobuf:protobuf-java:3.21.0-rc-1'
+ implementation 'com.google.protobuf:protobuf-java:3.21.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 ce950a2095..a770cbb9fe 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-bom
- 3.21.0-rc-1
+ 3.21.0-rc-2
pom
Protocol Buffers [BOM]
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 8a33a507ae..bffa2958b4 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.21.0-rc-1
+ 3.21.0-rc-2
protobuf-java
diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index a4737d8296..fd3734d36a 100644
--- a/java/kotlin-lite/pom.xml
+++ b/java/kotlin-lite/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.21.0-rc-1
+ 3.21.0-rc-2
protobuf-kotlin-lite
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index a3f66409bd..c9eeb6d79b 100644
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.21.0-rc-1
+ 3.21.0-rc-2
protobuf-kotlin
diff --git a/java/lite.md b/java/lite.md
index fd6c163c1f..633478b4a1 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.21.0-rc-1
+ 3.21.0-rc-2
```
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index d62c1b375e..c10edfd444 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.21.0-rc-1
+ 3.21.0-rc-2
protobuf-javalite
diff --git a/java/pom.xml b/java/pom.xml
index a1d6ab06d2..467c06d0b1 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.21.0-rc-1
+ 3.21.0-rc-2
pom
Protocol Buffers [Parent]
diff --git a/java/util/pom.xml b/java/util/pom.xml
index f20e1e5c58..a12fd2226f 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.21.0-rc-1
+ 3.21.0-rc-2
protobuf-java-util
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
index d1d5d87d20..deda5c5b47 100644
--- a/php/ext/google/protobuf/package.xml
+++ b/php/ext/google/protobuf/package.xml
@@ -10,10 +10,10 @@
protobuf-opensource@google.com
yes
- 2022-05-10
-
+ 2022-05-19
+
- 3.21.0RC1
+ 3.21.0RC2
3.21.0
@@ -1298,5 +1298,20 @@ G A release.
+
+
+ 3.21.0RC2
+ 3.21.0
+
+
+ beta
+ beta
+
+ 2022-05-19
+
+ BSD-3-Clause
+
+
+
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index 292a0eeca0..f95179b053 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.21.0RC1"
+#define PHP_PROTOBUF_VERSION "3.21.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 94e2247452..5725bdd6c3 100644
--- a/protobuf_version.bzl
+++ b/protobuf_version.bzl
@@ -1,3 +1,3 @@
-PROTOC_VERSION = '21.0-rc-1'
-PROTOBUF_JAVA_VERSION = '3.21.0-rc-1'
-PROTOBUF_PYTHON_VERSION = '4.21.0-rc-1'
+PROTOC_VERSION = '21.0-rc-2'
+PROTOBUF_JAVA_VERSION = '3.21.0-rc-2'
+PROTOBUF_PYTHON_VERSION = '4.21.0-rc-2'
diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml
index 45c2123f13..80451f9716 100644
--- a/protoc-artifacts/pom.xml
+++ b/protoc-artifacts/pom.xml
@@ -8,7 +8,7 @@
com.google.protobuf
protoc
- 21.0-rc-1
+ 3.21.0-rc-2
pom
Protobuf Compiler
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index 49039d5e12..bd2faa4e5a 100644
--- 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.21.0rc1'
+__version__ = '4.21.0rc2'
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index ff55b64275..f86cda7656 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.21.0.rc.1"
+ s.version = "3.21.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 0d53cd1f35..0514dbe6e6 100644
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -9,7 +9,7 @@
com.google.protobuf.jruby
protobuf-jruby
- 3.21.0-rc-1
+ 3.21.0-rc-2
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.21.0-rc-1
+ 3.21.0-rc-2
org.jruby
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index 033563090e..78b97e6cca 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -193,7 +193,7 @@
#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 8b581ba63a..36a4b08e41 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -85,7 +85,7 @@ namespace internal {
#define GOOGLE_PROTOBUF_VERSION 3021000
// 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 21379503c7..a007aba97e 100644
--- a/version.json
+++ b/version.json
@@ -1,17 +1,17 @@
{
"21.x": {
- "protoc_version": "21.0-dev",
+ "protoc_version": "21.0-rc2",
"lts": false,
- "date": "2022-05-13",
+ "date": "2022-05-19",
"languages": {
- "cpp": "3.21.0-dev",
- "csharp": "3.21.0-dev",
- "java": "3.21.0-dev",
- "javascript": "3.21.0-dev",
- "objectivec": "3.21.0-dev",
- "php": "3.21.0-dev",
- "python": "4.21.0-dev",
- "ruby": "3.21.0-dev"
+ "cpp": "3.21.0-rc2",
+ "csharp": "3.21.0-rc2",
+ "java": "3.21.0-rc2",
+ "javascript": "3.21.0-rc2",
+ "objectivec": "3.21.0-rc2",
+ "php": "3.21.0-rc2",
+ "python": "4.21.0-rc2",
+ "ruby": "3.21.0-rc2"
}
}
}
\ No newline at end of file