Merge pull request #12200 from protocolbuffers/main-202303101853

Merge 22.x back to main

CMakeLists.txt

@@ -93,7 +93,7 @@ if (protobuf_BUILD_SHARED_LIBS)
 endif ()
 
 # Version metadata
-set(protobuf_VERSION_STRING "4.22.1")
+set(protobuf_VERSION_STRING "4.22.2")
 set(protobuf_DESCRIPTION "Protocol Buffers")
 set(protobuf_CONTACT "protobuf@googlegroups.com")
 

Protobuf-C++.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
-  s.version  = '4.22.1'
+  s.version  = '4.22.2'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = 'BSD-3-Clause'

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

build_defs/java_opts.bzl

@@ -1,5 +1,4 @@
 """Java options and protobuf-specific java build rules with those options."""
-
 load("@rules_java//java:defs.bzl", "java_library")
 load("@rules_jvm_external//:defs.bzl", "java_export")
 
@@ -12,11 +11,11 @@ JAVA_OPTS = [
 def protobuf_java_export(**kwargs):
     java_export(
         javacopts = JAVA_OPTS,
-        **kwargs
+        **kwargs,
     )
 
 def protobuf_java_library(**kwargs):
     java_library(
         javacopts = JAVA_OPTS,
-        **kwargs
+        **kwargs,
     )

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.1</version>
+    <version>3.22.2</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

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.1</VersionPrefix>
+    <VersionPrefix>3.22.2</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Google Inc.</Authors>
     <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

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.22.1</version>
+  <version>3.22.2</version>
 </dependency>
 ```
 
@@ -37,16 +37,16 @@ protobuf-java-util package:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java-util</artifactId>
-  <version>3.22.1</version>
+  <version>3.22.2</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.1'` Again,
+dependencies: `implementation 'com.google.protobuf:protobuf-java:3.22.2'`
-be sure to check that the version number matches (or is newer than) the version
+Again, be sure to check that the version number matches (or is newer than) the
-number of protoc that you are using.
+version number of protoc that you are using.
 
 ### Use Java Protocol Buffers on Android
 

java/bom/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.22.1</version>
+  <version>3.22.2</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

java/core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.22.1</version>
+    <version>3.22.2</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

java/internal/JavaVersionTest.java

@@ -45,10 +45,10 @@ public class JavaVersionTest {
       return;
     }
     // Java 8's version is read as "1.8"
-    if (exp.equals("8")) exp = "1.8";
+    if(exp.equals("8")) exp = "1.8";
     String version = System.getProperty("java.version");
     assertWithMessage("Expected Java " + exp + " but found Java " + version)
-        .that(version.startsWith(exp))
+      .that(version.startsWith(exp))
-        .isTrue();
+      .isTrue();
   }
 }

java/kotlin-lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.22.1</version>
+    <version>3.22.2</version>
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>

java/kotlin-lite/pom_template.xml

@@ -17,8 +17,14 @@
   </description>
   <dependencies>
     <dependency>
-      <groupId>${groupId}</groupId>
+      <groupId>{groupId}</groupId>
       <artifactId>protobuf-javalite</artifactId>
+      <version>{version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>${kotlin.version}</version>
     </dependency>
     {dependencies}
   </dependencies>

java/kotlin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.22.1</version>
+    <version>3.22.2</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

java/kotlin/pom_template.xml

@@ -17,8 +17,14 @@
   </description>
   <dependencies>
     <dependency>
-      <groupId>${groupId}</groupId>
+      <groupId>{groupId}</groupId>
       <artifactId>protobuf-java</artifactId>
+      <version>{version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>${kotlin.version}</version>
     </dependency>
     {dependencies}
   </dependencies>

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.22.1</version>
+  <version>3.22.2</version>
 </dependency>
 ```
 

java/lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.22.1</version>
+    <version>3.22.2</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

java/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.22.1</version>
+  <version>3.22.2</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>

java/protoc/pom.xml

@@ -8,7 +8,7 @@
   </parent>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protoc</artifactId>
-  <version>3.22.1</version>
+  <version>3.22.2</version>
   <packaging>pom</packaging>
   <name>Protobuf Compiler</name>
   <description>

java/util/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.22.1</version>
+    <version>3.22.2</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

java/util/pom_template.xml

@@ -14,8 +14,9 @@
   <description>Utilities for Protocol Buffers</description>
   <dependencies>
     <dependency>
-      <groupId>${groupId}</groupId>
+      <groupId>{groupId}</groupId>
       <artifactId>protobuf-java</artifactId>
+      <version>{version}</version>
     </dependency>
     {dependencies}
   </dependencies>

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.1"
+#define PHP_PROTOBUF_VERSION "3.22.2"
 
 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:

protobuf_version.bzl

@@ -1,6 +1,5 @@
-""" Contains version numbers to be used in other bzl files """
+PROTOC_VERSION = "22.2"
-PROTOC_VERSION = "22.1"
+PROTOBUF_JAVA_VERSION = "3.22.2"
-PROTOBUF_JAVA_VERSION = "3.22.1"
+PROTOBUF_PYTHON_VERSION = "4.22.2"
-PROTOBUF_PYTHON_VERSION = "4.22.1"
+PROTOBUF_PHP_VERSION = "3.22.2"
-PROTOBUF_PHP_VERSION = "3.22.1"
+PROTOBUF_RUBY_VERSION = "3.22.2"
-PROTOBUF_RUBY_VERSION = "3.22.1"

python/google/protobuf/__init__.py

@@ -30,4 +30,4 @@
 
 # Copyright 2007 Google Inc. All Rights Reserved.
 
-__version__ = '4.22.1'
+__version__ = '4.22.2'

ruby/google-protobuf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google-protobuf"
-  s.version     = "3.22.1"
+  s.version     = "3.22.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"

ruby/pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>com.google.protobuf.jruby</groupId>
     <artifactId>protobuf-jruby</artifactId>
-    <version>3.22.1</version>
+    <version>3.22.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.22.1</version>
+          <version>3.22.2</version>
         </dependency>
         <dependency>
             <groupId>org.jruby</groupId>

src/google/protobuf/any.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/api.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/compiler/plugin.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/descriptor.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/duration.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/empty.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/field_mask.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/port_def.inc

@@ -226,7 +226,7 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
 #ifdef PROTOBUF_VERSION
 #error PROTOBUF_VERSION was previously defined
 #endif
-#define PROTOBUF_VERSION 4022001
+#define PROTOBUF_VERSION 4022002
 
 #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
 #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined

src/google/protobuf/source_context.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/struct.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/stubs/common.h

@@ -66,7 +66,7 @@ namespace internal {
 
 // The current version, represented as a single integer to make comparison
 // easier:  major * 10^6 + minor * 10^3 + micro
-#define GOOGLE_PROTOBUF_VERSION 4022001
+#define GOOGLE_PROTOBUF_VERSION 4022002
 
 // A suffix string for alpha, beta or rc releases. Empty for stable releases.
 #define GOOGLE_PROTOBUF_VERSION_SUFFIX ""

src/google/protobuf/timestamp.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/type.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."

src/google/protobuf/wrappers.pb.h

@@ -15,7 +15,7 @@
 #error "your headers."
 #endif  // PROTOBUF_VERSION
 
-#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022002 < 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."