diff --git a/core/src/main/java/hudson/maven/MavenModule.java b/core/src/main/java/hudson/maven/MavenModule.java index e83c774e1b..40c3d6c67b 100644 --- a/core/src/main/java/hudson/maven/MavenModule.java +++ b/core/src/main/java/hudson/maven/MavenModule.java @@ -53,6 +53,16 @@ public final class MavenModule extends AbstractProject i /*package*/ MavenModule(MavenModuleSet parent, PomInfo pom) { super(parent, pom.name.toFileSystemName()); + reconfigure(pom); + } + + /** + * Called to update the module with the new POM. + *

+ * This method is invoked on {@link MavenModule} that has the matching + * {@link ModuleName}. + */ + /*package*/ final void reconfigure(PomInfo pom) { this.displayName = pom.displayName; this.relativePath = pom.relativePath; this.dependencies = pom.dependencies; @@ -142,4 +152,14 @@ public final class MavenModule extends AbstractProject i // dependency setting might have been changed by the user, so rebuild. Hudson.getInstance().rebuildDependencyGraph(); } + + /** + * Marks this build as disabled. + */ + public void disable() throws IOException { + if(!disabled) { + disabled = true; + save(); + } + } } diff --git a/core/src/main/java/hudson/maven/MavenModuleSet.java b/core/src/main/java/hudson/maven/MavenModuleSet.java index 0d5ef651fd..feab6eb215 100644 --- a/core/src/main/java/hudson/maven/MavenModuleSet.java +++ b/core/src/main/java/hudson/maven/MavenModuleSet.java @@ -263,12 +263,26 @@ public class MavenModuleSet extends AbstractItem implements TopLevelItem, ItemGr }); synchronized(modules) { + Map old = new HashMap(modules); + modules.clear(); for (PomInfo pom : poms) { - MavenModule mm = new MavenModule(this,pom); + MavenModule mm = old.get(pom.name); + if(mm!=null) {// found an existing matching module + mm.reconfigure(pom); + modules.put(pom.name,mm); + } else {// this looks like a new module + mm = new MavenModule(this,pom); + modules.put(mm.getModuleName(),mm); + } mm.save(); - modules.put(mm.getModuleName(),mm); } + + // remaining modules are no longer active. + old.keySet().removeAll(modules.keySet()); + for (MavenModule om : old.values()) + om.disable(); + modules.putAll(old); } Hudson.getInstance().rebuildDependencyGraph();