소스 검색

HADOOP-7697. Add ignore slf4j in hadoop-common templates.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1177231 13f79535-47bb-0310-9956-ffa450edef68
Konstantin Shvachko 13 년 전
부모
커밋
19dd63ca16
2개의 변경된 파일24개의 추가작업 그리고 0개의 파일을 삭제
  1. 12 0
      common/ivy/hadoop-common-instrumented-template.xml
  2. 12 0
      common/ivy/hadoop-common-template.xml

+ 12 - 0
common/ivy/hadoop-common-instrumented-template.xml

@@ -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>

+ 12 - 0
common/ivy/hadoop-common-template.xml

@@ -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>