From 2212889ad505b5f5dc516fd60de41b61fa05364c Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Wed, 22 Nov 2017 10:43:17 +0100 Subject: [PATCH] LICENSE-85 Add OfficialDistribution to the pico of the compute engine --- .../java/org/sonar/ce/container/ComputeEngineContainerImpl.java | 2 ++ .../org/sonar/ce/container/ComputeEngineContainerImplTest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index 0964c3cfe22..9bcaaad2909 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -128,6 +128,7 @@ import org.sonar.server.platform.WebServerImpl; import org.sonar.server.platform.db.migration.MigrationConfigurationModule; import org.sonar.server.platform.db.migration.version.DatabaseVersion; import org.sonar.server.platform.monitoring.DbSection; +import org.sonar.server.platform.monitoring.OfficialDistribution; import org.sonar.server.platform.monitoring.cluster.ProcessInfoProvider; import org.sonar.server.plugins.InstalledPluginReferentialFactory; import org.sonar.server.plugins.ServerExtensionInstaller; @@ -416,6 +417,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { CeTaskCommonsModule.class, ProjectAnalysisTaskModule.class, CeTaskProcessorModule.class, + OfficialDistribution.class, InternalPropertiesImpl.class, ProjectConfigurationFactory.class, diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index dbb3ee1eafe..8c94f57d8e8 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -91,7 +91,7 @@ public class ComputeEngineContainerImplTest { assertThat(picoContainer.getComponentAdapters()) .hasSize( CONTAINER_ITSELF - + 75 // level 4 + + 76 // level 4 + 6 // content of CeConfigurationModule + 4 // content of CeQueueModule + 4 // content of CeHttpModule -- 2.39.5