Use junit BOM.

io7m-com · Oct 21, 2024 · 924e521 · 924e521
1 parent c2b8d44
commit 924e521
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/com.io7m.jxtrand.examples/src/main/java/module-info.java b/com.io7m.jxtrand.examples/src/main/java/module-info.java
@@ -23,8 +23,13 @@
   requires static org.osgi.annotation.bundle;
   requires static org.osgi.annotation.versioning;
 
-  requires transitive com.io7m.jxtrand.api;
+  requires com.io7m.jxtrand.api;
   requires com.io7m.jxtrand.vanilla;
 
+  opens com.io7m.jxtrand.examples to
+    com.io7m.jxtrand.vanilla;
+  opens com.io7m.jxtrand.examples.internal to
+    com.io7m.jxtrand.vanilla;
+
   exports com.io7m.jxtrand.examples;
 }
diff --git a/com.io7m.jxtrand.tests/pom.xml b/com.io7m.jxtrand.tests/pom.xml
@@ -55,6 +55,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -64,8 +69,16 @@
       <artifactId>junit-jupiter-engine</artifactId>
     </dependency>
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-commons</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-engine</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
 
     <!-- Third-party dependencies. -->
     <io7m.maven-api.version>3.9.9</io7m.maven-api.version>
-    <junit.version>5.11.2</junit.version>
+    <org.junit.version>5.11.2</org.junit.version>
   </properties>
 
   <licenses>
@@ -166,14 +166,11 @@
 
       <!-- Test suite. -->
       <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>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${org.junit.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.mock-server</groupId>