From b52754b71990154877e7129fd570c2f1cae5ca1b Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Fri, 22 Feb 2019 11:31:48 -0800 Subject: [PATCH] Update version to 3.7.0rc3 --- Protobuf.podspec | 2 +- configure.ac | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/bom/pom.xml | 7 ++----- java/core/pom.xml | 2 +- java/pom.xml | 2 +- java/util/pom.xml | 2 +- js/package.json | 2 +- php/ext/google/protobuf/package.xml | 20 +++++++++---------- php/ext/google/protobuf/protobuf.h | 2 +- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- update_version.py | 4 ++-- 15 files changed, 26 insertions(+), 29 deletions(-) diff --git a/Protobuf.podspec b/Protobuf.podspec index bfaa4600d6..47381bf806 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.7.0' + s.version = '3.7.0-rc.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' diff --git a/configure.ac b/configure.ac index cae769729e..cf1dca0631 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.7.0],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.7.0-rc-3],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 396fdf951f..b98cdff82b 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.7.0 + 3.7.0-rc.3 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/master/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 4b4131c37f..2240220642 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.7.0 + 3.7.0-rc.3 6 Google Inc. netstandard1.0;net45 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 5846d4b14e..f2989d7509 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -1,13 +1,10 @@ - + 4.0.0 com.google.protobuf protobuf-bom - 3.7.0 + 3.7.0-rc-3 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 57226c48a3..51e8a0e152 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.7.0 + 3.7.0-rc-3 protobuf-java diff --git a/java/pom.xml b/java/pom.xml index 54b6dc74db..87f06c6ad9 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.7.0 + 3.7.0-rc-3 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index c2eab472ea..3736cfdb42 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.7.0 + 3.7.0-rc-3 protobuf-java-util diff --git a/js/package.json b/js/package.json index 2dc3cdb781..1b49f24923 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.7.0", + "version": "3.7.0-rc.3", "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 a33625e459..76e02904c2 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,16 +10,16 @@ protobuf-opensource@google.com yes - 2019-02-19 - - 3.7.0 + 3.7.0RC3 3.7.0 - stable - stable + beta + beta + 2019-02-22 + 3-Clause BSD License GA release. @@ -278,15 +278,15 @@ G A release. - 3.7.0 + 3.7.0RC3 3.7.0 - stable - stable + beta + beta - 2019-02-19 - + 2019-02-22 + 3-Clause BSD License GA release. diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 908e3bad99..7903c71e96 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.7.0" +#define PHP_PROTOBUF_VERSION "3.7.0RC3" #define MAX_LENGTH_OF_INT64 20 #define SIZEOF_INT64 8 diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 4ef2bf8257..797a0e1147 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.7.0 + 3.7.0-rc-3 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 8cc7440c1f..92c629a050 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.7.0' +__version__ = '3.7.0rc3' if __name__ != '__main__': try: diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index b646e1271c..74c1352771 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.7.0" + s.version = "3.7.0.rc.3" s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." diff --git a/update_version.py b/update_version.py index 4330726979..42e632dfbb 100755 --- a/update_version.py +++ b/update_version.py @@ -217,9 +217,9 @@ def UpdatePhp(): ReplaceText(Find(version, 'release'), GetFullVersion(rc_suffix = 'RC')) ReplaceText(Find(version, 'api'), NEW_VERSION) stability = Find(root, 'stability') - ReplaceText(Find(version, 'release'), + ReplaceText(Find(stability, 'release'), 'stable' if RC_VERSION == 0 else 'beta') - ReplaceText(Find(version, 'api'), 'stable' if RC_VERSION == 0 else 'beta') + ReplaceText(Find(stability, 'api'), 'stable' if RC_VERSION == 0 else 'beta') now = datetime.datetime.now() ReplaceText(Find(root, 'date'), now.strftime('%Y-%m-%d')) ReplaceText(Find(root, 'time'), now.strftime('%H:%M:%S'))