From 2b12abbda235507a20d69869952e985ff035e05d Mon Sep 17 00:00:00 2001 From: abayer Date: Mon, 12 Oct 2009 15:17:48 +0000 Subject: [PATCH] [FIXED HUDSON-4637] Added check for leading slash, backslash, or Windows drive string in Alternate Settings File textfield, to reinforce that this is, in fact, a relative path in the workspace. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@22659 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/maven/MavenModuleSet.java | 24 +++++++++++++++++++ .../MavenModuleSet/configure-entries.jelly | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 5696a296b2..f73b587c3a 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -34,6 +34,8 @@ import hudson.search.SearchIndexBuilder; import hudson.tasks.Maven.MavenInstallation; import hudson.tasks.*; import hudson.tasks.junit.JUnitResultArchiver; +import static hudson.Util.fixEmpty; +import static hudson.Util.fixEmptyAndTrim; import hudson.util.CopyOnWriteMap; import hudson.util.DescribableList; import hudson.util.Function1; @@ -701,6 +703,28 @@ public final class MavenModuleSet extends AbstractMavenProject