From 22e50acbbfe9377b818bcc997f2464aa70d2600b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Nov 2025 20:24:47 +0000
Subject: [PATCH 1/2] Bump io.jenkins.tools.bom:bom-2.479.x

Bumps [io.jenkins.tools.bom:bom-2.479.x](https://github.com/jenkinsci/bom) from 4023.va_eeb_b_4e45f07 to 5054.v620b_5d2b_d5e6.
- [Release notes](https://github.com/jenkinsci/bom/releases)
- [Commits](https://github.com/jenkinsci/bom/commits)

---
updated-dependencies:
- dependency-name: io.jenkins.tools.bom:bom-2.479.x
  dependency-version: 5054.v620b_5d2b_d5e6
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index faf768c8..d4cb7ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>4023.va_eeb_b_4e45f07</version>
+                <version>5054.v620b_5d2b_d5e6</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

From 9731ef5a612ad9aa43dcbcb9854c8be2bdc2e165 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sun, 16 Nov 2025 04:51:53 -0700
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 on ci.jenkins.io 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.

Needs pull request:

* https://github.com/jenkinsci/workflow-durable-task-step-plugin/pull/462

Testing done:

* Confirmed that automated tests pass with Java 25
* Confirmed that DurableTaskStepTest fails on Fedora 43 with Java 21 and Java 25
* Confirmed that DurableTaskStepTest passes on Ubuntu 22.04 with Java 21 and Java 25
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 64fce02c..893f1600 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,6 +7,6 @@ https://github.com/jenkins-infra/pipeline-library/
 buildPlugin(
   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
-    [platform: 'linux', jdk: 21],
-    [platform: 'windows', jdk: 17],
+    [platform: 'linux', jdk: 25],
+    [platform: 'windows', jdk: 21],
 ])