From 8c600c90089dfbc2707cf9d53567a2188546ae94 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Sat, 2 Sep 2017 13:14:09 -0700 Subject: [PATCH] HBASE-18723 [pom cleanup] Do a pass with dependency:analyze; remove unused and explicity list the dependencies we exploit; ADDENDUM Addendum addresses holes found running HBASE-18674 against hadoopqa. --- hbase-backup/pom.xml | 62 ++++++++++++++++++++++++++++++++++++++++++------- hbase-mapreduce/pom.xml | 40 +++++++++++++++++++++++++++++-- hbase-rest/pom.xml | 22 ++++++++++++++++++ pom.xml | 1 + 4 files changed, 114 insertions(+), 11 deletions(-) diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml index dd813ee7b2..5490c5bd61 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -109,6 +109,12 @@ org.apache.hbase + hbase-server + test-jar + test + + + org.apache.hbase hbase-mapreduce test-jar test @@ -157,11 +163,6 @@ log4j - org.mockito - mockito-all - test - - junit junit test @@ -179,7 +180,7 @@ - - - + + + com.google.guava + guava + ${hadoop.guava.version} + + + com.google.code.findbugs + jsr305 + + + + + io.netty netty ${netty.hadoop.version} - test + + + com.google.code.findbugs + jsr305 + + + + + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop-two.version} + + + javax.servlet + servlet-api + + + javax.inject + javax.inject + + + com.google.guava + guava + + + + + org.apache.hadoop + hadoop-distcp + ${hadoop-two.version} diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 9fbc1b1a9e..e377ee1c34 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -154,6 +154,19 @@ hbase-common + + org.apache.hbase + hbase-protocol + + + + com.google.protobuf + protobuf-java + ${external.protobuf.version} + + org.apache.hbase hbase-protocol-shaded @@ -166,6 +179,17 @@ hbase-metrics-api + io.dropwizard.metrics + metrics-core + + + + org.slf4j + slf4j-api + ${slf4j.version} + + org.apache.hbase hbase-prefix-tree @@ -185,12 +209,22 @@ org.apache.hbase hbase-hadoop-compat + + + org.apache.hbase + ${compat.module} + + + org.apache.hbase + hbase-hadoop-compat test-jar test + org.apache.hbase - hbase-hadoop2-compat + ${compat.module} test-jar test @@ -379,7 +413,7 @@ org.apache.hadoop - hadoop-client + hadoop-mapreduce-client-core com.google.guava @@ -388,6 +422,7 @@ + org.apache.hadoop hadoop-minicluster test @@ -417,6 +452,7 @@ hadoop-common + org.apache.hadoop hadoop-minicluster diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 2f49711986..75e9a72df8 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -216,6 +216,7 @@ org.apache.hbase hbase-server + + + org.apache.hbase + hbase-hadoop-compat + org.apache.hbase hbase-hadoop-compat + test-jar + test + + + org.apache.hbase hbase-server test-jar test @@ -344,6 +361,11 @@ findbugs-annotations true + + javax.servlet + javax.servlet-api + ${servlet.api.version} + diff --git a/pom.xml b/pom.xml index 94b406b225..510928ff18 100755 --- a/pom.xml +++ b/pom.xml @@ -1379,6 +1379,7 @@ They ought to match the values found in our default hadoop profile, which is currently "hadoop-2.0". See HBASE-15925 for more info. --> ${hadoop-two.version} + 11.0.2 hbase-hadoop2-compat src/main/assembly/hadoop-two-compat.xml -- 2.11.0 (Apple Git-81)