Harmonize slf4j versions. (llu)

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

mapreduce/CHANGES.txt

@@ -4,6 +4,8 @@ Trunk (unreleased changes)
 
   MAPREDUCE-279
 
+    Harmonize slf4j versions. (llu)
+
     MAPREDUCE-2772. Fix MR-279 build after common mavenization, part 2.
     (Thomas Graves via llu)
 

mapreduce/mr-client/hadoop-mapreduce-client-jobclient/pom.xml

@@ -16,11 +16,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.2</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-common</artifactId>

mapreduce/pom.xml

@@ -104,6 +104,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+     <groupId>org.slf4j</groupId>
+       <artifactId>slf4j-api</artifactId>
+       <version>1.6.1</version>
+    </dependency>
     <dependency>
      <groupId>org.slf4j</groupId>
        <artifactId>slf4j-log4j12</artifactId>

mapreduce/yarn/pom.xml

@@ -137,6 +137,11 @@
       <artifactId>netty</artifactId>
       <version>3.2.3.Final</version>
     </dependency>
+   <dependency>
+     <groupId>org.slf4j</groupId>
+     <artifactId>slf4j-api</artifactId>
+     <version>1.6.1</version>
+   </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-log4j12</artifactId>