Merge pull request #11088 from protocolbuffers/21.x-202211291338

21.x 202211291338
protocolbuffers · Nov 29, 2022 · 9832e78 · 9832e78
2 parents f6ff28b + 74dae8f
commit 9832e78
Show file tree

Hide file tree

Showing 24 changed files with 40 additions and 41 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,4 @@
-2022-11-28 version 21.10-rc0 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+2022-11-29 version 21.10 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
 
   Java
   * Use bit-field int values in buildPartial to skip work on unset groups of fields. (#10960)
@@ -8,7 +8,6 @@
   Other
   * Add public modifiers to kotlin code (#11068)
 
-
 2022-10-26 version 21.9 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
 
   C++

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.21.10-rc0'
+  s.version  = '3.21.10'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = 'BSD-3-Clause'

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

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.21.10-rc-0],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.21.10],[protobuf@googlegroups.com],[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.21.10-rc0</version>
+    <version>3.21.10</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/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.21.10-rc0</VersionPrefix>
+    <VersionPrefix>3.21.10</VersionPrefix>
     <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
     <LangVersion>7.2</LangVersion>
     <Authors>Google Inc.</Authors>

diff --git a/java/README.md b/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.10-rc-0</version>
+  <version>3.21.10</version>
 </dependency>
 ```
 
@@ -37,15 +37,15 @@ protobuf-java-util package:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java-util</artifactId>
-  <version>3.21.10-rc-0</version>
+  <version>3.21.10</version>
 </dependency>
 ```
 
 ### Gradle
 
 If you are using Gradle, add the following to your `build.gradle` file's dependencies:
 ```
-    implementation 'com.google.protobuf:protobuf-java:3.21.10-rc-0'
+    implementation 'com.google.protobuf:protobuf-java:3.21.10'
 ```
 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
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.21.10-rc-0</version>
+  <version>3.21.10</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.21.10-rc-0</version>
+    <version>3.21.10</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.10-rc-0</version>
+    <version>3.21.10</version>
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>

diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.10-rc-0</version>
+    <version>3.21.10</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

diff --git a/java/lite.md b/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.10-rc-0</version>
+  <version>3.21.10</version>
 </dependency>
 ```
 

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.21.10-rc-0</version>
+    <version>3.21.10</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.21.10-rc-0</version>
+  <version>3.21.10</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.21.10-rc-0</version>
+    <version>3.21.10</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

diff --git 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.10RC0"
+#define PHP_PROTOBUF_VERSION "3.21.10"
 
 // 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
@@ -1,4 +1,4 @@
-PROTOC_VERSION = "21.10-rc-0"
-PROTOBUF_JAVA_VERSION = "3.21.10-rc-0"
-PROTOBUF_PYTHON_VERSION = "4.21.10rc0"
-PROTOBUF_PHP_VERSION = "3.21.10RC0"
+PROTOC_VERSION = "21.10"
+PROTOBUF_JAVA_VERSION = "3.21.10"
+PROTOBUF_PYTHON_VERSION = "4.21.10"
+PROTOBUF_PHP_VERSION = "3.21.10"
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.21.10-rc-0</version>
+  <version>3.21.10</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__ = '4.21.10rc0'
+__version__ = '4.21.10'
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.21.10.rc.0"
+  s.version     = "3.21.10"
   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
@@ -9,7 +9,7 @@
 
     <groupId>com.google.protobuf.jruby</groupId>
     <artifactId>protobuf-jruby</artifactId>
-    <version>3.21.10-rc-0</version>
+    <version>3.21.10</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.10-rc-0</version>
+          <version>3.21.10</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>

diff --git 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 "-rc0"
+#define PROTOBUF_VERSION_SUFFIX ""
 
 #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
@@ -85,7 +85,7 @@ namespace internal {
 #define GOOGLE_PROTOBUF_VERSION 3021010
 
 // A suffix string for alpha, beta or rc releases. Empty for stable releases.
-#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc0"
+#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

diff --git a/version.json b/version.json
@@ -1,17 +1,17 @@
 {
     "21.x": {
-        "protoc_version": "21.10-rc0",
+        "protoc_version": "21.10",
         "lts": false,
-        "date": "2022-11-28",
+        "date": "2022-11-29",
         "languages": {
-            "cpp": "3.21.10-rc0",
-            "csharp": "3.21.10-rc0",
-            "java": "3.21.10-rc0",
-            "javascript": "3.21.10-rc0",
-            "objectivec": "3.21.10-rc0",
-            "php": "3.21.10-rc0",
-            "python": "4.21.10-rc0",
-            "ruby": "3.21.10-rc0"
+            "cpp": "3.21.10",
+            "csharp": "3.21.10",
+            "java": "3.21.10",
+            "javascript": "3.21.10",
+            "objectivec": "3.21.10",
+            "php": "3.21.10",
+            "python": "4.21.10",
+            "ruby": "3.21.10"
         }
     }
-}
+}