SONAR-7441 deprecated Actions must be available in CE

because we currently support loading components annotated with @ServerSide

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 9a02f215935e5a626dfe92884f3aa0e6575563a5..168b1b2dae11ad306c32e92e9a779d5f7e65a47e 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
@@ -24,6 +24,7 @@ import java.util.List;
 import javax.annotation.CheckForNull;
 import org.sonar.api.config.EmailSettings;
 import org.sonar.api.internal.SonarQubeVersionFactory;
+import org.sonar.api.issue.action.Actions;
 import org.sonar.api.profiles.AnnotationProfileParser;
 import org.sonar.api.profiles.XMLProfileParser;
 import org.sonar.api.profiles.XMLProfileSerializer;
@@ -427,7 +428,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer {
     // InternalRubyIssueService.class, indirectly used only in Web Services
     // IssueChangelogService.class, indirectly used only in Web Services
     // ActionService.class, indirectly used only in Web Services
-    // Actions.class, long time deprecated and does not make sense to use it in any Component loaded in the CE
+    Actions.class,
     // IssueBulkChangeService.class, indirectly used only in Web Services
     // WsResponseCommonFormat.class, indirectly used only in Web Services
     // IssueWsModule.class, no Web Service in CE

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 4b071c4c72dfc3296b11488eef3e981e2f1fc669..d767f42a1bbc420e64e49dae14878a6b73ae8a14 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
@@ -79,7 +79,7 @@ public class ComputeEngineContainerImplTest {
     assertThat(picoContainer.getComponentAdapters())
       .hasSize(
         CONTAINER_ITSELF
-          + 77 // level 4
+          + 78 // level 4
           + 5 // content of CeModule
           + 7 // content of CeQueueModule
           + 4 // content of ReportProcessingModule