cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 14 May 2014 18:27:59 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a680f721
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a680f721
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a680f721

Branch: refs/heads/cassandra-2.1
Commit: a680f721b0bbedec1d367d5b6e8c8e8281d31a2f
Parents: c6efd35 2092da0
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed May 14 13:27:34 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed May 14 13:27:34 2014 -0500

----------------------------------------------------------------------
 build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a680f721/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 044e3a2,6adb042..c6dd55e
--- a/build.xml
+++ b/build.xml
@@@ -371,18 -366,19 +371,20 @@@
  
            <dependency groupId="junit" artifactId="junit" version="4.6" />
            <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
 -          <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.6">
 +          <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10">
               <exclusion groupId="commons-lang" artifactId="commons-lang"/>
            </dependency>
 -          <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3"/>
 +          <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3">
 +          	<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
 +          </dependency>
            <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
 -          <dependency groupId="org.apache.pig" artifactId="pig" version="0.10.0"/>
 -          <dependency groupId="net.java.dev.jna" artifactId="jna" version="3.2.7"/>
 +          <dependency groupId="org.apache.pig" artifactId="pig" version="0.11.1"/>
 +          <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
  
-           <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}"/>
+           <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
+             <exclusion groupId="xerces" artifactId="xercesImpl"/>
+           </dependency>
  
 -          <dependency groupId="log4j" artifactId="log4j" version="1.2.16" />
            <dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}"
/>
            <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}"
/>
            <dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.2.0"
/>


Mime
View raw message