From 655310ca192a6e3a050e0ca0b7084a2968072260 Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Mon, 5 Aug 2019 10:07:28 -0700 Subject: [PATCH] Update protobuf version (#6472) --- Protobuf.podspec | 2 +- configure.ac | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- csharp/src/Google.Protobuf.Test/testprotos.pb | Bin 205207 -> 205207 bytes .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/lite/pom.xml | 2 +- java/pom.xml | 2 +- java/util/pom.xml | 2 +- js/package.json | 2 +- php/ext/google/protobuf/package.xml | 22 ++++++++++++++---- php/ext/google/protobuf/protobuf.h | 2 +- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- src/Makefile.am | 2 +- src/google/protobuf/any.pb.h | 2 +- src/google/protobuf/api.pb.h | 2 +- src/google/protobuf/compiler/plugin.pb.h | 2 +- src/google/protobuf/descriptor.pb.h | 2 +- src/google/protobuf/duration.pb.h | 2 +- src/google/protobuf/empty.pb.h | 2 +- src/google/protobuf/field_mask.pb.h | 2 +- src/google/protobuf/port_def.inc | 2 +- src/google/protobuf/source_context.pb.h | 2 +- src/google/protobuf/struct.pb.h | 2 +- src/google/protobuf/stubs/common.h | 2 +- src/google/protobuf/timestamp.pb.h | 2 +- src/google/protobuf/type.pb.h | 2 +- src/google/protobuf/wrappers.pb.h | 2 +- 31 files changed, 47 insertions(+), 33 deletions(-) diff --git a/Protobuf.podspec b/Protobuf.podspec index a195f83a479d..f37de25baa05 100644 --- 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.9.0' + s.version = '3.9.1' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = '3-Clause BSD License' diff --git a/configure.ac b/configure.ac index 8d973e39defe..6dc48daae648 100644 --- 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.9.0],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.9.1],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 237a7e831f37..87372b6c94ef 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.9.0 + 3.9.1 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/master/LICENSE diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb index bc3979e965ef354b8491b637c3ca441bb1050365..71256aea778e8a7f1d74a709e2c84ab3acef5727 100644 GIT binary patch delta 5317 zcmYjVYiv}<72dgbX6)R3c=vjF`GFT>8?Z?+k2Xa>QwT_fD5Ponkn9LmA*P{fOTwdV zDm5z;OiKD=Ra$bR$T1O?s{jGjDrl?xNPfgn>RE@2|Otb`@zvtDm~ zJ$rp^uWdO_)DhgVlG5e9c6h#lj9|@518ss|TkX8b9Gg4B}p2sRd@_m$SoViXRZWa&~-?fwakPY%;Kv;L>#lmJobmtuw|{ z2<#p3)-!a{(&UG1M$*s>5HZ`U-NRRqY}jmw<(rK$kV6WL2k zS*^WhB8Xrk!bA|kMuZ7FK2LMlw8^fjcIt3=VI1CFuc?_eEWK-oBfg6|wPJ`m6s*xZ zro3M_vjtz73U*MNiXnC=_^e8kyL{UAKHJQ;YzSLiAuUcoh;!PA6A(nxMx201cACW5 zLZMOD1N-;4zWn~yuz=1U7=Z#|8=x;xK*WDQ0wtYAT=~!rUFW{eBJg}@mnNNV3%Nxs z@U&+iE@$;D-OhDZup+B=9*(Pq0Af=+Ps}zDS+(zT?Q{pe7jsrXz1C{TKy$3mu z796PWFq8%c>^R7Al4b|+Z#bV-a3Hqde){poYi@Ib^aMRJl>!)>M0}*pI>QSg{{)kM|b*7W5SRQMEnfH$fvXLUr_I2UoLKWouth zJl)E^pn-HN`*=L5%cEP_$LE+{*eJe_&ucWRD87%^Eph%qgC%0&3iW%(zRCXC(jNri z2+$t{pqtds^Nk9-5vUD0)eR*;*=GnnG$v75D(qr%>M>P;X1@IRH(ctX>XXydwK)@ z##s%UA^}n4uqhG{8;4DifGBd<6d6U4H&v0(M5)M|rbr-c1N4goL~1vwNJ=f{%FlV| zz8-fmcz(`H%bg!0vlwMI;x%nzFRmLgIl+iPBj#WMv1NqED^(i+k<$pDU*n9B_F{Bt z$GrYc?C&jO0R>Hmv4DbZN39qDb-G##tpnKVrYM0S&==`j>?Pc?mOjGBJW zG#v=r0R5%|BH%sK^fFgY^U!|be`CtvIn7JwI{&7Yl~LDcyhGn&4_anSQZORYjA
*7bo`Cd9|chuN`GWZ$11s+(g6|Wktw|l z3AGElRNg0BnAqGd^rb3Or33n<1ETbHq4gGb0xFH*<#i{g6Hu^Lh zW~~{aKd-PNR7U8J2_QCQgdSCZ$SNbMYm@*1QF}(DmK%uLGoqW-_r0sXoGQTGv3cfytLh|pPG zcLLn+h|*ckAl03qy1TP`wz53i)@>4k6;ZlP-GJECZR!R@LfxirK-ArB>IOvJ-BkA^ zi7G+wiVuYKp?Cb-Y~ra8M9CcW$%ma{9~Znzec=^G7#QXR2Gns}R8-;#D2a)hc)}Zg zjy2St5WKwLM<2iwV)h*83GD}b(p&f)wmN-M@L0i*?%qj}aMiat0XBI`Sf@pUIx%3J z3Jm_w5kQ>EDG~PP3m}4@5>@`|2@p*^-q5T z0OIrpap>0fn$yQB;`9oA`hbYjYfe9bb2+1=zbZku{)~|T5VisO5&%TRGbDlE+L*Pj zD?b*Yf$V>uXK%6ck40&v^EV5py=GmWS;q0dtt^tL2Y>ic=& z&JPSAJuep2s*j;dXw1VnEyh;X@C1=j_U^j|Mn1=9tAms}@F)m4xB zi{9uDSXcUDz(E;Z6#6yjs(daAw^mb<4lauN2AvJso)gv*y+|hwXtJT7RJnkOPC6&t zI^ztcoLID&n9|4w@RG0=>s1?6fQE`*X_th4_`?@emqcQraaMa97U`t0^|G+cBK@!d zG)(jyyBs7%&#}uQjegVX0zCoM<)GVez9KABJRArbDtdWc36i3h*AS~acdSnTAflf+2vP50IbAv(M<#^z|C|RzmL0MtrDjAq-H(IP8j}96B4BtQ zl(;2tl;D~GQ;@Fg|F*LZ`{geD_)#)dc2v+Mqi$fp)-GA@k2mFkP+bz^jijy&7$RM= zs>z8vrP=^Jb;;^RXTZ|oK+==_@<;5uEZtKaj#S!H9FFcyPjNU>YEN-Enpr)?;aDlc z^-#E;hz?cKR!rz*THwPWW`yrX;A>Wx_TJ4*y4#5<<5%Ag36 zHLA19fF$n7+J(+9bOb~k_p0`?*EWq8Gm)6ai_0M~jmz@61tt>DxWoV-Hl2ZC%Db_b leYR?{{gyel28Bu delta 5317 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 diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 2802f226ebdb..222f0fc56cf0 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -4,7 +4,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.9.0 + 3.9.1 6 Google Inc. netstandard1.0;netstandard2.0;net45 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index a95199894b15..792febb7b5cb 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.9.0 + 3.9.1 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index dd3c6b8fbdf7..0ec16945e25f 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.9.0 + 3.9.1 protobuf-java diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 73a50e429476..eec292af0d35 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.9.0 + 3.9.1 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index 9b46f8a741b9..a258674c268c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.9.0 + 3.9.1 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index 8058a63626ea..7ac8b32e4e41 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.9.0 + 3.9.1 protobuf-java-util diff --git a/js/package.json b/js/package.json index 444a53cea017..202e8e4c419e 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.9.0", + "version": "3.9.1", "description": "Protocol Buffers for JavaScript", "main": "google-protobuf.js", "files": [ diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index a56ade6d1842..5430bc9703da 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,11 +10,11 @@ protobuf-opensource@google.com yes - 2019-07-10 - + 2019-08-02 + - 3.9.0 - 3.9.0 + 3.9.1 + 3.9.1 stable @@ -375,5 +375,19 @@ G A release. 3-Clause BSD License GA release. + + + 3.9.1 + 3.9.1 + + + stable + stable + + 2019-08-02 + + 3-Clause BSD License + GA release. + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 26e662187878..1051d7218a7e 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -37,7 +37,7 @@ #include "upb.h" #define PHP_PROTOBUF_EXTNAME "protobuf" -#define PHP_PROTOBUF_VERSION "3.9.0" +#define PHP_PROTOBUF_VERSION "3.9.1" #define MAX_LENGTH_OF_INT64 20 #define SIZEOF_INT64 8 diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 0fef7b532144..38f371305572 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.9.0 + 3.9.1 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 4f889abb7d9f..d75ab244dafc 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,7 +30,7 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.9.0' +__version__ = '3.9.1' if __name__ != '__main__': try: diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index fb4ab6c983f5..ea4f0445cce2 100644 --- 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.9.0" + s.version = "3.9.1" s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." diff --git a/src/Makefile.am b/src/Makefile.am index f869d5665d35..78fb9b9c11b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ else PTHREAD_DEF = endif -PROTOBUF_VERSION = 20:0:0 +PROTOBUF_VERSION = 20:1:0 if GCC # Turn on all warnings except for sign comparison (we ignore sign comparison diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 0264bd7ab5e9..3408df365f10 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index f0a292d205db..e0ac7565e23d 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index ef2679897566..d61981e2b6eb 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 47b1d8739401..458db5a14824 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index c7023feb877c..4fce23eee68a 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index d9b04b4a5237..8a360c53e09a 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 0e3c58e1d90f..9eff1899a77f 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 17ab7ed83a45..74919b9c7dd4 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -285,7 +285,7 @@ // Shared google3/opensource definitions. ////////////////////////////////////// -#define PROTOBUF_VERSION 3009000 +#define PROTOBUF_VERSION 3009001 #define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3009000 #define PROTOBUF_MIN_PROTOC_VERSION 3009000 #define PROTOBUF_VERSION_SUFFIX "" diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index cd11d2398c69..79b2ba88bd56 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index c4c8a15827c7..92dd50e850d4 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index b9599010d549..8728b705d1e0 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -81,7 +81,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 3009000 +#define GOOGLE_PROTOBUF_VERSION 3009001 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 85d0454b9b16..4ecacdf6a593 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index b16b2980c3bf..0076428656ad 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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. diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index b445c9a41d1a..400e3c38de4e 100644 --- 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 3009000 < PROTOBUF_MIN_PROTOC_VERSION +#if 3009001 < 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.