diff options
| author | Jiayu Liu <jiayu@hey.com> | 2022-02-21 23:18:50 +0800 |
|---|---|---|
| committer | Jens Geyer <Jens-G@users.noreply.github.com> | 2022-03-10 23:15:19 +0100 |
| commit | 649dcfd4a06dbe529870015e7f838d5f46426648 (patch) | |
| tree | b0fbf283ba3cf3cdb9a7e4bb739681571ea21b7c | |
| parent | 20e2ceb8233217a61a77e37cccaf2cc119fb0c48 (diff) | |
| download | thrift-649dcfd4a06dbe529870015e7f838d5f46426648.tar.gz | |
update to gradle 6.9, jdk 15, update findbugs
| -rw-r--r-- | lib/java/build.gradle | 7 | ||||
| -rw-r--r-- | lib/java/gradle/codeQualityChecks.gradle | 11 | ||||
| -rw-r--r-- | lib/java/gradle/wrapper/gradle-wrapper.properties | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/lib/java/build.gradle b/lib/java/build.gradle index e88ff1212..ad3024997 100644 --- a/lib/java/build.gradle +++ b/lib/java/build.gradle @@ -40,12 +40,7 @@ plugins { id 'maven' id 'signing' id 'com.github.johnrengelman.shadow' version '4.0.4' - id "com.github.spotbugs" version "2.0.0" -} - -ext { - // https://github.com/spotbugs/spotbugs-gradle-plugin/issues/32#issuecomment-409951172 - SpotBugsTask = com.github.spotbugs.SpotBugsTask + id "com.github.spotbugs" version "4.7.1" } description = 'Apache Thrift Java Library' diff --git a/lib/java/gradle/codeQualityChecks.gradle b/lib/java/gradle/codeQualityChecks.gradle index b06628759..a3530979b 100644 --- a/lib/java/gradle/codeQualityChecks.gradle +++ b/lib/java/gradle/codeQualityChecks.gradle @@ -5,21 +5,22 @@ dependencies { spotbugs configurations.spotbugsPlugins.dependencies - spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.8.0' + spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0' } apply plugin: 'com.github.spotbugs' -spotbugs{ +// see https://spotbugs-gradle-plugin.netlify.app/com/github/spotbugs/snom/spotbugsextension +spotbugs { ignoreFailures = true - toolVersion = '3.1.12' - sourceSets = [ sourceSets.main ] + toolVersion = '4.5.3' effort = 'max' reportLevel = 'low' excludeFilter = file('code_quality_tools/findbugs-filter.xml') } -tasks.withType(SpotBugsTask) { +// see https://spotbugs-gradle-plugin.netlify.app/com/github/spotbugs/snom/spotbugstask +spotbugsMain { reports { text.enabled = false html.enabled = true diff --git a/lib/java/gradle/wrapper/gradle-wrapper.properties b/lib/java/gradle/wrapper/gradle-wrapper.properties index 5028f28f8..ec991f9aa 100644 --- a/lib/java/gradle/wrapper/gradle-wrapper.properties +++ b/lib/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |