[hbase] branch branch-1.3 updated: HBASE-23139 MapReduce jobs lauched from convenience distribution are nonfunctional (#705)

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apurtell pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new 8e10337  HBASE-23139 MapReduce jobs lauched from convenience distribution are nonfunctional (#705)
8e10337 is described below

commit 8e103372505c8ee1d5a511c4b5dcf1d227dedb0a
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Tue Oct 8 17:22:42 2019 -0700

    HBASE-23139 MapReduce jobs lauched from convenience distribution are nonfunctional (#705)
    
    Add hbase-shaded-gson to base job dependencies.
    
    Conflicts:
    	hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
---
 .../main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
index 8533ed0..a2fc416 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
@@ -825,6 +825,7 @@ public class TableMapReduceUtil {
       org.apache.hadoop.hbase.client.Put.class,                      // hbase-client
       org.apache.hadoop.hbase.CompatibilityFactory.class,            // hbase-hadoop-compat
       org.apache.hadoop.hbase.mapreduce.TableMapper.class,           // hbase-server
+      org.apache.hbase.thirdparty.com.google.gson.GsonBuilder.class, // hbase-shaded-gson
       prefixTreeCodecClass, //  hbase-prefix-tree (if null will be skipped)
       // pull necessary dependencies
       org.apache.zookeeper.ZooKeeper.class,