From a630f44b507becfa98456b12b06114a41a226c37 Mon Sep 17 00:00:00 2001
From: Taylor Smock <tsmock@fb.com>
Date: Wed, 19 May 2021 08:56:08 -0600
Subject: [PATCH] Gradle: Dependency updates

Signed-off-by: Taylor Smock <tsmock@fb.com>
---
 build.gradle                             | 20 ++++++++++----------
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index e9e2782..58c4824 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,11 +11,11 @@ plugins {
   id "maven-publish"
   id "pmd"
   id "com.github.ben-manes.versions" version "0.38.0"
-  id "com.github.spotbugs" version "4.7.0"
+  id "com.github.spotbugs" version "4.7.1"
   id "org.openstreetmap.josm" version "0.7.1"
   id "net.ltgt.errorprone" version "2.0.1"
-  id "com.diffplug.spotless" version "5.11.1"
-  id "org.sonarqube" version "3.1.1"
+  id "com.diffplug.spotless" version "5.12.5"
+  id "org.sonarqube" version "3.2.0"
   //id 'de.aaschmid.cpd' version '2.0'
 }
 
@@ -43,7 +43,6 @@ def gitlabGroup = "gokaart"
 def gitlabRepositoryName = "JOSM_MapWithAI"
 
 repositories {
-  jcenter()
   mavenCentral()
 }
 
@@ -71,13 +70,13 @@ sourceSets {
 }
 
 def versions = [
-  awaitility: "4.0.3",
+  awaitility: "4.1.0",
   errorprone: "2.4.0",
   jacoco: "0.8.5",
   jmockit: "1.49",
   junit: "5.7.1",
   pmd: "6.20.0",
-  spotbugs: "4.2.2",
+  spotbugs: "4.2.3",
   wiremock: "2.27.2",
   findsecbugs: "1.11.0",
 ]
@@ -92,8 +91,8 @@ dependencies {
   testImplementation("org.junit.jupiter:junit-jupiter-api:${versions.junit}")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit}")
   testImplementation("org.junit.vintage:junit-vintage-engine:${versions.junit}")
-  testCompile("org.junit.jupiter:junit-jupiter-params:${versions.junit}")
-  testCompile("org.jmockit:jmockit:${versions.jmockit}")
+  testImplementation("org.junit.jupiter:junit-jupiter-params:${versions.junit}")
+  testImplementation("org.jmockit:jmockit:${versions.jmockit}")
   testImplementation("com.github.spotbugs:spotbugs-annotations:${versions.spotbugs}")
   testImplementation("org.openstreetmap.josm:josm-unittest:"){changing=true}
   testImplementation("com.github.tomakehurst:wiremock:${versions.wiremock}")
@@ -146,10 +145,11 @@ task integrationTest(type: Test) {
 check.dependsOn integrationTest
 
 tasks.processResources {
+  // Note: src/${source_set}/resources is automatically copied
+  // processResources uses the `main` source set.
+  // https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_resources
   from("$projectDir/LICENSE")
   from("$projectDir/README.md")
-  from("$projectDir/src/resources")
-  from("$projectDir/src/main/resources")
 }
 
 jacocoTestCoverageVerification {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 51d930a..4e77d0c 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=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists