[ranger] branch ranger-2.1 updated: RANGER-2970: updated HBase plugin packaging to remove duplicate libraries, and add jersey-client and jersey-core

[ma...@apache.org]

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

madhan pushed a commit to branch ranger-2.1
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.1 by this push:
     new 68ec93a  RANGER-2970: updated HBase plugin packaging to remove duplicate libraries, and add jersey-client and jersey-core
68ec93a is described below

commit 68ec93a3b8974d2c8e63e9afdf45f4e153ac0bfb
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Thu Aug 27 00:31:38 2020 -0700

    RANGER-2970: updated HBase plugin packaging to remove duplicate libraries, and add jersey-client and jersey-core
    
    (cherry picked from commit d6641cf085661c55dd868e7f92b6e51ab23706ad)
---
 distro/src/main/assembly/hbase-agent.xml |  6 ++----
 hbase-agent/pom.xml                      | 12 ++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/distro/src/main/assembly/hbase-agent.xml b/distro/src/main/assembly/hbase-agent.xml
index f73a660..88220b3 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -54,12 +54,11 @@
         <directoryMode>755</directoryMode>
         <fileMode>644</fileMode>
         <includes>
-          <include>com.google.code.gson:gson*</include>
+          <include>com.sun.jersey:jersey-client:jar:${jersey-bundle.version}</include>
+          <include>com.sun.jersey:jersey-core:jar:${jersey-bundle.version}</include>
           <include>org.eclipse.persistence:eclipselink</include>
           <include>org.eclipse.persistence:javax.persistence</include>
           <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
-          <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include>
-          <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include>
           <include>org.noggit:noggit:jar:${noggit.version}</include>
           <include>org.apache.solr:solr-solrj</include>
           <include>com.google.guava:guava:jar:${google.guava.version}</include>
@@ -73,7 +72,6 @@
           <include>org.elasticsearch.client:elasticsearch-rest-high-level-client</include>
           <include>org.elasticsearch.plugin:rank-eval-client</include>
           <include>org.elasticsearch.plugin:lang-mustache-client</include>
-          <include>org.apache.httpcomponents:httpcore-nio:jar:${httpcomponents.httpcore.version}</include>
           <include>org.apache.httpcomponents:httpasyncclient:jar:${httpcomponents.httpasyncclient.version}</include>
           <include>org.apache.lucene:lucene-core</include>
           <include>joda-time:joda-time</include>
diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml
index d7be109..a44f2d1 100644
--- a/hbase-agent/pom.xml
+++ b/hbase-agent/pom.xml
@@ -53,6 +53,18 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+            <type>jar</type>
+            <version>${jersey-bundle.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-core</artifactId>
+            <type>jar</type>
+            <version>${jersey-bundle.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-hbase-plugin-shim</artifactId>
             <version>${project.version}</version>