From 4621b8525c1669242eca035f726b606fee3e95d5 Mon Sep 17 00:00:00 2001
From: Andrea Aime <andrea.aime@gmail.com>
Date: Sun, 28 Sep 2025 17:31:38 +0200
Subject: [PATCH] Adding support for java 25 build

---
 .github/workflows/linux.yml                   | 23 +++++++++++++++++++
 geowebcache/pom.xml                           |  8 +++----
 .../geowebcache/service/wms/WMSTileFuser.java |  6 ++---
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ebdade421..038ab1949 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -54,6 +54,29 @@ jobs:
       run: |
         find .m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
 
+  openjdk25:
+    runs-on: [ubuntu-22.04]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 25
+      uses: actions/setup-java@v3
+      with:
+        java-version: 25
+        distribution: 'temurin'
+    - name: Maven repository caching
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2/repository
+        key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Build with Maven
+      run: mvn -B clean install -Dspotless.apply.skip=true -Dall -T2 --file geowebcache/pom.xml
+    - name: Remove SNAPSHOT jars from repository
+      run: |
+        find .m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
+
+
   QA:
     runs-on: [ubuntu-22.04]
     steps:
diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
index ce896149c..266a22e13 100644
--- a/geowebcache/pom.xml
+++ b/geowebcache/pom.xml
@@ -80,7 +80,7 @@
     <lint>deprecation,unchecked</lint>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <jclouds.version>2.3.0</jclouds.version>
-    <mockito.version>5.15.2</mockito.version>
+    <mockito.version>5.20.0</mockito.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <skipITs>${skipTests}</skipITs>
   </properties>
@@ -193,7 +193,7 @@
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
-        <version>5.5.0</version>
+        <version>5.6.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -397,7 +397,7 @@
         <plugin>
           <groupId>com.diffplug.spotless</groupId>
           <artifactId>spotless-maven-plugin</artifactId>
-          <version>2.43.0</version>
+          <version>3.0.0</version>
         </plugin>
 
         <plugin>
@@ -615,7 +615,7 @@
         <configuration>
           <java>
             <palantirJavaFormat>
-              <version>2.50.0</version>
+              <version>2.74.0</version>
               <formatJavadoc>true</formatJavadoc>
             </palantirJavaFormat>
           </java>
diff --git a/geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSTileFuser.java b/geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSTileFuser.java
index 41bee0b17..9d3d5062b 100644
--- a/geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSTileFuser.java
+++ b/geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSTileFuser.java
@@ -163,7 +163,7 @@ public enum HintsLevel {
         HintsLevel(int numHint, String mode) {
             this.mode = mode;
             switch (numHint) {
-                    // QUALITY HINTS
+                // QUALITY HINTS
                 case 0:
                     hints = new RenderingHints(
                             RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
@@ -180,7 +180,7 @@ public enum HintsLevel {
                     hints.add(new RenderingHints(
                             RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE));
                     break;
-                    // DEFAULT HINTS
+                // DEFAULT HINTS
                 case 1:
                     hints = new RenderingHints(
                             RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_DEFAULT);
@@ -198,7 +198,7 @@ public enum HintsLevel {
                     hints.add(
                             new RenderingHints(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_DEFAULT));
                     break;
-                    // SPEED HINTS
+                // SPEED HINTS
                 case 2:
                     hints = new RenderingHints(
                             RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_SPEED);