diff options
| author | James E. King III <jking@apache.org> | 2018-12-30 11:06:00 -0500 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2018-12-30 11:06:00 -0500 |
| commit | c3375d9e434b5740808813138b28b70517e82c7d (patch) | |
| tree | db8f0e81129461b1ddc6e7a951cbb5667ca15634 /contrib | |
| parent | a139082755369611ed243376ec3c4161452369fc (diff) | |
| parent | 384647d290e2e4a55a14b1b7ef1b7e66293a2c33 (diff) | |
| download | thrift-c3375d9e434b5740808813138b28b70517e82c7d.tar.gz | |
Merge remote-tracking branch 'origin/0.12.0' into consume-0.12.0
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fb303/py/setup.py | 6 | ||||
| -rw-r--r-- | contrib/thrift-maven-plugin/pom.xml | 2 | ||||
| -rw-r--r-- | contrib/thrift.spec | 2 | ||||
| -rw-r--r-- | contrib/vagrant/centos-6.5/README.md | 2 | ||||
| -rwxr-xr-x | contrib/zeromq/csharp/ThriftZMQ.csproj | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/contrib/fb303/py/setup.py b/contrib/fb303/py/setup.py index 4321ce258..d27c2962f 100644 --- a/contrib/fb303/py/setup.py +++ b/contrib/fb303/py/setup.py @@ -26,9 +26,9 @@ except: from distutils.core import setup, Extension, Command setup(name='thrift_fb303', - version='1.0.0-dev', + version='1.0.0', description='Python bindings for the Apache Thrift FB303', - author=['Thrift Developers'], + author=['Apache Thrift Developers'], author_email=['dev@thrift.apache.org'], url='http://thrift.apache.org', license='Apache License 2.0', @@ -37,7 +37,7 @@ setup(name='thrift_fb303', 'fb303_scripts', ], classifiers=[ - 'Development Status :: 5 - Production/Stable', + 'Development Status :: 7 - Inactive', 'Environment :: Console', 'Intended Audience :: Developers', 'Programming Language :: Python', diff --git a/contrib/thrift-maven-plugin/pom.xml b/contrib/thrift-maven-plugin/pom.xml index 0af595764..d364cfc1f 100644 --- a/contrib/thrift-maven-plugin/pom.xml +++ b/contrib/thrift-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <artifactId>thrift-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <name>thrift-maven-plugin</name> - <version>1.0-SNAPSHOT</version> + <version>1.0.0</version> <build> <plugins> <plugin> diff --git a/contrib/thrift.spec b/contrib/thrift.spec index 5cfe88802..be526e238 100644 --- a/contrib/thrift.spec +++ b/contrib/thrift.spec @@ -28,7 +28,7 @@ Name: thrift License: Apache License v2.0 Group: Development Summary: RPC and serialization framework -Version: 0.11.0 +Version: 1.0.0 Release: 0 URL: http://thrift.apache.org Packager: Thrift Developers <dev@thrift.apache.org> diff --git a/contrib/vagrant/centos-6.5/README.md b/contrib/vagrant/centos-6.5/README.md index 76dca4439..55583f901 100644 --- a/contrib/vagrant/centos-6.5/README.md +++ b/contrib/vagrant/centos-6.5/README.md @@ -11,7 +11,7 @@ This will download and launch the base box VM under VirtualBox and run the Apach $ vagrant ssh [vagrant@thrift ~]$ cd /thrift [vagrant@thrift thrift]$ compiler/cpp/thrift --version - Thrift version 1.0.0-dev + Thrift version <version> The provisioning script (inside the Vagrantfile) runs ./bootstrap.sh, ./configure, make and make check, but does not install thrift. To install thrift run "make install". diff --git a/contrib/zeromq/csharp/ThriftZMQ.csproj b/contrib/zeromq/csharp/ThriftZMQ.csproj index 6b4653065..80ad1dbd6 100755 --- a/contrib/zeromq/csharp/ThriftZMQ.csproj +++ b/contrib/zeromq/csharp/ThriftZMQ.csproj @@ -25,7 +25,7 @@ <UpdateRequired>false</UpdateRequired> <MapFileExtensions>true</MapFileExtensions> <ApplicationRevision>0</ApplicationRevision> - <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <ApplicationVersion>1.0.0.0</ApplicationVersion> <IsWebBootstrapper>false</IsWebBootstrapper> <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> @@ -88,4 +88,4 @@ </BootstrapperPackage> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> -</Project>
\ No newline at end of file +</Project> |