diff options
39 files changed, 68 insertions, 68 deletions
diff --git a/build.gradle b/build.gradle index c98a8aa83df..128054dfa18 100644 --- a/build.gradle +++ b/build.gradle @@ -322,7 +322,7 @@ subprojects { dependency 'io.prometheus:simpleclient:0.16.0' dependency 'io.prometheus:simpleclient_common:0.16.0' dependency 'io.prometheus:simpleclient_servlet:0.16.0' - dependency 'com.google.code.findbugs:jsr305:3.0.2' + dependency 'com.github.spotbugs:spotbugs-annotations:4.8.6' dependency 'com.google.code.gson:gson:2.10.1' dependency('com.google.guava:guava:33.1.0-jre') { exclude 'com.google.errorprone:error_prone_annotations' diff --git a/plugins/sonar-education-plugin/build.gradle b/plugins/sonar-education-plugin/build.gradle index 7378f93ca26..23675c0c6c5 100644 --- a/plugins/sonar-education-plugin/build.gradle +++ b/plugins/sonar-education-plugin/build.gradle @@ -4,7 +4,7 @@ configurations { dependencies { compileOnlyApi 'org.sonarsource.api.plugin:sonar-plugin-api' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' implementation 'commons-io:commons-io' testImplementation 'junit:junit' diff --git a/plugins/sonar-xoo-plugin/build.gradle b/plugins/sonar-xoo-plugin/build.gradle index 221bdc559e0..fbd8c4d1228 100644 --- a/plugins/sonar-xoo-plugin/build.gradle +++ b/plugins/sonar-xoo-plugin/build.gradle @@ -5,7 +5,7 @@ dependencies { api 'org.apache.commons:commons-lang3' api 'org.apache.commons:commons-csv' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'org.sonarsource.api.plugin:sonar-plugin-api' testImplementation 'junit:junit' diff --git a/server/sonar-auth-bitbucket/build.gradle b/server/sonar-auth-bitbucket/build.gradle index 8329723c6e2..f4a24eb53bf 100644 --- a/server/sonar-auth-bitbucket/build.gradle +++ b/server/sonar-auth-bitbucket/build.gradle @@ -12,7 +12,7 @@ dependencies { api 'com.google.code.gson:gson' api project(':server:sonar-auth-common') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'com.squareup.okhttp3:okhttp' compileOnlyApi 'javax.servlet:javax.servlet-api' compileOnlyApi project(':sonar-core') diff --git a/server/sonar-auth-common/build.gradle b/server/sonar-auth-common/build.gradle index bbdf7b48d3a..56d3b03da1b 100644 --- a/server/sonar-auth-common/build.gradle +++ b/server/sonar-auth-common/build.gradle @@ -10,7 +10,7 @@ dependencies { api 'com.github.scribejava:scribejava-apis' api 'com.github.scribejava:scribejava-core' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'org.apache.commons:commons-lang3' testImplementation 'com.squareup.okhttp3:mockwebserver' diff --git a/server/sonar-auth-github/build.gradle b/server/sonar-auth-github/build.gradle index f62727c885c..506b127cd92 100644 --- a/server/sonar-auth-github/build.gradle +++ b/server/sonar-auth-github/build.gradle @@ -13,7 +13,7 @@ dependencies { api project(':server:sonar-auth-common') api project(':server:sonar-server-common') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'com.squareup.okhttp3:okhttp' compileOnlyApi 'javax.servlet:javax.servlet-api' compileOnlyApi project(':sonar-core') diff --git a/server/sonar-auth-gitlab/build.gradle b/server/sonar-auth-gitlab/build.gradle index 9a0574fd46e..b2922a4b638 100644 --- a/server/sonar-auth-gitlab/build.gradle +++ b/server/sonar-auth-gitlab/build.gradle @@ -13,7 +13,7 @@ dependencies { api project(':server:sonar-auth-common') api project(':server:sonar-server-common') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'com.squareup.okhttp3:okhttp' compileOnlyApi 'javax.servlet:javax.servlet-api' compileOnlyApi project(':sonar-core') diff --git a/server/sonar-auth-ldap/build.gradle b/server/sonar-auth-ldap/build.gradle index 510579ad443..e0c91dc532e 100644 --- a/server/sonar-auth-ldap/build.gradle +++ b/server/sonar-auth-ldap/build.gradle @@ -9,7 +9,7 @@ dependencies { api 'org.apache.commons:commons-lang3' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'javax.servlet:javax.servlet-api' compileOnlyApi project(':server:sonar-process') compileOnlyApi project(':sonar-core') diff --git a/server/sonar-auth-saml/build.gradle b/server/sonar-auth-saml/build.gradle index b60388a15c8..9a5db10e781 100644 --- a/server/sonar-auth-saml/build.gradle +++ b/server/sonar-auth-saml/build.gradle @@ -9,7 +9,7 @@ dependencies { api "com.onelogin:java-saml" - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'com.squareup.okhttp3:okhttp' compileOnlyApi 'javax.servlet:javax.servlet-api' compileOnlyApi 'org.json:json' diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle index 1ae3c93d58d..f011ec9da60 100644 --- a/server/sonar-ce-common/build.gradle +++ b/server/sonar-ce-common/build.gradle @@ -39,9 +39,9 @@ dependencies { api project(':server:sonar-server-common') api project(':sonar-core') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'org.apache.commons:commons-lang3' testImplementation 'junit:junit' diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle index 4cca46f43b0..604a1026213 100644 --- a/server/sonar-ce-task-projectanalysis/build.gradle +++ b/server/sonar-ce-task-projectanalysis/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation 'org.apache.commons:commons-text' api 'com.google.code.gson:gson' api 'com.google.guava:guava' - api 'com.google.code.findbugs:jsr305' + api 'com.github.spotbugs:spotbugs-annotations' api 'com.google.protobuf:protobuf-java' api 'com.googlecode.java-diff-utils:diffutils' api 'org.mybatis:mybatis' @@ -42,11 +42,11 @@ dependencies { api project(':sonar-duplications') api project(':sonar-scanner-protocol') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' api project(':server:sonar-db-dao') - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'org.apache.logging.log4j:log4j-api' testImplementation 'org.apache.logging.log4j:log4j-core' @@ -65,7 +65,7 @@ dependencies { testFixturesApi 'org.mockito:mockito-core' testFixturesApi testFixtures(project(':server:sonar-ce-task')) - testFixturesCompileOnly 'com.google.code.findbugs:jsr305' + testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' diff --git a/server/sonar-ce-task/build.gradle b/server/sonar-ce-task/build.gradle index ade8647bbd6..88959d6a1ab 100644 --- a/server/sonar-ce-task/build.gradle +++ b/server/sonar-ce-task/build.gradle @@ -24,13 +24,13 @@ dependencies { api project(':server:sonar-server-common') api project(':sonar-core') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' 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.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'junit:junit' testImplementation 'org.apache.logging.log4j:log4j-api' @@ -44,7 +44,7 @@ dependencies { testFixturesApi 'org.assertj:assertj-core' - testFixturesCompileOnly 'com.google.code.findbugs:jsr305' + testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' diff --git a/server/sonar-ce/build.gradle b/server/sonar-ce/build.gradle index 14b8794e61a..ac8a5f9ed06 100644 --- a/server/sonar-ce/build.gradle +++ b/server/sonar-ce/build.gradle @@ -24,9 +24,9 @@ dependencies { api project(':sonar-plugin-api-impl') api project(':sonar-ws') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' diff --git a/server/sonar-db-core/build.gradle b/server/sonar-db-core/build.gradle index c5de4301b8e..1fd40cd6a70 100644 --- a/server/sonar-db-core/build.gradle +++ b/server/sonar-db-core/build.gradle @@ -19,9 +19,9 @@ dependencies { api project(':server:sonar-process') api project(':sonar-plugin-api-impl') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.h2database:h2' testImplementation 'com.microsoft.sqlserver:mssql-jdbc' testImplementation 'com.oracle.database.jdbc:ojdbc11' @@ -48,7 +48,7 @@ dependencies { testFixturesImplementation 'com.oracle.database.jdbc:ojdbc11' testFixturesImplementation 'org.junit.jupiter:junit-jupiter-api' - testFixturesCompileOnly 'com.google.code.findbugs:jsr305' + testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' } test { diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle index a75979c4356..527bac05be9 100644 --- a/server/sonar-db-dao/build.gradle +++ b/server/sonar-db-dao/build.gradle @@ -19,7 +19,7 @@ dependencies { api project(':server:sonar-db-migration') api project(':sonar-core') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'commons-dbutils:commons-dbutils' testImplementation 'org.assertj:assertj-core' @@ -32,7 +32,7 @@ dependencies { testImplementation project(':sonar-testing-harness') testImplementation project(':sonar-plugin-api-impl') - testCompileOnly 'com.google.code.findbugs:jsr305' + testCompileOnly 'com.github.spotbugs:spotbugs-annotations' testRuntimeOnly 'com.h2database:h2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' @@ -48,7 +48,7 @@ dependencies { testFixturesImplementation 'com.h2database:h2' - testFixturesCompileOnly 'com.google.code.findbugs:jsr305' + testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' } test { diff --git a/server/sonar-db-migration/build.gradle b/server/sonar-db-migration/build.gradle index e2d0de9954c..5d46f5b0264 100644 --- a/server/sonar-db-migration/build.gradle +++ b/server/sonar-db-migration/build.gradle @@ -16,9 +16,9 @@ dependencies { api project(':server:sonar-process') api project(':sonar-core') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'commons-dbutils:commons-dbutils' testImplementation 'com.squareup.okhttp3:mockwebserver' diff --git a/server/sonar-main/build.gradle b/server/sonar-main/build.gradle index f1d2436176b..e1e567a0e9a 100644 --- a/server/sonar-main/build.gradle +++ b/server/sonar-main/build.gradle @@ -25,9 +25,9 @@ dependencies { api project(':server:sonar-process') api project(':sonar-core') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle index 927d3fefaaf..4b9d4a46a00 100644 --- a/server/sonar-process/build.gradle +++ b/server/sonar-process/build.gradle @@ -21,9 +21,9 @@ dependencies { api 'org.sonarsource.api.plugin:sonar-plugin-api' api project(':sonar-core') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.google.protobuf:protobuf-java' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'junit:junit' diff --git a/server/sonar-server-common/build.gradle b/server/sonar-server-common/build.gradle index d019caad292..3ad43d2a9c0 100644 --- a/server/sonar-server-common/build.gradle +++ b/server/sonar-server-common/build.gradle @@ -25,10 +25,10 @@ dependencies { api project(':sonar-markdown') api project(':sonar-ws') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'org.elasticsearch.plugin:transport-netty4-client' testImplementation 'ch.qos.logback:logback-core' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'org.subethamail:subethasmtp' testImplementation 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:okhttp-tls' @@ -51,7 +51,7 @@ dependencies { testFixturesApi 'junit:junit' testFixturesApi testFixtures(project(':server:sonar-db-dao')) - testFixturesCompileOnly 'com.google.code.findbugs:jsr305' + testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' testFixturesImplementation 'org.elasticsearch.plugin:transport-netty4-client' testFixturesImplementation 'org.codelibs.elasticsearch.module:analysis-common' testFixturesImplementation 'org.codelibs.elasticsearch.module:reindex' diff --git a/server/sonar-webserver-api/build.gradle b/server/sonar-webserver-api/build.gradle index 219be3e9683..15a4d2e782d 100644 --- a/server/sonar-webserver-api/build.gradle +++ b/server/sonar-webserver-api/build.gradle @@ -27,11 +27,11 @@ dependencies { api project(':sonar-plugin-api-impl') api 'org.mindrot:jbcrypt' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'javax.servlet:javax.servlet-api' testImplementation 'org.assertj:assertj-guava' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'javax.servlet:javax.servlet-api' testImplementation 'org.junit.jupiter:junit-jupiter-api' @@ -42,7 +42,7 @@ dependencies { testFixturesApi 'junit:junit' - testFixturesCompileOnly 'com.google.code.findbugs:jsr305' + testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' diff --git a/server/sonar-webserver-auth/build.gradle b/server/sonar-webserver-auth/build.gradle index 935a1a2abc3..6a4d5091c05 100644 --- a/server/sonar-webserver-auth/build.gradle +++ b/server/sonar-webserver-auth/build.gradle @@ -20,7 +20,7 @@ dependencies { api project(':server:sonar-auth-ldap') api 'org.mindrot:jbcrypt' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'javax.servlet:javax.servlet-api' testImplementation 'com.tngtech.java:junit-dataprovider' @@ -34,13 +34,13 @@ dependencies { testImplementation testFixtures(project(':server:sonar-server-common')) testImplementation project(':sonar-testing-harness') - testCompileOnly 'com.google.code.findbugs:jsr305' + testCompileOnly 'com.github.spotbugs:spotbugs-annotations' runtimeOnly 'io.jsonwebtoken:jjwt-jackson' testFixturesApi 'junit:junit' - testFixturesCompileOnly 'com.google.code.findbugs:jsr305' + testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' testFixturesCompileOnly 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' diff --git a/server/sonar-webserver-common/build.gradle b/server/sonar-webserver-common/build.gradle index 89ce2803657..ab17221b877 100644 --- a/server/sonar-webserver-common/build.gradle +++ b/server/sonar-webserver-common/build.gradle @@ -14,12 +14,12 @@ dependencies { implementation project(path: ':server:sonar-auth-gitlab') implementation project(path: ':server:sonar-alm-client') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'javax.servlet:javax.servlet-api' testImplementation 'org.apache.logging.log4j:log4j-api' testImplementation 'org.apache.logging.log4j:log4j-core' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'junit:junit' diff --git a/server/sonar-webserver-core/build.gradle b/server/sonar-webserver-core/build.gradle index 4ea552a5129..390aa4b6a1d 100644 --- a/server/sonar-webserver-core/build.gradle +++ b/server/sonar-webserver-core/build.gradle @@ -52,11 +52,11 @@ dependencies { api project(':sonar-ws') implementation project(path: ':server:sonar-webserver-webapi') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' // not a transitive dep. At runtime lib/jdbc/h2 is used compileOnlyApi 'com.h2database:h2' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.h2database:h2' testImplementation 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.tngtech.java:junit-dataprovider' diff --git a/server/sonar-webserver-es/build.gradle b/server/sonar-webserver-es/build.gradle index ad7e297b05d..01c88349af0 100644 --- a/server/sonar-webserver-es/build.gradle +++ b/server/sonar-webserver-es/build.gradle @@ -12,13 +12,13 @@ dependencies { api project(':server:sonar-server-common') api project(':server:sonar-webserver-auth') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi '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 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.mockito:mockito-core' diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle index 9e924b126cf..12ce4109fbd 100644 --- a/server/sonar-webserver-webapi/build.gradle +++ b/server/sonar-webserver-webapi/build.gradle @@ -28,13 +28,13 @@ dependencies { } api project(':sonar-scanner-protocol') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi '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 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'com.squareup.okhttp3:mockwebserver' testImplementation 'javax.servlet:javax.servlet-api' diff --git a/server/sonar-webserver-ws/build.gradle b/server/sonar-webserver-ws/build.gradle index 3a2418226b1..f6f5c198f0d 100644 --- a/server/sonar-webserver-ws/build.gradle +++ b/server/sonar-webserver-ws/build.gradle @@ -16,13 +16,13 @@ dependencies { api project(':sonar-plugin-api-impl') api project(':sonar-ws') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'javax.servlet:javax.servlet-api' compileOnlyApi 'org.apache.tomcat.embed:tomcat-embed-core' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'junit:junit' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'javax.servlet:javax.servlet-api' testImplementation 'org.apache.tomcat.embed:tomcat-embed-core' testImplementation 'org.mockito:mockito-core' @@ -30,5 +30,5 @@ dependencies { testFixturesApi project(':sonar-testing-harness') - testFixturesCompileOnly 'com.google.code.findbugs:jsr305' + testFixturesCompileOnly 'com.github.spotbugs:spotbugs-annotations' } diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle index a6ee7f7fad8..ab1bd8f4715 100644 --- a/server/sonar-webserver/build.gradle +++ b/server/sonar-webserver/build.gradle @@ -25,11 +25,11 @@ dependencies { api project(':server:sonar-webserver-pushapi') api project(':server:sonar-webserver-monitoring') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'org.apache.logging.log4j:log4j-api' testImplementation 'org.apache.logging.log4j:log4j-core' - testImplementation 'com.google.code.findbugs:jsr305' + testImplementation 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.tngtech.java:junit-dataprovider' testImplementation 'org.junit.jupiter:junit-jupiter-api' testImplementation 'org.mockito:mockito-core' diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle index 9dab90e85b7..f384e6d905a 100644 --- a/sonar-application/build.gradle +++ b/sonar-application/build.gradle @@ -66,7 +66,7 @@ dependencies { api project(':sonar-core') api project(':sonar-plugin-api-impl') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' scanner project(path: ':sonar-scanner-engine-shaded', configuration: 'shadow') cyclonedx project(path: ':sonar-scanner-engine-shaded') diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle index 26872fcd0b0..e14941e5f6c 100644 --- a/sonar-core/build.gradle +++ b/sonar-core/build.gradle @@ -24,7 +24,7 @@ dependencies { api project(':sonar-plugin-api-impl') api project(':sonar-ws') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'com.google.code.gson:gson' testImplementation 'com.tngtech.java:junit-dataprovider' @@ -37,7 +37,7 @@ dependencies { testImplementation 'org.sonarsource.api.plugin:sonar-plugin-api-test-fixtures' testImplementation project(':sonar-testing-harness') - testCompileOnly 'com.google.code.findbugs:jsr305' + testCompileOnly 'com.github.spotbugs:spotbugs-annotations' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' diff --git a/sonar-duplications/build.gradle b/sonar-duplications/build.gradle index d3c65d720b2..2afa1c31eda 100644 --- a/sonar-duplications/build.gradle +++ b/sonar-duplications/build.gradle @@ -10,7 +10,7 @@ dependencies { api 'org.codehaus.sonar:sonar-channel' api 'org.sonarsource.api.plugin:sonar-plugin-api' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'ch.qos.logback:logback-classic' testImplementation 'commons-io:commons-io' diff --git a/sonar-plugin-api-impl/build.gradle b/sonar-plugin-api-impl/build.gradle index 8dc960886ce..2417c1f89fa 100644 --- a/sonar-plugin-api-impl/build.gradle +++ b/sonar-plugin-api-impl/build.gradle @@ -13,10 +13,10 @@ dependencies { api 'org.apache.commons:commons-csv' api 'org.sonarsource.api.plugin:sonar-plugin-api' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'junit:junit' - testCompileOnly 'com.google.code.findbugs:jsr305' + testCompileOnly 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.google.guava:guava' testImplementation 'com.tngtech.java:junit-dataprovider' diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle index e6a289228b8..9963db68df4 100644 --- a/sonar-scanner-engine/build.gradle +++ b/sonar-scanner-engine/build.gradle @@ -47,7 +47,7 @@ dependencies { api project(':sonar-duplications') api project(':sonar-plugin-api-impl') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.squareup.okhttp3:mockwebserver' testImplementation 'com.squareup.okhttp3:okhttp' diff --git a/sonar-scanner-protocol/build.gradle b/sonar-scanner-protocol/build.gradle index 18158a88d5c..ab20b8484d5 100644 --- a/sonar-scanner-protocol/build.gradle +++ b/sonar-scanner-protocol/build.gradle @@ -13,7 +13,7 @@ dependencies { api 'org.apache.commons:commons-lang3' api project(':sonar-core') - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'com.google.guava:guava' testImplementation 'junit:junit' diff --git a/sonar-shutdowner/build.gradle b/sonar-shutdowner/build.gradle index 39afc0069fa..c347c07772d 100644 --- a/sonar-shutdowner/build.gradle +++ b/sonar-shutdowner/build.gradle @@ -6,7 +6,7 @@ sonar { dependencies { // please keep list ordered - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'junit:junit' testImplementation 'org.assertj:assertj-core' diff --git a/sonar-testing-harness/build.gradle b/sonar-testing-harness/build.gradle index 7826c3bdba9..5a249e167af 100644 --- a/sonar-testing-harness/build.gradle +++ b/sonar-testing-harness/build.gradle @@ -16,7 +16,7 @@ dependencies { api 'org.jsoup:jsoup' api 'org.mockito:mockito-core' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' } artifactoryPublish.skip = false diff --git a/sonar-ws-generator/build.gradle b/sonar-ws-generator/build.gradle index df3d2ac2ef2..7ce6a3ad099 100644 --- a/sonar-ws-generator/build.gradle +++ b/sonar-ws-generator/build.gradle @@ -15,7 +15,7 @@ dependencies { api 'org.slf4j:log4j-over-slf4j' api 'org.sonarsource.orchestrator:sonar-orchestrator-junit4' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' } task fatJar(type: Jar) { diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle index 2855ab338f0..b443bf860e6 100644 --- a/sonar-ws/build.gradle +++ b/sonar-ws/build.gradle @@ -18,7 +18,7 @@ dependencies { api 'com.google.code.gson:gson' api 'org.sonarsource.api.plugin:sonar-plugin-api' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' compileOnlyApi 'javax.annotation:javax.annotation-api' testImplementation 'com.squareup.okhttp3:mockwebserver' diff --git a/test-monitoring/build.gradle b/test-monitoring/build.gradle index a96d20ff256..48ca4ab5da3 100644 --- a/test-monitoring/build.gradle +++ b/test-monitoring/build.gradle @@ -11,7 +11,7 @@ dependencies { api 'junit:junit' compileOnlyApi 'org.aspectj:aspectjtools' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' diff --git a/ut-monitoring/build.gradle b/ut-monitoring/build.gradle index b607704e80a..34cda613176 100644 --- a/ut-monitoring/build.gradle +++ b/ut-monitoring/build.gradle @@ -12,7 +12,7 @@ dependencies { api 'org.sonarsource.api.plugin:sonar-plugin-api' compileOnlyApi 'org.aspectj:aspectjtools' - compileOnlyApi 'com.google.code.findbugs:jsr305' + compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' } tasks.withType(JavaCompile) { |