From 897cc3ef4c914fd852313be7f081767861b219b7 Mon Sep 17 00:00:00 2001
From: Eric Hartmann <hartmann.eric@gmail.com>
Date: Mon, 25 Jun 2018 14:34:56 +0200
Subject: [PATCH] SONAR-10890 Move OfficialDistribution to platform level 2

---
 .../server/platform/monitoring/WebSystemInfoModule.java      | 4 ----
 .../sonar/server/platform/platformlevel/PlatformLevel2.java  | 5 ++++-
 .../java/org/sonar/server/platform/web/WebPagesCache.java    | 1 +
 .../org/sonar/server/platform/web/WebPagesCacheTest.java     | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/WebSystemInfoModule.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/WebSystemInfoModule.java
index 662b3e2eb88..3e7c5504c17 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/WebSystemInfoModule.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/WebSystemInfoModule.java
@@ -21,7 +21,6 @@ package org.sonar.server.platform.monitoring;
 
 import org.sonar.process.systeminfo.JvmPropertiesSection;
 import org.sonar.process.systeminfo.JvmStateSection;
-import org.sonar.server.platform.OfficialDistribution;
 import org.sonar.server.platform.monitoring.cluster.AppNodesInfoLoaderImpl;
 import org.sonar.server.platform.monitoring.cluster.CeQueueGlobalSection;
 import org.sonar.server.platform.monitoring.cluster.GlobalInfoLoader;
@@ -53,7 +52,6 @@ public class WebSystemInfoModule {
       SettingsSection.class,
       StandaloneSystemSection.class,
 
-      OfficialDistribution.class,
       StandaloneSystemInfoWriter.class,
       InfoAction.class
     };
@@ -74,8 +72,6 @@ public class WebSystemInfoModule {
       PluginsSection.class,
       SettingsSection.class,
 
-      OfficialDistribution.class,
-
       ProcessInfoProvider.class,
       GlobalInfoLoader.class,
       AppNodesInfoLoaderImpl.class,
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 f1c5a27b053..d22ac542d01 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
@@ -29,6 +29,7 @@ import org.sonar.server.es.MigrationEsClientImpl;
 import org.sonar.server.l18n.ServerI18n;
 import org.sonar.server.platform.DatabaseServerCompatibility;
 import org.sonar.server.platform.DefaultServerUpgradeStatus;
+import org.sonar.server.platform.OfficialDistribution;
 import org.sonar.server.platform.StartupMetadataProvider;
 import org.sonar.server.platform.WebCoreExtensionsInstaller;
 import org.sonar.server.platform.db.CheckDatabaseCharsetAtStartup;
@@ -81,7 +82,9 @@ public class PlatformLevel2 extends PlatformLevel {
 
       // depends on plugins
       ServerI18n.class,
-      RuleI18nManager.class);
+      RuleI18nManager.class,
+
+      OfficialDistribution.class);
 
     // Migration state must be kept at level2 to survive moving in and then out of safe mode
     // ExecutorService must be kept at level2 because stopping it when stopping safe mode level causes error making SQ fail
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesCache.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesCache.java
index bbd8c6904d9..98a15d69c0e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesCache.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesCache.java
@@ -28,6 +28,7 @@ import java.util.Set;
 import javax.servlet.ServletContext;
 import org.apache.commons.io.IOUtils;
 import org.sonar.api.config.Configuration;
+import org.sonar.server.platform.OfficialDistribution;
 import org.sonar.server.platform.Platform;
 import org.sonar.server.platform.Platform.Status;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesCacheTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesCacheTest.java
index e77c823a9ee..2c2ca03f50f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesCacheTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesCacheTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.stubbing.Answer;
 import org.sonar.api.config.internal.MapSettings;
+import org.sonar.server.platform.OfficialDistribution;
 import org.sonar.server.platform.Platform;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-- 
2.39.5