HADOOP-7697. 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@1177177 13f79535-47bb-0310-9956-ffa450edef68

common/CHANGES.txt

@@ -546,6 +546,9 @@ Release 0.22.0 - Unreleased
 
     HADOOP-7646. Upgrade to Avro 1.5.3. (Joep Rottinghuis via shv)
 
+    HADOOP-7697. Remove ivy dependency on different version of slf4j in avro.
+    (shv)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

common/ivy.xml

@@ -265,11 +265,13 @@
       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="org.apache.avro"
       name="avro-ipc"
@@ -277,7 +279,7 @@
       conf="common->default">
       <exclude module="ant"/>
       <exclude module="jetty"/>
-      <exclude module="slf4j-simple"/>
+      <exclude module="slf4j-api"/>
     </dependency>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"