From debc03dfc5d71d7d642dd1c8f7d1c04b36e8a065 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Wed, 5 May 2021 13:25:54 -0700 Subject: [PATCH] Update protobuf version to 3.16.0-rc2 (#8556) * Update CHANGES.txt * Update protobuf version --- CHANGES.txt | 2 ++ Protobuf-C++.podspec | 2 +- Protobuf.podspec | 2 +- configure.ac | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/lite/pom.xml | 2 +- java/pom.xml | 2 +- java/util/pom.xml | 2 +- js/package.json | 2 +- php/ext/google/protobuf/package.xml | 23 +++++++++++++++---- php/ext/google/protobuf/protobuf.h | 2 +- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- src/google/protobuf/port_def.inc | 2 +- src/google/protobuf/stubs/common.h | 2 +- 19 files changed, 38 insertions(+), 21 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 7c27a930bf..1805c9ac65 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -72,6 +72,8 @@ Ruby * Fixed quadratic memory usage when appending to arrays. (#8364) + * Fixed memory leak of Ruby arena objects. (#8461) + * Add support for proto3 json_name in compiler and field definitions. (#8356) Other * Some doc on AOT compilation and protobuf (#8294) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index fc3087fc36..df55c95493 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.16.0-rc1' + s.version = '3.16.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 index 253854ccd2..e4fd8bc227 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.16.0-rc1' + s.version = '3.16.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 index 5d56ac1ef9..4fd09e0d55 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.16.0-rc-1],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.16.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 1c6ca92873..fc14480ab6 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.16.0-rc1 + 3.16.0-rc2 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/master/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 8e5f59b9ee..5429aad714 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.16.0-rc1 + 3.16.0-rc2 7.2 Google Inc. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 461d6cc9c8..4c77b5b5c5 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.16.0-rc-1 + 3.16.0-rc-2 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index ee97fecdb3..c473173c21 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.16.0-rc-1 + 3.16.0-rc-2 protobuf-java diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 7e73849471..e34c94e05f 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.16.0-rc-1 + 3.16.0-rc-2 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index 4f8598d8be..a4902abd71 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.16.0-rc-1 + 3.16.0-rc-2 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index a1cfc9bc00..40fab6cffd 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.16.0-rc-1 + 3.16.0-rc-2 protobuf-java-util diff --git a/js/package.json b/js/package.json index 6c0e3adbd9..0bea4a820a 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.16.0-rc.1", + "version": "3.16.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 index 617133cb20..5bc1a7d4b8 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -1,5 +1,5 @@ - + protobuf pecl.php.net Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. @@ -10,10 +10,10 @@ protobuf-opensource@google.com yes - 2021-04-02 - + 2021-05-03 + - 3.16.0RC1 + 3.16.0RC2 3.16.0 @@ -917,5 +917,20 @@ G A release. + + + 3.16.0RC2 + 3.16.0 + + + beta + beta + + 2021-05-03 + + 3-Clause BSD License + + + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index b927c9fecc..5cec982af0 100644 --- 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.16.0RC1" +#define PHP_PROTOBUF_VERSION "3.16.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 index ddf65c8128..461af3e4e5 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.16.0-rc-1 + 3.16.0-rc-2 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 80a7bd0158..51b525d7c7 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__ = '3.16.0rc1' +__version__ = '3.16.0rc2' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index fab7842cd2..e33293a1e4 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.16.0.rc.1" + s.version = "3.16.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 index 6761a00655..0b1e58e5fe 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -340,7 +340,7 @@ #define PROTOBUF_VERSION 3016000 #define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3016000 #define PROTOBUF_MIN_PROTOC_VERSION 3016000 -#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 index 8beedd7ab8..55db0c33cf 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 3016000 // 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