Revert "HBASE-26813 Remove javax.ws.rs-api dependency (#4191)"
MiniYARNCluster needs it
This reverts commit f497465d38
.
This commit is contained in:
parent
b11b18bf91
commit
c2ab765334
|
@ -180,6 +180,10 @@
|
|||
<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>
|
||||
|
|
|
@ -140,6 +140,16 @@
|
|||
</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>
|
||||
|
|
|
@ -3307,6 +3307,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>
|
||||
|
|
|
@ -143,6 +143,15 @@
|
|||
</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>
|
||||
|
|
6
pom.xml
6
pom.xml
|
@ -1553,6 +1553,7 @@
|
|||
<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>
|
||||
|
@ -2227,6 +2228,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>
|
||||
|
|
Loading…
Reference in New Issue