Repository: hbase Updated Branches: refs/heads/branch-2 70d3413ee -> 33212cf6c refs/heads/master 9497eac4e -> 0d6acfa0c
HBASE-19991 hbase-rest test fail against h3 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/33212cf6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/33212cf6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/33212cf6 Branch: refs/heads/branch-2 Commit: 33212cf6c84e6d6fec7489ef6168f9af2ce8cc5a Parents: 138f82c Author: Mike Drob <md...@apache.org> Authored: Tue Feb 13 14:35:26 2018 -0600 Committer: Mike Drob <md...@apache.org> Committed: Fri Feb 16 09:11:45 2018 -0600 ---------------------------------------------------------------------- hbase-rest/pom.xml | 6 ---- pom.xml | 86 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/33212cf6/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index c7af9f5..0d6b2ce 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -411,12 +411,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/33212cf6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f3b13df..715f2eb 100755 --- a/pom.xml +++ b/pom.xml @@ -1322,6 +1322,7 @@ <jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version> <servlet.api.version>3.1.0</servlet.api.version> <wx.rs.api.version>2.0.1</wx.rs.api.version> + <!-- Jersey 2.26 requires jetty 9.4 which breaks hadoop. Tread lightly. --> <jersey.version>2.25.1</jersey.version> <glassfish.jsp.version>2.3.2</glassfish.jsp.version> <glassfish.el.version>3.0.1-b08</glassfish.el.version> @@ -2385,6 +2386,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-two.version}</version> <exclusions> <exclusion> <groupId>org.apache.htrace</groupId> @@ -2423,7 +2425,6 @@ <artifactId>guava</artifactId> </exclusion> </exclusions> - <version>${hadoop-two.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -2618,6 +2619,10 @@ <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -2658,6 +2663,10 @@ <artifactId>jersey-core</artifactId> </exclusion> <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </exclusion> + <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -2726,6 +2735,24 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-three.version}</version> + <type>test-jar</type> + <classifier>tests</classifier> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -2800,6 +2827,19 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <type>test-jar</type> + <classifier>tests</classifier> + <version>${hadoop-three.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>${hadoop-three.version}</version> </dependency> @@ -2846,6 +2886,50 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-nodemanager</artifactId> + <version>${hadoop-three.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-resourcemanager</artifactId> + <version>${hadoop-three.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-timelineservice</artifactId> + <version>${hadoop-three.version}</version> + <exclusions> + <exclusion> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-common</artifactId> + <version>${hadoop-three.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minikdc</artifactId> <version>${hadoop-three.version}</version>
