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 2010/05/27 12:31:10 UTC
svn commit: r948765 -
/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Author: bentmann
Date: Thu May 27 10:31:10 2010
New Revision: 948765
URL: http://svn.apache.org/viewvc?rev=948765&view=rev
Log:
o Disabled EMMA runtime controller to prevent port clashes during CI
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=948765&r1=948764&r2=948765&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 Thu May 27 10:31:10 2010
@@ -1370,7 +1370,7 @@ public class Verifier
public String getMavenVersion()
throws VerificationException
{
- MavenLauncher launcher = new ForkedLauncher( defaultMavenHome );
+ ForkedLauncher launcher = new ForkedLauncher( defaultMavenHome );
File logFile;
try
@@ -1384,7 +1384,9 @@ public class Verifier
try
{
- launcher.run( new String[] { "--version" }, null, logFile );
+ // disable EMMA runtime controller port allocation, should be harmless if EMMA is not used
+ Map envVars = Collections.singletonMap( "MAVEN_OPTS", "-Demma.rt.control=false" );
+ launcher.run( new String[] { "--version" }, envVars, null, logFile );
}
catch ( LauncherException e )
{