diff options
| -rw-r--r-- | client/pom.xml | 5 | ||||
| -rw-r--r-- | pom.xml | 16 |
2 files changed, 2 insertions, 19 deletions
diff --git a/client/pom.xml b/client/pom.xml index 53a497b183..ca6009a007 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -41,11 +41,6 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-elemental</artifactId> </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> </dependencies> <build> @@ -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> |