hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1177177 - in /hadoop/common/branches/branch-0.22/common: CHANGES.txt ivy.xml
Date Thu, 29 Sep 2011 06:43:19 GMT
Author: shv
Date: Thu Sep 29 06:43:19 2011
New Revision: 1177177

URL: http://svn.apache.org/viewvc?rev=1177177&view=rev
Log:
HADOOP-7697. Remove ivy dependency on different version of slf4j in avro. Contributed by Konstantin
Shvachko.

Modified:
    hadoop/common/branches/branch-0.22/common/CHANGES.txt
    hadoop/common/branches/branch-0.22/common/ivy.xml

Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1177177&r1=1177176&r2=1177177&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Thu Sep 29 06:43:19 2011
@@ -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

Modified: hadoop/common/branches/branch-0.22/common/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy.xml?rev=1177177&r1=1177176&r2=1177177&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/ivy.xml (original)
+++ hadoop/common/branches/branch-0.22/common/ivy.xml Thu Sep 29 06:43:19 2011
@@ -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"



Mime
View raw message