diff options
| author | Godin <mandrikov@gmail.com> | 2010-10-08 20:13:44 +0000 |
|---|---|---|
| committer | Godin <mandrikov@gmail.com> | 2010-10-08 20:13:44 +0000 |
| commit | 565f2a2cb1a16a8c7ea8addee09c5aaccd4b0160 (patch) | |
| tree | 78225b6504dd186602678845c9b26d0a62f862e7 /subprojects | |
| parent | dc56f0674777248623506770d30adcb9388e5b4c (diff) | |
| download | sonarqube-565f2a2cb1a16a8c7ea8addee09c5aaccd4b0160.tar.gz sonarqube-565f2a2cb1a16a8c7ea8addee09c5aaccd4b0160.zip | |
SONAR-1839: Should be possible to execute integration tests using Maven 3.0
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml | 12 | ||||
| -rw-r--r-- | subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml | 9 |
2 files changed, 15 insertions, 6 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 9114df8bcff..5709daeb7b6 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 @@ -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 2b74f4d76ad..01fa1ba7844 100644 --- 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> |