Update to gradle-josm-plugin 0.7.0 and Gradle 6

build.gradle

@@ -1,4 +1,4 @@
-import com.github.spotbugs.SpotBugsTask
+import com.github.spotbugs.snom.SpotBugsTask
 import net.ltgt.gradle.errorprone.CheckSeverity
 
 plugins {
@@ -7,9 +7,9 @@ plugins {
   id "jacoco"
   id "maven-publish"
   id "pmd"
-  id "com.github.ben-manes.versions" version "0.27.0"
-  id "com.github.spotbugs" version "2.0.1"
-  id "org.openstreetmap.josm" version "0.6.5"
+  id("com.github.ben-manes.versions").version("0.28.0")
+  id("com.github.spotbugs").version("4.2.0")
+  id("org.openstreetmap.josm").version("0.7.0")
   id "net.ltgt.errorprone" version "1.1.1"
 }
 
@@ -32,11 +32,11 @@ tasks.withType(JavaCompile).configureEach {
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 def versions = [
-  errorprone: "2.3.3",
+  errorprone: "2.3.4",
   jacoco: "0.8.5",
-  junit: "5.5.2",
+  junit: "5.6.2",
   pmd: "6.19.0",
-  spotbugs: "3.1.12",
+  spotbugs: "4.0.3",
 ]
 
 repositories {
@@ -53,8 +53,8 @@ dependencies {
   testImplementation("org.junit.vintage:junit-vintage-engine:${versions.junit}")
   testImplementation("com.github.spotbugs:spotbugs-annotations:${versions.spotbugs}")
   testImplementation("org.openstreetmap.josm:josm-unittest:"){changing=true}
-  testImplementation("com.github.tomakehurst:wiremock-jre8:2.25.1")
-  testImplementation("org.awaitility:awaitility:4.0.1")
+  testImplementation("com.github.tomakehurst:wiremock-jre8:2.26.3")
+  testImplementation("org.awaitility:awaitility:4.0.2")
 }
 
 dependencyUpdates.rejectVersionIf { version ->
@@ -134,13 +134,11 @@ pmd {
 
 // Set up SpotBugs
 spotbugs {
-  toolVersion = versions.spotbugs
-  ignoreFailures = true
-  sourceSets = [sourceSets.main]
+  toolVersion.set(versions.spotbugs)
+  ignoreFailures.set(true)
 }
 tasks.withType(SpotBugsTask) {
   reports {
-    xml.enabled = false
     html.enabled = true
   }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=027fdd265d277bae65a0d349b6b8da02135b0b8e14ba891e26281fa877fe37a2
+distributionSha256Sum=d08f7e24d061910382c2fda9915e6ed42dd1480ae2e99211f92c70190cb697e0

ivy.xml

@@ -1,8 +1,8 @@
 <ivy-module version="2.0">
   <info organisation="org.openstreetmap.josm.plugins" module="wikipedia"/>
   <dependencies>
-    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.10.1"/>
-    <dependency org="org.wikidata.wdtk" name="wdtk-wikibaseapi" rev="0.11.0"/>
-    <dependency org="org.wikidata.wdtk" name="wdtk-dumpfiles" rev="0.11.0"/>
+    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.11.0"/>
+    <dependency org="org.wikidata.wdtk" name="wdtk-wikibaseapi" rev="0.11.1"/>
+    <dependency org="org.wikidata.wdtk" name="wdtk-dumpfiles" rev="0.11.1"/>
   </dependencies>
 </ivy-module>

test/unit/org/wikipedia/WikipediaAppTest.java

@@ -4,8 +4,8 @@
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;

test/unit/org/wikipedia/data/WikipediaEntryTest.java

@@ -3,7 +3,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Optional;
 import org.junit.Rule;

test/unit/org/wikipedia/gui/WikidataTagCellRendererTest.java

@@ -2,8 +2,8 @@
 package org.wikipedia.gui;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.List;

test/unit/org/wikipedia/io/SophoxDownloadReaderTest.java

@@ -2,7 +2,7 @@
 package org.wikipedia.io;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.ByteArrayInputStream;