SONAR-15595 Replace Gradle deprecated dependency scopes

26 files changed, 548 insertions, 548 deletions

diff --git a/server/sonar-alm-client/build.gradle b/server/sonar-alm-client/build.gradle
index 3a973be49b2..7d35c2e4533 100644
--- a/server/sonar-alm-client/build.gradle
+++ b/server/sonar-alm-client/build.gradle
@@ -1,24 +1,24 @@
 description = 'SonarQube :: ALM integrations :: Clients'
 
 dependencies {
-    compile project(':sonar-ws')
-    compile project(':server:sonar-webserver-api')
+    api project(':sonar-ws')
+    api project(':server:sonar-webserver-api')
 
-    compile 'com.google.code.gson:gson'
-    compile 'com.google.guava:guava'
-    compile 'com.squareup.okhttp3:okhttp'
-    compile 'commons-codec:commons-codec'
-    compile 'com.auth0:java-jwt'
-    compile 'org.bouncycastle:bcpkix-jdk15on:1.70'
-    compile'org.sonarsource.api.plugin:sonar-plugin-api'
+    api 'com.google.code.gson:gson'
+    api 'com.google.guava:guava'
+    api 'com.squareup.okhttp3:okhttp'
+    api 'commons-codec:commons-codec'
+    api 'com.auth0:java-jwt'
+    api 'org.bouncycastle:bcpkix-jdk15on:1.70'
+    api 'org.sonarsource.api.plugin:sonar-plugin-api'
 
-    testCompile project(':sonar-plugin-api-impl')
+    testImplementation project(':sonar-plugin-api-impl')
 
-    testCompile 'junit:junit'
-    testCompile 'com.tngtech.java:junit-dataprovider'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.assertj:assertj-guava'
-    testCompile 'org.mockito:mockito-core'
-    testCompile 'com.squareup.okhttp3:mockwebserver'
+    testImplementation 'junit:junit'
+    testImplementation 'com.tngtech.java:junit-dataprovider'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.assertj:assertj-guava'
+    testImplementation 'org.mockito:mockito-core'
+    testImplementation 'com.squareup.okhttp3:mockwebserver'
 
 }
diff --git a/server/sonar-auth-bitbucket/build.gradle b/server/sonar-auth-bitbucket/build.gradle
index 80f71c55fa7..445a0c2be16 100644
--- a/server/sonar-auth-bitbucket/build.gradle
+++ b/server/sonar-auth-bitbucket/build.gradle
@@ -1,25 +1,25 @@
 description = 'SonarQube :: Authentication :: Bitbucket'
 
 configurations {
-    testImplementation.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnlyApi
 }
 
 dependencies {
     // please keep the list ordered
 
-    compile 'com.github.scribejava:scribejava-apis'
-    compile 'com.github.scribejava:scribejava-core'
-    compile 'com.google.code.gson:gson'
-    compile project(':server:sonar-auth-common')
+    api 'com.github.scribejava:scribejava-apis'
+    api 'com.github.scribejava:scribejava-core'
+    api 'com.google.code.gson:gson'
+    api project(':server:sonar-auth-common')
 
-    compileOnly 'com.google.code.findbugs:jsr305'
-    compileOnly 'com.squareup.okhttp3:okhttp'
-    compileOnly 'javax.servlet:javax.servlet-api'
-    compileOnly project(':sonar-core')
+    compileOnlyApi 'com.google.code.findbugs:jsr305'
+    compileOnlyApi 'com.squareup.okhttp3:okhttp'
+    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi project(':sonar-core')
 
-    testCompile 'com.squareup.okhttp3:mockwebserver'
-    testCompile 'com.squareup.okhttp3:okhttp'
-    testCompile 'junit:junit'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.mockito:mockito-core'
+    testImplementation 'com.squareup.okhttp3:mockwebserver'
+    testImplementation 'com.squareup.okhttp3:okhttp'
+    testImplementation 'junit:junit'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.mockito:mockito-core'
 }
diff --git a/server/sonar-auth-common/build.gradle b/server/sonar-auth-common/build.gradle
index 7c598342345..0b79c334014 100644
--- a/server/sonar-auth-common/build.gradle
+++ b/server/sonar-auth-common/build.gradle
@@ -1,20 +1,20 @@
 description = 'SonarQube :: Authentication :: Common'
 
 configurations {
-    testImplementation.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnlyApi
 }
 
 dependencies {
     // please keep the list ordered
 
-    compile 'com.github.scribejava:scribejava-apis'
-    compile 'com.github.scribejava:scribejava-core'
+    api 'com.github.scribejava:scribejava-apis'
+    api 'com.github.scribejava:scribejava-core'
 
-    compileOnly 'com.google.code.findbugs:jsr305'
+    compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-    testCompile 'commons-lang:commons-lang'
-    testCompile 'com.squareup.okhttp3:mockwebserver'
-    testCompile 'junit:junit'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.mockito:mockito-core'
+    testImplementation 'commons-lang:commons-lang'
+    testImplementation 'com.squareup.okhttp3:mockwebserver'
+    testImplementation 'junit:junit'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.mockito:mockito-core'
 }
diff --git a/server/sonar-auth-github/build.gradle b/server/sonar-auth-github/build.gradle
index 9dbceacc719..811d44118a3 100644
--- a/server/sonar-auth-github/build.gradle
+++ b/server/sonar-auth-github/build.gradle
@@ -1,25 +1,25 @@
 description = 'SonarQube :: Authentication :: GitHub'
 
 configurations {
-    testImplementation.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnlyApi
 }
 
 dependencies {
     // please keep the list ordered
 
-    compile 'com.github.scribejava:scribejava-apis'
-    compile 'com.github.scribejava:scribejava-core'
-    compile 'com.google.code.gson:gson'
-    compile project(':server:sonar-auth-common')
+    api 'com.github.scribejava:scribejava-apis'
+    api 'com.github.scribejava:scribejava-core'
+    api 'com.google.code.gson:gson'
+    api project(':server:sonar-auth-common')
 
-    compileOnly 'com.google.code.findbugs:jsr305'
-    compileOnly 'com.squareup.okhttp3:okhttp'
-    compileOnly 'javax.servlet:javax.servlet-api'
-    compileOnly project(':sonar-core')
+    compileOnlyApi 'com.google.code.findbugs:jsr305'
+    compileOnlyApi 'com.squareup.okhttp3:okhttp'
+    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi project(':sonar-core')
 
-    testCompile 'com.squareup.okhttp3:mockwebserver'
-    testCompile 'com.squareup.okhttp3:okhttp'
-    testCompile 'junit:junit'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.mockito:mockito-core'
+    testImplementation 'com.squareup.okhttp3:mockwebserver'
+    testImplementation 'com.squareup.okhttp3:okhttp'
+    testImplementation 'junit:junit'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.mockito:mockito-core'
 }
diff --git a/server/sonar-auth-gitlab/build.gradle b/server/sonar-auth-gitlab/build.gradle
index 7f679b9506a..f1ece299f90 100644
--- a/server/sonar-auth-gitlab/build.gradle
+++ b/server/sonar-auth-gitlab/build.gradle
@@ -1,25 +1,25 @@
 description = 'SonarQube :: Authentication :: GitLab'
 
 configurations {
-    testImplementation.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnlyApi
 }
 
 dependencies {
     // please keep the list ordered
 
-    compile 'com.github.scribejava:scribejava-apis'
-    compile 'com.github.scribejava:scribejava-core'
-    compile 'com.google.code.gson:gson'
-    compile project(':server:sonar-auth-common')
+    api 'com.github.scribejava:scribejava-apis'
+    api 'com.github.scribejava:scribejava-core'
+    api 'com.google.code.gson:gson'
+    api project(':server:sonar-auth-common')
 
-    compileOnly 'com.google.code.findbugs:jsr305'
-    compileOnly 'com.squareup.okhttp3:okhttp'
-    compileOnly 'javax.servlet:javax.servlet-api'
-    compileOnly project(':sonar-core')
+    compileOnlyApi 'com.google.code.findbugs:jsr305'
+    compileOnlyApi 'com.squareup.okhttp3:okhttp'
+    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi project(':sonar-core')
 
-    testCompile 'com.squareup.okhttp3:mockwebserver'
-    testCompile 'com.squareup.okhttp3:okhttp'
-    testCompile 'junit:junit'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.mockito:mockito-core'
+    testImplementation 'com.squareup.okhttp3:mockwebserver'
+    testImplementation 'com.squareup.okhttp3:okhttp'
+    testImplementation 'junit:junit'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.mockito:mockito-core'
 }
diff --git a/server/sonar-auth-ldap/build.gradle b/server/sonar-auth-ldap/build.gradle
index 8af87f30bcb..6ef30e47a62 100644
--- a/server/sonar-auth-ldap/build.gradle
+++ b/server/sonar-auth-ldap/build.gradle
@@ -1,22 +1,22 @@
 description = 'SonarQube :: Authentication :: LDAP'
 
 configurations {
-    testImplementation.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnlyApi
 }
 
 dependencies {
     // please keep the list ordered
 
-    compile 'commons-lang:commons-lang'
+    api 'commons-lang:commons-lang'
 
-    compileOnly 'com.google.code.findbugs:jsr305'
-    compileOnly 'javax.servlet:javax.servlet-api'
-    compileOnly project(':sonar-core')
+    compileOnlyApi 'com.google.code.findbugs:jsr305'
+    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi project(':sonar-core')
 
-    testCompile 'com.tngtech.java:junit-dataprovider'
-    testCompile 'junit:junit'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.mockito:mockito-core'
-    testCompile project(":sonar-testing-ldap")
+    testImplementation 'com.tngtech.java:junit-dataprovider'
+    testImplementation 'junit:junit'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.mockito:mockito-core'
+    testImplementation project(":sonar-testing-ldap")
 
 }
diff --git a/server/sonar-auth-saml/build.gradle b/server/sonar-auth-saml/build.gradle
index 41c345f121f..cf41ccabb0c 100644
--- a/server/sonar-auth-saml/build.gradle
+++ b/server/sonar-auth-saml/build.gradle
@@ -1,24 +1,24 @@
 description = 'SonarQube :: Authentication :: SAML'
 
 configurations {
-    testImplementation.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnlyApi
 }
 
 dependencies {
     // please keep the list ordered
 
-    compile "com.onelogin:java-saml"
+    api "com.onelogin:java-saml"
 
-    compileOnly 'com.google.code.findbugs:jsr305'
-    compileOnly 'com.squareup.okhttp3:okhttp'
-    compileOnly 'javax.servlet:javax.servlet-api'
-    compileOnly 'org.json:json'
-    compileOnly project(':server:sonar-db-dao')
-    compileOnly project(':sonar-core')
+    compileOnlyApi 'com.google.code.findbugs:jsr305'
+    compileOnlyApi 'com.squareup.okhttp3:okhttp'
+    compileOnlyApi 'javax.servlet:javax.servlet-api'
+    compileOnlyApi 'org.json:json'
+    compileOnlyApi project(':server:sonar-db-dao')
+    compileOnlyApi project(':sonar-core')
 
-    testCompile 'com.tngtech.java:junit-dataprovider'
-    testCompile 'junit:junit'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.mockito:mockito-core'
-    testCompile testFixtures(project(':server:sonar-db-dao'))
+    testImplementation 'com.tngtech.java:junit-dataprovider'
+    testImplementation 'junit:junit'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.mockito:mockito-core'
+    testImplementation testFixtures(project(':server:sonar-db-dao'))
 }
diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle
index 207e2e46ad2..20e6562ad0b 100644
--- a/server/sonar-ce-common/build.gradle
+++ b/server/sonar-ce-common/build.gradle
@@ -25,31 +25,31 @@ processResources {
 }
 
 configurations {
-  testImplementation.extendsFrom compileOnly
+  testImplementation.extendsFrom compileOnlyApi
 }
 
 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 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile project(':server:sonar-ce-task')
-  compile project(':server:sonar-server-common')
-  compile project(':sonar-core')
-
-  compileOnly 'com.google.code.findbugs:jsr305'
-
-  testCompile 'com.google.code.findbugs:jsr305'
-  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.hamcrest:hamcrest-all'
-  testCompile project(':sonar-plugin-api-impl')
-  testCompile testFixtures(project(':server:sonar-server-common'))
+  api 'com.google.guava:guava'
+  api 'org.slf4j:jul-to-slf4j'
+  api 'org.slf4j:slf4j-api'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':server:sonar-ce-task')
+  api project(':server:sonar-server-common')
+  api project(':sonar-core')
+
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
+
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'commons-lang:commons-lang'
+  testImplementation 'junit:junit'
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'org.hamcrest:hamcrest-all'
+  testImplementation project(':sonar-plugin-api-impl')
+  testImplementation 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 5ad68e98bde..166e007fae0 100644
--- a/server/sonar-ce-task-projectanalysis/build.gradle
+++ b/server/sonar-ce-task-projectanalysis/build.gradle
@@ -17,43 +17,43 @@ sourceSets {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'org.slf4j:jul-to-slf4j'
-  compile 'org.slf4j:slf4j-api'
-  compile 'net.sf.trove4j:core:3.1.0'
-  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.sonarsource.api.plugin:sonar-plugin-api'
+  api 'org.slf4j:jul-to-slf4j'
+  api 'org.slf4j:slf4j-api'
+  api 'net.sf.trove4j:core:3.1.0'
+  api 'commons-codec:commons-codec'
+  api 'commons-io:commons-io'
+  api 'commons-lang:commons-lang'
+  api 'com.google.code.gson:gson'
+  api 'com.google.guava:guava'
+  api 'com.google.code.findbugs:jsr305'
+  api 'com.google.protobuf:protobuf-java'
+  api 'com.googlecode.java-diff-utils:diffutils'
+  api 'org.mybatis:mybatis'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
 
-  compile project(':sonar-core')
-  compile project(':server:sonar-ce-common')
-  compile project(':server:sonar-ce-task')
-  compile project(':server:sonar-db-migration')
-  compile project(':server:sonar-process')
-  compile project(':server:sonar-server-common')
-  compile project(':sonar-plugin-api-impl')
-  compile project(':sonar-duplications')
-  compile project(':sonar-scanner-protocol')
+  api project(':sonar-core')
+  api project(':server:sonar-ce-common')
+  api project(':server:sonar-ce-task')
+  api project(':server:sonar-db-migration')
+  api project(':server:sonar-process')
+  api project(':server:sonar-server-common')
+  api project(':sonar-plugin-api-impl')
+  api project(':sonar-duplications')
+  api project(':sonar-scanner-protocol')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-  compile project(':server:sonar-db-dao')
+  api project(':server:sonar-db-dao')
 
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  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.reflections:reflections'
-  testCompile project(':sonar-testing-harness')
-  testCompile testFixtures(project(':server:sonar-server-common'))
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'org.reflections:reflections'
+  testImplementation project(':sonar-testing-harness')
+  testImplementation testFixtures(project(':server:sonar-server-common'))
 
   testFixturesApi 'junit:junit'
   testFixturesApi 'org.assertj:assertj-core'
diff --git a/server/sonar-ce-task/build.gradle b/server/sonar-ce-task/build.gradle
index 1dd4ec7f979..c8d51225ef2 100644
--- a/server/sonar-ce-task/build.gradle
+++ b/server/sonar-ce-task/build.gradle
@@ -17,28 +17,28 @@ sourceSets {
 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-server-common')
-  compile project(':sonar-core')
-
-  compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly 'org.sonarsource.api.plugin:sonar-plugin-api'
-
-  testCompile 'ch.qos.logback:logback-access'
-  testCompile 'ch.qos.logback:logback-classic'
-  testCompile 'ch.qos.logback:logback-core'
-  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-guava'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'org.reflections:reflections'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
+  api 'com.google.guava:guava'
+  api 'org.slf4j:jul-to-slf4j'
+  api 'org.slf4j:slf4j-api'
+
+  api project(':server:sonar-server-common')
+  api project(':sonar-core')
+
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'org.sonarsource.api.plugin:sonar-plugin-api'
+
+  testImplementation 'ch.qos.logback:logback-access'
+  testImplementation 'ch.qos.logback:logback-classic'
+  testImplementation 'ch.qos.logback:logback-core'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'junit:junit'
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.reflections:reflections'
+  testImplementation testFixtures(project(':server:sonar-db-dao'))
 
   testFixturesApi 'org.assertj:assertj-core'
 
diff --git a/server/sonar-ce/build.gradle b/server/sonar-ce/build.gradle
index 75db8ee6fd7..a93dc41a6ad 100644
--- a/server/sonar-ce/build.gradle
+++ b/server/sonar-ce/build.gradle
@@ -8,33 +8,33 @@ sonar {
 
 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 'com.hazelcast:hazelcast-kubernetes'
-  compile 'commons-io:commons-io'
-  compile 'com.zaxxer:HikariCP'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile project(':server:sonar-ce-common')
-  compile project(':server:sonar-ce-task')
-  compile project(':server:sonar-ce-task-projectanalysis')
-  compile project(':server:sonar-process')
-  compile project(':server:sonar-ce-task')
-  compile project(':server:sonar-server-common')
-  compile project(':sonar-core')
-  compile project(':sonar-plugin-api-impl')
-  compile project(':sonar-ws')
+  api 'com.google.guava:guava'
+  api 'com.google.protobuf:protobuf-java'
+  api 'com.hazelcast:hazelcast'
+  api 'com.hazelcast:hazelcast-kubernetes'
+  api 'commons-io:commons-io'
+  api 'com.zaxxer:HikariCP'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':server:sonar-ce-common')
+  api project(':server:sonar-ce-task')
+  api project(':server:sonar-ce-task-projectanalysis')
+  api project(':server:sonar-process')
+  api project(':server:sonar-ce-task')
+  api project(':server:sonar-server-common')
+  api project(':sonar-core')
+  api project(':sonar-plugin-api-impl')
+  api project(':sonar-ws')
   
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'junit:junit'
-  testCompile 'org.assertj:assertj-core'
-  testCompile 'org.awaitility:awaitility'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'org.slf4j:slf4j-api'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.slf4j:slf4j-api'
 
-  testCompile testFixtures(project(':server:sonar-db-dao'))
+  testImplementation testFixtures(project(':server:sonar-db-dao'))
 
 }
diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle
index 845e2e645e5..30986cc2604 100644
--- a/server/sonar-db-core/build.gradle
+++ b/server/sonar-db-core/build.gradle
@@ -7,35 +7,35 @@ sonar {
 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 'com.google.guava:guava'
-  compile 'commons-io:commons-io'
-  compile 'commons-lang:commons-lang'
-  compile 'com.zaxxer:HikariCP'
-  compile 'org.mybatis:mybatis'
-  compile 'org.slf4j:slf4j-api'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile project(':server:sonar-process')
-  compile project(':sonar-plugin-api-impl')
+  api 'ch.qos.logback:logback-classic'
+  api 'ch.qos.logback:logback-core'
+  api 'com.google.guava:guava'
+  api 'commons-io:commons-io'
+  api 'commons-lang:commons-lang'
+  api 'com.zaxxer:HikariCP'
+  api 'org.mybatis:mybatis'
+  api 'org.slf4j:slf4j-api'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':server:sonar-process')
+  api project(':sonar-plugin-api-impl')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.h2database:h2'
-  testCompile 'com.microsoft.sqlserver:mssql-jdbc'
-  testCompile 'com.oracle.database.jdbc:ojdbc8'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'org.mockito:mockito-inline'
-  testCompile 'org.postgresql:postgresql'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.h2database:h2'
+  testImplementation 'com.microsoft.sqlserver:mssql-jdbc'
+  testImplementation 'com.oracle.database.jdbc:ojdbc8'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-inline'
+  testImplementation 'org.postgresql:postgresql'
 
-  testCompile project(':sonar-testing-harness')
+  testImplementation project(':sonar-testing-harness')
 
-  testRuntime 'com.h2database:h2'
-  testRuntime 'com.microsoft.sqlserver:mssql-jdbc'
-  testRuntime 'com.oracle.database.jdbc:ojdbc8'
-  testRuntime 'org.postgresql:postgresql'
+  testRuntimeOnly 'com.h2database:h2'
+  testRuntimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
+  testRuntimeOnly 'com.oracle.database.jdbc:ojdbc8'
+  testRuntimeOnly 'org.postgresql:postgresql'
 
   testFixturesApi 'commons-dbutils:commons-dbutils'
   testFixturesApi 'junit:junit'
diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle
index 59a2bf70848..dcaba9b60b6 100644
--- a/server/sonar-db-dao/build.gradle
+++ b/server/sonar-db-dao/build.gradle
@@ -7,36 +7,36 @@ sonar {
 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-io:commons-io'
-  compile 'commons-lang:commons-lang'
-  compile 'net.jpountz.lz4:lz4'
-  compile 'org.mybatis:mybatis'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-
-  compile project(':server:sonar-db-core')
-  compile project(':server:sonar-db-migration')
-  compile project(':sonar-core')
-
-  compileOnly 'com.google.code.findbugs:jsr305'
-
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'commons-dbutils:commons-dbutils'
-  testCompile 'junit:junit'
-  testCompile 'org.assertj:assertj-core'
-  testCompile 'org.assertj:assertj-guava'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'org.sonarsource.orchestrator:sonar-orchestrator'
-  testCompile project(':sonar-testing-harness')
-  testCompile project(':sonar-plugin-api-impl')
+  api 'com.google.guava:guava'
+  api 'com.google.protobuf:protobuf-java'
+  api 'commons-io:commons-io'
+  api 'commons-lang:commons-lang'
+  api 'net.jpountz.lz4:lz4'
+  api 'org.mybatis:mybatis'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+
+  api project(':server:sonar-db-core')
+  api project(':server:sonar-db-migration')
+  api project(':sonar-core')
+
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
+
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'commons-dbutils:commons-dbutils'
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.sonarsource.orchestrator:sonar-orchestrator'
+  testImplementation project(':sonar-testing-harness')
+  testImplementation project(':sonar-plugin-api-impl')
 
   testCompileOnly 'com.google.code.findbugs:jsr305'
 
-  testRuntime 'com.h2database:h2'
-  testRuntime 'com.microsoft.sqlserver:mssql-jdbc'
-  testRuntime 'com.oracle.database.jdbc:ojdbc8'
-  testRuntime 'org.postgresql:postgresql'
+  testRuntimeOnly 'com.h2database:h2'
+  testRuntimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
+  testRuntimeOnly 'com.oracle.database.jdbc:ojdbc8'
+  testRuntimeOnly 'org.postgresql:postgresql'
 
   testFixturesApi testFixtures(project(':server:sonar-db-core'))
 
diff --git a/server/sonar-db-migration/build.gradle b/server/sonar-db-migration/build.gradle
index c19929c27af..f278192f558 100644
--- a/server/sonar-db-migration/build.gradle
+++ b/server/sonar-db-migration/build.gradle
@@ -7,35 +7,35 @@ sonar {
 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 'com.fasterxml.staxmate:staxmate'
+  api 'com.google.guava:guava'
+  api 'commons-lang:commons-lang'
+  api 'commons-codec:commons-codec'
+  api 'com.fasterxml.staxmate:staxmate'
 
-  compile project(':server:sonar-db-core')
-  compile project(':server:sonar-process')
-  compile project(':sonar-core')
+  api project(':server:sonar-db-core')
+  api project(':server:sonar-process')
+  api project(':sonar-core')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'commons-dbutils:commons-dbutils'
-  testCompile 'com.squareup.okhttp3:mockwebserver'
-  testCompile 'junit:junit'
-  testCompile 'org.assertj:assertj-core'
-  testCompile 'org.mindrot:jbcrypt'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'org.xmlunit:xmlunit-core'
-  testCompile 'org.xmlunit:xmlunit-matchers'
-  testCompile project(':sonar-scanner-protocol')
-  testCompile project(':sonar-testing-harness')
-  testCompile testFixtures(project(':server:sonar-db-core'))
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'commons-dbutils:commons-dbutils'
+  testImplementation 'com.squareup.okhttp3:mockwebserver'
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.mindrot:jbcrypt'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.xmlunit:xmlunit-core'
+  testImplementation 'org.xmlunit:xmlunit-matchers'
+  testImplementation project(':sonar-scanner-protocol')
+  testImplementation project(':sonar-testing-harness')
+  testImplementation testFixtures(project(':server:sonar-db-core'))
 
-  testRuntime 'com.h2database:h2'
-  testRuntime 'com.microsoft.sqlserver:mssql-jdbc'
-  testRuntime 'com.oracle.database.jdbc:ojdbc8'
-  testRuntime 'org.postgresql:postgresql'
+  testRuntimeOnly 'com.h2database:h2'
+  testRuntimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
+  testRuntimeOnly 'com.oracle.database.jdbc:ojdbc8'
+  testRuntimeOnly 'org.postgresql:postgresql'
 }
 
 test {
diff --git a/server/sonar-main/build.gradle b/server/sonar-main/build.gradle
index a5679c57687..0e554b7104d 100644
--- a/server/sonar-main/build.gradle
+++ b/server/sonar-main/build.gradle
@@ -7,33 +7,33 @@ sonar {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'ch.qos.logback:logback-classic'
-  compile 'ch.qos.logback:logback-core'
+  api 'ch.qos.logback:logback-classic'
+  api '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 'commons-io:commons-io'
-  compile 'commons-lang:commons-lang'
-  compile 'org.apache.logging.log4j:log4j-to-slf4j'
-  compile 'org.apache.logging.log4j:log4j-api'
-  compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client'
-  compile 'org.elasticsearch:elasticsearch'
-  compile 'org.slf4j:slf4j-api'
-  compile 'org.yaml:snakeyaml'
+  api 'com.google.guava:guava'
+  api 'com.hazelcast:hazelcast'
+  api 'commons-io:commons-io'
+  api 'commons-lang:commons-lang'
+  api 'org.apache.logging.log4j:log4j-to-slf4j'
+  api 'org.apache.logging.log4j:log4j-api'
+  api 'org.elasticsearch.client:elasticsearch-rest-high-level-client'
+  api 'org.elasticsearch:elasticsearch'
+  api 'org.slf4j:slf4j-api'
+  api 'org.yaml:snakeyaml'
   
-  compile project(':server:sonar-process')
-  compile project(':sonar-core')
+  api project(':server:sonar-process')
+  api project(':sonar-core')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'junit:junit'
-  testCompile 'org.assertj:assertj-core'
-  testCompile 'org.awaitility:awaitility'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'com.squareup.okhttp3:mockwebserver'
-  testCompile 'commons-logging:commons-logging:1.2'
-  testCompile project(':sonar-testing-harness')
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'com.squareup.okhttp3:mockwebserver'
+  testImplementation 'commons-logging:commons-logging:1.2'
+  testImplementation project(':sonar-testing-harness')
 }
diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle
index 0ac0583073f..1be8e8beb6f 100644
--- a/server/sonar-process/build.gradle
+++ b/server/sonar-process/build.gradle
@@ -7,30 +7,30 @@ sonar {
 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 'com.hazelcast:hazelcast-kubernetes'
-  compile 'org.slf4j:jul-to-slf4j'
-  compile 'org.slf4j:slf4j-api'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile project(':sonar-core')
+  api 'ch.qos.logback:logback-classic'
+  api 'ch.qos.logback:logback-core'
+  api 'commons-codec:commons-codec'
+  api 'commons-io:commons-io'
+  api 'commons-lang:commons-lang'
+  api 'com.google.code.gson:gson'
+  api 'com.google.guava:guava'
+  api 'com.google.protobuf:protobuf-java'
+  api 'com.hazelcast:hazelcast'
+  api 'com.hazelcast:hazelcast-kubernetes'
+  api 'org.slf4j:jul-to-slf4j'
+  api 'org.slf4j:slf4j-api'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':sonar-core')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-  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.hamcrest:hamcrest-core'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'org.awaitility:awaitility'
-  testCompile project(':sonar-testing-harness')
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.google.protobuf:protobuf-java'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.hamcrest:hamcrest-core'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.awaitility:awaitility'
+  testImplementation project(':sonar-testing-harness')
 }
diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle
index 4591dcd9bfc..4f6caafbbb4 100644
--- a/server/sonar-server-common/build.gradle
+++ b/server/sonar-server-common/build.gradle
@@ -9,38 +9,38 @@ sonar {
 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:elasticsearch-rest-high-level-client'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  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(':sonar-ws')
+  api 'org.apache.commons:commons-email'
+  api 'commons-io:commons-io'
+  api 'commons-lang:commons-lang'
+  api 'com.google.guava:guava'
+  api 'org.slf4j:slf4j-api'
+  api 'com.squareup.okhttp3:okhttp'
+  api 'org.elasticsearch.client:elasticsearch-rest-high-level-client'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':server:sonar-db-dao')
+  api project(':server:sonar-db-migration')
+  api project(':server:sonar-process')
+  api project(':sonar-core')
+  api project(':sonar-markdown')
+  api project(':sonar-ws')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-  testCompile 'org.elasticsearch.plugin:transport-netty4-client'
-  testCompile 'ch.qos.logback:logback-core'
-  testCompile 'com.google.code.findbugs:jsr305'
-  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.hamcrest:hamcrest-core'
-  testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-db-dao'))
-  testCompile project(':sonar-plugin-api-impl')
-  testCompile project(':sonar-testing-harness')
+  testImplementation 'org.elasticsearch.plugin:transport-netty4-client'
+  testImplementation 'ch.qos.logback:logback-core'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.squareup.okhttp3:mockwebserver'
+  testImplementation 'com.squareup.okio:okio'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'junit:junit'
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.hamcrest:hamcrest-core'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation testFixtures(project(':server:sonar-db-dao'))
+  testImplementation project(':sonar-plugin-api-impl')
+  testImplementation project(':sonar-testing-harness')
     
   testFixturesApi 'junit:junit'
   testFixturesApi testFixtures(project(':server:sonar-db-dao'))
diff --git a/server/sonar-webserver-api/build.gradle b/server/sonar-webserver-api/build.gradle
index 872a3d14fd4..18082686d54 100644
--- a/server/sonar-webserver-api/build.gradle
+++ b/server/sonar-webserver-api/build.gradle
@@ -17,26 +17,26 @@ sourceSets {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'com.google.guava:guava'
-  compile 'io.jsonwebtoken:jjwt-api'
-  compile 'io.jsonwebtoken:jjwt-impl'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile project(':sonar-core')
-  compile project(':server:sonar-process')
-  compile project(':server:sonar-server-common')
-  compile project(':sonar-plugin-api-impl')
-  compile 'org.mindrot:jbcrypt'
-
-  compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly 'javax.servlet:javax.servlet-api'
-
-  testCompile 'org.assertj:assertj-guava'
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'javax.servlet:javax.servlet-api'
-  testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-server-common'))
-  testCompile project(':sonar-testing-harness')
+  api 'com.google.guava:guava'
+  api 'io.jsonwebtoken:jjwt-api'
+  api 'io.jsonwebtoken:jjwt-impl'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':sonar-core')
+  api project(':server:sonar-process')
+  api project(':server:sonar-server-common')
+  api project(':sonar-plugin-api-impl')
+  api 'org.mindrot:jbcrypt'
+
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'javax.servlet:javax.servlet-api'
+
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'javax.servlet:javax.servlet-api'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation testFixtures(project(':server:sonar-server-common'))
+  testImplementation project(':sonar-testing-harness')
 
   testFixturesApi 'junit:junit'
 
diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle
index 4c981061e48..bda05a4689e 100644
--- a/server/sonar-webserver-auth/build.gradle
+++ b/server/sonar-webserver-auth/build.gradle
@@ -7,34 +7,34 @@ sonar {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'com.google.code.gson:gson'
-  compile 'com.google.guava:guava'
-  compile 'io.jsonwebtoken:jjwt-api'
-  compile 'io.jsonwebtoken:jjwt-impl'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile project(':sonar-core')
-  compile project(':server:sonar-process')
-  compile project(':server:sonar-server-common')
-  compile project(':server:sonar-webserver-api')
-  compile project(':sonar-plugin-api-impl')
-  compile project(':server:sonar-auth-ldap')
-  compile 'org.mindrot:jbcrypt'
-
-  compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly 'javax.servlet:javax.servlet-api'
-
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'javax.servlet:javax.servlet-api'
-  testCompile 'org.apache.logging.log4j:log4j-api'
-  testCompile 'org.apache.logging.log4j:log4j-core'
-  testCompile 'org.assertj:assertj-guava'
-  testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-server-common'))
-  testCompile project(':sonar-testing-harness')
+  api 'com.google.code.gson:gson'
+  api 'com.google.guava:guava'
+  api 'io.jsonwebtoken:jjwt-api'
+  api 'io.jsonwebtoken:jjwt-impl'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':sonar-core')
+  api project(':server:sonar-process')
+  api project(':server:sonar-server-common')
+  api project(':server:sonar-webserver-api')
+  api project(':sonar-plugin-api-impl')
+  api project(':server:sonar-auth-ldap')
+  api 'org.mindrot:jbcrypt'
+
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'javax.servlet:javax.servlet-api'
+
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'javax.servlet:javax.servlet-api'
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation testFixtures(project(':server:sonar-server-common'))
+  testImplementation project(':sonar-testing-harness')
 
   testCompileOnly  'com.google.code.findbugs:jsr305'
 
-  runtime 'io.jsonwebtoken:jjwt-jackson'
+  runtimeOnly 'io.jsonwebtoken:jjwt-jackson'
 
   testFixturesApi 'junit:junit'
 
diff --git a/server/sonar-webserver-core/build.gradle b/server/sonar-webserver-core/build.gradle
index da0a48c0892..e4fc8952baa 100644
--- a/server/sonar-webserver-core/build.gradle
+++ b/server/sonar-webserver-core/build.gradle
@@ -18,62 +18,62 @@ processResources {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'ch.qos.logback:logback-access'
-  compile 'ch.qos.logback:logback-classic'
-  compile 'ch.qos.logback:logback-core'
-  compile 'com.google.code.gson:gson'
-  compile 'com.google.protobuf:protobuf-java'
-  compile 'io.jsonwebtoken:jjwt-api'
-  compile 'io.jsonwebtoken:jjwt-impl'
-  compile 'org.apache.httpcomponents:httpclient'
-  compile 'org.apache.logging.log4j:log4j-api'
-  compile 'org.apache.tomcat.embed:tomcat-embed-core'
-  compile 'com.zaxxer:HikariCP'
-  compile 'org.slf4j:jul-to-slf4j'
-  compile 'org.slf4j:slf4j-api'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile 'org.sonarsource.update-center:sonar-update-center-common'
-  compile 'org.mindrot:jbcrypt'
+  api 'ch.qos.logback:logback-access'
+  api 'ch.qos.logback:logback-classic'
+  api 'ch.qos.logback:logback-core'
+  api 'com.google.code.gson:gson'
+  api 'com.google.protobuf:protobuf-java'
+  api 'io.jsonwebtoken:jjwt-api'
+  api 'io.jsonwebtoken:jjwt-impl'
+  api 'org.apache.httpcomponents:httpclient'
+  api 'org.apache.logging.log4j:log4j-api'
+  api 'org.apache.tomcat.embed:tomcat-embed-core'
+  api 'com.zaxxer:HikariCP'
+  api 'org.slf4j:jul-to-slf4j'
+  api 'org.slf4j:slf4j-api'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api 'org.sonarsource.update-center:sonar-update-center-common'
+  api 'org.mindrot:jbcrypt'
 
-  compile project(':server:sonar-ce-common')
-  compile project(':server:sonar-ce-task')
-  compile project(':server:sonar-ce-task-projectanalysis')
-  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-pushapi')
-  compile project(':server:sonar-webserver-es')
-  compile project(':sonar-core')
-  compile project(':sonar-duplications')
-  compile project(':sonar-scanner-protocol')
-  compile project(':sonar-markdown')
-  compile project(':sonar-plugin-api-impl')
-  compile project(':sonar-ws')
+  api project(':server:sonar-ce-common')
+  api project(':server:sonar-ce-task')
+  api project(':server:sonar-ce-task-projectanalysis')
+  api project(':server:sonar-db-migration')
+  api project(':server:sonar-process')
+  api project(':server:sonar-server-common')
+  api project(':server:sonar-webserver-api')
+  api project(':server:sonar-webserver-pushapi')
+  api project(':server:sonar-webserver-es')
+  api project(':sonar-core')
+  api project(':sonar-duplications')
+  api project(':sonar-scanner-protocol')
+  api project(':sonar-markdown')
+  api project(':sonar-plugin-api-impl')
+  api project(':sonar-ws')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
   // not a transitive dep. At runtime lib/jdbc/h2 is used
-  compileOnly 'com.h2database:h2'
+  compileOnlyApi 'com.h2database:h2'
 
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.h2database:h2'
-  testCompile 'com.squareup.okhttp3:mockwebserver'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'commons-dbutils:commons-dbutils'
-  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.eclipse.jetty:jetty-server'
-  testCompile 'org.eclipse.jetty:jetty-servlet'
-  testCompile 'org.hamcrest:hamcrest-all'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'org.subethamail:subethasmtp'
-  testCompile testFixtures(project(':server:sonar-server-common'))
-  testCompile testFixtures(project(':server:sonar-webserver-auth'))
-  testCompile testFixtures(project(':server:sonar-webserver-es'))
-  testCompile testFixtures(project(':server:sonar-webserver-ws'))
-  testCompile project(':sonar-testing-harness')
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.h2database:h2'
+  testImplementation 'com.squareup.okhttp3:mockwebserver'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'commons-dbutils:commons-dbutils'
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'org.eclipse.jetty:jetty-server'
+  testImplementation 'org.eclipse.jetty:jetty-servlet'
+  testImplementation 'org.hamcrest:hamcrest-all'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.subethamail:subethasmtp'
+  testImplementation testFixtures(project(':server:sonar-server-common'))
+  testImplementation testFixtures(project(':server:sonar-webserver-auth'))
+  testImplementation testFixtures(project(':server:sonar-webserver-es'))
+  testImplementation testFixtures(project(':server:sonar-webserver-ws'))
+  testImplementation project(':sonar-testing-harness')
 
-  runtime 'io.jsonwebtoken:jjwt-jackson'
+  runtimeOnly 'io.jsonwebtoken:jjwt-jackson'
 }
diff --git a/server/sonar-webserver-es/build.gradle b/server/sonar-webserver-es/build.gradle
index 8acb0712834..83b559a8b8e 100644
--- a/server/sonar-webserver-es/build.gradle
+++ b/server/sonar-webserver-es/build.gradle
@@ -7,22 +7,22 @@ sonar {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'com.google.guava:guava'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile project(':server:sonar-server-common')
-  compile project(':server:sonar-webserver-auth')
+  api 'com.google.guava:guava'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':server:sonar-server-common')
+  api project(':server:sonar-webserver-auth')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'javax.servlet:javax.servlet-api'
 
-  testCompile 'org.apache.logging.log4j:log4j-api'
-  testCompile 'org.apache.logging.log4j:log4j-core'
-  testCompile 'org.assertj:assertj-guava'
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-webserver-auth'))
-  testCompile project(':sonar-testing-harness')
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation testFixtures(project(':server:sonar-webserver-auth'))
+  testImplementation project(':sonar-testing-harness')
     
   testFixturesApi testFixtures(project(':server:sonar-server-common'))
 }
diff --git a/server/sonar-webserver-monitoring/build.gradle b/server/sonar-webserver-monitoring/build.gradle
index 2c5bd4674b4..2d6de907f76 100644
--- a/server/sonar-webserver-monitoring/build.gradle
+++ b/server/sonar-webserver-monitoring/build.gradle
@@ -1,13 +1,13 @@
 description = 'SonarQube :: Monitoring'
 
 dependencies {
-    compile project(':server:sonar-webserver-api')
-    compile project(':server:sonar-webserver-pushapi')
-    compile project(':server:sonar-alm-client')
-    compile 'io.prometheus:simpleclient'
-    compile'org.sonarsource.api.plugin:sonar-plugin-api'
+    api project(':server:sonar-webserver-api')
+    api project(':server:sonar-webserver-pushapi')
+    api project(':server:sonar-alm-client')
+    api 'io.prometheus:simpleclient'
+    api'org.sonarsource.api.plugin:sonar-plugin-api'
 
-    testCompile 'junit:junit'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.mockito:mockito-core'
+    testImplementation 'junit:junit'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.mockito:mockito-core'
 }
diff --git a/server/sonar-webserver-pushapi/build.gradle b/server/sonar-webserver-pushapi/build.gradle
index de2feba9561..d9aec037bc1 100644
--- a/server/sonar-webserver-pushapi/build.gradle
+++ b/server/sonar-webserver-pushapi/build.gradle
@@ -5,18 +5,18 @@ sonar {
 }
 dependencies {
 
-    compile 'javax.servlet:javax.servlet-api'
-    compile 'org.json:json'
+    api 'javax.servlet:javax.servlet-api'
+    api 'org.json:json'
 
-    compile project(':server:sonar-webserver-ws')
-    compile project(':server:sonar-webserver-auth')
+    api project(':server:sonar-webserver-ws')
+    api project(':server:sonar-webserver-auth')
 
-    testCompile 'junit:junit'
-    testCompile 'org.assertj:assertj-core'
-    testCompile 'org.mockito:mockito-core'
-    testCompile 'org.awaitility:awaitility'
-    testCompile testFixtures(project(':server:sonar-webserver-ws'))
-    testCompile testFixtures(project(':server:sonar-db-dao'))
+    testImplementation 'junit:junit'
+    testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.mockito:mockito-core'
+    testImplementation 'org.awaitility:awaitility'
+    testImplementation testFixtures(project(':server:sonar-webserver-ws'))
+    testImplementation testFixtures(project(':server:sonar-db-dao'))
 
     testFixturesApi project(':sonar-testing-harness')
     testFixturesCompileOnly testFixtures(project(':server:sonar-webserver-ws'))
diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle
index 9ffdc194cc1..b8ee1eebe89 100644
--- a/server/sonar-webserver-webapi/build.gradle
+++ b/server/sonar-webserver-webapi/build.gradle
@@ -7,42 +7,42 @@ sonar {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'com.google.guava:guava'
-  compile 'com.github.everit-org.json-schema:org.everit.json.schema'
+  api 'com.google.guava:guava'
+  api 'com.github.everit-org.json-schema:org.everit.json.schema'
 
-  compile 'io.prometheus:simpleclient_common'
-  compile 'io.prometheus:simpleclient_servlet'
+  api 'io.prometheus:simpleclient_common'
+  api 'io.prometheus:simpleclient_servlet'
 
-  compile project(':server:sonar-ce-common')
-  compile project(':server:sonar-ce-task')
-  compile project(':server:sonar-db-dao')
-  compile project(':server:sonar-process')
-  compile project(':server:sonar-webserver-auth')
-  compile project(':server:sonar-webserver-es')
-  compile project(':server:sonar-webserver-ws')
-  compile project(':server:sonar-webserver-pushapi')
-  compile project(':server:sonar-alm-client')
-  compile (project(':server:sonar-auth-saml')) {
+  api project(':server:sonar-ce-common')
+  api project(':server:sonar-ce-task')
+  api project(':server:sonar-db-dao')
+  api project(':server:sonar-process')
+  api project(':server:sonar-webserver-auth')
+  api project(':server:sonar-webserver-es')
+  api project(':server:sonar-webserver-ws')
+  api project(':server:sonar-webserver-pushapi')
+  api project(':server:sonar-alm-client')
+  api (project(':server:sonar-auth-saml')) {
     exclude group:'org.apache.santuario'
   }
-  compile project(':sonar-scanner-protocol')
+  api project(':sonar-scanner-protocol')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'javax.servlet:javax.servlet-api'
 
-  testCompile 'org.apache.logging.log4j:log4j-api'
-  testCompile 'org.apache.logging.log4j:log4j-core'
-  testCompile 'org.assertj:assertj-guava'
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'com.squareup.okhttp3:mockwebserver'
-  testCompile 'javax.servlet:javax.servlet-api'
-  testCompile 'org.mockito:mockito-core'
-  testCompile testFixtures(project(':server:sonar-server-common'))
-  testCompile testFixtures(project(':server:sonar-webserver-auth'))
-  testCompile testFixtures(project(':server:sonar-webserver-es'))
-  testCompile testFixtures(project(':server:sonar-webserver-ws'))
-  testCompile project(':sonar-testing-harness')
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.assertj:assertj-guava'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'com.squareup.okhttp3:mockwebserver'
+  testImplementation 'javax.servlet:javax.servlet-api'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation testFixtures(project(':server:sonar-server-common'))
+  testImplementation testFixtures(project(':server:sonar-webserver-auth'))
+  testImplementation testFixtures(project(':server:sonar-webserver-es'))
+  testImplementation testFixtures(project(':server:sonar-webserver-ws'))
+  testImplementation project(':sonar-testing-harness')
   testFixturesApi testFixtures(project(':server:sonar-db-dao'))
 }
 
diff --git a/server/sonar-webserver-ws/build.gradle b/server/sonar-webserver-ws/build.gradle
index 893e1b0a2a0..3889fcf5555 100644
--- a/server/sonar-webserver-ws/build.gradle
+++ b/server/sonar-webserver-ws/build.gradle
@@ -9,23 +9,23 @@ sonar {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'com.google.guava:guava'
-  compile 'org.sonarsource.api.plugin:sonar-plugin-api'
-  compile project(':sonar-core')
-  compile project(':server:sonar-webserver-api')
-  compile project(':sonar-plugin-api-impl')
-  compile project(':sonar-ws')
+  api 'com.google.guava:guava'
+  api 'org.sonarsource.api.plugin:sonar-plugin-api'
+  api project(':sonar-core')
+  api project(':server:sonar-webserver-api')
+  api project(':sonar-plugin-api-impl')
+  api project(':sonar-ws')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
-  compileOnly 'javax.servlet:javax.servlet-api'
-  compileOnly 'org.apache.tomcat.embed:tomcat-embed-core'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'javax.servlet:javax.servlet-api'
+  compileOnlyApi 'org.apache.tomcat.embed:tomcat-embed-core'
 
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'junit:junit'
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'javax.servlet:javax.servlet-api'
-  testCompile 'org.apache.tomcat.embed:tomcat-embed-core'
-  testCompile 'org.mockito:mockito-core'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'junit:junit'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'javax.servlet:javax.servlet-api'
+  testImplementation 'org.apache.tomcat.embed:tomcat-embed-core'
+  testImplementation 'org.mockito:mockito-core'
 
   testFixturesApi project(':sonar-testing-harness')
 
diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle
index 76728cefc98..0c24dec1822 100644
--- a/server/sonar-webserver/build.gradle
+++ b/server/sonar-webserver/build.gradle
@@ -9,32 +9,32 @@ sonar {
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 
-  compile 'com.google.guava:guava'
-  compile 'org.apache.tomcat.embed:tomcat-embed-core'
-  compile project(':sonar-core')
-  compile project(':server:sonar-auth-bitbucket')
-  compile project(':server:sonar-auth-github')
-  compile project(':server:sonar-auth-gitlab')
-  compile project(':server:sonar-auth-ldap')
-  compile project(':server:sonar-auth-saml')
-  compile project(':server:sonar-ce-task-projectanalysis')
-  compile project(':server:sonar-process')
-  compile project(':server:sonar-webserver-core')
-  compile project(':server:sonar-webserver-webapi')
-  compile project(':server:sonar-webserver-pushapi')
-  compile project(':server:sonar-webserver-monitoring')
+  api 'com.google.guava:guava'
+  api 'org.apache.tomcat.embed:tomcat-embed-core'
+  api project(':sonar-core')
+  api project(':server:sonar-auth-bitbucket')
+  api project(':server:sonar-auth-github')
+  api project(':server:sonar-auth-gitlab')
+  api project(':server:sonar-auth-ldap')
+  api project(':server:sonar-auth-saml')
+  api project(':server:sonar-ce-task-projectanalysis')
+  api project(':server:sonar-process')
+  api project(':server:sonar-webserver-core')
+  api project(':server:sonar-webserver-webapi')
+  api project(':server:sonar-webserver-pushapi')
+  api project(':server:sonar-webserver-monitoring')
 
-  compileOnly 'com.google.code.findbugs:jsr305'
+  compileOnlyApi 'com.google.code.findbugs:jsr305'
 
-  testCompile 'org.apache.logging.log4j:log4j-api'
-  testCompile 'org.apache.logging.log4j:log4j-core'
-  testCompile 'com.google.code.findbugs:jsr305'
-  testCompile 'com.tngtech.java:junit-dataprovider'
-  testCompile 'org.mockito:mockito-core'
-  testCompile 'org.eclipse.jetty:jetty-server'
-  testCompile 'org.eclipse.jetty:jetty-servlet'
-  testCompile testFixtures(project(':server:sonar-server-common'))
-  testCompile testFixtures(project(':server:sonar-webserver-auth'))
-  testCompile testFixtures(project(':server:sonar-webserver-es'))
-  testCompile project(':sonar-testing-harness')
+  testImplementation 'org.apache.logging.log4j:log4j-api'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'com.google.code.findbugs:jsr305'
+  testImplementation 'com.tngtech.java:junit-dataprovider'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.eclipse.jetty:jetty-server'
+  testImplementation 'org.eclipse.jetty:jetty-servlet'
+  testImplementation testFixtures(project(':server:sonar-server-common'))
+  testImplementation testFixtures(project(':server:sonar-webserver-auth'))
+  testImplementation testFixtures(project(':server:sonar-webserver-es'))
+  testImplementation project(':sonar-testing-harness')
 }