Merge pull request #8689 from deannagarcia/merge3.17.2

Merge 3.17.x into master
4 years ago · 548e01324e
parent b650ea44b1 50a317556a
commit 548e01324e
33 changed files with 51 additions and 69 deletions
--- a/Protobuf-C++.podspec
+++ b/Protobuf-C++.podspec
@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name     = 'Protobuf-C++'
-  s.version  = '3.17.1'
+  s.version  = '3.17.2'
  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.17.1'
+  s.version  = '3.17.2'
  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.17.1],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.17.2],[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.17.1</version>
+    <version>3.17.2</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.17.1</VersionPrefix>
+    <VersionPrefix>3.17.2</VersionPrefix>
    <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
    <LangVersion>7.2</LangVersion>
    <Authors>Google Inc.</Authors>
--- 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.17.1</version>
+  <version>3.17.2</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.17.1</version>
+    <version>3.17.2</version>
  </parent>

  <artifactId>protobuf-java</artifactId>
--- a/java/kotlin-lite/pom.xml
+++ b/java/kotlin-lite/pom.xml
@ -4,11 +4,10 @@
  <parent>
    <groupId>com.google.protobuf</groupId>
    <artifactId>protobuf-parent</artifactId>
-    <version>3.17.1</version>
+    <version>3.17.2</version>
  </parent>

  <artifactId>protobuf-kotlin-lite</artifactId>
-  <packaging>bundle</packaging>

  <name>Protocol Buffers [Lite]</name>
  <description>
@ -263,22 +262,6 @@
          </execution>
        </executions>
      </plugin>
-
-      <!-- OSGI bundle configuration -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
-            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
-            <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
-            <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
    </plugins>
  </build>
 </project>
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@ -4,11 +4,10 @@
  <parent>
    <groupId>com.google.protobuf</groupId>
    <artifactId>protobuf-parent</artifactId>
-    <version>3.17.1</version>
+    <version>3.17.2</version>
  </parent>

  <artifactId>protobuf-kotlin</artifactId>
-  <packaging>bundle</packaging>

  <name>Protocol Buffers [Core]</name>
  <description>
@ -220,21 +219,6 @@
          </execution>
        </executions>
      </plugin>
-      <!-- OSGI bundle configuration -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
-            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
-            <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
-            <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
      <plugin>
        <groupId>org.jetbrains.dokka</groupId>
        <artifactId>dokka-maven-plugin</artifactId>
--- 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.17.1</version>
+    <version>3.17.2</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.17.1</version>
+  <version>3.17.2</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.17.1</version>
+    <version>3.17.2</version>
  </parent>

  <artifactId>protobuf-java-util</artifactId>
--- a/js/package.json
+++ b/js/package.json
@ -1,6 +1,6 @@
 {
  "name": "google-protobuf",
-  "version": "3.17.1",
+  "version": "3.17.2",
  "description": "Protocol Buffers for JavaScript",
  "main": "google-protobuf.js",
  "files": [
--- a/php/ext/google/protobuf/package.xml
+++ b/php/ext/google/protobuf/package.xml
@ -10,11 +10,11 @@
  <email>protobuf-opensource@google.com</email>
  <active>yes</active>
 </lead>
- <date>2021-05-19</date>
- <time>16:06:12</time>
+ <date>2021-05-25</date>
+ <time>19:32:12</time>
 <version>
-  <release>3.17.1</release>
-  <api>3.17.1</api>
+  <release>3.17.2</release>
+  <api>3.17.2</api>
 </version>
 <stability>
  <release>stable</release>
@ -1012,5 +1012,20 @@ G  A release.
   all but one are null.
   </notes>
  </release>
+  <release>
+   <version>
+    <release>3.17.2</release>
+    <api>3.17.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2021-05-25</date>
+   <time>19:32:12</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
@ -81,7 +81,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.17.1"
+#define PHP_PROTOBUF_VERSION "3.17.2"

 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:
--- 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.17.1</version>
+  <version>3.17.2</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.17.1'
+__version__ = '3.17.2'
--- 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.17.1"
+  s.version     = "3.17.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"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -18,7 +18,7 @@ else
 PTHREAD_DEF =
 endif

-PROTOBUF_VERSION = 28:1:0
+PROTOBUF_VERSION = 28:2: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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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
@ -107,7 +107,7 @@
 #ifdef PROTOBUF_VERSION
 #error PROTOBUF_VERSION was previously defined
 #endif
-#define PROTOBUF_VERSION 3017001
+#define PROTOBUF_VERSION 3017002

 #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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001
+#define GOOGLE_PROTOBUF_VERSION 3017002

 // 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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 3017001 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3017002 < 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.