diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Rebus/Properties/AssemblyInfo.cs | 4 | ||||
| -rwxr-xr-x | contrib/fb303/java/build.xml | 6 | ||||
| -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 | 15 | ||||
| -rw-r--r-- | contrib/vagrant/centos-6.5/README.md | 2 | ||||
| -rwxr-xr-x | contrib/zeromq/csharp/ThriftZMQ.csproj | 2 |
7 files changed, 25 insertions, 12 deletions
diff --git a/contrib/Rebus/Properties/AssemblyInfo.cs b/contrib/Rebus/Properties/AssemblyInfo.cs index dde781324..e476eab76 100644 --- a/contrib/Rebus/Properties/AssemblyInfo.cs +++ b/contrib/Rebus/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ using System.Runtime.InteropServices; [assembly: Guid("0af10984-40d3-453d-b1e5-421529e8c7e2")] -[assembly: AssemblyVersion("0.12.0.0")] -[assembly: AssemblyFileVersion("0.12.0.0")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/contrib/fb303/java/build.xml b/contrib/fb303/java/build.xml index 591a4cbd0..7a1b8f105 100755 --- a/contrib/fb303/java/build.xml +++ b/contrib/fb303/java/build.xml @@ -136,9 +136,9 @@ <remoteRepository refid="central"/> <remoteRepository refid="apache"/> <license name="The Apache Software License, Version 2.0" url="${license}"/> - <scm connection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git" - developerConnection="scm:git:https://git-wip-us.apache.org/repos/asf/thrift.git" - url="https://git-wip-us.apache.org/repos/asf?p=thrift.git" + <scm connection="scm:git:https://github.com/apache/thrift.git" + developerConnection="scm:git:https://github.com/apache/thrift.git" + url="https://github.com/apache/thrift" /> <!-- Thrift Developers --> <developer id="mcslee" name="Mark Slee"/> diff --git a/contrib/fb303/py/setup.py b/contrib/fb303/py/setup.py index 12d2d5c62..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='0.12.0', + 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 e11fbbf0f..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>0.12.0</version> + <version>1.0.0</version> <build> <plugins> <plugin> diff --git a/contrib/thrift.spec b/contrib/thrift.spec index 1fe0f9c59..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.12.0 +Version: 1.0.0 Release: 0 URL: http://thrift.apache.org Packager: Thrift Developers <dev@thrift.apache.org> @@ -178,6 +178,19 @@ export RUBYLIB=${PWD}/lib/rb/lib --without-csharp \ --without-erlang \ +%if 0%{!?without_ruby:1} +eval $(grep "^WITH_RUBY_TRUE" config.log) +if [[ "${WITH_RUBY_TRUE}" != "" ]]; then + set +x + echo "" + echo "configure determined that ruby requirements are missing (bundler gem?), either install missing components" >&2 + echo "or disable the ruby sub-packages as follows:" >&2 + echo " rpmbuild -D'%without_ruby 1' ..." >&2 + echo "" + exit 1 +fi +%endif + make %{?_smp_mflags} %if 0%{!?without_java:1} diff --git a/contrib/vagrant/centos-6.5/README.md b/contrib/vagrant/centos-6.5/README.md index 91ae67f2f..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 0.12.0 + 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 9143a6921..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>0.12.0</ApplicationVersion> + <ApplicationVersion>1.0.0.0</ApplicationVersion> <IsWebBootstrapper>false</IsWebBootstrapper> <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> |