Skip to content

Commit

Permalink
Merge pull request #101 from groovy/4.0.19
Browse files Browse the repository at this point in the history 
Groovy 4.0.19
  • Loading branch information
@keeganwitt
keeganwitt authored Mar 4, 2024
2 parents 25f6bdc + 5fb2591 commit b97b7a7
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
3 changes: 2 additions & 1 deletion jdk11-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion jdk17-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion jdk21-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion jdk21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion jdk8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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 \
Expand Down

0 comments on commit b97b7a7

Please sign in to comment.