Author: jnioche
Date: Wed Dec 22 16:43:43 2010
New Revision: 1051977
URL: http://svn.apache.org/viewvc?rev=1051977&view=rev
Log:
NUTCH-949 Conflicting ANT jars in classpath
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/ivy/ivy.xml
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1051977&r1=1051976&r2=1051977&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Wed Dec 22 16:43:43 2010
@@ -2,6 +2,8 @@ Nutch Change Log
Release 2.0 - Current Development
+* NUTCH-949 Conflicting ANT jars in classpath (jnioche)
+
* NUTCH-825 Publish nutch artifacts to central maven repository (mattmann)
* NUTCH-913 Nutch should use new namespace for Gora (dogacan)
Modified: nutch/trunk/ivy/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/ivy/ivy.xml?rev=1051977&r1=1051976&r2=1051977&view=diff
==============================================================================
--- nutch/trunk/ivy/ivy.xml (original)
+++ nutch/trunk/ivy/ivy.xml Wed Dec 22 16:43:43 2010
@@ -34,11 +34,6 @@
conf="*->default" />
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.11"
conf="*->master" />
- <dependency org="org.apache.hadoop" name="avro" rev="1.3.2"
- conf="*->default">
- <exclude org="ant" name="ant" />
- </dependency>
-
<dependency org="commons-lang" name="commons-lang" rev="2.4"
conf="*->default" />
<dependency org="commons-collections" name="commons-collections"
@@ -68,7 +63,7 @@
<dependency org="org.apache.gora" name="gora-core" rev="0.1"
conf="*->compile">
<exclude org="com.sun.jdmk"/>
<exclude org="com.sun.jmx"/>
- <exclude org="javax.jms"/>
+ <exclude org="javax.jms"/>
</dependency>
<dependency org="log4j" name="log4j" rev="1.2.15"
conf="*->master" >
@@ -115,6 +110,9 @@
</dependency>
<dependency org="org.restlet.jse" name="org.restlet"
rev="2.0.1" conf="*->default"/>
<dependency org="org.restlet.jse"
name="org.restlet.ext.jackson" rev="2.0.1" conf="*->default"/>
+
+ <!--global exclusion-->
+ <exclude module="ant" />
</dependencies>
</ivy-module>
