Move PastMeasureLoader as it is used by dev cockpit

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
index c29b5aa98bc1a0a0be8e67981720f6f549d32c00..17af5c5fcf011499d6f1119603e43c6ed4d1cdcd 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
@@ -28,6 +28,7 @@ import org.sonar.api.task.TaskComponent;
 import org.sonar.api.task.TaskDefinition;
 import org.sonar.api.utils.MessageException;
 import org.sonar.batch.bootstrapper.EnvironmentInformation;
+import org.sonar.batch.components.PastMeasuresLoader;
 import org.sonar.batch.scan.DeprecatedProjectReactorBuilder;
 import org.sonar.batch.scan.ProjectReactorBuilder;
 import org.sonar.batch.scan.ScanTask;
@@ -65,7 +66,9 @@ public class TaskContainer extends ComponentContainer {
   private void addCoreComponents() {
     // Metrics
     if (!getParent().getComponentByType(AnalysisMode.class).isSensorMode()) {
-      add(DeprecatedMetricFinder.class);
+      // Needed by dev cockpit task
+      add(DeprecatedMetricFinder.class,
+        PastMeasuresLoader.class);
     }
     add(DefaultMetricFinder.class);
 

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 e3fde9a8c0f6686a3d522d8ce7b2e42d0c936888..c5e21b89a66b6fba946c15c1c9a8089f93f86e91 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
@@ -39,7 +39,6 @@ import org.sonar.batch.bootstrap.ExtensionInstaller;
 import org.sonar.batch.bootstrap.ExtensionMatcher;
 import org.sonar.batch.bootstrap.ExtensionUtils;
 import org.sonar.batch.bootstrap.MetricProvider;
-import org.sonar.batch.components.PastMeasuresLoader;
 import org.sonar.batch.components.PeriodsDefinition;
 import org.sonar.batch.debt.DebtModelProvider;
 import org.sonar.batch.debt.IssueChangelogDebtCalculator;
@@ -190,7 +189,6 @@ public class ProjectScanContainer extends ComponentContainer {
 
       // Measures
       MeasureCache.class,
-      PastMeasuresLoader.class,
 
       // Rules
       new RulesProvider(),