SONAR-4843 fix installation of bundled plugins on restart

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
index 55754132be7dd5bd1faca70b4927a445750a2c33..4b208704a7ea82055ebd31d30d6fd6ab8aed1ae7 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -234,7 +234,6 @@ class ServerComponents {
       EmbeddedDatabaseFactory.class,
       DefaultDatabase.class,
       MyBatis.class,
-      DefaultServerUpgradeStatus.class,
       DatabaseServerCompatibility.class,
       DatabaseMigrator.class,
       DatabaseVersion.class,
@@ -257,6 +256,7 @@ class ServerComponents {
    */
   Collection level2Components() {
     return Lists.newArrayList(
+      DefaultServerUpgradeStatus.class,
       // plugins
       ServerPluginJarsInstaller.class,
       ServerPluginJarInstaller.class,