From 37183f4c868e8f4b4c0779809dbe27f2d9846351 Mon Sep 17 00:00:00 2001 From: abayer Date: Tue, 16 Feb 2010 15:40:20 +0000 Subject: [PATCH] [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 | 2 +- .../java/hudson/maven/MavenModuleSet.java | 10 +++++++-- .../test/java/hudson/maven/MavenOptsTest.java | 20 +++++++++++++++++- .../hudson/maven/maven-surefire-unstable.zip | Bin 0 -> 2459 bytes 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 test/src/test/resources/hudson/maven/maven-surefire-unstable.zip 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 0000000000000000000000000000000000000000..a0c2f9657f6d31943d9a365ff777e3a3a6ac6f1b GIT binary patch literal 2459 zcmWIWW@Zs#U|`^2ur&{`(URMcyOWWD;SVzd13QBZLqUG7UPW$BXb2|*bLplk@1q;4 zyh|&%85mh!09AmA-r&=Hw+uw?o)1^JqFXj2F;MZkP`B4w7G|Nvf#oMk^$z+Zx!19* zTJ=B9p2;HE?Umm1JH_$G&6iw##c`+aoUiWL=^qc?D(fpeY&D@{YmYpGX6(bWRjuhO z9FAIOK2KL(_v-S?7C-;M?-3%wf0DP}`E{htx5Z?dC*R}tizm|0_%4~=Wvo5rPk-6s zevyeYN;b!C)V^?YO7g4d32svZ_BWaBv+8B#kSlNu$$Wb2z3SK03mYdVTs%0{&GU+Z z;zZWuz{gqIHA+I0vYYfJ6=!E^f9r|n-+SQd1_g`9O-KBH9@A3Pu1c}{&E~w}wff9O zNtts4;@-q^l68i|lPl|8Qut)%ij-}L z<4J%0rR!l+V9CrMoV9M34>B3%?8s_lGv@TWpDAS{qkj1BktfTAOYgUB+4}j|%*k^UjI#7Z{Rdv}T%VTgc`N;1xq9jS zuzx%&KmBJq7(OF=#=2=vOn<*fr?iK4UtfQI_t$5sztwvtJ8cj9k*8muHPc>vO3cx{ zYv=ja+tmKx4gkhH7ck}-7z|5!ticQ@!2*o=;-X}IaJ2K9H+x};cHFu-p}I>_i%ZBf zf)Ck?$Yte`9i`y8N`Fx!_zxaBI*A0QJ zX_fbm&s^ZSE^xMv_WD-c)B1-v%xYuIql2ISW-?hQvLV%I+yC5+C$DqO6; zxg_lS4sEBtl;ScE>r)CrVhR1hEZd4r8ck16Z8&!6(Y!~OZa?B&_kY0-zrfz#f5qQk z{h~Li`|-AiKQj&8Kfd&ttr&dUo<*qPh;`Sb+b$?9AG!tSepJKz;KCT*CI9{Rrl4a9^J3z-KrD0yn5Q=OZ=(4H&Whp z?pmg3vP0rMbDZMOpDNpTEZ%W<@8t_|PkR)PF@90(_}71?OLgACvk_CG&r4YDyn0V< zMT+q&Ci$uJkCmrw-jev(jO%!u)K$Y8-NT}<_Fb@k`-L^Yn~_P58CQKF0WLp)*@aN2U^VmF$`A`1Tl<(L4e_{<1e6@kOB#45~x5T!6Z%wWRom_85v{}G!jWS zjt|ASYGmV}sf@6hn8g&b6AxpUiEu2aXu;}tTtyagln4N;Y`EXSjs+WxR)7JWkJA?H zafKSf)hrNOpm~>YXkg}C