diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-06-20 00:43:47 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-06-20 00:45:34 +0200 |
| commit | 2f779df51e9da5b07ad6f837fe1c98eab9fbf439 (patch) | |
| tree | d2be9202eb947ecb005c72368bbcb4f1b86e8e68 /sonar-deprecated | |
| parent | 24ec2501f751dc2a122f1e5f905ee4151ec8b891 (diff) | |
| download | sonarqube-2f779df51e9da5b07ad6f837fe1c98eab9fbf439.tar.gz sonarqube-2f779df51e9da5b07ad6f837fe1c98eab9fbf439.zip | |
Upgrade hamcrest and fix conflicts with JUnit and Mockito
Diffstat (limited to 'sonar-deprecated')
3 files changed, 8 insertions, 3 deletions
diff --git a/sonar-deprecated/pom.xml b/sonar-deprecated/pom.xml index 09672a84961..3559279cd70 100644 --- a/sonar-deprecated/pom.xml +++ b/sonar-deprecated/pom.xml @@ -31,6 +31,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-plugin-api</artifactId> <type>test-jar</type> @@ -40,7 +45,7 @@ <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java b/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java index b4155c39a72..8d8c7b66f80 100644 --- a/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java +++ b/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java @@ -21,7 +21,7 @@ package org.sonar.api.resources; import org.junit.Test; -import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; public class MethodTest { diff --git a/sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java b/sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java index 8573d4c834c..60b63e84de1 100644 --- a/sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java +++ b/sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java @@ -35,7 +35,7 @@ import org.sonar.api.utils.CoberturaReportParserUtils.FileResolver; import java.io.File; import java.net.URISyntaxException; -import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.is; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.argThat; |