diff options
author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-06-12 11:56:45 +0200 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-06-12 14:29:20 +0200 |
commit | ebf6040b060322040a35ab17cfddeed6e3c713c1 (patch) | |
tree | 38fa753cf51d44f4ce5d84bfda0fd3a512b4d042 | |
parent | e17cf1c2dc52256336c388c5dc4bde3087c13c1c (diff) | |
download | sonarqube-ebf6040b060322040a35ab17cfddeed6e3c713c1.tar.gz sonarqube-ebf6040b060322040a35ab17cfddeed6e3c713c1.zip |
SONAR-6642 drop internal maven plugins
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | sonar-maven-plugin/pom.xml | 52 | ||||
-rw-r--r-- | sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java | 54 | ||||
-rw-r--r-- | sonar-maven-plugin/src/test/java/org/sonar/maven/SonarMojoTest.java | 65 | ||||
-rw-r--r-- | sonar-maven3-plugin/pom.xml | 19 | ||||
-rwxr-xr-x | third-party-licenses.sh | 2 |
6 files changed, 1 insertions, 193 deletions
@@ -22,8 +22,6 @@ <module>sonar-duplications</module> <module>sonar-home</module> <module>sonar-markdown</module> - <module>sonar-maven-plugin</module> - <module>sonar-maven3-plugin</module> <module>sonar-plugin-api</module> <module>server</module> <module>sonar-testing-harness</module> diff --git a/sonar-maven-plugin/pom.xml b/sonar-maven-plugin/pom.xml deleted file mode 100644 index 95781fcdb63..00000000000 --- a/sonar-maven-plugin/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar</artifactId> - <version>5.2-SNAPSHOT</version> - </parent> - <artifactId>sonar-maven-plugin</artifactId> - <packaging>maven-plugin</packaging> - <name>SonarQube :: Maven2 Plugin</name> - - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>2.2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>2.2.0</version> - <scope>provided</scope> - </dependency> - - <!-- Test --> - <dependency> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-testing-harness</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>${skipBatchTests}</skipTests> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java b/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java deleted file mode 100644 index aab0a41369f..00000000000 --- a/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.maven; - -import org.apache.maven.artifact.versioning.ArtifactVersion; -import org.apache.maven.execution.RuntimeInformation; -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; - -/** - * @goal sonar - * @aggregator - */ -public final class SonarMojo extends AbstractMojo { - - /** - * @component - * @required - * @readonly - * @VisibleForTesting - */ - RuntimeInformation runtimeInformation; - - @Override - public void execute() throws MojoExecutionException { - ArtifactVersion mavenVersion = getMavenVersion(); - if (mavenVersion.getMajorVersion() < 3) { - throw new MojoExecutionException("Please use at least Maven 3.x to perform SonarQube analysis"); - } - throw new MojoExecutionException("Please update sonar-maven-plugin to at least version 2.3"); - } - - private ArtifactVersion getMavenVersion() { - return runtimeInformation.getApplicationVersion(); - } - -} diff --git a/sonar-maven-plugin/src/test/java/org/sonar/maven/SonarMojoTest.java b/sonar-maven-plugin/src/test/java/org/sonar/maven/SonarMojoTest.java deleted file mode 100644 index eb8cc4dd676..00000000000 --- a/sonar-maven-plugin/src/test/java/org/sonar/maven/SonarMojoTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * SonarQube is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.maven; - -import org.apache.maven.artifact.versioning.ArtifactVersion; -import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import org.apache.maven.execution.RuntimeInformation; -import org.apache.maven.plugin.MojoExecutionException; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; - -public class SonarMojoTest { - - @Rule - public ExpectedException thrown = ExpectedException.none(); - - @Test - public void testFailureWithMaven2() throws MojoExecutionException { - SonarMojo mojo = new SonarMojo(); - mojo.runtimeInformation = new RuntimeInformation() { - - @Override - public ArtifactVersion getApplicationVersion() { - return new DefaultArtifactVersion("2.2.1"); - } - }; - thrown.expect(MojoExecutionException.class); - thrown.expectMessage("Please use at least Maven 3.x to perform SonarQube analysis"); - mojo.execute(); - } - - @Test - public void testFailureWithMaven3() throws MojoExecutionException { - SonarMojo mojo = new SonarMojo(); - mojo.runtimeInformation = new RuntimeInformation() { - - @Override - public ArtifactVersion getApplicationVersion() { - return new DefaultArtifactVersion("3.0.5"); - } - }; - thrown.expect(MojoExecutionException.class); - thrown.expectMessage("Please update sonar-maven-plugin to at least version 2.3"); - mojo.execute(); - } - -} diff --git a/sonar-maven3-plugin/pom.xml b/sonar-maven3-plugin/pom.xml deleted file mode 100644 index fe3fca77dff..00000000000 --- a/sonar-maven3-plugin/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar</artifactId> - <version>5.2-SNAPSHOT</version> - </parent> - <artifactId>sonar-maven3-plugin</artifactId> - <packaging>pom</packaging> - <name>SonarQube :: Maven3 Plugin</name> - <!-- Since Sonar 3.7 there is no more difference between Maven 2 and Maven 3 so relocate to Maven 2 plugin to avoid duplication --> - <distributionManagement> - <relocation> - <artifactId>sonar-maven-plugin</artifactId> - </relocation> - </distributionManagement> - -</project> diff --git a/third-party-licenses.sh b/third-party-licenses.sh index de9ee91d656..2b827746ce6 100755 --- a/third-party-licenses.sh +++ b/third-party-licenses.sh @@ -1,2 +1,2 @@ #!/bin/sh -mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party -pl sonar-application,sonar-maven-plugin -am +mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party -pl sonar-application -am |