From af973bcc99dfae2ce8a7029afd07007bdb702aa6 Mon Sep 17 00:00:00 2001
From: Siddartha Sachidanand <siddartha.sachidanand@harman.com>
Date: Tue, 10 Feb 2026 07:43:52 +0000
Subject: [PATCH 1/4] Update pom version

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

diff --git a/pom.xml b/pom.xml
index 23a9cf9..7a6eb76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.eclipse.ecsp</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.SPRING-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
 	
     <name>Utils</name>
     <description>Utility library for ECSP project</description>

From 31094e069568094b263df7e9cda68c6e7b43ac85 Mon Sep 17 00:00:00 2001
From: Siddartha Sachidanand <siddartha.sachidanand@harman.com>
Date: Mon, 16 Feb 2026 07:27:23 +0000
Subject: [PATCH 2/4] maven-surefire-plugin update with junit fix

---
 pom.xml                                                   | 8 ++++----
 .../ecsp/diagnostic/PropertyDiagnosticReporterTest.java   | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a6eb76..9e1cafa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.eclipse.ecsp</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2.SPRING-SNAPSHOT</version>
 	
     <name>Utils</name>
     <description>Utility library for ECSP project</description>
@@ -103,7 +103,7 @@
         </jacoco.ut.execution.data.file>
         <logback.version>1.5.5</logback.version>
         <prometheus.client.version>0.6.0</prometheus.client.version>
-        <maven.surefire.version>2.18.1</maven.surefire.version>
+        <maven.surefire.version>3.5.4</maven.surefire.version>
         <spring.version>7.0.3</spring.version>
         <mockito.version>3.12.4</mockito.version>
         <springboot.version>4.0.2</springboot.version>
@@ -324,8 +324,8 @@
                     <argLine>-Xmx2G
                         ${surefireArgLine}
                     </argLine>
-                    <forkMode>pertest</forkMode>
-                    <childDelegation>true</childDelegation>
+                    <reuseForks>false</reuseForks>
+                    <forkCount>1</forkCount>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/test/java/org/eclipse/ecsp/diagnostic/PropertyDiagnosticReporterTest.java b/src/test/java/org/eclipse/ecsp/diagnostic/PropertyDiagnosticReporterTest.java
index ef2b30b..cc64137 100644
--- a/src/test/java/org/eclipse/ecsp/diagnostic/PropertyDiagnosticReporterTest.java
+++ b/src/test/java/org/eclipse/ecsp/diagnostic/PropertyDiagnosticReporterTest.java
@@ -41,6 +41,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -55,6 +56,7 @@
 @TestPropertySource(
         locations = {"classpath:property-diagnostic-test.properties", "classpath:property-diagnostic-test-2.properties"}
 )
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class PropertyDiagnosticReporterTest {
 
     @Autowired

From d68a7602a296e02288981e454fd4d557d7c0dea7 Mon Sep 17 00:00:00 2001
From: Siddartha Sachidanand <siddartha.sachidanand@harman.com>
Date: Tue, 17 Feb 2026 14:03:17 +0000
Subject: [PATCH 3/4] Renamed spring-boot-starter-aop to
 spring-boot-starter-aspectj as part of spring boot upgrade

---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9e1cafa..1f27e5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,6 @@
         <spring.version>7.0.3</spring.version>
         <mockito.version>3.12.4</mockito.version>
         <springboot.version>4.0.2</springboot.version>
-        <springboot.aop>3.5.10</springboot.aop>
         <spring.boot.autoconfigure>4.0.2</spring.boot.autoconfigure>
         <snakeyaml.version>2.0</snakeyaml.version>
         <sonar.coverage.exclusions>
@@ -134,8 +133,8 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-            <version>${springboot.aop}</version>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
+            <version>${springboot.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>

From 602b7c9ac2417439d810492fabf2b14d93e5055e Mon Sep 17 00:00:00 2001
From: Siddartha Sachidanand <siddartha.sachidanand@harman.com>
Date: Tue, 24 Feb 2026 12:55:45 +0000
Subject: [PATCH 4/4] Upgrade Spring boot to 4.0.3 and Spring to 7.0.5

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

diff --git a/pom.xml b/pom.xml
index 1f27e5a..dac93ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,10 +104,10 @@
         <logback.version>1.5.5</logback.version>
         <prometheus.client.version>0.6.0</prometheus.client.version>
         <maven.surefire.version>3.5.4</maven.surefire.version>
-        <spring.version>7.0.3</spring.version>
+        <spring.version>7.0.5</spring.version>
         <mockito.version>3.12.4</mockito.version>
-        <springboot.version>4.0.2</springboot.version>
-        <spring.boot.autoconfigure>4.0.2</spring.boot.autoconfigure>
+        <springboot.version>4.0.3</springboot.version>
+        <spring.boot.autoconfigure>4.0.3</spring.boot.autoconfigure>
         <snakeyaml.version>2.0</snakeyaml.version>
         <sonar.coverage.exclusions>
             src/main/java/org/eclipse/ecsp/utils/logger/IgniteCallerDataConverter.java,