From 311e12e7122148a6c9c7db121b7197eeea88edce Mon Sep 17 00:00:00 2001
From: Rahul Agarkar <ragarkar@cloudera.com>
Date: Fri, 28 Apr 2023 17:08:09 +0530
Subject: [PATCH 1/3] HBASE-27820: HBase is not starting due to Jersey library
 conflicts with javax.ws.rs.api jar

---
 bin/hbase | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/hbase b/bin/hbase
index 60cfb8afef9a..2fecb21ecfaf 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -304,9 +304,13 @@ if [ -n "${shaded_jar}" ] && [ -f "${shaded_jar}" ]; then
 # is too hard to be worth it.
 #
 else
-  for f in $HBASE_HOME/lib/*.jar; do
-    CLASSPATH=${CLASSPATH}:$f;
+  # Multiple jars in HBase_CP_EXCLUDE_LIST can be added using "\|" separator
+  # Ex: HBASE_CP_EXCLUDE_LIST="javax.ws.rs-api\|jersey-multiport"
+  HBASE_CP_EXCLUDE_LIST="javax.ws.rs-api-"
+  CLASSPATH=`find "${HBASE_HOME}"/lib -maxdepth 1 -name "*.jar" | grep -v "${HBASE_CP_EXCLUDE_LIST}" | (while read f; do
+    CLASSPATH="${CLASSPATH}:${f}"
   done
+  echo "$CLASSPATH")`
   # make it easier to check for shaded/not later on.
   shaded_jar=""
 fi

From 1e5b8c8ff3b71d1ca3406a04045abf3382271117 Mon Sep 17 00:00:00 2001
From: Rahul Agarkar <ragarkar@cloudera.com>
Date: Fri, 5 May 2023 17:04:49 +0530
Subject: [PATCH 2/3] HBASE-27820: HBase is not starting due to Jersey library
 conflicts with javax.ws.rs.api jar

---
 bin/hbase                                         |  8 ++------
 hbase-http/pom.xml                                |  4 ----
 hbase-it/pom.xml                                  | 10 ----------
 .../src/main/resources/supplemental-models.xml    | 15 ---------------
 hbase-rest/pom.xml                                |  9 ---------
 pom.xml                                           |  6 ------
 6 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/bin/hbase b/bin/hbase
index 2fecb21ecfaf..60cfb8afef9a 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -304,13 +304,9 @@ if [ -n "${shaded_jar}" ] && [ -f "${shaded_jar}" ]; then
 # is too hard to be worth it.
 #
 else
-  # Multiple jars in HBase_CP_EXCLUDE_LIST can be added using "\|" separator
-  # Ex: HBASE_CP_EXCLUDE_LIST="javax.ws.rs-api\|jersey-multiport"
-  HBASE_CP_EXCLUDE_LIST="javax.ws.rs-api-"
-  CLASSPATH=`find "${HBASE_HOME}"/lib -maxdepth 1 -name "*.jar" | grep -v "${HBASE_CP_EXCLUDE_LIST}" | (while read f; do
-    CLASSPATH="${CLASSPATH}:${f}"
+  for f in $HBASE_HOME/lib/*.jar; do
+    CLASSPATH=${CLASSPATH}:$f;
   done
-  echo "$CLASSPATH")`
   # make it easier to check for shaded/not later on.
   shaded_jar=""
 fi
diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index 2cdb4f3cebb6..2eb754a96ad3 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -93,10 +93,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-it/pom.xml b/hbase-it/pom.xml
index 58bb0e62bcc4..5b98aab6429d 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -41,16 +41,6 @@
   </properties>
 
   <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>
-      <scope>test</scope>
-    </dependency>
     <!-- Intra-project dependencies -->
     <dependency>
       <groupId>org.apache.hbase</groupId>
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index dd60a7ddc1f3..d077662e5588 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2265,21 +2265,6 @@ Copyright (c) 2007-2017 The JRuby project
       </licenses>
     </project>
   </supplement>
-  <supplement>
-    <project>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-      <version>2.1.1</version>
-      <name>Java API for RESTful Web Services</name>
-      <licenses>
-        <license>
-          <name>Eclipse Public License 2.0</name>
-          <url>https://www.eclipse.org/legal/epl-v20.html</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </project>
-  </supplement>
   <supplement>
     <project>
       <groupId>io.airlift</groupId>
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 8a3b9f31ddf1..176b58fb2cdb 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>
diff --git a/pom.xml b/pom.xml
index 7cbc82f94385..96d9f1ad22d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,7 +821,6 @@
     <jackson.databind.version>2.14.1</jackson.databind.version>
     <jaxb-api.version>2.3.1</jaxb-api.version>
     <servlet.api.version>3.1.0</servlet.api.version>
-    <wx.rs.api.version>2.1.1</wx.rs.api.version>
     <glassfish.jsp.version>2.3.2</glassfish.jsp.version>
     <glassfish.el.version>3.0.1-b08</glassfish.el.version>
     <jruby.version>9.3.9.0</jruby.version>
@@ -1494,11 +1493,6 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>${servlet.api.version}</version>
       </dependency>
-      <dependency>
-        <groupId>javax.ws.rs</groupId>
-        <artifactId>javax.ws.rs-api</artifactId>
-        <version>${wx.rs.api.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.sun.activation</groupId>
         <artifactId>javax.activation</artifactId>

From bc606b06f51e7a476d9baed37dfaa2cd29c9dba3 Mon Sep 17 00:00:00 2001
From: Rahul Agarkar <ragarkar@cloudera.com>
Date: Thu, 18 May 2023 14:07:49 +0530
Subject: [PATCH 3/3] HBASE-27820: HBase is not starting due to Jersey library
 conflicts with javax.ws.rs.api jar

---
 hbase-it/pom.xml                                  | 10 ++++++++++
 hbase-mapreduce/pom.xml                           |  5 +++++
 .../src/main/resources/supplemental-models.xml    | 15 +++++++++++++++
 pom.xml                                           |  6 ++++++
 4 files changed, 36 insertions(+)

diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 5b98aab6429d..58bb0e62bcc4 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -41,6 +41,16 @@
   </properties>
 
   <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>
+      <scope>test</scope>
+    </dependency>
     <!-- Intra-project dependencies -->
     <dependency>
       <groupId>org.apache.hbase</groupId>
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index f54144f39364..1f692fc4f03b 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -288,6 +288,11 @@
           <type>test-jar</type>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>javax.ws.rs-api</artifactId>
+          <scope>test</scope>
+        </dependency>
         <dependency>
           <!--maven dependency:analyze says not needed but tests fail w/o-->
           <groupId>org.apache.hadoop</groupId>
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index d077662e5588..dd60a7ddc1f3 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2265,6 +2265,21 @@ Copyright (c) 2007-2017 The JRuby project
       </licenses>
     </project>
   </supplement>
+  <supplement>
+    <project>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.1.1</version>
+      <name>Java API for RESTful Web Services</name>
+      <licenses>
+        <license>
+          <name>Eclipse Public License 2.0</name>
+          <url>https://www.eclipse.org/legal/epl-v20.html</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
   <supplement>
     <project>
       <groupId>io.airlift</groupId>
diff --git a/pom.xml b/pom.xml
index 96d9f1ad22d8..7cbc82f94385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,6 +821,7 @@
     <jackson.databind.version>2.14.1</jackson.databind.version>
     <jaxb-api.version>2.3.1</jaxb-api.version>
     <servlet.api.version>3.1.0</servlet.api.version>
+    <wx.rs.api.version>2.1.1</wx.rs.api.version>
     <glassfish.jsp.version>2.3.2</glassfish.jsp.version>
     <glassfish.el.version>3.0.1-b08</glassfish.el.version>
     <jruby.version>9.3.9.0</jruby.version>
@@ -1493,6 +1494,11 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>${servlet.api.version}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.ws.rs</groupId>
+        <artifactId>javax.ws.rs-api</artifactId>
+        <version>${wx.rs.api.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.sun.activation</groupId>
         <artifactId>javax.activation</artifactId>