Skip to content

Commit 53a7ca7

Browse files
committed
Revert "HBASE-26813 Remove javax.ws.rs-api dependency (#4191)"
MiniYARNCluster needs it This reverts commit b1c161e.
1 parent 1d38db9 commit 53a7ca7

File tree

5 files changed

+44
-0
lines changed

5 files changed

+44
-0
lines changed

hbase-http/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@
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>
183187
<dependency>
184188
<groupId>com.github.stephenc.findbugs</groupId>
185189
<artifactId>findbugs-annotations</artifactId>

hbase-it/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,16 @@
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>
143153
<!-- Intra-project dependencies -->
144154
<dependency>
145155
<groupId>org.apache.hbase</groupId>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,6 +2251,21 @@ Copyright (c) 2007-2017 The JRuby project
22512251
</licenses>
22522252
</project>
22532253
</supplement>
2254+
<supplement>
2255+
<project>
2256+
<groupId>javax.ws.rs</groupId>
2257+
<artifactId>javax.ws.rs-api</artifactId>
2258+
<version>2.1.1</version>
2259+
<name>Java API for RESTful Web Services</name>
2260+
<licenses>
2261+
<license>
2262+
<name>Eclipse Public License 2.0</name>
2263+
<url>https://www.eclipse.org/legal/epl-v20.html</url>
2264+
<distribution>repo</distribution>
2265+
</license>
2266+
</licenses>
2267+
</project>
2268+
</supplement>
22542269
<supplement>
22552270
<project>
22562271
<groupId>io.airlift</groupId>

hbase-rest/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,15 @@
130130
</plugins>
131131
</build>
132132
<dependencies>
133+
<!--This one is upfront to get in front of
134+
any dependency that pulls in jersey-core.
135+
Jersey-core has implemented version 1
136+
Interfaces of what is in this dependency
137+
which does version 2.-->
138+
<dependency>
139+
<groupId>javax.ws.rs</groupId>
140+
<artifactId>javax.ws.rs-api</artifactId>
141+
</dependency>
133142
<!-- Intra-project dependencies -->
134143
<dependency>
135144
<groupId>org.apache.hbase</groupId>

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,6 +1770,7 @@
17701770
<jackson.databind.version>2.13.1</jackson.databind.version>
17711771
<jaxb-api.version>2.3.1</jaxb-api.version>
17721772
<servlet.api.version>3.1.0</servlet.api.version>
1773+
<wx.rs.api.version>2.1.1</wx.rs.api.version>
17731774
<glassfish.jsp.version>2.3.2</glassfish.jsp.version>
17741775
<glassfish.el.version>3.0.1-b08</glassfish.el.version>
17751776
<jruby.version>9.2.13.0</jruby.version>
@@ -2432,6 +2433,11 @@
24322433
<artifactId>javax.servlet-api</artifactId>
24332434
<version>${servlet.api.version}</version>
24342435
</dependency>
2436+
<dependency>
2437+
<groupId>javax.ws.rs</groupId>
2438+
<artifactId>javax.ws.rs-api</artifactId>
2439+
<version>${wx.rs.api.version}</version>
2440+
</dependency>
24352441
<dependency>
24362442
<groupId>com.sun.activation</groupId>
24372443
<artifactId>javax.activation</artifactId>

0 commit comments

Comments
 (0)