You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by if...@apache.org on 2013/11/24 06:23:32 UTC
svn commit: r1544918 -
/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Author: ifedorenko
Date: Sun Nov 24 05:23:31 2013
New Revision: 1544918
URL: http://svn.apache.org/r1544918
Log:
Introduced forkMode=embedded to explicitly request embedded mode
Signed-off-by: Igor Fedorenko <ig...@ifedorenko.com>
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=1544918&r1=1544917&r2=1544918&view=diff
==============================================================================
--- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Sun Nov 24 05:23:31 2013
@@ -151,9 +151,7 @@ public class Verifier
this.basedir = basedir;
this.forkJvm = forkJvm;
- this.
-
- forkMode = System.getProperty( "verifier.forkMode" );
+ this.forkMode = System.getProperty( "verifier.forkMode" );
if ( !debug )
{
@@ -1344,42 +1342,48 @@ public class Verifier
}
}
- private MavenLauncher getMavenLauncher( Map<Object,Object> envVars )
+ private MavenLauncher getMavenLauncher( Map<Object, Object> envVars )
throws LauncherException
{
- boolean fork;
- if ( forkJvm != null )
- {
- fork = forkJvm;
- }
- else if ( envVars.isEmpty() && "auto".equalsIgnoreCase( forkMode ) )
- {
- fork = false;
+ boolean fork;
+ if ( forkJvm != null )
+ {
+ fork = forkJvm;
+ }
+ else if ( ( envVars.isEmpty() && "auto".equalsIgnoreCase( forkMode ) )
+ || "embedded".equalsIgnoreCase( forkMode ) )
+ {
+ fork = false;
- try
- {
- initEmbeddedLauncher();
- }
- catch ( Exception e )
- {
- fork = true;
- }
+ try
+ {
+ initEmbeddedLauncher();
}
- else
+ catch ( Exception e )
{
fork = true;
}
+ }
+ else
+ {
+ fork = true;
+ }
- if ( !fork )
- {
- initEmbeddedLauncher();
-
- return embeddedLauncher;
- }
- else
+ if ( !fork )
+ {
+ if ( !envVars.isEmpty() )
{
- return new ForkedLauncher( defaultMavenHome, envVars, debugJvm );
+ throw new LauncherException( "Environment variables are not supported in embedded runtime" );
}
+
+ initEmbeddedLauncher();
+
+ return embeddedLauncher;
+ }
+ else
+ {
+ return new ForkedLauncher( defaultMavenHome, envVars, debugJvm );
+ }
}
private void initEmbeddedLauncher()