Repository: hbase Updated Branches: refs/heads/master 83175fdf8 -> 0e95a8a0a
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. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0e95a8a0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0e95a8a0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0e95a8a0 Branch: refs/heads/master Commit: 0e95a8a0ae24b0d19b391d49794d6716a8e86bcd Parents: 83175fd Author: Michael Stack <st...@apache.org> Authored: Sat Sep 2 13:14:09 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Sun Sep 3 15:42:59 2017 -0700 ---------------------------------------------------------------------- hbase-backup/pom.xml | 62 +++++++++++++++++++++++++++++++++++++------- hbase-mapreduce/pom.xml | 40 ++++++++++++++++++++++++++-- hbase-rest/pom.xml | 21 +++++++++++++++ pom.xml | 1 + 4 files changed, 113 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0e95a8a0/hbase-backup/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml index dd813ee..5490c5b 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -109,6 +109,12 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> <type>test-jar</type> <scope>test</scope> @@ -157,11 +163,6 @@ <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -179,7 +180,7 @@ </property> </activation> <dependencies> - <!--dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <exclusions> @@ -223,14 +224,57 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <!--We let hadoop include guava here. It uses it + in the Configuration class --> </exclusions> - </dependency--> -<!-- Hadoop needs Netty 3.x at test scope for the minicluster --> + </dependency> <dependency> + <!--Hadoop2 Uses Guava in Configuration class at least--> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${hadoop.guava.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <!--This module seems to need this.--> <groupId>io.netty</groupId> <artifactId>netty</artifactId> <version>${netty.hadoop.version}</version> - <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop-two.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-distcp</artifactId> + <version>${hadoop-two.version}</version> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/hbase/blob/0e95a8a0/hbase-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 9fbc1b1..e377ee1 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -154,6 +154,19 @@ <artifactId>hbase-common</artifactId> </dependency> <dependency> + <!--Needed by ExportSnapshot. It is reading + Snapshot protos. TODO: Move to internal types.--> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + </dependency> + <dependency> + <!--Needed by ExportSnapshot. It is reading + Snapshot protos. TODO: Move to internal types.--> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${external.protobuf.version}</version> + </dependency> + <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-protocol-shaded</artifactId> </dependency> @@ -166,6 +179,17 @@ <artifactId>hbase-metrics-api</artifactId> </dependency> <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> + <!--This is not used by hbase directly. Used by thrift, + dropwizard and zk.--> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-prefix-tree</artifactId> </dependency> @@ -185,12 +209,22 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop-compat</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>${compat.module}</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> + <!--Do not removed. maven dependency:analyze says not needed but it + is; perhaps it comes in via reflection so maven can't figure it--> <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop2-compat</artifactId> + <artifactId>${compat.module}</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> @@ -379,7 +413,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> + <artifactId>hadoop-mapreduce-client-core</artifactId> <exclusions> <exclusion> <groupId>com.google.guava</groupId> @@ -388,6 +422,7 @@ </exclusions> </dependency> <dependency> + <!--maven dependency:analyze says not needed but tests fail w/o--> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <scope>test</scope> @@ -417,6 +452,7 @@ <artifactId>hadoop-common</artifactId> </dependency> <dependency> + <!--maven dependency:analyze says not needed but tests fail w/o--> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/0e95a8a0/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 2f49711..226a99e 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -216,6 +216,7 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> </dependency> + <!--Below MR wanted by PE--> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> @@ -232,9 +233,24 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <!-- REMOVE + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>${compat.module}</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>${compat.module}</artifactId> <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> </dependency> +--> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> @@ -344,6 +360,11 @@ <artifactId>findbugs-annotations</artifactId> <optional>true</optional> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet.api.version}</version> + </dependency> </dependencies> <profiles> <!-- Skip the tests in this module --> http://git-wip-us.apache.org/repos/asf/hbase/blob/0e95a8a0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 94b406b..510928f 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.version>${hadoop-two.version}</hadoop.version> + <hadoop.guava.version>11.0.2</hadoop.guava.version> <compat.module>hbase-hadoop2-compat</compat.module> <assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file> <!-- end HBASE-15925 default hadoop compatibility values -->