From abc38d80e41608aea0fc51798fbbd67250e3e5b0 Mon Sep 17 00:00:00 2001
From: Michael Stack <saintstack@users.noreply.github.com>
Date: Fri, 11 Oct 2019 05:30:29 -0700
Subject: [PATCH] HBASE-23129 Move core to use hbase-thirdparty-3.1.1 (#695)

Signed-off-by: Peter Somogyi <psomogyi@apache.org>
---
 hbase-common/pom.xml | 4 ++++
 pom.xml              | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index c23b9d4dd3cf..55395630bd77 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -150,6 +150,10 @@
       <groupId>org.apache.hbase.thirdparty</groupId>
       <artifactId>hbase-shaded-miscellaneous</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hbase.thirdparty</groupId>
+      <artifactId>hbase-shaded-gson</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.hbase.thirdparty</groupId>
       <artifactId>hbase-shaded-netty</artifactId>
diff --git a/pom.xml b/pom.xml
index 5029cc9a19c4..1beed4673a24 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1531,7 +1531,7 @@
     <surefire.version>2.22.2</surefire.version>
     <wagon.ssh.version>2.12</wagon.ssh.version>
     <xml.maven.version>1.0.1</xml.maven.version>
-    <hbase-thirdparty.version>2.2.1</hbase-thirdparty.version>
+    <hbase-thirdparty.version>3.1.1</hbase-thirdparty.version>
     <!-- Intraproject jar naming properties -->
     <!-- TODO this is pretty ugly, but works for the moment.
       Modules are pretty heavy-weight things, so doing this work isn't too bad. -->
@@ -2248,6 +2248,11 @@
         <artifactId>audience-annotations</artifactId>
         <version>${audience-annotations.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hbase.thirdparty</groupId>
+        <artifactId>hbase-shaded-gson</artifactId>
+        <version>${hbase-thirdparty.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.hbase.thirdparty</groupId>
         <artifactId>hbase-shaded-miscellaneous</artifactId>