diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-10-06 10:29:03 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-10-06 12:14:42 +0000 |
| commit | cc479e9a44200f13001074d58903e6f2baa5253d (patch) | |
| tree | 76407e91136d064560ddf6759495dccd8634a3e1 /pom.xml | |
| parent | 3a69a723e689b047325ed88392d012ac96f4f62d (diff) | |
| download | vaadin-framework-cc479e9a44200f13001074d58903e6f2baa5253d.tar.gz vaadin-framework-cc479e9a44200f13001074d58903e6f2baa5253d.zip | |
Revert "Fix Mockito/Hamcrest build classpath conflict"
The change broke junit tests in projects using vaadin-bom.
This reverts commit 2ae14ad9affca86448ac1003280b7852354d8a6b.
Change-Id: I06524be9b6cc95e84f5f2b5c8faeb705d86e06bd
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 16 |
1 files changed, 2 insertions, 14 deletions
@@ -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> |