MAPREDUCE-2772. Fix MR-279 build after common mavenization. (Robert Joseph Evans via llu)

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

mapreduce/CHANGES.txt

@@ -5,6 +5,9 @@ Trunk (unreleased changes)
 
     MAPREDUCE-279
 
+    MAPREDUCE-2772. Fix MR-279 build after common mavenization.
+    (Robert Joseph Evans via llu)
+
     MAPREDUCE-2773. server.api.records.NodeHealthStatus renamed but 
     not updated in client NodeHealthStatus.java (Thomas Graves via mahadev)
  

mapreduce/pom.xml

@@ -106,14 +106,31 @@
     </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>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common-test</artifactId>
+      <artifactId>hadoop-annotations</artifactId>
       <version>${hadoop-common.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <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>
+      <version>${hadoop-common.version}</version>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

mapreduce/yarn/pom.xml

@@ -99,8 +99,26 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common-test</artifactId>
+      <artifactId>hadoop-annotations</artifactId>
       <version>${hadoop-common.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.8.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${hadoop-common.version}</version>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>