From cc479e9a44200f13001074d58903e6f2baa5253d Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Thu, 6 Oct 2016 10:29:03 +0000
Subject: Revert "Fix Mockito/Hamcrest build classpath conflict"

The change broke junit tests in projects using vaadin-bom.

This reverts commit 2ae14ad9affca86448ac1003280b7852354d8a6b.

Change-Id: I06524be9b6cc95e84f5f2b5c8faeb705d86e06bd
---
 client/pom.xml |  5 -----
 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>
diff --git a/pom.xml b/pom.xml
index f25f81fbaf..0092f32b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
-- 
cgit v1.2.3