Return-Path: 
 <mapreduce-commits-return-1976-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 02FE97E96
	for <apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org>;
 Wed,  3 Aug 2011 22:28:09 +0000 (UTC)
Received: (qmail 84664 invoked by uid 500); 3 Aug 2011 22:28:08 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 84552 invoked by uid 500); 3 Aug 2011 22:28:07 -0000
Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mapreduce-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:mapreduce-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:mapreduce-commits@hadoop.apache.org>
List-Id: <mapreduce-commits.hadoop.apache.org>
Reply-To: mapreduce-dev@hadoop.apache.org
Delivered-To: mailing list mapreduce-commits@hadoop.apache.org
Received: (qmail 84544 invoked by uid 99); 3 Aug 2011 22:28:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2011 22:28:07 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2011 22:28:06 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id F305D2388906;
	Wed,  3 Aug 2011 22:27:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1153691 - in /hadoop/common/branches/MR-279/mapreduce:
 CHANGES.txt pom.xml yarn/pom.xml
Date: Wed, 03 Aug 2011 22:27:45 -0000
To: mapreduce-commits@hadoop.apache.org
From: llu@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110803222745.F305D2388906@eris.apache.org>

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>