drop dependency of sonar-ce on sonar-server

sonar-plugin-bridge dropped and its content (only ReportAnalysisComponentProvider interface) move to sonar-ce-task-projectanalysis

server/sonar-ce-task-projectanalysis/build.gradle

@@ -40,7 +40,6 @@ dependencies {
   compileOnly project(':sonar-core')
   compileOnly project(':server:sonar-ce-task')
   compileOnly project(':server:sonar-db-dao')
-  compileOnly project(':server:sonar-plugin-bridge')
   compileOnly project(':server:sonar-process')
   compileOnly project(':server:sonar-server-common')
   compileOnly project(path: ':sonar-plugin-api')

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactory.java

@@ -23,7 +23,6 @@ import javax.annotation.Nullable;
 import org.sonar.ce.task.CeTask;
 import org.sonar.ce.task.container.TaskContainer;
 import org.sonar.core.platform.ComponentContainer;
-import org.sonar.plugin.ce.ReportAnalysisComponentProvider;
 
 public interface ContainerFactory {
 

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ContainerFactoryImpl.java

@@ -24,7 +24,6 @@ import org.sonar.ce.task.CeTask;
 import org.sonar.ce.task.container.TaskContainer;
 import org.sonar.ce.task.container.TaskContainerImpl;
 import org.sonar.core.platform.ComponentContainer;
-import org.sonar.plugin.ce.ReportAnalysisComponentProvider;
 
 public class ContainerFactoryImpl implements ContainerFactory {
   @Override

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java

@@ -125,7 +125,6 @@ import org.sonar.ce.task.step.ComputationSteps;
 import org.sonar.ce.taskprocessor.MutableTaskResultHolderImpl;
 import org.sonar.core.issue.tracking.Tracker;
 import org.sonar.core.platform.ContainerPopulator;
-import org.sonar.plugin.ce.ReportAnalysisComponentProvider;
 import org.sonar.server.computation.organization.DefaultOrganizationLoader;
 import org.sonar.server.view.index.ViewIndex;
 

server/sonar-plugin-bridge/src/main/java/org/sonar/plugin/ce/ReportAnalysisComponentProvider.java → server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ReportAnalysisComponentProvider.java

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.plugin.ce;
+package org.sonar.ce.task.projectanalysis.container;
 
 import java.util.List;
 import org.sonar.api.ce.ComputeEngineSide;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/taskprocessor/ReportTaskProcessor.java

@@ -31,7 +31,7 @@ import org.sonar.ce.task.taskprocessor.CeTaskProcessor;
 import org.sonar.ce.taskprocessor.TaskResultHolder;
 import org.sonar.core.platform.ComponentContainer;
 import org.sonar.db.ce.CeTaskTypes;
-import org.sonar.plugin.ce.ReportAnalysisComponentProvider;
+import org.sonar.ce.task.projectanalysis.container.ReportAnalysisComponentProvider;
 
 public class ReportTaskProcessor implements CeTaskProcessor {
 

server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulatorTest.java

@@ -37,7 +37,6 @@ import org.sonar.ce.task.projectanalysis.step.PersistComponentsStep;
 import org.sonar.ce.task.step.ComputationStep;
 import org.sonar.ce.task.step.StepsExplorer;
 import org.sonar.core.platform.ComponentContainer;
-import org.sonar.plugin.ce.ReportAnalysisComponentProvider;
 
 import static com.google.common.base.Predicates.notNull;
 import static com.google.common.collect.FluentIterable.from;

server/sonar-ce/build.gradle

@@ -14,7 +14,7 @@ dependencies {
   compile project(':server:sonar-ce-common')
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-ce-task-projectanalysis')
-  compile project(':server:sonar-server')
+  compile project(':server:sonar-server-common')
 
   compileOnly 'com.google.code.findbugs:jsr305'
 

server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java

@@ -136,7 +136,8 @@ 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.cluster.ProcessInfoProvider;
-import org.sonar.server.platform.serverid.ServerIdModule;
+import org.sonar.server.platform.serverid.JdbcUrlSanitizer;
+import org.sonar.server.platform.serverid.ServerIdChecksum;
 import org.sonar.server.plugins.InstalledPluginReferentialFactory;
 import org.sonar.server.plugins.ServerExtensionInstaller;
 import org.sonar.server.property.InternalPropertiesImpl;
@@ -350,7 +351,8 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer {
   private static void populateLevel3(ComponentContainer container) {
     container.add(
       new StartupMetadataProvider(),
-      ServerIdModule.class,
+      JdbcUrlSanitizer.class,
+      ServerIdChecksum.class,
       UriReader.class,
       ServerImpl.class,
       DefaultOrganizationProviderImpl.class,

server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java

@@ -111,8 +111,7 @@ public class ComputeEngineContainerImplTest {
       );
       assertThat(picoContainer.getParent().getComponentAdapters()).hasSize(
         CONTAINER_ITSELF
-          + 7 // level 3
-          + 4 // content of ServerIdModule
+          + 8 // level 3
       );
       assertThat(picoContainer.getParent().getParent().getComponentAdapters()).hasSize(
         CONTAINER_ITSELF

server/sonar-plugin-bridge/build.gradle

@@ -1,14 +0,0 @@
-sonarqube {
-  properties {
-    property 'sonar.projectName', "${projectTitle} :: Priviledged Plugin Bridge"
-  }
-}
-
-dependencies {
-  // please keep the list grouped by configuration and ordered by name
-
-  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
-  compile project(':sonar-core')
-
-  compileOnly 'com.google.code.findbugs:jsr305'
-}

server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdChecksum.java → server/sonar-server-common/src/main/java/org/sonar/server/platform/serverid/ServerIdChecksum.java

@@ -20,10 +20,14 @@
 package org.sonar.server.platform.serverid;
 
 import org.apache.commons.codec.digest.DigestUtils;
+import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.config.Configuration;
+import org.sonar.api.server.ServerSide;
 
 import static org.sonar.process.ProcessProperties.Property.JDBC_URL;
 
+@ServerSide
+@ComputeEngineSide
 public class ServerIdChecksum {
 
   private final Configuration config;

server/sonar-plugin-bridge/src/main/java/org/sonar/plugin/ce/package-info.java → server/sonar-server-common/src/main/java/org/sonar/server/platform/serverid/package-info.java

@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.plugin.ce;
+package org.sonar.server.platform.serverid;
 
 import javax.annotation.ParametersAreNonnullByDefault;

server/sonar-server/build.gradle

@@ -51,7 +51,6 @@ dependencies {
   compile project(':server:sonar-ce-task-projectanalysis')
   compile project(':server:sonar-db-dao')
   compile project(':server:sonar-db-migration')
-  compile project(':server:sonar-plugin-bridge')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
   compile project(':sonar-core')

server/sonar-plugin-bridge/src/main/java/org/sonar/plugin/package-info.java → server/sonar-server/src/test/java/org/sonar/server/platform/serverid/ServerIdModuleTest.java

@@ -17,7 +17,22 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-@ParametersAreNonnullByDefault
-package org.sonar.plugin;
+package org.sonar.server.platform.serverid;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
+
+public class ServerIdModuleTest {
+  private ServerIdModule underTest = new ServerIdModule();
+
+  @Test
+  public void verify_count_of_added_components() {
+    ComponentContainer container = new ComponentContainer();
+    underTest.configure(container);
+    assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 4);
+  }
+
+}

settings.gradle

@@ -13,7 +13,6 @@ include 'server:sonar-db-dao'
 include 'server:sonar-db-migration'
 include 'server:sonar-docs'
 include 'server:sonar-main'
-include 'server:sonar-plugin-bridge'
 include 'server:sonar-process'
 include 'server:sonar-server'
 include 'server:sonar-server-common'