18 files changed, 23 insertions, 16 deletions
diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle
index 626c72a9ad3..7362ffc3ad6 100644
--- a/server/sonar-ce-task-projectanalysis/build.gradle
+++ b/server/sonar-ce-task-projectanalysis/build.gradle
@@ -63,7 +63,6 @@ dependencies {
   testCompile project(':server:sonar-db-testing')
   testCompile project(':sonar-testing-harness')
   testCompile project(path: ":server:sonar-ce-task", configuration: "tests")
-  testCompile project(path: ":server:sonar-server", configuration: "tests")
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
 }
 
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 13ff9a20c67..063ee7dcfcb 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -80,16 +80,3 @@ dependencies {
 
   runtime 'io.jsonwebtoken:jjwt-jackson'
 }
-
-task testJar(type: Jar) {
-  classifier = 'tests'
-  from sourceSets.test.output
-}
-
-configurations {
-  tests
-}
-
-artifacts {
- tests testJar
-}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ClusterFeature.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/ClusterFeature.java
index 24d8617a4e1..24d8617a4e1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/ClusterFeature.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/ClusterFeature.java
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/LicenseReader.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/LicenseReader.java
index 22029d62a36..22029d62a36 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/LicenseReader.java
+++ b/server/sonar-webserver-common/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-common/src/main/java/org/sonar/server/telemetry/package-info.java
new file mode 100644
index 00000000000..ce3724b93a5
--- /dev/null
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/telemetry/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2019 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.telemetry;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/GlobalLockManager.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/GlobalLockManager.java
index 81f13b22a1d..81f13b22a1d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/util/GlobalLockManager.java
+++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/util/GlobalLockManager.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java
index d11c03152b8..d11c03152b8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/BooleanTypeValidationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java
index b88c3fbb651..b88c3fbb651 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/FloatTypeValidationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java
index 8a069e1eae2..8a069e1eae2 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/GlobalLockManagerTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java
index e9b1953dd5a..e9b1953dd5a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/IntegerTypeValidationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/LongTypeValidationTest.java
index 2f7d7e0946e..2f7d7e0946e 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/LongTypeValidationTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/LongTypeValidationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java
index 9f2630fd0de..9f2630fd0de 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringListTypeValidationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringTypeValidationTest.java
index dde3afa3543..dde3afa3543 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/StringTypeValidationTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/StringTypeValidationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TextTypeValidationTest.java
index 4261f95c580..4261f95c580 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/TextTypeValidationTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TextTypeValidationTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java
index 3ff709c8f0f..3ff709c8f0f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationModuleTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTest.java
index 4dbae47cb37..4dbae47cb37 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTest.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTest.java
diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTesting.java
index b237ba62aab..b237ba62aab 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/util/TypeValidationsTesting.java
+++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/util/TypeValidationsTesting.java
diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
index b5d66accd1c..eaec81fa3ba 100644
--- a/server/sonar-webserver-webapi/build.gradle
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -18,7 +18,6 @@ dependencies {
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-db-dao')
   compile project(':server:sonar-process')
-  compile project(':server:sonar-server')
   compile project(':server:sonar-webserver-auth')
   compile project(':server:sonar-webserver-es')
   compile project(':server:sonar-webserver-ws')
@@ -37,7 +36,6 @@ dependencies {
   testCompile 'javax.servlet:javax.servlet-api'
   testCompile 'org.mockito:mockito-core'
   testCompile project(':server:sonar-db-testing')
-  testCompile project(path: ":server:sonar-server", configuration: "tests")
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-common", configuration: "tests")