Repository: hbase Updated Branches: refs/heads/branch-2 22ecb7a7b -> 6f9af9a92
HBASE-18518 Remove jersey1* dependencies form project and jersey1* jars from lib dir; ADDENDUM on branch-2 so master and branch-2 are same Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6f9af9a9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6f9af9a9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6f9af9a9 Branch: refs/heads/branch-2 Commit: 6f9af9a9245e3354c5859660c3224ed19d58498a Parents: 22ecb7a Author: Michael Stack <[email protected]> Authored: Fri Aug 18 10:09:23 2017 -0700 Committer: Michael Stack <[email protected]> Committed: Fri Aug 18 10:09:23 2017 -0700 ---------------------------------------------------------------------- hbase-rest/pom.xml | 4 ++++ .../src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java | 4 +++- pom.xml | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6f9af9a9/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index c157a8d..3e55610 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -309,6 +309,10 @@ <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/6f9af9a9/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 b78af2f..eb3fc26 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,6 +66,7 @@ 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; @@ -235,7 +236,8 @@ public class RESTServer implements Constants { parseCommandLine(args, servlet); // set up the Jersey servlet container for Jetty - ResourceConfig application = new ResourceConfig(); + ResourceConfig application = new ResourceConfig(). + packages("org.apache.hadoop.hbase.rest").register(Jackson1Feature.class); 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/6f9af9a9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9da4c6b..a785715 100644 --- a/pom.xml +++ b/pom.xml @@ -1879,6 +1879,11 @@ <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>
