From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 16 Jun 2016 07:23:27 +0000 (+0200)
Subject: Disable Clirr check
X-Git-Tag: 6.0-RC1~303
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d30b7dc59af98c4dbd30703ee12458db51a5b9f8;p=sonarqube.git

Disable Clirr check

As it's incompatible with Java 8
---

diff --git a/pom.xml b/pom.xml
index 794d325883a..29f44382abb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,12 +236,6 @@
           <artifactId>sonar-packaging-maven-plugin</artifactId>
           <version>1.15</version>
         </plugin>
-        <plugin>
-          <!-- declared to avoid enforcer error during SQ analysis when Clirr plugin installed -->
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>clirr-maven-plugin</artifactId>
-          <version>2.6.1</version>
-        </plugin>
         <plugin>
           <groupId>org.owasp</groupId>
           <artifactId>dependency-check-maven</artifactId>
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index 7e810e4bb44..56dd08afbb6 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -13,10 +13,6 @@
 
   <name>SonarQube :: Plugin API</name>
 
-  <properties>
-    <sonar.clirr.reportPath>${project.build.directory}/clirr-report.txt</sonar.clirr.reportPath>
-  </properties>
-
   <dependencies>
 
     <!--
@@ -225,41 +221,4 @@
     </resources>
   </build>
 
-  <profiles>
-    <profile>
-      <id>clirr</id>
-      <activation>
-        <property>
-          <name>clirr</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>clirr-maven-plugin</artifactId>
-            <configuration>
-              <comparisonVersion>5.6</comparisonVersion>
-              <textOutputFile>${project.build.directory}/clirr-report.txt</textOutputFile>
-              <linkXRef>false</linkXRef>
-              <failOnError>false</failOnError>
-              <excludes>
-                <exclude>**/internal/**</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <id>clirr</id>
-                <goals>
-                  <goal>check-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/travis.sh b/travis.sh
index 4d7066acec2..24d670091d6 100755
--- a/travis.sh
+++ b/travis.sh
@@ -58,7 +58,6 @@ CI)
 
     export MAVEN_OPTS="-Xmx1G -Xms128m"
     mvn org.jacoco:jacoco-maven-plugin:prepare-agent verify sonar:sonar \
-        -Dclirr=true \
         -Dsonar.analysis.mode=issues \
         -Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST \
         -Dsonar.github.repository=$TRAVIS_REPO_SLUG \