SONAR-6732 remove useless migrations from Compute Engine container

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 d54123f8afc11ecdd1c59ce6ee7a13f4749467c7..3d16c5fbeb7a6e041b8f0331bb33eedcaa80b7cc 100644 (file)
--- 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
@@ -58,7 +58,6 @@ import org.sonar.db.DefaultDatabase;
 import org.sonar.db.permission.PermissionRepository;
 import org.sonar.db.purge.PurgeProfiler;
 import org.sonar.db.version.DatabaseVersion;
-import org.sonar.db.version.MigrationStepModule;
 import org.sonar.process.Props;
 import org.sonar.server.activity.ActivityService;
 import org.sonar.server.activity.index.ActivityIndex;
@@ -161,7 +160,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer {
     // DB
     DbClient.class,
     DaoModule.class,
-    MigrationStepModule.class,
+   // MigrationStepModule.class, DB maintenance, responsibility of Web Server
 
     // Elasticsearch
     EsSearchModule.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 e70112231e52b8b6847beaacdd29da21463ab5a9..7310d34be0cabdc4d3ae4070ca29972041099882 100644 (file)
--- 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
@@ -88,12 +88,11 @@ public class ComputeEngineContainerImplTest {
       );
     assertThat(picoContainer.getParent().getParent().getParent().getComponentAdapters()).hasSize(
       COMPONENTS_IN_LEVEL_1_AT_CONSTRUCTION
-        + 22 // level 1
+        + 21 // level 1
         + 47 // content of DaoModule
         + 1 // content of EsSearchModule
         + 58 // content of CorePropertyDefinitions
         + 1 // content of CePropertyDefinitions
-        + 59 // content of MigrationStepModule
     );
     assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull();
     underTest.stop();