summaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml16
1 files changed, 2 insertions, 14 deletions
diff --git a/pom.xml b/pom.xml
index f25f81fbaf..0092f32b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,12 +183,6 @@
<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>
@@ -227,14 +221,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-all</artifactId>
<version>1.9.5</version>
- <exclusions>
- <exclusion>
- <artifactId>hamcrest-core</artifactId>
- <groupId>org.hamcrest</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -303,7 +291,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>