From 7a95850d02000d020c30d390f36bae76470a4731 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Fri, 16 Feb 2018 14:39:24 -0600 Subject: [PATCH] HBASE-20007 exclude more hadoop jersey-1 deps --- .../org/apache/hadoop/hbase/rest/RESTServer.java | 9 ++-- pom.xml | 60 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-) 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 3033f18f3a..5e5b4bdca1 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 @@ -353,13 +353,16 @@ public class RESTServer implements Constants { infoServer.start(); } try { - // start server server.start(); - server.join(); - } catch (Exception e) { + } catch (Throwable e) { LOG.error(HBaseMarkers.FATAL, "Failed to start server", e); System.exit(1); } + try { + server.join(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } LOG.info("***** STOPPING service '" + RESTServer.class.getSimpleName() + "' *****"); } } diff --git a/pom.xml b/pom.xml index 01b95bcaeb..82582d0768 100755 --- a/pom.xml +++ b/pom.xml @@ -2856,6 +2856,10 @@ com.sun.jersey jersey-core + + com.sun.jersey + jersey-server + @@ -2953,6 +2957,18 @@ com.sun.jersey jersey-core + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-servlet + @@ -3011,6 +3027,18 @@ com.sun.jersey jersey-core + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-json + + + com.sun.jersey.contribs + jersey-guice + @@ -3022,6 +3050,18 @@ com.sun.jersey jersey-core + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-json + + + com.sun.jersey.contribs + jersey-guice + @@ -3029,6 +3069,10 @@ hadoop-yarn-server-timelineservice ${hadoop-three.version} + + com.sun.jersey + jersey-client + javax.ws.rs jsr311-api @@ -3040,10 +3084,26 @@ hadoop-yarn-common ${hadoop-three.version} + + com.sun.jersey + jersey-client + com.sun.jersey jersey-core + + com.sun.jersey + jersey-json + + + com.sun.jersey + jersey-server + + + com.sun.jersey.contribs + jersey-guice + -- 2.16.1