From 22a61ba131e185b03110416242c2cf329725561f Mon Sep 17 00:00:00 2001
From: hbadshah <Hussain.Badshah@harman.com>
Date: Thu, 5 Feb 2026 08:50:12 +0000
Subject: [PATCH 1/2] Issue #795 - Upgrade to Java 25

---
 pom.xml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 362631c..d642998 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-java-25-SNAPSHOT</version>
 	
     <name>Utils</name>
     <description>Utility library for ECSP project</description>
@@ -64,6 +64,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>
@@ -77,7 +82,7 @@
     </organization>
 	
     <properties>
-        <java.version>17</java.version>
+        <java.version>25</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!--Checkstyle plugin properties -->
         <checkstyle.version>10.13.0</checkstyle.version>
@@ -85,17 +90,17 @@
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 		<install-plugin.version>3.1.1</install-plugin.version>
         <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
-        <maven.checkstyle.version>3.3.1</maven.checkstyle.version>
+        <maven.checkstyle.version>3.6.0</maven.checkstyle.version>
         <checkstyle.config.location>${project.basedir}/checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}/checkstyle-suppressions.xml
         </checkstyle.suppressions.location>
         <sonar.java.checkstyle.reportPaths>${project.build.directory}/checkstyle-result.xml
         </sonar.java.checkstyle.reportPaths>
-        <entities.version>1.1.1</entities.version>
+        <entities.version>1.2-java-25-SNAPSHOT</entities.version>
         <!-- Sonar plugin properties -->
         <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <sonar.java.source>17</sonar.java.source>
-        <sonar.java.target>17</sonar.java.target>
+        <sonar.java.source>25</sonar.java.source>
+        <sonar.java.target>25</sonar.java.target>
         <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco-ut/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
         <sonar.language>java</sonar.language>
@@ -104,10 +109,10 @@
         <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>
-        <spring.version>6.1.14</spring.version>
+        <spring.version>7.0.3</spring.version>
         <mockito.version>3.12.4</mockito.version>
-        <springboot.version>3.3.3</springboot.version>
-        <spring.boot.autoconfigure>3.3.3</spring.boot.autoconfigure>
+        <springboot.version>4.0.0-M2</springboot.version>
+        <spring.boot.autoconfigure>4.0.2</spring.boot.autoconfigure>
         <snakeyaml.version>2.0</snakeyaml.version>
         <sonar.coverage.exclusions>
             src/main/java/org/eclipse/ecsp/utils/logger/IgniteCallerDataConverter.java,
@@ -330,7 +335,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.14</version>
                 <executions>
                     <!-- Prepares the property pointing to the JaCoCo runtime
                         agent which is passed as VM argument when Maven the Surefire plugin is executed. -->

From 7b59e73f38fbf50d458640d866cdb6f71a781801 Mon Sep 17 00:00:00 2001
From: hbadshah <Hussain.Badshah@harman.com>
Date: Thu, 5 Feb 2026 08:53:06 +0000
Subject: [PATCH 2/2] Issue #795 - Upgrade to Java 25

---
 .github/workflows/dependencies-update.yaml | 4 ++--
 .github/workflows/maven-build.yml          | 8 ++++----
 .github/workflows/maven-deploy.yml         | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dependencies-update.yaml b/.github/workflows/dependencies-update.yaml
index e3fd1c5..ca5721a 100644
--- a/.github/workflows/dependencies-update.yaml
+++ b/.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
 
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index e8bbd65..997c497 100644
--- a/.github/workflows/maven-build.yml
+++ b/.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 }}
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
index be51b6d..662287a 100644
--- a/.github/workflows/maven-deploy.yml
+++ b/.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 }}