From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Thu, 8 Nov 2012 13:45:03 +0000 (+0100)
Subject: SONAR-3895 fix dependency of ExtensionProviders on commons-conf
X-Git-Tag: 3.4~352
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fc25673aef437c6fb28b8edb6750a0b7ddfb7d7b;p=sonarqube.git

SONAR-3895 fix dependency of ExtensionProviders on commons-conf
---

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java
index 8e7a22c33ef..3f58c74ccdf 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ProjectModule.java
@@ -63,17 +63,21 @@ public class ProjectModule extends Module {
   }
 
   private void addCoreComponents() {
+    ProjectDefinition projectDefinition = container.getComponentByType(ProjectTree.class).getProjectDefinition(project);
+    container.addSingleton(projectDefinition);
+    container.addSingleton(project.getConfiguration());
+    container.addSingleton(project);
+    container.addSingleton(ProjectSettings.class);
+
+    // hack to initialize commons-configuration before ExtensionProviders
+    container.getComponentByType(ProjectSettings.class);
+
     container.addSingleton(EventBus.class);
     container.addSingleton(Phases.class);
     container.addSingleton(PhasesTimeProfiler.class);
     for (Class clazz : Phases.getPhaseClasses()) {
       container.addSingleton(clazz);
     }
-    ProjectDefinition projectDefinition = container.getComponentByType(ProjectTree.class).getProjectDefinition(project);
-    container.addSingleton(projectDefinition);
-    container.addSingleton(project.getConfiguration());
-    container.addSingleton(project);
-    container.addSingleton(ProjectSettings.class);
     container.addSingleton(UnsupportedProperties.class);
 
     for (Object component : projectDefinition.getContainerExtensions()) {