Return-Path: 
 <commits-return-7039-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 880F476A9
	for <apmail-hbase-commits-archive@www.apache.org>;
 Tue, 29 Nov 2011 06:04:44 +0000 (UTC)
Received: (qmail 8038 invoked by uid 500); 29 Nov 2011 06:04:44 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 7894 invoked by uid 500); 29 Nov 2011 06:04:42 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 7884 invoked by uid 99); 29 Nov 2011 06:04:42 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Nov 2011 06:04:42 +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; Tue, 29 Nov 2011 06:04:39 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 709D5238897F
	for <commits@hbase.apache.org>; Tue, 29 Nov 2011 06:04:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1207763 - in /hbase/trunk: pom.xml
 src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
Date: Tue, 29 Nov 2011 06:04:18 -0000
To: commits@hbase.apache.org
From: stack@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111129060418.709D5238897F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: stack
Date: Tue Nov 29 06:04:17 2011
New Revision: 1207763

URL: http://svn.apache.org/viewvc?rev=1207763&view=rev
Log:
HBASE-4885 Building against Hadoop 0.23 uses out-of-date MapReduce artifacts

Modified:
    hbase/trunk/pom.xml
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java

Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1207763&r1=1207762&r2=1207763&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Tue Nov 29 06:04:17 2011
@@ -1739,7 +1739,7 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-mapred</artifactId>
+          <artifactId>hadoop-mapreduce-client-common</artifactId>
           <version>${hadoop.version}</version>
           <optional>true</optional>
           <exclusions>
@@ -1793,9 +1793,32 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-mapred-test</artifactId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
           <version>${hadoop.version}</version>
           <optional>true</optional>
+          <type>test-jar</type>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-app</artifactId>
+          <version>${hadoop.version}</version>
+          <optional>true</optional>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-hs</artifactId>
+          <version>${hadoop.version}</version>
+          <optional>true</optional>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-server-tests</artifactId>
+          <version>${hadoop.version}</version>
+          <optional>true</optional>
+          <type>test-jar</type>
           <scope>test</scope>
         </dependency>
       </dependencies>

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java?rev=1207763&r1=1207762&r2=1207763&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java Tue Nov 29 06:04:17 2011
@@ -225,7 +225,7 @@ public class TestHFileOutputFormat  {
       Class<?> clazz =
         Class.forName("org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl");
       Constructor<?> c = clazz.
-          getConstructor(job.getConfiguration().getClass(), TaskAttemptID.class);
+          getConstructor(Configuration.class, TaskAttemptID.class);
       context = (TaskAttemptContext)c.newInstance(job.getConfiguration(), id);
     } else {
       context = org.apache.hadoop.hbase.mapreduce.hadoopbackport.InputSampler.