Upgrade hamcrest and fix conflicts with JUnit and Mockito

2 files changed, 5 insertions, 3 deletions

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java
index 6e279661bd3..7631b6b9b85 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/config/AesCipherTest.java
@@ -34,7 +34,9 @@ import java.security.InvalidKeyException;
 import java.security.Key;
 
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.Is.isA;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
@@ -94,7 +96,7 @@ public class AesCipherTest {
       fail();
 
     } catch (RuntimeException e) {
-      assertThat(e.getCause(), is(InvalidKeyException.class));
+      assertThat(e.getCause(), instanceOf(InvalidKeyException.class));
     }
   }
 
@@ -109,7 +111,7 @@ public class AesCipherTest {
       fail();
 
     } catch (RuntimeException e) {
-      assertThat(e.getCause(), is(BadPaddingException.class));
+      assertThat(e.getCause(), instanceOf(BadPaddingException.class));
     }
   }
 
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/config/EncryptionTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/config/EncryptionTest.java
index 6473578f6ae..265a7cc4f2d 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/config/EncryptionTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/config/EncryptionTest.java
@@ -21,7 +21,7 @@ package org.sonar.api.config;
 
 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 {