Author: cdouglas
Date: Mon Jan 25 09:29:09 2010
New Revision: 902745
URL: http://svn.apache.org/viewvc?rev=902745&view=rev
Log:
HADOOP-6290. Prevent duplicate slf4j-simple jar via Avro's classpath.
Contributed by Owen O'Malley
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/ivy.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=902745&r1=902744&r2=902745&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Mon Jan 25 09:29:09 2010
@@ -1289,6 +1289,9 @@
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
Modified: hadoop/common/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/ivy.xml?rev=902745&r1=902744&r2=902745&view=diff
==============================================================================
--- hadoop/common/trunk/ivy.xml (original)
+++ hadoop/common/trunk/ivy.xml Mon Jan 25 09:29:09 2010
@@ -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}"
