Update protobuf version

protocolbuffers · Feb 17, 2021 · 8260126 · 8260126
1 parent c741c46
commit 8260126
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 22 deletions.
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
-  s.version  = '3.15.0-rc1'
+  s.version  = '3.15.0-rc2'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = '3-Clause BSD License'

diff --git 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.15.0-rc1'
+  s.version  = '3.15.0-rc2'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = '3-Clause BSD License'

diff --git 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.15.0-rc-1],[[email protected]],[protobuf])
+AC_INIT([Protocol Buffers],[3.15.0-rc-2],[[email protected]],[protobuf])
 
 AM_MAINTAINER_MODE([enable])
 

diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
@@ -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.15.0-rc1</version>
+    <version>3.15.0-rc2</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>

diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -4,7 +4,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.15.0-rc1</VersionPrefix>
+    <VersionPrefix>3.15.0-rc2</VersionPrefix>
     <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
     <LangVersion>7.2</LangVersion>
     <Authors>Google Inc.</Authors>

diff --git a/java/bom/pom.xml b/java/bom/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.15.0-rc-1</version>
+  <version>3.15.0-rc-2</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

diff --git a/java/core/pom.xml b/java/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.15.0-rc-1</version>
+    <version>3.15.0-rc-2</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

diff --git a/java/lite/pom.xml b/java/lite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.15.0-rc-1</version>
+    <version>3.15.0-rc-2</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

diff --git a/java/pom.xml b/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.15.0-rc-1</version>
+  <version>3.15.0-rc-2</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>

diff --git a/java/util/pom.xml b/java/util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.15.0-rc-1</version>
+    <version>3.15.0-rc-2</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "google-protobuf",
-  "version": "3.15.0-rc.1",
+  "version": "3.15.0-rc.2",
   "description": "Protocol Buffers for JavaScript",
   "main": "google-protobuf.js",
   "files": [

diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
@@ -10,10 +10,10 @@
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2021-02-05</date>
- <time>14:15:36</time>
+ <date>2021-02-17</date>
+ <time>09:10:33</time>
  <version>
-  <release>3.15.0RC1</release>
+  <release>3.15.0RC2</release>
   <api>3.15.0</api>
  </version>
  <stability>
@@ -24,9 +24,9 @@
  <notes>
  New changes in 3.15.0:
   * unregister INI entries and fix invalid read on shutdown (#8042)
-  * Fix PhpDoc comments for message accessors to include "|null". (#8136)
+  * Fix PhpDoc comments for message accessors to include &quot;|null&quot;. (#8136)
   * fix: convert native PHP floats to single precision (#8187)
-  * Fixed PHP to support field numbers >=2**28. (#8235)
+  * Fixed PHP to support field numbers &gt;=2**28. (#8235)
   * feat: add support for deprecated fields to PHP compiler (#8223)
   * Protect against stack overflow if the user derives from Message. (#8248)
   * Fixed clone for Message, RepeatedField, and MapField. (#8245)
@@ -775,5 +775,20 @@ G  A release.
    <notes>
    </notes>
   </release>
+  <release>
+   <version>
+    <release>3.15.0RC2</release>
+    <api>3.15.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2021-02-17</date>
+   <time>09:10:33</time>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
+   <notes>
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
@@ -76,7 +76,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.15.0RC1"
+#define PHP_PROTOBUF_VERSION "3.15.0RC2"
 
 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:

diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml
@@ -8,7 +8,7 @@
   </parent>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protoc</artifactId>
-  <version>3.15.0-rc-1</version>
+  <version>3.15.0-rc-2</version>
   <packaging>pom</packaging>
   <name>Protobuf Compiler</name>
   <description>

diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
@@ -30,4 +30,4 @@
 
 # Copyright 2007 Google Inc. All Rights Reserved.
 
-__version__ = '3.15.0rc1'
+__version__ = '3.15.0rc2'
diff --git 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.15.0.rc.1"
+  s.version     = "3.15.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/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -338,7 +338,7 @@
 #define PROTOBUF_VERSION 3015000
 #define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3015000
 #define PROTOBUF_MIN_PROTOC_VERSION 3015000
-#define PROTOBUF_VERSION_SUFFIX "-rc1"
+#define PROTOBUF_VERSION_SUFFIX "-rc2"
 
 // The minimum library version which works with the current version of the
 // headers.

diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
@@ -85,7 +85,7 @@ namespace internal {
 #define GOOGLE_PROTOBUF_VERSION 3015000
 
 // 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