SONAR-1839: Should be possible to execute integration tests using Maven 3.0

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 9114df8bcffb29186109bc167ee64aa6914e0cf8..5709daeb7b6e8e079bd012b3828c310cf5c730af 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
@@ -392,11 +392,11 @@
     <attribute name="args" default=""/>
 
     <sequential>
-      <exec failonerror="@{failonerror}" executable="${maven.home}/bin/mvn.bat" osfamily="Windows">
+      <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn.bat" osfamily="Windows">
         <arg line="-f @{pom}"/>
         <arg line="@{args}"/>
       </exec>
-      <exec failonerror="@{failonerror}" executable="${maven.home}/bin/mvn" osfamily="unix">
+      <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn" osfamily="unix">
         <arg line="-f @{pom}"/>
         <arg line="@{args} "/>
       </exec>
@@ -409,7 +409,7 @@
     <attribute name="pom"/>
 
     <sequential>
-      <exec failonerror="@{failonerror}" executable="${maven.home}/bin/mvn.bat" osfamily="Windows">
+      <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn.bat" osfamily="Windows">
         <arg line="org.codehaus.mojo:sonar-maven-plugin:1.0-beta-2:sonar @{args} -B -e"/>
         <arg line="-f @{pom}"/>
         <arg value='-Dsonar.jdbc.url="${jdbcUrl}"'/>
@@ -418,7 +418,7 @@
         <arg value="-Dsonar.jdbc.username=${jdbcUsername}"/>
         <arg value="-Dsonar.jdbc.password=${jdbcPassword}"/>
       </exec>
-      <exec failonerror="@{failonerror}" executable="${maven.home}/bin/mvn" osfamily="unix">
+      <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn" osfamily="unix">
         <arg line="org.codehaus.mojo:sonar-maven-plugin:1.0-beta-2:sonar @{args} -B -e"/>
         <arg line="-f @{pom}"/>
         <arg value='-Dsonar.jdbc.url=${jdbcUrl}'/>
@@ -438,11 +438,11 @@
     <attribute name="file"/>
 
     <sequential>
-      <exec failonerror="@{failonerror}" executable="${maven.home}/bin/mvn.bat" osfamily="Windows">
+      <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn.bat" osfamily="Windows">
         <arg
             line="install:install-file -DgroupId=@{groupId} -DartifactId=@{artifactId} -Dversion=@{version} -Dpackaging=@{packaging} -Dfile=@{file}"/>
       </exec>
-      <exec failonerror="@{failonerror}" executable="${maven.home}/bin/mvn" osfamily="unix">
+      <exec failonerror="@{failonerror}" executable="${mavenHome}/bin/mvn" osfamily="unix">
         <arg
             line="install:install-file -DgroupId=@{groupId} -DartifactId=@{artifactId} -Dversion=@{version} -Dpackaging=@{packaging} -Dfile=@{file}"/>
       </exec>

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml
index 2b74f4d76add56aa116561ec1093a65700158520..01fa1ba78442fbe0f5d2d83e037c582e9518caf9 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml
+++ b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml
@@ -383,6 +383,15 @@
           <type>java.lang.File</type>
           <defaultValue>${basedir}</defaultValue>
         </parameter>
+        <parameter>
+          <name>mavenHome</name>
+          <description>Maven home directory.</description>
+          <property>mavenHome</property>
+          <required>true</required>
+          <expression>${sonar.mavenHome}</expression>
+          <type>java.lang.File</type>
+          <defaultValue>${maven.home}</defaultValue>
+        </parameter>
       </parameters>
     </mojo>