Internal changes
PiperOrigin-RevId: 515648197
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc337f8..c042073 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,7 @@
endif ()
# Version metadata
-set(protobuf_VERSION_STRING "4.22.2")
+set(protobuf_VERSION_STRING "4.22.1")
set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com")
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
index fcdc2a4..07e2298 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.2'
+ s.version = '4.22.1'
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 47a9648..695bba4 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.2'
+ s.version = '3.22.1'
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 b6ee814..8e0fb0a 100644
--- a/build_defs/java_opts.bzl
+++ b/build_defs/java_opts.bzl
@@ -1,4 +1,5 @@
"""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")
@@ -11,11 +12,11 @@
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 e2e665b..85ae51b 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.2</version>
+ <version>3.22.1</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 1c9a007..344f4c4 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.2</VersionPrefix>
+ <VersionPrefix>3.22.1</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 30db593..4067c4e 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.2</version>
+ <version>3.22.1</version>
</dependency>
```
@@ -37,16 +37,16 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <version>3.22.2</version>
+ <version>3.22.1</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.2'`
-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.1'` 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 c08916d..22d812d 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.2</version>
+ <version>3.22.1</version>
<packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 60696c3..b43bf2d 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.2</version>
+ <version>3.22.1</version>
</parent>
<artifactId>protobuf-java</artifactId>
diff --git a/java/internal/JavaVersionTest.java b/java/internal/JavaVersionTest.java
index c9ea0a5..912870b 100644
--- a/java/internal/JavaVersionTest.java
+++ b/java/internal/JavaVersionTest.java
@@ -45,10 +45,10 @@
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 da3059f..37193f2 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.2</version>
+ <version>3.22.1</version>
</parent>
<artifactId>protobuf-kotlin-lite</artifactId>
diff --git a/java/kotlin-lite/pom_template.xml b/java/kotlin-lite/pom_template.xml
index 6e3e05f..90d9857 100644
--- a/java/kotlin-lite/pom_template.xml
+++ b/java/kotlin-lite/pom_template.xml
@@ -17,14 +17,8 @@
</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>
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index ec6cf3a..f9aa88e 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.2</version>
+ <version>3.22.1</version>
</parent>
<artifactId>protobuf-kotlin</artifactId>
diff --git a/java/kotlin/pom_template.xml b/java/kotlin/pom_template.xml
index a66e44d..d04bc89 100644
--- a/java/kotlin/pom_template.xml
+++ b/java/kotlin/pom_template.xml
@@ -17,14 +17,8 @@
</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>
diff --git a/java/lite.md b/java/lite.md
index 1bda472..41e00aa 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.2</version>
+ <version>3.22.1</version>
</dependency>
```
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index e69f773..ae9689f 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.2</version>
+ <version>3.22.1</version>
</parent>
<artifactId>protobuf-javalite</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index 8092ca6..26b595e 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.2</version>
+ <version>3.22.1</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>
diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml
index 02976e1..a891850 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.2</version>
+ <version>3.22.1</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index d8326eb..f8bc8e6 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.2</version>
+ <version>3.22.1</version>
</parent>
<artifactId>protobuf-java-util</artifactId>
diff --git a/java/util/pom_template.xml b/java/util/pom_template.xml
index 82d84c8..74ef795 100644
--- a/java/util/pom_template.xml
+++ b/java/util/pom_template.xml
@@ -14,9 +14,8 @@
<description>Utilities for Protocol Buffers</description>
<dependencies>
<dependency>
- <groupId>{groupId}</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>protobuf-java</artifactId>
- <version>{version}</version>
</dependency>
{dependencies}
</dependencies>
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index 0d9399a..4ed924b 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.2"
+#define PHP_PROTOBUF_VERSION "3.22.1"
// 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 b71c23f..5cc1e69 100644
--- a/protobuf_version.bzl
+++ b/protobuf_version.bzl
@@ -1,5 +1,6 @@
-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"
+""" 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"
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index 2af0a02..b9650b1 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.2'
+__version__ = '4.22.1'
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 157efc0..37acd1b 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.2"
+ s.version = "3.22.1"
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 3a5f626..503d3af 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.2</version>
+ <version>3.22.1</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.2</version>
+ <version>3.22.1</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
index 5cef0b2..5e3404e 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 4022002 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022001 < 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 f5884d2..455021a 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 4022002 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4022001 < 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 8767649..a969269 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -226,7 +226,7 @@
#ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined
#endif
-#define PROTOBUF_VERSION 4022002
+#define PROTOBUF_VERSION 4022001
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index 8b1afb3..3255944 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -66,7 +66,7 @@
// The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro
-#define GOOGLE_PROTOBUF_VERSION 4022002
+#define GOOGLE_PROTOBUF_VERSION 4022001
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
