[FIXED HUDSON-5651] Removing excess whitespace from MAVEN_OPTS

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@27559 71c3de6d-444a-0410-be80-ed276b4c234a

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

maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java

@@ -622,10 +622,16 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
      */
     public String getMavenOpts() {
         if ((mavenOpts!=null) && (mavenOpts.trim().length()>0)) { 
-            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;
+            }
         }
     }
 

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());
+	
+    }
+
+}
+