diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-11-23 22:01:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-23 22:01:21 +0100 |
| commit | 4eb8c7f8657ebe5544fcd2283145d175713ab567 (patch) | |
| tree | dd9e4078d15e052578874234bbb3761e20a448e4 /sonar-testing-harness | |
| parent | e02d9d4a80eeb4f5cff53dd057e86df2c48d4f7e (diff) | |
| download | sonarqube-4eb8c7f8657ebe5544fcd2283145d175713ab567.tar.gz sonarqube-4eb8c7f8657ebe5544fcd2283145d175713ab567.zip | |
Support build of SonarQube with JDK 9
Diffstat (limited to 'sonar-testing-harness')
3 files changed, 10 insertions, 7 deletions
diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml index 1bfe094460e..d340723c1e9 100644 --- a/sonar-testing-harness/pom.xml +++ b/sonar-testing-harness/pom.xml @@ -24,6 +24,10 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> @@ -35,11 +39,6 @@ </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedMatcherTest.java b/sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedMatcherTest.java index 26dcd8690e1..562b0cccc38 100644 --- a/sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedMatcherTest.java +++ b/sonar-testing-harness/src/test/java/org/sonar/test/i18n/BundleSynchronizedMatcherTest.java @@ -32,7 +32,11 @@ import java.io.InputStream; import java.util.SortedMap; import static junit.framework.TestCase.fail; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.*; public class BundleSynchronizedMatcherTest { diff --git a/sonar-testing-harness/src/test/java/org/sonar/test/i18n/I18nMatchersTest.java b/sonar-testing-harness/src/test/java/org/sonar/test/i18n/I18nMatchersTest.java index 149abda8f30..5ea1701bbbb 100644 --- a/sonar-testing-harness/src/test/java/org/sonar/test/i18n/I18nMatchersTest.java +++ b/sonar-testing-harness/src/test/java/org/sonar/test/i18n/I18nMatchersTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import java.io.File; -import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; |