From d9d47e3def636486f565da5c54120263bae905e3 Mon Sep 17 00:00:00 2001
From: Gerd Aschemann <gerd@aschemann.net>
Date: Fri, 16 Aug 2024 17:20:45 +0200
Subject: [PATCH] #318 Use Groovy version from Gradle

This should work for the Plugin and
result in compatibility for Spock
---
 build.gradle                      | 3 +--
 gradle/libs.versions.toml         | 1 -
 htmlSanityCheck-cli/build.gradle  | 1 +
 htmlSanityCheck-core/build.gradle | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index b91a7e1c..15ff30d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ ext.urls = [
 ]
 
 // tag::mavenBuildRepo[]
-File baseBuildDir = file("${project.rootDir}/build")
+File baseBuildDir = file("${project.rootDir}/${Project.DEFAULT_BUILD_DIR_NAME}")
 File mavenBuildRepo = new File(baseBuildDir, "maven-repo")
 // end::mavenBuildRepo[]
 
@@ -167,7 +167,6 @@ configure(subprojects) {
     description "${rootProject.description} - Module ${project.name}"
 
     dependencies {
-        implementation platform(libs.groovy.bom)
         implementation platform(libs.slf4j.bom)
 
         testImplementation platform(libs.spock)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a5298f84..ff4fc6c1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,6 @@ wiremock-testcontainers-version = '1.0-alpha-14'
 [libraries]
 commons-validator = 'commons-validator:commons-validator:1.9.0'
 # Use latest 3.x Groovy Version to use Spock for Groovy 3 as long as Gradle uses Groovy 3
-groovy-bom = 'org.codehaus.groovy:groovy-bom:3.0.22'
 jsoup = 'org.jsoup:jsoup:1.18.3'
 junit-vintage = { module = 'org.junit.vintage:junit-vintage-engine', version.ref = 'junit5-version' }
 lombok = 'org.projectlombok:lombok:1.18.36'
diff --git a/htmlSanityCheck-cli/build.gradle b/htmlSanityCheck-cli/build.gradle
index 7cb7fb88..66a8307c 100644
--- a/htmlSanityCheck-cli/build.gradle
+++ b/htmlSanityCheck-cli/build.gradle
@@ -6,6 +6,7 @@ dependencies {
     implementation libs.picocli.impl
     annotationProcessor libs.picocli.annotationprocessor
 
+    implementation platform("org.codehaus.groovy:groovy-bom:${GroovySystem.version}")
     implementation 'org.codehaus.groovy:groovy'
     implementation 'org.slf4j:slf4j-api'
     implementation 'org.slf4j:slf4j-simple'
diff --git a/htmlSanityCheck-core/build.gradle b/htmlSanityCheck-core/build.gradle
index c40104d3..4d7c3654 100644
--- a/htmlSanityCheck-core/build.gradle
+++ b/htmlSanityCheck-core/build.gradle
@@ -27,7 +27,6 @@ dependencies {
 
 gitProperties {
     // specify the location of the generated file
-//    gitPropertiesResourceDir = file("${project.projectDir}/build/resources/main")
 
     // specify the properties to include
     keys = ['git.branch',