svn commit: r1492215 - in /nutch/branches/2.x: CHANGES.txt ivy/ivy.xml

[ma...@apache.org]

Author: markus
Date: Wed Jun 12 14:19:39 2013
New Revision: 1492215

URL: http://svn.apache.org/r1492215
Log:
NUTCH-1578 Upgrade to Hadoop 1.2.0

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/ivy/ivy.xml

Modified: nutch/branches/2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1492215&r1=1492214&r2=1492215&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Wed Jun 12 14:19:39 2013
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Current Development
 
+* NUTCH-1578 Upgrade to Hadoop 1.2.0 (markus)
+
 * NUTCH-1522 Upgrade to Tika 1.3 (jnioche)
 
 Release 2.2 - 05/31/2013 (mm/yy/dddd)

Modified: nutch/branches/2.x/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/ivy/ivy.xml?rev=1492215&r1=1492214&r2=1492215&view=diff
==============================================================================
--- nutch/branches/2.x/ivy/ivy.xml (original)
+++ nutch/branches/2.x/ivy/ivy.xml Wed Jun 12 14:19:39 2013
@@ -50,7 +50,7 @@
       conf="*->default" />
 
     <dependency org="org.apache.hadoop" name="hadoop-core"
-      rev="1.1.1" conf="*->default">
+      rev="1.2.0" conf="*->default">
       <exclude org="net.sf.kosmosfs" name="kfs" />
       <exclude org="net.java.dev.jets3t" name="jets3t" />
       <exclude org="org.eclipse.jdt" name="core" />
@@ -78,7 +78,7 @@
     <!--artifacts needed for testing -->
     <dependency org="junit" name="junit" rev="4.11" conf="*->default" />
 
-    <dependency org="org.apache.hadoop" name="hadoop-test" rev="1.1.1" conf="test->default">
+    <dependency org="org.apache.hadoop" name="hadoop-test" rev="1.2.0" conf="test->default">
       <exclude org="net.sf.kosmosfs" name="kfs" />
       <exclude org="net.java.dev.jets3t" name="jets3t" />
       <exclude org="org.eclipse.jdt" name="core" />