This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 36c4239 HBASE-23139 MapReduce jobs lauched from convenience
distribution are nonfunctional (#705)
36c4239 is described below
commit 36c4239f379abe655c8e1325c4311ea28a251b21
Author: Andrew Purtell <[email protected]>
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 c789654b..e307bc6 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,
