SONAR-1860 Support Maven 3 analysis

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 0e9b24c830d63095cbdfdbea3d47c91748945059..0ff6e5c60f36854ebe941815a82e447a0919f7cd 100644 (file)
--- 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>