From 8cfaad20c84b3299b7c9a2342ee8a7aca5e0c0a2 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Mon, 2 Oct 2017 16:31:48 -0500 Subject: [PATCH] HBASE-16338 Remove Jackson1 deps --- hbase-client/pom.xml | 4 --- hbase-rest/pom.xml | 4 --- .../org/apache/hadoop/hbase/rest/RESTServer.java | 4 +-- .../hadoop/hbase/rest/HBaseRESTTestingUtility.java | 4 +-- hbase-server/pom.xml | 4 --- pom.xml | 29 ---------------------- 6 files changed, 2 insertions(+), 47 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index d9aa006fef..7af9d5502f 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -168,10 +168,6 @@ org.apache.htrace htrace-core - - org.codehaus.jackson - jackson-mapper-asl - org.jruby.jcodings jcodings diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 0b188095c1..833e6b6d9f 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -299,10 +299,6 @@ org.glassfish.jersey.containers jersey-container-servlet-core - - org.glassfish.jersey.media - jersey-media-json-jackson1 - org.glassfish.web 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 907a220544..a6c10a9a37 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 @@ -67,7 +67,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; @@ -237,8 +236,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 diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java index 95d9432eca..0da825cb07 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java @@ -34,7 +34,6 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.glassfish.jersey.jackson1.Jackson1Feature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; @@ -62,8 +61,7 @@ public class HBaseRESTTestingUtility { RESTServlet.getInstance(conf, UserProvider.instantiate(conf)); // set up the Jersey servlet container for Jetty - ResourceConfig app = new ResourceConfig(). - packages("org.apache.hadoop.hbase.rest").register(Jackson1Feature.class); + ResourceConfig app = new ResourceConfig(); ServletHolder sh = new ServletHolder(new ServletContainer(app)); // set up Jetty and run the embedded server diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index ad080f18d7..3fbd961ced 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -486,10 +486,6 @@ org.glassfish.jersey.containers jersey-container-servlet-core - - org.glassfish.jersey.media - jersey-media-json-jackson1 - org.glassfish.web diff --git a/pom.xml b/pom.xml index 272e4d452a..90f1d82a27 100755 --- a/pom.xml +++ b/pom.xml @@ -1403,7 +1403,6 @@ 2.2.12 9.4.6.v20170531 9.2.19.v20160908 - 1.9.13 3.1.0 2.0.1 2.25.1 @@ -1872,29 +1871,6 @@ joni ${joni.version} - - - org.codehaus.jackson - jackson-core-asl - ${jackson1.version} - - - org.codehaus.jackson - jackson-mapper-asl - ${jackson1.version} - - - org.codehaus.jackson - jackson-jaxrs - ${jackson1.version} - - - org.codehaus.jackson - jackson-xc - ${jackson1.version} - org.jamon jamon-runtime @@ -1977,11 +1953,6 @@ jersey-container-servlet-core ${jersey.version} - - org.glassfish.jersey.media - jersey-media-json-jackson1 - ${jackson.version} - org.glassfish.web -- 2.14.1