[FIXED HUDSON-5428] In Maven2 jobs, parsing POM is done *before* calling pre-build steps (using M2-extra-steps-plugin)

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@29609 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
vlatombe committed 2010-03-30 19:20:14 +00:00
1 parent 918a06d270
commit 67cc6af159
1 file changed
+2 -1
@@ -388,9 +388,9 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
"Either your server has no Maven installations defined, or the requested Maven version does not exist.");
mvn = mvn.forEnvironment(envVars).forNode(Computer.currentComputer().getNode(), listener);
parsePoms(listener, logger, envVars, mvn);
if(!project.isAggregatorStyleBuild()) {
parsePoms(listener, logger, envVars, mvn);
// start module builds
logger.println("Triggering "+project.getRootModule().getModuleName());
project.getRootModule().scheduleBuild(new UpstreamCause((Run<?,?>)MavenModuleSetBuild.this));
@@ -415,6 +415,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
if(!preBuild(listener, project.getPublishers()))
return Result.FAILURE;
parsePoms(listener, logger, envVars, mvn); // #5428 : do pre-build *before* parsing pom
SplittableBuildListener slistener = new SplittableBuildListener(listener);
proxies = new HashMap<ModuleName, ProxyImpl2>();
List<String> changedModules = new ArrayList<String>();