Browse Source

Merge 22.x back to main (#12200)

Closes #12200

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12200 from protocolbuffers:main-202303101853 1efa2e7205
PiperOrigin-RevId: 515722578
pull/12205/head
zhangskz 1 year ago
committed by Copybara-Service
parent
commit
b15bf628e5
27 changed files with 47 additions and 34 deletions
  1. +1
    -1
      CMakeLists.txt
  2. +1
    -1
      Protobuf-C++.podspec
  3. +1
    -1
      Protobuf.podspec
  4. +1
    -1
      csharp/Google.Protobuf.Tools.nuspec
  5. +1
    -1
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  6. +3
    -3
      java/README.md
  7. +1
    -1
      java/bom/pom.xml
  8. +1
    -1
      java/core/pom.xml
  9. +1
    -1
      java/kotlin-lite/pom.xml
  10. +7
    -1
      java/kotlin-lite/pom_template.xml
  11. +1
    -1
      java/kotlin/pom.xml
  12. +7
    -1
      java/kotlin/pom_template.xml
  13. +1
    -1
      java/lite.md
  14. +1
    -1
      java/lite/pom.xml
  15. +1
    -1
      java/pom.xml
  16. +1
    -1
      java/protoc/pom.xml
  17. +1
    -1
      java/util/pom.xml
  18. +2
    -1
      java/util/pom_template.xml
  19. +1
    -1
      php/ext/google/protobuf/protobuf.h
  20. +5
    -5
      protobuf_version.bzl
  21. +1
    -1
      python/google/protobuf/__init__.py
  22. +1
    -1
      ruby/google-protobuf.gemspec
  23. +2
    -2
      ruby/pom.xml
  24. +1
    -1
      src/google/protobuf/compiler/plugin.pb.h
  25. +1
    -1
      src/google/protobuf/descriptor.pb.h
  26. +1
    -1
      src/google/protobuf/port_def.inc
  27. +1
    -1
      src/google/protobuf/stubs/common.h

+ 1
- 1
CMakeLists.txt View File

@ -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")


+ 1
- 1
Protobuf-C++.podspec View File

@ -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'


+ 1
- 1
Protobuf.podspec View File

@ -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'


+ 1
- 1
csharp/Google.Protobuf.Tools.nuspec View File

@ -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>


+ 1
- 1
csharp/src/Google.Protobuf/Google.Protobuf.csproj View File

@ -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>


+ 3
- 3
java/README.md View File

@ -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,14 +37,14 @@ 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'` Again,
be sure to check that the version number matches (or is newer than) the version
number of protoc that you are using.


+ 1
- 1
java/bom/pom.xml View File

@ -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>


+ 1
- 1
java/core/pom.xml View File

@ -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>


+ 1
- 1
java/kotlin-lite/pom.xml View File

@ -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>


+ 7
- 1
java/kotlin-lite/pom_template.xml View File

@ -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>


+ 1
- 1
java/kotlin/pom.xml View File

@ -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>


+ 7
- 1
java/kotlin/pom_template.xml View File

@ -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>


+ 1
- 1
java/lite.md View File

@ -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>
```


+ 1
- 1
java/lite/pom.xml View File

@ -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>


+ 1
- 1
java/pom.xml View File

@ -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>


+ 1
- 1
java/protoc/pom.xml View File

@ -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>


+ 1
- 1
java/util/pom.xml View File

@ -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>


+ 2
- 1
java/util/pom_template.xml View File

@ -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>


+ 1
- 1
php/ext/google/protobuf/protobuf.h View File

@ -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:


+ 5
- 5
protobuf_version.bzl View File

@ -1,6 +1,6 @@
""" 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"

+ 1
- 1
python/google/protobuf/__init__.py View File

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

+ 1
- 1
ruby/google-protobuf.gemspec View File

@ -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"


+ 2
- 2
ruby/pom.xml View File

@ -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>


+ 1
- 1
src/google/protobuf/compiler/plugin.pb.h View File

@ -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."


+ 1
- 1
src/google/protobuf/descriptor.pb.h View File

@ -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."


+ 1
- 1
src/google/protobuf/port_def.inc View File

@ -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


+ 1
- 1
src/google/protobuf/stubs/common.h View File

@ -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 ""


Loading…
Cancel
Save