hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1177388 - in /hadoop/common/branches/branch-0.22/hdfs: CHANGES.txt ivy.xml
Date Thu, 29 Sep 2011 18:24:31 GMT
Author: shv
Date: Thu Sep 29 18:24:31 2011
New Revision: 1177388

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

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

Modified: hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt?rev=1177388&r1=1177387&r2=1177388&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Thu Sep 29 18:24:31 2011
@@ -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

Modified: hadoop/common/branches/branch-0.22/hdfs/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/ivy.xml?rev=1177388&r1=1177387&r2=1177388&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/ivy.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/ivy.xml Thu Sep 29 18:24:31 2011
@@ -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"/>



Mime
View raw message