Java 17 and JUnit5 (#5)

* JUnit 5 * Java 17
fuinorg · Dec 27, 2023 · c0d74f5 · c0d74f5
1 parent 4701edd
commit c0d74f5
Showing 13 changed files with 48 additions and 48 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -19,36 +19,36 @@ jobs:
 
     steps:
     - name: Checkout source
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'zulu'
         cache: maven
 
     - name: Show versions
       run: java -version && ./mvnw -version && gpg --version
 
     - name: Cache SonarCloud packages
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
 
     - name: Cache Maven packages
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
 
     - name: Import GPG key
-      uses: crazy-max/ghaction-import-gpg@v4
+      uses: crazy-max/ghaction-import-gpg@v5
       with:
         gpg_private_key: ${{ secrets.OSS_SONATYPE_GPG_PRIVATE_KEY }}
         passphrase: ${{ secrets.OSS_SONATYPE_GPG_PASSPHRASE }}

diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 target
 META-INF
 *.log
+/pom.xml.versionsBackup
diff --git a/README.md b/README.md
@@ -7,10 +7,10 @@ Base classes for Command Query Responsibility Segregation (CQRS) with Java
 [![Coverage Status](https://sonarcloud.io/api/project_badges/measure?project=org.fuin%3Acqrs-4-java&metric=coverage)](https://sonarcloud.io/dashboard?id=org.fuin%3Acqrs-4-java)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.fuin/cqrs-4-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.fuin/cqrs-4-java/)
 [![LGPLv3 License](http://img.shields.io/badge/license-LGPLv3-blue.svg)](https://www.gnu.org/licenses/lgpl.html)
-[![Java Development Kit 11](https://img.shields.io/badge/JDK-11-green.svg)](https://openjdk.java.net/projects/jdk/11/)
+[![Java Development Kit 17](https://img.shields.io/badge/JDK-17-green.svg)](https://openjdk.java.net/projects/jdk/17/)
 
 ## Versions
-- (Coming soon) 0.5.x (or later) = **Java 11** with new **jakarta** namespace
+- 0.5.x (or later) = **Java 17** with new **jakarta** namespace
 - 0.3.x/0.4.x = **Java 11** before namespace change from 'javax' to 'jakarta'
 - 0.2.1 = **Java 8**
 

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.fuin</groupId>
         <artifactId>pom</artifactId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
 
     <artifactId>cqrs-4-java</artifactId>
@@ -28,7 +28,7 @@
     </issueManagement>
 
     <properties>
-        <esc.version>0.5.0</esc.version>
+        <esc.version>0.6.0</esc.version>
     </properties>
 
     <dependencies>
@@ -38,32 +38,32 @@
         <dependency>
             <groupId>org.fuin</groupId>
             <artifactId>ddd-4-java</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
+            <version>0.5.0</version>
         </dependency>
 
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.14.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.32</version>
+            <version>2.0.9</version>
         </dependency>
 
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
             <optional>true</optional>
         </dependency>
 
@@ -77,44 +77,44 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.20.2</version>
+            <version>3.24.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.fuin</groupId>
             <artifactId>units4j</artifactId>
-            <version>0.10.0</version>
+            <version>0.11.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>7.0.1.Final</version>
+            <version>8.0.1.Final</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
-            <version>4.0.0</version>
+            <version>5.0.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.el</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -128,35 +128,35 @@
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>
-            <version>2.8.2</version>
+            <version>2.9.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.7.1</version>
+            <version>3.15.5</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.15.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>3.0.2</version>
+            <version>4.0.4</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>yasson</artifactId>
-            <version>2.0.2</version>
+            <version>3.0.3</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/test/java/org/fuin/cqrs4j/AbstractAggregateCommandTest.java b/src/test/java/org/fuin/cqrs4j/AbstractAggregateCommandTest.java
@@ -1,8 +1,8 @@
 package org.fuin.cqrs4j;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.fuin.utils4j.JaxbUtils.marshal;
-import static org.fuin.utils4j.JaxbUtils.unmarshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
 import static org.fuin.utils4j.Utils4J.deserialize;
 import static org.fuin.utils4j.Utils4J.serialize;
 
@@ -23,7 +23,7 @@
 import org.fuin.ddd4j.ddd.Event;
 import org.fuin.ddd4j.ddd.EventId;
 import org.fuin.ddd4j.ddd.EventType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 //CHECKSTYLE:OFF Test code
 public class AbstractAggregateCommandTest {

diff --git a/src/test/java/org/fuin/cqrs4j/AbstractCommandTest.java b/src/test/java/org/fuin/cqrs4j/AbstractCommandTest.java
@@ -1,8 +1,8 @@
 package org.fuin.cqrs4j;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.fuin.utils4j.JaxbUtils.marshal;
-import static org.fuin.utils4j.JaxbUtils.unmarshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
 import static org.fuin.utils4j.Utils4J.deserialize;
 import static org.fuin.utils4j.Utils4J.serialize;
 
@@ -16,7 +16,7 @@
 import org.fuin.ddd4j.ddd.Event;
 import org.fuin.ddd4j.ddd.EventId;
 import org.fuin.ddd4j.ddd.EventType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 //CHECKSTYLE:OFF Test code
 public class AbstractCommandTest {

diff --git a/src/test/java/org/fuin/cqrs4j/Cqrs4JUtilsTest.java b/src/test/java/org/fuin/cqrs4j/Cqrs4JUtilsTest.java
@@ -26,7 +26,7 @@
 import org.fuin.ddd4j.ddd.EventType;
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.vo.EmailAddressStr;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // CHECKSTYLE:OFF
 public final class Cqrs4JUtilsTest {

diff --git a/src/test/java/org/fuin/cqrs4j/DataResultJsonbAdapterTest.java b/src/test/java/org/fuin/cqrs4j/DataResultJsonbAdapterTest.java
@@ -31,7 +31,7 @@
 import org.eclipse.yasson.FieldAccessStrategy;
 import org.fuin.cqrs4j.DataResultTest.Invoice;
 import org.fuin.ddd4j.ddd.AggregateNotFoundException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for the {@link DataResultJsonbAdapter} class.

diff --git a/src/test/java/org/fuin/cqrs4j/DataResultTest.java b/src/test/java/org/fuin/cqrs4j/DataResultTest.java
@@ -18,8 +18,8 @@
 package org.fuin.cqrs4j;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.fuin.utils4j.JaxbUtils.marshal;
-import static org.fuin.utils4j.JaxbUtils.unmarshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
 
 import java.io.IOException;
 import java.util.UUID;
@@ -36,8 +36,7 @@
 import org.fuin.ddd4j.ddd.EntityType;
 import org.fuin.ddd4j.ddd.StringBasedEntityType;
 import org.fuin.objects4j.common.MarshalInformation;
-import org.junit.Test;
-import org.w3c.dom.Node;
+import org.junit.jupiter.api.Test;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.diff.Diff;
 

diff --git a/src/test/java/org/fuin/cqrs4j/GeneralTest.java b/src/test/java/org/fuin/cqrs4j/GeneralTest.java
@@ -22,7 +22,7 @@
 import java.io.File;
 
 import org.fuin.units4j.AssertCoverage.ClassFilter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * General tests for the project.

diff --git a/src/test/java/org/fuin/cqrs4j/MultiCommandExecutorTest.java b/src/test/java/org/fuin/cqrs4j/MultiCommandExecutorTest.java
@@ -18,7 +18,7 @@
 package org.fuin.cqrs4j;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@
 
 import org.fuin.ddd4j.ddd.EventType;
 import org.fuin.objects4j.common.ConstraintViolationException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for {@link MultiCommandExecutor}.

diff --git a/src/test/java/org/fuin/cqrs4j/SimpleEventDispatcherTest.java b/src/test/java/org/fuin/cqrs4j/SimpleEventDispatcherTest.java
@@ -29,7 +29,7 @@
 import org.fuin.esc.api.EventId;
 import org.fuin.esc.api.SimpleCommonEvent;
 import org.fuin.esc.api.TypeName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 //CHECKSTYLE:OFF
 public final class SimpleEventDispatcherTest {

diff --git a/src/test/java/org/fuin/cqrs4j/SimpleResultTest.java b/src/test/java/org/fuin/cqrs4j/SimpleResultTest.java
@@ -18,8 +18,8 @@
 package org.fuin.cqrs4j;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.fuin.utils4j.JaxbUtils.marshal;
-import static org.fuin.utils4j.JaxbUtils.unmarshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
 
 import java.io.IOException;
 import java.util.UUID;
@@ -29,7 +29,7 @@
 import org.fuin.ddd4j.ddd.AggregateRootId;
 import org.fuin.ddd4j.ddd.EntityType;
 import org.fuin.ddd4j.ddd.StringBasedEntityType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.diff.Diff;
-Original file line number
+Diff line change
@@ @@ -6,3 +6,4 @@ @@
     target
     META-INF
     *.log
+    /pom.xml.versionsBackup