You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2019/10/19 22:13:48 UTC
[thrift] branch master updated: fix veralign.sh and bump version
(again)
This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new 616df98 fix veralign.sh and bump version (again)
616df98 is described below
commit 616df98f00a594f133466aa7f94930c1bf85b24a
Author: Jens Geyer <je...@apache.org>
AuthorDate: Sat Oct 19 22:08:13 2019 +0200
fix veralign.sh and bump version (again)
---
Thrift.podspec | 4 ++--
build/veralign.sh | 4 +++-
doc/specs/idl.md | 2 +-
lib/as3/gradle.properties | 2 +-
lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs | 4 ++--
lib/csharp/src/Properties/AssemblyInfo.cs | 4 ++--
lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs | 4 ++--
lib/csharp/test/Multiplex/Server/MultiplexServer.csproj | 2 +-
lib/dart/pubspec.yaml | 2 +-
lib/erl/src/thrift.app.src | 2 +-
lib/js/package-lock.json | 2 +-
lib/js/package.json | 2 +-
lib/ocaml/_oasis | 2 +-
lib/perl/lib/Thrift.pm | 2 +-
lib/py/setup.py | 2 +-
lib/swift/Sources/Thrift.swift | 2 +-
lib/swift/Tests/ThriftTests/ThriftTests.swift | 2 +-
lib/ts/package-lock.json | 2 +-
package-lock.json | 2 +-
sonar-project.properties | 6 +++---
test/csharp/ThriftTest.csproj | 2 +-
test/dart/test_client/pubspec.yaml | 2 +-
test/erl/src/thrift_test.app.src | 2 +-
tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs | 4 ++--
tutorial/dart/client/pubspec.yaml | 2 +-
tutorial/delphi/DelphiClient/DelphiClient.dproj | 4 ++--
26 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/Thrift.podspec b/Thrift.podspec
index 4c8fa68..46de2b4 100644
--- a/Thrift.podspec
+++ b/Thrift.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Thrift'
- s.version = '0.13.0'
+ s.version = '0.14.0'
s.summary = "Apache Thrift is a lightweight, language-independent software stack with an associated code generation mechanism for RPC."
s.description = <<-DESC
The Apache Thrift scalable cross-language software framework for networked services development combines a software stack with a code generation engine to build services that work efficiently and seamlessly between many programming languages.
@@ -10,6 +10,6 @@ The Apache Thrift scalable cross-language software framework for networked servi
s.author = { 'Apache Thrift Developers' => 'dev@thrift.apache.org' }
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
- s.source = { :git => 'https://github.com/apache/thrift.git', :tag => 'v0.13.0' }
+ s.source = { :git => 'https://github.com/apache/thrift.git', :tag => 'v0.14.0' }
s.source_files = 'lib/swift/Sources/*.swift'
end
diff --git a/build/veralign.sh b/build/veralign.sh
index 1dd1e6f..ffecb6e 100755
--- a/build/veralign.sh
+++ b/build/veralign.sh
@@ -74,12 +74,12 @@ FILES[lib/haxe/haxelib.json]=simpleReplace
FILES[lib/hs/thrift.cabal]=simpleReplace
FILES[lib/java/gradle.properties]=simpleReplace
FILES[lib/js/package.json]=jsonReplace
+FILES[lib/js/package-lock.json]=jsonReplace
FILES[lib/js/src/thrift.js]=simpleReplace
FILES[lib/lua/Thrift.lua]=simpleReplace
FILES[lib/netcore/Thrift/Properties/AssemblyInfo.cs]=simpleReplace
FILES[lib/netcore/Thrift/Transports/Client/THttpClientTransport.cs]=simpleReplace
FILES[lib/netstd/Thrift/Properties/AssemblyInfo.cs]=simpleReplace
-FILES[lib/netstd/Thrift/Transports/Client/THttpClientTransport.cs]=simpleReplace
FILES[lib/netstd/Thrift/Thrift.csproj]=simpleReplace
FILES[lib/ocaml/_oasis]=simpleReplace
FILES[lib/perl/lib/Thrift.pm]=simpleReplace
@@ -90,7 +90,9 @@ FILES[lib/st/package.xml]=simpleReplace
FILES[lib/swift/Sources/Thrift.swift]=simpleReplace
FILES[lib/swift/Tests/ThriftTests/ThriftTests.swift]=simpleReplace
FILES[lib/ts/package.json]=jsonReplace
+FILES[lib/ts/package-lock.json]=jsonReplace
FILES[package.json]=jsonReplace
+FILES[package-lock.json]=jsonReplace
FILES[sonar-project.properties]=simpleReplace
FILES[test/csharp/Properties/AssemblyInfo.cs]=simpleReplace
FILES[test/csharp/ThriftTest.csproj]=simpleReplace
diff --git a/doc/specs/idl.md b/doc/specs/idl.md
index 9439bee..32763a6 100644
--- a/doc/specs/idl.md
+++ b/doc/specs/idl.md
@@ -1,6 +1,6 @@
## Thrift interface description language
-For Thrift version 0.13.0.
+For Thrift version 0.14.0.
The Thrift interface definition language (IDL) allows for the definition of [Thrift Types](/docs/types). A Thrift IDL file is processed by the Thrift code generator to produce code for the various target languages to support the defined structs and services in the IDL file.
diff --git a/lib/as3/gradle.properties b/lib/as3/gradle.properties
index 02d5eef..d918a23 100644
--- a/lib/as3/gradle.properties
+++ b/lib/as3/gradle.properties
@@ -1,7 +1,7 @@
# This file is shared currently between this Gradle build and the
# Ant builds for fd303 and JavaScript. Keep the dotted notation for
# the properties to minimize the changes in the dependencies.
-thrift.version=0.13.0
+thrift.version=0.14.0
thrift.groupid=org.apache.thrift
release=false
sign=false
diff --git a/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs b/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
index 6e99dd9..f5f0000 100644
--- a/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
+++ b/lib/csharp/ThriftMSBuildTask/Properties/AssemblyInfo.cs
@@ -56,5 +56,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.13.0.*")]
-[assembly: AssemblyFileVersion("0.13.0.*")]
+[assembly: AssemblyVersion("0.14.0.*")]
+[assembly: AssemblyFileVersion("0.14.0.*")]
diff --git a/lib/csharp/src/Properties/AssemblyInfo.cs b/lib/csharp/src/Properties/AssemblyInfo.cs
index ace0310..c8f51b5 100644
--- a/lib/csharp/src/Properties/AssemblyInfo.cs
+++ b/lib/csharp/src/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.13.0.0")]
-[assembly: AssemblyFileVersion("0.13.0.0")]
+[assembly: AssemblyVersion("0.14.0.0")]
+[assembly: AssemblyFileVersion("0.14.0.0")]
diff --git a/lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs b/lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs
index 0b65c1e..ce6692f 100644
--- a/lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs
+++ b/lib/csharp/test/Multiplex/Client/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.13.0.0")]
-[assembly: AssemblyFileVersion("0.13.0.0")]
+[assembly: AssemblyVersion("0.14.0.0")]
+[assembly: AssemblyFileVersion("0.14.0.0")]
diff --git a/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj b/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
index 23d3253..771ee12 100644
--- a/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
+++ b/lib/csharp/test/Multiplex/Server/MultiplexServer.csproj
@@ -46,7 +46,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>0.13.0.0</ApplicationVersion>
+ <ApplicationVersion>0.14.0.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
diff --git a/lib/dart/pubspec.yaml b/lib/dart/pubspec.yaml
index f406b99..1999b58 100644
--- a/lib/dart/pubspec.yaml
+++ b/lib/dart/pubspec.yaml
@@ -16,7 +16,7 @@
# under the License.
name: thrift
-version: 0.13.0
+version: 0.14.0
description: >
A Dart library for Apache Thrift
author: Apache Thrift Developers <de...@thrift.apache.org>
diff --git a/lib/erl/src/thrift.app.src b/lib/erl/src/thrift.app.src
index e5e6ed5..5e8d670 100644
--- a/lib/erl/src/thrift.app.src
+++ b/lib/erl/src/thrift.app.src
@@ -22,7 +22,7 @@
{description, "Thrift bindings"},
% The version of the applicaton
- {vsn, "0.13.0"},
+ {vsn, "0.14.0"},
% All modules used by the application.
{modules, [
diff --git a/lib/js/package-lock.json b/lib/js/package-lock.json
index 00bf05c..dfde697 100644
--- a/lib/js/package-lock.json
+++ b/lib/js/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.13.0",
+ "version": "0.14.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/lib/js/package.json b/lib/js/package.json
index 309622d..f578e4b 100644
--- a/lib/js/package.json
+++ b/lib/js/package.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.13.0",
+ "version": "0.14.0",
"description": "Thrift is a software framework for scalable cross-language services development.",
"author": {
"name": "Apache Thrift Developers",
diff --git a/lib/ocaml/_oasis b/lib/ocaml/_oasis
index 83566aa..2b6c477 100644
--- a/lib/ocaml/_oasis
+++ b/lib/ocaml/_oasis
@@ -1,5 +1,5 @@
Name: libthrift-ocaml
-Version: 0.13.0
+Version: 0.14.0
OASISFormat: 0.3
Synopsis: OCaml bindings for the Apache Thrift RPC system
Authors: Apache Thrift Developers <de...@thrift.apache.org>
diff --git a/lib/perl/lib/Thrift.pm b/lib/perl/lib/Thrift.pm
index 01985ea..9a7c6bb 100644
--- a/lib/perl/lib/Thrift.pm
+++ b/lib/perl/lib/Thrift.pm
@@ -31,6 +31,6 @@ use warnings;
#
package Thrift;
-use version 0.77; our $VERSION = version->declare("v0.13.0");
+use version 0.77; our $VERSION = version->declare("v0.14.0");
1;
diff --git a/lib/py/setup.py b/lib/py/setup.py
index 2ba2691..fa81694 100644
--- a/lib/py/setup.py
+++ b/lib/py/setup.py
@@ -90,7 +90,7 @@ def run_setup(with_binary):
twisted_deps = ['twisted']
setup(name='thrift',
- version='0.13.0',
+ version='0.14.0',
description='Python bindings for the Apache Thrift RPC system',
author='Apache Thrift Developers',
author_email='dev@thrift.apache.org',
diff --git a/lib/swift/Sources/Thrift.swift b/lib/swift/Sources/Thrift.swift
index 45c68f2..789aae9 100644
--- a/lib/swift/Sources/Thrift.swift
+++ b/lib/swift/Sources/Thrift.swift
@@ -1,3 +1,3 @@
class Thrift {
- let version = "0.13.0"
+ let version = "0.14.0"
}
diff --git a/lib/swift/Tests/ThriftTests/ThriftTests.swift b/lib/swift/Tests/ThriftTests/ThriftTests.swift
index ae47f38..37f3cf6 100644
--- a/lib/swift/Tests/ThriftTests/ThriftTests.swift
+++ b/lib/swift/Tests/ThriftTests/ThriftTests.swift
@@ -3,7 +3,7 @@ import XCTest
class ThriftTests: XCTestCase {
func testVersion() {
- XCTAssertEqual(Thrift().version, "0.13.0")
+ XCTAssertEqual(Thrift().version, "0.14.0")
}
func test_in_addr_extension() {
diff --git a/lib/ts/package-lock.json b/lib/ts/package-lock.json
index 8d0a7ff..49de90b 100644
--- a/lib/ts/package-lock.json
+++ b/lib/ts/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.13.0",
+ "version": "0.14.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package-lock.json b/package-lock.json
index 8eb8a21..e88fb1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.13.0",
+ "version": "0.14.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/sonar-project.properties b/sonar-project.properties
index a238197..fcda477 100755
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -16,7 +16,7 @@ development, combines a software stack with a code generation engine to build
services that work efficiently and seamlessly between all major languages.
# Apache Thrift Version
-sonar.projectVersion=0.13.0
+sonar.projectVersion=0.14.0
# use this to set another version string
# $ sonar-runner -D sonar.projectVersion=`git rev-parse HEAD`
# set projectDate in combination with projectVersion for imports of old releases
@@ -54,7 +54,7 @@ module1.sonar.projectName=Apache Thrift - Java Library
module1.sonar.projectBaseDir=lib/java
module1.sonar.sources=src
module1.sonar.tests=test
-module1.sonar.binaries=build/libs/libthrift-0.13.0.jar
+module1.sonar.binaries=build/libs/libthrift-0.14.0.jar
module1.sonar.libraries=build/deps/*.jar
module1.sonar.language=java
@@ -62,7 +62,7 @@ module2.sonar.projectName=Apache Thrift - Java Tutorial
module2.sonar.projectBaseDir=.
module2.sonar.sources=tutorial/java/src, tutorial/java/gen-java
module2.sonar.binaries=tutorial/java/tutorial.jar
-module2.sonar.libraries=lib/java/build/deps/*.jar,lib/java/build/libs/libthrift-0.13.0.jar
+module2.sonar.libraries=lib/java/build/deps/*.jar,lib/java/build/libs/libthrift-0.14.0.jar
module2.sonar.language=java
module3.sonar.projectName=Apache Thrift - JavaScript Library
diff --git a/test/csharp/ThriftTest.csproj b/test/csharp/ThriftTest.csproj
index effec19..2ff0926 100644
--- a/test/csharp/ThriftTest.csproj
+++ b/test/csharp/ThriftTest.csproj
@@ -46,7 +46,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>0.13.0.0</ApplicationVersion>
+ <ApplicationVersion>0.14.0.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
diff --git a/test/dart/test_client/pubspec.yaml b/test/dart/test_client/pubspec.yaml
index c86225e..6481962 100644
--- a/test/dart/test_client/pubspec.yaml
+++ b/test/dart/test_client/pubspec.yaml
@@ -16,7 +16,7 @@
# under the License.
name: thrift_test_client
-version: 0.13.0
+version: 0.14.0
description: A client integration test for the Dart Thrift library
author: Apache Thrift Developers <de...@thrift.apache.org>
homepage: http://thrift.apache.org
diff --git a/test/erl/src/thrift_test.app.src b/test/erl/src/thrift_test.app.src
index ffbad58..b6242b3 100644
--- a/test/erl/src/thrift_test.app.src
+++ b/test/erl/src/thrift_test.app.src
@@ -22,7 +22,7 @@
{description, "Thrift cross language test"},
% The version of the applicaton
- {vsn, "0.13.0"},
+ {vsn, "0.14.0"},
% All modules used by the application.
{modules, [
diff --git a/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs b/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs
index e3ed39a..0d4f0fb 100644
--- a/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs
+++ b/tutorial/csharp/CsharpServer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.13.0.0")]
-[assembly: AssemblyFileVersion("0.13.0.0")]
+[assembly: AssemblyVersion("0.14.0.0")]
+[assembly: AssemblyFileVersion("0.14.0.0")]
diff --git a/tutorial/dart/client/pubspec.yaml b/tutorial/dart/client/pubspec.yaml
index 6581b4d..35880ed 100644
--- a/tutorial/dart/client/pubspec.yaml
+++ b/tutorial/dart/client/pubspec.yaml
@@ -16,7 +16,7 @@
# under the License.
name: tutorial_client
-version: 0.13.0
+version: 0.14.0
description: A Dart client implementation of the Apache Thrift tutorial
author: Apache Thrift Developers <de...@thrift.apache.org>
homepage: http://thrift.apache.org
diff --git a/tutorial/delphi/DelphiClient/DelphiClient.dproj b/tutorial/delphi/DelphiClient/DelphiClient.dproj
index 7026747..f9adf85 100644
--- a/tutorial/delphi/DelphiClient/DelphiClient.dproj
+++ b/tutorial/delphi/DelphiClient/DelphiClient.dproj
@@ -100,13 +100,13 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">0.13.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">0.14.0.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName">DelphiClient</VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"/>
<VersionInfoKeys Name="OriginalFilename">DelphiClient.exe</VersionInfoKeys>
<VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">0.13.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">0.14.0.0</VersionInfoKeys>
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
<Source>