]> source.dussan.org Git - sonarqube.git/commitdiff
Disable Clirr check
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 16 Jun 2016 07:23:27 +0000 (09:23 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 16 Jun 2016 07:23:27 +0000 (09:23 +0200)
As it's incompatible with Java 8

pom.xml
sonar-plugin-api/pom.xml
travis.sh

diff --git a/pom.xml b/pom.xml
index 794d325883aa75e782c0452267bef665a3c39661..29f44382abb89f2f250ebcd507c07b452733349b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
           <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>
index 7e810e4bb449a2daaf89ffc3ed7b3ff49ae7a2bf..56dd08afbb6f8272c4733cc4dd5b23d9a74ef292 100644 (file)
 
   <name>SonarQube :: Plugin API</name>
 
-  <properties>
-    <sonar.clirr.reportPath>${project.build.directory}/clirr-report.txt</sonar.clirr.reportPath>
-  </properties>
-
   <dependencies>
 
     <!--
     </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>
index 4d7066acec2201ebd56e845e788f9bdf408af574..24d670091d63a8c33d55df105ad2df676508be33 100755 (executable)
--- 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 \