diff --git a/CHANGES.txt b/CHANGES.txt index dd2407d3e052..98cdf2091c49 100644 --- 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 index 4302da295658..41fab1b6a9ba 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.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 index 71241c86b9f3..b5fe42e763a5 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.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 index 8917f2620cf2..ed00950472b7 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.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 index 6b5bd46bd689..9ef830b681d4 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.21.10-rc0 + 3.21.10 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/main/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 20212d6ae39f..bf535bd02f4a 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.21.10-rc0 + 3.21.10 7.2 Google Inc. diff --git a/java/README.md b/java/README.md index 6ec2e8eb01ec..17de94d66541 100644 --- a/java/README.md +++ b/java/README.md @@ -23,7 +23,7 @@ If you are using Maven, use the following: com.google.protobuf protobuf-java - 3.21.10-rc-0 + 3.21.10 ``` @@ -37,7 +37,7 @@ protobuf-java-util package: com.google.protobuf protobuf-java-util - 3.21.10-rc-0 + 3.21.10 ``` @@ -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.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 index 827df56bcd57..b3389a8c14c0 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.21.10-rc-0 + 3.21.10 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 6f7d3eccf1a6..d1bd6739974c 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.10-rc-0 + 3.21.10 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index 688b80526f31..c8e2c34ce7f9 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.10-rc-0 + 3.21.10 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index bb5cb0c59fcb..cc563cf09d07 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.10-rc-0 + 3.21.10 protobuf-kotlin diff --git a/java/lite.md b/java/lite.md index a3a5abf65c4b..a10e9595b6a3 100644 --- a/java/lite.md +++ b/java/lite.md @@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following: com.google.protobuf protobuf-javalite - 3.21.10-rc-0 + 3.21.10 ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 6741aa5d9a11..db67296da8f0 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.10-rc-0 + 3.21.10 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index 7100ae9cbbe1..77b83143772e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.10-rc-0 + 3.21.10 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index 1823b155f09a..d2baaf474b01 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.10-rc-0 + 3.21.10 protobuf-java-util diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 9f7fd05ca433..a47abf625a01 100644 --- 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 index aa691940fbad..2ea278cb8d98 100644 --- 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 index 3811a8aca6c7..019e85741f9a 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.21.10-rc-0 + 3.21.10 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index d4206b239936..e0121a4f6c9a 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__ = '4.21.10rc0' +__version__ = '4.21.10' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 654fa5f5ef47..73abc8150943 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.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 index ae070a97446b..e5ea175f8978 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 3.21.10-rc-0 + 3.21.10 Protocol Buffer JRuby native extension Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ com.google.protobuf protobuf-java-util - 3.21.10-rc-0 + 3.21.10 org.jruby diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index d3747e19a19c..f4544112ebb1 100644 --- 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 index ef3ad1a67b90..a57165f8faa8 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 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 index 67201a11dbe9..7b7660216a86 100644 --- 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" } } -} +} \ No newline at end of file