You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2013/02/27 00:54:30 UTC

svn commit: r1450541 - in /hbase/trunk/hbase-server: pom.xml src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

Author: enis
Date: Tue Feb 26 23:54:29 2013
New Revision: 1450541

URL: http://svn.apache.org/r1450541
Log:
HBASE-7934 TableMapReduceUtil doesn't include all dependency jars in new modular build (Nick Dimiduk)

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

Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1450541&r1=1450540&r2=1450541&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Tue Feb 26 23:54:29 2013
@@ -276,8 +276,7 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-prefix-tree</artifactId>
-      <!-- unfortunately, runtime scope causes eclipse to put it in the compile time classpath -->
-      <scope>runtime</scope>
+      <scope>compile</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=1450541&r1=1450540&r2=1450541&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 Tue Feb 26 23:54:29 2013
@@ -503,8 +503,16 @@ public class TableMapReduceUtil {
   public static void addDependencyJars(Job job) throws IOException {
     try {
       addDependencyJars(job.getConfiguration(),
+          // explicitly pull a class from each module
+          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,
           com.google.protobuf.Message.class,
+          // pull job classes
           job.getMapOutputKeyClass(),
           job.getMapOutputValueClass(),
           job.getInputFormatClass(),