From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 12 May 2015 13:28:40 +0000 (+0200)
Subject: Fix regression introduced by SONAR-6535
X-Git-Tag: 5.2-RC1~1979
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fe9ef10d418a4ae443c3ef2f3a7178faa86c609f;p=sonarqube.git

Fix regression introduced by SONAR-6535
---

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
index 50c08020c06..b1abb181f22 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java
@@ -38,6 +38,7 @@ import org.sonar.batch.deprecated.ResourceFilters;
 import org.sonar.batch.deprecated.components.DefaultProjectClasspath;
 import org.sonar.batch.deprecated.components.DefaultTimeMachine;
 import org.sonar.batch.deprecated.perspectives.BatchPerspectives;
+import org.sonar.batch.events.EventBus;
 import org.sonar.batch.index.DefaultIndex;
 import org.sonar.batch.issue.IssuableFactory;
 import org.sonar.batch.issue.IssueFilters;
@@ -113,6 +114,7 @@ public class ModuleScanContainer extends ComponentContainer {
     module.setSettings(moduleSettings);
 
     add(
+      EventBus.class,
       Periods.class,
       PhaseExecutor.class,
       RuleFinderCompatibility.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 6406f75ab2c..982170b25d1 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
@@ -24,7 +24,6 @@ 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.core.platform.ComponentContainer;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.ResourceTypes;
@@ -84,6 +83,7 @@ import org.sonar.core.issue.IssueUpdater;
 import org.sonar.core.issue.workflow.FunctionExecutor;
 import org.sonar.core.issue.workflow.IssueWorkflow;
 import org.sonar.core.permission.PermissionFacade;
+import org.sonar.core.platform.ComponentContainer;
 import org.sonar.core.resource.DefaultResourcePermissions;
 import org.sonar.core.technicaldebt.DefaultTechnicalDebtModel;
 import org.sonar.core.test.TestPlanBuilder;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/events/EventHandler.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/events/EventHandler.java
index df63d940336..412593db9ad 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/events/EventHandler.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/events/EventHandler.java
@@ -21,7 +21,6 @@ package org.sonar.api.batch.events;
 
 import org.sonar.api.BatchSide;
 import org.sonar.api.ExtensionPoint;
-import org.sonar.api.batch.InstantiationStrategy;
 
 /**
  * Common interface for event handlers.
@@ -30,7 +29,6 @@ import org.sonar.api.batch.InstantiationStrategy;
  * @since 2.8
  */
 @BatchSide
-@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 @ExtensionPoint
 public interface EventHandler {