From 534288bb11a7f2d54eff7d39970e029068b92e6c Mon Sep 17 00:00:00 2001
From: Gerd Aschemann <gerd@aschemann.net>
Date: Wed, 24 Jan 2024 08:30:16 +0100
Subject: [PATCH] #309 Update dependencies to use Spock (with JUnit 4)

---
 build.gradle                               | 8 ++++++++
 gradle/libs.versions.toml                  | 3 +--
 htmlSanityCheck-core/build.gradle          | 6 ------
 htmlSanityCheck-gradle-plugin/build.gradle | 3 ---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index b59bacd3..e64d4bec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,6 +52,10 @@ allprojects {
 }
 
 subprojects {
+    test {
+        useJUnitPlatform()
+    }
+
     ext {
         publishVariant = { String variant ->
             publishing {
@@ -80,6 +84,10 @@ configure(subprojects) {
     dependencies {
         implementation platform(libs.groovy.bom)
         implementation 'org.codehaus.groovy:groovy'
+
+        testImplementation platform (libs.spock)
+        testImplementation "org.spockframework:spock-core"
+        testImplementation "org.spockframework:spock-junit4"
     }
 
     java {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6cea07fd..b9da1b68 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,10 +5,9 @@ groovy-version = "3.0.17"
 # Use Groovy which corresponds to Gradle version (of hsc build)
 groovy-bom = { module = "org.codehaus.groovy:groovy-bom", version.ref = "groovy-version" }
 jsoup = "org.jsoup:jsoup:1.17.2"
-junit = "junit:junit:4.13.2"
 slf4j-api = "org.slf4j:slf4j-simple:2.0.7"
 slf4j-simple = "org.slf4j:slf4j-simple:2.0.7"
-spock = "org.spockframework:spock-core:2.3-groovy-3.0"
+spock = "org.spockframework:spock-bom:2.3-groovy-3.0"
 
 [plugins]
 gradle-versions = { id= "com.github.ben-manes.versions", version = "0.50.0" }
diff --git a/htmlSanityCheck-core/build.gradle b/htmlSanityCheck-core/build.gradle
index f042ebb7..6d54def2 100644
--- a/htmlSanityCheck-core/build.gradle
+++ b/htmlSanityCheck-core/build.gradle
@@ -1,10 +1,4 @@
 dependencies {
-    testImplementation(
-            libs.junit,
-            libs.spock,
-            libs.slf4j.simple
-    )
-
     implementation libs.slf4j.api
 
     // jsoup is our awesome html parser, see jsoup.org
diff --git a/htmlSanityCheck-gradle-plugin/build.gradle b/htmlSanityCheck-gradle-plugin/build.gradle
index ac05b353..00574a0c 100755
--- a/htmlSanityCheck-gradle-plugin/build.gradle
+++ b/htmlSanityCheck-gradle-plugin/build.gradle
@@ -1,8 +1,5 @@
 dependencies {
     testImplementation(
-            libs.junit,
-            libs.spock,
-
             gradleTestKit()
     )