From 9ff0ac6cde4070f9906d05e080f7c5bc9306efe5 Mon Sep 17 00:00:00 2001 From: imod Date: Wed, 7 Nov 2012 21:51:21 +0100 Subject: [PATCH] simplify regex and use matcher.find() --- core/src/main/java/hudson/tasks/Maven.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index a4ccd91c04..e3a247c4c7 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -76,6 +76,7 @@ import java.util.Set; import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; +import java.util.regex.Pattern; /** * Build by using Maven. @@ -138,6 +139,9 @@ public class Maven extends Builder { private final static String MAVEN_1_INSTALLATION_COMMON_FILE = "bin/maven"; private final static String MAVEN_2_INSTALLATION_COMMON_FILE = "bin/mvn"; + + private static final Pattern S_PATTERN = Pattern.compile("(^| )-s "); + private static final Pattern GS_PATTERN = Pattern.compile("(^| )-gs "); public Maven(String targets,String name) { this(targets,name,null,null,null,false, null, null); @@ -286,13 +290,14 @@ public class Maven extends Builder { if(pom!=null) args.add("-f",pom); - if(!targets.matches("(.*)?(^-s | -s )(.*)?")) { // check the given target/goals do not contain settings parameter already + + if(!S_PATTERN.matcher(targets).find()){ // check the given target/goals do not contain settings parameter already String settingsPath = SettingsProvider.getSettingsRemotePath(getSettings(), build, listener); if(StringUtils.isNotBlank(settingsPath)){ args.add("-s", settingsPath); } } - if(!targets.matches("(.*)?(^-gs | -gs )(.*)?")) { + if(!GS_PATTERN.matcher(targets).find()){ String settingsPath = GlobalSettingsProvider.getSettingsRemotePath(getGlobalSettings(), build, listener); if(StringUtils.isNotBlank(settingsPath)){ args.add("-gs", settingsPath); -- GitLab