diff --git a/build.gradle b/build.gradle
index d157b49..37a2141 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ import java.nio.file.Paths
 import java.util.stream.Collectors
 
 plugins {
-  id "com.diffplug.spotless" version "6.3.0"
+  id "com.diffplug.spotless" version "6.6.0"
   id "com.github.ben-manes.versions" version "0.42.0"
   id "com.github.spotbugs" version "5.0.6"
   // id "de.aaschmid.cpd" version "3.3"
@@ -48,16 +48,18 @@ java {
 // Set up Errorprone
 tasks.withType(JavaCompile).configureEach {
   options.errorprone {
+    check("ClassCanBeStatic", CheckSeverity.ERROR)
+    check("ConstantField", CheckSeverity.WARN)
     check("DefaultCharset", CheckSeverity.ERROR)
-    check("StringEquality", CheckSeverity.ERROR)
-    check("ConstantField",  CheckSeverity.WARN)
     check("FieldCanBeFinal", CheckSeverity.WARN)
     check("LambdaFunctionalInterface", CheckSeverity.WARN)
     check("MethodCanBeStatic", CheckSeverity.WARN)
     check("MultiVariableDeclaration", CheckSeverity.WARN)
     check("PrivateConstructorForUtilityClass", CheckSeverity.WARN)
+    check("RemoveUnusedImports", CheckSeverity.WARN)
+    check("ReferenceEquality", CheckSeverity.ERROR)
     check("UngroupedOverloads", CheckSeverity.WARN)
-    check("WildcardImport", CheckSeverity.WARN)
+    check("WildcardImport", CheckSeverity.ERROR)
   }
 }
 
@@ -111,14 +113,14 @@ sourceSets {
 def versions = [
   awaitility: "4.2.0",
   // Errorprone 2.11 requires Java 11+
-  errorprone: (JavaVersion.toVersion(getJavaVersion()) >= JavaVersion.VERSION_11) ? "2.11.0" : "2.10.0",
+  errorprone: (JavaVersion.toVersion(getJavaVersion()) >= JavaVersion.VERSION_11) ? "2.13.1" : "2.10.0",
   jacoco: "0.8.7",
   jmockit: "1.49.a",
   junit: "5.8.2",
   pmd: "6.20.0",
-  spotbugs: "4.6.0",
-  wiremock: "2.32.0",
-  findsecbugs: "1.11.0",
+  spotbugs: "4.7.0",
+  wiremock: "2.33.2",
+  findsecbugs: "1.12.0",
   josm: properties.get("plugin.compile.version"),
 ]
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffe61b4..5c51a4a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists