57 files changed, 71 insertions, 7 deletions
diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle
index 6e189c3febf..3b2443c6f2a 100644
--- a/server/sonar-server-common/build.gradle
+++ b/server/sonar-server-common/build.gradle
@@ -15,8 +15,10 @@ dependencies {
 
   compile 'com.google.guava:guava'
   compile 'org.slf4j:slf4j-api'
-  compile project(':sonar-core')
+  compile 'com.squareup.okhttp3:okhttp'
   compile project(':server:sonar-db-dao')
+  compile project(':sonar-core')
+  compile project(':sonar-ws')
 
   compileOnly project(path: ':sonar-plugin-api')
   compileOnly project(path: ':server:sonar-process')
@@ -25,6 +27,7 @@ dependencies {
 
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.h2database:h2'
+  testCompile 'com.squareup.okhttp3:mockwebserver'
   testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecution.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecution.java
index 053ab2c6f25..053ab2c6f25 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecution.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecution.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java
index 1458e9a4eaf..1458e9a4eaf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionExecutorService.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java
index ce5a82d7135..ce5a82d7135 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionExecutorServiceImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java
index 7940fc3e9a0..7940fc3e9a0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java
index d908702e818..d908702e818 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMBean.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java
index f155a95f4a0..f155a95f4a0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMBeanImpl.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionModule.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionModule.java
index d1ef08628db..d1ef08628db 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionModule.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java
index ecc6e6782c6..ecc6e6782c6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/AsyncExecutionMonitoring.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/async/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/async/package-info.java
index a940f445dbe..a940f445dbe 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/async/package-info.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/async/package-info.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/Project.java b/server/sonar-server-common/src/main/java/org/sonar/server/project/Project.java
index af220370e34..af220370e34 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/Project.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/project/Project.java
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/project/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/project/package-info.java
new file mode 100644
index 00000000000..7771f38cbe9
--- /dev/null
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/project/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.server.project;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/Condition.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/Condition.java
index 3319b92dd4a..3319b92dd4a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/Condition.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/Condition.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java
index b47c176ac92..b47c176ac92 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/EvaluatedCondition.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java
index f568d242c76..f568d242c76 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/EvaluatedQualityGate.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGate.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/QualityGate.java
index d04742347d7..d04742347d7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGate.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/QualityGate.java
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/package-info.java
new file mode 100644
index 00000000000..c378d26367b
--- /dev/null
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.server.qualitygate;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/OkHttpClientProvider.java b/server/sonar-server-common/src/main/java/org/sonar/server/util/OkHttpClientProvider.java
index d28be2041ad..d28be2041ad 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/OkHttpClientProvider.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/util/OkHttpClientProvider.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/Analysis.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Analysis.java
index 5d1c24b1f26..5d1c24b1f26 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/Analysis.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Analysis.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/Branch.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Branch.java
index 2d62e584785..2d62e584785 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/Branch.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Branch.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/CeTask.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/CeTask.java
index 226e1f800c6..226e1f800c6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/CeTask.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/CeTask.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java
index 3a9175adbfb..3a9175adbfb 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/ProjectAnalysis.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooks.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooks.java
index b1c339f7b12..b1c339f7b12 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooks.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooks.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooksImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java
index 5036e81a92c..26c432656f6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebHooksImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebHooksImpl.java
@@ -23,6 +23,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
+import org.sonar.api.ce.ComputeEngineSide;
+import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.core.util.stream.MoreCollectors;
@@ -33,9 +35,11 @@ import org.sonar.db.webhook.WebhookDao;
 import org.sonar.db.webhook.WebhookDto;
 import org.sonar.server.async.AsyncExecution;
 
+import static java.lang.String.format;
 import static java.util.Optional.ofNullable;
-import static org.sonar.server.ws.WsUtils.checkStateWithOptional;
 
+@ServerSide
+@ComputeEngineSide
 public class WebHooksImpl implements WebHooks {
 
   private static final Logger LOGGER = Loggers.get(WebHooksImpl.class);
@@ -77,6 +81,14 @@ public class WebHooksImpl implements WebHooks {
     }
   }
 
+  private static <T> T checkStateWithOptional(java.util.Optional<T> value, String message, Object... messageArguments) {
+    if (!value.isPresent()) {
+      throw new IllegalStateException(format(message, messageArguments));
+    }
+
+    return value.get();
+  }
+
   @Override
   public void sendProjectAnalysisUpdate(Analysis analysis, Supplier<WebhookPayload> payloadSupplier) {
     List<Webhook> webhooks = readWebHooksFrom(analysis.getProjectUuid())
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/Webhook.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Webhook.java
index 8ac3b4c75a8..8ac3b4c75a8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/Webhook.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/Webhook.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCaller.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCaller.java
index 979386ac1c4..979386ac1c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCaller.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCaller.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java
index e9e70ca09c1..4f0624b6117 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookCallerImpl.java
@@ -28,6 +28,7 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import org.sonar.api.ce.ComputeEngineSide;
+import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.System2;
 
 import static java.lang.String.format;
@@ -38,6 +39,7 @@ import static okhttp3.internal.http.StatusLine.HTTP_PERM_REDIRECT;
 import static okhttp3.internal.http.StatusLine.HTTP_TEMP_REDIRECT;
 import static org.apache.commons.lang.StringUtils.isNotEmpty;
 
+@ServerSide
 @ComputeEngineSide
 public class WebhookCallerImpl implements WebhookCaller {
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDelivery.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDelivery.java
index 38194e05d80..38194e05d80 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDelivery.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDelivery.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java
index 0ba9bb95c75..7bf13c484a2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookDeliveryStorage.java
@@ -21,6 +21,7 @@ package org.sonar.server.webhook;
 
 import com.google.common.base.Throwables;
 import org.sonar.api.ce.ComputeEngineSide;
+import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.System2;
 import org.sonar.core.util.UuidFactory;
 import org.sonar.db.DbClient;
@@ -31,6 +32,7 @@ import org.sonar.db.webhook.WebhookDeliveryDto;
 /**
  * Persist and purge {@link WebhookDelivery} into database
  */
+@ServerSide
 @ComputeEngineSide
 public class WebhookDeliveryStorage {
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookModule.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookModule.java
index 1768b2739f1..1768b2739f1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookModule.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookModule.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayload.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayload.java
index 197f472c8a4..197f472c8a4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayload.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayload.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java
index cf2751f3243..cf2751f3243 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactory.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java
index 32440c4b2cb..d6b9b298ec6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/WebhookPayloadFactoryImpl.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import java.util.Optional;
 import org.sonar.api.ce.ComputeEngineSide;
 import org.sonar.api.platform.Server;
+import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.server.project.Project;
@@ -38,6 +39,7 @@ import org.sonar.server.qualitygate.EvaluatedQualityGate;
 import static java.lang.String.format;
 import static org.sonar.core.config.CorePropertyDefinitions.SONAR_ANALYSIS;
 
+@ServerSide
 @ComputeEngineSide
 public class WebhookPayloadFactoryImpl implements WebhookPayloadFactory {
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/package-info.java b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/package-info.java
index e4048c7aa0c..e4048c7aa0c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/webhook/package-info.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/webhook/package-info.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java
index 8aa2ee5165b..8aa2ee5165b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionExecutorServiceImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java
index 0ff2d3cec07..0ff2d3cec07 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java
index e534273abfb..e534273abfb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/async/AsyncExecutionMBeanImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ProjectTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/project/ProjectTest.java
index 4f2a351e844..4f2a351e844 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ProjectTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/project/ProjectTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ConditionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/ConditionTest.java
index ba0b79a7fef..ba0b79a7fef 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ConditionTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/ConditionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java
index 7cadd61e89f..7cadd61e89f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedConditionTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java
index b02d5dd2cd5..b02d5dd2cd5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/EvaluatedQualityGateTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java
index d1fe1dde3ca..d1fe1dde3ca 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/qualitygate/QualityGateTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java
index b6f2f037a98..b6f2f037a98 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/util/OkHttpClientProviderTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/AnalysisTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/AnalysisTest.java
index 5f307d904d4..5f307d904d4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/AnalysisTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/AnalysisTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java
index b7ca6d75fde..b7ca6d75fde 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/AsynchronousWebHooksImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/BranchTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/BranchTest.java
index b935d89b248..b935d89b248 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/BranchTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/BranchTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/CeTaskTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/CeTaskTest.java
index 0ed58b7f00a..0ed58b7f00a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/CeTaskTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/CeTaskTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java
index 0a453709b67..0a453709b67 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/ProjectAnalysisTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java
index de8d298052f..de8d298052f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/SynchronousWebHooksImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java
index 0634f160622..0634f160622 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/TestWebhookCaller.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java
index 60ac24ee262..60ac24ee262 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java
index 1fac932cbc9..7273b947c86 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryStorageTest.java
@@ -34,7 +34,6 @@ import org.sonar.db.webhook.WebhookDeliveryDto;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.sonar.db.webhook.WebhookDbTesting.newDto;
 import static org.sonar.db.webhook.WebhookDbTesting.selectAllDeliveryUuids;
 
 public class WebhookDeliveryStorageTest {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java
index 534702838c3..1e627f560e3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookDeliveryTest.java
@@ -21,9 +21,6 @@ package org.sonar.server.webhook;
 
 import java.io.IOException;
 import org.junit.Test;
-import org.sonar.server.webhook.Webhook;
-import org.sonar.server.webhook.WebhookDelivery;
-import org.sonar.server.webhook.WebhookPayload;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java
index 2615c87ade7..58b17bf35ee 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookModuleTest.java
@@ -23,6 +23,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.sonar.core.platform.ComponentContainer;
+import org.sonar.server.webhook.WebhookModule;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java
index a494b9a86e7..a494b9a86e7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookPayloadFactoryImplTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookTest.java
index 64778c0dfa4..64778c0dfa4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookTest.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index 0b1e7bcfbab..cf5e8b244cc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -28,7 +28,6 @@ import org.sonar.api.resources.ResourceTypes;
 import org.sonar.api.rules.AnnotationRuleParser;
 import org.sonar.api.rules.XMLRuleParser;
 import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
-import org.sonar.server.ce.CeModule;
 import org.sonar.ce.notification.ReportAnalysisFailureNotificationModule;
 import org.sonar.core.component.DefaultResourceTypes;
 import org.sonar.core.extension.CoreExtensionsInstaller;
@@ -42,6 +41,7 @@ import org.sonar.server.batch.BatchWsModule;
 import org.sonar.server.branch.BranchFeatureProxyImpl;
 import org.sonar.server.branch.pr.ws.PullRequestWsModule;
 import org.sonar.server.branch.ws.BranchWsModule;
+import org.sonar.server.ce.CeModule;
 import org.sonar.server.ce.ws.CeWsModule;
 import org.sonar.server.component.ComponentCleanerService;
 import org.sonar.server.component.ComponentFinder;