YARN-6414. ATSv2 HBase related tests fail due to guava version upgrade (Haibo Chen via Varun Saxena)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b8838578 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b8838578 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b8838578 Branch: refs/heads/HDFS-7240 Commit: b8838578ce1f1ae1f93cc6b40cc98b58321ad9ee Parents: 26172a9 Author: Varun Saxena <[email protected]> Authored: Sun Apr 2 04:37:34 2017 +0530 Committer: Varun Saxena <[email protected]> Committed: Sun Apr 2 04:37:34 2017 +0530 ---------------------------------------------------------------------- hadoop-project/pom.xml | 1 + .../pom.xml | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8838578/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index e55308f..f327933 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -51,6 +51,7 @@ <kafka.version>0.8.2.1</kafka.version> <hbase.version>1.2.4</hbase.version> <hbase-compatible-hadoop.version>2.5.1</hbase-compatible-hadoop.version> + <hbase-compatible-guava.version>11.0.2</hbase-compatible-guava.version> <hadoop.assemblies.version>${project.version}</hadoop.assemblies.version> <commons-daemon.version>1.0.13</commons-daemon.version> http://git-wip-us.apache.org/repos/asf/hadoop/blob/b8838578/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml index d44aa22..afe440f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml @@ -141,6 +141,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>${hbase-compatible-guava.version}</version> <scope>test</scope> </dependency> @@ -369,6 +370,24 @@ </additionnalDependencies> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>depcheck</id> + <configuration> + <!-- disable dependency convergence check --> + <skip>true</skip> + </configuration> + <goals> + <goal>enforce</goal> + </goals> + <phase/> + </execution> + </executions> + </plugin> </plugins> </build> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
