Skip to content

Commit f497465

Browse files
committed
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>
1 parent abdf727 commit f497465

5 files changed

Lines changed: 0 additions & 44 deletions

File tree

hbase-http/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,6 @@
180180
<groupId>javax.servlet</groupId>
181181
<artifactId>javax.servlet-api</artifactId>
182182
</dependency>
183-
<dependency>
184-
<groupId>javax.ws.rs</groupId>
185-
<artifactId>javax.ws.rs-api</artifactId>
186-
</dependency>
187183
<dependency>
188184
<groupId>com.github.stephenc.findbugs</groupId>
189185
<artifactId>findbugs-annotations</artifactId>

hbase-it/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,6 @@
140140
</build>
141141

142142
<dependencies>
143-
<!--This one is upfront to get in front of
144-
any dependency that pulls in jersey-core.
145-
Jersey-core has implemented version 1
146-
Interfaces of what is in this dependency
147-
which does version 2.-->
148-
<dependency>
149-
<groupId>javax.ws.rs</groupId>
150-
<artifactId>javax.ws.rs-api</artifactId>
151-
<scope>test</scope>
152-
</dependency>
153143
<!-- Intra-project dependencies -->
154144
<dependency>
155145
<groupId>org.apache.hbase</groupId>

hbase-resource-bundle/src/main/resources/supplemental-models.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3307,21 +3307,6 @@ Copyright (c) 2007-2017 The JRuby project
33073307
</licenses>
33083308
</project>
33093309
</supplement>
3310-
<supplement>
3311-
<project>
3312-
<groupId>javax.ws.rs</groupId>
3313-
<artifactId>javax.ws.rs-api</artifactId>
3314-
<version>2.1.1</version>
3315-
<name>Java API for RESTful Web Services</name>
3316-
<licenses>
3317-
<license>
3318-
<name>Eclipse Public License 2.0</name>
3319-
<url>https://www.eclipse.org/legal/epl-v20.html</url>
3320-
<distribution>repo</distribution>
3321-
</license>
3322-
</licenses>
3323-
</project>
3324-
</supplement>
33253310
<supplement>
33263311
<project>
33273312
<groupId>io.airlift</groupId>

hbase-rest/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,6 @@
143143
</plugins>
144144
</build>
145145
<dependencies>
146-
<!--This one is upfront to get in front of
147-
any dependency that pulls in jersey-core.
148-
Jersey-core has implemented version 1
149-
Interfaces of what is in this dependency
150-
which does version 2.-->
151-
<dependency>
152-
<groupId>javax.ws.rs</groupId>
153-
<artifactId>javax.ws.rs-api</artifactId>
154-
</dependency>
155146
<!-- Intra-project dependencies -->
156147
<dependency>
157148
<groupId>org.apache.hbase</groupId>

pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,7 +1553,6 @@
15531553
<jackson.databind.version>2.13.1</jackson.databind.version>
15541554
<jaxb-api.version>2.3.1</jaxb-api.version>
15551555
<servlet.api.version>3.1.0</servlet.api.version>
1556-
<wx.rs.api.version>2.1.1</wx.rs.api.version>
15571556
<glassfish.jsp.version>2.3.2</glassfish.jsp.version>
15581557
<glassfish.el.version>3.0.1-b08</glassfish.el.version>
15591558
<jruby.version>9.2.13.0</jruby.version>
@@ -2228,11 +2227,6 @@
22282227
<artifactId>javax.servlet-api</artifactId>
22292228
<version>${servlet.api.version}</version>
22302229
</dependency>
2231-
<dependency>
2232-
<groupId>javax.ws.rs</groupId>
2233-
<artifactId>javax.ws.rs-api</artifactId>
2234-
<version>${wx.rs.api.version}</version>
2235-
</dependency>
22362230
<dependency>
22372231
<groupId>com.sun.activation</groupId>
22382232
<artifactId>javax.activation</artifactId>

0 commit comments

Comments
 (0)