From c7b339220166e8f78b35e8f6a72775476fde1028 Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Tue, 19 Feb 2019 15:54:45 -0800 Subject: [PATCH] Update version to 3.7.0 (#5749) * Update version to 3.7.0 * Update version number for java bom --- Protobuf.podspec | 2 +- configure.ac | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/pom.xml | 2 +- java/util/pom.xml | 2 +- js/package.json | 2 +- php/ext/google/protobuf/package.xml | 24 +++++++++++++++---- 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 | 9 +++++++ 15 files changed, 41 insertions(+), 18 deletions(-) diff --git a/Protobuf.podspec b/Protobuf.podspec index cac05d162e58..bfaa4600d6bd 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-rc.2' + s.version = '3.7.0' 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 5b7900b4d77e..cae769729e79 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-rc-2],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.7.0],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 395b236ad834..396fdf951fec 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-rc.2 + 3.7.0 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 06115e8d87c3..4b4131c37f78 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-rc.2 + 3.7.0 6 Google Inc. netstandard1.0;net45 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 19fef02b0a75..5846d4b14e8b 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -7,7 +7,7 @@ com.google.protobuf protobuf-bom - 3.7.0-rc-2 + 3.7.0 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index f800ce661b2e..57226c48a3b0 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.7.0-rc-2 + 3.7.0 protobuf-java diff --git a/java/pom.xml b/java/pom.xml index f9d58807052c..54b6dc74dbc0 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.7.0-rc-2 + 3.7.0 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index 225804cedf0b..c2eab472ea87 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.7.0-rc-2 + 3.7.0 protobuf-java-util diff --git a/js/package.json b/js/package.json index 8a261b16802c..2dc3cdb78112 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.7.0-rc.2", + "version": "3.7.0", "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 999b92ed91a5..a33625e45988 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,15 +10,15 @@ protobuf-opensource@google.com yes - 2019-02-01 - + 2019-02-19 + - 3.7.0RC2 + 3.7.0 3.7.0 - beta - beta + stable + stable 3-Clause BSD License GA release. @@ -276,5 +276,19 @@ G A release. 3-Clause BSD License GA release. + + + 3.7.0 + 3.7.0 + + + stable + stable + + 2019-02-19 + + 3-Clause BSD License + GA release. + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index f15db0033333..908e3bad99cc 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.0RC2" +#define PHP_PROTOBUF_VERSION "3.7.0" #define MAX_LENGTH_OF_INT64 20 #define SIZEOF_INT64 8 diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 363728d363ab..4ef2bf825747 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.7.0-rc-2 + 3.7.0 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index f06687b641b1..8cc7440c1f42 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.0rc2' +__version__ = '3.7.0' if __name__ != '__main__': try: diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 72336a4ee0d7..b646e1271c75 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.rc.2" + s.version = "3.7.0" 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 fc4c15c14bff..3985ece0860d 100755 --- a/update_version.py +++ b/update_version.py @@ -125,6 +125,10 @@ def UpdateJava(): lambda document : ReplaceText( Find(document.documentElement, 'version'), NEW_VERSION)) + RewriteXml('java/bom/pom.xml', + lambda document : ReplaceText( + Find(document.documentElement, 'version'), NEW_VERSION)) + RewriteXml('java/core/pom.xml', lambda document : ReplaceText( Find(Find(document.documentElement, 'parent'), 'version'), @@ -220,6 +224,11 @@ def CreateNode(tagname, indent, children): changelog.appendChild(release) changelog.appendChild(document.createTextNode('\n ')) RewriteXml('php/ext/google/protobuf/package.xml', Callback) + RewriteTextFile('php/ext/google/protobuf/protobuf.h', + lambda line : re.sub( + r'PHP_PROTOBUF_VERSION ".*"$', + 'PHP_PROTOBUF_VERSION "%s"' % NEW_VERSION, + line)) def UpdatePython(): RewriteTextFile('python/google/protobuf/__init__.py',