From 2f779df51e9da5b07ad6f837fe1c98eab9fbf439 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 20 Jun 2014 00:43:47 +0200
Subject: Upgrade hamcrest and fix conflicts with JUnit and Mockito

---
 sonar-maven-plugin/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'sonar-maven-plugin')

diff --git a/sonar-maven-plugin/pom.xml b/sonar-maven-plugin/pom.xml
index a3f47bf7844..b21a1c3e169 100644
--- a/sonar-maven-plugin/pom.xml
+++ b/sonar-maven-plugin/pom.xml
@@ -41,9 +41,14 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-- 
cgit v1.2.3