diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2010-11-17 09:26:07 +0000 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2010-11-17 09:26:07 +0000 |
| commit | 05608c417ad5afd6ec911ef5e9a8dad7c97fb047 (patch) | |
| tree | d6a65f3f73acdd3b8214b9c9d19626a7d8d64d9d | |
| parent | e9b2c1cd16b4fcefba90e8349cfb58f795d52a2d (diff) | |
| download | sonarqube-05608c417ad5afd6ec911ef5e9a8dad7c97fb047.tar.gz sonarqube-05608c417ad5afd6ec911ef5e9a8dad7c97fb047.zip | |
SONAR-1860 Support Maven 3 analysis
| -rw-r--r-- | subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml index 0e9b24c830d..0ff6e5c60f3 100644 --- a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml +++ b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml @@ -399,12 +399,10 @@ <sequential> <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn.bat" osfamily="Windows"> - <env key="M2_HOME" value="${mavenHome}"/> <arg line="-f @{pom}"/> <arg line="@{args}"/> </exec> <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn" osfamily="unix"> - <env key="M2_HOME" value="${mavenHome}"/> <arg line="-f @{pom}"/> <arg line="@{args} "/> </exec> @@ -418,8 +416,7 @@ <sequential> <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn.bat" osfamily="Windows"> - <env key="M2_HOME" value="${mavenHome}"/> - <arg line="org.codehaus.mojo:sonar-maven-plugin:1.0-beta-2:sonar @{args} -B -e"/> + <arg line="sonar:sonar @{args} -B -e"/> <arg line="-f @{pom}"/> <arg value='-Dsonar.jdbc.url="${jdbcUrl}"'/> <!-- double quotes for windows --> @@ -428,8 +425,7 @@ <arg value="-Dsonar.jdbc.password=${jdbcPassword}"/> </exec> <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn" osfamily="unix"> - <env key="M2_HOME" value="${mavenHome}"/> - <arg line="org.codehaus.mojo:sonar-maven-plugin:1.0-beta-2:sonar @{args} -B -e"/> + <arg line="sonar:sonar @{args} -B -e"/> <arg line="-f @{pom}"/> <arg value='-Dsonar.jdbc.url=${jdbcUrl}'/> <arg value="-Dsonar.jdbc.driver=${jdbcDriver}"/> @@ -449,12 +445,10 @@ <sequential> <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn.bat" osfamily="Windows"> - <env key="M2_HOME" value="${mavenHome}"/> <arg line="install:install-file -DgroupId=@{groupId} -DartifactId=@{artifactId} -Dversion=@{version} -Dpackaging=@{packaging} -Dfile=@{file}"/> </exec> <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn" osfamily="unix"> - <env key="M2_HOME" value="${mavenHome}"/> <arg line="install:install-file -DgroupId=@{groupId} -DartifactId=@{artifactId} -Dversion=@{version} -Dpackaging=@{packaging} -Dfile=@{file}"/> </exec> |