mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-22 00:05:31 +00:00
[FIXED JENKINS-7535] building up the dependency graph for maven jobs
takes too long
This commit is contained in:
1 parent
a2e597b3ee
commit
6a5330fd93
3 files changed
+76
-25
No files matched your search
@@ -384,35 +384,52 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
|
||||
protected void buildDependencyGraph(DependencyGraph graph) {
|
||||
if(isDisabled() || getParent().ignoreUpstremChanges()) return;
|
||||
|
||||
Map<ModuleDependency,MavenModule> modules = new HashMap<ModuleDependency,MavenModule>();
|
||||
|
||||
// when we load old data that doesn't record version in dependency, we'd like
|
||||
// to emulate the old behavior that it tries to identify the upstream by ignoring the version.
|
||||
// do this by always putting groupId:artifactId:UNKNOWN to the modules list.
|
||||
|
||||
for (MavenModule m : Hudson.getInstance().getAllItems(MavenModule.class)) {
|
||||
if(m.isDisabled()) continue;
|
||||
ModuleDependency moduleDependency = m.asDependency();
|
||||
modules.put(moduleDependency,m);
|
||||
modules.put(moduleDependency.withUnknownVersion(),m);
|
||||
MavenDependencyComputationData data = graph.getComputationalData(MavenDependencyComputationData.class);
|
||||
|
||||
if (data == null) {
|
||||
Map<ModuleDependency,MavenModule> modules = new HashMap<ModuleDependency,MavenModule>();
|
||||
|
||||
// when we load old data that doesn't record version in dependency, we'd like
|
||||
// to emulate the old behavior that it tries to identify the upstream by ignoring the version.
|
||||
// do this by always putting groupId:artifactId:UNKNOWN to the modules list.
|
||||
|
||||
for (MavenModule m : Hudson.getInstance().getAllItems(MavenModule.class)) {
|
||||
if(m.isDisabled()) continue;
|
||||
ModuleDependency moduleDependency = m.asDependency();
|
||||
modules.put(moduleDependency,m);
|
||||
modules.put(moduleDependency.withUnknownVersion(),m);
|
||||
}
|
||||
data = new MavenDependencyComputationData(modules);
|
||||
graph.putComputationalData(MavenDependencyComputationData.class, data);
|
||||
}
|
||||
|
||||
// in case two modules with the same name is defined, modules in the same MavenModuleSet
|
||||
// takes precedence.
|
||||
|
||||
for (MavenModule m : getParent().getModules()) {
|
||||
if(m.isDisabled()) continue;
|
||||
ModuleDependency moduleDependency = m.asDependency();
|
||||
modules.put(moduleDependency,m);
|
||||
modules.put(moduleDependency.withUnknownVersion(),m);
|
||||
// in case two modules with the same name are defined, modules in the same MavenModuleSet
|
||||
// take precedence.
|
||||
Map<ModuleDependency,MavenModule> myParentsModules = data.modulesPerParent.get(getParent());
|
||||
|
||||
if (myParentsModules == null) {
|
||||
myParentsModules =new HashMap<ModuleDependency, MavenModule>();
|
||||
|
||||
for (MavenModule m : getParent().getModules()) {
|
||||
if(m.isDisabled()) continue;
|
||||
ModuleDependency moduleDependency = m.asDependency();
|
||||
myParentsModules.put(moduleDependency,m);
|
||||
myParentsModules.put(moduleDependency.withUnknownVersion(),m);
|
||||
}
|
||||
|
||||
data.modulesPerParent.put(getParent(), myParentsModules);
|
||||
}
|
||||
|
||||
// if the build style is the aggregator build, define dependencies against project,
|
||||
// not module.
|
||||
AbstractProject dest = getParent().isAggregatorStyleBuild() ? getParent() : this;
|
||||
AbstractProject<?, ?> dest = getParent().isAggregatorStyleBuild() ? getParent() : this;
|
||||
|
||||
for (ModuleDependency d : dependencies) {
|
||||
MavenModule src = modules.get(d);
|
||||
MavenModule src = myParentsModules.get(d);
|
||||
if (src==null) {
|
||||
src = data.allModules.get(d);
|
||||
}
|
||||
|
||||
if(src!=null) {
|
||||
DependencyGraph.Dependency dep = new MavenModuleDependency(
|
||||
src.getParent().isAggregatorStyleBuild() ? src.getParent() : src,dest);
|
||||
@@ -421,6 +438,17 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static class MavenDependencyComputationData {
|
||||
Map<ModuleDependency,MavenModule> allModules;
|
||||
|
||||
Map<MavenModuleSet, Map<ModuleDependency,MavenModule>> modulesPerParent = new HashMap<MavenModuleSet, Map<ModuleDependency,MavenModule>>();
|
||||
|
||||
public MavenDependencyComputationData(
|
||||
Map<ModuleDependency, MavenModule> modules) {
|
||||
this.allModules = modules;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addTransientActionsFromBuild(MavenBuild build, List<Action> collection, Set<Class> added) {
|
||||
|
||||
Reference in new issue
Block a user