Return-Path: 
 <commits-return-99800-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EB27E11906
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Thu, 15 May 2014 03:38:09 +0000 (UTC)
Received: (qmail 20368 invoked by uid 500); 14 May 2014 18:27:56 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 19857 invoked by uid 500); 14 May 2014 18:27:56 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 19490 invoked by uid 99); 14 May 2014 18:27:56 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 18:27:56 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id E917F8C4D87; Wed, 14 May 2014 18:27:55 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: brandonwilliams@apache.org
To: commits@cassandra.apache.org
Date: Wed, 14 May 2014 18:27:56 -0000
Message-Id: <4e23e2e85dbb4b4899bad90fea95b627@git.apache.org>
In-Reply-To: <e9ef59eb53c4485d8d59e73e3fef09ee@git.apache.org>
References: <e9ef59eb53c4485d8d59e73e3fef09ee@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/6] git commit: Exclude xerces to fix hadoop build issue.

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.1
Commit: 2092da09747a8f00a790a5eed8323227033e2115
Parents: 541a20d
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed May 14 13:26:18 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
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}" />