summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/pom.xml5
-rw-r--r--pom.xml16
2 files changed, 19 insertions, 2 deletions
diff --git a/client/pom.xml b/client/pom.xml
index ca6009a007..53a497b183 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -41,6 +41,11 @@
<groupId>com.google.gwt</groupId>
<artifactId>gwt-elemental</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index e82cbac4a4..6848b88c8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>hamcrest-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -199,8 +205,14 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>1.9.5</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>hamcrest-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -274,7 +286,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>