diff --git a/cli/pom.xml b/cli/pom.xml
index 120dd2a42f..8253cb028d 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
pom
org.jvnet.hudson.main
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
cli
Hudson CLI
diff --git a/core/pom.xml b/core/pom.xml
index 742821700a..42ed2db141 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
../pom.xml
diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java
index f305f39f4f..aec95d2802 100644
--- a/core/src/main/java/hudson/model/DependencyGraph.java
+++ b/core/src/main/java/hudson/model/DependencyGraph.java
@@ -41,6 +41,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -276,14 +277,14 @@ public final class DependencyGraph implements Comparator {
for (ListIterator it = set.listIterator(); it.hasNext();) {
Dependency d = it.next();
// Check for existing edge that connects the same two projects:
- if (d.equals(dep)) {
+ if (d.getUpstreamProject()==dep.getUpstreamProject() && d.getDownstreamProject()==dep.getDownstreamProject()) {
+ if (d.equals(dep))
+ return; // identical with existing edge
+
if (d instanceof DependencyGroup)
((DependencyGroup)d).add(dep);
- else {
- DependencyGroup group = new DependencyGroup(d);
- group.add(dep);
- it.set(group);
- }
+ else
+ it.set(new DependencyGroup(d,dep));
return;
}
}
@@ -448,6 +449,13 @@ public final class DependencyGraph implements Comparator {
return true;
}
+ /**
+ * Does this method point to itself?
+ */
+ public boolean pointsItself() {
+ return upstream==downstream;
+ }
+
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
@@ -475,11 +483,12 @@ public final class DependencyGraph implements Comparator {
* Collect multiple dependencies between the same two projects.
*/
private static class DependencyGroup extends Dependency {
- private List group = new ArrayList();
+ private Set group = new LinkedHashSet();
- DependencyGroup(Dependency first) {
+ DependencyGroup(Dependency first, Dependency second) {
super(first.getUpstreamProject(), first.getDownstreamProject());
group.add(first);
+ group.add(second);
}
void add(Dependency next) {
diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml
index 1236cc59d3..58e95fd561 100644
--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
../pom.xml
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index f91bab2818..d73c496249 100644
--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
../pom.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 4b12a0aafa..d73acd1e4f 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
maven-plugin
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java
index 57dfd56829..e4dd9142bb 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java
@@ -401,10 +401,10 @@ public final class MavenModule extends AbstractMavenProjectorg.jvnet.hudson.main
pom
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
pom
Hudson main module
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 343e3c6b05..0cd3e4b28f 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
../pom.xml
diff --git a/test/pom.xml b/test/pom.xml
index caea11b55f..6a4dbaf74b 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
pom
org.jvnet.hudson.main
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
4.0.0
org.jvnet.hudson.main
diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml
index 409063f0c5..025c69d8ff 100644
--- a/ui-samples-plugin/pom.xml
+++ b/ui-samples-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
ui-samples-plugin
diff --git a/war/pom.xml b/war/pom.xml
index 1efd1bf4a0..bd8ce51268 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.363-SNAPSHOT
+ 1.364-SNAPSHOT
../pom.xml