Fix conflict between sonar-core and sonar-testing-harness for the dependency json...

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 bc6768f29a93632fb021a7a6f2305042e147c07a..78e7f995a1e9a9cee174f9271289ad97eb1ce467 100644 (file)
--- 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>