Feature/java 25 upgrade

.github/workflows/dependencies-update.yaml

@@ -16,10 +16,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'zulu'
           cache: maven
 

.github/workflows/maven-build.yml

@@ -19,10 +19,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 25
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '25'
         distribution: 'zulu'
 
     - name: Build with Maven
@@ -56,10 +56,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'zulu'
           server-id: github
           settings-path: ${{ github.workspace }}

.github/workflows/maven-deploy.yml

@@ -40,10 +40,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '25'
           distribution: 'zulu'
           settings-path: ${{ github.workspace }}
 

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.2.2-java-25-SNAPSHOT</version>
 
 	<name>SQL DAO Library</name>
 	<description>DAO framework for SQL databases</description>
@@ -67,6 +67,11 @@
             <name>Kaushal Arora</name>
             <email>kaushal.arora@harman.com</email>
         </developer>
+        <developer>
+            <id>ihussainbadshah</id>
+            <name>Hussain Badshah</name>
+            <email>hussain.badshah@harman.com</email>
+        </developer>
     </developers>
 
     <issueManagement>
@@ -80,27 +85,28 @@
     </organization>
 
 	<properties>
-		<maven.surefire.version>2.22.0</maven.surefire.version>
+		<maven.surefire.version>3.5.2</maven.surefire.version>
 		<commons.lang3.version>3.13.0</commons.lang3.version>
-		<utils.version>1.1.0</utils.version>
-		<java.version>17</java.version>
+		<utils.version>1.2-java-25-SNAPSHOT</utils.version>
+		<java.version>25</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>
-		<lombok.version>1.18.28</lombok.version>
+        <testcontainers.version>2.0.3</testcontainers.version>
+		<spring.boot.version>4.0.2</spring.boot.version>
+		<lombok.version>1.18.42</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>
         <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-		<sonar.java.source>17</sonar.java.source>
+		<sonar.java.source>25</sonar.java.source>
 		<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 		<sonar.language>java</sonar.language>
 		<checkstyle.version>10.13.0</checkstyle.version>
@@ -132,17 +138,30 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <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>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>postgresql</artifactId>
-			<version>1.19.6</version>
+			<artifactId>testcontainers-postgresql</artifactId>
+			<version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<version>1.19.6</version>
+			<artifactId>testcontainers-junit-jupiter</artifactId>
+			<version>${testcontainers.version}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -200,7 +219,7 @@
 				</exclusion>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-aop</artifactId>
+					<artifactId>spring-boot-starter-aspectj</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.mongodb</groupId>
@@ -218,7 +237,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
+			<artifactId>spring-boot-starter-aspectj</artifactId>
 			<version>${spring.boot.version}</version>
 		</dependency>
 		<dependency>
@@ -309,9 +328,9 @@
 			<version>${prometheus.client.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>1.2</version>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>3.0.0</version>
 		</dependency>
 	</dependencies>
 
@@ -320,10 +339,16 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.14.0</version>
 				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
+					<release>${java.version}</release>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+							<version>${lombok.version}</version>
+						</path>
+					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
 
@@ -410,7 +435,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.8</version>
+				<version>0.8.14</version>
 				<configuration>
 					<excludes>
 						<exclude>org/eclipse/ecsp/sql/dao/constants/CredentialsConstants.class</exclude>

src/main/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfig.java

@@ -67,7 +67,7 @@
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;

src/test/java/org/eclipse/ecsp/sql/authentication/DefaultPostgresDbCredentialsProviderTest.java

@@ -51,8 +51,8 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Test for class {@link DefaultPostgresDbCredentialsProvider}.

src/test/java/org/eclipse/ecsp/sql/authentication/DefaultPostgresDbTest.java

@@ -41,7 +41,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * The Class DefaultPostgresDbTest.

src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresConfigJunitTest.java

@@ -53,9 +53,9 @@
 import java.sql.Connection;
 import java.util.Map;
 import javax.sql.DataSource;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 

src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresConnectionsTest.java

@@ -56,8 +56,8 @@
 import java.sql.SQLException;
 import java.util.Map;
 import javax.sql.DataSource;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;

src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigRefreshTest.java

@@ -49,7 +49,7 @@
 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.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -59,7 +59,7 @@
 import javax.sql.DataSource;
 import java.sql.SQLException;
 import java.util.Map;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -81,7 +81,7 @@ class PostgresDbConfigRefreshTest {
     @Qualifier("targetDataSources")
     private Map<String, DataSource> targetDataSources;
 
-    @SpyBean
+    @MockitoSpyBean
     private PostgresDbConfig config;
 
     /** The postgresql container. */

src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbConfigTest.java

@@ -59,9 +59,9 @@
 import javax.sql.DataSource;
 import java.sql.SQLException;
 import java.util.Map;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**

src/test/java/org/eclipse/ecsp/sql/postgress/config/PostgresDbSslConfigTest.java

@@ -55,7 +55,7 @@
 import javax.sql.DataSource;
 import java.sql.SQLException;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 /**
  * Test class for {@link PostgresDbConfig}.
  */

src/test/java/org/eclipse/ecsp/sql/postgress/health/PostgresDbHealthMonitorTest.java

@@ -53,9 +53,9 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import io.prometheus.client.CollectorRegistry;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  *Test class for {@link PostgresDbHealthService}.

src/test/java/org/eclipse/ecsp/sql/postgress/health/PostgresDbHealthMonitorUnitTest.java

@@ -51,7 +51,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.test.util.ReflectionTestUtils;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

src/test/java/org/eclipse/ecsp/sql/postgress/health/PostgresDbHealthTest.java

@@ -45,7 +45,7 @@
 import org.eclipse.ecsp.sql.dao.constants.PostgresDbConstants;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * class {@link PostgresDbHealthTest}

src/test/java/org/eclipse/ecsp/sql/postgress/metrics/IgnitePostgresDbMetricsExporterTest.java

@@ -53,8 +53,8 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import io.prometheus.client.CollectorRegistry;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 /**
  * Test class for {@link IgnitePostgresDbMetricsExporter}.

src/test/java/org/eclipse/ecsp/sql/postgress/metrics/PostgresDbMetricsExporterUnitTest.java

@@ -48,7 +48,7 @@
 import org.mockito.MockitoAnnotations;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;