From 783c311adbe26b22d4866c54b1e05bd97361fc22 Mon Sep 17 00:00:00 2001 From: stack Date: Thu, 14 Mar 2019 10:22:53 -0700 Subject: [PATCH] HBASE-22052 pom cleaning; filter out jersey-core in hadoop2 to match hadoop3 and remove redunant version specifications 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 Explicitly reference hadoop-hdfs/hadoop-common just so we inherit exclusions; in particular the exclusion of jersey-core. Remove exclusion inherited from parent pom. M hbase-procedure/pom.xml Remove redundant version and classifier. M pom.xml Add jersey-core exclusions to all dependencies that pull it in. --- hbase-endpoint/pom.xml | 3 -- hbase-http/pom.xml | 3 -- hbase-it/pom.xml | 22 ++++++++--- hbase-mapreduce/pom.xml | 4 -- hbase-procedure/pom.xml | 4 +- hbase-rest/pom.xml | 6 --- hbase-server/pom.xml | 6 ++- hbase-zookeeper/pom.xml | 3 -- pom.xml | 86 ++++++++++++++++++++++++++++++++++------- 9 files changed, 93 insertions(+), 44 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..029fa29c83 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -330,12 +330,22 @@ org.apache.hadoop hadoop-common - - - org.apache.htrace - htrace-core - - + + + org.apache.hadoop + hadoop-common + test-jar + test + + + org.apache.hadoop + hadoop-hdfs + + + org.apache.hadoop + hadoop-hdfs + test-jar + test org.apache.hadoop 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-procedure/pom.xml b/hbase-procedure/pom.xml index e575d6b8fa..b8601547c9 100644 --- a/hbase-procedure/pom.xml +++ b/hbase-procedure/pom.xml @@ -57,8 +57,8 @@ org.apache.hbase hbase-common - ${project.version} - tests + test-jar + test org.apache.hbase 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..df2602ce8d 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,10 @@ hadoop-minicluster ${hadoop-two.version} + + com.sun.jersey + jersey-core + org.apache.htrace htrace-core @@ -2620,6 +2665,11 @@ ${hadoop-two.version} test + + org.apache.hadoop + hadoop-annotations + ${hadoop-two.version} + @@ -2655,6 +2705,10 @@ hadoop-mapreduce-client-core ${hadoop-three.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2682,6 +2736,10 @@ hadoop-mapreduce-client-jobclient ${hadoop-three.version} + + com.sun.jersey + jersey-core + io.netty netty @@ -2695,6 +2753,10 @@ test-jar test + + com.sun.jersey + jersey-core + io.netty netty @@ -2793,20 +2855,6 @@ - - org.apache.hadoop - hadoop-hdfs - ${hadoop-three.version} - test-jar - tests - test - - - com.sun.jersey - jersey-core - - - org.apache.hadoop hadoop-auth @@ -2885,13 +2933,17 @@ org.apache.hadoop hadoop-common test-jar - tests + test ${hadoop-three.version} com.sun.jersey jersey-core + + com.google.code.findbugs + jsr305 + @@ -2911,6 +2963,10 @@ hadoop-minicluster ${hadoop-three.version} + + com.sun.jersey + jersey-core + org.apache.htrace htrace-core -- 2.19.1