Merge pull request #799 from imod/JENKINS-17555

Originally-Committed-As: 7e1fc28c8892244e39ab0cdf7078ab632d939e23
jenkinsci · Sep 28, 2013 · 509e9ad · 509e9ad
2 parents 6efd5ea + ff2c294
commit 509e9ad
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/java/hudson/maven/MavenModuleSetBuild.java b/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -40,6 +40,7 @@
 import hudson.model.Action;
 import hudson.model.Build;
 import hudson.model.BuildListener;
+import hudson.model.EnvironmentContributingAction;
 import hudson.model.Cause.UpstreamCause;
 import hudson.model.Computer;
 import hudson.model.Environment;
@@ -634,6 +635,12 @@ protected Result doRun(final BuildListener listener) throws Exception {
                             }
                             buildEnvironments.add(e);
                             e.buildEnvVars(envVars); // #3502: too late for getEnvironment to do this
+                            Collection<? extends Action> actionsFromWrapper = w.getProjectActions(project);
+                            for (Action action : actionsFromWrapper) {
+                                if(action instanceof EnvironmentContributingAction){ // #17555
+                                    ((EnvironmentContributingAction) action).buildEnvVars(MavenModuleSetBuild.this, envVars);
+                                }
+                            }                            
                         }
 
                     	// run pre build steps