aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGodin <mandrikov@gmail.com>2010-10-11 13:30:57 +0000
committerGodin <mandrikov@gmail.com>2010-10-11 13:30:57 +0000
commitf561c79fce592354824d1db303a22fe4cd3a0277 (patch)
treed6ead6bb28e860391ae62c53854bbad7b94ac10b
parentbac939973be188f45344833b9da3118c59de496f (diff)
downloadsonarqube-f561c79fce592354824d1db303a22fe4cd3a0277.tar.gz
sonarqube-f561c79fce592354824d1db303a22fe4cd3a0277.zip
Fix for SONAR-1848
-rw-r--r--subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml6
1 files changed, 6 insertions, 0 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 5709daeb7b6..f5b33e23db8 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
@@ -393,10 +393,12 @@
<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>
@@ -410,6 +412,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="-f @{pom}"/>
<arg value='-Dsonar.jdbc.url="${jdbcUrl}"'/>
@@ -419,6 +422,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="-f @{pom}"/>
<arg value='-Dsonar.jdbc.url=${jdbcUrl}'/>
@@ -439,10 +443,12 @@
<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>