Merged revisions 32154-32155,32157 via svnmerge from

https://svn.dev.java.net/svn/hudson/branches/rc

........
  r32154 | kohsuke | 2010-06-18 20:38:45 -0700 (Fri, 18 Jun 2010) | 1 line
  
  fixed a bug in the logic of aggregating multiple dependency edges.
........
  r32155 | kohsuke | 2010-06-18 21:41:33 -0700 (Fri, 18 Jun 2010) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_363
........
  r32157 | kohsuke | 2010-06-18 21:41:47 -0700 (Fri, 18 Jun 2010) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32161 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
mode committed 2010-06-19 05:35:41 +00:00
1 parent 80d2bd2dc0
commit 6f1cdeda56
12 files changed
+31 -22

No files matched your search

@@ -401,10 +401,10 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
for (ModuleDependency d : dependencies) {
MavenModule src = modules.get(d);
if(src!=null) {
if(src.getParent().isAggregatorStyleBuild())
graph.addDependency(new DependencyGraph.Dependency(src.getParent(),dest));
else
graph.addDependency(new DependencyGraph.Dependency(src,dest));
DependencyGraph.Dependency dep = new DependencyGraph.Dependency(
src.getParent().isAggregatorStyleBuild() ? src.getParent() : src,dest);
if (!dep.pointsItself())
graph.addDependency(dep);
}
}
}