From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 16 Mar 2015 13:09:09 +0000 (+0100)
Subject: Add script find-classpath-conflicts.sh
X-Git-Tag: 5.2-RC1~2573
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=008f29b5613739b2da1db8596bc92f103eca427e;p=sonarqube.git

Add script find-classpath-conflicts.sh
---

diff --git a/find-classpath-conflicts.sh b/find-classpath-conflicts.sh
new file mode 100644
index 00000000000..866de0e65b4
--- /dev/null
+++ b/find-classpath-conflicts.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Search for duplication of classes in classpath
+# This check can not be automated in build yet as current
+# conflicts must be fixed.
+
+mvn org.basepom.maven:duplicate-finder-maven-plugin:check
diff --git a/pom.xml b/pom.xml
index b52201d8516..d9f2c1cb172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,7 +297,27 @@
             <suppressionFile>cve-false-positives.xml</suppressionFile>
           </configuration>
         </plugin>
-
+        <plugin>
+          <!--
+          Detection of conflicts in classpath.
+          Command line is: mvn org.basepom.maven:duplicate-finder-maven-plugin:check
+          See https://github.com/basepom/duplicate-finder-maven-plugin
+          -->
+          <groupId>org.basepom.maven</groupId>
+          <artifactId>duplicate-finder-maven-plugin</artifactId>
+          <version>1.1.0</version>
+          <configuration>
+            <printEqualFiles>true</printEqualFiles>
+            <!--
+            <failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>
+            <failBuildInCaseOfEqualContentConflict>true</failBuildInCaseOfEqualContentConflict>
+            <failBuildInCaseOfConflict>true</failBuildInCaseOfConflict>
+            -->
+            <checkCompileClasspath>true</checkCompileClasspath>
+            <checkRuntimeClasspath>true</checkRuntimeClasspath>
+            <checkTestClasspath>false</checkTestClasspath>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
 
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 6ea64a19f02..00000000000
--- a/run.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  OS='macosx-universal-64'
-else
-  OS='linux-x86-64'
-fi
-
-if ! ls sonar-application/target/sonarqube-*.zip &> /dev/null; then
-  echo 'Sources are not built'
-  ./build.sh
-fi
-
-cd sonar-application/target/
-if ! ls sonarqube-*/bin/$OS/sonar.sh &> /dev/null; then
-  unzip sonarqube-*.zip
-fi
-cd sonarqube-*
-bin/$OS/sonar.sh restart
-echo "sonar.search.http.port=9200" >>  conf/sonar.properties
-sleep 1
-tail -100f logs/sonar.log