From b8aec882f28bbbd889ebc1f4a761ed1310353040 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Wed, 20 Jul 2011 20:41:00 +0200 Subject: [PATCH] [FIXED JENKINS-10366] choose most 'relevant' job for dependency graph if multiple jobs are building the same maven module --- .../main/java/hudson/maven/MavenModule.java | 54 ++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index 00239ea90d..8229f38d9b 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -404,9 +404,11 @@ public final class MavenModule extends AbstractMavenProject relevancy2) { + return mm1; + } else if (relevancy2 > relevancy1) { + return mm2; + } + + // arbitrary, but reproduceable + if (mm1.getParent().getName().compareTo(mm2.getParent().getName()) < 0) { + return mm2; + } else { // should always mean > 0 as name is unique + return mm1; + } + } + + private int getDependencyRelevancy(MavenModule mm) { + + int relevancy = 0; + + for (String goal : Util.tokenize(mm.getGoals())) { + if ("deploy".equals(goal) || "deploy:deploy".equals(goal)) { + return 2; + } + + if ("install".equals(goal)) { + relevancy = 1; + } + } + + for (Publisher publisher : mm.getParent().getPublishers()) { + if (publisher instanceof RedeployPublisher) { + return 2; + } + } + + return relevancy; + } private static class MavenDependencyComputationData { boolean withUnknownVersions = false;