aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-03-25 16:42:34 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-03-25 16:42:34 +0100
commitfe13138cef996cfc0ade3252d0452442635f6f92 (patch)
tree608804a3ebe6e0db2ccc9de4da2968175492e7f6 /server/sonar-server
parentd1f5fafa49554f2a194ac63242b7ceb6d52bd5ff (diff)
downloadsonarqube-fe13138cef996cfc0ade3252d0452442635f6f92.tar.gz
sonarqube-fe13138cef996cfc0ade3252d0452442635f6f92.zip
Fix conflict between sonar-core and sonar-testing-harness for the dependency json-simple.
I don't have any explanation for this strange maven behavior.
Diffstat (limited to 'server/sonar-server')
-rw-r--r--server/sonar-server/pom.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index bc6768f29a9..78e7f995a1e 100644
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -81,6 +81,15 @@
<artifactId>sonar-core</artifactId>
</dependency>
<dependency>
+ <!--
+ This dependency of sonar-core must be repeated, even if it's not directly
+ used by sonar-server. For an unknown reason it conflicts with sonar-testing-harness
+ and is removed from distribution.
+ -->
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-batch-protocol</artifactId>
</dependency>