Update protobuf version

2020-11-05 13:43:22 -08:00 · 2020-11-05 13:43:22 -08:00 · 27100b40fd
commit 27100b40fd
parent ea513d71e0
41 changed files with 175 additions and 80 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.13.0'
+  s.version  = '3.14.0-rc1'
  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.13.0'
+  s.version  = '3.14.0-rc1'
  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.13.0],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.14.0-rc-1],[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.13.0</version>
+    <version>3.14.0-rc1</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.13.0</VersionPrefix>
+    <VersionPrefix>3.14.0-rc1</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.13.0</version>
+  <version>3.14.0-rc-1</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.13.0</version>
+    <version>3.14.0-rc-1</version>
  </parent>

  <artifactId>protobuf-java</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.13.0</version>
+    <version>3.14.0-rc-1</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.13.0</version>
+  <version>3.14.0-rc-1</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.13.0</version>
+    <version>3.14.0-rc-1</version>
  </parent>

  <artifactId>protobuf-java-util</artifactId>
--- a/js/package.json
+++ b/js/package.json
@ -1,6 +1,6 @@
 {
  "name": "google-protobuf",
-  "version": "3.13.0",
+  "version": "3.14.0-rc.1",
  "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,15 +10,15 @@
  <email>protobuf-opensource@google.com</email>
  <active>yes</active>
 </lead>
- <date>2020-10-08</date>
- <time>14:07:59</time>
+ <date>2020-11-05</date>
+ <time>13:39:47</time>
 <version>
-  <release>3.13.0.1</release>
-  <api>3.13.0.1</api>
+  <release>3.14.0RC1</release>
+  <api>3.14.0</api>
 </version>
 <stability>
-  <release>stable</release>
-  <api>stable</api>
+  <release>beta</release>
+  <api>beta</api>
 </stability>
 <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
 <notes>GA release.</notes>
@ -691,5 +691,20 @@ G  A release.
   <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
   <notes>GA release.</notes>
  </release>
+  <release>
+   <version>
+    <release>3.14.0RC1</release>
+    <api>3.14.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2020-11-05</date>
+   <time>13:39:47</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
@ -69,7 +69,7 @@ const zval *get_generated_pool();
 #define PROTO_STRLEN_P(obj) ZSTR_LEN(obj)
 #endif

-#define PHP_PROTOBUF_VERSION "3.13.0.1"
+#define PHP_PROTOBUF_VERSION "3.14.0RC1"

 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:
--- a/php/src/GPBMetadata/Google/Protobuf/Any.php
+++ b/php/src/GPBMetadata/Google/Protobuf/Any.php
@ -14,9 +14,15 @@ class Any
        if (static::$is_initialized == true) {
          return;
        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ad4010a19676f6f676c652f70726f746f6275662f616e792e70726f746f120f676f6f676c652e70726f746f62756622260a03416e7912100a08747970655f75726c180120012809120d0a0576616c756518022001280c42760a13636f6d2e676f6f676c652e70726f746f6275664208416e7950726f746f50015a2c676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f616e797062a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
-        ), true);
+        $pool->internalAddGeneratedFile(
+            '
+Ô
+google/protobuf/any.protogoogle.protobuf"&
+Any
+type_url (	
+value (Bv
+com.google.protobufBAnyProtoPZ,google.golang.org/protobuf/types/known/anypb˘GPBŞGoogle.Protobuf.WellKnownTypesbproto3'
+        , true);

        static::$is_initialized = true;
    }
--- a/php/src/GPBMetadata/Google/Protobuf/Api.php
+++ b/php/src/GPBMetadata/Google/Protobuf/Api.php
@ -16,9 +16,31 @@ class Api
        }
        \GPBMetadata\Google\Protobuf\SourceContext::initOnce();
        \GPBMetadata\Google\Protobuf\Type::initOnce();
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ac9050a19676f6f676c652f70726f746f6275662f6170692e70726f746f120f676f6f676c652e70726f746f6275661a1a676f6f676c652f70726f746f6275662f747970652e70726f746f2281020a03417069120c0a046e616d6518012001280912280a076d6574686f647318022003280b32172e676f6f676c652e70726f746f6275662e4d6574686f6412280a076f7074696f6e7318032003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e120f0a0776657273696f6e18042001280912360a0e736f757263655f636f6e7465787418052001280b321e2e676f6f676c652e70726f746f6275662e536f75726365436f6e7465787412260a066d6978696e7318062003280b32162e676f6f676c652e70726f746f6275662e4d6978696e12270a0673796e74617818072001280e32172e676f6f676c652e70726f746f6275662e53796e74617822d5010a064d6574686f64120c0a046e616d6518012001280912180a10726571756573745f747970655f75726c18022001280912190a11726571756573745f73747265616d696e6718032001280812190a11726573706f6e73655f747970655f75726c180420012809121a0a12726573706f6e73655f73747265616d696e6718052001280812280a076f7074696f6e7318062003280b32172e676f6f676c652e70726f746f6275662e4f7074696f6e12270a0673796e74617818072001280e32172e676f6f676c652e70726f746f6275662e53796e74617822230a054d6978696e120c0a046e616d65180120012809120c0a04726f6f7418022001280942760a13636f6d2e676f6f676c652e70726f746f627566420841706950726f746f50015a2c676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f6170697062a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
-        ), true);
+        $pool->internalAddGeneratedFile(
+            '
+É
+google/protobuf/api.protogoogle.protobufgoogle/protobuf/type.proto"<EFBFBD>
+Api
+name (	(
+methods (2.google.protobuf.Method(
+options (2.google.protobuf.Option
+version (	6
+source_context (2.google.protobuf.SourceContext&
+mixins (2.google.protobuf.Mixin\'
+syntax (2.google.protobuf.Syntax"Ő
+Method
+name (	
+request_type_url (	
+request_streaming (
+response_type_url (	
+response_streaming ((
+options (2.google.protobuf.Option\'
+syntax (2.google.protobuf.Syntax"#
+Mixin
+name (	
+root (	Bv
+com.google.protobufBApiProtoPZ,google.golang.org/protobuf/types/known/apipb˘GPBŞGoogle.Protobuf.WellKnownTypesbproto3'
+        , true);

        static::$is_initialized = true;
    }
--- a/php/src/GPBMetadata/Google/Protobuf/Duration.php
+++ b/php/src/GPBMetadata/Google/Protobuf/Duration.php
@ -14,9 +14,15 @@ class Duration
        if (static::$is_initialized == true) {
          return;
        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0aeb010a1e676f6f676c652f70726f746f6275662f6475726174696f6e2e70726f746f120f676f6f676c652e70726f746f627566222a0a084475726174696f6e120f0a077365636f6e6473180120012803120d0a056e616e6f731802200128054283010a13636f6d2e676f6f676c652e70726f746f627566420d4475726174696f6e50726f746f50015a31676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f6475726174696f6e7062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
-        ), true);
+        $pool->internalAddGeneratedFile(
+            '
+ë
+google/protobuf/duration.protogoogle.protobuf"*
+Duration
+seconds (
+nanos (Bƒ
+com.google.protobufB
DurationProtoPZ1google.golang.org/protobuf/types/known/durationpbø¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
+        , true);

        static::$is_initialized = true;
    }
--- a/php/src/GPBMetadata/Google/Protobuf/FieldMask.php
+++ b/php/src/GPBMetadata/Google/Protobuf/FieldMask.php
@ -14,9 +14,14 @@ class FieldMask
        if (static::$is_initialized == true) {
          return;
        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0adf010a20676f6f676c652f70726f746f6275662f6669656c645f6d61736b2e70726f746f120f676f6f676c652e70726f746f627566221a0a094669656c644d61736b120d0a0570617468731801200328094285010a13636f6d2e676f6f676c652e70726f746f627566420e4669656c644d61736b50726f746f50015a32676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f6669656c646d61736b7062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
-        ), true);
+        $pool->internalAddGeneratedFile(
+            '
+ß
+ google/protobuf/field_mask.protogoogle.protobuf"
+	FieldMask
+paths (	B…
+com.google.protobufBFieldMaskProtoPZ2google.golang.org/protobuf/types/known/fieldmaskpbř˘GPBŞGoogle.Protobuf.WellKnownTypesbproto3'
+        , true);

        static::$is_initialized = true;
    }
--- a/php/src/GPBMetadata/Google/Protobuf/GPBEmpty.php
+++ b/php/src/GPBMetadata/Google/Protobuf/GPBEmpty.php
@ -14,9 +14,14 @@ class GPBEmpty
        if (static::$is_initialized == true) {
          return;
        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0abe010a1b676f6f676c652f70726f746f6275662f656d7074792e70726f746f120f676f6f676c652e70726f746f62756622070a05456d707479427d0a13636f6d2e676f6f676c652e70726f746f627566420a456d70747950726f746f50015a2e676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f656d7074797062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
-        ), true);
+        $pool->internalAddGeneratedFile(
+            '
+ž
+google/protobuf/empty.protogoogle.protobuf"
+EmptyB}
+com.google.protobufB
+EmptyProtoPZ.google.golang.org/protobuf/types/known/emptypbř˘GPBŞGoogle.Protobuf.WellKnownTypesbproto3'
+        , true);

        static::$is_initialized = true;
    }
--- a/php/src/GPBMetadata/Google/Protobuf/SourceContext.php
+++ b/php/src/GPBMetadata/Google/Protobuf/SourceContext.php
@ -14,9 +14,14 @@ class SourceContext
        if (static::$is_initialized == true) {
          return;
        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0af0010a24676f6f676c652f70726f746f6275662f736f757263655f636f6e746578742e70726f746f120f676f6f676c652e70726f746f62756622220a0d536f75726365436f6e7465787412110a0966696c655f6e616d65180120012809428a010a13636f6d2e676f6f676c652e70726f746f6275664212536f75726365436f6e7465787450726f746f50015a36676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f736f75726365636f6e746578747062a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
-        ), true);
+        $pool->internalAddGeneratedFile(
+            '
+ð
+$google/protobuf/source_context.protogoogle.protobuf""
+
SourceContext
+	file_name (	BŠ
+com.google.protobufBSourceContextProtoPZ6google.golang.org/protobuf/types/known/sourcecontextpb¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
+        , true);

        static::$is_initialized = true;
    }
--- a/php/src/GPBMetadata/Google/Protobuf/Struct.php
+++ b/php/src/GPBMetadata/Google/Protobuf/Struct.php
--- a/php/src/GPBMetadata/Google/Protobuf/Timestamp.php
+++ b/php/src/GPBMetadata/Google/Protobuf/Timestamp.php
@ -14,9 +14,15 @@ class Timestamp
        if (static::$is_initialized == true) {
          return;
        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0aef010a1f676f6f676c652f70726f746f6275662f74696d657374616d702e70726f746f120f676f6f676c652e70726f746f627566222b0a0954696d657374616d70120f0a077365636f6e6473180120012803120d0a056e616e6f731802200128054285010a13636f6d2e676f6f676c652e70726f746f627566420e54696d657374616d7050726f746f50015a32676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f74696d657374616d707062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
-        ), true);
+        $pool->internalAddGeneratedFile(
+            '
+ď
+google/protobuf/timestamp.protogoogle.protobuf"+
+	Timestamp
+seconds (
+nanos (B…
+com.google.protobufBTimestampProtoPZ2google.golang.org/protobuf/types/known/timestamppbř˘GPBŞGoogle.Protobuf.WellKnownTypesbproto3'
+        , true);

        static::$is_initialized = true;
    }
--- a/php/src/GPBMetadata/Google/Protobuf/Type.php
+++ b/php/src/GPBMetadata/Google/Protobuf/Type.php
--- a/php/src/GPBMetadata/Google/Protobuf/Wrappers.php
+++ b/php/src/GPBMetadata/Google/Protobuf/Wrappers.php
@ -14,9 +14,34 @@ class Wrappers
        if (static::$is_initialized == true) {
          return;
        }
-        $pool->internalAddGeneratedFile(hex2bin(
-            "0ac7030a1e676f6f676c652f70726f746f6275662f77726170706572732e70726f746f120f676f6f676c652e70726f746f627566221c0a0b446f75626c6556616c7565120d0a0576616c7565180120012801221b0a0a466c6f617456616c7565120d0a0576616c7565180120012802221b0a0a496e74363456616c7565120d0a0576616c7565180120012803221c0a0b55496e74363456616c7565120d0a0576616c7565180120012804221b0a0a496e74333256616c7565120d0a0576616c7565180120012805221c0a0b55496e74333256616c7565120d0a0576616c756518012001280d221a0a09426f6f6c56616c7565120d0a0576616c7565180120012808221c0a0b537472696e6756616c7565120d0a0576616c7565180120012809221b0a0a427974657356616c7565120d0a0576616c756518012001280c4283010a13636f6d2e676f6f676c652e70726f746f627566420d577261707065727350726f746f50015a31676f6f676c652e676f6c616e672e6f72672f70726f746f6275662f74797065732f6b6e6f776e2f77726170706572737062f80101a20203475042aa021e476f6f676c652e50726f746f6275662e57656c6c4b6e6f776e5479706573620670726f746f33"
-        ), true);
+        $pool->internalAddGeneratedFile(
+            '
+Ç
+google/protobuf/wrappers.protogoogle.protobuf"
+DoubleValue
+value ("
+
+FloatValue
+value ("
+
+Int64Value
+value ("
+UInt64Value
+value ("
+
+Int32Value
+value ("
+UInt32Value
+value (
"
+	BoolValue
+value ("
+StringValue
+value (	"
+
+BytesValue
+value (Bƒ
+com.google.protobufB
WrappersProtoPZ1google.golang.org/protobuf/types/known/wrapperspbø¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
+        , true);

        static::$is_initialized = true;
    }
--- 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.13.0</version>
+  <version>3.14.0-rc-1</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.13.0'
+__version__ = '3.14.0rc1'
--- 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.13.0"
+  s.version     = "3.14.0.rc.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"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -18,7 +18,7 @@ else
 PTHREAD_DEF =
 endif

-PROTOBUF_VERSION = 24:0:0
+PROTOBUF_VERSION = 25:0: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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -318,14 +318,14 @@

 // Shared google3/opensource definitions. //////////////////////////////////////

-#define PROTOBUF_VERSION 3013000
-#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3013000
-#define PROTOBUF_MIN_PROTOC_VERSION 3013000
-#define PROTOBUF_VERSION_SUFFIX ""
+#define PROTOBUF_VERSION 3014000
+#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3014000
+#define PROTOBUF_MIN_PROTOC_VERSION 3014000
+#define PROTOBUF_VERSION_SUFFIX "-rc1"

 // The minimum library version which works with the current version of the
 // headers.
-#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3013000
+#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3014000

 #if defined(GOOGLE_PROTOBUF_NO_RTTI) && GOOGLE_PROTOBUF_NO_RTTI
 #define PROTOBUF_RTTI 0
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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,23 +82,23 @@ 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 3013000
+#define GOOGLE_PROTOBUF_VERSION 3014000

 // A suffix string for alpha, beta or rc releases. Empty for stable releases.
-#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
+#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1"

 // The minimum header version which works with the current version of
 // the library.  This constant should only be used by protoc's C++ code
 // generator.
-static const int kMinHeaderVersionForLibrary = 3013000;
+static const int kMinHeaderVersionForLibrary = 3014000;

 // The minimum protoc version which works with the current version of the
 // headers.
-#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3013000
+#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3014000

 // The minimum header version which works with the current version of
 // protoc.  This constant should only be used in VerifyVersion().
-static const int kMinHeaderVersionForProtoc = 3013000;
+static const int kMinHeaderVersionForProtoc = 3014000;

 // Verifies that the headers and libraries are compatible.  Use the macro
 // below to call this.
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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
@ -8,12 +8,12 @@
 #include <string>

 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3013000
+#if PROTOBUF_VERSION < 3014000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3013000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3014000 < 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.