From 4d527303e5121189cd3564279c2ea9978dada84c Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@topdesk.com>
Date: Fri, 15 Sep 2023 04:15:08 +0200
Subject: [PATCH] [docker] next set of fixes

---
 docker/ant/files/jdk-11/classpath/build.xml | 2 +-
 docker/ant/files/jdk-17/classpath/build.xml | 2 +-
 docker/ant/files/jdk-17/modules/build.xml   | 2 +-
 docker/ant/files/jdk-21/classpath/build.xml | 2 +-
 docker/ant/files/jdk-21/modules/build.xml   | 2 +-
 docker/gradle/Dockerfile                    | 2 +-
 docker/gradle/readme.md                     | 7 ++++---
 docker/maven/files/jdk-21/classpath/pom.xml | 2 +-
 docker/maven/files/jdk-21/modules/pom.xml   | 2 +-
 docker/provision/gradle/gradle-8.3.sh       | 4 ++++
 10 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100755 docker/provision/gradle/gradle-8.3.sh

diff --git a/docker/ant/files/jdk-11/classpath/build.xml b/docker/ant/files/jdk-11/classpath/build.xml
index a7cebdb1a5..07e5885674 100644
--- a/docker/ant/files/jdk-11/classpath/build.xml
+++ b/docker/ant/files/jdk-11/classpath/build.xml
@@ -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"/>
diff --git a/docker/ant/files/jdk-17/classpath/build.xml b/docker/ant/files/jdk-17/classpath/build.xml
index 01decd3fba..07e5885674 100644
--- a/docker/ant/files/jdk-17/classpath/build.xml
+++ b/docker/ant/files/jdk-17/classpath/build.xml
@@ -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"/>
diff --git a/docker/ant/files/jdk-17/modules/build.xml b/docker/ant/files/jdk-17/modules/build.xml
index 3f181ed929..e1f9355020 100644
--- a/docker/ant/files/jdk-17/modules/build.xml
+++ b/docker/ant/files/jdk-17/modules/build.xml
@@ -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"/>
diff --git a/docker/ant/files/jdk-21/classpath/build.xml b/docker/ant/files/jdk-21/classpath/build.xml
index 01decd3fba..07e5885674 100644
--- a/docker/ant/files/jdk-21/classpath/build.xml
+++ b/docker/ant/files/jdk-21/classpath/build.xml
@@ -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"/>
diff --git a/docker/ant/files/jdk-21/modules/build.xml b/docker/ant/files/jdk-21/modules/build.xml
index 3f181ed929..e1f9355020 100644
--- a/docker/ant/files/jdk-21/modules/build.xml
+++ b/docker/ant/files/jdk-21/modules/build.xml
@@ -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"/>
diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile
index aee8ade756..efc7eef2d2 100644
--- a/docker/gradle/Dockerfile
+++ b/docker/gradle/Dockerfile
@@ -7,7 +7,7 @@ RUN provision/jdk/java-${jdk}.sh
 ARG lombokjar=lombok.jar
 ADD https://projectlombok.org/downloads/${lombokjar} /lombok.jar
 
-ARG gradle=7.6.1
+ARG gradle=8.3
 ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
 RUN provision/gradle/gradle-${gradle}.sh
 
diff --git a/docker/gradle/readme.md b/docker/gradle/readme.md
index 91a5da0d08..5b8278019e 100644
--- a/docker/gradle/readme.md
+++ b/docker/gradle/readme.md
@@ -2,11 +2,12 @@
 
 [_(general configuration and options)_](../readme.md)
 
-### `ARG gradle=7.6.1`
+### `ARG gradle=8.3`
 
 The gradle version to be used. Supported values:
 
-- `7.6.1` (default)
+- `8.3` (default)
+- `7.6.1`
 - `6.8.3`
 
 ## Example build commands:
@@ -16,7 +17,7 @@ The gradle version to be used. Supported values:
 ```
 docker build -t lombok-gradle-jdk17 -f gradle/Dockerfile .
 
-docker build -t lombok-gradle-jdk17 --build-arg lombokjar=lombok-1.18.20.jar -f gradle/Dockerfile .
+docker build -t lombok-gradle-jdk17 --build-arg lombokjar=lombok-1.18.28.jar -f gradle/Dockerfile .
 ```
 
 ## Example run commands:
diff --git a/docker/maven/files/jdk-21/classpath/pom.xml b/docker/maven/files/jdk-21/classpath/pom.xml
index e480d5cc24..6f07b8369b 100644
--- a/docker/maven/files/jdk-21/classpath/pom.xml
+++ b/docker/maven/files/jdk-21/classpath/pom.xml
@@ -15,7 +15,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
diff --git a/docker/maven/files/jdk-21/modules/pom.xml b/docker/maven/files/jdk-21/modules/pom.xml
index 9761bc4768..d1d2811c6b 100644
--- a/docker/maven/files/jdk-21/modules/pom.xml
+++ b/docker/maven/files/jdk-21/modules/pom.xml
@@ -15,7 +15,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
diff --git a/docker/provision/gradle/gradle-8.3.sh b/docker/provision/gradle/gradle-8.3.sh
new file mode 100755
index 0000000000..507087d470
--- /dev/null
+++ b/docker/provision/gradle/gradle-8.3.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget unzip
+wget https://services.gradle.org/distributions/gradle-8.3-bin.zip -O gradle.zip
+mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
+mv /opt/gradle/gradle-8.3 /opt/gradle/gradle