From 2ae14ad9affca86448ac1003280b7852354d8a6b Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Wed, 28 Sep 2016 13:52:11 +0300
Subject: [PATCH] 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
---
 client/pom.xml |  5 +++++
 pom.xml        | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 2 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>
diff --git a/pom.xml b/pom.xml
index 0092f32b63..f25f81fbaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,6 +183,12 @@
                 <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>
@@ -221,8 +227,14 @@
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
+                <artifactId>mockito-core</artifactId>
                 <version>1.9.5</version>
+                <exclusions>
+                   <exclusion>
+                      <artifactId>hamcrest-core</artifactId>
+                      <groupId>org.hamcrest</groupId>
+                  </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
@@ -291,7 +303,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-- 
2.39.5