You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2014/03/03 13:15:54 UTC
svn commit: r1573536 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
Author: stephenc
Date: Mon Mar 3 12:15:54 2014
New Revision: 1573536
URL: http://svn.apache.org/r1573536
Log:
Tests were only passing if you have the (deprecated) M2_HOME environment variable set
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=1573536&r1=1573535&r2=1573536&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java Mon Mar 3 12:15:54 2014
@@ -330,8 +330,27 @@ public class InvokerMavenExecutor
InvocationOutputHandler handler = getOutputHandler();
InvokerLogger bridge = getInvokerLogger();
+ File mavenPath = null;
+ // if null we use the current one
+ if ( releaseEnvironment.getMavenHome() != null )
+ {
+ mavenPath = releaseEnvironment.getMavenHome();
+ }
+ else
+ {
+ String mavenHome = System.getProperty( "maven.home" );
+ if ( mavenHome == null )
+ {
+ mavenHome = System.getenv("MAVEN_HOME");
+ }
+ if ( mavenHome == null )
+ {
+ mavenHome = System.getenv("M2_HOME");
+ }
+ mavenPath = mavenHome == null ? null : new File( mavenHome );
+ }
Invoker invoker =
- new DefaultInvoker().setMavenHome( releaseEnvironment.getMavenHome() ).setLogger( bridge ).setOutputHandler(
+ new DefaultInvoker().setMavenHome( mavenPath ).setLogger( bridge ).setOutputHandler(
handler ).setErrorHandler( handler );
InvocationRequest req =