From cc23c9b5503bbff7a353208914aabb73e1c49d45 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 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 | 9 +++++ hbase-mapreduce/pom.xml | 4 -- hbase-rest/pom.xml | 6 --- hbase-server/pom.xml | 6 ++- hbase-zookeeper/pom.xml | 3 -- pom.xml | 86 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 99 insertions(+), 21 deletions(-) diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 3b5f2f1611..98d3de557c 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -337,9 +337,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index a22d386288..e6ac295faf 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 5b44e9cba0..a0a1b2dbfa 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -218,6 +218,15 @@ org.apache.hbase hbase-testing-util + + + + com.sun.jersey + jersey-core + + org.apache.hbase.thirdparty diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 30b882900f..9ec2ebe0dc 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -359,7 +359,6 @@ xercesImpl - ${hadoop-two.version} org.apache.hadoop @@ -410,9 +409,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index acf176f9c0..171f0a2057 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -401,7 +401,6 @@ org.apache.hadoop hadoop-annotations - ${hadoop-two.version} org.apache.hadoop @@ -436,7 +435,6 @@ org.apache.hadoop hadoop-yarn-server-nodemanager - ${hadoop-three.version} com.sun.jersey @@ -447,7 +445,6 @@ org.apache.hadoop hadoop-yarn-server-resourcemanager - ${hadoop-three.version} com.sun.jersey @@ -458,7 +455,6 @@ org.apache.hadoop hadoop-yarn-server-timelineservice - ${hadoop-three.version} javax.ws.rs @@ -469,7 +465,6 @@ org.apache.hadoop hadoop-yarn-common - ${hadoop-three.version} com.sun.jersey @@ -488,7 +483,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 c272cbae9c..08b8eeff39 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -683,6 +683,8 @@ org.apache.hadoop hadoop-distcp + ${hadoop-two.version} @@ -696,7 +698,6 @@ org.apache.hadoop hadoop-annotations - ${hadoop-two.version} org.apache.hadoop @@ -803,6 +804,8 @@ org.apache.hadoop hadoop-distcp + ${hadoop-three.version} @@ -816,7 +819,6 @@ org.apache.hadoop hadoop-annotations - ${hadoop-three.version} org.apache.hadoop diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml index d46af2f55e..47240a8647 100644 --- a/hbase-zookeeper/pom.xml +++ b/hbase-zookeeper/pom.xml @@ -335,9 +335,6 @@ 3.0 - - ${hadoop-three.version} - org.apache.hadoop diff --git a/pom.xml b/pom.xml index 29e788d4fe..112f95a892 100755 --- a/pom.xml +++ b/pom.xml @@ -2378,6 +2378,10 @@ hadoop-mapreduce-client-core ${hadoop-two.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2405,6 +2409,10 @@ hadoop-mapreduce-client-jobclient ${hadoop-two.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2422,6 +2430,10 @@ test-jar test + + com.sun.jersey + jersey-core + io.netty netty @@ -2437,6 +2449,10 @@ hadoop-hdfs ${hadoop-two.version} + + com.sun.jersey + jersey-core + org.apache.htrace htrace-core @@ -2518,6 +2534,10 @@ com.google.guava guava + + com.sun.jersey + jersey-core + @@ -2530,6 +2550,10 @@ hadoop-common ${hadoop-two.version} + + com.sun.jersey + jersey-core + org.apache.htrace htrace-core @@ -2572,6 +2596,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 @@ -2584,6 +2625,18 @@ hadoop-minicluster ${hadoop-two.version} + org.apache.htrace htrace-core @@ -2620,6 +2673,11 @@ ${hadoop-two.version} test + + org.apache.hadoop + hadoop-annotations + ${hadoop-two.version} + @@ -2655,6 +2713,10 @@ hadoop-mapreduce-client-core ${hadoop-three.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2682,6 +2744,10 @@ hadoop-mapreduce-client-jobclient ${hadoop-three.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2695,6 +2761,10 @@ test-jar test + + com.sun.jersey + jersey-core + io.netty netty @@ -2892,6 +2962,10 @@ com.sun.jersey jersey-core + + com.google.code.findbugs + jsr305 + @@ -2911,6 +2985,18 @@ hadoop-minicluster ${hadoop-three.version} + org.apache.htrace htrace-core -- 2.19.1