diff options
44 files changed, 728 insertions, 728 deletions
diff --git a/build.gradle b/build.gradle index 726da0b4fe6..cf1661be68b 100644 --- a/build.gradle +++ b/build.gradle @@ -139,7 +139,7 @@ subprojects { apply plugin: 'com.github.hierynomus.license' apply plugin: 'io.spring.dependency-management' apply plugin: 'jacoco' - apply plugin: 'java' + apply plugin: 'java-library' apply plugin: 'idea' apply plugin: 'signing' @@ -539,7 +539,7 @@ subprojects { } dependencies { - testCompile project(":ut-monitoring") + testImplementation project(":ut-monitoring") utMonitoring 'org.aspectj:aspectjweaver:1.9.9.1' } diff --git a/plugins/sonar-education-plugin/build.gradle b/plugins/sonar-education-plugin/build.gradle index 71bad6499f1..e386ec90234 100644 --- a/plugins/sonar-education-plugin/build.gradle +++ b/plugins/sonar-education-plugin/build.gradle @@ -1,14 +1,14 @@ configurations { - testImplementation.extendsFrom(compileOnly) + testImplementation.extendsFrom(compileOnlyApi) } dependencies { - compileOnly 'org.sonarsource.api.plugin:sonar-plugin-api' + compileOnlyApi 'org.sonarsource.api.plugin:sonar-plugin-api' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' - testCompile 'org.mockito:mockito-core' - testCompile project(':sonar-plugin-api-impl') + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.mockito:mockito-core' + testImplementation project(':sonar-plugin-api-impl') } jar { diff --git a/plugins/sonar-xoo-plugin/build.gradle b/plugins/sonar-xoo-plugin/build.gradle index f194b7d1786..2b00deaa50f 100644 --- a/plugins/sonar-xoo-plugin/build.gradle +++ b/plugins/sonar-xoo-plugin/build.gradle @@ -1,20 +1,20 @@ configurations { - testImplementation.extendsFrom(compileOnly) + testImplementation.extendsFrom(compileOnlyApi) } dependencies { - compile 'com.google.guava:guava' - compile 'commons-io:commons-io' - compile 'commons-lang:commons-lang' - compile 'org.apache.commons:commons-csv' + api 'com.google.guava:guava' + api 'commons-io:commons-io' + api 'commons-lang:commons-lang' + api 'org.apache.commons:commons-csv' - compileOnly 'com.google.code.findbugs:jsr305' - compileOnly 'org.sonarsource.api.plugin:sonar-plugin-api' + compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'org.sonarsource.api.plugin:sonar-plugin-api' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' - testCompile 'org.mockito:mockito-core' - testCompile project(':sonar-plugin-api-impl') + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.mockito:mockito-core' + testImplementation project(':sonar-plugin-api-impl') } jar { 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') } diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle index 28163b86c07..34aceda221c 100644 --- a/sonar-application/build.gradle +++ b/sonar-application/build.gradle @@ -36,7 +36,7 @@ configurations { extendsFrom bundledPlugin transitive = true } - appLicenses.extendsFrom(compile, web, scanner, jdbc_mssql, jdbc_postgresql, jdbc_h2, bundledPlugin_deps) + appLicenses.extendsFrom(api, web, scanner, jdbc_mssql, jdbc_postgresql, jdbc_h2, bundledPlugin_deps) cyclonedx } @@ -52,18 +52,18 @@ shadowJar { dependencies { // please keep list ordered - compile 'org.slf4j:slf4j-api' - - compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client' - compile 'org.sonarsource.api.plugin:sonar-plugin-api' - compile project(':server:sonar-ce') - compile project(':server:sonar-main') - compile project(':server:sonar-process') - compile project(':server:sonar-webserver') - compile project(':sonar-core') - compile project(':sonar-plugin-api-impl') - - compileOnly 'com.google.code.findbugs:jsr305' + api 'org.slf4j:slf4j-api' + + api 'org.elasticsearch.client:elasticsearch-rest-high-level-client' + api 'org.sonarsource.api.plugin:sonar-plugin-api' + api project(':server:sonar-ce') + api project(':server:sonar-main') + api project(':server:sonar-process') + api project(':server:sonar-webserver') + api project(':sonar-core') + api project(':sonar-plugin-api-impl') + + compileOnlyApi 'com.google.code.findbugs:jsr305' scanner project(path: ':sonar-scanner-engine-shaded', configuration: 'shadow') cyclonedx project(path: ':sonar-scanner-engine-shaded') diff --git a/sonar-check-api/build.gradle b/sonar-check-api/build.gradle index 52523a86fe3..677fbc4f3fb 100644 --- a/sonar-check-api/build.gradle +++ b/sonar-check-api/build.gradle @@ -5,6 +5,6 @@ sonar { } dependencies { - compileOnly 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.google.code.findbugs:jsr305' } diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle index 63608062593..cd1c8250cf7 100644 --- a/sonar-core/build.gradle +++ b/sonar-core/build.gradle @@ -7,32 +7,32 @@ sonar { dependencies { // please keep list ordered - compile 'ch.qos.logback:logback-classic' - compile 'ch.qos.logback:logback-core' - compile 'com.google.guava:guava' - compile 'com.google.protobuf:protobuf-java' - compile 'commons-codec:commons-codec' - compile 'commons-io:commons-io' - compile 'commons-lang:commons-lang' - compile 'javax.annotation:javax.annotation-api' - compile 'javax.inject:javax.inject' - compile 'org.codehaus.sonar:sonar-classloader' - compile 'org.slf4j:slf4j-api' - compile 'org.sonarsource.api.plugin:sonar-plugin-api' - compile 'org.sonarsource.update-center:sonar-update-center-common' - compile 'org.springframework:spring-context' - compile project(':sonar-plugin-api-impl') + api 'ch.qos.logback:logback-classic' + api 'ch.qos.logback:logback-core' + api 'com.google.guava:guava' + api 'com.google.protobuf:protobuf-java' + api 'commons-codec:commons-codec' + api 'commons-io:commons-io' + api 'commons-lang:commons-lang' + api 'javax.annotation:javax.annotation-api' + api 'javax.inject:javax.inject' + api 'org.codehaus.sonar:sonar-classloader' + api 'org.slf4j:slf4j-api' + api 'org.sonarsource.api.plugin:sonar-plugin-api' + api 'org.sonarsource.update-center:sonar-update-center-common' + api 'org.springframework:spring-context' + api project(':sonar-plugin-api-impl') - compileOnly 'com.google.code.findbugs:jsr305' - compileOnly 'com.google.code.gson:gson' + compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.google.code.gson:gson' - 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.simpleframework:simple' - testCompile project(':sonar-testing-harness') + 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.simpleframework:simple' + testImplementation project(':sonar-testing-harness') testCompileOnly 'com.google.code.findbugs:jsr305' } diff --git a/sonar-duplications/build.gradle b/sonar-duplications/build.gradle index f7dc1d6b20f..d3c65d720b2 100644 --- a/sonar-duplications/build.gradle +++ b/sonar-duplications/build.gradle @@ -7,15 +7,15 @@ sonar { dependencies { // please keep list ordered - compile 'org.codehaus.sonar:sonar-channel' - compile 'org.sonarsource.api.plugin:sonar-plugin-api' + api 'org.codehaus.sonar:sonar-channel' + api 'org.sonarsource.api.plugin:sonar-plugin-api' - compileOnly 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.google.code.findbugs:jsr305' - testCompile 'ch.qos.logback:logback-classic' - testCompile 'commons-io:commons-io' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' - testCompile 'org.hamcrest:hamcrest-core' - testCompile 'org.mockito:mockito-core' + testImplementation 'ch.qos.logback:logback-classic' + testImplementation 'commons-io:commons-io' + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.hamcrest:hamcrest-core' + testImplementation 'org.mockito:mockito-core' } diff --git a/sonar-markdown/build.gradle b/sonar-markdown/build.gradle index 051ba589705..714a4651345 100644 --- a/sonar-markdown/build.gradle +++ b/sonar-markdown/build.gradle @@ -7,12 +7,12 @@ sonar { dependencies { // please keep list ordered - compile 'commons-lang:commons-lang' - compile 'org.codehaus.sonar:sonar-channel' + api 'commons-lang:commons-lang' + api 'org.codehaus.sonar:sonar-channel' - testCompile 'ch.qos.logback:logback-classic' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' + testImplementation 'ch.qos.logback:logback-classic' + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' } artifactoryPublish.skip = false diff --git a/sonar-plugin-api-impl/build.gradle b/sonar-plugin-api-impl/build.gradle index 5c69debac0f..3b9fde8eced 100644 --- a/sonar-plugin-api-impl/build.gradle +++ b/sonar-plugin-api-impl/build.gradle @@ -7,22 +7,22 @@ sonar { dependencies { // please keep the list grouped by configuration and ordered by name - compile 'commons-codec:commons-codec' - compile 'commons-io:commons-io' - compile 'commons-lang:commons-lang' - compile 'org.apache.commons:commons-csv' - compile 'org.sonarsource.api.plugin:sonar-plugin-api' + api 'commons-codec:commons-codec' + api 'commons-io:commons-io' + api 'commons-lang:commons-lang' + api 'org.apache.commons:commons-csv' + api 'org.sonarsource.api.plugin:sonar-plugin-api' - compileOnly 'com.google.code.findbugs:jsr305' - compileOnly 'junit:junit' + compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'junit:junit' testCompileOnly 'com.google.code.findbugs:jsr305' - testCompile 'com.google.guava:guava' - testCompile 'com.tngtech.java:junit-dataprovider' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' - testCompile 'org.mockito:mockito-core' + testImplementation 'com.google.guava:guava' + testImplementation 'com.tngtech.java:junit-dataprovider' + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.mockito:mockito-core' } import org.apache.tools.ant.filters.ReplaceTokens diff --git a/sonar-scanner-engine-shaded/build.gradle b/sonar-scanner-engine-shaded/build.gradle index dbcf0d5ecc7..77df9b346b9 100644 --- a/sonar-scanner-engine-shaded/build.gradle +++ b/sonar-scanner-engine-shaded/build.gradle @@ -7,5 +7,5 @@ sonar { apply plugin: 'com.github.johnrengelman.shadow' dependencies { - compile project(':sonar-scanner-engine') + api project(':sonar-scanner-engine') } diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle index df6cde037be..f25a70b6519 100644 --- a/sonar-scanner-engine/build.gradle +++ b/sonar-scanner-engine/build.gradle @@ -10,54 +10,54 @@ sourceSets.test.resources { } configurations { - testImplementation.extendsFrom(compileOnly) + testImplementation.extendsFrom(compileOnlyApi) } dependencies { // please keep the list ordered - 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 'org.apache.commons:commons-csv' - compile 'com.google.protobuf:protobuf-java' - compile 'com.squareup.okhttp3:okhttp' - compile 'com.fasterxml.staxmate:staxmate' - compile 'javax.annotation:javax.annotation-api' - compile 'org.eclipse.jgit:org.eclipse.jgit' - compile 'org.tmatesoft.svnkit:svnkit' - compile 'org.slf4j:jcl-over-slf4j' - compile 'org.slf4j:jul-to-slf4j' - compile 'org.slf4j:log4j-over-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.springframework:spring-context' + 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 'org.apache.commons:commons-csv' + api 'com.google.protobuf:protobuf-java' + api 'com.squareup.okhttp3:okhttp' + api 'com.fasterxml.staxmate:staxmate' + api 'javax.annotation:javax.annotation-api' + api 'org.eclipse.jgit:org.eclipse.jgit' + api 'org.tmatesoft.svnkit:svnkit' + api 'org.slf4j:jcl-over-slf4j' + api 'org.slf4j:jul-to-slf4j' + api 'org.slf4j:log4j-over-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.springframework:spring-context' - compile project(':sonar-core') - compile project(':sonar-scanner-protocol') - compile project(':sonar-ws') - compile project(':sonar-duplications') - compile project(':sonar-plugin-api-impl') + api project(':sonar-core') + api project(':sonar-scanner-protocol') + api project(':sonar-ws') + api project(':sonar-duplications') + api project(':sonar-plugin-api-impl') - compileOnly 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.google.code.findbugs:jsr305' - testCompile 'com.squareup.okhttp3:mockwebserver' - testCompile 'com.squareup.okhttp3:okhttp' - testCompile 'com.squareup.okio:okio' - testCompile 'com.tngtech.java:junit-dataprovider' - testCompile 'commons-io:commons-io' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' - testCompile 'com.fasterxml.staxmate:staxmate' - testCompile 'org.hamcrest:hamcrest-core' - testCompile 'org.mockito:mockito-core' - testCompile 'org.mockito:mockito-inline' - testCompile project(':plugins:sonar-xoo-plugin') + testImplementation 'com.squareup.okhttp3:mockwebserver' + testImplementation 'com.squareup.okhttp3:okhttp' + testImplementation 'com.squareup.okio:okio' + testImplementation 'com.tngtech.java:junit-dataprovider' + testImplementation 'commons-io:commons-io' + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' + testImplementation 'com.fasterxml.staxmate:staxmate' + testImplementation 'org.hamcrest:hamcrest-core' + testImplementation 'org.mockito:mockito-core' + testImplementation 'org.mockito:mockito-inline' + testImplementation project(':plugins:sonar-xoo-plugin') } license { diff --git a/sonar-scanner-protocol/build.gradle b/sonar-scanner-protocol/build.gradle index aa7252a787a..3e45afc6882 100644 --- a/sonar-scanner-protocol/build.gradle +++ b/sonar-scanner-protocol/build.gradle @@ -7,17 +7,17 @@ sonar { dependencies { // please keep the list ordered - compile 'com.google.code.gson:gson' - compile 'com.google.protobuf:protobuf-java' - compile 'commons-io:commons-io' - compile 'commons-lang:commons-lang' - compile project(':sonar-core') + api 'com.google.code.gson:gson' + api 'com.google.protobuf:protobuf-java' + api 'commons-io:commons-io' + api 'commons-lang:commons-lang' + api project(':sonar-core') - compileOnly 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.google.code.findbugs:jsr305' - testCompile 'com.google.guava:guava' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' + testImplementation 'com.google.guava:guava' + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' } //create a single Jar with all dependencies @@ -26,7 +26,7 @@ task fatJar(type: Jar) { attributes 'Main-Class': 'org.sonar.scanner.protocol.viewer.ScannerReportViewerApp' } archiveBaseName = project.name + '-all' - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } with jar duplicatesStrategy = DuplicatesStrategy.EXCLUDE } diff --git a/sonar-shutdowner/build.gradle b/sonar-shutdowner/build.gradle index 1855e99fe6c..39afc0069fa 100644 --- a/sonar-shutdowner/build.gradle +++ b/sonar-shutdowner/build.gradle @@ -6,10 +6,10 @@ sonar { dependencies { // please keep list ordered - compileOnly 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.google.code.findbugs:jsr305' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' } jar { diff --git a/sonar-testing-harness/build.gradle b/sonar-testing-harness/build.gradle index 40c523c8bdb..7826c3bdba9 100644 --- a/sonar-testing-harness/build.gradle +++ b/sonar-testing-harness/build.gradle @@ -7,16 +7,16 @@ sonar { dependencies { // please keep list ordered - compile 'com.google.code.gson:gson' - compile 'com.googlecode.json-simple:json-simple' - compile 'com.sun.mail:javax.mail' - compile 'commons-io:commons-io' - compile 'junit:junit' - compile 'org.assertj:assertj-core' - compile 'org.jsoup:jsoup' - compile 'org.mockito:mockito-core' + api 'com.google.code.gson:gson' + api 'com.googlecode.json-simple:json-simple' + api 'com.sun.mail:javax.mail' + api 'commons-io:commons-io' + api 'junit:junit' + api 'org.assertj:assertj-core' + api 'org.jsoup:jsoup' + api 'org.mockito:mockito-core' - compileOnly 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.google.code.findbugs:jsr305' } artifactoryPublish.skip = false diff --git a/sonar-testing-ldap/build.gradle b/sonar-testing-ldap/build.gradle index ef4b246bbf5..be7655faf03 100644 --- a/sonar-testing-ldap/build.gradle +++ b/sonar-testing-ldap/build.gradle @@ -5,11 +5,11 @@ sonar { } dependencies { - compile 'junit:junit' - compile 'org.apache.directory.server:apacheds-all:2.0.0-M24' - compile 'org.slf4j:slf4j-api' + api 'junit:junit' + api 'org.apache.directory.server:apacheds-all:2.0.0-M24' + api 'org.slf4j:slf4j-api' - testCompile 'org.assertj:assertj-core' - testCompile 'org.hamcrest:hamcrest-core' - testCompile 'org.mockito:mockito-core' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.hamcrest:hamcrest-core' + testImplementation 'org.mockito:mockito-core' } diff --git a/sonar-ws-generator/build.gradle b/sonar-ws-generator/build.gradle index d2b875cd52c..a57236825a8 100644 --- a/sonar-ws-generator/build.gradle +++ b/sonar-ws-generator/build.gradle @@ -5,17 +5,17 @@ sonar { dependencies { // please keep list ordered - compile 'com.google.code.gson:gson' - compile 'com.google.guava:guava' - compile 'commons-io:commons-io' + api 'com.google.code.gson:gson' + api 'com.google.guava:guava' + api 'commons-io:commons-io' // transitive dependency of Velocity that must be upgraded // in order to fix a vulnerability - compile 'commons-collections:commons-collections:3.2.2' - compile 'org.apache.velocity:velocity:1.7' - compile 'org.slf4j:log4j-over-slf4j' - compile 'org.sonarsource.orchestrator:sonar-orchestrator' + api 'commons-collections:commons-collections:3.2.2' + api 'org.apache.velocity:velocity:1.7' + api 'org.slf4j:log4j-over-slf4j' + api 'org.sonarsource.orchestrator:sonar-orchestrator' - compileOnly 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.google.code.findbugs:jsr305' } task fatJar(type: Jar) { @@ -23,6 +23,6 @@ task fatJar(type: Jar) { attributes 'Main-Class': 'org.sonarqube.wsgenerator.Generator' } archiveClassifier = 'jar-with-dependencies' - from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } with jar } diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle index 40ecc959ab8..01338797055 100644 --- a/sonar-ws/build.gradle +++ b/sonar-ws/build.gradle @@ -6,29 +6,29 @@ sonar { } configurations { - testImplementation.extendsFrom(compileOnly) + testImplementation.extendsFrom(compileOnlyApi) } dependencies { // please keep list ordered - compile 'com.google.protobuf:protobuf-java' - compile 'com.squareup.okhttp3:okhttp' - compile 'com.google.code.gson:gson' - compile 'org.sonarsource.api.plugin:sonar-plugin-api' + api 'com.google.protobuf:protobuf-java' + api 'com.squareup.okhttp3:okhttp' + api 'com.google.code.gson:gson' + api 'org.sonarsource.api.plugin:sonar-plugin-api' - compileOnly 'com.google.code.findbugs:jsr305' - compileOnly 'javax.annotation:javax.annotation-api' + compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'javax.annotation:javax.annotation-api' - testCompile 'com.squareup.okhttp3:mockwebserver' - testCompile 'com.squareup.okio:okio' - testCompile 'commons-io:commons-io' - testCompile 'commons-lang:commons-lang' - testCompile 'junit:junit' - testCompile 'org.assertj:assertj-core' - testCompile 'org.hamcrest:hamcrest-core' - testCompile 'org.mockito:mockito-core' - testCompile project(':sonar-testing-harness') + testImplementation 'com.squareup.okhttp3:mockwebserver' + testImplementation 'com.squareup.okio:okio' + testImplementation 'commons-io:commons-io' + testImplementation 'commons-lang:commons-lang' + testImplementation 'junit:junit' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.hamcrest:hamcrest-core' + testImplementation 'org.mockito:mockito-core' + testImplementation project(':sonar-testing-harness') } artifactoryPublish.skip = false diff --git a/ut-monitoring/build.gradle b/ut-monitoring/build.gradle index ee096d95cf8..7cbf861e644 100644 --- a/ut-monitoring/build.gradle +++ b/ut-monitoring/build.gradle @@ -7,11 +7,11 @@ sonar { dependencies { // please keep the list grouped by configuration and ordered by name - compile 'com.google.code.gson:gson' - compile 'junit:junit' - compile 'org.sonarsource.api.plugin:sonar-plugin-api' + api 'com.google.code.gson:gson' + api 'junit:junit' + api 'org.sonarsource.api.plugin:sonar-plugin-api' - compileOnly 'org.aspectj:aspectjtools' + compileOnlyApi 'org.aspectj:aspectjtools' } sonar { |