Merge pull request #10044 from protocolbuffers/21.x-202205252102

Update versions and changelog for 21.x

CHANGES.txt

@@ -1,3 +1,53 @@
+2022-05-25 version 21.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+
+  C++
+  * cmake: Call get_filename_component() with DIRECTORY mode instead of PATH mode (#9614)
+  * Escape GetObject macro inside protoc-generated code (#9739)
+  * Update CMake configuration to add a dependency on Abseil (#9793)
+  * Fix cmake install targets (#9822)
+  * Use __constinit only in GCC 12.2 and up (#9936)
+
+  Java
+  * Update protobuf_version.bzl to separate protoc and per-language java … (#9900)
+
+  Python
+  * Increment python major version to 4 in version.json for python upb (#9926)
+  * The C extension module for Python has been rewritten to use the upb library.
+    This is expected to deliver significant performance benefits, especially when
+    parsing large payloads.  There are some minor breaking changes, but these
+    should not impact most users.  For more information see:
+    https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+  * Fixed win32 build and fixed str(message) on all Windows platforms. (#9976)
+  * The binary wheel for macOS now supports Apple silicon.
+
+  PHP
+  * [PHP] fix PHP build system (#9571)
+  * Fix building packaged PHP extension (#9727)
+  * fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)
+  * fix: phpdoc syntax for repeatedfield parameters (#9784)
+  * fix: phpdoc for repeatedfield (#9783)
+  * Change enum string name for reserved words (#9780)
+  * chore: [PHP] fix phpdoc for MapField keys (#9536)
+  * Fixed PHP SEGV by not writing to shared memory for zend_class_entry. (#9996)
+
+  Ruby
+  * Allow pre-compiled binaries for ruby 3.1.0 (#9566)
+  * Implement `respond_to?` in RubyMessage (#9677)
+  * [Ruby] Fix RepeatedField#last, #first inconsistencies (#9722)
+  * Do not use range based UTF-8 validation in truffleruby (#9769)
+  * Improve range handling logic of `RepeatedField` (#9799)
+  * Support x64-mingw-ucrt platform
+
+  Other
+  * [Kotlin] remove redundant public modifiers for compiled code (#9642)
+  * [C#] Update GetExtension to support getting typed value (#9655)
+  * Fix invalid dependency manifest when using `descriptor_set_out` (#9647)
+  * Fix C# generator handling of a field named "none" in a oneof (#9636)
+  * Add initial version.json file for 21-dev (#9840)
+  * Remove duplicate java generated code (#9909)
+  * Cherry-pick PR #9981 into 21.x branch (#10000)
+
+
 2022-05-19 version 21.0-rc2(C++/Java/Python/PHP/Objective-C/C#/Ruby)
 
   Python

Protobuf-C++.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
-  s.version  = '3.21.0-rc2'
+  s.version  = '3.21.0'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = 'BSD-3-Clause'

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

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-2],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.21.0],[protobuf@googlegroups.com],[protobuf])
 
 AM_MAINTAINER_MODE([enable])
 

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.21.0-rc2</version>
+    <version>3.21.0</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

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.21.0-rc2</VersionPrefix>
+    <VersionPrefix>3.21.0</VersionPrefix>
     <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
     <LangVersion>7.2</LangVersion>
     <Authors>Google Inc.</Authors>

java/README.md

@@ -23,7 +23,7 @@ If you are using Maven, use the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java</artifactId>
-  <version>3.21.0-rc-2</version>
+  <version>3.21.0</version>
 </dependency>
 ```
 
@@ -37,7 +37,7 @@ protobuf-java-util package:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java-util</artifactId>
-  <version>3.21.0-rc-2</version>
+  <version>3.21.0</version>
 </dependency>
 ```
 
@@ -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-2'
+    implementation 'com.google.protobuf:protobuf-java:3.21.0'
 ```
 Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.
 

java/bom/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.21.0-rc-2</version>
+  <version>3.21.0</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

java/core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.0-rc-2</version>
+    <version>3.21.0</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

java/kotlin-lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.0-rc-2</version>
+    <version>3.21.0</version>
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>

java/kotlin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.0-rc-2</version>
+    <version>3.21.0</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

java/lite.md

@@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-javalite</artifactId>
-  <version>3.21.0-rc-2</version>
+  <version>3.21.0</version>
 </dependency>
 ```
 

java/lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.0-rc-2</version>
+    <version>3.21.0</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

java/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.21.0-rc-2</version>
+  <version>3.21.0</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>

java/util/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.0-rc-2</version>
+    <version>3.21.0</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

php/ext/google/protobuf/package.xml

@@ -10,15 +10,15 @@
   <email>protobuf-opensource@google.com</email>
   <active>yes</active>
  </lead>
- <date>2022-05-19</date>
+ <date>2022-05-25</date>
- <time>13:35:18</time>
+ <time>13:50:26</time>
  <version>
-  <release>3.21.0RC2</release>
+  <release>3.21.0</release>
   <api>3.21.0</api>
  </version>
  <stability>
-  <release>beta</release>
+  <release>stable</release>
-  <api>beta</api>
+  <api>stable</api>
  </stability>
  <license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license>
  <notes>
@@ -1313,5 +1313,20 @@ G  A release.
    <notes>
    </notes>
   </release>
+  <release>
+   <version>
+    <release>3.21.0</release>
+    <api>3.21.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2022-05-25</date>
+   <time>13:50:26</time>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license>
+   <notes>
+   </notes>
+  </release>
  </changelog>
 </package>

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.0RC2"
+#define PHP_PROTOBUF_VERSION "3.21.0"
 
 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:

protobuf_version.bzl

@@ -1,3 +1,3 @@
-PROTOC_VERSION = '21.0-rc-2'
+PROTOC_VERSION = '21.0'
-PROTOBUF_JAVA_VERSION = '3.21.0-rc-2'
+PROTOBUF_JAVA_VERSION = '3.21.0'
-PROTOBUF_PYTHON_VERSION = '4.21.0-rc-2'
+PROTOBUF_PYTHON_VERSION = '4.21.0'

protoc-artifacts/pom.xml

@@ -8,7 +8,7 @@
   </parent>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protoc</artifactId>
-  <version>3.21.0-rc-2</version>
+  <version>3.21.0</version>
   <packaging>pom</packaging>
   <name>Protobuf Compiler</name>
   <description>

python/google/protobuf/__init__.py

@@ -30,4 +30,4 @@
 
 # Copyright 2007 Google Inc. All Rights Reserved.
 
-__version__ = '4.21.0rc2'
+__version__ = '4.21.0'

ruby/google-protobuf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google-protobuf"
-  s.version     = "3.21.0.rc.2"
+  s.version     = "3.21.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"

ruby/pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>com.google.protobuf.jruby</groupId>
     <artifactId>protobuf-jruby</artifactId>
-    <version>3.21.0-rc-2</version>
+    <version>3.21.0</version>
     <name>Protocol Buffer JRuby native extension</name>
     <description>
       Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -76,7 +76,7 @@
         <dependency>
           <groupId>com.google.protobuf</groupId>
           <artifactId>protobuf-java-util</artifactId>
-          <version>3.21.0-rc-2</version>
+          <version>3.21.0</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>

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 "-rc2"
+#define PROTOBUF_VERSION_SUFFIX ""
 
 #if defined(PROTOBUF_NAMESPACE) || defined(PROTOBUF_NAMESPACE_ID)
 #error PROTOBUF_NAMESPACE or PROTOBUF_NAMESPACE_ID was previously defined

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 "-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

version.json

@@ -1,17 +1,17 @@
 {
     "21.x": {
-        "protoc_version": "21.0-dev",
+        "protoc_version": "21.0",
         "lts": false,
-        "date": "2022-05-20",
+        "date": "2022-05-25",
         "languages": {
-            "cpp": "3.21.0-dev",
+            "cpp": "3.21.0",
-            "csharp": "3.21.0-dev",
+            "csharp": "3.21.0",
-            "java": "3.21.0-dev",
+            "java": "3.21.0",
-            "javascript": "3.21.0-dev",
+            "javascript": "3.21.0",
-            "objectivec": "3.21.0-dev",
+            "objectivec": "3.21.0",
-            "php": "3.21.0-dev",
+            "php": "3.21.0",
-            "python": "4.21.0-dev",
+            "python": "4.21.0",
-            "ruby": "3.21.0-dev"
+            "ruby": "3.21.0"
         }
     }
 }