Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 89338a160 -> 729da03c5
fix duplicate classes between cassandra-all and cassandra-thrift patch by dbrosius reviewed by jbellis for CASSANDRA-5833 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c49d3363 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c49d3363 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c49d3363 Branch: refs/heads/cassandra-2.1 Commit: c49d33633aa07551af52e40277e284eb78bb73d4 Parents: bed60fb Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Mar 14 00:43:10 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Mar 14 00:43:10 2014 -0400 ---------------------------------------------------------------------- build.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c49d3363/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 3e25e25..74878da 100644 --- a/build.xml +++ b/build.xml @@ -717,8 +717,8 @@ <jar jarfile="${build.dir}/${ant.project.name}-thrift-${version}.jar" basedir="${build.classes.thrift}"> <fileset dir="${build.classes.main}"> - <include name="org/apache/cassandra/thrift/ITransportFactory.class" /> - <include name="org/apache/cassandra/thrift/TFramedTransportFactory.class" /> + <include name="org/apache/cassandra/thrift/ITransportFactory*.class" /> + <include name="org/apache/cassandra/thrift/TFramedTransportFactory*.class" /> </fileset> <manifest> <attribute name="Implementation-Title" value="Cassandra"/> @@ -728,8 +728,11 @@ </jar> <!-- Main Jar --> - <jar jarfile="${build.dir}/${final.name}.jar" - basedir="${build.classes.main}"> + <jar jarfile="${build.dir}/${final.name}.jar"> + <fileset dir="${build.classes.main}"> + <exclude name="org/apache/cassandra/thrift/ITransportFactory*.class" /> + <exclude name="org/apache/cassandra/thrift/TFramedTransportFactory*.class" /> + </fileset> <manifest> <!-- <section name="org/apache/cassandra/infrastructure"> --> <attribute name="Implementation-Title" value="Cassandra"/>
