rename sonar-server to sonar-webserver-core

200 files changed, 2 insertions, 2 deletions

diff --git a/server/sonar-server/COPYING b/server/sonar-webserver-core/COPYING
index fc8a5de7edf..fc8a5de7edf 100644
--- a/server/sonar-server/COPYING
+++ b/server/sonar-webserver-core/COPYING
diff --git a/server/sonar-server/build.gradle b/server/sonar-webserver-core/build.gradle
index e23855ef1e1..9ff120d6cfb 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-webserver-core/build.gradle
@@ -1,6 +1,6 @@
 sonarqube {
   properties {
-    property 'sonar.projectName', "${projectTitle} :: Server"
+    property 'sonar.projectName', "${projectTitle} :: Web Server :: Core"
   }
 }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/app/WebServerProcessLogging.java
index 9f866b62d70..9f866b62d70 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/WebServerProcessLogging.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/app/WebServerProcessLogging.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java
index 016f20434b9..016f20434b9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java
index 5536f1baf7f..5536f1baf7f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java
index 18d7dc1168d..18d7dc1168d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/debt/package-info.java
index 6610578a903..6610578a903 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/debt/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/debt/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/es/IndexerStartupTask.java
index be64ce0a057..be64ce0a057 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/es/IndexerStartupTask.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/es/IndexerStartupTask.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/MigrationEsClientImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/es/MigrationEsClientImpl.java
index d353a266466..d353a266466 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/es/MigrationEsClientImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/es/MigrationEsClientImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/es/package-info.java
index df6be07802c..df6be07802c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/es/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/es/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/NotificationDaemon.java
index acf90de9586..acf90de9586 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationDaemon.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/NotificationDaemon.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/NotificationModule.java
index abe04c57386..abe04c57386 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/NotificationModule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/NotificationModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/notification/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/package-info.java
index a38c847a25f..a38c847a25f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/notification/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.java
index fad900559ed..fad900559ed 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/BackendCleanup.java
index e4fc7c2bce6..e4fc7c2bce6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/BackendCleanup.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/BackendCleanup.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ClusterVerification.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ClusterVerification.java
index f8659270705..f8659270705 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ClusterVerification.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/ClusterVerification.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java
index ea8a7f7e336..ea8a7f7e336 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java
index 6948c10225b..6948c10225b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DefaultServerUpgradeStatus.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/LogServerVersion.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/LogServerVersion.java
index ed78bd44f2b..ed78bd44f2b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/LogServerVersion.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/LogServerVersion.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/PersistentSettings.java
index 818e13930c3..818e13930c3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/PersistentSettings.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java
index 41fa223b2f2..41fa223b2f2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/StartupMetadataPersister.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/WebCoreExtensionsInstaller.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/WebCoreExtensionsInstaller.java
index 26f2df7e52f..26f2df7e52f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/WebCoreExtensionsInstaller.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/WebCoreExtensionsInstaller.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java
index 345e3dbc1c3..345e3dbc1c3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartup.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java
index 6cb54bb6e51..6cb54bb6e51 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/EmbeddedDatabase.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java
index 9ed180873d3..9ed180873d3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/EmbeddedDatabaseFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java
index 7327cacb0f2..7327cacb0f2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/AutoDbMigration.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java
index 63306e38ac8..63306e38ac8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java
index 659b8fbcd10..659b8fbcd10 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java
index 7e5d5ba359f..7e5d5ba359f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/DatabaseMigrationImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/package-info.java
index 52a8464fb32..52a8464fb32 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/migration/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/migration/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/db/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/package-info.java
index de34ff5428d..de34ff5428d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/db/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/db/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/BaseSectionMBean.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/BaseSectionMBean.java
index c7ff804adf3..c7ff804adf3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/BaseSectionMBean.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/BaseSectionMBean.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSection.java
index 871fbab5e62..871fbab5e62 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSectionMBean.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSectionMBean.java
index 8aca3210e84..8aca3210e84 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSectionMBean.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/DbConnectionSectionMBean.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsIndexesSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/EsIndexesSection.java
index 1d07f5a32cd..1d07f5a32cd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsIndexesSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/EsIndexesSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsStateSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/EsStateSection.java
index a865c7e9d0e..a865c7e9d0e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsStateSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/EsStateSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/PluginsSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/PluginsSection.java
index 4fd9bb19942..4fd9bb19942 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/PluginsSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/PluginsSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java
index daa26a5e6f7..daa26a5e6f7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SettingsSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java
index 1454ae298b0..1454ae298b0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/StandaloneSystemSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SystemSectionMBean.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SystemSectionMBean.java
index 07cc22074c0..07cc22074c0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/SystemSectionMBean.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/SystemSectionMBean.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoader.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoader.java
index cea4044190b..cea4044190b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoader.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImpl.java
index 3fdccddf5e9..3fdccddf5e9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/CeQueueGlobalSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/CeQueueGlobalSection.java
index 5d05864ea23..5d05864ea23 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/CeQueueGlobalSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/CeQueueGlobalSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSection.java
index e257de37c9f..e257de37c9f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalInfoLoader.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalInfoLoader.java
index 6cfde83913a..6cfde83913a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalInfoLoader.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalInfoLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSection.java
index 6ebb83d06f0..6ebb83d06f0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/NodeInfo.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/NodeInfo.java
index d60be12979e..d60be12979e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/NodeInfo.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/NodeInfo.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/NodeSystemSection.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/NodeSystemSection.java
index 0960336bdaf..0960336bdaf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/NodeSystemSection.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/NodeSystemSection.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoader.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoader.java
index 2c17b9666ab..2c17b9666ab 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoader.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImpl.java
index 5ce39d0d9f2..5ce39d0d9f2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/package-info.java
index 45cea3a7a14..45cea3a7a14 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/cluster/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/cluster/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/package-info.java
index 895638cb3f2..895638cb3f2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/monitoring/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/package-info.java
index 71d187381a7..71d187381a7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdFactory.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/ServerIdFactory.java
index e62ef12f2b5..e62ef12f2b5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdFactory.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/ServerIdFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdFactoryImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/ServerIdFactoryImpl.java
index 8bee91eace9..8bee91eace9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdFactoryImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/ServerIdFactoryImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdManager.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/ServerIdManager.java
index 5a4945150b0..5a4945150b0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdManager.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/ServerIdManager.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdModule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/ServerIdModule.java
index 1f01a12704e..1f01a12704e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/ServerIdModule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/ServerIdModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/package-info.java
index e7b4b5d7659..e7b4b5d7659 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/serverid/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/serverid/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java
index 66aa523acf2..66aa523acf2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/AbortTomcatStartException.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/RootFilter.java
index 572444e5414..572444e5414 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/RootFilter.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/package-info.java
index 0ca88f82702..0ca88f82702 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java
index 22fa06b2cc9..22fa06b2cc9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/HttpRequestIdModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java
index 4acf5961341..4acf5961341 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdConfiguration.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java
index 4296285dd14..4296285dd14 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGenerator.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java
index c3781871a55..c3781871a55 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBase.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java
index 30979665ea1..30979665ea1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorBaseImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java
index 7010cac69de..7010cac69de 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java
index 53b4bf49e33..53b4bf49e33 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/RequestIdMDCStorage.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/package-info.java
index 413da7d0492..413da7d0492 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/web/requestid/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/CachingRuleFinder.java
index bd6995ab93b..bd6995ab93b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/CachingRuleFinder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java
index 252b0c1e332..252b0c1e332 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/CommonRuleDefinitions.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java
index 0a9c5407950..0a9c5407950 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/CommonRuleDefinitionsImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java
index a6e255ed80f..a6e255ed80f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/Rule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/Rule.java
index 5d6a2a32339..5d6a2a32339 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/Rule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/Rule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java
index 80da97d352f..80da97d352f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/RuleParam.java
index 0a65abd961b..0a65abd961b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleParam.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/RuleParam.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/SingleDeprecatedRuleKey.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/SingleDeprecatedRuleKey.java
index b96d906bf71..b96d906bf71 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/SingleDeprecatedRuleKey.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/SingleDeprecatedRuleKey.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java
index aadbb34d40b..aadbb34d40b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/WebServerRuleFinder.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java
index db347d46132..db347d46132 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/WebServerRuleFinderImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/package-info.java
index 09d28ba5169..09d28ba5169 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java
index 22e5bf4257e..22e5bf4257e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/GeneratePluginIndex.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/LogServerId.java
index 5091d13b22a..5091d13b22a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/LogServerId.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/LogServerId.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterMetrics.java
index 615d91cef80..615d91cef80 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterMetrics.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterMetrics.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java
index fd2ff4590cf..fd2ff4590cf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPlugins.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterPlugins.java
index cefa3fbb571..cefa3fbb571 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPlugins.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterPlugins.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java
index 7be27df5c8a..7be27df5c8a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RenameDeprecatedPropertyKeys.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/package-info.java
index c43f2781b47..c43f2781b47 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryClient.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryClient.java
index 719405aee62..719405aee62 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryClient.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryClient.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java
index 64f44c3cc88..64f44c3cc88 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java
index b31f2b30678..b31f2b30678 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/TelemetryDataLoaderImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/package-info.java
index b85d360841b..b85d360841b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/telemetry/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java
index d3f07169f61..d3f07169f61 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/updatecenter/UpdateCenterModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/updatecenter/package-info.java
index b89cb43f66a..b89cb43f66a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/updatecenter/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/updatecenter/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/ClassLoaderUtils.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/util/ClassLoaderUtils.java
index 9e273d66307..9e273d66307 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/ClassLoaderUtils.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/util/ClassLoaderUtils.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/DateCollector.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/util/DateCollector.java
index 446f1a499ab..446f1a499ab 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/DateCollector.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/util/DateCollector.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/TempFolderCleaner.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/util/TempFolderCleaner.java
index 812af0edb85..812af0edb85 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/TempFolderCleaner.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/util/TempFolderCleaner.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/package-info.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/util/package-info.java
index d02f184b834..d02f184b834 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/package-info.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/util/package-info.java
diff --git a/server/sonar-server/src/main/resources/build.properties b/server/sonar-webserver-core/src/main/resources/build.properties
index c73bb2bc3ae..c73bb2bc3ae 100644
--- a/server/sonar-server/src/main/resources/build.properties
+++ b/server/sonar-webserver-core/src/main/resources/build.properties
diff --git a/server/sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml b/server/sonar-webserver-core/src/main/resources/com/sonar/sqale/technical-debt-model.xml
index 4e3277a44b6..4e3277a44b6 100644
--- a/server/sonar-server/src/main/resources/com/sonar/sqale/technical-debt-model.xml
+++ b/server/sonar-webserver-core/src/main/resources/com/sonar/sqale/technical-debt-model.xml
diff --git a/server/sonar-server/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java
index b5612766341..b5612766341 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/app/WebServerProcessLoggingTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java
index 5275d006954..5275d006954 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java
index f5e984c9fa3..f5e984c9fa3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java
index ea78946bd40..ea78946bd40 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/debt/DebtRulesXMLImporterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java
index de10b8e1905..de10b8e1905 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/MigrationEsClientImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/es/MigrationEsClientImplTest.java
index 4f6633793b6..4f6633793b6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/es/MigrationEsClientImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/es/MigrationEsClientImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java
index 741d823a6e8..741d823a6e8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java
index 344b598c5c7..344b598c5c7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java
index 4d1fca0083f..4d1fca0083f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java
index 3b460edc827..3b460edc827 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/measure/index/ProjectsEsModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationChannelTest.java
index 9d90900df71..9d90900df71 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationChannelTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java
index 8a24e6b092c..8a24e6b092c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationDaemonTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationMediumTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationMediumTest.java
index 9476a84c983..9476a84c983 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationMediumTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationMediumTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
index b485602fcd3..b485602fcd3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationTest.java
index bc3400d44c6..bc3400d44c6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java
index 7b57c9af448..7b57c9af448 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/email/EmailNotificationChannelTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/BackendCleanupTest.java
index 30c65d1fee0..30c65d1fee0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/BackendCleanupTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java
index f81955071ec..f81955071ec 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClassLoaderUtilsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ClusterVerificationTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClusterVerificationTest.java
index 590bca2cb09..590bca2cb09 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/ClusterVerificationTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/ClusterVerificationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java
index 3de7281760b..3de7281760b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java
index 050fc56cbac..050fc56cbac 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/DefaultServerUpgradeStatusTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
index 884c7d343de..884c7d343de 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java
index c4c84ee1b94..c4c84ee1b94 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/StartupMetadataPersisterTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/WebCoreExtensionsInstallerTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/WebCoreExtensionsInstallerTest.java
index b89d6c2739b..b89d6c2739b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/WebCoreExtensionsInstallerTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/WebCoreExtensionsInstallerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java
index 97ed8c9894a..97ed8c9894a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/CheckDatabaseCharsetAtStartupTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java
index 7e30958d539..7e30958d539 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseFactoryTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java
index 5672b7b60cf..5672b7b60cf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/EmbeddedDatabaseTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java
index 1c8d50cd7f5..1c8d50cd7f5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/AutoDbMigrationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java
index 736d056c22b..736d056c22b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationExecutorServiceAdaptor.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java
index 693a4468fb7..693a4468fb7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java
index dd9be0581f8..dd9be0581f8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplConcurrentAccessTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java
index d4357906db3..d4357906db3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseSectionMBeanTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/BaseSectionMBeanTest.java
index 7cd99dedd22..7cd99dedd22 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/BaseSectionMBeanTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/BaseSectionMBeanTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DbConnectionSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/DbConnectionSectionTest.java
index e68ca345091..e68ca345091 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/DbConnectionSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/DbConnectionSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java
index d82b90a7319..d82b90a7319 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java
index 3a03fc5a696..3a03fc5a696 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeSection.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/FakeSection.java
index bf3c6e01ed0..bf3c6e01ed0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeSection.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/FakeSection.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeSectionMBean.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/FakeSectionMBean.java
index 5879452629e..5879452629e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/FakeSectionMBean.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/FakeSectionMBean.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/PluginsSectionTest.java
index 5b6837473e4..5b6837473e4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/PluginsSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/PluginsSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SettingsSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/SettingsSectionTest.java
index 5860ed73671..5860ed73671 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/SettingsSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/SettingsSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java
index bc233dab4e9..bc233dab4e9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImplTest.java
index e67e84b37ed..e67e84b37ed 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/AppNodesInfoLoaderImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/CeQueueGlobalSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/CeQueueGlobalSectionTest.java
index f7d9bf0941f..f7d9bf0941f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/CeQueueGlobalSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/CeQueueGlobalSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java
index b82012392b7..b82012392b7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalInfoLoaderTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalInfoLoaderTest.java
index 442a55427ad..442a55427ad 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalInfoLoaderTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalInfoLoaderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSectionTest.java
index f12c7461f1e..f12c7461f1e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/NodeInfoTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/NodeInfoTest.java
index e0863fee41b..e0863fee41b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/NodeInfoTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/NodeInfoTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/NodeSystemSectionTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/NodeSystemSectionTest.java
index 9fdb245d475..9fdb245d475 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/NodeSystemSectionTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/NodeSystemSectionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java
index 37a712ecc47..37a712ecc47 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/serverid/ServerIdFactoryImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/serverid/ServerIdFactoryImplTest.java
index 3756ca14b58..3756ca14b58 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/serverid/ServerIdFactoryImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/serverid/ServerIdFactoryImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/serverid/ServerIdManagerTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/serverid/ServerIdManagerTest.java
index 0875ad0fcb2..0875ad0fcb2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/serverid/ServerIdManagerTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/serverid/ServerIdManagerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/serverid/ServerIdModuleTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/serverid/ServerIdModuleTest.java
index 0fd1a57bcec..0fd1a57bcec 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/serverid/ServerIdModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/serverid/ServerIdModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java
index 6d68d7502b9..6d68d7502b9 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/web/requestid/HttpRequestIdModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java
index 84a62916785..84a62916785 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/web/requestid/RequestIdConfigurationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java
index 5e2bf3c2cf7..5e2bf3c2cf7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/web/requestid/RequestIdGeneratorImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java
index 6c19c1a0ef0..6c19c1a0ef0 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java
index ca338616a5d..ca338616a5d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/DeprecatedRulesDefinitionLoaderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java
index 3cc43fa62d3..3cc43fa62d3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/SingleDeprecatedRuleKeyTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/SingleDeprecatedRuleKeyTest.java
index 4b4b286a962..4b4b286a962 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/SingleDeprecatedRuleKeyTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/SingleDeprecatedRuleKeyTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java
index 5fdac77d9e8..5fdac77d9e8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/WebServerRuleFinderImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/search/BaseDocTest.java
index 450bf1b96d2..450bf1b96d2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/search/BaseDocTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java
index fb585a8565b..fb585a8565b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/GeneratePluginIndexTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/LogServerIdTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/LogServerIdTest.java
index 073e9577710..073e9577710 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/LogServerIdTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/LogServerIdTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
index b5fc51496cd..b5fc51496cd 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
index b7683ee184d..b7683ee184d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPluginsTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPluginsTest.java
index 9fed6eef493..9fed6eef493 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPluginsTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RegisterPluginsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java
index 0edd9f2d27e..0edd9f2d27e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/startup/RenameDeprecatedPropertyKeysTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/telemetry/FakeServer.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/FakeServer.java
index b1aa8a872ce..b1aa8a872ce 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/telemetry/FakeServer.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/FakeServer.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryClientTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryClientTest.java
index 60fdc81e5d6..60fdc81e5d6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryClientTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryClientTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java
index dc57204baf2..dc57204baf2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java
index b7531b0f39b..b7531b0f39b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/updatecenter/UpdateCenterModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/util/DateCollectorTest.java
index e3d0146c112..e3d0146c112 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/DateCollectorTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/util/DateCollectorTest.java
diff --git a/server/sonar-server/src/test/resources/logback-test.xml b/server/sonar-webserver-core/src/test/resources/logback-test.xml
index 3e34b0f9fc8..3e34b0f9fc8 100644
--- a/server/sonar-server/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver-core/src/test/resources/logback-test.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml
index e4569a2a7bf..e4569a2a7bf 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/csharp-model.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml
index 0b37f562107..0b37f562107 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtModelPluginRepositoryTest/java-model.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml
index ef18e12ef83..ef18e12ef83 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtModelXMLExporterTest/export_xml.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml
index 00deb4d0299..00deb4d0299 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_constant_per_issue_with_coefficient_by_constant_per_issue_with_offset.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml
index 9ebc69b94a6..9ebc69b94a6 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_deprecated_linear_with_threshold_function_by_linear_function.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml
index d4707ba62a8..d4707ba62a8 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/convert_network_use_key.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml
index 3b15eae11d6..3b15eae11d6 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/fail_on_bad_xml.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml
index 4b8ae3f6475..4b8ae3f6475 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_deprecated_constant_per_file_function.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml
index bb6bdbb4afb..bb6bdbb4afb 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_invalid_value.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml
index 2165a603341..2165a603341 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_remediation_cost_having_zero_value.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml
index bcf3ed867d3..bcf3ed867d3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/ignore_rule_on_root_characteristics.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml
index 6c7d153992c..6c7d153992c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_badly_formatted_xml.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml
index 86b1f551fbe..86b1f551fbe 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_constant_issue.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml
index f641a5185ec..f641a5185ec 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml
index 12328da7c83..12328da7c83 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_having_offset_to_zero.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml
index be4fdd3ce4e..be4fdd3ce4e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_linear_with_offset.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml
index af3b906764e..af3b906764e 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml
index f8f7e9b6d5d..f8f7e9b6d5d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/import_rules_with_deprecated_quality_model_format.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml
index 483a98bebd3..483a98bebd3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/read_integer.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml
index f6b3f2dbb96..f6b3f2dbb96 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/replace_mn_by_min.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml
index 34c2f2cd9e5..34c2f2cd9e5 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/debt/DebtRulesXMLImporterTest/use_default_unit_when_no_unit.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml b/server/sonar-webserver-core/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml
index 60a47d06c7f..60a47d06c7f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/metric/DefaultMetricFinderTest/shared.xml
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar b/server/sonar-webserver-core/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar
index 21024e33b94..21024e33b94 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/platform/ClassLoaderUtilsTest/ClassLoaderUtilsTest.jar
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties b/server/sonar-webserver-core/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties
index 230f3ae8907..230f3ae8907 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/platform/ServerImplTest/build.properties
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt b/server/sonar-webserver-core/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/platform/ServerImplTest/empty-version.txt
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt b/server/sonar-webserver-core/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt
index d3827e75a5c..d3827e75a5c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/platform/ServerImplTest/version.txt
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/telemetry/telemetry-example.json b/server/sonar-webserver-core/src/test/resources/org/sonar/server/telemetry/telemetry-example.json
index 5eeb14d2ff0..5eeb14d2ff0 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/telemetry/telemetry-example.json
+++ b/server/sonar-webserver-core/src/test/resources/org/sonar/server/telemetry/telemetry-example.json
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle
index 14b48b96680..bf7b2cdb8d2 100644
--- a/server/sonar-webserver/build.gradle
+++ b/server/sonar-webserver/build.gradle
@@ -14,7 +14,7 @@ dependencies {
   compile project(':sonar-core')
   compile project(':server:sonar-ce-task-projectanalysis')
   compile project(':server:sonar-process')
-  compile project(':server:sonar-server')
+  compile project(':server:sonar-webserver-core')
   compile project(':server:sonar-webserver-webapi')
 
   compileOnly 'com.google.code.findbugs:jsr305'