From 006632282a1d654b7f2d38a6797e03040cfce72d Mon Sep 17 00:00:00 2001
From: Andrew Bell <115623869+andybharness@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:30:24 +0100
Subject: [PATCH 1/2] feat: [FFM-12612]: Fix build to work with Java 25

---
 build.gradle    | 5 ++++-
 settings.gradle | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8c1a228d..a08303e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,8 +42,11 @@ allprojects {
         resolutionStrategy {
             // version overrides for CVE fixes
             force 'org.apache.commons:commons-lang3:3.18.0' // CVE-2025-48924
-            force "ch.qos.logback:logback-classic:1.3.15" // CVE-2024-12798, CVE-2024-12801
+            force 'ch.qos.logback:logback-classic:1.3.15' // CVE-2024-12798, CVE-2024-12801
             force 'com.google.code.gson:gson:2.13.1' // CVE-2025-53864
+
+            // JDK 25 fix for spotless plugin
+            force 'com.google.googlejavaformat:google-java-format:1.27.0'
         }
     }
 
diff --git a/settings.gradle b/settings.gradle
index 354a66d1..0ab48199 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -38,7 +38,7 @@ dependencyResolutionManagement {
             // do not upgrade openapi, doing so will break compatibility with customers using SpringBoot 2.5.x
             // (newer 5.x.x generators use APIs not present in okhttp 3.14.9)
             version('openapi.generator', '4.3.1')
-            version('spotless', '7.1.0')
+            version('spotless', '7.2.1')
             version('depsize', '0.2.0')
             version('spotbugs', '6.2.3')
             version('depcheck', '12.1.3')

From f78c8cd002445e07615441c468ef1eb0a4374cc5 Mon Sep 17 00:00:00 2001
From: Andrew Bell <115623869+andybharness@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:40:37 +0100
Subject: [PATCH 2/2] fix github action

---
 .github/workflows/ci_gradle.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci_gradle.yml b/.github/workflows/ci_gradle.yml
index 3939773b..d6a75f37 100644
--- a/.github/workflows/ci_gradle.yml
+++ b/.github/workflows/ci_gradle.yml
@@ -25,14 +25,12 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
+    - name: Setup Java
+      uses: actions/setup-java@v4
       with:
-        java-version: '11'
         distribution: 'temurin'
+        java-version: 17
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
-      with:
-        arguments: build
-        gradle-version: 8.5
-
+      run: ./gradlew build