diff options
author | Julien HENRY <julien.henry@sonarsource.com> | 2013-06-17 10:34:10 +0200 |
---|---|---|
committer | Julien HENRY <julien.henry@sonarsource.com> | 2013-06-19 13:49:11 +0200 |
commit | a52fbd8cd565f58464635906c54db7db87b3be77 (patch) | |
tree | 4bdbb503b519d17d179082b9e3bcc5041dc0684c /sonar-maven3-plugin/pom.xml | |
parent | 759ac46aaf07593fc0dca30466a440df5cd830c7 (diff) | |
download | sonarqube-a52fbd8cd565f58464635906c54db7db87b3be77.tar.gz sonarqube-a52fbd8cd565f58464635906c54db7db87b3be77.zip |
SONAR-3979, SONAR-4047 Fix Sonar Maven goal to support Maven 3.1
* now use Sonar Runner embedded to run Sonar
* also updated Maven plugins to make Sonar build pass with Maven 3.1
Diffstat (limited to 'sonar-maven3-plugin/pom.xml')
-rw-r--r-- | sonar-maven3-plugin/pom.xml | 58 |
1 files changed, 8 insertions, 50 deletions
diff --git a/sonar-maven3-plugin/pom.xml b/sonar-maven3-plugin/pom.xml index 2e5cf98cd49..18dd0a9c87e 100644 --- a/sonar-maven3-plugin/pom.xml +++ b/sonar-maven3-plugin/pom.xml @@ -7,55 +7,13 @@ <version>3.7-SNAPSHOT</version> </parent> <artifactId>sonar-maven3-plugin</artifactId> - <packaging>maven-plugin</packaging> + <packaging>pom</packaging> <name>Sonar :: Maven3 Plugin</name> - - <properties> - <maven.version>3.0</maven.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-batch</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> + <!-- 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> |