From 51820c3b0133a73d8a78e899047e489d2fdf1b5b Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 25 Mar 2013 12:30:44 +0100
Subject: [PATCH] SONAR-4069 Restore Metrics as a BatchExtension to avoid
 compatibility issues with plugins

---
 .../main/java/org/sonar/batch/bootstrap/MetricProvider.java   | 4 ++--
 .../main/java/org/sonar/batch/bootstrap/TaskContainer.java    | 1 -
 .../src/main/java/org/sonar/api/measures/Metrics.java         | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
index bc8839f3b91..59e626ab417 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/MetricProvider.java
@@ -20,15 +20,15 @@
 package org.sonar.batch.bootstrap;
 
 import com.google.common.collect.Lists;
+import org.sonar.api.BatchComponent;
 import org.sonar.api.ExtensionProvider;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metrics;
-import org.sonar.api.task.TaskComponent;
 
 import java.util.List;
 
-public class MetricProvider extends ExtensionProvider implements TaskComponent {
+public class MetricProvider extends ExtensionProvider implements BatchComponent {
 
   private Metrics[] factories;
 
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 f898e874340..89073052f40 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskContainer.java
@@ -63,7 +63,6 @@ public class TaskContainer extends ComponentContainer {
     add(
         ResourceTypes.class,
         DefaultResourcePermissions.class,
-        MetricProvider.class,
         Tasks.class);
   }
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
index 7d000a2de1e..969c726d98d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metrics.java
@@ -19,14 +19,14 @@
  */
 package org.sonar.api.measures;
 
+import org.sonar.api.BatchExtension;
 import org.sonar.api.ServerExtension;
-import org.sonar.api.task.TaskExtension;
 
 import java.util.List;
 
 /**
  * @since 1.10
  */
-public interface Metrics extends TaskExtension, ServerExtension {
+public interface Metrics extends BatchExtension, ServerExtension {
   List<Metric> getMetrics();
 }
-- 
2.39.5