From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 25 Mar 2015 15:42:34 +0000 (+0100)
Subject: Fix conflict between sonar-core and sonar-testing-harness for the dependency json... 
X-Git-Tag: 5.2-RC1~2478
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fe13138cef996cfc0ade3252d0452442635f6f92;p=sonarqube.git

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.
---

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
@@ -80,6 +80,15 @@
       <groupId>org.codehaus.sonar</groupId>
       <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>