[hbase] branch branch-2.1 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-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git


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

commit df302f77a83d62b2f1b85032292c06b629bea045
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-mapreduce/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-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
index 7098e24..c8fed5f 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
@@ -814,6 +814,7 @@ public class TableMapReduceUtil {
       org.apache.hadoop.hbase.mapreduce.TableMapper.class,           // hbase-server
       org.apache.hadoop.hbase.metrics.impl.FastLongHistogram.class,  // hbase-metrics
       org.apache.hadoop.hbase.metrics.Snapshot.class,                // hbase-metrics-api
+      org.apache.hbase.thirdparty.com.google.gson.GsonBuilder.class, // hbase-shaded-gson
       org.apache.zookeeper.ZooKeeper.class,
       org.apache.hbase.thirdparty.io.netty.channel.Channel.class,
       com.google.protobuf.Message.class,