From f497465d382337009b41753fcec465884edccb4e Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Wed, 16 Mar 2022 16:46:15 +0100
Subject: [PATCH] HBASE-26813 Remove javax.ws.rs-api dependency (#4191)

This is no longer needed since we've transitioned to the shaded Jersey shipped in
hbase-thirdparty. Also drop supplemental models entry.

Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Andrew Purtell <apurtell@apache.org>
---
 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 ------
 5 files changed, 44 deletions(-)

diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index 6ad70498419..ea5924974ff 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -180,10 +180,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 f1ce681c688..d422877c31c 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -140,16 +140,6 @@
   </build>
 
   <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 42cf49fb673..07b74c04a86 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -3307,21 +3307,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 31885e867d0..cd11f5a9b40 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -143,15 +143,6 @@
     </plugins>
   </build>
   <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 aa4d891decb..4e7d66a80a5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1553,7 +1553,6 @@
     <jackson.databind.version>2.13.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.2.13.0</jruby.version>
@@ -2228,11 +2227,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>