Use junit BOM, make JavaFX optional.

io7m-com · May 16, 2024 · b6697b3 · b6697b3
1 parent d43c936
commit b6697b3
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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>