MAPREDUCE-2772. Fix MR-279 build after common mavenization, part 2. (Thomas Graves via llu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279@1153710 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -2,8 +2,10 @@ Hadoop MapReduce Change Log
 
 Trunk (unreleased changes)
 
+  MAPREDUCE-279
 
-    MAPREDUCE-279
+    MAPREDUCE-2772. Fix MR-279 build after common mavenization, part 2.
+    (Thomas Graves via llu)
 
     MAPREDUCE-2772. Fix MR-279 build after common mavenization.
     (Robert Joseph Evans via llu)

mapreduce/ivy.xml

@@ -95,6 +95,12 @@
    <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}"
                conf="common->default"/>
 
+   <!-- Exclusions for transitive dependencies pulled in by log4j -->
+   <exclude org="com.sun.jdmk"/>
+   <exclude org="com.sun.jmx"/>
+   <exclude org="javax.jms"/>
+   <exclude org="javax.mail"/>
+
  </dependencies>
   
 </ivy-module>

mapreduce/pom.xml

@@ -120,12 +120,6 @@
       <version>1.8.5</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.2</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>

mapreduce/src/contrib/capacity-scheduler/ivy.xml

@@ -49,5 +49,12 @@
                 rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" 
                 rev="${hadoop-hdfs.version}" conf="test->default"/>
+
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/data_join/ivy.xml

@@ -45,5 +45,11 @@
      <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}" conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}" conf="common->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/dynamic-scheduler/ivy.xml

@@ -38,5 +38,11 @@
 
   <dependencies>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/eclipse-plugin/ivy.xml

@@ -43,5 +43,11 @@
   <dependencies>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/fairscheduler/ivy.xml

@@ -48,5 +48,11 @@
                 rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" 
                 rev="${hadoop-hdfs.version}" conf="test->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/gridmix/ivy.xml

@@ -52,5 +52,11 @@
       name="hadoop-hdfs-test"
       rev="${hadoop-hdfs.version}"
       conf="test->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+     <exclude org="com.sun.jdmk"/>
+     <exclude org="com.sun.jmx"/>
+     <exclude org="javax.jms"/>
+     <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/index/ivy.xml

@@ -46,5 +46,11 @@
      <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="org.apache.lucene" name="lucene-core" rev="${lucene-core.version}" conf="common->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/mumak/ivy.xml

@@ -51,5 +51,11 @@
                 conf="common->default"/>
     <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}"
                 conf="common->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/raid/ivy.xml

@@ -52,5 +52,11 @@
       name="hadoop-hdfs-test"
       rev="${hadoop-hdfs.version}"
       conf="test->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/streaming/ivy.xml

@@ -48,5 +48,11 @@
                 rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
                 rev="${hadoop-hdfs.version}" conf="test->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/vaidya/ivy.xml

@@ -42,5 +42,11 @@
   </publications>
   <dependencies>
     <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}" conf="common->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/vertica/ivy.xml

@@ -44,5 +44,11 @@
       name="hadoop-common"
       rev="${hadoop-common.version}"
       conf="common->default"/>
+
+    <!-- Exclusions for transitive dependencies pulled in by log4j -->
+    <exclude org="com.sun.jdmk"/>
+    <exclude org="com.sun.jmx"/>
+    <exclude org="javax.jms"/>
+    <exclude org="javax.mail"/>
   </dependencies>
 </ivy-module>

mapreduce/yarn/pom.xml

@@ -139,9 +139,8 @@
     </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
-     <artifactId>slf4j-simple</artifactId>
-     <version>1.5.2</version>
-     <scope>test</scope>
+     <artifactId>slf4j-log4j12</artifactId>
+     <version>1.6.1</version>
    </dependency>
   </dependencies>