diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2018-07-05 17:26:54 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2018-07-09 10:39:33 +0200 |
| commit | deafa95ac4fe407e22e5ad56ecdbbb2e0105e24a (patch) | |
| tree | 3851df2f9e31da05ceaa7ff63775fb9cfedd177e /server/sonar-ce | |
| parent | e43471671222ac80e9016e71646389b13d4677ba (diff) | |
| download | sonarqube-deafa95ac4fe407e22e5ad56ecdbbb2e0105e24a.tar.gz sonarqube-deafa95ac4fe407e22e5ad56ecdbbb2e0105e24a.zip | |
drop dependency of sonar-ce on sonar-server
sonar-plugin-bridge dropped and its content (only ReportAnalysisComponentProvider interface) move to sonar-ce-task-projectanalysis
Diffstat (limited to 'server/sonar-ce')
3 files changed, 6 insertions, 5 deletions
diff --git a/server/sonar-ce/build.gradle b/server/sonar-ce/build.gradle index 43da9d72769..d54e627ec32 100644 --- a/server/sonar-ce/build.gradle +++ b/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' 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 b22b9366b7e..ecdf7f84cb8 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 @@ -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, 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 0c01e4fab67..c9efd801a37 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 @@ -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 |