From 8db82cd9d1f3d68d90eafd8bc63f8f55423afc72 Mon Sep 17 00:00:00 2001
From: Andrew Bayer <abayer@apache.org>
Date: Fri, 22 Jul 2011 20:03:54 +0000
Subject: [PATCH] Fix Apache Hadoop ivy dependencies.

From: Aaron Kimball <aaron@cloudera.com>

git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1149908 13f79535-47bb-0310-9956-ffa450edef68
---
 ivy.xml                  | 16 ++++++++--------
 ivy/libraries.properties |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 683c9f09..4525895c 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -69,10 +69,10 @@
   </publications>
   <dependencies>
     <!-- Dependencies for Apache Hadoop (trunk) -->
-    <dependency org="org.apache.hadoop" name="hadoop-core"
-      rev="${hadoop-core.apache.version}" conf="apache->default"/>
-    <dependency org="org.apache.hadoop" name="hadoop-core-test"
-      rev="${hadoop-core.apache.version}" conf="apachetest->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common"
+      rev="${hadoop-common.apache.version}" conf="apache->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test"
+      rev="${hadoop-common.apache.version}" conf="apachetest->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs"
       rev="${hadoop-hdfs.apache.version}" conf="apache->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
@@ -83,10 +83,10 @@
       rev="${hadoop-mapred.apache.version}" conf="apachetest->default"/>
 
     <!-- Dependencies for Apache Hadoop (0.21) -->
-    <dependency org="org.apache.hadoop" name="hadoop-core"
-      rev="${hadoop-core.apache21.version}" conf="apache21->default"/>
-    <dependency org="org.apache.hadoop" name="hadoop-core-test"
-      rev="${hadoop-core.apache21.version}" conf="apache21test->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common"
+      rev="${hadoop-common.apache21.version}" conf="apache21->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test"
+      rev="${hadoop-common.apache21.version}" conf="apache21test->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs"
       rev="${hadoop-hdfs.apache21.version}" conf="apache21->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index 27730bde..ba2dce97 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -23,12 +23,12 @@ commons-io.version=1.4
 commons-logging.version=1.0.4
 
 # Apache Hadoop dependency version: use trunk.
-hadoop-core.apache.version=0.22.0-SNAPSHOT
+hadoop-common.apache.version=0.22.0-SNAPSHOT
 hadoop-hdfs.apache.version=0.22.0-SNAPSHOT
 hadoop-mapred.apache.version=0.22.0-SNAPSHOT
 
 # Apache 0.21 release Hadoop dependency version: use 0.21.
-hadoop-core.apache21.version=0.21.0-SNAPSHOT
+hadoop-common.apache21.version=0.21.0-SNAPSHOT
 hadoop-hdfs.apache21.version=0.21.0-SNAPSHOT
 hadoop-mapred.apache21.version=0.21.0-SNAPSHOT