From a5d9528c8fddf0c1ce2fe98fd33750a952033641 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 1 Mar 2011 16:38:01 +0100 Subject: [PATCH] [FIXED JENKINS-8865] Environment variable not available for Maven build/POM parsing. --- .../main/java/hudson/maven/MavenModuleSetBuild.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 5a9615527e..17aeb3ac1a 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -54,6 +54,7 @@ import hudson.model.TaskListener; import hudson.remoting.Channel; import hudson.remoting.VirtualChannel; import hudson.scm.ChangeLogSet; +import hudson.slaves.NodeProperty; import hudson.tasks.BuildWrapper; import hudson.tasks.MailSender; import hudson.tasks.Maven.MavenInstallation; @@ -725,7 +726,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild poms; try { - poms = getModuleRoot().act(new PomParser(listener, mvn, project, mavenVersion)); + poms = getModuleRoot().act(new PomParser(listener, mvn, project, mavenVersion, envVars)); } catch (IOException e) { if (e.getCause() instanceof AbortException) throw (AbortException) e.getCause(); @@ -1046,7 +1047,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild entry : envVars.entrySet()) { + if (entry.getKey() != null && entry.getValue() != null) { + this.properties.put( "env." + entry.getKey(), entry.getValue() ); + } + } + } + this.nonRecursive = project.isNonRecursive(); this.workspaceProper = project.getLastBuild().getWorkspace().getRemote(); if (project.usesPrivateRepository()) {