diff options
| author | John Ahlroos <john@vaadin.com> | 2016-09-28 13:52:11 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-10-05 08:49:04 +0000 |
| commit | 2ae14ad9affca86448ac1003280b7852354d8a6b (patch) | |
| tree | 67df1b2f39387be8a5fbd62afad00ae0a3139a4e /client/pom.xml | |
| parent | e5c64043ec14f16e431c7d804c244a1abca46b1f (diff) | |
| download | vaadin-framework-2ae14ad9affca86448ac1003280b7852354d8a6b.tar.gz vaadin-framework-2ae14ad9affca86448ac1003280b7852354d8a6b.zip | |
Fix Mockito/Hamcrest build classpath conflict
* Fixes issue with Mockito classes not found on the vaadin-client test classpath
* Fixes Mockito/Hamcrest dependency conflict described in
https://tedvinke.wordpress.com/2013/12/17/mixing-junit-hamcrest-and-mockito-explaining-nosuchmethoderror/
Change-Id: I946c464118e3b9365bb8da4fb337fd45e6073f5e
Diffstat (limited to 'client/pom.xml')
| -rw-r--r-- | client/pom.xml | 5 |
1 files changed, 5 insertions, 0 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> |