Author: jnioche
Date: Wed Dec 22 14:57:12 2010
New Revision: 1051932
URL: http://svn.apache.org/viewvc?rev=1051932&view=rev
Log:
NUTCH-949 Conflicting ANT jars in classpath
Modified:
nutch/branches/branch-1.3/CHANGES.txt
nutch/branches/branch-1.3/ivy/ivy.xml
Modified: nutch/branches/branch-1.3/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/CHANGES.txt?rev=1051932&r1=1051931&r2=1051932&view=diff
==============================================================================
--- nutch/branches/branch-1.3/CHANGES.txt (original)
+++ nutch/branches/branch-1.3/CHANGES.txt Wed Dec 22 14:57:12 2010
@@ -2,6 +2,8 @@ Nutch Change Log
Release 1.3 - Current Development
+* NUTCH-949 Conflicting ANT jars in classpath (jnioche)
+
* NUTCH-862 HttpClient null pointer exception (Sebastian Nagel via ab)
* NUTCH-870 Injector should add the metadata before calling injectedScore
(jnioche via mattmann)
Modified: nutch/branches/branch-1.3/ivy/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/branch-1.3/ivy/ivy.xml?rev=1051932&r1=1051931&r2=1051932&view=diff
==============================================================================
--- nutch/branches/branch-1.3/ivy/ivy.xml (original)
+++ nutch/branches/branch-1.3/ivy/ivy.xml Wed Dec 22 14:57:12 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-logging" name="commons-logging"
rev="1.0.4" conf="*->master" />
<dependency org="commons-logging" name="commons-logging-api"
@@ -60,6 +55,7 @@
<exclude org="net.java.dev.jets3t" name="jets3t" />
<exclude org="org.eclipse.jdt" name="core" />
<exclude org="org.mortbay.jetty" name="jsp-*" />
+ <exclude org="ant" name="ant" />
</dependency>
<dependency org="com.ibm.icu" name="icu4j" rev="4.0.1" />
