diff --git a/docker/ant/Dockerfile b/docker/ant/Dockerfile index 0ccd15b7..f3162c80 100644 --- a/docker/ant/Dockerfile +++ b/docker/ant/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 as downloader -ARG jdk=17 +ARG jdk=21 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh RUN provision/jdk/java-${jdk}.sh @@ -22,7 +22,7 @@ WORKDIR workspace ADD shared/ ./ -ARG jdk=17 +ARG jdk=21 ADD ant/files/jdk-${jdk} ./ COPY --from=downloader /lombok.jar /workspace/lombok.jar diff --git a/docker/bazel/Dockerfile b/docker/bazel/Dockerfile index 1e3ece5c..ac48e75d 100644 --- a/docker/bazel/Dockerfile +++ b/docker/bazel/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 as downloader -ARG jdk=17 +ARG jdk=21 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh RUN provision/jdk/java-${jdk}.sh @@ -28,7 +28,7 @@ ADD bazel/files/ ./ COPY --from=downloader /lombok.jar /workspace/lombok.jar -ARG jdk=17 +ARG jdk=21 ENV JDK_VERSION=${jdk} ENV JAVA_HOME=/opt/jdk ENV BAZEL_HOME=/opt/bazel diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile index 381b0f09..cfb32939 100644 --- a/docker/gradle/Dockerfile +++ b/docker/gradle/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 as downloader -ARG jdk=17 +ARG jdk=21 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh RUN provision/jdk/java-${jdk}.sh @@ -25,7 +25,7 @@ ADD gradle/files/ ./ COPY --from=downloader /lombok.jar /workspace/lombok.jar -ARG jdk=17 +ARG jdk=21 ENV JDK_VERSION=${jdk} ENV JAVA_HOME=/opt/jdk ENV GRADLE_HOME=/opt/gradle/gradle diff --git a/docker/maven/Dockerfile b/docker/maven/Dockerfile index 16d6caf9..baa06c29 100644 --- a/docker/maven/Dockerfile +++ b/docker/maven/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 as downloader -ARG jdk=17 +ARG jdk=21 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh RUN provision/jdk/java-${jdk}.sh @@ -22,7 +22,7 @@ WORKDIR workspace ADD shared/ ./ -ARG jdk=17 +ARG jdk=21 ADD maven/files/jdk-${jdk} ./ COPY --from=downloader /lombok.jar /workspace/lombok.jar diff --git a/docker/readme.md b/docker/readme.md index d5995684..b36cd85b 100644 --- a/docker/readme.md +++ b/docker/readme.md @@ -10,17 +10,12 @@ Each docker image contains a `/workspace` where all relevant files are located. When building the image, a lombok.jar will be downloaded to `/workspace/classpath` and `/workspace/modules`. By default, this is the latest released version. You can download a specific version by adding `--build-arg lombokjar=lombok-.jar` -### `ARG jdk=13` +### `ARG jdk=21` The jdk version to be used. Supported values: -- `21` (based on openjdk instead of adoptium) -- `17` (default) -- `16` -- `13 -- `12` +- `21` (default)(based on openjdk instead of adoptium) +- `17` - `11` -- `10` -- `9` - `8` The version is also accessible in `JDK_VERSION`.