Author: ab
Date: Wed Mar 9 12:21:39 2011
New Revision: 1079770
URL: http://svn.apache.org/viewvc?rev=1079770&view=rev
Log:
NUTCH-955 Ivy configuration improvements. Upgrade to Xerces 2.9.1 and Restlet
2.0.5.
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/ivy/ivy.xml
nutch/trunk/src/plugin/protocol-sftp/ivy.xml
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1079770&r1=1079769&r2=1079770&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Wed Mar 9 12:21:39 2011
@@ -2,6 +2,8 @@ Nutch Change Log
Release 2.0 - Current Development
+* NUTCH-955 Ivy configuration improvements. Upgrade to Xerces 2.9.1 and
Restlet 2.0.5 (alexis via ab)
+
* NUTCH-962 max. redirects not handled correctly: fetcher stops at max-1
redirects (Sebastian Nagel via ab)
* NUTCH-964 Upgraded Xerces to 2.91 (markus)
Modified: nutch/trunk/ivy/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/ivy/ivy.xml?rev=1079770&r1=1079769&r2=1079770&view=diff
==============================================================================
--- nutch/trunk/ivy/ivy.xml (original)
+++ nutch/trunk/ivy/ivy.xml Wed Mar 9 12:21:39 2011
@@ -108,9 +108,32 @@
<exclude org="com.sun.jmx"/>
<exclude org="javax.jms"/>
</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"/>
-
+ <dependency org="org.restlet.jse" name="org.restlet"
rev="2.0.5" conf="*->default"/>
+ <dependency org="org.restlet.jse"
name="org.restlet.ext.jackson" rev="2.0.5" conf="*->default"/>
+
+<!--
+ Uncomment this to use MySQL as database with SQL as Gora store.
+-->
+<!--
+ <dependency org="mysql" name="mysql-connector-java" rev="5.1.13"
conf="*->default"/>
+-->
+
+<!--
+ Uncomment this to use HBase as Gora backend. Then manually add
hbase-0.20.6 jar to the lib directory.
+-->
+<!--
+ <dependency org="org.apache.gora" name="gora-hbase" rev="0.1"
conf="*->compile">
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ </dependency>
+ <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.2"
conf="*->default">
+ <exclude org="com.sun.jdmk"/>
+ <exclude org="com.sun.jmx"/>
+ <exclude org="javax.jms"/>
+ </dependency>
+-->
+
<!--global exclusion-->
<exclude module="ant" />
</dependencies>
Modified: nutch/trunk/src/plugin/protocol-sftp/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-sftp/ivy.xml?rev=1079770&r1=1079769&r2=1079770&view=diff
==============================================================================
--- nutch/trunk/src/plugin/protocol-sftp/ivy.xml (original)
+++ nutch/trunk/src/plugin/protocol-sftp/ivy.xml Wed Mar 9 12:21:39 2011
@@ -27,7 +27,7 @@
</info>
<configurations>
- <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ <include file="${basedir}/ivy/ivy-configurations.xml"/>
</configurations>
<publications>
