Skip to content

Commit

Permalink
[docker] cleanup old versions, minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
rspilker committed Sep 15, 2023
1 parent 64927d0 commit 08fa14e
Show file tree
Hide file tree
Showing 48 changed files with 12 additions and 843 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
needs: build
strategy:
matrix:
jdk: [8, 9, 10, 11, 12, 13, 16]
jdk: [8, 11, 17, 21]
tool:
- {name: "maven", cmd: "mvn compile"}
- {name: "gradle", cmd: "gradle assemble"}
Expand Down
3 changes: 1 addition & 2 deletions docker/ant/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ ADD shared/ ./
ARG jdk=17
ADD ant/files/jdk-${jdk} ./

COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar
COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar
COPY --from=downloader /lombok.jar /workspace/lombok.jar

ENV JDK_VERSION=${jdk}
ENV JAVA_HOME=/opt/jdk
Expand Down
35 changes: 0 additions & 35 deletions docker/ant/files/jdk-10/classpath/build.xml

This file was deleted.

35 changes: 0 additions & 35 deletions docker/ant/files/jdk-10/modules/build.xml

This file was deleted.

2 changes: 1 addition & 1 deletion docker/ant/files/jdk-11/classpath/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</target>

<target name="compile" depends="init" description="compile the source">
<javac classpath="lombok.jar" modulepath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<javac classpath="../lombok.jar" modulepath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
Expand Down
2 changes: 1 addition & 1 deletion docker/ant/files/jdk-11/modules/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</target>

<target name="compile" depends="init" description="compile the source">
<javac classpath="lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<javac classpath="../lombok.jar" srcdir="${src}" destdir="${build}" fork="true">
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
Expand Down
35 changes: 0 additions & 35 deletions docker/ant/files/jdk-12/classpath/build.xml

This file was deleted.

35 changes: 0 additions & 35 deletions docker/ant/files/jdk-12/modules/build.xml

This file was deleted.

35 changes: 0 additions & 35 deletions docker/ant/files/jdk-13/classpath/build.xml

This file was deleted.

35 changes: 0 additions & 35 deletions docker/ant/files/jdk-13/modules/build.xml

This file was deleted.

35 changes: 0 additions & 35 deletions docker/ant/files/jdk-16/classpath/build.xml

This file was deleted.

35 changes: 0 additions & 35 deletions docker/ant/files/jdk-16/modules/build.xml

This file was deleted.

35 changes: 0 additions & 35 deletions docker/ant/files/jdk-9/classpath/build.xml

This file was deleted.

Loading

0 comments on commit 08fa14e

Please sign in to comment.