Upgrade hamcrest and fix conflicts with JUnit and Mockito

6 files changed, 12 insertions, 6 deletions

diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 4340d3dc57d..1c8ffbf1eab 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -193,13 +193,18 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.easytesting</groupId>
       <artifactId>fest-assert</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sonar-application/src/test/java/org/sonar/application/ConfigurationUtilsTest.java b/sonar-application/src/test/java/org/sonar/application/ConfigurationUtilsTest.java
index 29a722b9fad..133505a51c7 100644
--- a/sonar-application/src/test/java/org/sonar/application/ConfigurationUtilsTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/ConfigurationUtilsTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import java.util.Map;
 import java.util.Properties;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 public class ConfigurationUtilsTest {
diff --git a/sonar-application/src/test/java/org/sonar/application/EncryptionTest.java b/sonar-application/src/test/java/org/sonar/application/EncryptionTest.java
index 85b3c568a35..80bc4f1d819 100644
--- a/sonar-application/src/test/java/org/sonar/application/EncryptionTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/EncryptionTest.java
@@ -22,7 +22,7 @@ package org.sonar.application;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 public class EncryptionTest {
diff --git a/sonar-application/src/test/java/org/sonar/application/LoggingTest.java b/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
index 1e5743daa33..1ff7b194d56 100644
--- a/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
@@ -33,6 +33,7 @@ import org.mockito.Mockito;
 import org.slf4j.Logger;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Properties;
 
 import static org.mockito.Matchers.argThat;
@@ -47,7 +48,7 @@ public class LoggingTest {
   public TemporaryFolder temp = new TemporaryFolder();
 
   @Before
-  public void setHome() {
+  public void setHome() throws IOException {
     File homeDir = temp.newFolder("home");
     System.setProperty("SONAR_HOME", homeDir.getAbsolutePath());
   }
diff --git a/sonar-application/src/test/java/org/sonar/application/StartServerTest.java b/sonar-application/src/test/java/org/sonar/application/StartServerTest.java
index 56de4ab9a3d..33bdd787db5 100644
--- a/sonar-application/src/test/java/org/sonar/application/StartServerTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/StartServerTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
-import java.io.IOException;
 
 import static org.fest.assertions.Assertions.assertThat;
 import static org.fest.assertions.Fail.fail;
diff --git a/sonar-application/src/test/java/org/sonar/application/WebappTest.java b/sonar-application/src/test/java/org/sonar/application/WebappTest.java
index dc7d605cc68..ccfe6d3fb52 100644
--- a/sonar-application/src/test/java/org/sonar/application/WebappTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/WebappTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Properties;
 
 import static org.fest.assertions.Assertions.assertThat;
@@ -44,7 +45,7 @@ public class WebappTest {
   private Env env;
 
   @Before
-  public void initEnv() {
+  public void initEnv() throws IOException {
     env = mock(Env.class);
     File sonarHome = temp.newFolder("home");
     when(env.rootDir()).thenReturn(sonarHome);