Return-Path: 
 <commits-return-11647-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 494F9E811
	for <apmail-hbase-commits-archive@www.apache.org>;
 Fri,  1 Mar 2013 23:03:55 +0000 (UTC)
Received: (qmail 39656 invoked by uid 500); 1 Mar 2013 23:03:55 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 39551 invoked by uid 500); 1 Mar 2013 23:03:55 -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 39543 invoked by uid 99); 1 Mar 2013 23:03:55 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Mar 2013 23:03:55 +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; Fri, 01 Mar 2013 23:03:52 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A4D8D2388980;
	Fri,  1 Mar 2013 23:03:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1451759 - in /hbase/trunk: hbase-client/pom.xml
 hbase-server/pom.xml
 hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Date: Fri, 01 Mar 2013 23:03:32 -0000
To: commits@hbase.apache.org
From: tedyu@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130301230332.A4D8D2388980@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tedyu
Date: Fri Mar  1 23:03:32 2013
New Revision: 1451759

URL: http://svn.apache.org/r1451759
Log:
HBASE-7936 Undo prefix-tree module as dependency for mapreduce and for DataBlockEncoding, addendum (Ted Yu)


Modified:
    hbase/trunk/hbase-client/pom.xml
    hbase/trunk/hbase-server/pom.xml
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

Modified: hbase/trunk/hbase-client/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/pom.xml?rev=1451759&r1=1451758&r2=1451759&view=diff
==============================================================================
--- hbase/trunk/hbase-client/pom.xml (original)
+++ hbase/trunk/hbase-client/pom.xml Fri Mar  1 23:03:32 2013
@@ -60,10 +60,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-prefix-tree</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-common</artifactId>
             <type>test-jar</type>
         </dependency>

Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1451759&r1=1451758&r2=1451759&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Fri Mar  1 23:03:32 2013
@@ -276,7 +276,7 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-prefix-tree</artifactId>
-      <scope>compile</scope>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1451759&r1=1451758&r2=1451759&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java Fri Mar  1 23:03:32 2013
@@ -511,7 +511,6 @@ public class TableMapReduceUtil {
           org.apache.hadoop.hbase.HConstants.class,                      // hbase-common
           org.apache.hadoop.hbase.protobuf.generated.ClientProtos.class, // hbase-protocol
           org.apache.hadoop.hbase.client.Put.class,                      // hbase-client
-          org.apache.hbase.codec.prefixtree.PrefixTreeCodec.class,       // hbase-prefix-tree
           org.apache.hadoop.hbase.CompatibilityFactory.class,            // hbase-hadoop-compat
           // pull necessary dependencies
           org.apache.zookeeper.ZooKeeper.class,