From 8610b80f4661635d56dcdfbcfb8256719d528249 Mon Sep 17 00:00:00 2001
From: Siddartha Sachidanand <siddartha.sachidanand@harman.com>
Date: Mon, 2 Feb 2026 09:08:18 +0000
Subject: [PATCH 1/3] Upgrade Spring to 7.0.3 and Spring Boot to 4.0.2

---
 pom.xml                                       | 11 +++++-----
 .../config/PostgresDbConfigRefreshTest.java   | 22 ++++++++++++++++---
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7924c63..e74d2ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.ecsp</groupId>
 	<artifactId>sql-dao</artifactId>
-	<version>1.2.2</version>
+	<version>1.3.SPRING-SNAPSHOT</version>
 	
 	<name>SQL DAO Library</name>
 	<description>DAO framework for SQL databases</description>
@@ -82,18 +82,19 @@
 	<properties>
 		<maven.surefire.version>2.22.0</maven.surefire.version>
 		<commons.lang3.version>3.13.0</commons.lang3.version>
-		<utils.version>1.1.0</utils.version>
+		<utils.version>1.2.SPRING-SNAPSHOT</utils.version>
 		<java.version>17</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<hikaricp.version>5.0.1</hikaricp.version>
 		<awaitility.version>4.3.0</awaitility.version>
 		<prometheus.client.version>0.6.0</prometheus.client.version>
-		<spring.boot.version>3.2.5</spring.boot.version>
+		<spring.boot.version>4.0.2</spring.boot.version>
+		<springboot.aop>3.5.10</springboot.aop>
 		<lombok.version>1.18.28</lombok.version>
 		<postgres.version>42.7.3</postgres.version>
 		<dropwizard.version>4.2.19</dropwizard.version>
-		<spring.version>6.1.14</spring.version>
+		<spring.version>7.0.3</spring.version>
 		<jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
 		<license-tool-plugin.version>1.1.0</license-tool-plugin.version>
         <install-plugin.version>3.1.1</install-plugin.version>
@@ -219,7 +220,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-aop</artifactId>
-			<version>${spring.boot.version}</version>
+			<version>${springboot.aop}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java b/src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java
index 92c7a10..dfc099e 100644
--- a/src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java
+++ b/src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java
@@ -49,10 +49,13 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.mockito.Mockito;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import io.prometheus.client.CollectorRegistry;
@@ -68,7 +71,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {PostgresDbConfig.class, DefaultPostgresDbCredentialsProvider.class,
-            SqlDaoApplication.class })
+            SqlDaoApplication.class, PostgresDbConfigRefreshTest.TestConfig.class })
 @TestPropertySource("/application-dao-refresh-test.properties")
 class PostgresDbConfigRefreshTest {
 
@@ -81,7 +84,7 @@ class PostgresDbConfigRefreshTest {
     @Qualifier("targetDataSources")
     private Map<String, DataSource> targetDataSources;
     
-    @SpyBean
+    @Autowired
     private PostgresDbConfig config;
     
     /** The postgresql container. */
@@ -124,4 +127,17 @@ static void tearUpPostgresServer() {
         CollectorRegistry.defaultRegistry.clear();
         postgresqlContainer.stop();
     }
+
+    /**
+     * Test configuration to create a spy of PostgresDbConfig.
+     */
+    @TestConfiguration
+    static class TestConfig {
+        
+        @Bean
+        @Primary
+        public PostgresDbConfig postgresDbConfig(PostgresDbConfig realConfig) {
+            return Mockito.spy(realConfig);
+        }
+    }
 }

From 28df2bfa1b298431aeb477800039f29eaeaf5aaf Mon Sep 17 00:00:00 2001
From: Siddartha Sachidanand <siddartha.sachidanand@harman.com>
Date: Mon, 2 Feb 2026 09:11:32 +0000
Subject: [PATCH 2/3] Included maven central snapshot repo for pulling snapshot
 dependencies

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

diff --git a/pom.xml b/pom.xml
index e74d2ce..c1a8a05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,19 @@
         </sonar.coverage.exclusions>
 	</properties>
 
+    <repositories>
+        <repository>
+                <id>org.sonatype.central</id>
+                <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+                <releases>
+                    <enabled>false</enabled>
+                </releases>
+                <snapshots>
+                    <enabled>true</enabled>
+                </snapshots>
+        </repository>
+    </repositories>
+	
     <pluginRepositories>
         <pluginRepository>
             <id>dash-licenses-releases</id>

From ccf17c5a604d6bd028abb3459101d0614a8330ac Mon Sep 17 00:00:00 2001
From: Siddartha Sachidanand <siddartha.sachidanand@harman.com>
Date: Tue, 10 Feb 2026 08:06:40 +0000
Subject: [PATCH 3/3] Pom verion updated

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

diff --git a/pom.xml b/pom.xml
index c1a8a05..6d00ab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.ecsp</groupId>
 	<artifactId>sql-dao</artifactId>
-	<version>1.3.SPRING-SNAPSHOT</version>
+	<version>1.3-SNAPSHOT</version>
 	
 	<name>SQL DAO Library</name>
 	<description>DAO framework for SQL databases</description>