From c840d44574389fcc2c701cb4e86303475f1cde0c Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Mon, 1 Dec 2025 02:08:25 +0000
Subject: [PATCH 1/4] Use ssh syntax that works well with plugin BOM

Silences a Maven warning.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2b0bd43..0ab5052 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 
   <scm>
     <connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/jenkinsci/${project.artifactId}-plugin.git</developerConnection>
+    <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
     <tag>${scmTag}</tag>
   </scm>

From 8e2eefaa092ad7e93ec093c348ce833fbae714f3 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Mon, 1 Dec 2025 02:09:25 +0000
Subject: [PATCH 2/4] Require Jenkins 2.479.3, not 2.479.1 and use latest
 plugin BOM

Simplify version management in the pom file by using the versions
provided by the plugin BOM.
---
 pom.xml | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0ab5052..6445bdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,7 @@
 
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
     <jenkins.baseline>2.479</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
-
-    <!-- jenkins plugins versions -->
-    <jenkins-env-inject.version>2.3.0</jenkins-env-inject.version>
+    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
 
     <!-- maven plugins versions -->
     <maven-coveralls.version>4.3.0</maven-coveralls.version>
@@ -67,21 +64,10 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3893.v213a_42768d35</version>
+        <version>5054.v620b_5d2b_d5e6</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>authentication-tokens</artifactId>
-        <version>1.119.v50285141b_7e1</version>
-      </dependency>
-      <!-- required to enforce dependency version -->
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>kubernetes-client-api</artifactId>
-        <version>6.10.0-240.v57880ce8b_0b_2</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -142,7 +128,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>envinject</artifactId>
-      <version>${jenkins-env-inject.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 1ae2f1ed24c5eb46d36ff9e9a30b9a5fba3a89b8 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Mon, 1 Dec 2025 02:10:35 +0000
Subject: [PATCH 3/4] Use parent pom 5.28

Need parent pom 5.24 or later in order to compile and test with Java 25.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6445bdc..79f3ae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.7</version>
+    <version>5.28</version>
     <relativePath />
   </parent>
 

From 9f3a9442d1babd76c059674a58614acbcc2dbae5 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Mon, 1 Dec 2025 02:12:04 +0000
Subject: [PATCH 4/4] 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 plugin compiles with Java 25
* Confirmed that many automated tests pass with Java 25
* Rely on ci.jenkins.io to test all configurations
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5b17e8d..64899b6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 // Java versions to test against
-String[] unitTestJdkVersions = [17, 21]
-String integrationJdkVersions = 17
+String[] unitTestJdkVersions = [21, 25]
+String integrationJdkVersions = 21
 
 // Platform to test for
 String[] platforms = [