aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-03-16 14:09:09 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-03-16 14:11:50 +0100
commit008f29b5613739b2da1db8596bc92f103eca427e (patch)
treec1338a75f0bb7e6b0c7b8f22e572d203aa512b00
parente07370f93a4d30fc0fdb4584ea40c1a81ba8ad51 (diff)
downloadsonarqube-008f29b5613739b2da1db8596bc92f103eca427e.tar.gz
sonarqube-008f29b5613739b2da1db8596bc92f103eca427e.zip
Add script find-classpath-conflicts.sh
-rw-r--r--find-classpath-conflicts.sh7
-rw-r--r--pom.xml22
-rwxr-xr-xrun.sh22
3 files changed, 28 insertions, 23 deletions
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