瀏覽代碼

HADOOP-6290. Prevent duplicate slf4j-simple jar via Avro's classpath.
Contributed by Owen O'Malley


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@902745 13f79535-47bb-0310-9956-ffa450edef68

Christopher Douglas 15 年之前
父節點
當前提交
f38a996b4c
共有 2 個文件被更改,包括 6 次插入1 次删除
  1. 3 0
      CHANGES.txt
  2. 3 1
      ivy.xml

+ 3 - 0
CHANGES.txt

@@ -1289,6 +1289,9 @@ Release 0.21.0 - Unreleased
     HADOOP-6374. JUnit tests should never depend on anything in conf.
     HADOOP-6374. JUnit tests should never depend on anything in conf.
     (Anatoli Fomenko via cos)
     (Anatoli Fomenko via cos)
 
 
+    HADOOP-6290. Prevent duplicate slf4j-simple jar via Avro's classpath.
+    (Owen O'Malley via cdouglas)
+
 Release 0.20.2 - Unreleased
 Release 0.20.2 - Unreleased
 
 
   NEW FEATURES
   NEW FEATURES

+ 3 - 1
ivy.xml

@@ -269,7 +269,9 @@
     <dependency org="org.apache.hadoop"
     <dependency org="org.apache.hadoop"
       name="avro"
       name="avro"
       rev="${avro.version}"
       rev="${avro.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.codehaus.jackson"
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
       name="jackson-mapper-asl"
       rev="${jackson.version}"
       rev="${jackson.version}"