24 files changed, 14 insertions, 35 deletions
diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle
index c10f7b688e0..800286bde41 100644
--- a/server/sonar-ce-common/build.gradle
+++ b/server/sonar-ce-common/build.gradle
@@ -51,6 +51,5 @@ dependencies {
   testCompile 'org.assertj:assertj-guava'
   testCompile 'org.hamcrest:hamcrest-all'
   testCompile project(':sonar-plugin-api-impl')
-  testCompile testFixtures(project(':server:sonar-db-dao'))
-  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile testFixtures(project(':server:sonar-server-common'))
 }
diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle
index 47e0a9999dd..e9eca578474 100644
--- a/server/sonar-ce-task-projectanalysis/build.gradle
+++ b/server/sonar-ce-task-projectanalysis/build.gradle
@@ -50,17 +50,15 @@ dependencies {
 
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'junit:junit'
   testCompile 'org.apache.logging.log4j:log4j-api'
   testCompile 'org.apache.logging.log4j:log4j-core'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.assertj:assertj-guava'
   testCompile 'org.mockito:mockito-core'
   testCompile 'org.reflections:reflections'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
   testCompile project(':sonar-testing-harness')
   testCompile project(path: ":server:sonar-ce-task", configuration: "tests")
-  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile testFixtures(project(':server:sonar-server-common'))
 }
 
 task testJar(type: Jar) {
diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle
index 284828db542..5e027f81878 100644
--- a/server/sonar-server-common/build.gradle
+++ b/server/sonar-server-common/build.gradle
@@ -6,12 +6,6 @@ sonarqube {
   }
 }
 
-configurations {
-  tests
-
-  testCompile.extendsFrom tests
-}
-
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
@@ -32,10 +26,6 @@ dependencies {
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
-  // "tests" dependencies are pulled by other modules which depends on "tests" configuration, "testCompile" are not pulled
-  tests 'org.codelibs.elasticsearch.module:analysis-common'
-  tests 'org.elasticsearch:mocksocket'
-
   testCompile 'ch.qos.logback:logback-core'
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.squareup.okhttp3:mockwebserver'
@@ -51,13 +41,12 @@ dependencies {
   testCompile project(path: ':sonar-plugin-api', configuration: 'shadow')
   testCompile project(':sonar-plugin-api-impl')
   testCompile project(':sonar-testing-harness')
-}
+    
+  testFixturesApi 'junit:junit'
+  testFixturesApi testFixtures(project(':server:sonar-db-dao'))
 
-task testJar(type: Jar) {
-  classifier = 'tests'
-  from sourceSets.test.output
-}
+  testFixturesCompileOnly 'com.google.code.findbugs:jsr305'
 
-artifacts {
-  tests testJar
+  testFixturesImplementation 'org.codelibs.elasticsearch.module:analysis-common'
+  testFixturesImplementation 'org.elasticsearch:mocksocket'
 }
diff --git a/server/sonar-server-common/src/test/java/org/elasticsearch/transport/MockTcpTransport.java b/server/sonar-server-common/src/testFixtures/java/org/elasticsearch/transport/MockTcpTransport.java
index b5d89ef054d..b5d89ef054d 100644
--- a/server/sonar-server-common/src/test/java/org/elasticsearch/transport/MockTcpTransport.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/elasticsearch/transport/MockTcpTransport.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/EsTester.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/EsTester.java
index 9d69c0413f3..9d69c0413f3 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/EsTester.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/EsTester.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/FakeDoc.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/FakeDoc.java
index d199ed9323a..d199ed9323a 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/FakeDoc.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/FakeDoc.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/TestProjectIndexers.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/TestProjectIndexers.java
index fb858911533..fb858911533 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/TestProjectIndexers.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/TestProjectIndexers.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/newindex/FakeIndexDefinition.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/newindex/FakeIndexDefinition.java
index d6dfd760540..d6dfd760540 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/newindex/FakeIndexDefinition.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/newindex/FakeIndexDefinition.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java
index 60ddbdbde5b..60ddbdbde5b 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/IssueDocTesting.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/issue/IssueDocTesting.java
index c63f12e950c..c63f12e950c 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/IssueDocTesting.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/issue/IssueDocTesting.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/IssuesChangesNotificationBuilderTesting.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/issue/notification/IssuesChangesNotificationBuilderTesting.java
index 43f5cbfd5a2..43f5cbfd5a2 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/notification/IssuesChangesNotificationBuilderTesting.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/issue/notification/IssuesChangesNotificationBuilderTesting.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/l18n/I18nRule.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/l18n/I18nRule.java
index f81a2f09b45..f81a2f09b45 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/l18n/I18nRule.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/l18n/I18nRule.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java
index a5b52317a37..a5b52317a37 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/organization/TestDefaultOrganizationProvider.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/organization/TestOrganizationFlags.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/organization/TestOrganizationFlags.java
index f5a6d71cd33..f5a6d71cd33 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/organization/TestOrganizationFlags.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/organization/TestOrganizationFlags.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/platform/monitoring/SystemInfoTesting.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/platform/monitoring/SystemInfoTesting.java
index a438af791b9..a438af791b9 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/platform/monitoring/SystemInfoTesting.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/platform/monitoring/SystemInfoTesting.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/platform/monitoring/cluster/TestGlobalSystemInfoSection.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/platform/monitoring/cluster/TestGlobalSystemInfoSection.java
index 534c0f5df46..534c0f5df46 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/platform/monitoring/cluster/TestGlobalSystemInfoSection.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/platform/monitoring/cluster/TestGlobalSystemInfoSection.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/platform/monitoring/cluster/TestSystemInfoSection.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/platform/monitoring/cluster/TestSystemInfoSection.java
index 0ae8b3aec57..0ae8b3aec57 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/platform/monitoring/cluster/TestSystemInfoSection.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/platform/monitoring/cluster/TestSystemInfoSection.java
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/source/index/FileSourceTesting.java b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/source/index/FileSourceTesting.java
index 86624383dc4..86624383dc4 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/source/index/FileSourceTesting.java
+++ b/server/sonar-server-common/src/testFixtures/java/org/sonar/server/source/index/FileSourceTesting.java
diff --git a/server/sonar-webserver-api/build.gradle b/server/sonar-webserver-api/build.gradle
index 93b373805f7..561fd3957d5 100644
--- a/server/sonar-webserver-api/build.gradle
+++ b/server/sonar-webserver-api/build.gradle
@@ -35,7 +35,6 @@ dependencies {
   testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'javax.servlet:javax.servlet-api'
   testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
-  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile testFixtures(project(':server:sonar-server-common'))
   testCompile project(':sonar-testing-harness')
 }
diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle
index cba572bb3ba..2882242d7fc 100644
--- a/server/sonar-webserver-auth/build.gradle
+++ b/server/sonar-webserver-auth/build.gradle
@@ -35,8 +35,7 @@ dependencies {
   testCompile 'org.apache.logging.log4j:log4j-core'
   testCompile 'org.assertj:assertj-guava'
   testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
-  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile testFixtures(project(':server:sonar-server-common'))
   testCompile project(':sonar-testing-harness')
 
   runtime 'io.jsonwebtoken:jjwt-jackson'
diff --git a/server/sonar-webserver-core/build.gradle b/server/sonar-webserver-core/build.gradle
index 46fd497fa9f..824739f42c7 100644
--- a/server/sonar-webserver-core/build.gradle
+++ b/server/sonar-webserver-core/build.gradle
@@ -61,7 +61,6 @@ dependencies {
   testCompile 'com.h2database:h2'
   testCompile 'com.squareup.okhttp3:mockwebserver'
   testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'junit:junit'
   testCompile 'org.apache.logging.log4j:log4j-api'
   testCompile 'org.apache.logging.log4j:log4j-core'
   testCompile 'org.assertj:assertj-core'
@@ -71,8 +70,7 @@ dependencies {
   testCompile 'org.hamcrest:hamcrest-all'
   testCompile 'org.mockito:mockito-core'
   testCompile 'org.subethamail:subethasmtp'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
-  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile testFixtures(project(':server:sonar-server-common'))
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile testFixtures(project(':server:sonar-webserver-ws'))
diff --git a/server/sonar-webserver-es/build.gradle b/server/sonar-webserver-es/build.gradle
index cea503301be..d69e85e01aa 100644
--- a/server/sonar-webserver-es/build.gradle
+++ b/server/sonar-webserver-es/build.gradle
@@ -27,9 +27,8 @@ dependencies {
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
-  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile testFixtures(project(':server:sonar-server-common'))
   testCompile project(':sonar-testing-harness')
 }
 
diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
index 2d3a2c1772f..d9501e61847 100644
--- a/server/sonar-webserver-webapi/build.gradle
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -33,8 +33,7 @@ dependencies {
   testCompile 'com.squareup.okhttp3:mockwebserver'
   testCompile 'javax.servlet:javax.servlet-api'
   testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
-  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile testFixtures(project(':server:sonar-server-common'))
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile testFixtures(project(':server:sonar-webserver-ws'))
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle
index cd4e3185417..758f76bca3c 100644
--- a/server/sonar-webserver/build.gradle
+++ b/server/sonar-webserver/build.gradle
@@ -26,8 +26,7 @@ dependencies {
   testCompile 'org.mockito:mockito-core'
   testCompile 'org.eclipse.jetty:jetty-server'
   testCompile 'org.eclipse.jetty:jetty-servlet'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
-  testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile testFixtures(project(':server:sonar-server-common'))
   testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests")
   testCompile project(path: ":server:sonar-webserver-es", configuration: "tests")
   testCompile project(':sonar-testing-harness')