diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 12374e5dc1..6ecb948d10 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -297,7 +297,7 @@ public class Maven extends Builder { String jvmOptions = env.expand(this.jvmOptions); if(jvmOptions!=null) - env.put("MAVEN_OPTS",jvmOptions); + env.put("MAVEN_OPTS",jvmOptions.replaceAll("[\t\r\n]+"," ")); } @Override diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index fc02a4b0b8..ae8b4ad6e0 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -622,10 +622,16 @@ public final class MavenModuleSet extends AbstractMavenProject0)) { - return mavenOpts; + return mavenOpts.replaceAll("[\t\r\n]+"," "); } else { - return DESCRIPTOR.getGlobalMavenOpts(); + String globalOpts = DESCRIPTOR.getGlobalMavenOpts(); + if (globalOpts!=null) { + return globalOpts.replaceAll("[\t\r\n]+"," "); + } + else { + return globalOpts; + } } } diff --git a/test/src/test/java/hudson/maven/MavenOptsTest.java b/test/src/test/java/hudson/maven/MavenOptsTest.java index d411bf7680..8958e8e980 100644 --- a/test/src/test/java/hudson/maven/MavenOptsTest.java +++ b/test/src/test/java/hudson/maven/MavenOptsTest.java @@ -8,6 +8,7 @@ import hudson.Launcher; import hudson.model.BuildListener; import hudson.model.Result; import hudson.util.NullStream; +import hudson.tasks.Maven.MavenInstallation; import java.io.IOException; import java.io.PrintWriter; @@ -83,4 +84,21 @@ public class MavenOptsTest extends HudsonTestCase { assertLogContains("[hudson.mavenOpt.test=foo]", m.getLastBuild()); } -} \ No newline at end of file + + @Bug(5651) + public void testNewlinesInOptsRemoved() throws Exception { + configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21); + MavenModuleSet m = createMavenProject(); + m.setScm(new ExtractResourceSCM(getClass().getResource("maven-surefire-unstable.zip"))); + m.setMavenOpts("-XX:MaxPermSize=512m\r\n-Xms128m\r\n-Xmx512m"); + m.setGoals("install"); + + assertBuildStatus(Result.UNSTABLE, m.scheduleBuild2(0).get()); + MavenModuleSetBuild pBuild = m.getLastBuild(); + + assertEquals("Parent build should have Result.UNSTABLE", Result.UNSTABLE, pBuild.getResult()); + + } + +} + diff --git a/test/src/test/resources/hudson/maven/maven-surefire-unstable.zip b/test/src/test/resources/hudson/maven/maven-surefire-unstable.zip new file mode 100644 index 0000000000..a0c2f9657f Binary files /dev/null and b/test/src/test/resources/hudson/maven/maven-surefire-unstable.zip differ