Return-Path: X-Original-To: apmail-incubator-crunch-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-crunch-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 739CCEAF9 for ; Wed, 13 Feb 2013 01:02:30 +0000 (UTC) Received: (qmail 13384 invoked by uid 500); 13 Feb 2013 01:02:30 -0000 Delivered-To: apmail-incubator-crunch-commits-archive@incubator.apache.org Received: (qmail 13342 invoked by uid 500); 13 Feb 2013 01:02:30 -0000 Mailing-List: contact crunch-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: crunch-dev@incubator.apache.org Delivered-To: mailing list crunch-commits@incubator.apache.org Received: (qmail 13335 invoked by uid 99); 13 Feb 2013 01:02:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2013 01:02:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 032BB51A90; Wed, 13 Feb 2013 01:02:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jwills@apache.org To: crunch-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix HBase integration tests to work w/Hadoop 2.x Message-Id: <20130213010230.032BB51A90@tyr.zones.apache.org> Date: Wed, 13 Feb 2013 01:02:29 +0000 (UTC) Updated Branches: refs/heads/master 82e911b4e -> aa05a4618 Fix HBase integration tests to work w/Hadoop 2.x Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/aa05a461 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/aa05a461 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/aa05a461 Branch: refs/heads/master Commit: aa05a4618fa897d20001b88e1630f12bd821eed8 Parents: 82e911b Author: Josh Wills Authored: Tue Feb 12 17:00:29 2013 -0800 Committer: Josh Wills Committed: Tue Feb 12 17:00:29 2013 -0800 ---------------------------------------------------------------------- .../apache/crunch/io/hbase/WordCountHBaseIT.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/aa05a461/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java ---------------------------------------------------------------------- diff --git a/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java b/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java index 4271fad..a59b5c9 100644 --- a/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java +++ b/crunch-hbase/src/it/java/org/apache/crunch/io/hbase/WordCountHBaseIT.java @@ -180,6 +180,12 @@ public class WordCountHBaseIT { jarUp(jos, baseDir, prefix + "WordCountHBaseIT$1.class"); jarUp(jos, baseDir, prefix + "WordCountHBaseIT$2.class"); jarUp(jos, baseDir, prefix + "WordCountHBaseIT$3.class"); + jarUp(jos, baseDir, prefix + "WordCountHBaseIT$StringifyFn.class"); + + // Now for the OutputFormat (doesn't get copied by default, apparently) + baseDir = new File("target/classes"); + jarUp(jos, baseDir, prefix + "TableOutputFormat.class"); + jarUp(jos, baseDir, prefix + "TableOutputFormat$TableRecordWriter.class"); jos.close(); Path target = new Path(tmpPath, "WordCountHBaseIT.jar");