Merge branch 'jenkinsci:master' into add-token-auth-support

Author: Gagarmel

.gitattributes

@@ -0,0 +1,16 @@
+*.adoc text eol=lf
+*.config text eol=lf
+*.css text eol=lf
+*.groovy text eol=lf
+*.html text eol=lf
+*.java text eol=lf
+*.jelly text eol=lf
+*.js text eol=lf
+*.ls-remote text eol=lf
+*.properties text eol=lf
+*.pub text eol=lf
+*.sh text eol=lf
+*.txt text eol=lf
+*.xml text eol=lf
+*.yaml text eol=lf
+*.yml text eol=lf

.github/dependabot.yml

@@ -5,9 +5,6 @@ updates:
   # Maintain dependencies for maven
   - package-ecosystem: "maven"
     directory: "/"
-    ignore:
-      # Fails plugin bill of materials tests
-      - dependency-name: "org.jenkins-ci.plugins:promoted-builds"
     schedule:
       interval: "weekly"
     labels:

.github/pull_request_template.md

@@ -0,0 +1,21 @@
+name: Jenkins Security Scan
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    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: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.

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

@@ -6,6 +6,6 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/labeler.yml

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

.mvn/extensions.xml

@@ -4,8 +4,9 @@
 */
 buildPlugin(
   forkCount: '1C', // Run a JVM per core in tests
-  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+  // we use Docker for containerized tests
+  useContainerAgent: false,
   configurations: [
-    [platform: 'linux', jdk: 21],
-    [platform: 'windows', jdk: 17],
+    [platform: 'linux', jdk: 25],
+    [platform: 'windows', jdk: 21],
 ])