HDFS-2388. Remove ivy dependency on different version of slf4j in avro. Contributed by Konstantin Shvachko.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1177388 13f79535-47bb-0310-9956-ffa450edef68

hdfs/CHANGES.txt

@@ -635,6 +635,9 @@ Release 0.22.0 - Unreleased
     HDFS-1943. fail to start datanode while start-dfs.sh is executed by root
     user (Wei Yongjun via cos)
 
+    HDFS-2388. Remove ivy dependency on different version of slf4j in avro.
+    (shv)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

hdfs/ivy.xml

@@ -61,8 +61,12 @@
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->master"/>
     <dependency org="commons-daemon" name="commons-daemon" rev="${commons-daemon.version}" conf="common->default" />
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
-    <dependency org="org.apache.avro" name="avro" rev="${avro.version}" conf="common->default"/>
-    <dependency org="org.apache.avro" name="avro-compiler" rev="${avro.version}" conf="common->default"/>
+    <dependency org="org.apache.avro" name="avro" rev="${avro.version}" conf="common->default">
+      <exclude module="slf4j-api"/>
+   </dependency>
+    <dependency org="org.apache.avro" name="avro-compiler" rev="${avro.version}" conf="common->default">
+      <exclude module="slf4j-api"/>
+   </dependency>
     <dependency org="com.thoughtworks.paranamer" name="paranamer-ant" rev="${paranamer.version}" conf="common->default"/>
     <dependency org="org.aspectj" name="aspectjrt" rev="${aspectj.version}" conf="common->default"/>
     <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}" conf="common->default"/>