You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/08/17 07:30:04 UTC
git commit: one version of servlet-api is more than enough,
remove the second
Updated Branches:
refs/heads/trunk d8dfa1703 -> 0e4bd46c6
one version of servlet-api is more than enough, remove the second
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e4bd46c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e4bd46c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e4bd46c
Branch: refs/heads/trunk
Commit: 0e4bd46c68e5c2f04741b0049e6c95b84e55556f
Parents: d8dfa17
Author: Dave Brosius <db...@apache.org>
Authored: Sat Aug 17 01:29:12 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Aug 17 01:29:12 2013 -0400
----------------------------------------------------------------------
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e4bd46c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 92f18f8..7140611 100644
--- a/build.xml
+++ b/build.xml
@@ -365,7 +365,9 @@
<dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.6">
<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.pig" artifactId="pig" version="0.10.0"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="3.2.7"/>