From f38a996b4c7fda7e7a69fb3bce5247517ad6e13b Mon Sep 17 00:00:00 2001
From: Christopher Douglas <cdouglas@apache.org>
Date: Mon, 25 Jan 2010 09:29:09 +0000
Subject: [PATCH] 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
---
 CHANGES.txt | 3 +++
 ivy.xml     | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 68273bdaa3f..f03a1b46dd4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1289,6 +1289,9 @@ Release 0.21.0 - Unreleased
     HADOOP-6374. JUnit tests should never depend on anything in conf.
     (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
 
   NEW FEATURES
diff --git a/ivy.xml b/ivy.xml
index 2d41b3e43ad..53bba3bd164 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -269,7 +269,9 @@
     <dependency org="org.apache.hadoop"
       name="avro"
       rev="${avro.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
       rev="${jackson.version}"