Removal of deprecated ProjectBootstrapper

4 files changed, 5 insertions, 28 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
index acf0515fbf5..4bf47a5b970 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
@@ -42,7 +42,7 @@ public class BatchComponents {
     // only static stuff
   }
 
-  public static Collection<Object> all(GlobalMode analysisMode) {
+  public static Collection<Object> all() {
     List<Object> components = Lists.newArrayList(
       DefaultResourceTypes.get(),
       // SCM
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
index aa4f22e4e1e..d70dd788f57 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
@@ -34,18 +34,16 @@ public class ExtensionInstaller {
 
   private final PluginRepository pluginRepository;
   private final EnvironmentInformation env;
-  private final GlobalMode globalMode;
 
-  public ExtensionInstaller(PluginRepository pluginRepository, EnvironmentInformation env, GlobalMode globalMode) {
+  public ExtensionInstaller(PluginRepository pluginRepository, EnvironmentInformation env) {
     this.pluginRepository = pluginRepository;
     this.env = env;
-    this.globalMode = globalMode;
   }
 
   public ExtensionInstaller install(ComponentContainer container, ExtensionMatcher matcher) {
 
     // core components
-    for (Object o : BatchComponents.all(globalMode)) {
+    for (Object o : BatchComponents.all()) {
       doInstall(container, matcher, null, o);
     }
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java b/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
index a77fab56223..3cd6d8ff142 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
@@ -22,38 +22,18 @@ package org.sonar.batch.scan;
 import org.apache.commons.io.FileUtils;
 import org.sonar.batch.analysis.AnalysisProperties;
 import org.picocontainer.injectors.ProviderAdapter;
-import org.sonar.api.batch.bootstrap.ProjectBootstrapper;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 
-import javax.annotation.Nullable;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 
 public class MutableProjectReactorProvider extends ProviderAdapter {
-
-  private final ProjectBootstrapper projectBootstrapper;
   private ProjectReactor reactor = null;
 
-  public MutableProjectReactorProvider(@Nullable ProjectBootstrapper projectBootstrapper) {
-    this.projectBootstrapper = projectBootstrapper;
-  }
-
   public ProjectReactor provide(ProjectReactorBuilder builder, AnalysisProperties settings) {
     if (reactor == null) {
-      // Look for a deprecated custom ProjectBootstrapper for old versions of SQ Runner
-      if (projectBootstrapper == null
-        // Starting from Maven plugin 2.3 then only DefaultProjectBootstrapper should be used.
-        || "true".equals(settings.property("sonar.mojoUseRunner"))) {
-        // Use default SonarRunner project bootstrapper
-        reactor = builder.execute();
-      } else {
-        reactor = projectBootstrapper.bootstrap();
-      }
-      if (reactor == null) {
-        throw new IllegalStateException(projectBootstrapper + " has returned null as ProjectReactor");
-      }
+      reactor = builder.execute();
       cleanDirectory(reactor.getRoot().getWorkDir());
     }
     return reactor;
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
index e31f14a104e..c8ddc3d869e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
@@ -34,7 +34,6 @@ import org.sonar.batch.issue.DefaultIssueCallback;
 import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.bootstrap.ProjectBootstrapper;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.Project;
@@ -131,7 +130,7 @@ public class ProjectScanContainer extends ComponentContainer {
       props,
       DefaultAnalysisMode.class,
       projectReactorBuilder(),
-      new MutableProjectReactorProvider(getComponentByType(ProjectBootstrapper.class)),
+      new MutableProjectReactorProvider(),
       new ImmutableProjectReactorProvider(),
       ProjectBuildersExecutor.class,
       ProjectLock.class,