From 2b045455b5ca330b7e538a40a832504eeaa0d7df Mon Sep 17 00:00:00 2001 From: stack Date: Fri, 15 Mar 2019 00:27:13 -0700 Subject: [PATCH] HBASE-22052 pom cleaning; filter out jersey-core in hadoop2 to match hadoop3 and remove redunant version specifications jersey-core is problematic. It was transitively included from hadoop and polluting our CLASSPATH with an implementation of a 1.x version of the javax.ws.rs.core.Response Interface from jsr311-api when we want the javax.ws.rs-api 2.x version. M hbase-endpoint/pom.xml M hbase-http/pom.xml M hbase-mapreduce/pom.xml M hbase-rest/pom.xml M hbase-server/pom.xml M hbase-zookeeper/pom.xml Remove redundant version specification (and the odd property define done already up in parent pom). M hbase-it/pom.xml M hbase-rest/pom.xml Exclude jersey-core explicitly. M hbase-procedure/pom.xml Remove redundant version and classifier. M pom.xml Add jersey-core exclusions to all dependencies that pull it in except hadoop-minicluster. mr tests fail w/o the jersey-core so let it in for minicluster and then in modules, exclude it where it causes damage as in hbase-it. --- hbase-endpoint/pom.xml | 3 -- hbase-http/pom.xml | 3 -- hbase-it/pom.xml | 24 ++++++++--- hbase-mapreduce/pom.xml | 3 -- hbase-rest/pom.xml | 28 +++++++----- hbase-server/pom.xml | 36 ++++++++++++++++ hbase-zookeeper/pom.xml | 3 -- pom.xml | 94 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 167 insertions(+), 27 deletions(-) diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 4c5f845c80..f04c0af563 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 d521258f77..dcb55b5838 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 f9807d6849..950819c802 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 167c38367d..d564026a2b 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 1422dd8b39..9631154dbd 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 7d1d31b8a4..a14b6e5264 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -676,10 +676,35 @@ + + 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-client + + + com.google.guava + guava + + + org.apache.hadoop hadoop-mapreduce-client-core @@ -772,6 +797,13 @@ + + org.apache.hadoop + hadoop-distcp + + ${hadoop-three.version} + org.apache.hadoop hadoop-common @@ -801,6 +833,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 2d8f936ae7..eb2e32d963 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 fac88da2ef..451aee97c0 100755 --- a/pom.xml +++ b/pom.xml @@ -2414,6 +2414,10 @@ hadoop-mapreduce-client-core ${hadoop-two.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2441,6 +2445,10 @@ hadoop-mapreduce-client-jobclient ${hadoop-two.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2458,6 +2466,10 @@ test-jar test + + com.sun.jersey + jersey-core + io.netty netty @@ -2473,6 +2485,14 @@ hadoop-hdfs ${hadoop-two.version} + + com.sun.jersey + jersey-core + + + org.apache.htrace + htrace-core + javax.servlet.jsp jsp-api @@ -2546,6 +2566,10 @@ com.google.guava guava + + com.sun.jersey + jersey-core + @@ -2558,6 +2582,14 @@ hadoop-common ${hadoop-two.version} + + com.sun.jersey + jersey-core + + + org.apache.htrace + htrace-core + commons-beanutils commons-beanutils @@ -2596,6 +2628,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 @@ -2608,6 +2657,18 @@ hadoop-minicluster ${hadoop-two.version} + commons-httpclient commons-httpclient @@ -2640,6 +2701,11 @@ ${hadoop-two.version} test + + org.apache.hadoop + hadoop-annotations + ${hadoop-two.version} + @@ -2675,6 +2741,10 @@ hadoop-mapreduce-client-core ${hadoop-three.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2702,6 +2772,10 @@ hadoop-mapreduce-client-jobclient ${hadoop-three.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2715,6 +2789,10 @@ test-jar test + + com.sun.jersey + jersey-core + io.netty netty @@ -2900,6 +2978,10 @@ com.sun.jersey jersey-core + + com.google.code.findbugs + jsr305 + @@ -2919,6 +3001,18 @@ hadoop-minicluster ${hadoop-three.version} + commons-httpclient commons-httpclient -- 2.19.1