From b71b47079ecef99011894586e34925ab1d395bab Mon Sep 17 00:00:00 2001
From: Thomas White <tomwhite@apache.org>
Date: Tue, 2 Aug 2011 17:16:59 +0000
Subject: [PATCH] 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
---
 hdfs/CHANGES.txt | 3 +++
 hdfs/ivy.xml     | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/hdfs/CHANGES.txt b/hdfs/CHANGES.txt
index 6f2140efe2d..01fbbc7ad52 100644
--- a/hdfs/CHANGES.txt
+++ b/hdfs/CHANGES.txt
@@ -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.
diff --git a/hdfs/ivy.xml b/hdfs/ivy.xml
index ecaf026d3ea..e63c44029d5 100644
--- a/hdfs/ivy.xml
+++ b/hdfs/ivy.xml
@@ -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">