Skip to content

Commit

Permalink
HBASE-26813 Remove javax.ws.rs-api dependency (#4191)
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Andrew Purtell <[email protected]>
  • Loading branch information
ndimiduk authored Mar 16, 2022
1 parent fec5478 commit b1c161e
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 44 deletions.
4 changes: 0 additions & 4 deletions hbase-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 0 additions & 10 deletions hbase-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 0 additions & 15 deletions hbase-resource-bundle/src/main/resources/supplemental-models.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2251,21 +2251,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>
Expand Down
9 changes: 0 additions & 9 deletions hbase-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,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>
Expand Down
6 changes: 0 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,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>
Expand Down Expand Up @@ -2433,11 +2432,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>
Expand Down

0 comments on commit b1c161e

Please sign in to comment.