You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/05/30 18:04:08 UTC
svn commit: r661776 - in /maven/shared/trunk: maven-invoker/pom.xml
maven-runtime/pom.xml
Author: bentmann
Date: Fri May 30 09:04:08 2008
New Revision: 661776
URL: http://svn.apache.org/viewvc?rev=661776&view=rev
Log:
o Ensured Surefire passes maven.home to unit tests (for maven-invoker to work) regardless of Surefire version (SUREFIRE-121 vs SUREFIRE-491)
(Interestingly, the tests pass on Windows because the envvar M2_HOME leaks through to the forked tests, not sure how correct that is...)
Modified:
maven/shared/trunk/maven-invoker/pom.xml
maven/shared/trunk/maven-runtime/pom.xml
Modified: maven/shared/trunk/maven-invoker/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=661776&r1=661775&r2=661776&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/pom.xml (original)
+++ maven/shared/trunk/maven-invoker/pom.xml Fri May 30 09:04:08 2008
@@ -50,6 +50,13 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <systemProperties>
+ <!-- required for maven-invoker to locate Maven installation -->
+ <property>
+ <name>maven.home</name>
+ <value>${maven.home}</value>
+ </property>
+ </systemProperties>
<excludes>
<exclude>test-build-should*/**</exclude>
</excludes>
@@ -98,4 +105,4 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven-invoker</url>
</scm>
-</project>
\ No newline at end of file
+</project>
Modified: maven/shared/trunk/maven-runtime/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-runtime/pom.xml?rev=661776&r1=661775&r2=661776&view=diff
==============================================================================
--- maven/shared/trunk/maven-runtime/pom.xml (original)
+++ maven/shared/trunk/maven-runtime/pom.xml Fri May 30 09:04:08 2008
@@ -52,6 +52,18 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <!-- required for maven-invoker to locate Maven installation -->
+ <property>
+ <name>maven.home</name>
+ <value>${maven.home}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<version>1.3.2</version>