From 1d2454d4830756b6c321cacfb35e0026ba38ea3c Mon Sep 17 00:00:00 2001
From: Jarek Jarcec Cecho <jarcec@apache.org>
Date: Wed, 23 Jul 2014 09:29:48 -0700
Subject: [PATCH] SQOOP-1359: Fix avro versions in Sqoop to stop shipping
 hadoop1 jars with hadoop2

(Venkat Ranganathan via Jarek Jarcec Cecho)
---
 build.xml                |  5 ++++
 ivy.xml                  | 49 ++++++++++++++++++++++++----------------
 ivy/libraries.properties |  2 +-
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/build.xml b/build.xml
index a6b5da9c..de4fd06e 100644
--- a/build.xml
+++ b/build.xml
@@ -131,6 +131,7 @@
       <property name="hadoop.version.full" value="0.20" />
       <property name="hcatalog.version" value="0.13.0" />
       <property name="hbasecompatprofile" value="1" />
+      <property name="avrohadoopprofile" value="1" />
     </then>
 
     <elseif>
@@ -142,6 +143,7 @@
         <property name="hadoop.version.full" value="0.23" />
         <property name="hcatalog.version" value="0.13.0" />
         <property name="hbasecompatprofile" value="2" />
+        <property name="avrohadoopprofile" value="2" />
       </then>
     </elseif>
 
@@ -154,6 +156,7 @@
         <property name="hadoop.version.full" value="1.0.0" />
         <property name="hcatalog.version" value="0.13.0" />
         <property name="hbasecompatprofile" value="1" />
+        <property name="avrohadoopprofile" value="1" />
       </then>
     </elseif>
 
@@ -166,6 +169,7 @@
         <property name="hadoop.version.full" value="2.0.4-alpha" />
         <property name="hcatalog.version" value="0.13.0" />
         <property name="hbasecompatprofile" value="2" />
+        <property name="avrohadoopprofile" value="2" />
       </then>
     </elseif>
 
@@ -178,6 +182,7 @@
         <property name="hadoop.version.full" value="2.1.0-beta" />
         <property name="hcatalog.version" value="0.13.0" />
         <property name="hbasecompatprofile" value="2" />
+        <property name="avrohadoopprofile" value="2" />
       </then>
     </elseif>
     <else>
diff --git a/ivy.xml b/ivy.xml
index 9b160e42..abc12a10 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -41,17 +41,20 @@ under the License.
     <conf name="hbase95" visibility="private" extends="hbasecompat${hbasecompatprofile}" />
     <conf name="hbasecompat1" visibility="private" />
     <conf name="hbasecompat2" visibility="private" />
+    <conf name="avro" visibility="private" extends="avrohadoop${avrohadoopprofile}" />
+    <conf name="avrohadoop1" visibility="private" />
+    <conf name="avrohadoop2" visibility="private" />
     <conf name="hcatalog13" visibility="private" />
     <conf name="hadoop23" visibility="private"
-      extends="common,runtime,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
+      extends="common,runtime,avro,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
     <conf name="hadoop20" visibility="private"
-      extends="common,runtime,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
+      extends="common,runtime,avro,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
     <conf name="hadoop100" visibility="private"
-      extends="common,runtime,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
+      extends="common,runtime,avro,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
     <conf name="hadoop200" visibility="private"
-      extends="common,runtime,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
+      extends="common,runtime,avro,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
     <conf name="hadoop210" visibility="private"
-      extends="common,runtime,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
+      extends="common,runtime,avro,hbase${hbaseprofile},hcatalog${hcatprofile},accumulo" />
 
     <conf name="test" visibility="private" extends="common,runtime"/>
     <conf name="hadoop23test" visibility="private" extends="test,hadoop23" />
@@ -180,20 +183,6 @@ under the License.
       conf="common->default;redist->default"/>
     <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
       conf="common->default;redist->default"/>
-    <dependency org="org.apache.avro" name="avro" rev="${avro.version}"
-      conf="common->default;redist->default">
-      <exclude org="org.slf4j" module="slf4j-api"/>
-      <exclude org="org.mortbay.jetty" module="jetty"/>
-      <exclude org="org.jboss.netty" module="netty"/>
-      <exclude org="org.apache.velocity" module="velocity"/>
-    </dependency>
-    <dependency org="org.apache.avro" name="avro-mapred" rev="${avro.version}"
-      conf="common->default;redist->default">
-      <exclude org="org.slf4j" module="slf4j-api"/>
-      <exclude org="org.mortbay.jetty" module="jetty"/>
-      <exclude org="org.jboss.netty" module="netty"/>
-      <exclude org="org.apache.velocity" module="velocity"/>
-    </dependency>
 
     <!-- dependencies for static analysis -->
     <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
@@ -301,6 +290,28 @@ under the License.
     <dependency org="org.postgresql" name="postgresql"
       rev="${postgresql.version}" conf="common->default" />
 
+    <dependency org="org.apache.avro" name="avro" rev="${avro.version}"
+      conf="avro->default;redist->default">
+      <exclude org="org.slf4j" module="slf4j-api"/>
+      <exclude org="org.mortbay.jetty" module="jetty"/>
+      <exclude org="org.jboss.netty" module="netty"/>
+      <exclude org="org.apache.velocity" module="velocity"/>
+    </dependency>
+    <dependency org="org.apache.avro" name="avro-mapred" rev="${avro.version}"
+      m:classifier="hadoop1" conf="avrohadoop1->default;redist->default">
+      <exclude org="org.slf4j" module="slf4j-api"/>
+      <exclude org="org.mortbay.jetty" module="jetty"/>
+      <exclude org="org.jboss.netty" module="netty"/>
+      <exclude org="org.apache.velocity" module="velocity"/>
+    </dependency>
+    <dependency org="org.apache.avro" name="avro-mapred" rev="${avro.version}"
+      m:classifier="hadoop2" conf="avrohadoop2->default;redist->default">
+      <exclude org="org.slf4j" module="slf4j-api"/>
+      <exclude org="org.mortbay.jetty" module="jetty"/>
+      <exclude org="org.jboss.netty" module="netty"/>
+      <exclude org="org.apache.velocity" module="velocity"/>
+    </dependency>
+
     <exclude org="org.apache.hadoop" module="avro"/>
     <exclude org="commons-daemon" module="commons-daemon" />
     <exclude type="pom" />
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index 0e5133a0..45a9bcc5 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -18,7 +18,7 @@
 # This properties file lists the versions of the various artifacts we use.
 # It drives ivy and the generation of a maven POM
 
-avro.version=1.5.3
+avro.version=1.7.5
 
 checkstyle.version=5.0