From d74fdf91c52298be683b5bba1b1681e943d6139b Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 5 Dec 2025 04:05:07 +0000
Subject: [PATCH 1/2] Use parent pom 5.28 and latest plugin BOM

Need parent pom 5.24 or newer to compile with Java 25.
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5cf11d2..84e1528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>5.9</version>
+        <version>5.28</version>
         <relativePath />
     </parent>
 
@@ -61,7 +61,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>4228.v0a_71308d905b_</version>
+                <version>5054.v620b_5d2b_d5e6</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

From 84db36fdae9ffb3c966e30d3fc1cc14b4a954c88 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 5 Dec 2025 04:05:57 +0000
Subject: [PATCH 2/2] Test with Java 25 and Java 21

Java 25 released September 16, 2025.  The Jenkins project wants to support
Java 25 soon.  Compile and test on ci.jenkins.io with Java 25 and Java 21.

Intentionally continues to generate Java 17 byte code as configured by
the plugin parent pom.

Does not compile or test with Java 17 any longer because we have found no
issues in the past that were specific to the Java 17 compiler.  The plan
is to drop support for Java 17 in the not too distant future so that the
Jenkins project is only supporting two major Java versions at a time,
Java 21 and Java 25.

Testing done:

* Confirmed that automated tests pass with Java 25
---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8a2983d..347471d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,6 +6,6 @@ buildPlugin(
   forkCount: '1C', // run this number of tests in parallel for faster feedback.  If the number terminates with a 'C', the value will be multiplied by the number of available CPU cores
   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
-    [platform: 'linux', jdk: 21],
-    [platform: 'windows', jdk: 17],
-])
\ No newline at end of file
+    [platform: 'linux', jdk: 25],
+    [platform: 'windows', jdk: 21],
+])