Groovy 5.0.3 #20440
Merged
Groovy 5.0.3 #20440
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 383eb7c:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b273fa2..99ccd7e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,35 +1,40 @@
Maintainers: Keegan Witt <keeganwitt@gmail.com> (@keeganwitt)
GitRepo: https://github.com/groovy/docker-groovy.git
-Tags: 4.0.27-jdk8, 4.0-jdk8, 4-jdk8, jdk8, 4.0.27-jdk8-jammy, 4.0-jdk8-jammy, 4-jdk8-jammy, jdk8-jammy
-Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 5a3c63b31c157987812e0b7d7d510cf83490e259
-Directory: jdk8
-
-Tags: 4.0.27-jdk11, 4.0-jdk11, 4-jdk11, jdk11, 4.0.27-jdk11-jammy, 4.0-jdk11-jammy, 4-jdk11-jammy, jdk11-jammy, 4.0.27-jdk-jammy, 4.0-jdk-jammy, 4-jdk-jammy, jdk-jammy, 4.0.27-jammy, 4.0-jammy, 4-jammy, jammy
+Tags: 5.0.3-jdk11, 5.0-jdk11, 5-jdk11, jdk11, 5.0.3-jdk11-jammy, 5.0-jdk11-jammy, 5-jdk11-jammy, jdk11-jammy, 5.0.3-jdk-jammy, 5.0-jdk-jammy, 5-jdk-jammy, jdk-jammy, 5.0.3-jammy, 5.0-jammy, 5-jammy, jammy
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 5a3c63b31c157987812e0b7d7d510cf83490e259
+GitCommit: 4c69514606dd56641932a0253ded4932f808cf0b
Directory: jdk11
-Tags: 4.0.27-jdk11-alpine, 4.0-jdk11-alpine, 4-jdk11-alpine, jdk11-alpine
-GitCommit: 5a3c63b31c157987812e0b7d7d510cf83490e259
+Tags: 5.0.3-jdk11-alpine, 5.0-jdk11-alpine, 5-jdk11-alpine, jdk11-alpine
+GitCommit: 4c69514606dd56641932a0253ded4932f808cf0b
Directory: jdk11-alpine
-Tags: 4.0.27-jdk17, 4.0-jdk17, 4-jdk17, jdk17, 4.0.27-jdk17-noble, 4.0-jdk17-noble, 4-jdk17-noble, jdk17-noble
+Tags: 5.0.3-jdk17, 5.0-jdk17, 5-jdk17, jdk17, 5.0.3-jdk17-noble, 5.0-jdk17-noble, 5-jdk17-noble, jdk17-noble
Architectures: amd64, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitCommit: 5a3c63b31c157987812e0b7d7d510cf83490e259
+GitCommit: 4c69514606dd56641932a0253ded4932f808cf0b
Directory: jdk17
-Tags: 4.0.27-jdk17-alpine, 4.0-jdk17-alpine, 4-jdk17-alpine, jdk17-alpine
-GitCommit: 5a3c63b31c157987812e0b7d7d510cf83490e259
+Tags: 5.0.3-jdk17-alpine, 5.0-jdk17-alpine, 5-jdk17-alpine, jdk17-alpine
+GitCommit: 4c69514606dd56641932a0253ded4932f808cf0b
Directory: jdk17-alpine
-Tags: 4.0.27-jdk21, 4.0-jdk21, 4-jdk21, jdk21, 4.0.27-jdk21-noble, 4.0-jdk21-noble, 4-jdk21-noble, jdk21-noble, latest, 4.0.27-jdk, 4.0-jdk, 4-jdk, jdk, 4.0.27, 4.0, 4, 4.0.27-jdk-noble, 4.0-jdk-noble, 4-jdk-noble, jdk-noble, 4.0.27-noble, 4.0-noble, 4-noble, noble
+Tags: 5.0.3-jdk21, 5.0-jdk21, 5-jdk21, jdk21, 5.0.3-jdk21-noble, 5.0-jdk21-noble, 5-jdk21-noble, jdk21-noble
Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
-GitCommit: 5a3c63b31c157987812e0b7d7d510cf83490e259
+GitCommit: 4c69514606dd56641932a0253ded4932f808cf0b
Directory: jdk21
-Tags: 4.0.27-jdk21-alpine, 4.0-jdk21-alpine, 4-jdk21-alpine, jdk21-alpine, 4.0.27-jdk-alpine, 4.0-jdk-alpine, 4-jdk-alpine, jdk-alpine, 4.0.27-alpine, 4.0-alpine, 4-alpine, alpine
+Tags: 5.0.3-jdk21-alpine, 5.0-jdk21-alpine, 5-jdk21-alpine, jdk21-alpine
Architectures: amd64, arm64v8
-GitCommit: 5a3c63b31c157987812e0b7d7d510cf83490e259
+GitCommit: 4c69514606dd56641932a0253ded4932f808cf0b
Directory: jdk21-alpine
+
+Tags: 5.0.3-jdk25, 5.0-jdk25, 5-jdk25, jdk25, 5.0.3-jdk25-noble, 5.0-jdk25-noble, 5-jdk25-noble, jdk25-noble, latest, 5.0.3-jdk, 5.0-jdk, 5-jdk, jdk, 5.0.3, 5.0, 4, 5.0.3-jdk-noble, 5.0-jdk-noble, 5-jdk-noble, jdk-noble, 5.0.3-noble, 5.0-noble, 5-noble, noble
+Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
+GitCommit: 4c69514606dd56641932a0253ded4932f808cf0b
+Directory: jdk25
+
+Tags: 5.0.3-jdk25-alpine, 5.0-jdk25-alpine, 5-jdk25-alpine, jdk25-alpine, 5.0.3-jdk-alpine, 5.0-jdk-alpine, 5-jdk-alpine, jdk-alpine, 5.0.3-alpine, 5.0-alpine, 5-alpine, alpine
+Architectures: amd64, arm64v8
+GitCommit: 4c69514606dd56641932a0253ded4932f808cf0b
+Directory: jdk25-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index bef328b..5e1a914 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,65 +1,66 @@
groovy:4
-groovy:4-alpine
-groovy:4-jammy
-groovy:4-jdk
-groovy:4-jdk8
-groovy:4-jdk8-jammy
-groovy:4-jdk11
-groovy:4-jdk11-alpine
-groovy:4-jdk11-jammy
-groovy:4-jdk17
-groovy:4-jdk17-alpine
-groovy:4-jdk17-noble
-groovy:4-jdk21
-groovy:4-jdk21-alpine
-groovy:4-jdk21-noble
-groovy:4-jdk-alpine
-groovy:4-jdk-jammy
-groovy:4-jdk-noble
-groovy:4-noble
-groovy:4.0
-groovy:4.0-alpine
-groovy:4.0-jammy
-groovy:4.0-jdk
-groovy:4.0-jdk8
-groovy:4.0-jdk8-jammy
-groovy:4.0-jdk11
-groovy:4.0-jdk11-alpine
-groovy:4.0-jdk11-jammy
-groovy:4.0-jdk17
-groovy:4.0-jdk17-alpine
-groovy:4.0-jdk17-noble
-groovy:4.0-jdk21
-groovy:4.0-jdk21-alpine
-groovy:4.0-jdk21-noble
-groovy:4.0-jdk-alpine
-groovy:4.0-jdk-jammy
-groovy:4.0-jdk-noble
-groovy:4.0-noble
-groovy:4.0.27
-groovy:4.0.27-alpine
-groovy:4.0.27-jammy
-groovy:4.0.27-jdk
-groovy:4.0.27-jdk8
-groovy:4.0.27-jdk8-jammy
-groovy:4.0.27-jdk11
-groovy:4.0.27-jdk11-alpine
-groovy:4.0.27-jdk11-jammy
-groovy:4.0.27-jdk17
-groovy:4.0.27-jdk17-alpine
-groovy:4.0.27-jdk17-noble
-groovy:4.0.27-jdk21
-groovy:4.0.27-jdk21-alpine
-groovy:4.0.27-jdk21-noble
-groovy:4.0.27-jdk-alpine
-groovy:4.0.27-jdk-jammy
-groovy:4.0.27-jdk-noble
-groovy:4.0.27-noble
+groovy:5-alpine
+groovy:5-jammy
+groovy:5-jdk
+groovy:5-jdk11
+groovy:5-jdk11-alpine
+groovy:5-jdk11-jammy
+groovy:5-jdk17
+groovy:5-jdk17-alpine
+groovy:5-jdk17-noble
+groovy:5-jdk21
+groovy:5-jdk21-alpine
+groovy:5-jdk21-noble
+groovy:5-jdk25
+groovy:5-jdk25-alpine
+groovy:5-jdk25-noble
+groovy:5-jdk-alpine
+groovy:5-jdk-jammy
+groovy:5-jdk-noble
+groovy:5-noble
+groovy:5.0
+groovy:5.0-alpine
+groovy:5.0-jammy
+groovy:5.0-jdk
+groovy:5.0-jdk11
+groovy:5.0-jdk11-alpine
+groovy:5.0-jdk11-jammy
+groovy:5.0-jdk17
+groovy:5.0-jdk17-alpine
+groovy:5.0-jdk17-noble
+groovy:5.0-jdk21
+groovy:5.0-jdk21-alpine
+groovy:5.0-jdk21-noble
+groovy:5.0-jdk25
+groovy:5.0-jdk25-alpine
+groovy:5.0-jdk25-noble
+groovy:5.0-jdk-alpine
+groovy:5.0-jdk-jammy
+groovy:5.0-jdk-noble
+groovy:5.0-noble
+groovy:5.0.3
+groovy:5.0.3-alpine
+groovy:5.0.3-jammy
+groovy:5.0.3-jdk
+groovy:5.0.3-jdk11
+groovy:5.0.3-jdk11-alpine
+groovy:5.0.3-jdk11-jammy
+groovy:5.0.3-jdk17
+groovy:5.0.3-jdk17-alpine
+groovy:5.0.3-jdk17-noble
+groovy:5.0.3-jdk21
+groovy:5.0.3-jdk21-alpine
+groovy:5.0.3-jdk21-noble
+groovy:5.0.3-jdk25
+groovy:5.0.3-jdk25-alpine
+groovy:5.0.3-jdk25-noble
+groovy:5.0.3-jdk-alpine
+groovy:5.0.3-jdk-jammy
+groovy:5.0.3-jdk-noble
+groovy:5.0.3-noble
groovy:alpine
groovy:jammy
groovy:jdk
-groovy:jdk8
-groovy:jdk8-jammy
groovy:jdk11
groovy:jdk11-alpine
groovy:jdk11-jammy
@@ -69,6 +70,9 @@ groovy:jdk17-noble
groovy:jdk21
groovy:jdk21-alpine
groovy:jdk21-noble
+groovy:jdk25
+groovy:jdk25-alpine
+groovy:jdk25-noble
groovy:jdk-alpine
groovy:jdk-jammy
groovy:jdk-noble
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 9a0d513..9897bfe 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,7 +1,8 @@
groovy:alpine
groovy:jammy
-groovy:jdk8-jammy
groovy:jdk11-alpine
groovy:jdk17-alpine
groovy:jdk17-noble
+groovy:jdk21-alpine
+groovy:jdk21-noble
groovy:noble
diff --git a/groovy_alpine/Dockerfile b/groovy_alpine/Dockerfile
index eb286a1..2c72f18 100644
--- a/groovy_alpine/Dockerfile
+++ b/groovy_alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-alpine
+FROM eclipse-temurin:25-jdk-alpine
CMD ["groovysh"]
@@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes
WORKDIR /home/groovy
-ENV GROOVY_VERSION=4.0.27
+ENV GROOVY_VERSION=5.0.3
RUN set -o errexit -o nounset \
&& echo "Installing build dependencies" \
&& apk add --no-cache --virtual .build-deps \
diff --git a/groovy_jammy/Dockerfile b/groovy_jammy/Dockerfile
index f5c3bf0..408674d 100644
--- a/groovy_jammy/Dockerfile
+++ b/groovy_jammy/Dockerfile
@@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \
wget \
&& rm --recursive --force /var/lib/apt/lists/*
-ENV GROOVY_VERSION=4.0.27
+ENV GROOVY_VERSION=5.0.3
RUN set -o errexit -o nounset \
&& echo "Downloading Groovy" \
&& wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
diff --git a/groovy_jdk11-alpine/Dockerfile b/groovy_jdk11-alpine/Dockerfile
index 790b0cb..ab7eb97 100644
--- a/groovy_jdk11-alpine/Dockerfile
+++ b/groovy_jdk11-alpine/Dockerfile
@@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes
WORKDIR /home/groovy
-ENV GROOVY_VERSION=4.0.27
+ENV GROOVY_VERSION=5.0.3
RUN set -o errexit -o nounset \
&& echo "Installing build dependencies" \
&& apk add --no-cache --virtual .build-deps \
diff --git a/groovy_jdk17-alpine/Dockerfile b/groovy_jdk17-alpine/Dockerfile
index e12c4d0..26e53b5 100644
--- a/groovy_jdk17-alpine/Dockerfile
+++ b/groovy_jdk17-alpine/Dockerfile
@@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes
WORKDIR /home/groovy
-ENV GROOVY_VERSION=4.0.27
+ENV GROOVY_VERSION=5.0.3
RUN set -o errexit -o nounset \
&& echo "Installing build dependencies" \
&& apk add --no-cache --virtual .build-deps \
diff --git a/groovy_jdk17-noble/Dockerfile b/groovy_jdk17-noble/Dockerfile
index 0b4d565..f4fd8ef 100644
--- a/groovy_jdk17-noble/Dockerfile
+++ b/groovy_jdk17-noble/Dockerfile
@@ -31,7 +31,7 @@ RUN set -o errexit -o nounset \
wget \
&& rm --recursive --force /var/lib/apt/lists/*
-ENV GROOVY_VERSION=4.0.27
+ENV GROOVY_VERSION=5.0.3
RUN set -o errexit -o nounset \
&& echo "Downloading Groovy" \
&& wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
diff --git a/groovy_alpine/Dockerfile b/groovy_jdk21-alpine/Dockerfile
similarity index 99%
copy from groovy_alpine/Dockerfile
copy to groovy_jdk21-alpine/Dockerfile
index eb286a1..755673f 100644
--- a/groovy_alpine/Dockerfile
+++ b/groovy_jdk21-alpine/Dockerfile
@@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes
WORKDIR /home/groovy
-ENV GROOVY_VERSION=4.0.27
+ENV GROOVY_VERSION=5.0.3
RUN set -o errexit -o nounset \
&& echo "Installing build dependencies" \
&& apk add --no-cache --virtual .build-deps \
diff --git a/groovy_jdk8-jammy/Dockerfile b/groovy_jdk21-noble/Dockerfile
similarity index 82%
rename from groovy_jdk8-jammy/Dockerfile
rename to groovy_jdk21-noble/Dockerfile
index 850a036..a5eecde 100644
--- a/groovy_jdk8-jammy/Dockerfile
+++ b/groovy_jdk21-noble/Dockerfile
@@ -1,13 +1,15 @@
-FROM eclipse-temurin:8-jdk-jammy
+FROM eclipse-temurin:21-jdk-noble
CMD ["groovysh"]
ENV GROOVY_HOME=/opt/groovy
RUN set -o errexit -o nounset \
- && echo "Adding groovy user and group" \
- && groupadd --system --gid 1000 groovy \
- && useradd --system --gid groovy --uid 1000 --shell /bin/bash --create-home groovy \
+ && echo "Renaming ubuntu user and group to groovy" \
+ && groupmod --new-name groovy ubuntu \
+ && mkdir /home/groovy \
+ && usermod --login groovy --home /home/groovy --groups groovy ubuntu \
+ && chown groovy /home/groovy \
&& mkdir --parents /home/groovy/.groovy/grapes \
&& chown --recursive groovy:groovy /home/groovy \
&& chmod --recursive 1777 /home/groovy \
@@ -29,7 +31,7 @@ RUN set -o errexit -o nounset \
wget \
&& rm --recursive --force /var/lib/apt/lists/*
-ENV GROOVY_VERSION=4.0.27
+ENV GROOVY_VERSION=5.0.3
RUN set -o errexit -o nounset \
&& echo "Downloading Groovy" \
&& wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
@@ -60,7 +62,10 @@ RUN set -o errexit -o nounset \
&& ln --symbolic "${GROOVY_HOME}/bin/groovyConsole" /usr/bin/groovyConsole \
&& ln --symbolic "${GROOVY_HOME}/bin/groovydoc" /usr/bin/groovydoc \
&& ln --symbolic "${GROOVY_HOME}/bin/groovysh" /usr/bin/groovysh \
- && ln --symbolic "${GROOVY_HOME}/bin/java2groovy" /usr/bin/java2groovy
+ && ln --symbolic "${GROOVY_HOME}/bin/java2groovy" /usr/bin/java2groovy \
+ \
+ && echo "Editing startGroovy to include java.xml.bind module" \
+ && sed --in-place 's|startGroovy ( ) {|startGroovy ( ) {\n JAVA_OPTS="$JAVA_OPTS --add-modules=ALL-SYSTEM"|' "${GROOVY_HOME}/bin/startGroovy"
USER 1000:1000
diff --git a/groovy_noble/Dockerfile b/groovy_noble/Dockerfile
index 4ee3221..9c4556d 100644
--- a/groovy_noble/Dockerfile
+++ b/groovy_noble/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk-noble
+FROM eclipse-temurin:25-jdk-noble
CMD ["groovysh"]
@@ -31,7 +31,7 @@ RUN set -o errexit -o nounset \
wget \
&& rm --recursive --force /var/lib/apt/lists/*
-ENV GROOVY_VERSION=4.0.27
+ENV GROOVY_VERSION=5.0.3
RUN set -o errexit -o nounset \
&& echo "Downloading Groovy" \
&& wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \Relevant Maintainers:
|
tianon
approved these changes
Dec 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.