You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/08/18 17:52:18 UTC
[2/2] hbase git commit: Revert "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
3ac60fc0d87911c42460066a1d30678a2963582d. This is a r
Revert "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 3ac60fc0d87911c42460066a1d30678a2963582d.
This is a revert of an addendum subsequent testing showed as a mistake!
The addendum caused us to deviate from master, not bring us to parity
with master as claimed. My bad.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8c85b6b8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8c85b6b8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8c85b6b8
Branch: refs/heads/branch-2
Commit: 8c85b6b85336747a583d720d428a9e92caae38b9
Parents: 3ac60fc
Author: Michael Stack <st...@apache.org>
Authored: Fri Aug 18 10:50:58 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Fri Aug 18 10:51:37 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/8c85b6b8/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/8c85b6b8/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/8c85b6b8/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>