Merge remote-tracking branch 'upstream/master' into tooltip-enter-delay

Author: uhafner

.github/workflows/announce-lts-rc.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   post:
     runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'jenkinsci' }}
     steps:
       - name: Post on Discourse
         uses: roots/discourse-topic-github-release-action@c30dc233349b7c6f24f52fb1c659cc64f13b5474 # v1.0.1

.github/workflows/changelog.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write # to add label to PR (release-drafter/release-drafter)
       contents: write # to create a github release (release-drafter/release-drafter)
 
-    if: github.repository_owner == 'jenkinsci'
+    if: ${{ github.repository_owner == 'jenkinsci' }}
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
@@ -54,7 +54,7 @@ jobs:
           repositories: >-
             ["jenkins.io"]
       - name: Check out
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Publish jenkins.io changelog draft

.github/workflows/label-conflicting-pr.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   main:
-    if: github.event.pull_request.user.login != 'dependabot[bot]'
+    if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' && github.repository_owner == 'jenkinsci' }}
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs

.github/workflows/label-lts-prs.yaml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Check if PR targets LTS branch
         if: startsWith(github.event.pull_request.base.ref, 'stable-')
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/publish-release-artifact.yml

@@ -9,18 +9,19 @@ permissions:
 
 jobs:
   determine-version:
+    if: ${{ github.repository_owner == 'jenkinsci' }}
     runs-on: ubuntu-latest
     outputs:
       project-version: ${{ steps.set-version.outputs.project-version }}
       is-lts: ${{ steps.set-version.outputs.is-lts }}
       is-rc: ${{ steps.set-version.outputs.is-rc }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
         with:
           distribution: "temurin"
-          java-version: 17
+          java-version: 21
           cache: "maven"
       - name: Set version
         id: set-version
@@ -73,7 +74,7 @@ jobs:
           wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
       - name: Upload Release Asset
         id: upload-war
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -108,7 +109,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-deb
         if: always()
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -144,7 +145,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-rpm
         if: always()
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -180,7 +181,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-msi
         if: always()
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -216,7 +217,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-suse-rpm
         if: always()
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/require-changelog-label.yml

@@ -6,6 +6,7 @@ on:
       - "master"
 jobs:
   label:
+    if: ${{ github.repository_owner == 'jenkinsci' }}
     runs-on: ubuntu-latest
     permissions:
       issues: write

.github/workflows/run-since-updater.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'jenkinsci' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Run update-since-todo.py

.mvn/extensions.xml

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

CITATION.cff

@@ -0,0 +1,19 @@
+cff-version: 1.2.0
+title: "Jenkins"
+type: software
+repository-code: "https://github.com/jenkinsci/jenkins"
+url: "https://jenkins.io/"
+authors:
+  - name: "Jenkins contributors"
+    affiliation: "Jenkins project"
+abstract: >-
+  In a nutshell, Jenkins is the leading open-source automation server.
+  Built with Java, it provides over 2,000 plugins to support automating virtually anything,
+  so that humans can spend their time doing things machines cannot.
+keywords:
+  - jenkins
+  - continuous-integration
+  - continuous-delivery
+  - pipelines
+  - automation
+license: MIT

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6319.v9da_e005f2fd2
+export ATH_VERSION=6361.vcb_036a_7ffb_a_5
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17