From f2bf861042fe9bcbdbb15c8953e1d21db44b8310 Mon Sep 17 00:00:00 2001
From: Jarek Jarcec Cecho <jarcec@apache.org>
Date: Thu, 12 Sep 2013 00:20:08 -0700
Subject: [PATCH] SQOOP-1197: Enable Sqoop to build against Hadoop-2.1.0-beta
 jar files

(sam liu via Jarek Jarcec Cecho)
---
 build.xml | 14 +++++++++++++-
 ivy.xml   | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index a186b681..c8972456 100644
--- a/build.xml
+++ b/build.xml
@@ -121,8 +121,20 @@
       </then>
     </elseif>
 
+    <elseif>
+      <equals arg1="${hadoopversion}" arg2="210" />
+      <then>
+        <property name="hadoop.version" value="2.1.0-beta" />
+        <property name="hbase94.version" value="0.94.2" />
+        <property name="zookeeper.version" value="3.4.2" />
+        <property name="hadoop.version.full" value="2.1.0-beta" />
+        <property name="hcatalog.version" value="0.11.0" />
+        <property name="hbasecompatprofile" value="2" />
+      </then>
+    </elseif>
+
     <else>
-      <fail message="Unrecognized hadoopversion. Can only be 20, 23, 100 or 200." />
+      <fail message="Unrecognized hadoopversion. Can only be 20, 23, 100, 200 or 210." />
     </else>
   </if>
 
diff --git a/ivy.xml b/ivy.xml
index d7486e0d..c5130ae7 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -49,12 +49,15 @@ under the License.
       extends="common,runtime,hbase${hbaseprofile},hcatalog" />
     <conf name="hadoop200" visibility="private"
       extends="common,runtime,hbase${hbaseprofile},hcatalog" />
+    <conf name="hadoop210" visibility="private"
+      extends="common,runtime,hbase${hbaseprofile},hcatalog" />
 
     <conf name="test" visibility="private" extends="common,runtime"/>
     <conf name="hadoop23test" visibility="private" extends="test,hadoop23" />
     <conf name="hadoop20test" visibility="private" extends="test,hadoop20" />
     <conf name="hadoop100test" visibility="private" extends="test,hadoop100" />
     <conf name="hadoop200test" visibility="private" extends="test,hadoop200" />
+    <conf name="hadoop210test" visibility="private" extends="test,hadoop210" />
 
     <!-- We don't redistribute everything we depend on (e.g., Hadoop itself);
          anything which Hadoop itself also depends on, we do not ship.
@@ -78,6 +81,21 @@ under the License.
     <artifact conf="master"/>
   </publications>
   <dependencies>
+    <!-- Dependencies for Hadoop 2.1.0 -->
+    <dependency org="org.apache.hadoop" name="hadoop-common"
+      rev="${hadoop.version}" conf="hadoop210->default">
+      <artifact name="hadoop-common" type="jar" />
+      <artifact name="hadoop-common" type="jar" m:classifier="tests"/>
+    </dependency>
+    <dependency org="org.apache.hadoop" name="hadoop-hdfs"
+      rev="${hadoop.version}" conf="hadoop210->default">
+      <artifact name="hadoop-hdfs" type="jar" />
+      <artifact name="hadoop-hdfs" type="jar" m:classifier="tests"/>
+    </dependency>
+    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common"
+      rev="${hadoop.version}" conf="hadoop210->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+      rev="${hadoop.version}" conf="hadoop210->default"/>
 
     <!-- Dependencies for Hadoop 2.0.0 -->
     <dependency org="org.apache.hadoop" name="hadoop-common"