summaryrefslogtreecommitdiffstats
path: root/client/pom.xml
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-10-06 10:29:03 +0000
committerVaadin Code Review <review@vaadin.com>2016-10-06 12:14:42 +0000
commitcc479e9a44200f13001074d58903e6f2baa5253d (patch)
tree76407e91136d064560ddf6759495dccd8634a3e1 /client/pom.xml
parent3a69a723e689b047325ed88392d012ac96f4f62d (diff)
downloadvaadin-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 'client/pom.xml')
-rw-r--r--client/pom.xml5
1 files changed, 0 insertions, 5 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>