SONAR-15470 Do not declare Gradle build dependencies using compile and runtime config...

diff --git a/plugins/sonar-xoo-plugin/build.gradle b/plugins/sonar-xoo-plugin/build.gradle
index b4bb30a3c1170a143fa81302ae982c97d29a1988..f34fd75a325081d5b493208a58d73b0d9938caad 100644 (file)
--- a/plugins/sonar-xoo-plugin/build.gradle
+++ b/plugins/sonar-xoo-plugin/build.gradle
@@ -1,5 +1,5 @@
 configurations {
-  testCompile.extendsFrom(compileOnly)
+  testImplementation.extendsFrom(compileOnly)
 }
 
 configureCompileJavaToVersion 8
@@ -31,7 +31,7 @@ jar {
     )
   }
   into('META-INF/lib') {
-    from configurations.compile
+    from configurations.compileClasspath
   }
 }
 

diff --git a/server/sonar-auth-bitbucket/build.gradle b/server/sonar-auth-bitbucket/build.gradle
index 2e5f80aa76e274af4b34fcdadf0442c014441f50..80f71c55fa72a530748c8e81cf8f9c929849a46c 100644 (file)
--- a/server/sonar-auth-bitbucket/build.gradle
+++ b/server/sonar-auth-bitbucket/build.gradle
@@ -1,7 +1,7 @@
 description = 'SonarQube :: Authentication :: Bitbucket'
 
 configurations {
-    testCompile.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnly
 }
 
 dependencies {

diff --git a/server/sonar-auth-common/build.gradle b/server/sonar-auth-common/build.gradle
index 8adf3d9591e0890b5314dc69b435433da65c2550..7c598342345ba5f58bc17054fea30860cbd50330 100644 (file)
--- a/server/sonar-auth-common/build.gradle
+++ b/server/sonar-auth-common/build.gradle
@@ -1,7 +1,7 @@
 description = 'SonarQube :: Authentication :: Common'
 
 configurations {
-    testCompile.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnly
 }
 
 dependencies {

diff --git a/server/sonar-auth-github/build.gradle b/server/sonar-auth-github/build.gradle
index b8911ac7943bcbd4d7d1a4ee96964ffc82ad2bc4..9dbceacc719bca34ce7407e26b62e5abce626c6f 100644 (file)
--- a/server/sonar-auth-github/build.gradle
+++ b/server/sonar-auth-github/build.gradle
@@ -1,7 +1,7 @@
 description = 'SonarQube :: Authentication :: GitHub'
 
 configurations {
-    testCompile.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnly
 }
 
 dependencies {

diff --git a/server/sonar-auth-gitlab/build.gradle b/server/sonar-auth-gitlab/build.gradle
index f4c43ca87691530b093a910926cea27cd2314e56..7f679b9506a1da956eb5bf69cd783b8afa440e6c 100644 (file)
--- a/server/sonar-auth-gitlab/build.gradle
+++ b/server/sonar-auth-gitlab/build.gradle
@@ -1,7 +1,7 @@
 description = 'SonarQube :: Authentication :: GitLab'
 
 configurations {
-    testCompile.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnly
 }
 
 dependencies {

diff --git a/server/sonar-auth-ldap/build.gradle b/server/sonar-auth-ldap/build.gradle
index 622b983188a0a933407318a02ebd7fe3d5110ead..8af87f30bcb666393541b971041d61b4a467feb1 100644 (file)
--- a/server/sonar-auth-ldap/build.gradle
+++ b/server/sonar-auth-ldap/build.gradle
@@ -1,7 +1,7 @@
 description = 'SonarQube :: Authentication :: LDAP'
 
 configurations {
-    testCompile.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnly
 }
 
 dependencies {

diff --git a/server/sonar-auth-saml/build.gradle b/server/sonar-auth-saml/build.gradle
index dd9d2341cb1919d2ecbbf28ad6ba27dec7616d8c..168572a6620a31a5893f381766ce6a5eeaf7983b 100644 (file)
--- a/server/sonar-auth-saml/build.gradle
+++ b/server/sonar-auth-saml/build.gradle
@@ -1,7 +1,7 @@
 description = 'SonarQube :: Authentication :: SAML'
 
 configurations {
-    testCompile.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnly
 }
 
 ext {

diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle
index 800286bde41406ee193d1569696297dcfbec3914..02edbe428bc30e6a6739fe65084e59f52b59ad65 100644 (file)
--- a/server/sonar-ce-common/build.gradle
+++ b/server/sonar-ce-common/build.gradle
@@ -25,7 +25,7 @@ processResources {
 }
 
 configurations {
-  testCompile.extendsFrom compileOnly
+  testImplementation.extendsFrom compileOnly
 }
 
 dependencies {

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 70ddc8bb2a32ba324665f7187626de25aefdd613..d9ec42c1f1d3c38a139302f0048759d804a8d3bc 100644 (file)
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -90,7 +90,7 @@ task downloadElasticSearch(type: Download) {
   finalizedBy verifyElasticSearchDownload
 }
 
-task zip(type: Zip, dependsOn: [configurations.compile, downloadElasticSearch, verifyElasticSearchDownload]) {
+task zip(type: Zip, dependsOn: [configurations.compileClasspath, downloadElasticSearch, verifyElasticSearchDownload]) {
   duplicatesStrategy DuplicatesStrategy.EXCLUDE
   def archiveDir = "sonarqube-$project.version"
 

diff --git a/sonar-plugin-api/build.gradle b/sonar-plugin-api/build.gradle
index 8cdf7778f70076dcae292b1d2c5062a6a5d69b01..6226e1a77a1a4d9a28cad51cc676663f8e992c4b 100644 (file)
--- a/sonar-plugin-api/build.gradle
+++ b/sonar-plugin-api/build.gradle
@@ -33,10 +33,9 @@ dependencies {
   testCompile project(':sonar-plugin-api-impl')
 }
 
-sourceSets {
+configurations {
   // Make the compileOnly dependencies available when compiling/running tests
-  test.compileClasspath += configurations.compileOnly + configurations.shadow
-  test.runtimeClasspath += configurations.compileOnly + configurations.shadow
+  testImplementation.extendsFrom compileOnly
 }
 
 def on3Digits(version) {
@@ -54,7 +53,7 @@ processResources {
 }
 
 shadowJar {
-  configurations = [project.configurations.default]
+  configurations = [project.configurations.runtimeClasspath]
   minimize {
     exclude(project(':sonar-check-api'))
   }

diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle
index 6c324c325b46a2fb46d82d7fdd25049a8300b2bd..5afaba8d774ecc5966864db3f14c689dde47b43b 100644 (file)
--- a/sonar-scanner-engine/build.gradle
+++ b/sonar-scanner-engine/build.gradle
@@ -10,7 +10,7 @@ sourceSets.test.resources {
 }
 
 configurations {
-  testCompile.extendsFrom(compileOnly)
+  testImplementation.extendsFrom(compileOnly)
 }
 
 dependencies {

diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle
index bfb707e01e707b143671521729ddd4cfd81ab76b..021b9156c2f81a7bfa3f8bd96342703992106847 100644 (file)
--- a/sonar-ws/build.gradle
+++ b/sonar-ws/build.gradle
@@ -8,7 +8,7 @@ sonarqube {
 configureCompileJavaToVersion 8
 
 configurations {
-  testCompile.extendsFrom(compileOnly)
+  testImplementation.extendsFrom(compileOnly)
 }
 
 dependencies {