From 3086da7d127b92c19b51d9a829c08055bccefd54 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Mon, 1 Jun 2020 11:11:12 +0200
Subject: [PATCH] [JAVA-1659] Upgraded Maven Surefire Plugin and JUnit versions

* Fixed sub-modules parent poms names

* Added relative paths to sub-modules poms

* Configured Maven Surefire Plugin so that it works with the dummy test

* Upgraded Maven Surefire Plugin version to 2.22.2

* Upgraded JUnit version to 5.6.2
---
 ddd-modules/infrastructure/pom.xml  |  3 ++-
 ddd-modules/mainapp/pom.xml         |  3 ++-
 ddd-modules/ordercontext/pom.xml    |  3 ++-
 ddd-modules/pom.xml                 | 34 ++++++++++++++++++++++++-----
 ddd-modules/sharedkernel/pom.xml    |  3 ++-
 ddd-modules/shippingcontext/pom.xml |  3 ++-
 6 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/ddd-modules/infrastructure/pom.xml b/ddd-modules/infrastructure/pom.xml
index c301eaa92a..abf90935c3 100644
--- a/ddd-modules/infrastructure/pom.xml
+++ b/ddd-modules/infrastructure/pom.xml
@@ -12,8 +12,9 @@
 
     <parent>
         <groupId>com.baeldung.dddmodules</groupId>
-        <artifactId>dddmodules</artifactId>
+        <artifactId>ddd-modules</artifactId>
         <version>1.0</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/ddd-modules/mainapp/pom.xml b/ddd-modules/mainapp/pom.xml
index a048263d37..59d2ad7d3a 100644
--- a/ddd-modules/mainapp/pom.xml
+++ b/ddd-modules/mainapp/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>com.baeldung.dddmodules</groupId>
-        <artifactId>dddmodules</artifactId>
+        <artifactId>ddd-modules</artifactId>
         <version>1.0</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/ddd-modules/ordercontext/pom.xml b/ddd-modules/ordercontext/pom.xml
index abd166fb69..8dee3a5148 100644
--- a/ddd-modules/ordercontext/pom.xml
+++ b/ddd-modules/ordercontext/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>com.baeldung.dddmodules</groupId>
-        <artifactId>dddmodules</artifactId>
+        <artifactId>ddd-modules</artifactId>
         <version>1.0</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>
diff --git a/ddd-modules/pom.xml b/ddd-modules/pom.xml
index c6dd6e1f25..6ab1829198 100644
--- a/ddd-modules/pom.xml
+++ b/ddd-modules/pom.xml
@@ -28,9 +28,15 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>${junit-jupiter.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -56,15 +62,31 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <forkCount>0</forkCount>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <properties>
-        <compiler.plugin.version>3.8.1</compiler.plugin.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
         <source.version>9</source.version>
         <target.version>9</target.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <assertj-core.version>3.12.2</assertj-core.version>
+
+        <compiler.plugin.version>3.8.1</compiler.plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+
         <appmodules.version>1.0</appmodules.version>
+
+        <junit-jupiter.version>5.6.2</junit-jupiter.version>
+        <assertj-core.version>3.12.2</assertj-core.version>
     </properties>
 
 </project>
diff --git a/ddd-modules/sharedkernel/pom.xml b/ddd-modules/sharedkernel/pom.xml
index a61f03a494..1afddf1e22 100644
--- a/ddd-modules/sharedkernel/pom.xml
+++ b/ddd-modules/sharedkernel/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>com.baeldung.dddmodules</groupId>
-        <artifactId>dddmodules</artifactId>
+        <artifactId>ddd-modules</artifactId>
         <version>1.0</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <build>
diff --git a/ddd-modules/shippingcontext/pom.xml b/ddd-modules/shippingcontext/pom.xml
index 2096923f90..25b5882ef1 100644
--- a/ddd-modules/shippingcontext/pom.xml
+++ b/ddd-modules/shippingcontext/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>com.baeldung.dddmodules</groupId>
-        <artifactId>dddmodules</artifactId>
+        <artifactId>ddd-modules</artifactId>
         <version>1.0</version>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencies>