diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 3587cd9f6b8..ac5a0e7edec 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -327,9 +327,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index df3130cc444..e9c185f4ef9 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -416,9 +416,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 5af367ab9ae..09e46ba3eb4 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -162,6 +162,16 @@ + + + javax.ws.rs + javax.ws.rs-api + test + org.apache.hbase @@ -218,6 +228,15 @@ org.apache.hbase hbase-testing-util + + + + com.sun.jersey + jersey-core + + org.apache.hbase.thirdparty @@ -243,11 +262,6 @@ org.apache.htrace htrace-core4 - - javax.ws.rs - javax.ws.rs-api - test - org.glassfish.jersey.core jersey-client diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 82d337e5b4d..1ca4b92a4fd 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -401,9 +401,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 7916f2e6317..ee03cd43e74 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -172,6 +172,15 @@ + + + javax.ws.rs + javax.ws.rs-api + org.apache.hbase @@ -227,6 +236,15 @@ org.apache.hbase hbase-testing-util test + + + + com.sun.jersey + jersey-core + + org.apache.hbase @@ -273,10 +291,6 @@ javax.servlet javax.servlet-api - - javax.ws.rs - javax.ws.rs-api - org.eclipse.jetty jetty-server @@ -426,7 +440,6 @@ org.apache.hadoop hadoop-annotations - ${hadoop-two.version} org.apache.hadoop @@ -455,7 +468,6 @@ org.apache.hadoop hadoop-yarn-server-nodemanager - ${hadoop-three.version} com.sun.jersey @@ -466,7 +478,6 @@ org.apache.hadoop hadoop-yarn-server-resourcemanager - ${hadoop-three.version} com.sun.jersey @@ -477,7 +488,6 @@ org.apache.hadoop hadoop-yarn-server-timelineservice - ${hadoop-three.version} javax.ws.rs @@ -488,7 +498,6 @@ org.apache.hadoop hadoop-yarn-common - ${hadoop-three.version} com.sun.jersey @@ -507,7 +516,6 @@ org.apache.hadoop hadoop-annotations - ${hadoop-three.version} org.apache.hadoop diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 701730cd2ce..1e20de62116 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -676,10 +676,25 @@ + + org.apache.hadoop + hadoop-distcp + + ${hadoop-two.version} + org.apache.hadoop hadoop-common + + org.apache.hadoop + hadoop-auth + + + org.apache.hadoop + hadoop-annotations + org.apache.hadoop hadoop-mapreduce-client-core @@ -772,6 +787,13 @@ + + org.apache.hadoop + hadoop-distcp + + ${hadoop-three.version} + org.apache.hadoop hadoop-common @@ -801,6 +823,10 @@ test-jar test + + org.apache.hadoop + hadoop-annotations + org.apache.hadoop hadoop-minicluster diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml index b9e90d36922..140282fa841 100644 --- a/hbase-zookeeper/pom.xml +++ b/hbase-zookeeper/pom.xml @@ -342,9 +342,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop diff --git a/pom.xml b/pom.xml index c0902ae4d22..c518163b27e 100755 --- a/pom.xml +++ b/pom.xml @@ -2437,6 +2437,10 @@ hadoop-mapreduce-client-core ${hadoop-two.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2464,6 +2468,10 @@ hadoop-mapreduce-client-jobclient ${hadoop-two.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2481,6 +2489,10 @@ test-jar test + + com.sun.jersey + jersey-core + io.netty netty @@ -2496,6 +2508,10 @@ hadoop-hdfs ${hadoop-two.version} + + com.sun.jersey + jersey-core + javax.servlet.jsp jsp-api @@ -2569,6 +2585,10 @@ com.google.guava guava + + com.sun.jersey + jersey-core + @@ -2581,6 +2601,10 @@ hadoop-common ${hadoop-two.version} + + com.sun.jersey + jersey-core + commons-beanutils commons-beanutils @@ -2619,6 +2643,23 @@ + + org.apache.hadoop + hadoop-common + ${hadoop-two.version} + test-jar + test + + + com.sun.jersey + jersey-core + + + com.google.code.findbugs + jsr305 + + + org.apache.hadoop hadoop-client @@ -2631,6 +2672,18 @@ hadoop-minicluster ${hadoop-two.version} + commons-httpclient commons-httpclient @@ -2663,6 +2716,11 @@ ${hadoop-two.version} test + + org.apache.hadoop + hadoop-annotations + ${hadoop-two.version} + @@ -2698,6 +2756,10 @@ hadoop-mapreduce-client-core ${hadoop-three.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2725,6 +2787,10 @@ hadoop-mapreduce-client-jobclient ${hadoop-three.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2738,6 +2804,10 @@ test-jar test + + com.sun.jersey + jersey-core + io.netty netty @@ -2923,6 +2993,10 @@ com.sun.jersey jersey-core + + com.google.code.findbugs + jsr305 + @@ -2942,6 +3016,18 @@ hadoop-minicluster ${hadoop-three.version} + commons-httpclient commons-httpclient