Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 541a20dbb -> 2092da097 refs/heads/cassandra-2.1 c6efd35cf -> a680f721b refs/heads/trunk 30aec9339 -> 1cfa56100
Exclude xerces to fix hadoop build issue. Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6877 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2092da09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2092da09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2092da09 Branch: refs/heads/cassandra-2.0 Commit: 2092da09747a8f00a790a5eed8323227033e2115 Parents: 541a20d Author: Brandon Williams <[email protected]> Authored: Wed May 14 13:26:18 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed May 14 13:26:18 2014 -0500 ---------------------------------------------------------------------- build.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2092da09/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index af571ed..6adb042 100644 --- a/build.xml +++ b/build.xml @@ -374,7 +374,9 @@ <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="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}" />
