From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 6 Sep 2016 12:28:28 +0000 (+0200)
Subject: Fix DB upgrade form
X-Git-Tag: 6.1-RC1~201
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=001815f2b1e16369d1151c62aacc8b28f2077ba3;p=sonarqube.git

Fix DB upgrade form
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java
index e93c580fdf2..19fa44aac74 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel2.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.platform.platformlevel;
 
+import org.sonar.api.utils.Durations;
 import org.sonar.core.i18n.DefaultI18n;
 import org.sonar.core.i18n.RuleI18nManager;
 import org.sonar.core.platform.PluginClassloaderFactory;
@@ -38,6 +39,7 @@ import org.sonar.server.plugins.ServerPluginJarExploder;
 import org.sonar.server.plugins.ServerPluginRepository;
 import org.sonar.server.plugins.WebServerExtensionInstaller;
 import org.sonar.server.ruby.PlatformRubyBridge;
+import org.sonar.server.ui.JRubyI18n;
 
 public class PlatformLevel2 extends PlatformLevel {
   public PlatformLevel2(PlatformLevel parent) {
@@ -50,6 +52,8 @@ public class PlatformLevel2 extends PlatformLevel {
       new StartupMetadataProvider(),
       ServerImpl.class,
       DefaultServerUpgradeStatus.class,
+      Durations.class,
+      JRubyI18n.class,
 
       // depends on Ruby
       PlatformRubyBridge.class,
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java
index 30ddf76a312..c3486905b8e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel3.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.platform.platformlevel;
 
-import org.sonar.api.utils.Durations;
 import org.sonar.api.utils.UriReader;
 import org.sonar.server.platform.ServerIdGenerator;
 import org.sonar.server.platform.ServerIdLoader;
@@ -27,7 +26,6 @@ import org.sonar.server.platform.StartupMetadataPersister;
 import org.sonar.server.setting.DatabaseSettingLoader;
 import org.sonar.server.setting.DatabaseSettingsEnabler;
 import org.sonar.server.startup.LogServerId;
-import org.sonar.server.ui.JRubyI18n;
 
 public class PlatformLevel3 extends PlatformLevel {
   public PlatformLevel3(PlatformLevel parent) {
@@ -40,8 +38,6 @@ public class PlatformLevel3 extends PlatformLevel {
     add(
       DatabaseSettingLoader.class,
       DatabaseSettingsEnabler.class,
-      Durations.class,
-      JRubyI18n.class,
       UriReader.class,
       ServerIdLoader.class,
       ServerIdGenerator.class,