Author: shv
Date: Thu Sep 29 09:13:49 2011
New Revision: 1177231
URL: http://svn.apache.org/viewvc?rev=1177231&view=rev
Log:
HADOOP-7697. Add ignore slf4j in hadoop-common templates.
Modified:
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml
Modified:
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml?rev=1177231&r1=1177230&r2=1177231&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml
(original)
+++
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-instrumented-template.xml
Thu Sep 29 09:13:49 2011
@@ -122,6 +122,13 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.5.3</version>
+ <exclusions>
+ <exclusion>
+ <!-- Don't pull in Avro's version of SLF4J.-->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
@@ -138,6 +145,11 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
+ <exclusion>
+ <!-- Don't pull in Avro's version of SLF4J.-->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
Modified:
hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml?rev=1177231&r1=1177230&r2=1177231&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml
(original)
+++ hadoop/common/branches/branch-0.22/common/ivy/hadoop-common-template.xml
Thu Sep 29 09:13:49 2011
@@ -122,6 +122,13 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.5.3</version>
+ <exclusions>
+ <exclusion>
+ <!-- Don't pull in Avro's version of SLF4J.-->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
@@ -138,6 +145,11 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
+ <exclusion>
+ <!-- Don't pull in Avro's version of SLF4J.-->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
