Issue #957: Updating docker Script to Use Latest Groovy5

Author: AmitKumarDeoghoria

.circleci/config.yml

@@ -51,7 +51,7 @@ workflows:
     jobs:
       - validate-with-maven-script:
           name: "releasenotes-builder"
-          image-name: &custom_img "amitkumardeoghoria/jdk-17-groovy-git-mvn:v1.0"
+          image-name: &custom_img "amitkumardeoghoria/jdk-21-groovy5-git-mvn-ant-jq:latest"
           command: "./.ci/validation.sh releasenotes-builder"
       - validate-with-maven-script:
           name: "patch-diff-report-tool"

checkstyle-tester/diff.groovy

@@ -3,7 +3,9 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
 
 import java.nio.file.Files
 import java.nio.file.Paths
+import java.nio.file.Path
 import java.util.regex.Pattern
+import groovy.cli.picocli.CliBuilder
 
 static void main(String[] args) {
     def cliOptions = getCliOptions(args)
@@ -571,7 +573,7 @@ def generateAndPrintConfigHtmlFile(diffDir, configFile, textTransform, summaryIn
     def configfilenameWithoutExtension = getFilenameWithoutExtension(configFile.name)
     def configFileHtml = new File("$diffDir/${configfilenameWithoutExtension}.html")
     textTransform.transform(configFile.name, configFileHtml.toPath().toString(), Locale.ENGLISH,
-        "UTF-8", "UTF-8")
+        "UTF-8", "UTF-8", "UTF-8")
 
     summaryIndexHtml << ('<h6>')
     summaryIndexHtml << ("<a href='${configFileHtml.name}'>${configFile.name} file</a>")
@@ -703,27 +705,51 @@ def runMavenExecution(srcDir, excludes, checkstyleConfig,
 }
 
 def postProcessCheckstyleReport(targetDir, repoName, repoPath) {
-    new AntBuilder().replace(
-        file: getOsSpecificPath("$targetDir", "checkstyle-result.xml"),
-        token: new File(getOsSpecificPath("src", "main", "java", "$repoName")).absolutePath,
-        value: getOsSpecificPath("$repoPath")
-    )
+    def checkstyleResultFile = new File(getOsSpecificPath("$targetDir", "checkstyle-result.xml"))
+    if (checkstyleResultFile.exists()) {
+        def content = checkstyleResultFile.text
+        def oldPath = new File(getOsSpecificPath("src", "main", "java", "$repoName")).absolutePath
+        def newContent = content.replace(oldPath, getOsSpecificPath("$repoPath"))
+        checkstyleResultFile.text = newContent
+    }
 }
 
 def copyDir(source, destination) {
-    new AntBuilder().copy(todir: destination) {
-        fileset(dir: source)
+    def sourceDir = new File(source)
+    def destDir = new File(destination)
+
+    if (!destDir.exists()) {
+        destDir.mkdirs()
+    }
+
+    sourceDir.eachFileRecurse { file ->
+        def relativePath = sourceDir.toPath().relativize(file.toPath())
+        def destFile = new File(destDir, relativePath.toString())
+
+        if (file.isDirectory()) {
+            destFile.mkdirs()
+        } else {
+            Files.copy(file.toPath(), destFile.toPath(), REPLACE_EXISTING)
+        }
     }
 }
 
 def moveDir(source, destination) {
-    new AntBuilder().move(todir: destination) {
-        fileset(dir: source)
+    def sourceDir = new File(source)
+    def destDir = new File(destination)
+
+    if (sourceDir.exists()) {
+        // First copy, then delete
+        copyDir(source, destination)
+        deleteDir(source)
     }
 }
 
 def deleteDir(dir) {
-    new AntBuilder().delete(dir: dir, failonerror: false)
+    def dirFile = new File(dir)
+    if (dirFile.exists() && dirFile.isDirectory()) {
+        dirFile.deleteDir()
+    }
 }
 
 def executeCmd(cmd, dir = new File("").absoluteFile) {

devops/docker/no-exception-build-image/jdk-21-groovy-git-mvn-ant-jq/Dockerfile

@@ -12,7 +12,7 @@ RUN curl -s "https://get.sdkman.io" | bash
 # Install Java 21, Groovy, Maven via SDKMAN
 RUN bash -c "source $SDKMAN_DIR/bin/sdkman-init.sh && \
     sdk install java 21.0.4-tem && \
-    sdk install groovy 3.0.21 && \
+    sdk install groovy 5.0.0 && \
     sdk install maven 3.9.11"
 
 # Update PATH and setup environment
@@ -24,6 +24,4 @@ ENV PATH=$GROOVY_HOME/bin:$SDKMAN_DIR/candidates/maven/current/bin:$JAVA_HOME/bi
 RUN bash -c "source $SDKMAN_DIR/bin/sdkman-init.sh && \
     java -version && \
     groovy --version && \
-    mvn -version && \
-    groovy -e 'new CliBuilder(); println \"CliBuilder OK\"' && \
-    groovy -e 'new AntBuilder(); println \"AntBuilder OK\"'"
+    mvn -version"