Merge pull request #11974 from protocolbuffers/22.x-202302161804
22.x 202302161804
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ac9acb..c71a74d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@
endif ()
# Version metadata
-set(protobuf_VERSION_STRING "4.22.0-rc-3")
+set(protobuf_VERSION_STRING "4.22.0")
set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com")
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
index 538d12a..8b90ccc 100644
--- a/Protobuf-C++.podspec
+++ b/Protobuf-C++.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
- s.version = '4.22.0-rc3'
+ s.version = '4.22.0'
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 b0300e3..286db4b 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.22.0-rc3'
+ s.version = '3.22.0'
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/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
index 2d6ca93..e8bc497 100644
--- 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.22.0-rc3</version>
+ <version>3.22.0</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
index 9d8539a..026a1d7 100644
--- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj
+++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -5,7 +5,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.22.0-rc3</VersionPrefix>
+ <VersionPrefix>3.22.0</VersionPrefix>
<LangVersion>10.0</LangVersion>
<Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>
diff --git a/java/README.md b/java/README.md
index 59d1115..8f60bb2 100644
--- a/java/README.md
+++ b/java/README.md
@@ -23,7 +23,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.22.0-rc-3</version>
+ <version>3.22.0</version>
</dependency>
```
@@ -37,14 +37,14 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <version>3.22.0-rc-3</version>
+ <version>3.22.0</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.22.0-rc-3'`
+dependencies: `implementation 'com.google.protobuf:protobuf-java:3.22.0'`
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 4fa400d..f792a62 100644
--- 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.22.0-RC3</version>
+ <version>3.22.0</version>
<packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 9bab6e0..6f32c9d 100644
--- 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.22.0-RC3</version>
+ <version>3.22.0</version>
</parent>
<artifactId>protobuf-java</artifactId>
diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index c9b81cf..c91bd88 100644
--- 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.22.0-RC3</version>
+ <version>3.22.0</version>
</parent>
<artifactId>protobuf-kotlin-lite</artifactId>
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index 741fb30..52a368d 100644
--- 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.22.0-RC3</version>
+ <version>3.22.0</version>
</parent>
<artifactId>protobuf-kotlin</artifactId>
diff --git a/java/lite.md b/java/lite.md
index 1481451..035b86c 100644
--- a/java/lite.md
+++ b/java/lite.md
@@ -29,7 +29,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId>
- <version>3.22.0-rc-3</version>
+ <version>3.22.0</version>
</dependency>
```
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index e527e11..716ff74 100644
--- 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.22.0-RC3</version>
+ <version>3.22.0</version>
</parent>
<artifactId>protobuf-javalite</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index 97d7805..cedeb04 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>3.22.0-RC3</version>
+ <version>3.22.0</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>
diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml
index 970908e..4ffc34d 100644
--- a/java/protoc/pom.xml
+++ b/java/protoc/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
- <version>3.22.0-RC3</version>
+ <version>3.22.0</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index ff4131f..84cba14 100644
--- 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.22.0-RC3</version>
+ <version>3.22.0</version>
</parent>
<artifactId>protobuf-java-util</artifactId>
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index 6bc764a..e26ee44 100644
--- a/php/ext/google/protobuf/protobuf.h
+++ b/php/ext/google/protobuf/protobuf.h
@@ -127,7 +127,7 @@
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()
-#define PHP_PROTOBUF_VERSION "3.22.0RC3"
+#define PHP_PROTOBUF_VERSION "3.22.0"
// 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 6a3358a..e3e45eb 100644
--- a/protobuf_version.bzl
+++ b/protobuf_version.bzl
@@ -1,5 +1,5 @@
-PROTOC_VERSION = "22.0-rc-3"
-PROTOBUF_JAVA_VERSION = "3.22.0-RC3"
-PROTOBUF_PYTHON_VERSION = "4.22.0rc3"
-PROTOBUF_PHP_VERSION = "3.22.0RC3"
-PROTOBUF_RUBY_VERSION = "3.22.0.rc.3"
+PROTOC_VERSION = "22.0"
+PROTOBUF_JAVA_VERSION = "3.22.0"
+PROTOBUF_PYTHON_VERSION = "4.22.0"
+PROTOBUF_PHP_VERSION = "3.22.0"
+PROTOBUF_RUBY_VERSION = "3.22.0"
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index cf96a5d..a301349 100755
--- 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.22.0rc3'
+__version__ = '4.22.0'
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 6c06cd5..174657d 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.22.0.rc.3"
+ s.version = "3.22.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/ruby/pom.xml b/ruby/pom.xml
index 2219386..1d3de9b 100644
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
- <version>3.22.0-RC3</version>
+ <version>3.22.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.22.0-RC3</version>
+ <version>3.22.0</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index 450e622..ef458ad 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -233,7 +233,7 @@
#ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined
#endif
-#define PROTOBUF_VERSION_SUFFIX "-rc3"
+#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 1e1e86d..5f1652d 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -69,7 +69,7 @@
#define GOOGLE_PROTOBUF_VERSION 4022000
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
-#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc3"
+#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 2b07e84..bc12f0e 100644
--- a/version.json
+++ b/version.json
@@ -1,17 +1,17 @@
{
"22.x": {
- "protoc_version": "22.0-dev",
+ "protoc_version": "22.1-dev",
"lts": false,
- "date": "2023-02-10",
+ "date": "2023-02-16",
"languages": {
- "cpp": "4.22.0-dev",
- "csharp": "3.22.0-dev",
- "java": "3.22.0-dev",
- "javascript": "3.22.0-dev",
- "objectivec": "3.22.0-dev",
- "php": "3.22.0-dev",
- "python": "4.22.0-dev",
- "ruby": "3.22.0-dev"
+ "cpp": "4.22.1-dev",
+ "csharp": "3.22.1-dev",
+ "java": "3.22.1-dev",
+ "javascript": "3.22.1-dev",
+ "objectivec": "3.22.1-dev",
+ "php": "3.22.1-dev",
+ "python": "4.22.1-dev",
+ "ruby": "3.22.1-dev"
}
}
}
\ No newline at end of file
