Revert "HBASE-18518 Remove jersey1* dependencies form project and jersey1* jars from lib dir; ADDENDUM on branch-2 so master and branch-2 are same"
This reverts commit 6f9af9a924
.
This commit is contained in:
parent
6f9af9a924
commit
3ac60fc0d8
|
@ -309,10 +309,6 @@
|
|||
<groupId>org.glassfish.jersey.containers</groupId>
|
||||
<artifactId>jersey-container-servlet-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.media</groupId>
|
||||
<artifactId>jersey-media-json-jackson1</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<profiles>
|
||||
<!-- Skip the tests in this module -->
|
||||
|
|
|
@ -66,7 +66,6 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
|
|||
import org.eclipse.jetty.jmx.MBeanContainer;
|
||||
import org.eclipse.jetty.servlet.FilterHolder;
|
||||
|
||||
import org.glassfish.jersey.jackson1.Jackson1Feature;
|
||||
import org.glassfish.jersey.server.ResourceConfig;
|
||||
import org.glassfish.jersey.servlet.ServletContainer;
|
||||
|
||||
|
@ -236,8 +235,7 @@ public class RESTServer implements Constants {
|
|||
parseCommandLine(args, servlet);
|
||||
|
||||
// set up the Jersey servlet container for Jetty
|
||||
ResourceConfig application = new ResourceConfig().
|
||||
packages("org.apache.hadoop.hbase.rest").register(Jackson1Feature.class);
|
||||
ResourceConfig application = new ResourceConfig();
|
||||
ServletHolder sh = new ServletHolder(new ServletContainer(application));
|
||||
|
||||
// Set the default max thread number to 100 to limit
|
||||
|
|
5
pom.xml
5
pom.xml
|
@ -1878,11 +1878,6 @@
|
|||
<artifactId>jersey-container-servlet-core</artifactId>
|
||||
<version>${jersey.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jersey.media</groupId>
|
||||
<artifactId>jersey-media-json-jackson1</artifactId>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jaxb-api</artifactId>
|
||||
|
|
Loading…
Reference in New Issue