Updated Branches: refs/heads/trunk 06183f7ab -> f2bf86104
SQOOP-1197: Enable Sqoop to build against Hadoop-2.1.0-beta jar files (sam liu via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/f2bf8610 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/f2bf8610 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/f2bf8610 Branch: refs/heads/trunk Commit: f2bf861042fe9bcbdbb15c8953e1d21db44b8310 Parents: 06183f7 Author: Jarek Jarcec Cecho <[email protected]> Authored: Thu Sep 12 00:20:08 2013 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Thu Sep 12 00:20:08 2013 -0700 ---------------------------------------------------------------------- build.xml | 14 +++++++++++++- ivy.xml | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/f2bf8610/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index a186b68..c897245 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> http://git-wip-us.apache.org/repos/asf/sqoop/blob/f2bf8610/ivy.xml ---------------------------------------------------------------------- diff --git a/ivy.xml b/ivy.xml index d7486e0..c5130ae 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"
