From 494993f5e95b8a82518e1620b08cabbc1a14d083 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 4706173e79..242421fa24 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java_version: [11, 17, 21]
+        java_version: [11, 17, 21, 25]
         os:
         - ubuntu-latest
     env:

From 2073f8bf55d75eda296b2a1963775fa81f44a430 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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3fbcf128e0..85971bd414 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,6 +151,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>
@@ -165,6 +168,7 @@
                             <compilerArgs>
                                 <arg>-Xlint:all</arg>
                                 <arg>-XDcompilePolicy=simple</arg>
+                                <arg>--should-stop=ifError=FLOW</arg>
                                 <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/target/generated-sources/.*</arg>
                                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
                                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>