[FIXED JENKINS-10367] Maven modules which are not buildable should be…

… excluded from the dependency graph Originally-Committed-As: 4d8d95b5172387a0f73c61e68eb9aced65da7d7c
jenkinsci · Jul 25, 2011 · 592a67d · 592a67d
1 parent b1c79d1
commit 592a67d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/hudson/maven/MavenModule.java b/src/main/java/hudson/maven/MavenModule.java
@@ -389,7 +389,7 @@ protected void updateTransientActions() {
     }
 
     protected void buildDependencyGraph(DependencyGraph graph) {
-        if(isDisabled() || getParent().ignoreUpstremChanges())        return;
+        if(!isBuildable() || getParent().ignoreUpstremChanges())        return;
 
         MavenDependencyComputationData data = graph.getComputationalData(MavenDependencyComputationData.class);
 
@@ -404,7 +404,7 @@ protected void buildDependencyGraph(DependencyGraph graph) {
             Map<ModuleDependency,MavenModule> modules = new HashMap<ModuleDependency,MavenModule>();
 
             for (MavenModule m : Jenkins.getInstance().getAllItems(MavenModule.class)) {
-                if(m.isDisabled())  continue;
+                if(!m.isBuildable())  continue;
                 ModuleDependency moduleDependency = m.asDependency();
                 MavenModule old = modules.get(moduleDependency);
                 MavenModule relevant = chooseMoreRelevantModule(old, m, moduleDependency);