Updating version.json and repo version numbers to: 21.2
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index f537be0..e34d343 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.1' + s.version = '3.21.2' 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 6b2beda..85f1dc6 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.1' + s.version = '3.21.2' 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 55e6064..c55a6a2 100644 --- a/configure.ac +++ b/configure.ac
@@ -17,7 +17,7 @@ # 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.1],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.21.2],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable])
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index d477bb1..ea05597 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.21.1</version> + <version>3.21.2</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 d3c18db..5517b00 100644 --- 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.1</VersionPrefix> + <VersionPrefix>3.21.2</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 index 20f4c9b..7e71e66 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.21.1</version> + <version>3.21.2</version> </dependency> ``` @@ -37,7 +37,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.21.1</version> + <version>3.21.2</version> </dependency> ``` @@ -45,7 +45,7 @@ If you are using Gradle, add the following to your `build.gradle` file's dependencies: ``` - implementation 'com.google.protobuf:protobuf-java:3.21.1' + implementation 'com.google.protobuf:protobuf-java:3.21.2' ``` 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 3813b32..b4c3465 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.21.1</version> + <version>3.21.2</version> <packaging>pom</packaging> <name>Protocol Buffers [BOM]</name>
diff --git a/java/core/pom.xml b/java/core/pom.xml index e32d0aa..845ff88 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.21.1</version> + <version>3.21.2</version> </parent> <artifactId>protobuf-java</artifactId>
diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index 3585f3a..3fec5ec 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.21.1</version> + <version>3.21.2</version> </parent> <artifactId>protobuf-kotlin-lite</artifactId>
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index e795876..43debaf 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.21.1</version> + <version>3.21.2</version> </parent> <artifactId>protobuf-kotlin</artifactId>
diff --git a/java/lite.md b/java/lite.md index 1a5c951..1ad0019 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.21.1</version> + <version>3.21.2</version> </dependency> ```
diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 8b1590b..7c635ec 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.21.1</version> + <version>3.21.2</version> </parent> <artifactId>protobuf-javalite</artifactId>
diff --git a/java/pom.xml b/java/pom.xml index 5776cfd..34475a4 100644 --- a/java/pom.xml +++ b/java/pom.xml
@@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.21.1</version> + <version>3.21.2</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name>
diff --git a/java/util/pom.xml b/java/util/pom.xml index afc912b..53f90ce 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.21.1</version> + <version>3.21.2</version> </parent> <artifactId>protobuf-java-util</artifactId>
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index 5ef1085..bf3d90e 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml
@@ -10,11 +10,11 @@ <email>protobuf-opensource@google.com</email> <active>yes</active> </lead> - <date>2022-05-27</date> - <time>09:36:34</time> + <date>2022-06-23</date> + <time>12:12:44</time> <version> - <release>3.21.1</release> - <api>3.21.1</api> + <release>3.21.2</release> + <api>3.21.2</api> </version> <stability> <release>stable</release> @@ -1343,5 +1343,20 @@ <notes> </notes> </release> + <release> + <version> + <release>3.21.2</release> + <api>3.21.2</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2022-06-23</date> + <time>12:12:44</time> + <license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license> + <notes> + </notes> + </release> </changelog> </package>
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 6488196..c5dac32 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.21.1" +#define PHP_PROTOBUF_VERSION "3.21.2" // 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 81b068c..b6c35f3 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl
@@ -1,3 +1,3 @@ -PROTOC_VERSION = '21.1' -PROTOBUF_JAVA_VERSION = '3.21.1' -PROTOBUF_PYTHON_VERSION = '4.21.1' +PROTOC_VERSION = '21.2' +PROTOBUF_JAVA_VERSION = '3.21.2' +PROTOBUF_PYTHON_VERSION = '4.21.2'
diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 06af961..bce8121 100644 --- 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.1</version> + <version>3.21.2</version> <packaging>pom</packaging> <name>Protobuf Compiler</name> <description>
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 5678136..2c3e06c 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.1' +__version__ = '4.21.2'
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index cecc370..e7aa377 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.1" + s.version = "3.21.2" 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 b861c39..f1bdbf1 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.21.1</version> + <version>3.21.2</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.1</version> + <version>3.21.2</version> </dependency> <dependency> <groupId>org.jruby</groupId>
diff --git a/src/Makefile.am b/src/Makefile.am index 264d8ea..ffbc36c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am
@@ -18,7 +18,7 @@ PTHREAD_DEF = endif -PROTOBUF_VERSION = 32:1:0 +PROTOBUF_VERSION = 32:2:0 if GCC # Turn on all warnings except for sign comparison (we ignore sign comparison
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 6db2ab3..2368446 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index a06f930..ac80560 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 1c4b0f6..fd7e835 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 78df1d5..72c8071 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 73193eb..87729c4 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index f5c44b8..fdc398c 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index f4f7707..fd75b88 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index d534411..8858e19 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc
@@ -178,7 +178,7 @@ #ifdef PROTOBUF_VERSION #error PROTOBUF_VERSION was previously defined #endif -#define PROTOBUF_VERSION 3021001 +#define PROTOBUF_VERSION 3021002 #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 63204f7..fb2e29f 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 1372271..b026be3 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 81fb427..9d90305 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h
@@ -82,7 +82,7 @@ // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 3021001 +#define GOOGLE_PROTOBUF_VERSION 3021002 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 7c074c4..3b5a469 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 83439e9..bbc1265 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 6f549dd..72304a5 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h
@@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021001 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021002 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc.
diff --git a/version.json b/version.json index bd420ea..7e2cafe 100644 --- a/version.json +++ b/version.json
@@ -1,17 +1,17 @@ { "21.x": { - "protoc_version": "21.2-dev", + "protoc_version": "21.2", "lts": false, - "date": "2022-05-27", + "date": "2022-06-23", "languages": { - "cpp": "3.21.2-dev", - "csharp": "3.21.2-dev", - "java": "3.21.2-dev", - "javascript": "3.21.2-dev", - "objectivec": "3.21.2-dev", - "php": "3.21.2-dev", - "python": "4.21.2-dev", - "ruby": "3.21.2-dev" + "cpp": "3.21.2", + "csharp": "3.21.2", + "java": "3.21.2", + "javascript": "3.21.2", + "objectivec": "3.21.2", + "php": "3.21.2", + "python": "4.21.2", + "ruby": "3.21.2" } } } \ No newline at end of file