rename sonar-webserver-common to sonar-webserver-api

155 files changed, 10 insertions, 8 deletions

diff --git a/server/sonar-webserver-common/build.gradle b/server/sonar-webserver-api/build.gradle
index 17637fc201a..9c89a4b7de4 100644
--- a/server/sonar-webserver-common/build.gradle
+++ b/server/sonar-webserver-api/build.gradle
@@ -1,6 +1,8 @@
+description = 'SonarQube WebServer internal APIs, used by other Web Server modules or Core Extensions'
+
 sonarqube {
   properties {
-    property 'sonar.projectName', "${projectTitle} :: WebServer :: Common"
+    property 'sonar.projectName', "${projectTitle} :: WebServer :: API"
   }
 }
 
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
index 44bdc4377e3..44bdc4377e3 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
index 12b3f68543c..12b3f68543c 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolder.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/RestartFlagHolder.java
index dfc6c8c8414..dfc6c8c8414 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolder.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/RestartFlagHolder.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java
index 98354a8e77b..98354a8e77b 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/package-info.java
index 7170de2498d..7170de2498d 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/app/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/app/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeature.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/BranchFeature.java
index 7d60949c954..7d60949c954 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeature.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/BranchFeature.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java
index 20fc40ff324..20fc40ff324 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java
index 8647d7c421f..8647d7c421f 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java
index 634e59721a7..634e59721a7 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/package-info.java
index cb79dbcf31d..cb79dbcf31d 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/branch/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/ce/http/CeHttpClient.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
index f86a08efb62..f86a08efb62 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/ce/http/CeHttpClient.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/ce/http/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/ce/http/package-info.java
index 17b36c59125..17b36c59125 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/ce/http/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/ce/http/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/BadRequestException.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/BadRequestException.java
index 3113d202d99..3113d202d99 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/BadRequestException.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/BadRequestException.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/ForbiddenException.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
index d72eefbd02f..d72eefbd02f 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/ForbiddenException.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/Message.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/Message.java
index c069ead73d2..c069ead73d2 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/Message.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/Message.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/NotFoundException.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/NotFoundException.java
index f21a98b5157..f21a98b5157 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/NotFoundException.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/NotFoundException.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/ServerException.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/ServerException.java
index 491c17ed437..491c17ed437 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/ServerException.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/ServerException.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java
index 0b4af12beee..0b4af12beee 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/UnauthorizedException.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/package-info.java
index c1ac144f25a..c1ac144f25a 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/exceptions/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/exceptions/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/health/ClusterHealth.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/health/ClusterHealth.java
index 23fcfca9f7a..23fcfca9f7a 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/health/ClusterHealth.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/health/ClusterHealth.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/health/Health.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/health/Health.java
index d5b49449bbe..d5b49449bbe 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/health/Health.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/health/Health.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/health/HealthChecker.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/health/HealthChecker.java
index 80fb8aed1bf..80fb8aed1bf 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/health/HealthChecker.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/health/HealthChecker.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/health/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/health/package-info.java
index 18ea762c56b..18ea762c56b 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/health/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/health/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/ClusterFeature.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/platform/ClusterFeature.java
index 24d8617a4e1..24d8617a4e1 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/ClusterFeature.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/platform/ClusterFeature.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/Platform.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/platform/Platform.java
index 22f3e451a97..22f3e451a97 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/Platform.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/platform/Platform.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/SystemInfoWriter.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/platform/SystemInfoWriter.java
index 3a82f471f6a..3a82f471f6a 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/SystemInfoWriter.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/platform/SystemInfoWriter.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/platform/package-info.java
index 71d187381a7..71d187381a7 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/platform/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/InstalledPlugin.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/InstalledPlugin.java
index 0fffb7b7d78..0fffb7b7d78 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/InstalledPlugin.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/InstalledPlugin.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginDownloader.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginDownloader.java
index d61efac304c..d61efac304c 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginDownloader.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginDownloader.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginFileSystem.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginFileSystem.java
index e65336a7586..e65336a7586 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginFileSystem.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginFileSystem.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginUninstaller.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginUninstaller.java
index 8253dbaf8c1..8253dbaf8c1 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginUninstaller.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginUninstaller.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java
index 1970d4475a5..1970d4475a5 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
index ecc3abc2d76..ecc3abc2d76 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
index 2f5d0b2d357..2f5d0b2d357 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java
index 0c0a6730987..0c0a6730987 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
index 9fa956d2a15..9fa956d2a15 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java
index f6c1db3b035..f6c1db3b035 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/edition/package-info.java
index e0a7b00bbf9..e0a7b00bbf9 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/edition/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/package-info.java
index cc398bb88c6..cc398bb88c6 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java
index 6afdea527e9..6afdea527e9 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java
index 7f3d3f1867d..7f3d3f1867d 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java
index af440d60adb..af440d60adb 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/RekeyedProject.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/RekeyedProject.java
index ecab0b148f8..ecab0b148f8 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/RekeyedProject.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/RekeyedProject.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/Visibility.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/Visibility.java
index edf05180276..edf05180276 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/Visibility.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/Visibility.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/package-info.java
index 205d7058e06..205d7058e06 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/project/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/project/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java
index 7591c138d28..7591c138d28 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java
index 6953a77575e..6953a77575e 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java
index c3baf201471..c3baf201471 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java
index e2e66b555de..e2e66b555de 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java
index 76a4c2bebf1..76a4c2bebf1 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java
index 6ef8397046a..6ef8397046a 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java
index ed52cd87a47..ed52cd87a47 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
index 91a31ca76d9..91a31ca76d9 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
index 32a11c072d8..32a11c072d8 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
index 106fd158b26..106fd158b26 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualityprofile/RuleActivation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualityprofile/package-info.java
index 5a3c798af36..5a3c798af36 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/qualityprofile/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/qualityprofile/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.java
index e261763e6f5..e261763e6f5 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.java
index 95e11242587..95e11242587 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.java
index de074ef5232..de074ef5232 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/setting/package-info.java
index e816bf4051c..e816bf4051c 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/setting/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/LicenseReader.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/telemetry/LicenseReader.java
index 22029d62a36..22029d62a36 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/LicenseReader.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/telemetry/LicenseReader.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/telemetry/package-info.java
index ce3724b93a5..ce3724b93a5 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/telemetry/package-info.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/BooleanTypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/BooleanTypeValidation.java
index 1b3ade32e60..1b3ade32e60 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/BooleanTypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/BooleanTypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/FloatTypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/FloatTypeValidation.java
index fd221dced55..fd221dced55 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/FloatTypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/FloatTypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/GlobalLockManager.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/GlobalLockManager.java
index 81f13b22a1d..81f13b22a1d 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/GlobalLockManager.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/GlobalLockManager.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/IntegerTypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/IntegerTypeValidation.java
index 84502df47f7..84502df47f7 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/IntegerTypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/IntegerTypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/LongTypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/LongTypeValidation.java
index 9ca540a1d1d..9ca540a1d1d 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/LongTypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/LongTypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java
index ba8598a7786..ba8598a7786 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/MetricLevelTypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/StringListTypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/StringListTypeValidation.java
index acb1c7dca8f..acb1c7dca8f 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/StringListTypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/StringListTypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/StringTypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/StringTypeValidation.java
index 3851ede0e81..3851ede0e81 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/StringTypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/StringTypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TextTypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/TextTypeValidation.java
index c26ad125162..c26ad125162 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TextTypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/TextTypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/TypeValidation.java
index 797a3438d8f..797a3438d8f 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/TypeValidation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidationModule.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/TypeValidationModule.java
index 3cc4f038e5e..3cc4f038e5e 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidationModule.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/TypeValidationModule.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidations.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/TypeValidations.java
index 2c8883b77eb..2c8883b77eb 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/TypeValidations.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/TypeValidations.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/Validation.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/Validation.java
index 99d28d0bc96..99d28d0bc96 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/Validation.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/Validation.java
diff --git a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/package-info.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/package-info.java
index 8fd4b5b3582..8fd4b5b3582 100644
--- a/server/sonar-webserver-common/src/main/java/org/sonar/server/util/package-info.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/util/package-info.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
index de5f24347fc..de5f24347fc 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java
index 6fb3d9a6449..6fb3d9a6449 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureRule.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/branch/BranchFeatureRule.java
index 2bf56463474..2bf56463474 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureRule.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/branch/BranchFeatureRule.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java
index 0dc82c559f0..0dc82c559f0 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/MessageTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/exceptions/MessageTest.java
index f05bb55058a..f05bb55058a 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/MessageTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/exceptions/MessageTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java
index ae2ce7846db..ae2ce7846db 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/exceptions/ServerExceptionTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java
index 27c2e469dde..27c2e469dde 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java
index f984cd9bd1e..f984cd9bd1e 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java
index bc353f99778..bc353f99778 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java
index 20eae5f2781..20eae5f2781 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java
index 8f4d928cd4c..8f4d928cd4c 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
index e426c9ebfea..e426c9ebfea 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestPluginA.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/TestPluginA.java
index 7952eb5799c..7952eb5799c 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestPluginA.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/TestPluginA.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestProjectUtils.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/TestProjectUtils.java
index 9710a8689e4..9710a8689e4 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestProjectUtils.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/TestProjectUtils.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
index b1e50cba77c..b1e50cba77c 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java
index a71522a77d5..a71522a77d5 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java
index d6d9904452d..d6d9904452d 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java
index 907768f56fa..907768f56fa 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java
index 8085b643ede..8085b643ede 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/project/RekeyedProjectTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/project/RekeyedProjectTest.java
index a847d91d0d8..a847d91d0d8 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/project/RekeyedProjectTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/project/RekeyedProjectTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java
index 964637487fb..964637487fb 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java
index eb4ce5d6c60..eb4ce5d6c60 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java
index 0fb88ee9b05..0fb88ee9b05 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.java
index 577eda83519..577eda83519 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.java
index e0c0b6d2854..e0c0b6d2854 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java
index d11c03152b8..d11c03152b8 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java
index b88c3fbb651..b88c3fbb651 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java
index 8a069e1eae2..8a069e1eae2 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java
index e9b1953dd5a..e9b1953dd5a 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/LongTypeValidationTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/LongTypeValidationTest.java
index 2f7d7e0946e..2f7d7e0946e 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/LongTypeValidationTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/LongTypeValidationTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java
index 9f2630fd0de..9f2630fd0de 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringTypeValidationTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/StringTypeValidationTest.java
index dde3afa3543..dde3afa3543 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringTypeValidationTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/StringTypeValidationTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TextTypeValidationTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/TextTypeValidationTest.java
index 4261f95c580..4261f95c580 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TextTypeValidationTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/TextTypeValidationTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java
index 3ff709c8f0f..3ff709c8f0f 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/TypeValidationsTest.java
index 4dbae47cb37..4dbae47cb37 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/TypeValidationsTest.java
diff --git a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTesting.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/TypeValidationsTesting.java
index b237ba62aab..b237ba62aab 100644
--- a/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTesting.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/util/TypeValidationsTesting.java
diff --git a/server/sonar-webserver-common/src/test/projects/.gitignore b/server/sonar-webserver-api/src/test/projects/.gitignore
index a945b8525e6..a945b8525e6 100644
--- a/server/sonar-webserver-common/src/test/projects/.gitignore
+++ b/server/sonar-webserver-api/src/test/projects/.gitignore
diff --git a/server/sonar-webserver-common/src/test/projects/README.txt b/server/sonar-webserver-api/src/test/projects/README.txt
index c53a66d52f2..c53a66d52f2 100644
--- a/server/sonar-webserver-common/src/test/projects/README.txt
+++ b/server/sonar-webserver-api/src/test/projects/README.txt
diff --git a/server/sonar-webserver-common/src/test/projects/fake-report-plugin/pom.xml b/server/sonar-webserver-api/src/test/projects/fake-report-plugin/pom.xml
index 72a04dbe04f..72a04dbe04f 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-report-plugin/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/fake-report-plugin/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/BasePlugin.java b/server/sonar-webserver-api/src/test/projects/fake-report-plugin/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/BasePlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/fake-report-plugin/src/BasePlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-api/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-api/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-webserver-common/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar
index 6085e44fdca..6085e44fdca 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/pom.xml b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/pom.xml
index e417dd96fba..e417dd96fba 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/BasePlugin.java b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/BasePlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/src/BasePlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar
index b5c99f721b3..b5c99f721b3 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/projects/fake-views-plugin/pom.xml b/server/sonar-webserver-api/src/test/projects/fake-views-plugin/pom.xml
index 1ef73d2ffda..1ef73d2ffda 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-views-plugin/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/fake-views-plugin/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/BasePlugin.java b/server/sonar-webserver-api/src/test/projects/fake-views-plugin/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/BasePlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/fake-views-plugin/src/BasePlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-api/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-api/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-webserver-common/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar
index a47d93d94a8..a47d93d94a8 100644
--- a/server/sonar-webserver-common/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/projects/pom.xml b/server/sonar-webserver-api/src/test/projects/pom.xml
index 37338313ac0..37338313ac0 100644
--- a/server/sonar-webserver-common/src/test/projects/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/pom.xml b/server/sonar-webserver-api/src/test/projects/test-base-plugin-v2/pom.xml
index 982be1c0170..982be1c0170 100644
--- a/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/test-base-plugin-v2/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/BasePlugin.java b/server/sonar-webserver-api/src/test/projects/test-base-plugin-v2/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/BasePlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/test-base-plugin-v2/src/BasePlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-api/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-api/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar
index 1d4ef5430c7..1d4ef5430c7 100644
--- a/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/projects/test-base-plugin/pom.xml b/server/sonar-webserver-api/src/test/projects/test-base-plugin/pom.xml
index c4e95936e74..c4e95936e74 100644
--- a/server/sonar-webserver-common/src/test/projects/test-base-plugin/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/test-base-plugin/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/BasePlugin.java b/server/sonar-webserver-api/src/test/projects/test-base-plugin/src/BasePlugin.java
index d12daff3e57..d12daff3e57 100644
--- a/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/BasePlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/test-base-plugin/src/BasePlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-api/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
index e0b54398eaf..e0b54398eaf 100644
--- a/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
+++ b/server/sonar-webserver-api/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java
diff --git a/server/sonar-webserver-common/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar
index 739a22fcdae..739a22fcdae 100644
--- a/server/sonar-webserver-common/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/projects/test-extend-plugin/pom.xml b/server/sonar-webserver-api/src/test/projects/test-extend-plugin/pom.xml
index e23667e6318..e23667e6318 100644
--- a/server/sonar-webserver-common/src/test/projects/test-extend-plugin/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/test-extend-plugin/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/test-extend-plugin/src/ExtendPlugin.java b/server/sonar-webserver-api/src/test/projects/test-extend-plugin/src/ExtendPlugin.java
index d364a2f9dd4..d364a2f9dd4 100644
--- a/server/sonar-webserver-common/src/test/projects/test-extend-plugin/src/ExtendPlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/test-extend-plugin/src/ExtendPlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar
index 2f63c2e652c..2f63c2e652c 100644
--- a/server/sonar-webserver-common/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/projects/test-libs-plugin/pom.xml b/server/sonar-webserver-api/src/test/projects/test-libs-plugin/pom.xml
index 2d49cca2cf2..2d49cca2cf2 100644
--- a/server/sonar-webserver-common/src/test/projects/test-libs-plugin/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/test-libs-plugin/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/test-libs-plugin/src/LibsPlugin.java b/server/sonar-webserver-api/src/test/projects/test-libs-plugin/src/LibsPlugin.java
index 7e3ebe0909c..7e3ebe0909c 100644
--- a/server/sonar-webserver-common/src/test/projects/test-libs-plugin/src/LibsPlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/test-libs-plugin/src/LibsPlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar
index 6ebe8652d8b..6ebe8652d8b 100644
--- a/server/sonar-webserver-common/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/projects/test-require-plugin/pom.xml b/server/sonar-webserver-api/src/test/projects/test-require-plugin/pom.xml
index 62462ffbf34..62462ffbf34 100644
--- a/server/sonar-webserver-common/src/test/projects/test-require-plugin/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/test-require-plugin/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/test-require-plugin/src/RequirePlugin.java b/server/sonar-webserver-api/src/test/projects/test-require-plugin/src/RequirePlugin.java
index 847ae2d994e..847ae2d994e 100644
--- a/server/sonar-webserver-common/src/test/projects/test-require-plugin/src/RequirePlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/test-require-plugin/src/RequirePlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar
index f5fc95f9d0d..f5fc95f9d0d 100644
--- a/server/sonar-webserver-common/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/pom.xml b/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/pom.xml
index 044cd94e8f0..044cd94e8f0 100644
--- a/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/pom.xml
+++ b/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/pom.xml
diff --git a/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java b/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java
index 0d14cde33c1..0d14cde33c1 100644
--- a/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java
+++ b/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java
diff --git a/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar
index 0dd577fc360..0dd577fc360 100644
--- a/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar
+++ b/server/sonar-webserver-api/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar
diff --git a/server/sonar-webserver-common/src/test/resources/logback-test.xml b/server/sonar-webserver-api/src/test/resources/logback-test.xml
index 3e34b0f9fc8..3e34b0f9fc8 100644
--- a/server/sonar-webserver-common/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver-api/src/test/resources/logback-test.xml
diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle
index 195dbbbe963..3d50a54a0ec 100644
--- a/server/sonar-webserver-auth/build.gradle
+++ b/server/sonar-webserver-auth/build.gradle
@@ -21,7 +21,7 @@ dependencies {
   compile project(':server:sonar-db-dao')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
-  compile project(':server:sonar-webserver-common')
+  compile project(':server:sonar-webserver-api')
   compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile 'org.mindrot:jbcrypt'
diff --git a/server/sonar-webserver-core/build.gradle b/server/sonar-webserver-core/build.gradle
index 8d8daa84ad9..f8415d6f3a4 100644
--- a/server/sonar-webserver-core/build.gradle
+++ b/server/sonar-webserver-core/build.gradle
@@ -43,8 +43,8 @@ dependencies {
   compile project(':server:sonar-db-migration')
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
+  compile project(':server:sonar-webserver-api')
   compile project(':server:sonar-webserver-auth')
-  compile project(':server:sonar-webserver-common')
   compile project(':server:sonar-webserver-es')
   compile project(':sonar-core')
   compile project(':sonar-duplications')
@@ -74,8 +74,8 @@ dependencies {
   testCompile 'org.subethamail:subethasmtp'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-api", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
-  testCompile project(path: ":server:sonar-webserver-common", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
   testCompile project(':sonar-testing-harness')
diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
index c94534da997..d32bf648c4d 100644
--- a/server/sonar-webserver-webapi/build.gradle
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -36,8 +36,8 @@ dependencies {
   testCompile 'org.mockito:mockito-core'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-api", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
-  testCompile project(path: ":server:sonar-webserver-common", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests")
   testCompile project(':sonar-testing-harness')
diff --git a/server/sonar-webserver-ws/build.gradle b/server/sonar-webserver-ws/build.gradle
index 61535505c5e..7fa56ae5c0b 100644
--- a/server/sonar-webserver-ws/build.gradle
+++ b/server/sonar-webserver-ws/build.gradle
@@ -17,7 +17,7 @@ dependencies {
 
   compile 'com.google.guava:guava'
   compile project(':sonar-core')
-  compile project(':server:sonar-webserver-common')
+  compile project(':server:sonar-webserver-api')
   compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile project(':sonar-ws')
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle
index 47925090c2f..863fa2769b9 100644
--- a/server/sonar-webserver/build.gradle
+++ b/server/sonar-webserver/build.gradle
@@ -28,8 +28,8 @@ dependencies {
   testCompile 'org.eclipse.jetty:jetty-servlet'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(path: ":server:sonar-webserver-api", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
-  testCompile project(path: ":server:sonar-webserver-common", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile project(':sonar-testing-harness')
 }
diff --git a/settings.gradle b/settings.gradle
index 000a441e198..7ea694bb170 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,8 +17,8 @@ include 'server:sonar-server-common'
 include 'server:sonar-vsts'
 include 'server:sonar-web'
 include 'server:sonar-webserver'
+include 'server:sonar-webserver-api'
 include 'server:sonar-webserver-auth'
-include 'server:sonar-webserver-common'
 include 'server:sonar-webserver-core'
 include 'server:sonar-webserver-es'
 include 'server:sonar-webserver-webapi'