Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-2196. Make ant build system work with hadoop-common JAR generated by Maven. Contributed by Alejandro Abdelnur 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1153207 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2011-08-02 17:16:59 +00:00
parent ddc3f5d105
commit b71b47079e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hdfs/CHANGES.txt
View File

@ -914,6 +914,9 @@ Trunk (unreleased changes)
HDFS-1776. Bug in Concat code. (Bharath Mundlapudi via Dmytro Molkov) HDFS-1776. Bug in Concat code. (Bharath Mundlapudi via Dmytro Molkov)
HDFS-2196. Make ant build system work with hadoop-common JAR generated
by Maven. (Alejandro Abdelnur via tomwhite)
BREAKDOWN OF HDFS-1073 SUBTASKS BREAKDOWN OF HDFS-1073 SUBTASKS
HDFS-1521. Persist transaction ID on disk between NN restarts. HDFS-1521. Persist transaction ID on disk between NN restarts.

7
hdfs/ivy.xml
View File

@ -58,6 +58,7 @@
</publications> </publications>
<dependencies> <dependencies>
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}" conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"> <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default">
<exclude module="ant"/> <exclude module="ant"/>
</dependency> </dependency>
@ -66,7 +67,11 @@
</dependency> </dependency>
<dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="compile->master"/> <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="compile->master"/>
<dependency org="commons-daemon" name="commons-daemon" rev="${commons-daemon.version}" conf="hdfs->default" /> <dependency org="commons-daemon" name="commons-daemon" rev="${commons-daemon.version}" conf="hdfs->default" />
<dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/> <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master">
<exclude org="com.sun.jdmk"/>
<exclude org="com.sun.jmx"/>
<exclude org="javax.jms"/>
</dependency>
<dependency org="com.google.guava" name="guava" rev="${guava.version}" conf="hdfs->default" /> <dependency org="com.google.guava" name="guava" rev="${guava.version}" conf="hdfs->default" />
<dependency org="com.google.protobuf" name="protobuf-java" rev="2.4.0a" conf="common->master"/> <dependency org="com.google.protobuf" name="protobuf-java" rev="2.4.0a" conf="common->master"/>
<dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="compile->master"> <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="compile->master">