Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge release branch 21.x in to main

Browse Source
pull/11138/head
Jorg Brown 2 years ago
parent 47aecb734b d024e3bca1
commit bab8ec343b
33 changed files with 48 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      CHANGES.txt
  2. 2
      Protobuf-C++.podspec
  3. 2
      Protobuf.podspec
  4. 2
      csharp/Google.Protobuf.Tools.nuspec
  5. 2
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  6. 6
      java/README.md
  7. 2
      java/bom/pom.xml
  8. 2
      java/core/pom.xml
  9. 2
      java/kotlin-lite/pom.xml
  10. 2
      java/kotlin/pom.xml
  11. 2
      java/lite.md
  12. 2
      java/lite/pom.xml
  13. 2
      java/pom.xml
  14. 2
      java/util/pom.xml
  15. 2
      php/ext/google/protobuf/protobuf.h
  16. 8
      protobuf_version.bzl
  17. 2
      python/google/protobuf/__init__.py
  18. 2
      ruby/google-protobuf.gemspec
  19. 4
      ruby/pom.xml
  20. 2
      src/google/protobuf/any.pb.h
  21. 2
      src/google/protobuf/api.pb.h
  22. 2
      src/google/protobuf/compiler/plugin.pb.h
  23. 2
      src/google/protobuf/descriptor.pb.h
  24. 2
      src/google/protobuf/duration.pb.h
  25. 2
      src/google/protobuf/empty.pb.h
  26. 2
      src/google/protobuf/field_mask.pb.h
  27. 2
      src/google/protobuf/port_def.inc
  28. 2
      src/google/protobuf/source_context.pb.h
  29. 2
      src/google/protobuf/struct.pb.h
  30. 2
      src/google/protobuf/stubs/common.h
  31. 2
      src/google/protobuf/timestamp.pb.h
  32. 2
      src/google/protobuf/type.pb.h
  33. 2
      src/google/protobuf/wrappers.pb.h

10
CHANGES.txt
Unescape View File

@ -81,6 +81,16 @@
* Print full path name of source .proto file on error * Print full path name of source .proto file on error
* Include proto message type in the annotation comments. * Include proto message type in the annotation comments.
2022-11-29 version 21.10 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
Java
* Use bit-field int values in buildPartial to skip work on unset groups of fields. (#10960)
* Mark nested builder as clean after clear is called (#10984)
UPB
* Fix UPB_LIKELY() for 32-bit Windows builds; update protobuf_deps to point to the current upb 21.x (#11028)
Other
* Add public modifiers to kotlin code (#11068)
2022-10-26 version 21.9 (C++/Java/Python/PHP/Objective-C/C#/Ruby) 2022-10-26 version 21.9 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
C++ C++

2
Protobuf-C++.podspec
Unescape View File

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

2
Protobuf.podspec
Unescape View File

@ -5,7 +5,7 @@
# dependent projects use the :git notation to refer to the library. # dependent projects use the :git notation to refer to the library.
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Protobuf' s.name = 'Protobuf'
s.version = '3.21.9' s.version = '3.21.10'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf' s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'

2
csharp/Google.Protobuf.Tools.nuspec
Unescape View File

@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title> <title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
<description>See project site for more info.</description> <description>See project site for more info.</description>
<version>3.21.9</version> <version>3.21.10</version>
<authors>Google Inc.</authors> <authors>Google Inc.</authors>
<owners>protobuf-packages</owners> <owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

2
csharp/src/Google.Protobuf/Google.Protobuf.csproj
Unescape View File

@ -5,7 +5,7 @@
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description> <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright> <Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle> <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
<VersionPrefix>3.21.9</VersionPrefix> <VersionPrefix>3.21.10</VersionPrefix>
<LangVersion>10.0</LangVersion> <LangVersion>10.0</LangVersion>
<Authors>Google Inc.</Authors> <Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks> <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

6
java/README.md
Unescape View File

@ -23,7 +23,7 @@ If you are using Maven, use the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>3.21.9</version> <version>3.21.10</version>
</dependency> </dependency>
``` ```
@ -37,7 +37,7 @@ protobuf-java-util package:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.21.9</version> <version>3.21.10</version>
</dependency> </dependency>
``` ```
@ -45,7 +45,7 @@ protobuf-java-util package:
If you are using Gradle, add the following to your `build.gradle` file's dependencies: If you are using Gradle, add the following to your `build.gradle` file's dependencies:
``` ```
implementation 'com.google.protobuf:protobuf-java:3.21.9' implementation 'com.google.protobuf:protobuf-java:3.21.10'
``` ```
Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using. Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.

2
java/bom/pom.xml
Unescape View File

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

2
java/core/pom.xml
Unescape View File

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

2
java/kotlin-lite/pom.xml
Unescape View File

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

2
java/kotlin/pom.xml
Unescape View File

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

2
java/lite.md
Unescape View File

@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>
<version>3.21.9</version> <version>3.21.10</version>
</dependency> </dependency>
``` ```

2
java/lite/pom.xml
Unescape View File

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

2
java/pom.xml
Unescape View File

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

2
java/util/pom.xml
Unescape View File

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

2
php/ext/google/protobuf/protobuf.h
Unescape View File

@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
#define PHP_PROTOBUF_VERSION "3.21.9" #define PHP_PROTOBUF_VERSION "3.21.10"
// ptr -> PHP object cache. This is a weak map that caches lazily-created // ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types: // wrapper objects around upb types:

8
protobuf_version.bzl
Unescape View File

@ -1,4 +1,4 @@
PROTOC_VERSION = "21.9" PROTOC_VERSION = "21.10"
PROTOBUF_JAVA_VERSION = "3.21.9" PROTOBUF_JAVA_VERSION = "3.21.10"
PROTOBUF_PYTHON_VERSION = "4.21.9" PROTOBUF_PYTHON_VERSION = "4.21.10"
PROTOBUF_PHP_VERSION = "3.21.9" PROTOBUF_PHP_VERSION = "3.21.10"

2
python/google/protobuf/__init__.py
Unescape View File

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

2
ruby/google-protobuf.gemspec
Unescape View File

@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "google-protobuf" s.name = "google-protobuf"
s.version = "3.21.9" s.version = "3.21.10"
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 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.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers" s.summary = "Protocol Buffers"

4
ruby/pom.xml
Unescape View File

@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId> <groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId> <artifactId>protobuf-jruby</artifactId>
<version>3.21.9</version> <version>3.21.10</version>
<name>Protocol Buffer JRuby native extension</name> <name>Protocol Buffer JRuby native extension</name>
<description> <description>
Protocol Buffers are a way of encoding structured data in an efficient yet Protocol Buffers are a way of encoding structured data in an efficient yet
@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.21.9</version> <version>3.21.10</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jruby</groupId> <groupId>org.jruby</groupId>

2
src/google/protobuf/any.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/api.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/compiler/plugin.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/descriptor.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/duration.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/empty.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/field_mask.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/port_def.inc
Unescape View File

@ -217,7 +217,7 @@
#ifdef PROTOBUF_VERSION #ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined #error PROTOBUF_VERSION was previously defined
#endif #endif
#define PROTOBUF_VERSION 3021009 #define PROTOBUF_VERSION 3021010
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined

2
src/google/protobuf/source_context.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/struct.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/stubs/common.h
Unescape View File

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

2
src/google/protobuf/timestamp.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/type.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

2
src/google/protobuf/wrappers.pb.h
Unescape View File

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION #if 3021010 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

Write Preview
Loading…
Cancel
Save