From 1ff6672223e7a897c5f2eda80a47d2c7daae7124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Dupire?= <dupire.francois+pro@gmail.com>
Date: Tue, 30 Jun 2020 18:55:30 +0200
Subject: [PATCH] =?UTF-8?q?[JAVA-1670]=20Upgraded=20JUnit=20and=20Maven=20?=
 =?UTF-8?q?Surefire=20Plugin=20in=20spring-boot-m=E2=80=A6=20(#9509)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [JAVA-1670] Upgraded JUnit and Maven Surefire Plugin in spring-boot-modules

* Upgraded Maven Surefire Plugin version to 2.22.2

* Upgraded JUnit version to 5.6.2

* [JAVA-1670] Phasing upgrade - Inheriting form parent-boot-2

* Reverted JUnit version upgrade for now (will focus on parent/child relationships first)

* Changed parent pom of spring-boot-modules to parent-boot-2

* Upgraded JUnit version to 5.6.2 in spring-boot-modules
---
 spring-boot-modules/pom.xml                   | 20 +++++++++++++++++--
 spring-boot-modules/spring-boot-camel/pom.xml |  7 ++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 14f071b5e5..50059fe383 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -2,15 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>com.baeldung.spring-boot-modules</groupId>
     <artifactId>spring-boot-modules</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
     <name>spring-boot-modules</name>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <modules>
@@ -60,4 +63,17 @@
         <module>spring-boot-actuator</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <junit-jupiter.version>5.6.2</junit-jupiter.version>
+    </properties>
 </project>
diff --git a/spring-boot-modules/spring-boot-camel/pom.xml b/spring-boot-modules/spring-boot-camel/pom.xml
index 7c1e28b3ee..881b021b96 100644
--- a/spring-boot-modules/spring-boot-camel/pom.xml
+++ b/spring-boot-modules/spring-boot-camel/pom.xml
@@ -8,9 +8,10 @@
 	<name>spring-boot-camel</name>
 	
     <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-1</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-1</relativePath>
     </parent>
 
     <dependencies>