You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2014/07/23 18:31:00 UTC
git commit: SQOOP-1359: Fix avro versions in Sqoop to stop shipping
hadoop1 jars with hadoop2
Repository: sqoop
Updated Branches:
refs/heads/trunk 44d5f2f94 -> 1d2454d48
SQOOP-1359: Fix avro versions in Sqoop to stop shipping hadoop1 jars with hadoop2
(Venkat Ranganathan 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/1d2454d4
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/1d2454d4
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/1d2454d4
Branch: refs/heads/trunk
Commit: 1d2454d4830756b6c321cacfb35e0026ba38ea3c
Parents: 44d5f2f
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Wed Jul 23 09:29:48 2014 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Wed Jul 23 09:29:48 2014 -0700
----------------------------------------------------------------------
build.xml | 5 +++++
ivy.xml | 49 ++++++++++++++++++++++++++-----------------
ivy/libraries.properties | 2 +-
3 files changed, 36 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1d2454d4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a6b5da9..de4fd06 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>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1d2454d4/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 9b160e4..abc12a1 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" />
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1d2454d4/ivy/libraries.properties
----------------------------------------------------------------------
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index 0e5133a..45a9bcc 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