From 6099c6505d73681bf98a5c5d8908cb5c3fd1bab9 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Tue, 6 Apr 2021 13:23:26 -0700 Subject: [PATCH 1/7] Updated CHANGES.txt for 3.16.0 (#8456) * Updated CHANGES.txt for 3.16.0 * Fix spelling errors --- .github/workflows/codespell.yml | 2 +- CHANGES.txt | 49 ++++++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 5d252faa06..aa4820b87d 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -13,4 +13,4 @@ jobs: with: check_filenames: true skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal - ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,OptIn" + ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin" diff --git a/CHANGES.txt b/CHANGES.txt index aff04e6dea..7c27a930bf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,20 @@ -Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) +2021-04-06 version 3.16.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) C++ + * Fix compiler warnings issue found in conformance_test_runner #8189 (#8190) + * Fix MinGW-w64 build issues. (#8286) + * [Protoc] C++ Resolved an issue where NO_DESTROY and CONSTINIT are in incorrect order (#8296) + * Fix PROTOBUF_CONSTINIT macro redefinition (#8323) + * Delete StringPiecePod (#8353) + * Fix gcc error: comparison of unsigned expression in '>= 0' is always … (#8309) + * Fix cmake install on iOS (#8301) + * Create a CMake option to control whether or not RTTI is enabled (#8347) + * Fix endian.h location on FreeBSD (#8351) + * Refactor util::Status (#8354) + * Make util::Status more similar to absl::Status (#8405) + * Fix -Wsuggest-destructor-override for generated C++ proto classes. (#8408) + * Refactor StatusOr and StringPiece (#8406) + * Refactor uint128 (#8416) * The ::pb namespace is no longer exposed due to conflicts. * Allow MessageDifferencer::TreatAsSet() (and friends) to override previous calls instead of crashing. @@ -25,20 +39,47 @@ Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) * util::DefaultFieldComparator will be final in a future version of protobuf. Subclasses should inherit from SimpleFieldComparator instead. - Java: + C# + * Add .NET 5 target and improve WriteString performance with SIMD (#8147) + + Java + * deps: update JUnit and Truth (#8319) * Detect invalid overflow of byteLimit and return InvalidProtocolBufferException as documented. * Exceptions thrown while reading from an InputStream in parseFrom are now included as causes. * Support potentially more efficient proto parsing from RopeByteStrings. * Clarify runtime of ByteString.Output.toStringBuffer(). + * Added UnsafeByteOperations to protobuf-lite (#8426) + + JavaScript + * Make Any.pack() chainable. Python + * Fix some constness / char literal issues being found by MSVC standard conforming mode (#8344) + * Switch on "new" buffer API (#8339) + * Enable crosscompiling aarch64 python wheels under dockcross manylinux docker image (#8280) * Fixed a bug in text format where a trailing colon was printed for repeated field. * When TextFormat encounters a duplicate message map key, replace the current one instead of merging. - JavaScript - * Make Any.pack() chainable. + Objective-C + * Move the class map to a CFDictionary. (#8328) + + PHP + * read_property() handler is not supposed to return NULL (#8362) + * Changed parameter type from long to integer (#7613) + * fix: README supported PHP version for C extension (#8236) + + Ruby + * Fixed quadratic memory usage when appending to arrays. (#8364) + + Other + * Some doc on AOT compilation and protobuf (#8294) + * [CMake] Ability to pass options to protoc executable from cmake (#8374) + * Add --fatal_warnings flag to treat warnings as errors (#8131) + * [bazel] Remove deprecated way to depend on googletest (#8396) + * add error returns missing from protoc to prevent it from exiting with… (#8409) + 2021-04-02 version 3.15.7 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) From 7689f00ba8d1e818f2a8e7a4bf24577d9ccd5d84 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Tue, 6 Apr 2021 14:26:56 -0700 Subject: [PATCH 2/7] Update protobuf version (#8448) --- Protobuf-C++.podspec | 2 +- Protobuf.podspec | 2 +- configure.ac | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 4 +-- 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 | 25 +++++++++++++++---- php/ext/google/protobuf/protobuf.h | 2 +- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- src/Makefile.am | 2 +- src/google/protobuf/any.pb.h | 4 +-- src/google/protobuf/api.pb.h | 4 +-- src/google/protobuf/compiler/plugin.pb.h | 4 +-- src/google/protobuf/descriptor.pb.h | 4 +-- src/google/protobuf/duration.pb.h | 4 +-- src/google/protobuf/empty.pb.h | 4 +-- src/google/protobuf/field_mask.pb.h | 4 +-- src/google/protobuf/port_def.inc | 10 ++++---- src/google/protobuf/source_context.pb.h | 4 +-- src/google/protobuf/struct.pb.h | 4 +-- src/google/protobuf/stubs/common.h | 10 ++++---- src/google/protobuf/timestamp.pb.h | 4 +-- src/google/protobuf/type.pb.h | 4 +-- src/google/protobuf/wrappers.pb.h | 4 +-- 31 files changed, 71 insertions(+), 56 deletions(-) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 26e3825da9..fc3087fc36 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.15.7' + s.version = '3.16.0-rc1' 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 28a046a23d..253854ccd2 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.15.7' + s.version = '3.16.0-rc1' 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 0f4b0910c4..5d56ac1ef9 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.15.7],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.16.0-rc-1],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 9af72081a5..1c6ca92873 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.15.7 + 3.16.0-rc1 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 1a5f3423fa..8e5f59b9ee 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -1,10 +1,10 @@ - + C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.15.7 + 3.16.0-rc1 7.2 Google Inc. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index c8a92e466a..461d6cc9c8 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.15.7 + 3.16.0-rc-1 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 0176b9fc26..ee97fecdb3 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.15.7 + 3.16.0-rc-1 protobuf-java diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 20740038f7..7e73849471 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.15.7 + 3.16.0-rc-1 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index b93d8ea49c..4f8598d8be 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.15.7 + 3.16.0-rc-1 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index 58999799b9..a1cfc9bc00 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.15.7 + 3.16.0-rc-1 protobuf-java-util diff --git a/js/package.json b/js/package.json index db83dc5acd..6c0e3adbd9 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.15.7", + "version": "3.16.0-rc.1", "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 f20eb109a0..617133cb20 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -11,14 +11,14 @@ yes 2021-04-02 - + - 3.15.7 - 3.15.7 + 3.16.0RC1 + 3.16.0 - stable - stable + beta + beta 3-Clause BSD License @@ -902,5 +902,20 @@ G A release. + + + 3.16.0RC1 + 3.16.0 + + + beta + beta + + 2021-04-02 + + 3-Clause BSD License + + + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 46886746d4..b927c9fecc 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.15.7" +#define PHP_PROTOBUF_VERSION "3.16.0RC1" // 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 defc194e8a..ddf65c8128 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.15.7 + 3.16.0-rc-1 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index e4d941cf4a..80a7bd0158 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.15.7' +__version__ = '3.16.0rc1' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 7ff45f8114..fab7842cd2 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.15.7" + s.version = "3.16.0.rc.1" 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/Makefile.am b/src/Makefile.am index 648c2679f3..e0c6680d82 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ else PTHREAD_DEF = endif -PROTOBUF_VERSION = 26:7:0 +PROTOBUF_VERSION = 27:0:0 if GCC # Turn on all warnings except for sign comparison (we ignore sign comparison diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 824934f2e2..81aebe88bf 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index df54760037..13e42d1a7d 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index e2bfb2c9b2..af51e546ae 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 27be4912c2..861cc4aadc 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 0aedba45f4..fdab83d79b 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 289e5570c6..eb3c11c3b8 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 355dff4b8d..e6047def3a 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 73cd630352..6761a00655 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -337,14 +337,14 @@ // Shared google3/opensource definitions. ////////////////////////////////////// -#define PROTOBUF_VERSION 3015007 -#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3015000 -#define PROTOBUF_MIN_PROTOC_VERSION 3015000 -#define PROTOBUF_VERSION_SUFFIX "" +#define PROTOBUF_VERSION 3016000 +#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3016000 +#define PROTOBUF_MIN_PROTOC_VERSION 3016000 +#define PROTOBUF_VERSION_SUFFIX "-rc1" // The minimum library version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3015000 +#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3016000 #if defined(GOOGLE_PROTOBUF_NO_RTTI) && GOOGLE_PROTOBUF_NO_RTTI #define PROTOBUF_RTTI 0 diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index cd3213a77c..ef58998371 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 8dbefa416d..f0ee367eff 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 4bac057f56..8beedd7ab8 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -82,23 +82,23 @@ namespace internal { // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 3015007 +#define GOOGLE_PROTOBUF_VERSION 3016000 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1" // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code // generator. -static const int kMinHeaderVersionForLibrary = 3015000; +static const int kMinHeaderVersionForLibrary = 3016000; // The minimum protoc version which works with the current version of the // headers. -#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3015000 +#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3016000 // The minimum header version which works with the current version of // protoc. This constant should only be used in VerifyVersion(). -static const int kMinHeaderVersionForProtoc = 3015000; +static const int kMinHeaderVersionForProtoc = 3016000; // Verifies that the headers and libraries are compatible. Use the macro // below to call this. diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index f399dd03fe..cc5efca92e 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 7d0cd6d08f..a34fd60060 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 0bc4949585..5659b5f4ad 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -8,12 +8,12 @@ #include #include -#if PROTOBUF_VERSION < 3015000 +#if PROTOBUF_VERSION < 3016000 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3015007 < PROTOBUF_MIN_PROTOC_VERSION +#if 3016000 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. From e8b78f8208971a28e566198d38e43ad5f49a9009 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Wed, 7 Apr 2021 16:46:18 -0700 Subject: [PATCH 3/7] Fixed memory leak of Ruby arena objects. (#8465) In our free() method, we were freeing the memory from the upb arena but we were failing to free the memory for the Ruby arena object. This was causing every Ruby arena object to leak: even though the objects were getting GC'd, the underlying memory was not getting released. Co-authored-by: Joshua Haberman --- ruby/ext/google/protobuf_c/protobuf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby/ext/google/protobuf_c/protobuf.c b/ruby/ext/google/protobuf_c/protobuf.c index 63c7b9ab72..19917fe4f1 100644 --- a/ruby/ext/google/protobuf_c/protobuf.c +++ b/ruby/ext/google/protobuf_c/protobuf.c @@ -180,6 +180,7 @@ static void Arena_mark(void *data) { static void Arena_free(void *data) { Arena *arena = data; upb_arena_free(arena->arena); + xfree(arena); } static VALUE cArena; From 4aa425c6c5eb7914582ebd67ab8ecac464bdf271 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Tue, 20 Apr 2021 13:52:44 -0700 Subject: [PATCH 4/7] Cherry-pick #8356 into 3.16.x (#8518) * Ruby: Add support for proto3 json_name in compiler and field definitions * Address review feedback * Add test for json_name functionality Co-authored-by: Lukas Fittl --- ruby/ext/google/protobuf_c/defs.c | 43 +++++++++++++++---- ruby/tests/encode_decode_test.rb | 6 +++ ruby/tests/generated_code.proto | 4 ++ .../protobuf/compiler/ruby/ruby_generator.cc | 5 +++ 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/ruby/ext/google/protobuf_c/defs.c b/ruby/ext/google/protobuf_c/defs.c index 1d912c1a2e..992f54bc4d 100644 --- a/ruby/ext/google/protobuf_c/defs.c +++ b/ruby/ext/google/protobuf_c/defs.c @@ -868,6 +868,20 @@ static VALUE FieldDescriptor_default(VALUE _self) { return Convert_UpbToRuby(default_val, TypeInfo_get(self->fielddef), Qnil); } + +/* + * call-seq: + * FieldDescriptor.json_name => json_name + * + * Returns this field's json_name, as a Ruby string, or nil if not yet set. + */ +static VALUE FieldDescriptor_json_name(VALUE _self) { + FieldDescriptor* self = ruby_to_FieldDescriptor(_self); + const upb_fielddef *f = self->fielddef; + const char *json_name = upb_fielddef_jsonname(f); + return rb_str_new2(json_name); +} + /* * call-seq: * FieldDescriptor.label => label @@ -1043,6 +1057,7 @@ static void FieldDescriptor_register(VALUE module) { rb_define_method(klass, "name", FieldDescriptor_name, 0); rb_define_method(klass, "type", FieldDescriptor__type, 0); rb_define_method(klass, "default", FieldDescriptor_default, 0); + rb_define_method(klass, "json_name", FieldDescriptor_json_name, 0); rb_define_method(klass, "label", FieldDescriptor_label, 0); rb_define_method(klass, "number", FieldDescriptor_number, 0); rb_define_method(klass, "submsg_name", FieldDescriptor_submsg_name, 0); @@ -1750,6 +1765,16 @@ static void msgdef_add_field(VALUE msgbuilder_rb, upb_label_t label, VALUE name, field_proto, FileBuilderContext_strdup(self->file_builder, default_value)); } + + if (rb_funcall(options, rb_intern("key?"), 1, + ID2SYM(rb_intern("json_name"))) == Qtrue) { + VALUE json_name = + rb_hash_lookup(options, ID2SYM(rb_intern("json_name"))); + + google_protobuf_FieldDescriptorProto_set_json_name( + field_proto, + FileBuilderContext_strdup(self->file_builder, json_name)); + } } if (oneof_index >= 0) { @@ -1899,18 +1924,20 @@ static VALUE MessageBuilderContext_required(int argc, VALUE* argv, */ static VALUE MessageBuilderContext_repeated(int argc, VALUE* argv, VALUE _self) { - VALUE name, type, number, type_class; + VALUE name, type, number; + VALUE type_class, options = Qnil; - if (argc < 3) { - rb_raise(rb_eArgError, "Expected at least 3 arguments."); + rb_scan_args(argc, argv, "32", &name, &type, &number, &type_class, &options); + + // Allow passing (name, type, number, options) or + // (name, type, number, type_class, options) + if (argc == 4 && RB_TYPE_P(type_class, T_HASH)) { + options = type_class; + type_class = Qnil; } - name = argv[0]; - type = argv[1]; - number = argv[2]; - type_class = (argc > 3) ? argv[3] : Qnil; msgdef_add_field(_self, UPB_LABEL_REPEATED, name, type, number, type_class, - Qnil, -1, false); + options, -1, false); return Qnil; } diff --git a/ruby/tests/encode_decode_test.rb b/ruby/tests/encode_decode_test.rb index cce364d0d8..429ac43322 100755 --- a/ruby/tests/encode_decode_test.rb +++ b/ruby/tests/encode_decode_test.rb @@ -95,4 +95,10 @@ class EncodeDecodeTest < Test::Unit::TestCase end end + def test_json_name + msg = A::B::C::TestJsonName.new(:value => 42) + json = msg.to_json + assert_match json, "{\"CustomJsonName\":42}" + end + end diff --git a/ruby/tests/generated_code.proto b/ruby/tests/generated_code.proto index e8116697d7..bfdfa5aa78 100644 --- a/ruby/tests/generated_code.proto +++ b/ruby/tests/generated_code.proto @@ -83,3 +83,7 @@ message TestUnknown { map map_unknown = 67; int32 unknown_field = 89; } + +message TestJsonName { + int32 value = 1 [json_name = "CustomJsonName"]; +} diff --git a/src/google/protobuf/compiler/ruby/ruby_generator.cc b/src/google/protobuf/compiler/ruby/ruby_generator.cc index a6935c7658..cca69de087 100644 --- a/src/google/protobuf/compiler/ruby/ruby_generator.cc +++ b/src/google/protobuf/compiler/ruby/ruby_generator.cc @@ -220,6 +220,11 @@ void GenerateField(const FieldDescriptor* field, io::Printer* printer) { DefaultValueForField(field)); } + if (field->has_json_name()) { + printer->Print(", json_name: \"$json_name$\"", "json_name", + field->json_name()); + } + printer->Print("\n"); } } From 17b0fb9149109e22d56cfa27f1f17b04508ea726 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Mon, 3 May 2021 16:26:59 -0700 Subject: [PATCH 5/7] Make update_version.py compatible with Python 3 (#8555) --- update_version.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/update_version.py b/update_version.py index 470e4251e6..cb5ab98429 100755 --- a/update_version.py +++ b/update_version.py @@ -13,25 +13,25 @@ import sys from xml.dom import minidom if len(sys.argv) < 2 or len(sys.argv) > 3: - print """ + print(""" [ERROR] Please specify a version. ./update_version.py .. [] Example: ./update_version.py 3.7.1 2 -""" +""") exit(1) NEW_VERSION = sys.argv[1] NEW_VERSION_INFO = [int(x) for x in NEW_VERSION.split('.')] if len(NEW_VERSION_INFO) != 3: - print """ + print(""" [ERROR] Version must be in the format .. Example: ./update_version.py 3.7.3 -""" +""") exit(1) RC_VERSION = -1 @@ -71,9 +71,9 @@ def RewriteXml(filename, rewriter, add_xml_prefix=True): content = document.toxml().replace('', '') file_handle = open(filename, 'wb') if add_xml_prefix: - file_handle.write('\n') - file_handle.write(content) - file_handle.write('\n') + file_handle.write(b'\n') + file_handle.write(content.encode('utf-8')) + file_handle.write(b'\n') file_handle.close() @@ -83,7 +83,7 @@ def RewriteTextFile(filename, line_rewriter): for line in lines: updated_lines.append(line_rewriter(line)) if lines == updated_lines: - print '%s was not updated. Please double check.' % filename + print('%s was not updated. Please double check.' % filename) f = open(filename, 'w') f.write(''.join(updated_lines)) f.close() @@ -245,11 +245,11 @@ def UpdateMakefile(): protobuf_version_offset = 11 expected_major_version = 3 if NEW_VERSION_INFO[0] != expected_major_version: - print """[ERROR] Major protobuf version has changed. Please update + print("""[ERROR] Major protobuf version has changed. Please update update_version.py to readjust the protobuf_version_offset and expected_major_version such that the PROTOBUF_VERSION in src/Makefile.am is always increasing. - """ + """) exit(1) protobuf_version_info = '%d:%d:0' % ( From debc03dfc5d71d7d642dd1c8f7d1c04b36e8a065 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Wed, 5 May 2021 13:25:54 -0700 Subject: [PATCH 6/7] 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 From 2dc747c574b68a808ea4699d26942c8132fe2b09 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Thu, 6 May 2021 12:50:11 -0700 Subject: [PATCH 7/7] Update PHP release notes and update version to 3.16.0 (#8573) * Updated PHP release notes in packages.xml * Update protobuf version to 3.16.0 --- 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 | 31 ++++++++++++++----- 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 +- 18 files changed, 41 insertions(+), 24 deletions(-) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index df55c95493..707f66d881 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-rc2' + s.version = '3.16.0' 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 e4fd8bc227..97f74a5914 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-rc2' + s.version = '3.16.0' 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 4fd09e0d55..6251e37f3a 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-2],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.16.0],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index fc14480ab6..f555fed37b 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-rc2 + 3.16.0 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 5429aad714..cd6bd3c392 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-rc2 + 3.16.0 7.2 Google Inc. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 4c77b5b5c5..b71e56d9dc 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.16.0-rc-2 + 3.16.0 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index c473173c21..934d095152 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.16.0-rc-2 + 3.16.0 protobuf-java diff --git a/java/lite/pom.xml b/java/lite/pom.xml index e34c94e05f..821266a3db 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.16.0-rc-2 + 3.16.0 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index a4902abd71..0cb9dd793f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.16.0-rc-2 + 3.16.0 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index 40fab6cffd..8bc6a06682 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.16.0-rc-2 + 3.16.0 protobuf-java-util diff --git a/js/package.json b/js/package.json index 0bea4a820a..7d44eb6100 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.16.0-rc.2", + "version": "3.16.0", "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 5bc1a7d4b8..beccc86e9e 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,19 +10,21 @@ protobuf-opensource@google.com yes - 2021-05-03 - + 2021-05-05 + - 3.16.0RC2 + 3.16.0 3.16.0 - beta - beta + stable + stable 3-Clause BSD License - No new changes in 3.15.7 + * read_property() handler is not supposed to return NULL (#8362) + * Changed parameter type from long to integer (#7613) + * fix: README supported PHP version for C extension (#8236) @@ -932,5 +934,20 @@ G A release. + + + 3.16.0 + 3.16.0 + + + stable + stable + + 2021-05-05 + + 3-Clause BSD License + + + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 5cec982af0..ac3d8c1156 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.0RC2" +#define PHP_PROTOBUF_VERSION "3.16.0" // 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 461af3e4e5..c23e2f2936 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.16.0-rc-2 + 3.16.0 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 51b525d7c7..9de3619193 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.0rc2' +__version__ = '3.16.0' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index e33293a1e4..287c5a635d 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.2" + s.version = "3.16.0" 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 0b1e58e5fe..7bfcfa96e7 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 "-rc2" +#define PROTOBUF_VERSION_SUFFIX "" // 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 55db0c33cf..be14a6f1e8 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 "-rc2" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code