From 246eaf9162f670d34fd618a82cdd08b6b40d33d4 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 31 Aug 2007 00:20:52 +0000
Subject: [PATCH] fixed a bug in dependency handling with aggregator m2
 project.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@4554 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/maven/MavenModule.java     | 10 ++++++++--
 core/src/main/java/hudson/model/DependencyGraph.java |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/maven/MavenModule.java b/core/src/main/java/hudson/maven/MavenModule.java
index 822c0ec04d..aa8543d970 100644
--- a/core/src/main/java/hudson/maven/MavenModule.java
+++ b/core/src/main/java/hudson/maven/MavenModule.java
@@ -299,12 +299,18 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
             modules.put(m.getModuleName(),m);
         }
 
+        // if the build style is the aggregator build, define dependencies against project,
+        // not module.
         AbstractProject dest = getParent().isAggregatorStyleBuild() ? getParent() : this;
 
         for (ModuleName d : dependencies) {
             MavenModule src = modules.get(d);
-            if(src!=null)
-                graph.addDependency(src,dest);
+            if(src!=null) {
+                if(src.getParent().isAggregatorStyleBuild())
+                    graph.addDependency(src.getParent(),dest);
+                else
+                    graph.addDependency(src,dest);
+            }
         }
     }
 
diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java
index bb41b7f4ac..a4a31faa36 100644
--- a/core/src/main/java/hudson/model/DependencyGraph.java
+++ b/core/src/main/java/hudson/model/DependencyGraph.java
@@ -187,7 +187,8 @@ public final class DependencyGraph {
             set = new ArrayList<AbstractProject>();
             map.put(src,set);
         }
-        set.add(dst);
+        if(!set.contains(dst))
+            set.add(dst);
     }
 
     private Map<AbstractProject, List<AbstractProject>> finalize(Map<AbstractProject, List<AbstractProject>> m) {
-- 
GitLab