diff options
| -rw-r--r-- | sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectBuildersExecutor.java | 6 | ||||
| -rw-r--r-- | sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java | 8 |
2 files changed, 1 insertions, 13 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectBuildersExecutor.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectBuildersExecutor.java index 11da05c7de6..9c5c70ef806 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectBuildersExecutor.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectBuildersExecutor.java @@ -49,12 +49,8 @@ public class ProjectBuildersExecutor { } public void execute(ProjectReactor reactor) { - executeProjectBuilders(projectBuilders, reactor, "Execute project builders"); - } - - public void executeProjectBuilders(ProjectBuilder[] projectBuilders, ProjectReactor reactor, String profilerMessage) { if (projectBuilders.length > 0) { - Profiler profiler = Profiler.create(LOG).startInfo(profilerMessage); + Profiler profiler = Profiler.create(LOG).startInfo("Execute project builders"); ProjectBuilderContext context = new ProjectBuilderContext(reactor, globalConfig); for (ProjectBuilder projectBuilder : projectBuilders) { diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java index 6ec3d025c8d..b70fde51660 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/SpringProjectScanContainer.java @@ -25,8 +25,6 @@ import javax.annotation.Priority; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.Plugin; -import org.sonar.api.batch.bootstrap.ProjectBuilder; -import org.sonar.api.batch.bootstrap.ProjectReactor; import org.sonar.api.batch.fs.internal.DefaultInputModule; import org.sonar.api.measures.Metrics; import org.sonar.api.resources.Languages; @@ -140,12 +138,6 @@ public class SpringProjectScanContainer extends SpringComponentContainer { protected void doAfterStart() { getParentComponentByType(ScannerMetrics.class).addPluginMetrics(getComponentsByType(Metrics.class)); getComponentByType(ProjectLock.class).tryLock(); - - // NOTE: ProjectBuilders executed here will have any changes they make to the ProjectReactor discarded. - ProjectBuilder[] phase2ProjectBuilders = getComponentsByType(ProjectBuilder.class).toArray(new ProjectBuilder[0]); - getComponentByType(ProjectBuildersExecutor.class).executeProjectBuilders(phase2ProjectBuilders, getComponentByType(ProjectReactor.class), - "Executing phase 2 project builders"); - getComponentByType(ProjectFileIndexer.class).index(); GlobalAnalysisMode analysisMode = getComponentByType(GlobalAnalysisMode.class); InputModuleHierarchy tree = getComponentByType(InputModuleHierarchy.class); |