13 files changed, 111 insertions, 53 deletions
diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle
index c028c302b2f..0de22abccf3 100644
--- a/server/sonar-ce-common/build.gradle
+++ b/server/sonar-ce-common/build.gradle
@@ -31,25 +31,29 @@ configurations {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
+  compile 'com.google.guava:guava'
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
+  compile project(':server:sonar-ce-task')
   compile project(':server:sonar-db-dao')
+  compile project(':server:sonar-server-common')
+  compile project(':sonar-core')
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
 
   compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly project(':server:sonar-ce-task')
-  compileOnly project(':server:sonar-server-common')
 
   testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.h2database:h2'
   testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'commons-lang:commons-lang'
   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 project(':sonar-plugin-api')
-  testCompile project(':sonar-core')
+  testCompile 'org.hamcrest:hamcrest-all'
+  testCompile project(':sonar-plugin-api-impl')
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+
+  testRuntime 'com.h2database:h2'
 }
diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle
index 62914da5e86..626c72a9ad3 100644
--- a/server/sonar-ce-task-projectanalysis/build.gradle
+++ b/server/sonar-ce-task-projectanalysis/build.gradle
@@ -25,16 +25,30 @@ dependencies {
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
 
+  compile 'commons-codec:commons-codec'
+  compile 'commons-io:commons-io'
+  compile 'commons-lang:commons-lang'
+  compile 'com.google.code.gson:gson'
+  compile 'com.google.guava:guava'
+  compile 'com.google.code.findbugs:jsr305'
+  compile 'com.google.protobuf:protobuf-java'
+  compile 'com.googlecode.java-diff-utils:diffutils'
+  compile 'org.mybatis:mybatis'
+  compile 'org.picocontainer:picocontainer'
+  
+  compile project(':sonar-core')
+  compile project(':server:sonar-ce-task')
+  compile project(':server:sonar-db-core')
+  compile project(':server:sonar-db-dao')
+  compile project(':server:sonar-db-migration')
+  compile project(':server:sonar-process')
+  compile project(':server:sonar-server-common')
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+  compile project(':sonar-plugin-api-impl')
+  compile project(':sonar-duplications')
+  compile project(':sonar-scanner-protocol')
+
   compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly 'com.googlecode.java-diff-utils:diffutils'
-  compileOnly project(':sonar-core')
-  compileOnly project(':server:sonar-ce-task')
-  compileOnly project(':server:sonar-db-dao')
-  compileOnly project(':server:sonar-process')
-  compileOnly project(':server:sonar-server-common')
-  compileOnly project(':sonar-plugin-api')
-  compileOnly project(':sonar-plugin-api-impl')
-  compileOnly project(':sonar-duplications')
 
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.h2database:h2'
@@ -47,6 +61,7 @@ dependencies {
   testCompile 'org.mockito:mockito-core'
   testCompile 'org.reflections:reflections'
   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-ce-task/build.gradle b/server/sonar-ce-task/build.gradle
index 27d6edf9ce5..9d9f32ac4b0 100644
--- a/server/sonar-ce-task/build.gradle
+++ b/server/sonar-ce-task/build.gradle
@@ -17,14 +17,15 @@ sourceSets {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
+  compile 'com.google.guava:guava'
   compile 'org.picocontainer:picocontainer'
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
 
-  compile project(':server:sonar-process')
+  compile project(':server:sonar-db-dao')
   compile project(':server:sonar-server-common')
   compile project(':sonar-core')
-  compileOnly project(path: ':sonar-plugin-api')
+  compileOnly project(path: ':sonar-plugin-api', configuration: 'shadow')
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
diff --git a/server/sonar-ce/build.gradle b/server/sonar-ce/build.gradle
index d54e627ec32..434c0c2b27e 100644
--- a/server/sonar-ce/build.gradle
+++ b/server/sonar-ce/build.gradle
@@ -8,22 +8,37 @@ sonarqube {
 
 dependencies {
   // please keep the list grouped by configuration and ordered by name
-
+  compile 'com.google.guava:guava'
   compile 'com.google.protobuf:protobuf-java'
+  compile 'com.hazelcast:hazelcast'
+  compile 'commons-io:commons-io'
+  compile 'org.apache.commons:commons-dbcp2'
   compile 'org.nanohttpd:nanohttpd'
+  compile 'org.picocontainer:picocontainer'
   compile project(':server:sonar-ce-common')
   compile project(':server:sonar-ce-task')
   compile project(':server:sonar-ce-task-projectanalysis')
+  compile project(':server:sonar-db-dao')
+  compile project(':server:sonar-db-core')
+  compile project(':server:sonar-process')
+  compile project(':server:sonar-ce-task')
   compile project(':server:sonar-server-common')
-
+  compile project(':sonar-core')
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+  compile project(':sonar-plugin-api-impl')
+  compile project(':sonar-ws')
+  
   compileOnly 'com.google.code.findbugs:jsr305'
 
   testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.h2database:h2'
   testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
-  testCompile 'org.assertj:assertj-guava'
   testCompile 'org.mockito:mockito-core'
+  testCompile 'org.slf4j:slf4j-api'
+  
   testCompile project(':server:sonar-db-testing')
+
+  testRuntime 'com.h2database:h2'
+
 }
diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle
index 5e1cfc7b748..77ecbeb8818 100644
--- a/server/sonar-db-core/build.gradle
+++ b/server/sonar-db-core/build.gradle
@@ -9,16 +9,15 @@ dependencies {
 
   compile 'ch.qos.logback:logback-classic'
   compile 'ch.qos.logback:logback-core'
-  compile 'commons-codec:commons-codec'
-  compile 'org.apache.commons:commons-dbcp2'
+  compile 'com.google.guava:guava'
   compile 'commons-dbutils:commons-dbutils'
-  compile 'net.jpountz.lz4:lz4'
-  compile 'org.apache.commons:commons-csv'
+  compile 'commons-io:commons-io'
+  compile 'commons-lang:commons-lang'
+  compile 'org.apache.commons:commons-dbcp2'
   compile 'org.mybatis:mybatis'
+  compile 'org.picocontainer:picocontainer'
   compile 'org.slf4j:slf4j-api'
   compile project(':server:sonar-process')
-  compile project(':sonar-core')
-  compile project(':sonar-scanner-protocol')
   compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
 
@@ -61,9 +60,7 @@ task testJar(type: Jar) {
   from sourceSets.test.output
 }
 
-configurations {
-  tests
-}
+configurations { tests { extendsFrom testRuntime } }
 
 artifacts {
    tests testJar
diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle
index 12e9ed4500f..0443ad91e38 100644
--- a/server/sonar-db-dao/build.gradle
+++ b/server/sonar-db-dao/build.gradle
@@ -7,8 +7,16 @@ sonarqube {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
+  compile 'com.google.guava:guava'
+  compile 'com.google.protobuf:protobuf-java'
+  compile 'commons-dbutils:commons-dbutils'
+  compile 'commons-io:commons-io'
+  compile 'commons-lang:commons-lang'
+  compile 'net.jpountz.lz4:lz4'
+  compile 'org.mybatis:mybatis'
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+
   compile project(':server:sonar-db-core')
-  compile project(':server:sonar-db-migration')
   compile project(':sonar-core')
 
   compileOnly 'com.google.code.findbugs:jsr305'
diff --git a/server/sonar-db-migration/build.gradle b/server/sonar-db-migration/build.gradle
index dd2969a4dea..282b5bc3c65 100644
--- a/server/sonar-db-migration/build.gradle
+++ b/server/sonar-db-migration/build.gradle
@@ -7,7 +7,14 @@ sonarqube {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
+  compile 'com.google.guava:guava'
+  compile 'commons-lang:commons-lang'
+  compile 'commons-codec:commons-codec'
+  compile 'org.picocontainer:picocontainer'
+  compile 'commons-dbutils:commons-dbutils'
+
   compile project(':server:sonar-db-core')
+  compile project(':server:sonar-process')
   compile project(':sonar-core')
 
   compileOnly 'com.google.code.findbugs:jsr305'
@@ -17,8 +24,9 @@ dependencies {
   testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.dbunit:dbunit'
-  testCompile 'org.mockito:mockito-core'
   testCompile 'org.mindrot:jbcrypt'
+  testCompile 'org.mockito:mockito-core'
+  testCompile project(':sonar-scanner-protocol')
   testCompile project(':sonar-testing-harness')
   testCompile project(':server:sonar-db-core').sourceSets.test.output
 
diff --git a/server/sonar-db-testing/build.gradle b/server/sonar-db-testing/build.gradle
index a7fddde0420..78e9bf4192f 100644
--- a/server/sonar-db-testing/build.gradle
+++ b/server/sonar-db-testing/build.gradle
@@ -6,10 +6,8 @@ sonarqube {
 
 dependencies {
   // please keep the list grouped by configuration and ordered by name
-
   compile 'org.dbunit:dbunit'
-
+  
   compile project(':server:sonar-db-core').sourceSets.test.output
   compile project(':server:sonar-db-dao').sourceSets.test.output
-  compile project(':sonar-testing-harness')
 }
diff --git a/server/sonar-main/build.gradle b/server/sonar-main/build.gradle
index 40494cf097d..cb67a49fe04 100644
--- a/server/sonar-main/build.gradle
+++ b/server/sonar-main/build.gradle
@@ -8,16 +8,25 @@ dependencies {
   // please keep the list grouped by configuration and ordered by name
 
   compile 'ch.qos.logback:logback-classic'
+  compile 'ch.qos.logback:logback-core'
+
   // Required by our usage of Guava for clustering : CeWorkerFactoryImpl.getClusteredWorkerUUIDs()
   compile 'com.google.guava:guava'
   compile 'com.hazelcast:hazelcast'
-  compile 'com.hazelcast:hazelcast-client'
+  compile 'commons-io:commons-io'
+  compile 'commons-lang:commons-lang'
+  compile 'io.netty:netty-common'
   compile 'org.apache.logging.log4j:log4j-to-slf4j'
   compile 'org.apache.logging.log4j:log4j-api'
   compile 'org.elasticsearch.client:transport'
+  compile 'org.elasticsearch:elasticsearch'
+  compile 'org.elasticsearch:elasticsearch-core'
+  compile 'org.elasticsearch.plugin:transport-netty4-client'
   compile 'org.slf4j:slf4j-api'
   compile 'org.yaml:snakeyaml'
+  
   compile project(':server:sonar-process')
+  compile project(':sonar-core')
 
   compileOnly 'com.google.code.findbugs:jsr305'
 
diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle
index 48e763545b2..aef277baef4 100644
--- a/server/sonar-process/build.gradle
+++ b/server/sonar-process/build.gradle
@@ -8,25 +8,27 @@ dependencies {
   // please keep the list grouped by configuration and ordered by name
 
   compile 'ch.qos.logback:logback-classic'
+  compile 'ch.qos.logback:logback-core'
   compile 'commons-codec:commons-codec'
   compile 'commons-io:commons-io'
   compile 'commons-lang:commons-lang'
   compile 'com.google.code.gson:gson'
   compile 'com.google.guava:guava'
+  compile 'com.google.protobuf:protobuf-java'
   compile 'com.hazelcast:hazelcast'
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
   compile project(':sonar-core')
-  
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
+
   compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly 'com.google.protobuf:protobuf-java'
-  compileOnly 'org.nanohttpd:nanohttpd'
 
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.google.protobuf:protobuf-java'
   testCompile 'com.tngtech.java:junit-dataprovider'
+  testCompile 'junit:junit'
   testCompile 'org.assertj:assertj-core'
-  testCompile 'org.eclipse.jetty:jetty-server'
+  testCompile 'org.hamcrest:hamcrest-core'
   testCompile 'org.mockito:mockito-core'
   testCompile 'org.awaitility:awaitility'
   testCompile project(':sonar-testing-harness')
diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle
index 32537555a28..e4f13494136 100644
--- a/server/sonar-server-common/build.gradle
+++ b/server/sonar-server-common/build.gradle
@@ -16,18 +16,20 @@ dependencies {
   // please keep the list grouped by configuration and ordered by name
 
   compile 'org.apache.commons:commons-email'
+  compile 'commons-io:commons-io'
+  compile 'commons-lang:commons-lang'
   compile 'com.google.guava:guava'
   compile 'org.slf4j:slf4j-api'
   compile 'com.squareup.okhttp3:okhttp'
   compile 'org.elasticsearch.client:transport'
   compile project(':server:sonar-db-dao')
+  compile project(':server:sonar-db-migration')
+  compile project(':server:sonar-process')
   compile project(':sonar-core')
   compile project(':sonar-markdown')
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-ws')
 
-  compileOnly project(':sonar-plugin-api')
-  compileOnly project(':server:sonar-process')
-
   compileOnly 'com.google.code.findbugs:jsr305'
 
   // "tests" dependencies are pulled by other modules which depends on "tests" configuration, "testCompile" are not pulled
@@ -38,15 +40,18 @@ dependencies {
   testCompile 'com.google.code.findbugs:jsr305'
   testCompile 'com.h2database:h2'
   testCompile 'com.squareup.okhttp3:mockwebserver'
+  testCompile 'com.squareup.okio:okio'
   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.hamcrest:hamcrest-core'
   testCompile 'org.mockito:mockito-core'
   testCompile project(':server:sonar-db-testing')
+  testCompile project(path: ':sonar-plugin-api', configuration: 'shadow')
   testCompile project(':sonar-plugin-api-impl')
+  testCompile project(':sonar-testing-harness')
 }
 
 task testJar(type: Jar) {
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java
index 50f1bc102df..a3df08da451 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualityprofile/QPMeasureData.java
@@ -20,8 +20,6 @@
 package org.sonar.server.qualityprofile;
 
 import com.google.common.collect.ImmutableSortedSet;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import java.io.StringWriter;
 import java.util.Comparator;
 import java.util.Map;
@@ -29,6 +27,8 @@ import java.util.SortedSet;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import javax.annotation.concurrent.Immutable;
+import org.sonar.api.internal.google.gson.JsonObject;
+import org.sonar.api.internal.google.gson.JsonParser;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.util.UtcDateUtils;
 
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 1ba49c4c7da..3efd483fbd9 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -30,17 +30,13 @@ dependencies {
   compile 'ch.qos.logback:logback-core'
   compile 'com.google.code.gson:gson'
   compile 'com.google.protobuf:protobuf-java'
-  compile 'com.googlecode.java-diff-utils:diffutils'
-  compile 'com.hazelcast:hazelcast-client'
   compile 'commons-dbutils:commons-dbutils'
   compile 'io.jsonwebtoken:jjwt-api'
   compile 'io.jsonwebtoken:jjwt-impl'
-  compile 'javax.xml.bind:jaxb-api'
   compile 'org.apache.httpcomponents:httpclient'
   compile 'org.apache.logging.log4j:log4j-api'
   compile 'org.apache.tomcat.embed:tomcat-embed-core'
   compile 'org.apache.commons:commons-dbcp2'
-  compile 'org.elasticsearch.client:transport'
   compile 'org.picocontainer:picocontainer'
   compile 'org.slf4j:jul-to-slf4j'
   compile 'org.slf4j:slf4j-api'
@@ -55,11 +51,10 @@ dependencies {
   compile project(':server:sonar-process')
   compile project(':server:sonar-server-common')
   compile project(':sonar-core')
+  compile project(':sonar-duplications')
   compile project(':sonar-scanner-protocol')
   compile project(':sonar-markdown')
-  compile project(':sonar-duplications')
-  runtime project(path: ':sonar-plugin-api', configuration: 'shadow')
-  compileOnly project(path: ':sonar-plugin-api')
+  compile project(path: ':sonar-plugin-api', configuration: 'shadow')
   compile project(':sonar-plugin-api-impl')
   compile project(':sonar-ws')
 
@@ -84,6 +79,7 @@ dependencies {
   testCompile 'org.subethamail:subethasmtp'
   testCompile project(':server:sonar-db-testing')
   testCompile project(path: ":server:sonar-server-common", configuration: "tests")
+  testCompile project(':sonar-testing-harness')
 
   runtime 'io.jsonwebtoken:jjwt-jackson'
 }