github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-02 22:19:15 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-1359: Fix avro versions in Sqoop to stop shipping hadoop1 jars with hadoop2

Browse Source 
(Venkat Ranganathan via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2014-07-23 09:29:48 -07:00
parent 44d5f2f94c
commit 1d2454d483
3 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -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>

49
ivy.xml
View File

@ -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" />

2
ivy/libraries.properties
View File

@ -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