You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2019/10/11 13:05:14 UTC

[hbase] branch branch-2 updated: HBASE-23129 Move core to use hbase-thirdparty-3.1.1 (#695)

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

psomogyi 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 d8ad2a0  HBASE-23129 Move core to use hbase-thirdparty-3.1.1 (#695)
d8ad2a0 is described below

commit d8ad2a0bb57b0889e14d737c34d893a9e8046c2c
Author: Michael Stack <sa...@users.noreply.github.com>
AuthorDate: Fri Oct 11 05:30:29 2019 -0700

    HBASE-23129 Move core to use hbase-thirdparty-3.1.1 (#695)
    
    Signed-off-by: Peter Somogyi <ps...@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 7804259..19e80a8 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -152,6 +152,10 @@
     </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>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index cd4735c..7367a76 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1368,7 +1368,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. -->
@@ -2077,6 +2077,11 @@
       </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>
         <version>${hbase-thirdparty.version}</version>
       </dependency>