Merge branch '3.19.x' into merge-3.19.x

3 years ago · 5bb34e9930
parent 49b184b163 cc7b1b5323
commit 5bb34e9930
41 changed files with 89 additions and 49 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -1,3 +1,13 @@
+2022-01-10 version 3.19.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
+
+  Python
+  * Fix missing Windows wheel for Python 3.10 on PyPI
+
+2022-01-05 version 3.19.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
+
+  Java
+  * Improve performance characteristics of UnknownFieldSet parsing (#9371)
+
 2021-10-28 version 3.19.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)

  Bazel
--- a/Protobuf-C++.podspec
+++ b/Protobuf-C++.podspec
@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name     = 'Protobuf-C++'
-  s.version  = '3.19.1'
+  s.version  = '3.19.3'
  s.summary  = 'Protocol Buffers v3 runtime library for C++.'
  s.homepage = 'https://github.com/google/protobuf'
  s.license  = '3-Clause BSD License'
--- 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.19.1'
+  s.version  = '3.19.3'
  s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
  s.homepage = 'https://github.com/protocolbuffers/protobuf'
  s.license  = '3-Clause BSD License'
--- a/configure.ac
+++ b/configure.ac
@ -17,7 +17,7 @@ AC_PREREQ(2.59)
 # In the SVN trunk, the version should always be the next anticipated release
 # version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
 # the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[3.19.1],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.19.3],[protobuf@googlegroups.com],[protobuf])

 AM_MAINTAINER_MODE([enable])

--- 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.19.1</version>
+    <version>3.19.3</version>
    <authors>Google Inc.</authors>
    <owners>protobuf-packages</owners>
    <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>
--- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj
+++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@ -4,7 +4,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.19.1</VersionPrefix>
+    <VersionPrefix>3.19.3</VersionPrefix>
    <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
    <LangVersion>7.2</LangVersion>
    <Authors>Google Inc.</Authors>
--- a/java/README.md
+++ b/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.19.1</version>
+  <version>3.19.3</version>
 </dependency>
 ```

@ -37,7 +37,7 @@ protobuf-java-util package:
 <dependency>
  <groupId>com.google.protobuf</groupId>
  <artifactId>protobuf-java-util</artifactId>
-  <version>3.19.1</version>
+  <version>3.19.3</version>
 </dependency>
 ```

@ -45,7 +45,7 @@ protobuf-java-util package:

 If you are using Gradle, add the following to your `build.gradle` file's dependencies:
 ```
-    implementation 'com.google.protobuf:protobuf-java:3.19.1'
+    implementation 'com.google.protobuf:protobuf-java:3.19.3'
 ```
 Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.

--- 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.19.1</version>
+  <version>3.19.3</version>
  <packaging>pom</packaging>

  <name>Protocol Buffers [BOM]</name>
--- 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.19.1</version>
+    <version>3.19.3</version>
  </parent>

  <artifactId>protobuf-java</artifactId>
--- 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.19.1</version>
+    <version>3.19.3</version>
  </parent>

  <artifactId>protobuf-kotlin-lite</artifactId>
--- 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.19.1</version>
+    <version>3.19.3</version>
  </parent>

  <artifactId>protobuf-kotlin</artifactId>
--- a/java/lite.md
+++ b/java/lite.md
@ -30,7 +30,7 @@ protobuf Java runtime. If you are using Maven, use the following:
 <dependency>
  <groupId>com.google.protobuf</groupId>
  <artifactId>protobuf-javalite</artifactId>
-  <version>3.19.1</version>
+  <version>3.19.3</version>
 </dependency>
 ```

--- 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.19.1</version>
+    <version>3.19.3</version>
  </parent>

  <artifactId>protobuf-javalite</artifactId>
--- a/java/pom.xml
+++ b/java/pom.xml
@ -4,7 +4,7 @@

  <groupId>com.google.protobuf</groupId>
  <artifactId>protobuf-parent</artifactId>
-  <version>3.19.1</version>
+  <version>3.19.3</version>
  <packaging>pom</packaging>

  <name>Protocol Buffers [Parent]</name>
--- 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.19.1</version>
+    <version>3.19.3</version>
  </parent>

  <artifactId>protobuf-java-util</artifactId>
--- a/js/package.json
+++ b/js/package.json
@ -1,6 +1,6 @@
 {
  "name": "google-protobuf",
-  "version": "3.19.1",
+  "version": "3.19.3",
  "description": "Protocol Buffers for JavaScript",
  "main": "google-protobuf.js",
  "files": [
--- a/kokoro/linux/dockerfile/test/ruby/Dockerfile
+++ b/kokoro/linux/dockerfile/test/ruby/Dockerfile
@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y \
 RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys \
    409B6B1796C275462A1703113804BB82D39DC0E3 \
    7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-RUN \curl -sSL https://get.rvm.io | bash -s master
+RUN \curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s master

 RUN /bin/bash -l -c "rvm install 2.5.1"
 RUN /bin/bash -l -c "rvm install 2.6.0"
--- a/kokoro/release/python/windows/install_python_interpreters.ps1
+++ b/kokoro/release/python/windows/install_python_interpreters.ps1
@ -101,7 +101,7 @@ $Python310x86Config = @{
    PythonVersion = "3.10.0"
    PythonInstaller = "python-3.10.0"
    PythonInstallPath = "C:\python310_32bit"
-    PythonInstallerHash = "6de353f2f7422aa030d4ccc788ffa75e"
+    PythonInstallerHash = "133aa48145032e341ad2a000cd3bff50"
 }
 Install-Python @Python310x86Config

@ -109,6 +109,6 @@ $Python310x64Config = @{
    PythonVersion = "3.10.0"
    PythonInstaller = "python-3.10.0-amd64"
    PythonInstallPath = "C:\python310"
-    PythonInstallerHash = "39135519b044757f0a3b09d63612b0da"
+    PythonInstallerHash = "c3917c08a7fe85db7203da6dcaa99a70"
 }
 Install-Python @Python310x64Config
--- a/php/ext/google/protobuf/package.xml
+++ b/php/ext/google/protobuf/package.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.5" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+<package packagerversion="1.9.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
 <name>protobuf</name>
 <channel>pecl.php.net</channel>
 <summary>Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.</summary>
@ -10,11 +10,11 @@
  <email>protobuf-opensource@google.com</email>
  <active>yes</active>
 </lead>
- <date>2021-10-28</date>
- <time>20:01:12</time>
+ <date>2022-01-11</date>
+ <time>00:58:50</time>
 <version>
-  <release>3.19.1</release>
-  <api>3.19.1</api>
+  <release>3.19.3</release>
+  <api>3.19.3</api>
 </version>
 <stability>
  <release>stable</release>
@ -22,7 +22,7 @@
 </stability>
 <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
 <notes>
- * No new changes in 3.19.1
+ * No new changes in 3.19.3
 </notes>
 <contents>
  <dir baseinstalldir="/" name="/">
@ -1158,5 +1158,35 @@ G  A release.
   <notes>
   </notes>
  </release>
+  <release>
+   <version>
+    <release>3.19.2</release>
+    <api>3.19.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2022-01-05</date>
+   <time>17:01:38</time>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
+   <notes>
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>3.19.3</release>
+    <api>3.19.3</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2022-01-11</date>
+   <time>00:58:50</time>
+   <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
+   <notes>
+   </notes>
+  </release>
 </changelog>
 </package>
--- a/php/ext/google/protobuf/protobuf.h
+++ b/php/ext/google/protobuf/protobuf.h
@ -91,7 +91,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.19.1"
+#define PHP_PROTOBUF_VERSION "3.19.3"

 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:
--- a/protobuf_version.bzl
+++ b/protobuf_version.bzl
@ -1 +1 @@
-PROTOBUF_VERSION = '3.19.1'
+PROTOBUF_VERSION = '3.19.3'
--- a/protoc-artifacts/pom.xml
+++ b/protoc-artifacts/pom.xml
@ -8,7 +8,7 @@
  </parent>
  <groupId>com.google.protobuf</groupId>
  <artifactId>protoc</artifactId>
-  <version>3.19.1</version>
+  <version>3.19.3</version>
  <packaging>pom</packaging>
  <name>Protobuf Compiler</name>
  <description>
--- a/python/google/protobuf/init.py
+++ b/python/google/protobuf/init.py
@ -30,4 +30,4 @@

 # Copyright 2007 Google Inc. All Rights Reserved.

-__version__ = '3.19.1'
+__version__ = '3.19.3'
--- a/python/google/protobuf/pyext/unknown_fields.cc
+++ b/python/google/protobuf/pyext/unknown_fields.cc
@ -219,7 +219,7 @@ const UnknownField* GetUnknownField(PyUnknownFieldRef* self) {
                 "The parent message might be cleared.");
    return NULL;
  }
-  ssize_t total_size = fields->field_count();
+  Py_ssize_t total_size = fields->field_count();
  if (self->index >= total_size) {
    PyErr_Format(PyExc_ValueError,
                 "UnknownField does not exist. "
--- 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.19.1"
+  s.version     = "3.19.3"
  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"
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@ -9,7 +9,7 @@

    <groupId>com.google.protobuf.jruby</groupId>
    <artifactId>protobuf-jruby</artifactId>
-    <version>3.19.1</version>
+    <version>3.19.3</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.19.1</version>
+          <version>3.19.3</version>
        </dependency>
        <dependency>
            <groupId>org.jruby</groupId>
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -18,7 +18,7 @@ else
 PTHREAD_DEF =
 endif

-PROTOBUF_VERSION = 30:1:0
+PROTOBUF_VERSION = 30:3:0

 if GCC
 # Turn on all warnings except for sign comparison (we ignore sign comparison
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@ -153,7 +153,7 @@
 #ifdef PROTOBUF_VERSION
 #error PROTOBUF_VERSION was previously defined
 #endif
-#define PROTOBUF_VERSION 3019001
+#define PROTOBUF_VERSION 3019003

 #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
 #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@ -82,7 +82,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 3019001
+#define GOOGLE_PROTOBUF_VERSION 3019003

 // A suffix string for alpha, beta or rc releases. Empty for stable releases.
 #define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@ -13,7 +13,7 @@
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3019003 < 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.