From 5a665b420aa86bb92fd578ecf5c22681a8f02826 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Wed, 8 Mar 2023 10:36:21 +0200
Subject: [PATCH] Java 18137 Upgraded javafx module to jdk9-and-above profile

* [JAVA-18137] Upgraded javafx module to jdk9-and-above profile

* [JAVA-18137] Upgraded javafx module to jdk9-and-above profile

* [JAVA-18137] Clean up properties

* [JAVA-18137] Fixed a typo
---
 javafx/pom.xml | 31 +++++++++++++++++++++++++++++++
 pom.xml        | 14 +++++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/javafx/pom.xml b/javafx/pom.xml
index 9b0b6002a8..69855a9494 100644
--- a/javafx/pom.xml
+++ b/javafx/pom.xml
@@ -12,4 +12,35 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>${javafx-maven-plugin.version}</version>
+                <configuration>
+                    <mainClass>Main</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <javafx.version>19</javafx.version>
+        <javafx-maven-plugin.version>0.0.8</javafx-maven-plugin.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d1ba6c9365..712455351f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,7 +349,6 @@
                 <module>apache-httpclient</module>
                 <module>apache-httpclient4</module>
 
-                <module>javafx</module>
                 <module>java-jdi</module>
                 <module>java-websocket</module>
 
@@ -576,7 +575,6 @@
                 <module>apache-httpclient</module>
                 <module>apache-httpclient4</module>
 
-                <module>javafx</module>
                 <module>java-jdi</module>
                 <module>java-websocket</module>
 
@@ -799,6 +797,9 @@
             </build>
 
             <modules>
+
+                <module>javafx</module>
+
                 <module>spring-batch</module>
                 <module>spring-boot-rest</module>
                 <module>spring-drools</module>
@@ -808,11 +809,11 @@
                 <module>spring-core-4</module>
                 <module>spring-integration</module>
                 <module>libraries-security</module>
+
                 <module>performance-tests</module>
                 <module>security-modules</module>
                 <module>libraries-server-2</module>
                 <module>orika</module>
-
                 <module>patterns-modules</module>
                 <module>json-modules</module>
                 <module>libraries-data</module>
@@ -1053,6 +1054,9 @@
             </build>
 
             <modules>
+
+                <module>javafx</module>
+
                 <module>spring-batch</module>
                 <module>spring-boot-rest</module>
                 <module>spring-drools</module>
@@ -1062,18 +1066,18 @@
                 <module>spring-core-4</module>
                 <module>spring-integration</module>
                 <module>libraries-security</module>
+
                 <module>performance-tests</module>
                 <module>security-modules</module>
                 <module>libraries-server-2</module>
                 <module>orika</module>
-                
                 <module>patterns-modules</module>
                 <module>json-modules</module>
                 <module>libraries-data</module>
                 <module>saas-modules</module>
                 <module>server-modules</module>
                 <module>apache-cxf-modules</module>
-                
+
                 <module>algorithms-modules</module>
                 <module>apache-libraries</module>
                 <module>apache-poi</module>