From 114084f381d51ef69301f3919bf3888bf6f9cc84 Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Thu, 26 Oct 2023 13:12:18 +0530
Subject: [PATCH 1/7] build: use JavaFX 21.0.1

---
 .github/workflows/bundles-linux.yml       | 2 +-
 .github/workflows/bundles-mac.yml         | 2 +-
 .github/workflows/bundles-mac_aarch64.yml | 2 +-
 .github/workflows/bundles-windows.yml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml
index ff0bef026..7bc6bf140 100644
--- a/.github/workflows/bundles-linux.yml
+++ b/.github/workflows/bundles-linux.yml
@@ -14,7 +14,7 @@ on:
         required: false
         type: string
       javafx-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
index eda21bd2a..29be0fb8b 100644
--- a/.github/workflows/bundles-mac.yml
+++ b/.github/workflows/bundles-mac.yml
@@ -14,7 +14,7 @@ on:
         required: false
         type: string
       javafx-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
index 83c8ae0c1..7e7516340 100644
--- a/.github/workflows/bundles-mac_aarch64.yml
+++ b/.github/workflows/bundles-mac_aarch64.yml
@@ -14,7 +14,7 @@ on:
         required: false
         type: string
       javafx-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       test:
diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml
index 1327e8313..6459ddec4 100644
--- a/.github/workflows/bundles-windows.yml
+++ b/.github/workflows/bundles-windows.yml
@@ -14,7 +14,7 @@ on:
         required: false
         type: string
       javafx-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       test:

From 88a6cab1f34504ba1fa42ba60180ed4bcc94f55f Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Thu, 26 Oct 2023 13:43:12 +0530
Subject: [PATCH 2/7] use Java 21.0.1

---
 .github/workflows/bundles-kit.yml         | 2 +-
 .github/workflows/bundles-linux.yml       | 2 +-
 .github/workflows/bundles-mac.yml         | 2 +-
 .github/workflows/bundles-mac_aarch64.yml | 2 +-
 .github/workflows/bundles-windows.yml     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml
index d3eaf986e..f0e03dfe1 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'
+        default: '21.0.1'
         required: false
         type: string
 
diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml
index 7bc6bf140..edf745e2b 100644
--- a/.github/workflows/bundles-linux.yml
+++ b/.github/workflows/bundles-linux.yml
@@ -10,7 +10,7 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
index 29be0fb8b..7cf811a9f 100644
--- a/.github/workflows/bundles-mac.yml
+++ b/.github/workflows/bundles-mac.yml
@@ -10,7 +10,7 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
index 7e7516340..c3cfcedef 100644
--- a/.github/workflows/bundles-mac_aarch64.yml
+++ b/.github/workflows/bundles-mac_aarch64.yml
@@ -10,7 +10,7 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:
diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml
index 6459ddec4..74f2be2b0 100644
--- a/.github/workflows/bundles-windows.yml
+++ b/.github/workflows/bundles-windows.yml
@@ -10,7 +10,7 @@ on:
         required: true
         type: string
       java-version:
-        default: '21'
+        default: '21.0.1'
         required: false
         type: string
       javafx-version:

From 37171fdbb7ed86c57e67be5589718c8f3f49b34b Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Thu, 26 Oct 2023 13:48:20 +0530
Subject: [PATCH 3/7] more changes

---
 .github/workflows/early-access.yml | 4 ++--
 .github/workflows/release.yml      | 4 ++--
 pom.xml                            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
index 826f94854..d425f7deb 100644
--- a/.github/workflows/early-access.yml
+++ b/.github/workflows/early-access.yml
@@ -5,8 +5,8 @@ on:
     branches: [ master ]
 
 env:
-  JAVAFX_VERSION: '21'
-  JAVA_VERSION: '21'
+  JAVAFX_VERSION: '21.0.1'
+  JAVA_VERSION: '21.0.1'
 
 jobs:
   precheck:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 96492be7a..9441928e5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,8 +11,8 @@ on:
           - GA
 
 env:
-  JAVAFX_VERSION: '21'
-  JAVA_VERSION: '21'
+  JAVAFX_VERSION: '21.0.1'
+  JAVA_VERSION: '21.0.1'
 
 jobs:
   precheck:
diff --git a/pom.xml b/pom.xml
index 21fe2b3b8..f415d96b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,11 +16,11 @@
     </modules>
 
     <properties>
-        <java.version>21</java.version>
+        <java.version>21.0.1</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</javafx.version>
+        <javafx.version>21.0.1</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>

From b754754b34a23df1f4877c4059446ec90aa875a1 Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Thu, 26 Oct 2023 14:21:52 +0530
Subject: [PATCH 4/7] use major version for maven compiler

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f415d96b6..6cae14866 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,9 @@
 
     <properties>
         <java.version>21.0.1</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>
+        <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>
         <aether.version>1.1.0</aether.version>
         <charm.glisten.version>6.2.2</charm.glisten.version>

From 58481947c9aa9053b27f115530d8ca0a18cf3487 Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Thu, 26 Oct 2023 14:32:12 +0530
Subject: [PATCH 5/7] use env to set java version

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 402e5b34d..94ac7e892 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,9 @@ name: Scene Builder PR Verify
 on:
   pull_request:
 
+env:
+  JAVA_VERSION: '21.0.1'
+
 jobs:
   verify:
     runs-on: ${{ matrix.os }}
@@ -17,7 +20,7 @@ jobs:
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
-          release: 21
+          release: ${{ env.JAVA_VERSION }}
 
       - name: Run Tests (Linux)
         if: runner.os == 'Linux'

From af9fa2fd7b4fe6105c35b24a4ca70c6e6e0fba31 Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Thu, 26 Oct 2023 14:44:52 +0530
Subject: [PATCH 6/7] use java version as 21. oracle-action automatically
 downloads the latest version.

---
 .github/workflows/build.yml        | 2 +-
 .github/workflows/early-access.yml | 2 +-
 .github/workflows/release.yml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 94ac7e892..c97f5deeb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
 
 env:
-  JAVA_VERSION: '21.0.1'
+  JAVA_VERSION: '21'
 
 jobs:
   verify:
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
index d425f7deb..7954621c8 100644
--- a/.github/workflows/early-access.yml
+++ b/.github/workflows/early-access.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   JAVAFX_VERSION: '21.0.1'
-  JAVA_VERSION: '21.0.1'
+  JAVA_VERSION: '21'
 
 jobs:
   precheck:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9441928e5..e0e0f9230 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   JAVAFX_VERSION: '21.0.1'
-  JAVA_VERSION: '21.0.1'
+  JAVA_VERSION: '21'
 
 jobs:
   precheck:

From 88d193298d9f0667e3741023fc4ec54ffe102111 Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Thu, 26 Oct 2023 15:18:48 +0530
Subject: [PATCH 7/7] update project development version to 21.0.1

---
 app/pom.xml | 2 +-
 kit/pom.xml | 2 +-
 pom.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/pom.xml b/app/pom.xml
index 3718807c9..a713b840c 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.gluonhq.scenebuilder</groupId>
         <artifactId>parent</artifactId>
-        <version>21.0.0-SNAPSHOT</version>
+        <version>21.0.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/kit/pom.xml b/kit/pom.xml
index 2e0abee77..644d36cfb 100644
--- a/kit/pom.xml
+++ b/kit/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.gluonhq.scenebuilder</groupId>
         <artifactId>parent</artifactId>
-        <version>21.0.0-SNAPSHOT</version>
+        <version>21.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 6cae14866..193f7ca9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.gluonhq.scenebuilder</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>21.0.0-SNAPSHOT</version>
+    <version>21.0.1-SNAPSHOT</version>
     <name>Scene Builder</name>
     <description>Scene Builder is a visual, drag n drop, layout tool for designing JavaFX application user interfaces</description>
     <inceptionYear>2012</inceptionYear>