diff --git a/CMakeLists.txt b/CMakeLists.txt
index c042073d2c..dc337f8fa2 100644
--- a/CMakeLists.txt
+++ b/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")
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
index 07e2298973..fcdc2a45db 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.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'
diff --git a/Protobuf.podspec b/Protobuf.podspec
index 695bba4562..47a964848b 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.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'
diff --git a/build_defs/java_opts.bzl b/build_defs/java_opts.bzl
index 8e0fb0a58a..b6ee8142ba 100644
--- a/build_defs/java_opts.bzl
+++ b/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,
)
diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
index 85ae51bf8e..e2e665b3c2 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.1
+ 3.22.2
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 344f4c49eb..1c9a007950 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.1
+ 3.22.2
10.0
Google Inc.
netstandard1.1;netstandard2.0;net45;net50
diff --git a/java/README.md b/java/README.md
index 4067c4e798..30db5936d8 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.1
+ 3.22.2
```
@@ -37,16 +37,16 @@ protobuf-java-util package:
com.google.protobuf
protobuf-java-util
- 3.22.1
+ 3.22.2
```
### 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,
-be sure to check that the version number matches (or is newer than) the version
-number of protoc that you are using.
+dependencies: `implementation 'com.google.protobuf:protobuf-java:3.22.2'`
+Again, be sure to check that the version number matches (or is newer than) the
+version number of protoc that you are using.
### Use Java Protocol Buffers on Android
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index 22d812da21..c08916d260 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-bom
- 3.22.1
+ 3.22.2
pom
Protocol Buffers [BOM]
diff --git a/java/core/pom.xml b/java/core/pom.xml
index b43bf2df7b..60696c3b5c 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.22.1
+ 3.22.2
protobuf-java
diff --git a/java/internal/JavaVersionTest.java b/java/internal/JavaVersionTest.java
index 912870b44b..c9ea0a504b 100644
--- a/java/internal/JavaVersionTest.java
+++ b/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))
- .isTrue();
+ .that(version.startsWith(exp))
+ .isTrue();
}
}
diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index 37193f2921..da3059f096 100644
--- a/java/kotlin-lite/pom.xml
+++ b/java/kotlin-lite/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.22.1
+ 3.22.2
protobuf-kotlin-lite
diff --git a/java/kotlin-lite/pom_template.xml b/java/kotlin-lite/pom_template.xml
index 90d9857dd8..6e3e05fcce 100644
--- a/java/kotlin-lite/pom_template.xml
+++ b/java/kotlin-lite/pom_template.xml
@@ -17,8 +17,14 @@
- ${groupId}
+ {groupId}
protobuf-javalite
+ {version}
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${kotlin.version}
{dependencies}
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index f9aa88edf4..ec6cf3a63c 100644
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.22.1
+ 3.22.2
protobuf-kotlin
diff --git a/java/kotlin/pom_template.xml b/java/kotlin/pom_template.xml
index d04bc89fc3..a66e44d52b 100644
--- a/java/kotlin/pom_template.xml
+++ b/java/kotlin/pom_template.xml
@@ -17,8 +17,14 @@
- ${groupId}
+ {groupId}
protobuf-java
+ {version}
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${kotlin.version}
{dependencies}
diff --git a/java/lite.md b/java/lite.md
index 41e00aadfa..1bda472627 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.1
+ 3.22.2
```
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index ae9689fd03..e69f773ae3 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.22.1
+ 3.22.2
protobuf-javalite
diff --git a/java/pom.xml b/java/pom.xml
index 26b595ee6b..8092ca6c2f 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.22.1
+ 3.22.2
pom
Protocol Buffers [Parent]
diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml
index a891850ac7..02976e1a83 100644
--- a/java/protoc/pom.xml
+++ b/java/protoc/pom.xml
@@ -8,7 +8,7 @@
com.google.protobuf
protoc
- 3.22.1
+ 3.22.2
pom
Protobuf Compiler
diff --git a/java/util/pom.xml b/java/util/pom.xml
index f8bc8e6e35..d8326eb0ca 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.22.1
+ 3.22.2
protobuf-java-util
diff --git a/java/util/pom_template.xml b/java/util/pom_template.xml
index 74ef795f17..82d84c8721 100644
--- a/java/util/pom_template.xml
+++ b/java/util/pom_template.xml
@@ -14,8 +14,9 @@
Utilities for Protocol Buffers
- ${groupId}
+ {groupId}
protobuf-java
+ {version}
{dependencies}
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index 4ed924b607..0d9399a199 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.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:
diff --git a/protobuf_version.bzl b/protobuf_version.bzl
index 5cc1e69ceb..b71c23ff42 100644
--- a/protobuf_version.bzl
+++ b/protobuf_version.bzl
@@ -1,6 +1,5 @@
-""" Contains version numbers to be used in other bzl files """
-PROTOC_VERSION = "22.1"
-PROTOBUF_JAVA_VERSION = "3.22.1"
-PROTOBUF_PYTHON_VERSION = "4.22.1"
-PROTOBUF_PHP_VERSION = "3.22.1"
-PROTOBUF_RUBY_VERSION = "3.22.1"
+PROTOC_VERSION = "22.2"
+PROTOBUF_JAVA_VERSION = "3.22.2"
+PROTOBUF_PYTHON_VERSION = "4.22.2"
+PROTOBUF_PHP_VERSION = "3.22.2"
+PROTOBUF_RUBY_VERSION = "3.22.2"
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index b9650b1969..2af0a0262d 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.1'
+__version__ = '4.22.2'
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 37acd1bb15..157efc060d 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.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"
diff --git a/ruby/pom.xml b/ruby/pom.xml
index 503d3af02d..3a5f626c5b 100644
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -9,7 +9,7 @@
com.google.protobuf.jruby
protobuf-jruby
- 3.22.1
+ 3.22.2
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.1
+ 3.22.2
org.jruby
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index 0917057643..32b7c9455a 100644
--- a/src/google/protobuf/any.pb.h
+++ b/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."
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index d334922ed0..f7930953e5 100644
--- a/src/google/protobuf/api.pb.h
+++ b/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."
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
index 5e3404ee80..5cef0b260b 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/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."
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index 455021a755..f5884d2fd9 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/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."
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index 7121b53ee7..09ae131ea3 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/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."
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index c17b5ea44c..29e62fff60 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/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."
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index ddb95f567b..245c43919e 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/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."
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index a969269704..8767649575 100644
--- a/src/google/protobuf/port_def.inc
+++ b/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
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
index c16e4107ce..6f202f5ea3 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/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."
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 78633249a8..980edcc7d3 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/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."
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index 32559441ca..8b1afb358d 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/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 ""
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index bb9082b8fc..7b55bebc7c 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/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."
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 23ff96855a..0d022f0e02 100644
--- a/src/google/protobuf/type.pb.h
+++ b/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."
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index e5d676aa44..22f65904f6 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/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."