new versions for docker

45 files changed, 354 insertions, 68 deletions

diff --git a/docker/ant/Dockerfile b/docker/ant/Dockerfile
index 69b465e8..57a2faf9 100644
--- a/docker/ant/Dockerfile
+++ b/docker/ant/Dockerfile
@@ -1,10 +1,13 @@
 FROM ubuntu:18.04 as downloader
 
-ARG jdk=12
+ARG jdk=13
 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
 RUN provision/jdk/java-${jdk}.sh
 
-ARG ant=1.10.6
+ARG lombokjar=lombok.jar
+ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
+
+ARG ant=1.10.7
 ADD provision/ant/ant-${ant}.sh provision/ant/ant-${ant}.sh
 RUN provision/ant/ant-${ant}.sh
 
@@ -19,11 +22,11 @@ WORKDIR workspace
 
 ADD shared/ ./
 
-ARG jdk=12
+ARG jdk=13
 ADD ant/files/jdk-${jdk} ./
 
-ARG lombokjar=lombok.jar
-ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
+COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar
+COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar
 
 ENV JDK_VERSION=${jdk}
 ENV JAVA_HOME=/opt/jdk
diff --git a/docker/ant/files/jdk-10/build.xml b/docker/ant/files/jdk-10/classpath/build.xml
index 3f181ed9..3f181ed9 100644
--- a/docker/ant/files/jdk-10/build.xml
+++ b/docker/ant/files/jdk-10/classpath/build.xml
diff --git a/docker/ant/files/jdk-10/modules/build.xml b/docker/ant/files/jdk-10/modules/build.xml
new file mode 100644
index 00000000..01decd3f
--- /dev/null
+++ b/docker/ant/files/jdk-10/modules/build.xml
@@ -0,0 +1,35 @@
+<project name="example" default="dist" basedir=".">
+	<property name="src" location="src/main/java"/>
+	<property name="build" location="build"/>
+	<property name="dist" location="dist"/>
+	<property name="build.sysclasspath" value="ignore"/>
+	
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${build}"/>
+	</target>
+	
+	<target name="compile" depends="init" description="compile the source">
+		<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"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+		</javac>
+	</target>
+	
+	<target name="dist" depends="compile" description="generate the distribution">
+		<mkdir dir="${dist}/lib"/>
+		<jar jarfile="${dist}/lib/example-${DSTAMP}.jar" basedir="${build}"/>
+	</target>
+	
+	<target name="clean" description="clean up">
+		<delete dir="${build}"/>
+		<delete dir="${dist}"/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/docker/ant/files/jdk-11/classpath/build.xml b/docker/ant/files/jdk-11/classpath/build.xml
new file mode 100644
index 00000000..01decd3f
--- /dev/null
+++ b/docker/ant/files/jdk-11/classpath/build.xml
@@ -0,0 +1,35 @@
+<project name="example" default="dist" basedir=".">
+	<property name="src" location="src/main/java"/>
+	<property name="build" location="build"/>
+	<property name="dist" location="dist"/>
+	<property name="build.sysclasspath" value="ignore"/>
+	
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${build}"/>
+	</target>
+	
+	<target name="compile" depends="init" description="compile the source">
+		<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"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+		</javac>
+	</target>
+	
+	<target name="dist" depends="compile" description="generate the distribution">
+		<mkdir dir="${dist}/lib"/>
+		<jar jarfile="${dist}/lib/example-${DSTAMP}.jar" basedir="${build}"/>
+	</target>
+	
+	<target name="clean" description="clean up">
+		<delete dir="${build}"/>
+		<delete dir="${dist}"/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/docker/ant/files/jdk-11/build.xml b/docker/ant/files/jdk-11/modules/build.xml
index 3f181ed9..3f181ed9 100644
--- a/docker/ant/files/jdk-11/build.xml
+++ b/docker/ant/files/jdk-11/modules/build.xml
diff --git a/docker/ant/files/jdk-12/build.xml b/docker/ant/files/jdk-12/classpath/build.xml
index 3f181ed9..3f181ed9 100644
--- a/docker/ant/files/jdk-12/build.xml
+++ b/docker/ant/files/jdk-12/classpath/build.xml
diff --git a/docker/ant/files/jdk-12/modules/build.xml b/docker/ant/files/jdk-12/modules/build.xml
new file mode 100644
index 00000000..01decd3f
--- /dev/null
+++ b/docker/ant/files/jdk-12/modules/build.xml
@@ -0,0 +1,35 @@
+<project name="example" default="dist" basedir=".">
+	<property name="src" location="src/main/java"/>
+	<property name="build" location="build"/>
+	<property name="dist" location="dist"/>
+	<property name="build.sysclasspath" value="ignore"/>
+	
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${build}"/>
+	</target>
+	
+	<target name="compile" depends="init" description="compile the source">
+		<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"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+		</javac>
+	</target>
+	
+	<target name="dist" depends="compile" description="generate the distribution">
+		<mkdir dir="${dist}/lib"/>
+		<jar jarfile="${dist}/lib/example-${DSTAMP}.jar" basedir="${build}"/>
+	</target>
+	
+	<target name="clean" description="clean up">
+		<delete dir="${build}"/>
+		<delete dir="${dist}"/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/docker/ant/files/jdk-13/classpath/build.xml b/docker/ant/files/jdk-13/classpath/build.xml
new file mode 100644
index 00000000..01decd3f
--- /dev/null
+++ b/docker/ant/files/jdk-13/classpath/build.xml
@@ -0,0 +1,35 @@
+<project name="example" default="dist" basedir=".">
+	<property name="src" location="src/main/java"/>
+	<property name="build" location="build"/>
+	<property name="dist" location="dist"/>
+	<property name="build.sysclasspath" value="ignore"/>
+	
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${build}"/>
+	</target>
+	
+	<target name="compile" depends="init" description="compile the source">
+		<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"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+		</javac>
+	</target>
+	
+	<target name="dist" depends="compile" description="generate the distribution">
+		<mkdir dir="${dist}/lib"/>
+		<jar jarfile="${dist}/lib/example-${DSTAMP}.jar" basedir="${build}"/>
+	</target>
+	
+	<target name="clean" description="clean up">
+		<delete dir="${build}"/>
+		<delete dir="${dist}"/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/docker/ant/files/jdk-13/build.xml b/docker/ant/files/jdk-13/modules/build.xml
index 3f181ed9..3f181ed9 100644
--- a/docker/ant/files/jdk-13/build.xml
+++ b/docker/ant/files/jdk-13/modules/build.xml
diff --git a/docker/ant/files/jdk-8/build.xml b/docker/ant/files/jdk-8/classpath/build.xml
index 2fc38879..2fc38879 100644
--- a/docker/ant/files/jdk-8/build.xml
+++ b/docker/ant/files/jdk-8/classpath/build.xml
diff --git a/docker/ant/files/jdk-8/modules/readme.txt b/docker/ant/files/jdk-8/modules/readme.txt
new file mode 100644
index 00000000..89aea537
--- /dev/null
+++ b/docker/ant/files/jdk-8/modules/readme.txt
@@ -0,0 +1 @@
+unsupported
\ No newline at end of file
diff --git a/docker/ant/files/jdk-9/build.xml b/docker/ant/files/jdk-9/classpath/build.xml
index 3f181ed9..3f181ed9 100644
--- a/docker/ant/files/jdk-9/build.xml
+++ b/docker/ant/files/jdk-9/classpath/build.xml
diff --git a/docker/ant/files/jdk-9/modules/build.xml b/docker/ant/files/jdk-9/modules/build.xml
new file mode 100644
index 00000000..01decd3f
--- /dev/null
+++ b/docker/ant/files/jdk-9/modules/build.xml
@@ -0,0 +1,35 @@
+<project name="example" default="dist" basedir=".">
+	<property name="src" location="src/main/java"/>
+	<property name="build" location="build"/>
+	<property name="dist" location="dist"/>
+	<property name="build.sysclasspath" value="ignore"/>
+	
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${build}"/>
+	</target>
+	
+	<target name="compile" depends="init" description="compile the source">
+		<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"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
+			<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
+		</javac>
+	</target>
+	
+	<target name="dist" depends="compile" description="generate the distribution">
+		<mkdir dir="${dist}/lib"/>
+		<jar jarfile="${dist}/lib/example-${DSTAMP}.jar" basedir="${build}"/>
+	</target>
+	
+	<target name="clean" description="clean up">
+		<delete dir="${build}"/>
+		<delete dir="${dist}"/>
+	</target>
+</project>
\ No newline at end of file
diff --git a/docker/ant/readme.md b/docker/ant/readme.md
index 8983213e..7dce84e3 100644
--- a/docker/ant/readme.md
+++ b/docker/ant/readme.md
@@ -2,29 +2,30 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG ant=1.10.6`
+### `ARG ant=1.10.7`
 
 The ant version to be used. Supported values:
 
-- `1.10.6` (default)
-- `1.10.1` (default)
+- `1.10.7` (default)
+- `1.10.6`
+- `1.10.1`
 
 ## Example build commands:
 
 (To be executed from the `<lombokhome>/docker` directory)
 
 ```
-docker build -t lombok-ant-jdk12 -f ant/Dockerfile .
+docker build -t lombok-ant-jdk13 -f ant/Dockerfile .
 
-docker build -t lombok-ant-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f ant/Dockerfile .
+docker build -t lombok-ant-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f ant/Dockerfile .
 ```
 
 ## Example run commands:
 
 ```
-docker run -it lombok-ant-jdk12
+docker run -it lombok-ant-jdk13
 
-docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-ant-jdk12
+docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-ant-jdk13
 ```
 
 ## Example container commands:
diff --git a/docker/bazel/Dockerfile b/docker/bazel/Dockerfile
index dd69273c..edc5e6fd 100644
--- a/docker/bazel/Dockerfile
+++ b/docker/bazel/Dockerfile
@@ -1,10 +1,13 @@
 FROM ubuntu:18.04 as downloader
 
-ARG jdk=12
+ARG jdk=13
 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh
 RUN provision/jdk/java-${jdk}.sh
 
-ARG bazel=0.28.1
+ARG lombokjar=lombok.jar
+ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
+
+ARG bazel=2.0.0
 ADD provision/bazel/bazel-${bazel}.sh provision/bazel/bazel-${bazel}.sh
 RUN provision/bazel/bazel-${bazel}.sh
 
@@ -20,10 +23,11 @@ WORKDIR workspace
 
 ADD shared/ ./
 ADD bazel/files/ ./
-ARG lombokjar=lombok.jar
-ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar
 
-ARG jdk=12
+COPY --from=downloader /lombok.jar /workspace/classpath/lombok.jar
+COPY --from=downloader /lombok.jar /workspace/modules/lombok.jar
+
+ARG jdk=13
 ENV JDK_VERSION=${jdk}
 ENV JAVA_HOME=/opt/jdk
 ENV BAZEL_HOME=/opt/bazel
diff --git a/docker/bazel/files/BUILD b/docker/bazel/files/classpath/BUILD
index 4a9c7655..4a9c7655 100644
--- a/docker/bazel/files/BUILD
+++ b/docker/bazel/files/classpath/BUILD
diff --git a/docker/bazel/files/BUILD.lombok b/docker/bazel/files/classpath/BUILD.lombok
index 06836d17..06836d17 100644
--- a/docker/bazel/files/BUILD.lombok
+++ b/docker/bazel/files/classpath/BUILD.lombok
diff --git a/docker/bazel/files/WORKSPACE b/docker/bazel/files/classpath/WORKSPACE
index 4b073ec8..d2974805 100644
--- a/docker/bazel/files/WORKSPACE
+++ b/docker/bazel/files/classpath/WORKSPACE
@@ -1,5 +1,5 @@
 new_local_repository(
     name = "lombok_jar",
-    path = "/workspace",
+    path = "/workspace/classpath",
     build_file = "BUILD.lombok",
 )
\ No newline at end of file
diff --git a/docker/bazel/files/modules/readme.txt b/docker/bazel/files/modules/readme.txt
new file mode 100644
index 00000000..4dbb9323
--- /dev/null
+++ b/docker/bazel/files/modules/readme.txt
@@ -0,0 +1 @@
+not implemented
\ No newline at end of file
diff --git a/docker/bazel/readme.md b/docker/bazel/readme.md
index 916b8718..86712231 100644
--- a/docker/bazel/readme.md
+++ b/docker/bazel/readme.md
@@ -2,11 +2,12 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG bazel=0.28.1`
+### `ARG bazel=2.0.0
 
 The bazel version to be used. Supported values:
 
-- `0.28.1` (default)
+- `2.0.0` (default)
+- `0.28.1`
 - `0.13.0`
 
 ## Example build commands:
@@ -14,17 +15,17 @@ The bazel version to be used. Supported values:
 (To be executed from the `<lombokhome>/docker` directory)
 
 ```
-docker build -t lombok-bazel-jdk12 -f bazel/Dockerfile .
+docker build -t lombok-bazel-jdk13 -f bazel/Dockerfile .
 
-docker build -t lombok-bazel-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f bazel/Dockerfile .
+docker build -t lombok-bazel-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f bazel/Dockerfile .
 ```
 
 ## Example run commands:
 
 ```
-docker run -it lombok-bazel-jdk12
+docker run -it lombok-bazel-jdk13
 
-docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk12
+docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-bazel-jdk13
 ```
 
 ## Example container commands:
diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile
index 2721f9b2..c4ea0704 100644
--- a/docker/gradle/Dockerfile
+++ b/docker/gradle/Dockerfile
@@ -1,10 +1,13 @@
 FROM ubuntu:18.04 as downloader

 

-ARG jdk=12

+ARG jdk=13

 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh

 RUN provision/jdk/java-${jdk}.sh

 

-ARG gradle=5.6

+ARG lombokjar=lombok.jar

+ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar

+

+ARG gradle=6.0.1

 ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh

 RUN provision/gradle/gradle-${gradle}.sh

 

@@ -19,10 +22,11 @@ WORKDIR workspace
 

 ADD shared/ ./

 ADD gradle/files/ ./

-ARG lombokjar=lombok.jar

-ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar

 

-ARG jdk=12

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

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

+

+ARG jdk=13

 ENV JDK_VERSION=${jdk}

 ENV JAVA_HOME=/opt/jdk

 ENV GRADLE_HOME=/opt/gradle/gradle

diff --git a/docker/gradle/files/build.gradle b/docker/gradle/files/classpath/build.gradle
index bbf276c7..bbf276c7 100644
--- a/docker/gradle/files/build.gradle
+++ b/docker/gradle/files/classpath/build.gradle
diff --git a/docker/gradle/readme.md b/docker/gradle/readme.md
index 81f147d8..5aaf857a 100644
--- a/docker/gradle/readme.md
+++ b/docker/gradle/readme.md
@@ -2,11 +2,12 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG gradle=5.6`
+### `ARG gradle=6.0.1`
 
 The gradle version to be used. Supported values:
 
-- `5.6` (default)
+- `6.0.1` (default)
+- `5.6`
 - `5.1.1`
 - `4.10.2`
 - `4.7`
@@ -17,17 +18,17 @@ The gradle version to be used. Supported values:
 (To be executed from the `<lombokhome>/docker` directory)
 
 ```
-docker build -t lombok-gradle-jdk12 -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk13 -f gradle/Dockerfile .
 
-docker build -t lombok-gradle-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f gradle/Dockerfile .
 ```
 
 ## Example run commands:
 
 ```
-docker run -it lombok-gradle-jdk12
+docker run -it lombok-gradle-jdk13
 
-docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk12
+docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-gradle-jdk13
 ```
 
 ## Example container commands:
diff --git a/docker/maven/Dockerfile b/docker/maven/Dockerfile
index e5269ba2..32ebbe48 100644
--- a/docker/maven/Dockerfile
+++ b/docker/maven/Dockerfile
@@ -1,9 +1,12 @@
 FROM ubuntu:18.04 as downloader

 

-ARG jdk=12

+ARG jdk=13

 ADD provision/jdk/java-${jdk}.sh provision/jdk/java-${jdk}.sh

 RUN provision/jdk/java-${jdk}.sh

 

+ARG lombokjar=lombok.jar

+ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar

+

 ARG maven=3.6.1

 ADD provision/maven/maven-${maven}.sh provision/maven/maven-${maven}.sh

 RUN provision/maven/maven-${maven}.sh

@@ -19,11 +22,11 @@ WORKDIR workspace
 

 ADD shared/ ./

 

-ARG jdk=12

+ARG jdk=13

 ADD maven/files/jdk-${jdk} ./

 

-ARG lombokjar=lombok.jar

-ADD https://projectlombok.org/downloads/${lombokjar} lombok.jar

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

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

 

 ENV JDK_VERSION=${jdk}

 ENV JAVA_HOME=/opt/jdk

diff --git a/docker/maven/files/jdk-10/pom.xml b/docker/maven/files/jdk-10/classpath/pom.xml
index 9940955d..b5367ae1 100644
--- a/docker/maven/files/jdk-10/pom.xml
+++ b/docker/maven/files/jdk-10/classpath/pom.xml
@@ -46,7 +46,7 @@
             <artifactId>lombok</artifactId>
             <version>1.2.3</version>
             <scope>system</scope>
-            <systemPath>/workspace/lombok.jar</systemPath>
+            <systemPath>/workspace/classpath/lombok.jar</systemPath>
         </dependency>
     </dependencies>
 
diff --git a/docker/maven/files/jdk-11/pom.xml b/docker/maven/files/jdk-11/classpath/pom.xml
index 58a66c4d..e1f04343 100644
--- a/docker/maven/files/jdk-11/pom.xml
+++ b/docker/maven/files/jdk-11/classpath/pom.xml
@@ -46,7 +46,7 @@
             <artifactId>lombok</artifactId>
             <version>1.2.3</version>
             <scope>system</scope>
-            <systemPath>/workspace/lombok.jar</systemPath>
+            <systemPath>/workspace/classpath/lombok.jar</systemPath>
         </dependency>
     </dependencies>
 
diff --git a/docker/maven/files/jdk-12/pom.xml b/docker/maven/files/jdk-12/classpath/pom.xml
index cdbab371..78120150 100644
--- a/docker/maven/files/jdk-12/pom.xml
+++ b/docker/maven/files/jdk-12/classpath/pom.xml
@@ -46,7 +46,7 @@
             <artifactId>lombok</artifactId>
             <version>1.2.3</version>
             <scope>system</scope>
-            <systemPath>/workspace/lombok.jar</systemPath>
+            <systemPath>/workspace/classpath/lombok.jar</systemPath>
         </dependency>
     </dependencies>
 
diff --git a/docker/maven/files/jdk-13/pom.xml b/docker/maven/files/jdk-13/classpath/pom.xml
index 46a7e3c8..2414342e 100644
--- a/docker/maven/files/jdk-13/pom.xml
+++ b/docker/maven/files/jdk-13/classpath/pom.xml
@@ -46,7 +46,7 @@
             <artifactId>lombok</artifactId>
             <version>1.2.3</version>
             <scope>system</scope>
-            <systemPath>/workspace/lombok.jar</systemPath>
+            <systemPath>/workspace/classpath/lombok.jar</systemPath>
         </dependency>
     </dependencies>
 
diff --git a/docker/maven/files/jdk-13/modules/pom.xml b/docker/maven/files/jdk-13/modules/pom.xml
new file mode 100644
index 00000000..f607f590
--- /dev/null
+++ b/docker/maven/files/jdk-13/modules/pom.xml
@@ -0,0 +1,60 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>lombok-jdk-${env.JDK_VERSION}</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>13</java.version>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <showDeprecation>true</showDeprecation>
+                    <showWarnings>true</showWarnings> 
+                    <fork>true</fork>
+                    <compilerargs>
+                        <arg>-Werror</arg>
+                        <arg>-Xlint:all</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+                        <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+                    </compilerargs>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.10</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.2.3</version>
+            <scope>system</scope>
+            <systemPath>/workspace/modules/lombok.jar</systemPath>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/docker/maven/files/jdk-8/pom.xml b/docker/maven/files/jdk-8/classpath/pom.xml
index 87c4a6a8..87c4a6a8 100644
--- a/docker/maven/files/jdk-8/pom.xml
+++ b/docker/maven/files/jdk-8/classpath/pom.xml
diff --git a/docker/maven/files/jdk-8/modules/readme.txt b/docker/maven/files/jdk-8/modules/readme.txt
new file mode 100644
index 00000000..89aea537
--- /dev/null
+++ b/docker/maven/files/jdk-8/modules/readme.txt
@@ -0,0 +1 @@
+unsupported
\ No newline at end of file
diff --git a/docker/maven/files/jdk-9/pom.xml b/docker/maven/files/jdk-9/classpath/pom.xml
index dfbb9ad9..258c7fa5 100644
--- a/docker/maven/files/jdk-9/pom.xml
+++ b/docker/maven/files/jdk-9/classpath/pom.xml
@@ -46,7 +46,7 @@
             <artifactId>lombok</artifactId>
             <version>1.2.3</version>
             <scope>system</scope>
-            <systemPath>/workspace/lombok.jar</systemPath>
+            <systemPath>/workspace/classpath/lombok.jar</systemPath>
         </dependency>
     </dependencies>
 
diff --git a/docker/maven/readme.md b/docker/maven/readme.md
index 2d0f0604..9ca76985 100644
--- a/docker/maven/readme.md
+++ b/docker/maven/readme.md
@@ -15,17 +15,17 @@ The maven version to be used. Supported values:
 (To be executed from the `<lombokhome>/docker` directory)
 
 ```
-docker build -t lombok-maven-jdk12 -f maven/Dockerfile .
+docker build -t lombok-maven-jdk13 -f maven/Dockerfile .
 
-docker build -t lombok-maven-jdk12 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile .
+docker build -t lombok-maven-jdk13 --build-arg lombokjar=lombok-1.16.20.jar -f maven/Dockerfile .
 ```
 
 ## Example run commands:
 
 ```
-docker run -it lombok-maven-jdk12
+docker run -it lombok-maven-jdk13
 
-docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk12
+docker run --rm -it -v /<lombokhome>/dist/lombok.jar:/workspace/lombok.jar lombok-maven-jdk13
 ```
 
 ## Example container commands:
diff --git a/docker/provision/ant/ant-1.10.7.sh b/docker/provision/ant/ant-1.10.7.sh
new file mode 100644
index 00000000..7299e538
--- /dev/null
+++ b/docker/provision/ant/ant-1.10.7.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget
+wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.tar.gz -O ant.tar.gz
+mkdir /usr/local/apache-ant/ && tar xvf ant.tar.gz -C /usr/local/apache-ant/
+mv /usr/local/apache-ant/apache-ant-1.10.7 /usr/local/apache-ant/apache-ant
\ No newline at end of file
diff --git a/docker/provision/bazel/bazel-2.0.0.sh b/docker/provision/bazel/bazel-2.0.0.sh
new file mode 100644
index 00000000..99e79ef6
--- /dev/null
+++ b/docker/provision/bazel/bazel-2.0.0.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget pkg-config zip g++ zlib1g-dev unzip python
+wget https://github.com/bazelbuild/bazel/releases/download/2.0.0/bazel-2.0.0-installer-linux-x86_64.sh -O bazel-installer.sh
+chmod +x bazel-installer.sh
+./bazel-installer.sh --prefix=/opt/bazel
\ No newline at end of file
diff --git a/docker/provision/gradle/gradle-6.0.1.sh b/docker/provision/gradle/gradle-6.0.1.sh
new file mode 100644
index 00000000..9dbcdb19
--- /dev/null
+++ b/docker/provision/gradle/gradle-6.0.1.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget unzip
+wget https://services.gradle.org/distributions/gradle-6.0.1-bin.zip -O gradle.zip
+mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
+mv /opt/gradle/gradle-6.0.1 /opt/gradle/gradle
diff --git a/docker/provision/jdk/java-13.sh b/docker/provision/jdk/java-13.sh
index fe5d4fdc..e20629e6 100644
--- a/docker/provision/jdk/java-13.sh
+++ b/docker/provision/jdk/java-13.sh
@@ -1,4 +1,4 @@
 apt-get update && apt-get install -y wget
-wget https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk13u-2019-12-10-19-42/OpenJDK13U-jdk_x64_linux_hotspot_2019-12-10-19-42.tar.gz -O jdk.tar.gz
+wget https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.1%2B9/OpenJDK13U-jdk_x64_linux_hotspot_13.0.1_9.tar.gz -O jdk.tar.gz
 tar -xzf jdk.tar.gz -C /opt/
 mv /opt/jdk-13.0.1+9 /opt/jdk
\ No newline at end of file
diff --git a/docker/readme.md b/docker/readme.md
index 2e2c706c..a7a6aca0 100644
--- a/docker/readme.md
+++ b/docker/readme.md
@@ -10,12 +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`. By default, this is the latest released version. You

 can download a specific version by adding `--build-arg lombokjar=lombok-<major.minor.build>.jar`

 

-### `ARG jdk=12`

+### `ARG jdk=13`

 

 The jdk version to be used. Supported values:

 

-- `13` (experimental)

-- `12` (default)

+- `13` (default)

+- `12`

 - `11`

 - `10`

 - `9`

diff --git a/docker/shared/lombok.config b/docker/shared/classpath/lombok.config
index 62f16b08..62f16b08 100644
--- a/docker/shared/lombok.config
+++ b/docker/shared/classpath/lombok.config
diff --git a/docker/shared/classpath/src/main/java/HelloWorld.java b/docker/shared/classpath/src/main/java/HelloWorld.java
new file mode 100644
index 00000000..ff12d248
--- /dev/null
+++ b/docker/shared/classpath/src/main/java/HelloWorld.java
@@ -0,0 +1,12 @@
+@lombok.Data 

+public class HelloWorld {

+	private final int answer;

+	

+	public static void main(String... args) {

+		System.out.println(new HelloWorld(42).getAnswer());

+	}

+	

+	@FunctionalInterface interface Foo {

+		String name();

+	}

+}

diff --git a/docker/shared/src/main/java/SneakyThrowsExample.java b/docker/shared/classpath/src/main/java/SneakyThrowsExample.java
index 04811bae..54e1425c 100644
--- a/docker/shared/src/main/java/SneakyThrowsExample.java
+++ b/docker/shared/classpath/src/main/java/SneakyThrowsExample.java
@@ -1,7 +1,6 @@
 public class SneakyThrowsExample {
-  
 	@lombok.SneakyThrows
-    public static void main(String... args) {
+	public static void main(String... args) {
 		throw new java.io.IOException("boo");
-    }
+	}
 }
diff --git a/docker/shared/modules/lombok.config b/docker/shared/modules/lombok.config
new file mode 100644
index 00000000..cd8b7392
--- /dev/null
+++ b/docker/shared/modules/lombok.config
@@ -0,0 +1,4 @@
+lombok.addJavaxGeneratedAnnotation = false
+lombok.anyConstructor.suppressConstructorProperties = true
+
+config.stopBubbling = true
\ No newline at end of file
diff --git a/docker/shared/modules/src/main/java/foo/HelloWorld.java b/docker/shared/modules/src/main/java/foo/HelloWorld.java
new file mode 100644
index 00000000..9c2abbba
--- /dev/null
+++ b/docker/shared/modules/src/main/java/foo/HelloWorld.java
@@ -0,0 +1,14 @@
+package foo;
+
+@lombok.Data 
+public class HelloWorld {
+	private final int answer;
+	
+	public static void main(String... args) {
+		System.out.println(new HelloWorld(42).getAnswer());
+	}
+	
+	@FunctionalInterface interface Foo {
+		String name();
+	}
+}
diff --git a/docker/shared/modules/src/main/java/module-info.java b/docker/shared/modules/src/main/java/module-info.java
new file mode 100644
index 00000000..2ba5f10b
--- /dev/null
+++ b/docker/shared/modules/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module foo {
+	requires static lombok;
+}
\ No newline at end of file
diff --git a/docker/shared/src/main/java/HelloWorld.java b/docker/shared/src/main/java/HelloWorld.java
deleted file mode 100644
index f4c30218..00000000
--- a/docker/shared/src/main/java/HelloWorld.java
+++ /dev/null
@@ -1,13 +0,0 @@
-@lombok.Data

-public class HelloWorld {

-    private final int answer;

-    

-    public static void main(String... args) {

-        System.out.println(new HelloWorld(42).getAnswer());

-    }

-    

-    @FunctionalInterface

-    interface Foo {

-        String name();

-    }

-}