You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by br...@apache.org on 2014/05/28 01:20:24 UTC

git commit: MRUNIT-208: mrunit unnecessarily depends on mockito-all (Alexandre Normand via Dave Beech)

Repository: mrunit
Updated Branches:
  refs/heads/mrunit-1.1-hadoop1 1ac4e66cc -> 644a83f75


MRUNIT-208: mrunit unnecessarily depends on mockito-all (Alexandre Normand via Dave Beech)


Project: http://git-wip-us.apache.org/repos/asf/mrunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/mrunit/commit/644a83f7
Tree: http://git-wip-us.apache.org/repos/asf/mrunit/tree/644a83f7
Diff: http://git-wip-us.apache.org/repos/asf/mrunit/diff/644a83f7

Branch: refs/heads/mrunit-1.1-hadoop1
Commit: 644a83f75e41c29c76583eaae31f60d80569e020
Parents: 1ac4e66
Author: Dave Beech <db...@apache.org>
Authored: Wed Apr 30 21:29:50 2014 +0100
Committer: Brock Noland <br...@apache.org>
Committed: Tue May 27 16:20:08 2014 -0700

----------------------------------------------------------------------
 pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mrunit/blob/644a83f7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2001f6c..179e5d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,10 +359,16 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <version>1.9.5</version>
     </dependency>
     <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>11.0.2</version>
@@ -383,6 +389,12 @@
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
       <version>1.5.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.mockito</groupId>
+          <artifactId>mockito-all</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>