From 5d8a554d2e06b1cc8302cff2bbe2a78b482a7220 Mon Sep 17 00:00:00 2001
From: Ben Manes <ben.manes@gmail.com>
Date: Sun, 11 Oct 2020 22:15:26 -0700
Subject: [PATCH] Upgrade spotbugs

---
 checksum.xml               | 1 +
 gradle/codeQuality.gradle  | 8 +++++---
 gradle/dependencies.gradle | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/checksum.xml b/checksum.xml
index f58ba6d49e..c0a0aa889c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -164,6 +164,7 @@
     <trusted-key id='bcf4173966770193' group='org.jetbrains' />
     <trusted-key id='b2c4d8b48a99f98a' group='org.jetbrains.kotlin' />
     <trusted-key id='66f8e4860bf74983' group='org.jooq' />
+    <trusted-key id='145d819475314d97' group='org.json' />
     <trusted-key id='8db9fa0b0718bbf9' group='org.jsr107.ri' />
     <trusted-key id='0315bfb7970a144f' group='org.jvnet.staxex' />
     <trusted-key id='f1f286fc184b6bda' group='org.kordamp.gradle' />
diff --git a/gradle/codeQuality.gradle b/gradle/codeQuality.gradle
index 24d372b491..a59f9d012c 100644
--- a/gradle/codeQuality.gradle
+++ b/gradle/codeQuality.gradle
@@ -1,6 +1,8 @@
 /**
  * Configurations for code quality analysis
  */
+import static org.gradle.util.GradleVersion.version
+
 apply plugin: 'org.kordamp.gradle.jandex'
 apply plugin: 'org.kordamp.gradle.stats'
 apply plugin: 'com.github.spotbugs'
@@ -67,18 +69,18 @@ checkstyle {
 
 spotbugs {
   effort = 'max'
-  toolVersion = pluginVersions.spotbugs
   excludeFilter = file("${rootDir}/config/spotbugs/exclude.xml")
+  toolVersion = [version(pluginVersions.spotbugs), version(toolVersion.get())].max().version
 }
 
 pmd {
   ruleSets = []
-  toolVersion = pluginVersions.pmd
   ruleSetConfig = resources.text.fromFile(file("${rootDir}/config/pmd/rulesSets.xml"))
+  toolVersion = [version(pluginVersions.pmd), version(toolVersion)].max().version
 }
 
 jacoco {
-  toolVersion = pluginVersions.jacoco
+  toolVersion = [version(pluginVersions.jacoco), version(toolVersion)].max().version
 }
 
 jacocoTestReport {
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 75e8912d12..dcb2f3b749 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -96,7 +96,7 @@ ext {
     semanticVersioning: '1.1.0',
     shadow: '6.1.0',
     sonarqube: '3.0',
-    spotbugs: '4.0.3',
+    spotbugs: '4.1.3',
     spotbugsPlugin: '4.5.1',
     stats: '0.2.2',
     versions: '0.33.0',