From f720bee91c244401fa4cff6dc065fdaa6d92a89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pereda?= <pereda@eii.uva.es>
Date: Sun, 24 Sep 2023 12:01:08 +0200
Subject: [PATCH] Use JDK and JavaFX 21 (#649)

---
 .github/workflows/build.yml               |  2 +-
 .github/workflows/bundles-kit.yml         |  2 +-
 .github/workflows/bundles-linux.yml       |  4 ++--
 .github/workflows/bundles-mac.yml         |  4 ++--
 .github/workflows/bundles-mac_aarch64.yml |  4 ++--
 .github/workflows/bundles-windows.yml     |  4 ++--
 .github/workflows/early-access.yml        |  4 ++--
 .github/workflows/release.yml             |  4 ++--
 pom.xml                                   | 12 ++++++------
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 16c0a16fc..402e5b34d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
-          release: 20
+          release: 21
 
       - name: Run Tests (Linux)
         if: runner.os == 'Linux'
diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml
index 9c92d0a1e..d3eaf986e 100644
--- a/.github/workflows/bundles-kit.yml
+++ b/.github/workflows/bundles-kit.yml
@@ -7,7 +7,7 @@ on:
         required: true
         type: string
       java-version:
-        default: '20'
+        default: '21'
         required: false
         type: string
 
diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml
index e6aa4b167..ff0bef026 100644
--- a/.github/workflows/bundles-linux.yml
+++ b/.github/workflows/bundles-linux.yml
@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '20'
+        default: '21'
         required: false
         type: string
       javafx-version:
-        default: '20.0.1'
+        default: '21'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
index d72b2f4af..90f3d3523 100644
--- a/.github/workflows/bundles-mac.yml
+++ b/.github/workflows/bundles-mac.yml
@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '20'
+        default: '21'
         required: false
         type: string
       javafx-version:
-        default: '20.0.1'
+        default: '21'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
index 48cc42646..83c8ae0c1 100644
--- a/.github/workflows/bundles-mac_aarch64.yml
+++ b/.github/workflows/bundles-mac_aarch64.yml
@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '20'
+        default: '21'
         required: false
         type: string
       javafx-version:
-        default: '20.0.1'
+        default: '21'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml
index 22fc83f73..1327e8313 100644
--- a/.github/workflows/bundles-windows.yml
+++ b/.github/workflows/bundles-windows.yml
@@ -10,11 +10,11 @@ on:
         required: true
         type: string
       java-version:
-        default: '20'
+        default: '21'
         required: false
         type: string
       javafx-version:
-        default: '20.0.1'
+        default: '21'
         required: false
         type: string
       test:
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
index d9bc0ea1a..826f94854 100644
--- a/.github/workflows/early-access.yml
+++ b/.github/workflows/early-access.yml
@@ -5,8 +5,8 @@ on:
     branches: [ master ]
 
 env:
-  JAVAFX_VERSION: '20.0.1'
-  JAVA_VERSION: '20'
+  JAVAFX_VERSION: '21'
+  JAVA_VERSION: '21'
 
 jobs:
   precheck:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 260b55f58..2fb1e5369 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
 
 env:
-  JAVAFX_VERSION: '20.0.1'
-  JAVA_VERSION: '20'
+  JAVAFX_VERSION: '21'
+  JAVA_VERSION: '21'
 
 jobs:
   precheck:
diff --git a/pom.xml b/pom.xml
index caf1a3b5c..21fe2b3b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,15 +16,15 @@
     </modules>
 
     <properties>
-        <java.version>20</java.version>
+        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.release>${java.version}</maven.compiler.release>
-        <javafx.version>21-ea+24</javafx.version>
+        <javafx.version>21</javafx.version>
         <aether.version>1.1.0</aether.version>
-        <charm.glisten.version>6.2.0</charm.glisten.version>
-        <gluon.attach.version>4.0.15</gluon.attach.version>
-        <junit.jupiter.version>5.8.2</junit.jupiter.version>
+        <charm.glisten.version>6.2.2</charm.glisten.version>
+        <gluon.attach.version>4.0.19</gluon.attach.version>
+        <junit.jupiter.version>5.10.0</junit.jupiter.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.github.repository>gluonhq/scenebuilder</project.github.repository>
         <repository.url>github.com:${project.github.repository}</repository.url>
@@ -78,7 +78,7 @@
                 <plugin>
                     <groupId>org.openjfx</groupId>
                     <artifactId>javafx-maven-plugin</artifactId>
-                    <version>0.0.5</version>
+                    <version>0.0.8</version>
                     <configuration>
                         <mainClass>${main.class.name}</mainClass>
                         <options>