Author: llu
Date: Wed Aug 3 22:27:45 2011
New Revision: 1153691
URL: http://svn.apache.org/viewvc?rev=1153691&view=rev
Log:
MAPREDUCE-2772. Fix MR-279 build after common mavenization. (Robert Joseph Evans via llu)
Modified:
hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
hadoop/common/branches/MR-279/mapreduce/pom.xml
hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml
Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1153691&r1=1153690&r2=1153691&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Wed Aug 3 22:27:45 2011
@@ -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)
Modified: hadoop/common/branches/MR-279/mapreduce/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/pom.xml?rev=1153691&r1=1153690&r2=1153691&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/pom.xml Wed Aug 3 22:27:45 2011
@@ -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>
Modified: hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml?rev=1153691&r1=1153690&r2=1153691&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/yarn/pom.xml Wed Aug 3 22:27:45 2011
@@ -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>
|