hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r1153207 - in /hadoop/common/trunk/hdfs: CHANGES.txt ivy.xml
Date Tue, 02 Aug 2011 17:17:00 GMT
Author: tomwhite
Date: Tue Aug  2 17:16:59 2011
New Revision: 1153207

URL: http://svn.apache.org/viewvc?rev=1153207&view=rev
Log:
HDFS-2196. Make ant build system work with hadoop-common JAR generated by Maven. Contributed
by Alejandro Abdelnur

Modified:
    hadoop/common/trunk/hdfs/CHANGES.txt
    hadoop/common/trunk/hdfs/ivy.xml

Modified: hadoop/common/trunk/hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/CHANGES.txt?rev=1153207&r1=1153206&r2=1153207&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hdfs/CHANGES.txt Tue Aug  2 17:16:59 2011
@@ -914,6 +914,9 @@ Trunk (unreleased changes)
 
     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
 
     HDFS-1521. Persist transaction ID on disk between NN restarts.

Modified: hadoop/common/trunk/hdfs/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hdfs/ivy.xml?rev=1153207&r1=1153206&r2=1153207&view=diff
==============================================================================
--- hadoop/common/trunk/hdfs/ivy.xml (original)
+++ hadoop/common/trunk/hdfs/ivy.xml Tue Aug  2 17:16:59 2011
@@ -58,6 +58,7 @@
   </publications>
   <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">
       <exclude module="ant"/>
     </dependency>
@@ -66,7 +67,11 @@
     </dependency>
     <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="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.protobuf" name="protobuf-java" rev="2.4.0a" conf="common->master"/>
     <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="compile->master">



Mime
View raw message