SONAR-6111 Drop ability to execute Maven plugin as part of the batch analysis

2 files changed, 1 insertions, 27 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 c1801298afc..ea8dac835fb 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
@@ -27,7 +27,6 @@ import org.sonar.batch.design.MavenDependenciesSensor;
 import org.sonar.batch.design.ProjectDsmDecorator;
 import org.sonar.batch.design.SubProjectDsmDecorator;
 import org.sonar.batch.issue.tracking.IssueTracking;
-import org.sonar.batch.maven.DefaultMavenPluginExecutor;
 import org.sonar.batch.maven.MavenProjectBootstrapper;
 import org.sonar.batch.maven.MavenProjectBuilder;
 import org.sonar.batch.maven.MavenProjectConverter;
@@ -57,7 +56,7 @@ public class BatchComponents {
   public static Collection all(DefaultAnalysisMode analysisMode) {
     List components = Lists.newArrayList(
       // Maven
-      MavenProjectBootstrapper.class, DefaultMavenPluginExecutor.class, MavenProjectConverter.class, MavenProjectBuilder.class,
+      MavenProjectBootstrapper.class, MavenProjectConverter.class, MavenProjectBuilder.class,
 
       // Design
       ProjectDsmDecorator.class,
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
index b9e3dd0a960..95f333fe93e 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchExtensionDictionnary.java
@@ -28,8 +28,6 @@ import org.sonar.api.batch.CheckProject;
 import org.sonar.api.batch.DependedUpon;
 import org.sonar.api.batch.DependsUpon;
 import org.sonar.api.batch.Phase;
-import org.sonar.api.batch.maven.DependsUponMavenPlugin;
-import org.sonar.api.batch.maven.MavenPluginHandler;
 import org.sonar.api.batch.sensor.Sensor;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.platform.ComponentContainer;
@@ -74,29 +72,6 @@ public class BatchExtensionDictionnary {
     return result;
   }
 
-  public Collection<MavenPluginHandler> selectMavenPluginHandlers(Project project) {
-    List<DependsUponMavenPlugin> selectedExtensions = Lists.newArrayList();
-    for (Object extension : getExtensions(null)) {
-      if (ClassUtils.isAssignable(extension.getClass(), DependsUponMavenPlugin.class)) {
-        selectedExtensions.add((DependsUponMavenPlugin) extension);
-      }
-    }
-    List<MavenPluginHandler> handlers = Lists.newArrayList();
-    for (DependsUponMavenPlugin extension : selectedExtensions) {
-      MavenPluginHandler handler = extension.getMavenPluginHandler(project);
-      if (handler != null) {
-        boolean ok = true;
-        if (handler instanceof CheckProject) {
-          ok = ((CheckProject) handler).shouldExecuteOnProject(project);
-        }
-        if (ok) {
-          handlers.add(handler);
-        }
-      }
-    }
-    return handlers;
-  }
-
   private Phase.Name evaluatePhase(Object extension) {
     Object extensionToEvaluate;
     if (extension instanceof SensorWrapper) {