From c726027c91a591b0e2b491a6cb48d040c912b674 Mon Sep 17 00:00:00 2001
From: Rawi01 <Rawi01@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:11:08 +0200
Subject: [PATCH] Update docker integration tests

---
 .github/workflows/ant.yml                               | 4 +---
 docker/ant/files/{jdk-22 => jdk-23}/classpath/build.xml | 0
 docker/ant/files/{jdk-22 => jdk-23}/modules/build.xml   | 0
 docker/gradle/Dockerfile                                | 2 +-
 docker/maven/files/{jdk-22 => jdk-23}/classpath/pom.xml | 0
 docker/maven/files/{jdk-22 => jdk-23}/modules/pom.xml   | 0
 docker/provision/gradle/gradle-8.10.2.sh                | 4 ++++
 docker/provision/jdk/java-22.sh                         | 4 ----
 docker/provision/jdk/java-23.sh                         | 4 ++++
 9 files changed, 10 insertions(+), 8 deletions(-)
 rename docker/ant/files/{jdk-22 => jdk-23}/classpath/build.xml (100%)
 rename docker/ant/files/{jdk-22 => jdk-23}/modules/build.xml (100%)
 rename docker/maven/files/{jdk-22 => jdk-23}/classpath/pom.xml (100%)
 rename docker/maven/files/{jdk-22 => jdk-23}/modules/pom.xml (100%)
 create mode 100755 docker/provision/gradle/gradle-8.10.2.sh
 delete mode 100755 docker/provision/jdk/java-22.sh
 create mode 100755 docker/provision/jdk/java-23.sh

diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 8d743478a..4d973d443 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -166,14 +166,12 @@ jobs:
     needs: build
     strategy: 
       matrix: 
-        jdk: [8, 11, 17, 21, 22]
+        jdk: [8, 11, 17, 21, 23]
         tool: 
           - {name: "maven",  cmd: "mvn compile"}
           - {name: "gradle", cmd: "gradle assemble"}
           - {name: "ant",    cmd: "ant dist"}
           - {name: "bazel",  cmd: "bazel build //:ProjectRunner"}
-        exclude:
-          - {tool: {name: "gradle", cmd: "gradle assemble"}, jdk: 22}
       fail-fast: false
     env:
       IMAGE_NAME: lombok-${{ matrix.tool.name }}-jdk${{ matrix.jdk }}
diff --git a/docker/ant/files/jdk-22/classpath/build.xml b/docker/ant/files/jdk-23/classpath/build.xml
similarity index 100%
rename from docker/ant/files/jdk-22/classpath/build.xml
rename to docker/ant/files/jdk-23/classpath/build.xml
diff --git a/docker/ant/files/jdk-22/modules/build.xml b/docker/ant/files/jdk-23/modules/build.xml
similarity index 100%
rename from docker/ant/files/jdk-22/modules/build.xml
rename to docker/ant/files/jdk-23/modules/build.xml
diff --git a/docker/gradle/Dockerfile b/docker/gradle/Dockerfile
index b83f7f0e1..16eb290c8 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=8.5
+ARG gradle=8.10.2
 ADD provision/gradle/gradle-${gradle}.sh provision/gradle/gradle-${gradle}.sh
 RUN provision/gradle/gradle-${gradle}.sh
 
diff --git a/docker/maven/files/jdk-22/classpath/pom.xml b/docker/maven/files/jdk-23/classpath/pom.xml
similarity index 100%
rename from docker/maven/files/jdk-22/classpath/pom.xml
rename to docker/maven/files/jdk-23/classpath/pom.xml
diff --git a/docker/maven/files/jdk-22/modules/pom.xml b/docker/maven/files/jdk-23/modules/pom.xml
similarity index 100%
rename from docker/maven/files/jdk-22/modules/pom.xml
rename to docker/maven/files/jdk-23/modules/pom.xml
diff --git a/docker/provision/gradle/gradle-8.10.2.sh b/docker/provision/gradle/gradle-8.10.2.sh
new file mode 100755
index 000000000..30126f929
--- /dev/null
+++ b/docker/provision/gradle/gradle-8.10.2.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget unzip
+https://github.com/gradle/gradle-distributions/releases/download/v8.10.2/gradle-8.10.2-bin.zip -O gradle.zip
+mkdir /opt/gradle && unzip -d /opt/gradle gradle.zip
+mv /opt/gradle/gradle-8.10.2 /opt/gradle/gradle
diff --git a/docker/provision/jdk/java-22.sh b/docker/provision/jdk/java-22.sh
deleted file mode 100755
index 69135bfd3..000000000
--- a/docker/provision/jdk/java-22.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-apt-get update && apt-get install -y wget
-wget https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz -O jdk.tar.gz
-tar -xzf jdk.tar.gz -C /opt/
-mv /opt/jdk-22 /opt/jdk
diff --git a/docker/provision/jdk/java-23.sh b/docker/provision/jdk/java-23.sh
new file mode 100755
index 000000000..5c489e28b
--- /dev/null
+++ b/docker/provision/jdk/java-23.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget
+wget https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz -O jdk.tar.gz
+tar -xzf jdk.tar.gz -C /opt/
+mv /opt/jdk-23 /opt/jdk