From c3612ccffd3ee33ffc9fe48ca21156b2c7ebd159 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Fri, 26 Sep 2025 21:09:34 +0200
Subject: [PATCH 1/2] ci: build with Java 25

Add Java 25 to build matrix.
---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3f530d9d56..a95072f24d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java_version: [17, 21]
+        java_version: [17, 21, 25]
         os:
         - ubuntu-latest
     env:

From 33a477fa9b116d83ccb2451fa543367c8b3348f3 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Fri, 26 Sep 2025 21:27:51 +0200
Subject: [PATCH 2/2] build: use ErrorProne 2.42.0 with JDK 17 and later

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

diff --git a/pom.xml b/pom.xml
index c0349d1dce..607719146f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,9 @@
             <activation>
                 <jdk>[17,)</jdk>
             </activation>
+            <properties>
+                <errorprone.version>2.42.0</errorprone.version>
+            </properties>
             <modules>
                 <module>metrics-jetty12</module>
                 <module>metrics-jetty12-ee10</module>