Repository: hadoop Updated Branches: refs/heads/branch-2 d59555785 -> aaef460e7
YARN-2549. TestContainerLaunch fails due to classpath problem with hamcrest classes. Contributed by Chris Nauroth. (cherry picked from commit 9d4ec97c95b51c6f99112030da91950551b22b9c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aaef460e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aaef460e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aaef460e Branch: refs/heads/branch-2 Commit: aaef460e7a4a75e723557ea027ba9df329350ec9 Parents: d595557 Author: cnauroth <[email protected]> Authored: Mon Sep 15 11:53:57 2014 -0700 Committer: cnauroth <[email protected]> Committed: Mon Sep 15 11:54:41 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop-yarn-server-nodemanager/pom.xml | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/aaef460e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c675e75..6b29f2f 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -331,6 +331,9 @@ Release 2.6.0 - UNRELEASED header and made it accept multiple origins in CrossOriginFilter. (Jonathan Eagles via zjshen) + YARN-2549. TestContainerLaunch fails due to classpath problem with hamcrest + classes. (cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/aaef460e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml index 24bc784..e72d489 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml @@ -120,11 +120,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> <!-- 'mvn dependency:analyze' fails to detect use of this dependency --> <dependency> <groupId>org.apache.hadoop</groupId> @@ -140,12 +135,21 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> </dependency> + <!-- + junit must be before mockito-all on the classpath. mockito-all bundles its + own copy of the hamcrest classes, but they don't match our junit version. + --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency>
