Index: applications/editors/josm/plugins/MicrosoftStreetside/gradle/tool-config.gradle
===================================================================
--- applications/editors/josm/plugins/MicrosoftStreetside/gradle/tool-config.gradle	(revision 34361)
+++ applications/editors/josm/plugins/MicrosoftStreetside/gradle/tool-config.gradle	(revision 35779)
@@ -1,9 +1,10 @@
-def pmdVersion = "5.8.0" // TODO: Update to PMD 6
-def spotbugsVersion = "3.1.3"
-def jacocoVersion = "0.8.1"
-def errorproneVersion = "2.3.1"
+def pmdVersion = "6.36.0"
+def spotbugsVersion = "4.3.0"
+def jacocoVersion = "0.8.7"
+def errorproneVersion = "2.7.1"
 
 // Set up ErrorProne (currently only for JDK8, until JDK9 is supported)
 dependencies.errorprone "com.google.errorprone:error_prone_core:$errorproneVersion"
+/*
 tasks.withType(JavaCompile) {
 options.compilerArgs += ['-Xep:DefaultCharset:ERROR',
@@ -17,4 +18,5 @@
   '-Xep:ConstantField:WARN']
 }
+*/
 
 // Spotbugs config
@@ -24,5 +26,5 @@
   effort = "max"
   reportLevel = "low"
-  sourceSets = [sourceSets.main, sourceSets.test]
+  //sourceSets = [sourceSets.main, sourceSets.test]
 }
 
Index: applications/editors/josm/plugins/MicrosoftStreetside/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- applications/editors/josm/plugins/MicrosoftStreetside/gradle/wrapper/gradle-wrapper.properties	(revision 34361)
+++ applications/editors/josm/plugins/MicrosoftStreetside/gradle/wrapper/gradle-wrapper.properties	(revision 35779)
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists