Skip to content

Commit 4298e26

Browse files
Issue #957: Updating docker Script to Use Latest Groovy5
1 parent 60f7b99 commit 4298e26

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ workflows:
5151
jobs:
5252
- validate-with-maven-script:
5353
name: "releasenotes-builder"
54-
image-name: &custom_img "amitkumardeoghoria/jdk-17-groovy-git-mvn:v1.0"
54+
image-name: &custom_img "amitkumardeoghoria/jdk-21-groovy5-git-mvn-ant-jq:latest"
5555
command: "./.ci/validation.sh releasenotes-builder"
5656
- validate-with-maven-script:
5757
name: "patch-diff-report-tool"

checkstyle-tester/diff.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
44
import java.nio.file.Files
55
import java.nio.file.Paths
66
import java.util.regex.Pattern
7+
import groovy.cli.picocli.CliBuilder
8+
import groovy.util.AntBuilder
79

810
static void main(String[] args) {
911
def cliOptions = getCliOptions(args)
@@ -571,7 +573,7 @@ def generateAndPrintConfigHtmlFile(diffDir, configFile, textTransform, summaryIn
571573
def configfilenameWithoutExtension = getFilenameWithoutExtension(configFile.name)
572574
def configFileHtml = new File("$diffDir/${configfilenameWithoutExtension}.html")
573575
textTransform.transform(configFile.name, configFileHtml.toPath().toString(), Locale.ENGLISH,
574-
"UTF-8", "UTF-8")
576+
"UTF-8", "UTF-8", "UTF-8")
575577

576578
summaryIndexHtml << ('<h6>')
577579
summaryIndexHtml << ("<a href='${configFileHtml.name}'>${configFile.name} file</a>")

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN curl -s "https://get.sdkman.io" | bash
1212
# Install Java 21, Groovy, Maven via SDKMAN
1313
RUN bash -c "source $SDKMAN_DIR/bin/sdkman-init.sh && \
1414
sdk install java 21.0.4-tem && \
15-
sdk install groovy 3.0.21 && \
15+
sdk install groovy 5.0.0 && \
1616
sdk install maven 3.9.11"
1717

1818
# Update PATH and setup environment
@@ -24,6 +24,4 @@ ENV PATH=$GROOVY_HOME/bin:$SDKMAN_DIR/candidates/maven/current/bin:$JAVA_HOME/bi
2424
RUN bash -c "source $SDKMAN_DIR/bin/sdkman-init.sh && \
2525
java -version && \
2626
groovy --version && \
27-
mvn -version && \
28-
groovy -e 'new CliBuilder(); println \"CliBuilder OK\"' && \
29-
groovy -e 'new AntBuilder(); println \"AntBuilder OK\"'"
27+
mvn -version"

0 commit comments

Comments
 (0)