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-testing-harness/pom.xml | |
| parent | 24ec2501f751dc2a122f1e5f905ee4151ec8b891 (diff) | |
| download | sonarqube-2f779df51e9da5b07ad6f837fe1c98eab9fbf439.tar.gz sonarqube-2f779df51e9da5b07ad6f837fe1c98eab9fbf439.zip | |
Upgrade hamcrest and fix conflicts with JUnit and Mockito
Diffstat (limited to 'sonar-testing-harness/pom.xml')
| -rw-r--r-- | sonar-testing-harness/pom.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml index 65d7a16745a..a3b68ab6bbe 100644 --- a/sonar-testing-harness/pom.xml +++ b/sonar-testing-harness/pom.xml @@ -17,10 +17,6 @@ <artifactId>fest-assert</artifactId> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - </dependency> - <dependency> <groupId>org.skyscreamer</groupId> <artifactId>jsonassert</artifactId> </dependency> @@ -33,6 +29,10 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + </dependency> + <dependency> <!-- used only for org.sonar.test.channel classes --> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-channel</artifactId> |