diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-06-16 09:23:27 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-06-16 09:23:27 +0200 |
| commit | d30b7dc59af98c4dbd30703ee12458db51a5b9f8 (patch) | |
| tree | 4b812d34666466a014bae0b5b908962aafdd8c07 | |
| parent | 5e3dfec6ae098a1396ab537a990c2be4e6927b47 (diff) | |
| download | sonarqube-d30b7dc59af98c4dbd30703ee12458db51a5b9f8.tar.gz sonarqube-d30b7dc59af98c4dbd30703ee12458db51a5b9f8.zip | |
Disable Clirr check
As it's incompatible with Java 8
| -rw-r--r-- | pom.xml | 6 | ||||
| -rw-r--r-- | sonar-plugin-api/pom.xml | 41 | ||||
| -rwxr-xr-x | travis.sh | 1 |
3 files changed, 0 insertions, 48 deletions
@@ -237,12 +237,6 @@ <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> <version>1.2.11</version> 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 \ |