Merge branch 'master' into move-forkCount-to-Jenkinsfile

.github/workflows/jenkins-security-scan.yml

@@ -7,9 +7,14 @@ on:
     types: [ opened, synchronize, reopened ]
   workflow_dispatch:
 
+permissions:
+  security-events: write
+  contents: read
+  actions: read
+
 jobs:
   security-scan:
     uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
     with:
       java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
-      java-version: 11 # What version of Java to set up for the build.
+      # java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.

.mvn/extensions.xml

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

Jenkinsfile

@@ -1,4 +1,4 @@
 buildPlugin(useContainerAgent: true, forkCount: '1C', configurations: [
-[platform: 'linux', jdk: '11'],
-[platform: 'linux', jdk: '17'],
+[platform: 'linux', jdk: 21],
+[platform: 'linux', jdk: 17],
 ])

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.69</version>
+        <version>4.86</version>
     </parent>
 
     <artifactId>jobConfigHistory</artifactId>
@@ -52,7 +52,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-2.387.x</artifactId>
-                <version>2198.v39c76fc308ca</version>
+                <version>2465.va_e76ed7b_3061</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.jenkins-ci.main</groupId>
             <artifactId>maven-plugin</artifactId>
-            <version>3.22</version>
+            <version>3.23</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>