From b0abe31388d87e07aee6714363e8f8c63113a22d Mon Sep 17 00:00:00 2001
From: Konrad Neitzel <konrad@kneitzel.de>
Date: Sat, 22 Oct 2022 17:52:37 +0200
Subject: [PATCH 01/10] Added bindServices attribute to moditects jlink call.

---
 README.md | 8 +++++++-
 pom.xml   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fe5e980..53bbd0a 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,10 @@ Example Maven Project for a JavaFX Application.
 
 Maven modules are configured so that even Images are build (including JPackage app-image).
 
-Project includes PMD and spotbugs!
\ No newline at end of file
+Project includes PMD and spotbugs!
+
+
+Branches shows,
+- including log4j
+- including slf4j
+This is just for testing purpose / was requiried during threads in http://java-forum.org.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a9ca0e4..db5f442 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,6 +255,7 @@
                                 <module>${main.module}</module>
                             </launcher>
                             <compression>2</compression>
+                            <bindServices>true</bindServices>
                             <jarInclusionPolicy>APP_WITH_DEPENDENCIES</jarInclusionPolicy>
                             <stripDebug>true</stripDebug>
                             <outputDirectory>${project.build.directory}/jlink-image</outputDirectory>

From c95b54eea2858f681abb0ef30467efa1ca0a975f Mon Sep 17 00:00:00 2001
From: Konrad Neitzel <konrad@kneitzel.de>
Date: Fri, 11 Nov 2022 15:27:54 +0100
Subject: [PATCH 02/10] Moved JLink/JPackage to Profile Image.

---
 pom.xml | 237 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 132 insertions(+), 105 deletions(-)

diff --git a/pom.xml b/pom.xml
index db5f442..4638062 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,111 +178,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>${maven.dependency.plugin}</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/modules</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>false</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-                <version>${moditect.maven.plugin}</version>
-                <executions>
-                    <execution>
-                        <id>add-module-info-to-dependencies</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/modules</outputDirectory>
-                            <overwriteExistingFiles>true</overwriteExistingFiles>
-							<!-- Beispiel wie eine Dependency ohne module-info diese bekommen kann! -->
-							<!--
-                            <modules>
-                                <module>
-                                    <artifact>
-                                        <groupId>org.json</groupId>
-                                        <artifactId>json</artifactId>
-                                    </artifact>
-                                    <moduleInfo>
-                                        <name>org.json</name>
-                                    </moduleInfo>
-                                </module>
-                            </modules>
-							-->
-
-                            <module>
-                                <mainClass>${main.class}</mainClass>
-                                <moduleInfoFile>${project.build.sourceDirectory}/module-info.java</moduleInfoFile>
-                            </module>
-
-                            <jdepsExtraArgs>
-                                --ignore-missing-deps
-                            </jdepsExtraArgs>
-                        </configuration>
-                        <goals>
-                            <goal>add-module-info</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>create-runtime-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>create-runtime-image</goal>
-                        </goals>
-                        <configuration>
-                            <modulePath>
-                                <path>${project.build.directory}/modules</path>
-                            </modulePath>
-                            <modules>
-                                <module>${main.module}</module>
-                            </modules>
-                            <launcher>
-                                <name>${launcher}</name>
-                                <module>${main.module}</module>
-                            </launcher>
-                            <compression>2</compression>
-                            <bindServices>true</bindServices>
-                            <jarInclusionPolicy>APP_WITH_DEPENDENCIES</jarInclusionPolicy>
-                            <stripDebug>true</stripDebug>
-                            <outputDirectory>${project.build.directory}/jlink-image</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.github.akman</groupId>
-                <artifactId>jpackage-maven-plugin</artifactId>
-                <version>${jpackage.maven.plugin}</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jpackage</goal>
-                        </goals>
-                        <configuration>
-                            <name>${appName}</name>
-                            <type>IMAGE</type>
-                            <runtimeimage>${project.build.directory}/jlink-image</runtimeimage>
-                            <module>${main.module}/${main.class}</module>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
@@ -376,4 +271,136 @@
 
         </plugins>
     </build>
+
+    <profiles>
+
+        <!-- Profile that adds JLink and JPackage runs.
+
+             Add -PImage or -DImage to use this profile.
+             -->
+        <profile>
+            <id>Image</id>
+            <activation>
+                <property>
+                    <name>Image</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+
+                    <!-- Copy dependencies -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>${maven.dependency.plugin}</version>
+                        <executions>
+                            <execution>
+                                <id>copy-dependencies</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/modules</outputDirectory>
+                                    <overWriteReleases>false</overWriteReleases>
+                                    <overWriteSnapshots>false</overWriteSnapshots>
+                                    <overWriteIfNewer>true</overWriteIfNewer>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Build image -->
+                    <plugin>
+                        <groupId>org.moditect</groupId>
+                        <artifactId>moditect-maven-plugin</artifactId>
+                        <version>${moditect.maven.plugin}</version>
+                        <executions>
+                            <execution>
+                                <id>add-module-info-to-dependencies</id>
+                                <phase>package</phase>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/modules</outputDirectory>
+                                    <overwriteExistingFiles>true</overwriteExistingFiles>
+                                    <!-- Beispiel wie eine Dependency ohne module-info diese bekommen kann! -->
+                                    <!--
+                                    <modules>
+                                        <module>
+                                            <artifact>
+                                                <groupId>org.json</groupId>
+                                                <artifactId>json</artifactId>
+                                            </artifact>
+                                            <moduleInfo>
+                                                <name>org.json</name>
+                                            </moduleInfo>
+                                        </module>
+                                    </modules>
+                                    -->
+
+                                    <module>
+                                        <mainClass>${main.class}</mainClass>
+                                        <moduleInfoFile>${project.build.sourceDirectory}/module-info.java</moduleInfoFile>
+                                    </module>
+
+                                    <jdepsExtraArgs>
+                                        --ignore-missing-deps
+                                    </jdepsExtraArgs>
+                                </configuration>
+                                <goals>
+                                    <goal>add-module-info</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>create-runtime-image</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>create-runtime-image</goal>
+                                </goals>
+                                <configuration>
+                                    <modulePath>
+                                        <path>${project.build.directory}/modules</path>
+                                    </modulePath>
+                                    <modules>
+                                        <module>${main.module}</module>
+                                    </modules>
+                                    <launcher>
+                                        <name>${launcher}</name>
+                                        <module>${main.module}</module>
+                                    </launcher>
+                                    <compression>2</compression>
+                                    <bindServices>true</bindServices>
+                                    <jarInclusionPolicy>APP_WITH_DEPENDENCIES</jarInclusionPolicy>
+                                    <stripDebug>true</stripDebug>
+                                    <outputDirectory>${project.build.directory}/jlink-image</outputDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Build JPackage App-Image -->
+                    <plugin>
+                        <groupId>com.github.akman</groupId>
+                        <artifactId>jpackage-maven-plugin</artifactId>
+                        <version>${jpackage.maven.plugin}</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jpackage</goal>
+                                </goals>
+                                <configuration>
+                                    <name>${appName}</name>
+                                    <type>IMAGE</type>
+                                    <runtimeimage>${project.build.directory}/jlink-image</runtimeimage>
+                                    <module>${main.module}/${main.class}</module>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
 </project>

From 61e33aff0c3b5a7dcf2b5772d6c935d8f5d6acc5 Mon Sep 17 00:00:00 2001
From: Konrad Neitzel <konrad@kneitzel.de>
Date: Mon, 28 Nov 2022 13:09:26 +0100
Subject: [PATCH 03/10] - Added Main class to start from inside NetBeans -
 updated PMD / Spotbugs to latest version - Ignored Netbeans nbactions.xml

---
 .gitignore                          |  3 ++-
 pom.xml                             |  4 ++--
 src/main/java/de/kneitzel/Main.java | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/de/kneitzel/Main.java

diff --git a/.gitignore b/.gitignore
index f295354..5f6d4d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea
 *.iml
 target
-debug.out
\ No newline at end of file
+debug.out
+/nbactions.xml
diff --git a/pom.xml b/pom.xml
index 4638062..3fb7fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,10 +42,10 @@
         <moditect.maven.plugin>1.0.0.RC2</moditect.maven.plugin>
         <jpackage.maven.plugin>0.1.3</jpackage.maven.plugin>
         <maven.pmd.version>3.16.0</maven.pmd.version>
-        <pmd.version>6.49.0</pmd.version>
+        <pmd.version>6.52.0</pmd.version>
         <codehaus.version.plugin>2.11.0</codehaus.version.plugin>
         <spotbugs.maven.plugin>4.7.2.0</spotbugs.maven.plugin>
-        <spotbugs.version>4.7.2</spotbugs.version>
+        <spotbugs.version>4.7.3</spotbugs.version>
 
         <!-- other properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/de/kneitzel/Main.java b/src/main/java/de/kneitzel/Main.java
new file mode 100644
index 0000000..82917a6
--- /dev/null
+++ b/src/main/java/de/kneitzel/Main.java
@@ -0,0 +1,15 @@
+package de.kneitzel;
+
+/**
+ * Another Main class as workaround when the JavaFX Application ist started without
+ * taking care os Classloader Requirements of JavaFX. (Important when starting from inside NetBeans!)
+ */
+public class Main {
+    /**
+     * Additional main methode to start Application.
+     * @param args Commandline Arguments.
+     */
+    public static void main(String[] args) {
+        JavaFXApp.main(args);
+    }
+}

From 7d8839cfb8994078ee76f928dbb2a8bb9e195c12 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Tue, 10 Jan 2023 01:17:13 +0000
Subject: [PATCH 04/10] fix: upgrade org.jetbrains:annotations from 23.0.0 to
 23.1.0

Snyk has created this PR to upgrade org.jetbrains:annotations from 23.0.0 to 23.1.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.jetbrains/annotations/

See this project in Snyk:
https://app.snyk.io/org/konrad-kid/project/9e73a33f-cacb-42bf-b7b1-8472751001d6?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3fb7fb3..8bdb70b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <junit.version>5.9.1</junit.version>
         <javafx.version>19</javafx.version>
         <lombok.version>1.18.24</lombok.version>
-        <jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
+        <jetbrains.annotations.version>23.1.0</jetbrains.annotations.version>
 
         <!-- Plugin dependencies -->
 		<maven.clean.plugin>3.2.0</maven.clean.plugin>

From 9cf7bbeba04271a9690281a7f27c637dc681e437 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Fri, 10 Feb 2023 00:54:33 +0000
Subject: [PATCH 05/10] fix: upgrade org.openjfx:javafx-graphics from 19 to
 19.0.2

Snyk has created this PR to upgrade org.openjfx:javafx-graphics from 19 to 19.0.2.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.openjfx/javafx-graphics/

See this project in Snyk:
https://app.snyk.io/org/konrad-kid/project/9e73a33f-cacb-42bf-b7b1-8472751001d6?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3fb7fb3..b84e4b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
         <!-- Dependency versions -->
         <junit.version>5.9.1</junit.version>
-        <javafx.version>19</javafx.version>
+        <javafx.version>19.0.2</javafx.version>
         <lombok.version>1.18.24</lombok.version>
         <jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
 

From ef64a7c6a618bd4bb4c6f29a967f46676274e83a Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sat, 25 Feb 2023 23:52:04 +0000
Subject: [PATCH 06/10] fix: upgrade org.projectlombok:lombok from 1.18.24 to
 1.18.26

Snyk has created this PR to upgrade org.projectlombok:lombok from 1.18.24 to 1.18.26.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.projectlombok/lombok/

See this project in Snyk:
https://app.snyk.io/org/konrad-kid/project/9e73a33f-cacb-42bf-b7b1-8472751001d6?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3fb7fb3..62f006a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <!-- Dependency versions -->
         <junit.version>5.9.1</junit.version>
         <javafx.version>19</javafx.version>
-        <lombok.version>1.18.24</lombok.version>
+        <lombok.version>1.18.26</lombok.version>
         <jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
 
         <!-- Plugin dependencies -->

From b889eb7448fa029db18537918539c3fa9e988a29 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sun, 26 Feb 2023 23:40:11 +0000
Subject: [PATCH 07/10] fix: upgrade org.projectlombok:lombok from 1.18.24 to
 1.18.26

Snyk has created this PR to upgrade org.projectlombok:lombok from 1.18.24 to 1.18.26.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.projectlombok/lombok/

See this project in Snyk:
https://app.snyk.io/org/konrad-kid/project/9e73a33f-cacb-42bf-b7b1-8472751001d6?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3903018..4ed4770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         <lombok.version>1.18.26</lombok.version>
         <javafx.version>19.0.2</javafx.version>
         <jetbrains.annotations.version>23.1.0</jetbrains.annotations.version>
-        <lombok.version>1.18.24</lombok.version>
+        <lombok.version>1.18.26</lombok.version>
 
         <!-- Plugin dependencies -->
 		<maven.clean.plugin>3.2.0</maven.clean.plugin>

From 573a59aa7687350b3b99343b7dab7444616a1123 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sun, 26 Feb 2023 23:40:15 +0000
Subject: [PATCH 08/10] fix: upgrade org.openjfx:javafx-graphics from 19.0.2 to
 19.0.2.1

Snyk has created this PR to upgrade org.openjfx:javafx-graphics from 19.0.2 to 19.0.2.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.openjfx/javafx-graphics/

See this project in Snyk:
https://app.snyk.io/org/konrad-kid/project/9e73a33f-cacb-42bf-b7b1-8472751001d6?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3903018..9d5ff15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <!-- Dependency versions -->
         <junit.version>5.9.1</junit.version>
         <lombok.version>1.18.26</lombok.version>
-        <javafx.version>19.0.2</javafx.version>
+        <javafx.version>19.0.2.1</javafx.version>
         <jetbrains.annotations.version>23.1.0</jetbrains.annotations.version>
         <lombok.version>1.18.24</lombok.version>
 

From cfdb6ce0e1c00082745121073fc9a7b13803522c Mon Sep 17 00:00:00 2001
From: Konrad Neitzel <konrad@kneitzel.de>
Date: Thu, 9 Mar 2023 22:09:55 +0100
Subject: [PATCH 09/10] Update README.md

---
 README.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 53bbd0a..c23ae1c 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,5 @@ Maven modules are configured so that even Images are build (including JPackage a
 
 Project includes PMD and spotbugs!
 
-
-Branches shows,
-- including log4j
-- including slf4j
-This is just for testing purpose / was requiried during threads in http://java-forum.org.
\ No newline at end of file
+**Important**: Using moditect to add module descriptions is not required. New solution to create images through jpackage will be commited soon.
+Check branch direct-jpackage to see the current test project I build.

From 970fe0785bf44da60c317788d93d4fd7ea1658dd Mon Sep 17 00:00:00 2001
From: Konrad Neitzel <konrad@kneitzel.de>
Date: Sat, 11 Mar 2023 16:18:42 +0100
Subject: [PATCH 10/10] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c23ae1c..35c8273 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Example Maven Project for a JavaFX Application.
 
-Maven modules are configured so that even Images are build (including JPackage app-image).
+Maven modules are configured so that even Images are built (including JPackage app-image).
 
 Project includes PMD and spotbugs!