diff --git a/changelog.html b/changelog.html index 152586f673..401e51f572 100644 --- a/changelog.html +++ b/changelog.html @@ -63,6 +63,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 +