From b6966367563fdfe336eb40dba944bcc254988c76 Mon Sep 17 00:00:00 2001 From: Mike Drob Date: Tue, 13 Feb 2018 14:35:26 -0600 Subject: [PATCH] HBASE-19991 hbase-rest test fail against h3 --- hbase-rest/pom.xml | 9 ++---- pom.xml | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 8 deletions(-) diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index d4ab0b4af8..722798f0b5 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -300,7 +300,8 @@ org.glassfish.jersey.containers - jersey-container-servlet-core + jersey-container-jetty-servlet + ${jersey.version} com.fasterxml.jackson.jaxrs @@ -411,12 +412,6 @@ org.apache.hadoop hadoop-mapreduce-client-core test - - - com.google.guava - guava - - org.apache.hadoop diff --git a/pom.xml b/pom.xml index 32a9860731..5ef0954b0a 100755 --- a/pom.xml +++ b/pom.xml @@ -2502,6 +2502,7 @@ org.apache.hadoop hadoop-hdfs + ${hadoop-two.version} org.apache.htrace @@ -2540,7 +2541,6 @@ guava - ${hadoop-two.version} org.apache.hadoop @@ -2735,6 +2735,10 @@ org.codehaus.jackson jackson-mapper-asl + + com.google.guava + guava + @@ -2774,6 +2778,10 @@ com.sun.jersey jersey-core + + com.sun.jersey + jersey-server + javax.servlet.jsp jsp-api @@ -2843,6 +2851,24 @@ com.google.guava guava + + com.sun.jersey + jersey-core + + + + + org.apache.hadoop + hadoop-hdfs + ${hadoop-three.version} + test-jar + tests + test + + + com.sun.jersey + jersey-core + @@ -2915,6 +2941,19 @@ + + org.apache.hadoop + hadoop-common + test-jar + tests + ${hadoop-three.version} + + + com.sun.jersey + jersey-core + + + org.apache.hadoop hadoop-client @@ -2962,6 +3001,50 @@ + + org.apache.hadoop + hadoop-yarn-server-nodemanager + ${hadoop-three.version} + + + com.sun.jersey + jersey-core + + + + + org.apache.hadoop + hadoop-yarn-server-resourcemanager + ${hadoop-three.version} + + + com.sun.jersey + jersey-core + + + + + org.apache.hadoop + hadoop-yarn-server-timelineservice + ${hadoop-three.version} + + + javax.ws.rs + jsr311-api + + + + + org.apache.hadoop + hadoop-yarn-common + ${hadoop-three.version} + + + com.sun.jersey + jersey-core + + + org.apache.hadoop hadoop-minikdc -- 2.15.1