mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 14:02:22 +00:00
perform macro expansion.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@4908 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
024f517287
commit
b4c07c63a6
1 file changed
+3
-1
@@ -123,9 +123,12 @@ public class Maven extends Builder {
|
||||
endIndex = targets.length();
|
||||
}
|
||||
|
||||
Map<String,String> env = build.getEnvVars();
|
||||
|
||||
String normalizedTarget = targets
|
||||
.substring(startIndex, endIndex)
|
||||
.replaceAll("[\t\r\n]+"," ");
|
||||
normalizedTarget = Util.replaceMacro(normalizedTarget,env);
|
||||
|
||||
ArgumentListBuilder args = new ArgumentListBuilder();
|
||||
MavenInstallation ai = getMaven();
|
||||
@@ -143,7 +146,6 @@ public class Maven extends Builder {
|
||||
args.addKeyValuePairs("-D",build.getBuildVariables());
|
||||
args.addTokenized(normalizedTarget);
|
||||
|
||||
Map<String,String> env = build.getEnvVars();
|
||||
if(ai!=null) {
|
||||
// if somebody has use M2_HOME they will get a classloading error
|
||||
// when M2_HOME points to a different version of Maven2 from
|
||||
|
||||
Reference in new issue
Block a user