From c222acecaf0fe67d48711b9c298a85569b0a00fa Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Sun, 2 Dec 2012 18:14:10 +0100 Subject: [PATCH] [JENKINS-1295] Disable trigger downstream for maven jobs --- changelog.html | 3 +++ .../src/main/java/hudson/maven/MavenModule.java | 2 +- .../main/java/hudson/maven/MavenModuleSet.java | 15 +++++++++++++++ .../maven/MavenModuleSet/configure-entries.jelly | 4 ++++ .../configure-entries_fr.properties | 3 ++- 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index 8e474f6378..1d3d402471 100644 --- a/changelog.html +++ b/changelog.html @@ -60,6 +60,9 @@ Upcoming changes
  • WARNING: Caught exception evaluating: descriptor.getHelpFile(attrs.field). Reason: java.lang.NullPointerException. (issue 15940) +
  • + Allows to disable triggering of downstream jobs (for a maven job) + (issue 1295) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index fe6f380044..190a44ae9e 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -488,7 +488,7 @@ public class MavenModule extends AbstractMavenProject im src = data.allModules.get(winner); } - if(src!=null) { + if(src!=null && !src.getParent().isDisableTriggerDownstreamProjects()) { DependencyGraph.Dependency dep = new MavenModuleDependency(nodeOf(src),nodeOf(this)); if (!dep.pointsItself()) graph.addDependency(dep); diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 69be88b259..c9d4b1c2cb 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -265,6 +265,12 @@ public class MavenModuleSet extends AbstractMavenProject +