aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-colorizer
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-06-20 00:43:47 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-06-20 00:45:34 +0200
commit2f779df51e9da5b07ad6f837fe1c98eab9fbf439 (patch)
treed2be9202eb947ecb005c72368bbcb4f1b86e8e68 /sonar-colorizer
parent24ec2501f751dc2a122f1e5f905ee4151ec8b891 (diff)
downloadsonarqube-2f779df51e9da5b07ad6f837fe1c98eab9fbf439.tar.gz
sonarqube-2f779df51e9da5b07ad6f837fe1c98eab9fbf439.zip
Upgrade hamcrest and fix conflicts with JUnit and Mockito
Diffstat (limited to 'sonar-colorizer')
-rw-r--r--sonar-colorizer/pom.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/sonar-colorizer/pom.xml b/sonar-colorizer/pom.xml
index 9c1a7e277e7..c86f25fa88a 100644
--- a/sonar-colorizer/pom.xml
+++ b/sonar-colorizer/pom.xml
@@ -31,8 +31,10 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
+ <version>1.3</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert</artifactId>