From 4e8775fc2c53a4fe4409a8b79c3bdd7eaa0274c0 Mon Sep 17 00:00:00 2001 From: IanKemp Date: Tue, 22 May 2012 13:15:28 +0200 Subject: [PATCH] Fixes JENKINS-13822: expand variables in "Root POM" field of Maven plugin --- .../src/main/java/hudson/maven/MavenModuleSet.java | 14 ++++++++------ .../java/hudson/maven/MavenModuleSetBuild.java | 5 ++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 3d70ee0ccd..1d9f40d688 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -799,10 +799,10 @@ public class MavenModuleSet extends AbstractMavenProject activities = new HashSet(); activities.addAll(super.getResourceActivities()); - activities.addAll(Util.filter(publishers,ResourceActivity.class)); + activities.addAll(Util.filter(publishers, ResourceActivity.class)); activities.addAll(Util.filter(buildWrappers, ResourceActivity.class)); - activities.addAll(Util.filter(prebuilders,ResourceActivity.class)); - activities.addAll(Util.filter(postbuilders,ResourceActivity.class)); + activities.addAll(Util.filter(prebuilders, ResourceActivity.class)); + activities.addAll(Util.filter(postbuilders, ResourceActivity.class)); return activities; } @@ -810,9 +810,11 @@ public class MavenModuleSet extends AbstractMavenProjectpom.xml relative to the workspace root. */ - public String getRootPOM() { - if(rootPOM==null) return "pom.xml"; - return rootPOM; + public String getRootPOM(EnvVars env) { + if (rootPOM == null) return "pom.xml"; + // JENKINS-13822 + if (env == null) return rootPOM; + return env.expand(rootPOM); } public void setRootPOM(String rootPOM) { diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index e21c798eee..aa67b61d7e 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -688,7 +688,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild