From e77a51967c2cab8a252af8842b8687e45f5fabb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20L=C3=B6ffler?=
 <22102800+Oliver-Loeffler@users.noreply.github.com>
Date: Fri, 22 Mar 2024 14:53:44 +0100
Subject: [PATCH] build: Use Java and JavaFX 22 (#686)

---
 .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                                   | 10 +++++-----
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c97f5deeb..0caf31844 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
 
 env:
-  JAVA_VERSION: '21'
+  JAVA_VERSION: '22'
 
 jobs:
   verify:
diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml
index f0e03dfe1..ced47d5d2 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: '21.0.1'
+        default: '22'
         required: false
         type: string
 
diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml
index edf745e2b..09bdc6ac5 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: '21.0.1'
+        default: '22'
         required: false
         type: string
       javafx-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
index 7cf811a9f..53631d237 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: '21.0.1'
+        default: '22'
         required: false
         type: string
       javafx-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
index 555325a25..1918ac8ab 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: '21.0.1'
+        default: '22'
         required: false
         type: string
       javafx-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml
index 36723f4e1..cc1c72bbe 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: '21.0.1'
+        default: '22'
         required: false
         type: string
       javafx-version:
-        default: '21.0.1'
+        default: '22'
         required: false
         type: string
       test:
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
index 7954621c8..eb413e9bf 100644
--- a/.github/workflows/early-access.yml
+++ b/.github/workflows/early-access.yml
@@ -5,8 +5,8 @@ on:
     branches: [ master ]
 
 env:
-  JAVAFX_VERSION: '21.0.1'
-  JAVA_VERSION: '21'
+  JAVAFX_VERSION: '22'
+  JAVA_VERSION: '22'
 
 jobs:
   precheck:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e0e0f9230..ca95d84fb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,8 +11,8 @@ on:
           - GA
 
 env:
-  JAVAFX_VERSION: '21.0.1'
-  JAVA_VERSION: '21'
+  JAVAFX_VERSION: '22'
+  JAVA_VERSION: '22'
 
 jobs:
   precheck:
diff --git a/pom.xml b/pom.xml
index b1e059c30..2103fe873 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,11 +16,11 @@
     </modules>
 
     <properties>
-        <java.version>21.0.1</java.version>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
-        <maven.compiler.release>21</maven.compiler.release>
-        <javafx.version>21.0.1</javafx.version>
+        <java.version>22</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>22</javafx.version>
         <aether.version>1.1.0</aether.version>
         <charm.glisten.version>6.2.2</charm.glisten.version>
         <gluon.attach.version>4.0.19</gluon.attach.version>