Merge branch 'master' into migrate_to_junit5

Author: strangelookingnerd

.github/workflows/auto-merge-safe-deps.yml

@@ -0,0 +1,9 @@
+name: Automatically approve and merge safe dependency updates
+on:
+- pull_request_target
+permissions:
+  contents: write
+  pull-requests: write
+jobs:
+  auto-merge-safe-deps:
+    uses: jenkins-infra/github-reusable-workflows/.github/workflows/auto-merge-safe-deps.yml@v1

.github/workflows/close-bom-if-passing.yml

@@ -0,0 +1,11 @@
+name: Close BOM update PR if passing
+on:
+  check_run:
+    types:
+    - completed
+permissions:
+  contents: read
+  pull-requests: write
+jobs:
+  close-bom-if-passing:
+    uses: jenkins-infra/github-reusable-workflows/.github/workflows/close-bom-if-passing.yml@v1

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.8</version>
+    <version>1.13</version>
   </extension>
 </extensions>

Jenkinsfile

@@ -1,4 +1,4 @@
 buildPlugin(useContainerAgent: false, configurations: [
-  [ platform: "linux", jdk: "21" ],
-  [ platform: "windows", jdk: "17" ]
+  [ platform: "linux", jdk: "25" ],
+  [ platform: "windows", jdk: "21" ]
 ])

pom.xml

@@ -28,7 +28,7 @@
     <parent>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>plugin</artifactId>
-      <version>5.26</version>
+      <version>6.2108.v08c2b_01b_cf4d</version>
       <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>