From a847a8dc4ba1d99e7ba917146c84438b4de7d085 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 16 Feb 2023 09:13:25 -0800 Subject: [PATCH 1/2] Updating version.json and repo version numbers to: 22.0 --- CMakeLists.txt | 2 +- Protobuf-C++.podspec | 2 +- Protobuf.podspec | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/README.md | 6 +++--- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/kotlin-lite/pom.xml | 2 +- java/kotlin/pom.xml | 2 +- java/lite.md | 2 +- java/lite/pom.xml | 2 +- java/pom.xml | 2 +- java/protoc/pom.xml | 2 +- java/util/pom.xml | 2 +- php/ext/google/protobuf/protobuf.h | 2 +- protobuf_version.bzl | 10 +++++----- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- ruby/pom.xml | 4 ++-- src/google/protobuf/port_def.inc | 2 +- src/google/protobuf/stubs/common.h | 2 +- version.json | 20 +++++++++---------- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ac9acbe47..c71a74d4a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,7 @@ if (protobuf_BUILD_SHARED_LIBS) 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 538d12aa93..8b90ccce49 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 b0300e34b9..286db4b45c 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 2d6ca93395..e8bc49731b 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.22.0-rc3 + 3.22.0 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 9d8539a9d5..026a1d718d 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -5,7 +5,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.22.0-rc3 + 3.22.0 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/README.md b/java/README.md index 59d111558f..8f60bb2af3 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.22.0-rc-3 + 3.22.0 ``` @@ -37,14 +37,14 @@ protobuf-java-util package: com.google.protobuf protobuf-java-util - 3.22.0-rc-3 + 3.22.0 ``` ### 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 4fa400d69a..f792a62966 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.22.0-RC3 + 3.22.0 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 9bab6e003e..6f32c9d59f 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.22.0-RC3 + 3.22.0 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index c9b81cf3a7..c91bd889ad 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.22.0-RC3 + 3.22.0 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index 741fb30b81..52a368d58f 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.22.0-RC3 + 3.22.0 protobuf-kotlin diff --git a/java/lite.md b/java/lite.md index 148145100c..035b86c2bf 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.22.0-rc-3 + 3.22.0 ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index e527e11213..716ff74d32 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.22.0-RC3 + 3.22.0 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index 97d7805fde..cedeb04d0e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.22.0-RC3 + 3.22.0 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index 970908e42e..4ffc34dde8 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.22.0-RC3 + 3.22.0 pom Protobuf Compiler diff --git a/java/util/pom.xml b/java/util/pom.xml index ff4131fd83..84cba14001 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.22.0-RC3 + 3.22.0 protobuf-java-util diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 6bc764a3b1..e26ee44285 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.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 6a3358a7ec..e3e45eba50 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 cf96a5db4a..a301349e31 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 6c06cd578a..174657dee3 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 2219386d7e..1d3de9b563 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 3.22.0-RC3 + 3.22.0 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.22.0-RC3 + 3.22.0 org.jruby diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 450e622d4b..ef458adb83 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -233,7 +233,7 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and #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 1e1e86dd47..5f1652d25d 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -69,7 +69,7 @@ namespace internal { #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 2b07e84c0e..ca24c41f6e 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "22.x": { - "protoc_version": "22.0-dev", + "protoc_version": "22.0", "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.0", + "csharp": "3.22.0", + "java": "3.22.0", + "javascript": "3.22.0", + "objectivec": "3.22.0", + "php": "3.22.0", + "python": "4.22.0", + "ruby": "3.22.0" } } } \ No newline at end of file From f931fca33c54c97f74f34e4bf0f67451ae82733c Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 16 Feb 2023 09:13:25 -0800 Subject: [PATCH 2/2] Updating version.json to: 22.1-dev --- version.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/version.json b/version.json index ca24c41f6e..bc12f0e681 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "22.x": { - "protoc_version": "22.0", + "protoc_version": "22.1-dev", "lts": false, "date": "2023-02-16", "languages": { - "cpp": "4.22.0", - "csharp": "3.22.0", - "java": "3.22.0", - "javascript": "3.22.0", - "objectivec": "3.22.0", - "php": "3.22.0", - "python": "4.22.0", - "ruby": "3.22.0" + "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