From b6697b3c11d6f7dd54e1a231e45aee91b2f8f321 Mon Sep 17 00:00:00 2001
From: Mark Raynsford <code@io7m.com>
Date: Thu, 16 May 2024 11:42:42 +0000
Subject: [PATCH] Use junit BOM, make JavaFX optional.

---
 com.io7m.digal.core/pom.xml  |  4 ++++
 com.io7m.digal.tests/pom.xml | 25 +++++++++++++++++++++----
 pom.xml                      | 35 +++++++++++++++++++----------------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/com.io7m.digal.core/pom.xml b/com.io7m.digal.core/pom.xml
index 91248d4..9228dd5 100644
--- a/com.io7m.digal.core/pom.xml
+++ b/com.io7m.digal.core/pom.xml
@@ -22,18 +22,22 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-fxml</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-graphics</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-base</artifactId>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
diff --git a/com.io7m.digal.tests/pom.xml b/com.io7m.digal.tests/pom.xml
index 5046eaa..c70a70c 100644
--- a/com.io7m.digal.tests/pom.xml
+++ b/com.io7m.digal.tests/pom.xml
@@ -30,6 +30,27 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-fxml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-controls</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-graphics</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-base</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-swing</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -66,10 +87,6 @@
       <groupId>org.testfx</groupId>
       <artifactId>testfx-junit5</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.openjfx</groupId>
-      <artifactId>javafx-swing</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.github.romankh3</groupId>
       <artifactId>image-comparison</artifactId>
diff --git a/pom.xml b/pom.xml
index a41fc0d..785961d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
     <!-- Third-party dependencies. -->
     <javafx.version>21.0.3</javafx.version>
     <jqwik.version>1.8.4</jqwik.version>
-    <junit.version>5.10.2</junit.version>
+    <org.junit.version>5.10.2</org.junit.version>
     <testfx.version>4.0.18</testfx.version>
   </properties>
 
@@ -106,16 +106,8 @@
         <artifactId>logback-classic</artifactId>
         <version>1.5.6</version>
       </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-api</artifactId>
-        <version>${junit.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-        <version>${junit.version}</version>
-      </dependency>
+
+      <!-- Build metadata. -->
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.annotation.bundle</artifactId>
@@ -126,11 +118,8 @@
         <artifactId>org.osgi.annotation.versioning</artifactId>
         <version>1.1.2</version>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>5.12.0</version>
-      </dependency>
+
+      <!-- JavaFX -->
       <dependency>
         <groupId>org.openjfx</groupId>
         <artifactId>javafx-fxml</artifactId>
@@ -156,6 +145,15 @@
         <artifactId>javafx-swing</artifactId>
         <version>${javafx.version}</version>
       </dependency>
+
+      <!-- Test suite. -->
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${org.junit.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>net.jqwik</groupId>
         <artifactId>jqwik-engine</artifactId>
@@ -186,6 +184,11 @@
         <artifactId>hamcrest</artifactId>
         <version>2.2</version>
       </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <version>5.12.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>