From 102248e13c2deb270b9d1982dc962bddcb1bdf68 Mon Sep 17 00:00:00 2001 From: Keegan Witt Date: Fri, 1 Mar 2024 18:17:46 -0500 Subject: [PATCH 1/2] Groovy 4.0.19 --- .github/workflows/ci.yaml | 2 +- jdk11-alpine/Dockerfile | 2 +- jdk11/Dockerfile | 2 +- jdk17-alpine/Dockerfile | 2 +- jdk17/Dockerfile | 2 +- jdk21-alpine/Dockerfile | 2 +- jdk21/Dockerfile | 2 +- jdk8/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c94fc77..86c545a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,7 +32,7 @@ jobs: - name: test env: version: ${{ matrix.version }} - expectedGroovyVersion: 4.0.18 + expectedGroovyVersion: 4.0.19 run: | cd test ./run.sh "groovy:${version}" "${expectedGroovyVersion}" diff --git a/jdk11-alpine/Dockerfile b/jdk11-alpine/Dockerfile index eaf64df..e2cc2a9 100644 --- a/jdk11-alpine/Dockerfile +++ b/jdk11-alpine/Dockerfile @@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes WORKDIR /home/groovy -ENV GROOVY_VERSION 4.0.18 +ENV GROOVY_VERSION 4.0.19 RUN set -o errexit -o nounset \ && echo "Installing build dependencies" \ && apk add --no-cache --virtual .build-deps \ diff --git a/jdk11/Dockerfile b/jdk11/Dockerfile index a39449e..927e927 100644 --- a/jdk11/Dockerfile +++ b/jdk11/Dockerfile @@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \ wget \ && rm --recursive --force /var/lib/apt/lists/* -ENV GROOVY_VERSION 4.0.18 +ENV GROOVY_VERSION 4.0.19 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/jdk17-alpine/Dockerfile b/jdk17-alpine/Dockerfile index 52ad2b0..3457a54 100644 --- a/jdk17-alpine/Dockerfile +++ b/jdk17-alpine/Dockerfile @@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes WORKDIR /home/groovy -ENV GROOVY_VERSION 4.0.18 +ENV GROOVY_VERSION 4.0.19 RUN set -o errexit -o nounset \ && echo "Installing build dependencies" \ && apk add --no-cache --virtual .build-deps \ diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile index 5fa4f6d..96883b5 100644 --- a/jdk17/Dockerfile +++ b/jdk17/Dockerfile @@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \ wget \ && rm --recursive --force /var/lib/apt/lists/* -ENV GROOVY_VERSION 4.0.18 +ENV GROOVY_VERSION 4.0.19 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/jdk21-alpine/Dockerfile b/jdk21-alpine/Dockerfile index 64293f1..28ff660 100644 --- a/jdk21-alpine/Dockerfile +++ b/jdk21-alpine/Dockerfile @@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes WORKDIR /home/groovy -ENV GROOVY_VERSION 4.0.18 +ENV GROOVY_VERSION 4.0.19 RUN set -o errexit -o nounset \ && echo "Installing build dependencies" \ && apk add --no-cache --virtual .build-deps \ diff --git a/jdk21/Dockerfile b/jdk21/Dockerfile index df1ea9b..40af063 100644 --- a/jdk21/Dockerfile +++ b/jdk21/Dockerfile @@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \ wget \ && rm --recursive --force /var/lib/apt/lists/* -ENV GROOVY_VERSION 4.0.18 +ENV GROOVY_VERSION 4.0.19 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/jdk8/Dockerfile b/jdk8/Dockerfile index 72d4e80..3d9304b 100644 --- a/jdk8/Dockerfile +++ b/jdk8/Dockerfile @@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \ wget \ && rm --recursive --force /var/lib/apt/lists/* -ENV GROOVY_VERSION 4.0.18 +ENV GROOVY_VERSION 4.0.19 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" \ From 5fb25910e83018366979dea9bf74d4e7b370bae3 Mon Sep 17 00:00:00 2001 From: Keegan Witt Date: Sun, 3 Mar 2024 21:28:45 -0500 Subject: [PATCH 2/2] Remove erroneously included raw jar --- jdk11-alpine/Dockerfile | 1 + jdk11/Dockerfile | 1 + jdk17-alpine/Dockerfile | 1 + jdk17/Dockerfile | 1 + jdk21-alpine/Dockerfile | 1 + jdk21/Dockerfile | 1 + jdk8/Dockerfile | 1 + 7 files changed, 7 insertions(+) diff --git a/jdk11-alpine/Dockerfile b/jdk11-alpine/Dockerfile index e2cc2a9..6a0b449 100644 --- a/jdk11-alpine/Dockerfile +++ b/jdk11-alpine/Dockerfile @@ -50,6 +50,7 @@ RUN set -o errexit -o nounset \ && unzip groovy.zip \ && rm groovy.zip \ && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \ + && rm -f "${GROOVY_HOME}/lib/groovy-raw-${GROOVY_VERSION}-raw.jar" \ && ln -s "${GROOVY_HOME}/bin/grape" /usr/bin/grape \ && ln -s "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \ && ln -s "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \ diff --git a/jdk11/Dockerfile b/jdk11/Dockerfile index 927e927..a17b40c 100644 --- a/jdk11/Dockerfile +++ b/jdk11/Dockerfile @@ -53,6 +53,7 @@ RUN set -o errexit -o nounset \ && unzip groovy.zip \ && rm groovy.zip \ && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \ + && rm --force "${GROOVY_HOME}/lib/groovy-raw-${GROOVY_VERSION}-raw.jar" \ && ln --symbolic "${GROOVY_HOME}/bin/grape" /usr/bin/grape \ && ln --symbolic "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \ && ln --symbolic "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \ diff --git a/jdk17-alpine/Dockerfile b/jdk17-alpine/Dockerfile index 3457a54..a8c419f 100644 --- a/jdk17-alpine/Dockerfile +++ b/jdk17-alpine/Dockerfile @@ -50,6 +50,7 @@ RUN set -o errexit -o nounset \ && unzip groovy.zip \ && rm groovy.zip \ && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \ + && rm -f "${GROOVY_HOME}/lib/groovy-raw-${GROOVY_VERSION}-raw.jar" \ && ln -s "${GROOVY_HOME}/bin/grape" /usr/bin/grape \ && ln -s "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \ && ln -s "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \ diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile index 96883b5..9f71cc9 100644 --- a/jdk17/Dockerfile +++ b/jdk17/Dockerfile @@ -53,6 +53,7 @@ RUN set -o errexit -o nounset \ && unzip groovy.zip \ && rm groovy.zip \ && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \ + && rm --force "${GROOVY_HOME}/lib/groovy-raw-${GROOVY_VERSION}-raw.jar" \ && ln --symbolic "${GROOVY_HOME}/bin/grape" /usr/bin/grape \ && ln --symbolic "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \ && ln --symbolic "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \ diff --git a/jdk21-alpine/Dockerfile b/jdk21-alpine/Dockerfile index 28ff660..5438cdc 100644 --- a/jdk21-alpine/Dockerfile +++ b/jdk21-alpine/Dockerfile @@ -50,6 +50,7 @@ RUN set -o errexit -o nounset \ && unzip groovy.zip \ && rm groovy.zip \ && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \ + && rm -f "${GROOVY_HOME}/lib/groovy-raw-${GROOVY_VERSION}-raw.jar" \ && ln -s "${GROOVY_HOME}/bin/grape" /usr/bin/grape \ && ln -s "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \ && ln -s "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \ diff --git a/jdk21/Dockerfile b/jdk21/Dockerfile index 40af063..86c4f69 100644 --- a/jdk21/Dockerfile +++ b/jdk21/Dockerfile @@ -53,6 +53,7 @@ RUN set -o errexit -o nounset \ && unzip groovy.zip \ && rm groovy.zip \ && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \ + && rm --force "${GROOVY_HOME}/lib/groovy-raw-${GROOVY_VERSION}-raw.jar" \ && ln --symbolic "${GROOVY_HOME}/bin/grape" /usr/bin/grape \ && ln --symbolic "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \ && ln --symbolic "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \ diff --git a/jdk8/Dockerfile b/jdk8/Dockerfile index 3d9304b..c00cd8c 100644 --- a/jdk8/Dockerfile +++ b/jdk8/Dockerfile @@ -53,6 +53,7 @@ RUN set -o errexit -o nounset \ && unzip groovy.zip \ && rm groovy.zip \ && mv "groovy-${GROOVY_VERSION}" "${GROOVY_HOME}/" \ + && rm --force "${GROOVY_HOME}/lib/groovy-raw-${GROOVY_VERSION}-raw.jar" \ && ln --symbolic "${GROOVY_HOME}/bin/grape" /usr/bin/grape \ && ln --symbolic "${GROOVY_HOME}/bin/groovy" /usr/bin/groovy \ && ln --symbolic "${GROOVY_HOME}/bin/groovyc" /usr/bin/groovyc \