Repository: hbase Updated Branches: refs/heads/branch-2 6f9af9a92 -> 8c85b6b85
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 6f9af9a9245e3354c5859660c3224ed19d58498a. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3ac60fc0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3ac60fc0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3ac60fc0 Branch: refs/heads/branch-2 Commit: 3ac60fc0d87911c42460066a1d30678a2963582d Parents: 6f9af9a Author: Michael Stack <st...@apache.org> Authored: Fri Aug 18 10:13:49 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Fri Aug 18 10:13:49 2017 -0700 ---------------------------------------------------------------------- hbase-rest/pom.xml | 4 ---- .../src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java | 4 +--- pom.xml | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3ac60fc0/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 3e55610..c157a8d 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -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 --> http://git-wip-us.apache.org/repos/asf/hbase/blob/3ac60fc0/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java index eb3fc26..b78af2f 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java @@ -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 http://git-wip-us.apache.org/repos/asf/hbase/blob/3ac60fc0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a785715..9da4c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -1879,11 +1879,6 @@ <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> <version>${jaxb-api.version}</version>
