Author: mfriedenhagen
Date: Wed Mar 25 21:18:36 2015
New Revision: 1669230
URL: http://svn.apache.org/r1669230
Log:
Add a solution for running
org.apache.maven.shared.release.exec.InvokerMavenExecutorTest.
The Maven shell scripts do not export M2_HOME correctly. The system property
maven.home
is not inherited by default in surefire. Directly setting maven.home here does
not work
because a lot of the tests are checking M2_HOME.
So introduce a system property injectedMavenHome in surefire which is picked up
by
InvokerMavenExecutorTest lateron to determine maven.home.
Modified:
maven/release/trunk/maven-release-manager/pom.xml
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1669230&r1=1669229&r2=1669230&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Wed Mar 25 21:18:36 2015
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -213,6 +213,7 @@
<argLine>-Xmx256m</argLine>
<systemPropertyVariables>
<settings.security>${project.build.testOutputDirectory}/settings-security.xml</settings.security>
+ <injectedMavenHome>${maven.home}</injectedMavenHome>
</systemPropertyVariables>
</configuration>
</plugin>
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java?rev=1669230&r1=1669229&r2=1669230&view=diff
==============================================================================
---
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
(original)
+++
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
Wed Mar 25 21:18:36 2015
@@ -117,6 +117,7 @@ public class InvokerMavenExecutorTest
ReleaseEnvironment releaseEnvironment = new
DefaultReleaseEnvironment();
releaseEnvironment.setSettings( settings );
+ releaseEnvironment.setMavenHome( new File( System.getProperty(
"injectedMavenHome" ) ) );
InvokerMavenExecutor executorSpy = spy( executor );
SettingsXpp3Writer settingsWriter = mock( SettingsXpp3Writer.class );
