From ce5c137ab9f3b654c90295715174de356c6131ff Mon Sep 17 00:00:00 2001
From: I538344 <charles.dubois@sap.com>
Date: Wed, 28 Aug 2024 12:53:20 +0200
Subject: [PATCH 1/4] Fixed e2e tests

---
 e2e-test-app/pom.xml | 15 ++++-----------
 pom.xml              |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/e2e-test-app/pom.xml b/e2e-test-app/pom.xml
index 9441a1c9e..ca47c77a8 100644
--- a/e2e-test-app/pom.xml
+++ b/e2e-test-app/pom.xml
@@ -42,17 +42,6 @@
     <enforcer.skipEnforceScopeLoggerBridges>true</enforcer.skipEnforceScopeLoggerBridges>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring-boot.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
     <!-- scope "compile" -->
     <dependency>
@@ -78,14 +67,17 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
+      <version>${spring-boot.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot</artifactId>
+      <version>${spring-boot.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
+      <version>${springframework.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -119,6 +111,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
+      <version>${spring-boot.version}</version>
       <scope>runtime</scope>
     </dependency>
     <!-- scope "provided" -->
diff --git a/pom.xml b/pom.xml
index a0a1c3326..bddd6e0a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
     <spotless.version>2.43.0</spotless.version>
     <checkstyle.version>10.18.0</checkstyle.version>
     <system-stubs.version>2.1.3</system-stubs.version>
-    <surefire.version>3.3.1</surefire.version>
+    <surefire.version>3.4.0</surefire.version>
     <system-stubs.version>2.1.3</system-stubs.version>
     <springframework.version>6.1.12</springframework.version>
     <!--  Quality assurance  -->

From 7c2ebfe469ed03a05926ac5cf48075a92278d7eb Mon Sep 17 00:00:00 2001
From: I538344 <charles.dubois@sap.com>
Date: Wed, 28 Aug 2024 13:19:02 +0200
Subject: [PATCH 2/4] Removed surefire plugin

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index bddd6e0a7..2ea844c90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@
     <spotless.version>2.43.0</spotless.version>
     <checkstyle.version>10.18.0</checkstyle.version>
     <system-stubs.version>2.1.3</system-stubs.version>
-    <surefire.version>3.4.0</surefire.version>
     <system-stubs.version>2.1.3</system-stubs.version>
     <springframework.version>6.1.12</springframework.version>
     <!--  Quality assurance  -->
@@ -413,11 +412,6 @@ https://gitbox.apache.org/repos/asf?p=maven-pmd-plugin.git;a=blob_plain;f=src/ma
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-      </plugin>
     </plugins>
   </build>
 </project>

From bce2af4c3d8b3dd1bba1af2fde423f30ef8de259 Mon Sep 17 00:00:00 2001
From: I538344 <charles.dubois@sap.com>
Date: Wed, 28 Aug 2024 13:22:35 +0200
Subject: [PATCH 3/4] Revert "Removed surefire plugin"

This reverts commit 7c2ebfe469ed03a05926ac5cf48075a92278d7eb.
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2ea844c90..bddd6e0a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
     <spotless.version>2.43.0</spotless.version>
     <checkstyle.version>10.18.0</checkstyle.version>
     <system-stubs.version>2.1.3</system-stubs.version>
+    <surefire.version>3.4.0</surefire.version>
     <system-stubs.version>2.1.3</system-stubs.version>
     <springframework.version>6.1.12</springframework.version>
     <!--  Quality assurance  -->
@@ -412,6 +413,11 @@ https://gitbox.apache.org/repos/asf?p=maven-pmd-plugin.git;a=blob_plain;f=src/ma
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+      </plugin>
     </plugins>
   </build>
 </project>

From 899fb99f1cfb9292e9b03ce8c68151066ab231e6 Mon Sep 17 00:00:00 2001
From: I538344 <charles.dubois@sap.com>
Date: Wed, 28 Aug 2024 13:23:31 +0200
Subject: [PATCH 4/4] Added comment

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index bddd6e0a7..10fd04773 100644
--- a/pom.xml
+++ b/pom.xml
@@ -414,6 +414,7 @@ https://gitbox.apache.org/repos/asf?p=maven-pmd-plugin.git;a=blob_plain;f=src/ma
         </configuration>
       </plugin>
       <plugin>
+        <!-- Needed because GitHub actions uses an old Maven version <3.9.0 -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire.version}</version>