svn commit: r1372805 - in /sqoop/branches/branch-1.4.2: build.xml ivy.xml

[ja...@apache.org]

Author: jarcec
Date: Tue Aug 14 09:32:55 2012
New Revision: 1372805

URL: http://svn.apache.org/viewvc?rev=1372805&view=rev
Log:
SQOOP-574. Create a Hadoop-2.0.0 build profile.

(Cheolsoo Park via Jarek Jarcec Cecho)

Modified:
    sqoop/branches/branch-1.4.2/build.xml
    sqoop/branches/branch-1.4.2/ivy.xml

Modified: sqoop/branches/branch-1.4.2/build.xml
URL: http://svn.apache.org/viewvc/sqoop/branches/branch-1.4.2/build.xml?rev=1372805&r1=1372804&r2=1372805&view=diff
==============================================================================
--- sqoop/branches/branch-1.4.2/build.xml (original)
+++ sqoop/branches/branch-1.4.2/build.xml Tue Aug 14 09:32:55 2012
@@ -73,8 +73,18 @@
       </then>
     </elseif>
 
+    <elseif>
+      <equals arg1="${hadoopversion}" arg2="200" />
+      <then>
+        <property name="hadoop.version" value="2.0.0-alpha" />
+        <property name="hbase.version" value="0.92.0" />
+        <property name="zookeeper.version" value="3.4.2" />
+        <property name="hadoop.version.full" value="2.0.0-alpha" />
+      </then>
+    </elseif>
+
     <else>
-      <fail message="Unrecognized hadoopversion. Can only be 20, 23, or 100." />
+      <fail message="Unrecognized hadoopversion. Can only be 20, 23, 100, or 200." />
     </else>
   </if>
 

Modified: sqoop/branches/branch-1.4.2/ivy.xml
URL: http://svn.apache.org/viewvc/sqoop/branches/branch-1.4.2/ivy.xml?rev=1372805&r1=1372804&r2=1372805&view=diff
==============================================================================
--- sqoop/branches/branch-1.4.2/ivy.xml (original)
+++ sqoop/branches/branch-1.4.2/ivy.xml Tue Aug 14 09:32:55 2012
@@ -40,11 +40,13 @@ under the License.
     <conf name="hadoop23" visibility="private" extends="common,runtime,hbase" />
     <conf name="hadoop20" visibility="private" extends="common,runtime,hbase" />
     <conf name="hadoop100" visibility="private" extends="common,runtime,hbase" />
+    <conf name="hadoop200" visibility="private" extends="common,runtime,hbase" />
 
     <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" />
 
     <!-- We don't redistribute everything we depend on (e.g., Hadoop itself);
          anything which Hadoop itself also depends on, we do not ship.
@@ -69,6 +71,22 @@ under the License.
   </publications>
   <dependencies>
 
+    <!-- Dependencies for Hadoop 2.0.0 -->
+    <dependency org="org.apache.hadoop" name="hadoop-common"
+      rev="${hadoop.version}" conf="hadoop200->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="hadoop200->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="hadoop200->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+      rev="${hadoop.version}" conf="hadoop200->default"/>
+
     <!-- Dependencies for Hadoop 0.23 -->
     <dependency org="org.apache.hadoop" name="hadoop-common"
       rev="${hadoop.version}" conf="hadoop23->default">