Remove erroneously included raw jar

groovy · Mar 4, 2024 · 5fb2591 · 5fb2591
1 parent 102248e
commit 5fb2591
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \