From 32902b2c0732ded0cdd1f12b70ec31b3a679104f Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 12 Jan 2011 22:22:59 +0100 Subject: [PATCH] [HUDSON-8484] nonRecursive option is not honored anymore when parsing pom --- .../hudson/maven/MavenModuleSetBuild.java | 35 +++++++++++-------- .../java/hudson/maven/Maven3BuildTest.java | 13 +++++++ .../hudson/maven/MavenMultiModuleTest.java | 12 +++++++ 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index b98f11f0fb..c819991209 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -877,7 +877,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild projects = rm.getSortedProjects(); Set buildingProjects = new HashSet(); for (MavenProject p : projects) { @@ -1146,7 +1145,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild mps = new ArrayList(0); if (maven3OrLater) { - mps = embedder.readProjects( pom,true ); + mps = embedder.readProjects( pom,!this.nonRecursive ); } else { // http://issues.hudson-ci.org/browse/HUDSON-8390 @@ -1156,7 +1155,9 @@ public class MavenModuleSetBuild extends AbstractMavenBuild canonicalPaths = new HashMap( mps.size() ); for(MavenProject mp : mps) { @@ -1215,18 +1216,24 @@ public class MavenModuleSetBuild extends AbstractMavenBuild