2 files changed, 5 insertions, 4 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 29807361e1a..9df02c89559 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
@@ -19,18 +19,19 @@
  */
 package org.sonar.batch.bootstrap;
 
-import org.sonar.api.task.TaskExtension;
-
 import com.google.common.collect.Lists;
 import org.slf4j.LoggerFactory;
+import org.sonar.api.BatchExtension;
 import org.sonar.api.ExtensionProvider;
+import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metrics;
 
 import java.util.List;
 
-public class MetricProvider extends ExtensionProvider implements TaskExtension {
+@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
+public class MetricProvider extends ExtensionProvider implements BatchExtension {
 
   private Metrics[] factories;
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskModule.java
index 6c7073d6127..d93ec527849 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskModule.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/TaskModule.java
@@ -83,11 +83,11 @@ public class TaskModule extends Module {
     logSettings();
     registerCoreComponents();
     registerDatabaseComponents();
-    registerTaskExtensions();
     registerCoreTasks();
     if (projectPresent) {
       registerCoreComponentsRequiringProject();
     }
+    registerTaskExtensions();
   }
 
   private void registerCoreComponents() {