From 75014726bbf2fdc000333f9854591b613f7b1fab Mon Sep 17 00:00:00 2001
From: Rahul Agarkar <ragarkar@cloudera.com>
Date: Wed, 31 May 2023 14:53:40 +0530
Subject: [PATCH] =?UTF-8?q?HBASE-27820:=20HBase=20is=20not=20starting=20du?=
 =?UTF-8?q?e=20to=20Jersey=20library=20conflicts=20wi=E2=80=A6=20(#5210)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Ankit Singhal <ankit@apache.org>
(cherry picked from commit 7cc15fc92b62877d91bbb8d653f02ead4d901900)
---
 hbase-http/pom.xml      |  4 ----
 hbase-mapreduce/pom.xml | 11 +++++++++++
 hbase-rest/pom.xml      |  9 ---------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index 0254811733b9..546ebd69f027 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -80,10 +80,6 @@
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.github.stephenc.findbugs</groupId>
       <artifactId>findbugs-annotations</artifactId>
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index 994e934c6894..f3befbe62fe8 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -345,6 +345,17 @@
           <version>${netty.hadoop.version}</version>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-hdfs</artifactId>
+          <type>test-jar</type>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>javax.ws.rs-api</artifactId>
+          <scope>test</scope>
+        </dependency>
       </dependencies>
 
     </profile>
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index b0ffe30e6a00..1cdfba4a0969 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -30,15 +30,6 @@
   <name>Apache HBase - Rest</name>
   <description>HBase Rest Server</description>
   <dependencies>
-    <!--This one is upfront to get in front of
-         any dependency that pulls in jersey-core.
-         Jersey-core has implemented version 1
-         Interfaces of what is in this dependency
-         which does version 2.-->
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-    </dependency>
     <!-- Intra-project dependencies -->
     <dependency>
       <groupId>org.apache.hbase</groupId>