Merge branch 'master' into add-experimental-plugin-manager

Author: janfaracik

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,6 +24,16 @@ For frontend changes, include screenshots of the relevant page(s) before and aft
 For refactoring and code cleanup changes, exercise the code before and after the change and verify the behavior remains the same.
 -->
 
+### Screenshots (UI changes only)
+
+<!--
+If your change involves a UI change, please include screenshots showing the before and after states.
+-->
+
+#### Before
+
+#### After
+
 ### Proposed changelog entries
 
 - human-readable text

.github/renovate.json

@@ -1,16 +1,9 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:recommended", ":semanticCommitsDisabled"],
+  "extends": ["github>jenkinsci/renovate-config", "schedule:daily"],
   "prHourlyLimit": 0,
   "prConcurrentLimit": 0,
-  "postUpdateOptions": ["yarnDedupeHighest"],
   "packageRules": [
-    {
-      "matchDatasources": ["npm"],
-      "addLabels": ["javascript"],
-      "minimumReleaseAge": "3 days",
-      "reviewers": ["team:sig-ux"]
-    },
     {
       "description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned",
       "matchManagers": ["maven"],
@@ -82,13 +75,6 @@
       "datasourceTemplate": "docker",
       "versioningTemplate": "loose"
     },
-    {
-      "customType": "regex",
-      "managerFilePatterns": ["/.gitpod/Dockerfile/"],
-      "matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
-      "depNameTemplate": "org.apache.maven:maven-core",
-      "datasourceTemplate": "maven"
-    },
     {
       "customType": "regex",
       "managerFilePatterns": ["/core/src/site/site.xml/"],
@@ -111,15 +97,5 @@
       "datasourceTemplate": "maven"
     }
   ],
-  "labels": ["dependencies", "skip-changelog"],
-  "rebaseWhen": "conflicted",
-  "ignorePaths": [
-    "**/node_modules/**",
-    "**/bower_components/**",
-    "**/vendor/**",
-    "**/examples/**",
-    "**/__tests__/**",
-    "**/tests/**",
-    "**/__fixtures__/**"
-  ]
+  "labels": ["dependencies", "skip-changelog"]
 }

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

@@ -17,7 +17,7 @@ jobs:
           discourse-author-username: jenkins-release-bot
           discourse-category: 23
       - name: Post on mailing list
-        uses: dawidd6/action-send-mail@6d98ae34d733f9a723a9e04e94f2f24ba05e1402 # v6
+        uses: dawidd6/action-send-mail@6e71c855c9a091d80a519621b9fd3e8d252ca40c # v7
         with:
           server_address: smtp.gmail.com
           server_port: 465

.github/workflows/changelog.yml

@@ -24,7 +24,7 @@ jobs:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Generate GitHub Release Draft
         id: release-drafter
-        uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
+        uses: release-drafter/release-drafter@267d2e0268deae5d44f3ba5029dd4d6e85f9d52d # v6.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Generates a YAML changelog file using https://github.com/jenkinsci/jenkins-core-changelog-generator

.github/workflows/label-lts-prs.yaml .github/workflows/label-lts-prs.yml.github/workflows/label-lts-prs.yaml renamed to .github/workflows/label-lts-prs.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Set up JDK 21
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e #v 5.0.0
+        uses: actions/setup-java@d81c4e45f3ac973cc936d79104023e20054ba578 #v 5.0.0
         with:
           distribution: "temurin"
           java-version: 21
@@ -136,7 +136,7 @@ jobs:
           REPO=rpm
           if [ ${IS_LTS} = 'true' ]
           then
-            REPO=redhat-stable
+            REPO=rpm-stable
             FILE_NAME=jenkins-${PROJECT_VERSION}-1.1.noarch.rpm
           fi
 

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

@@ -9,8 +9,8 @@ This page provides information about contributing code to the Jenkins core codeb
 1. Fork the repository on GitHub
 2. Clone the forked repository to your machine
 3. Install the necessary development tools. In order to develop Jenkins, you need the following:
-   - Java Development Kit (JDK) 17 or 21.
-     In the Jenkins project we usually use [Eclipse Temurin](https://adoptium.net/) or [OpenJDK](https://openjdk.java.net/), but you can use other JDKs as well.
+   - Java Development Kit (JDK) 21 or 25.
+     In the Jenkins project we usually use [Eclipse Temurin](https://adoptium.net/) or [OpenJDK](https://openjdk.org/), but you can use other JDKs as well.
    - Apache Maven 3.9.6 or above. You can [download Maven here](https://maven.apache.org/download.cgi).
      In the Jenkins project we usually use the most recent Maven release.
    - Any IDE which supports importing Maven projects.
@@ -83,16 +83,6 @@ Open another terminal and start a [webpack](https://webpack.js.org/) dev server,
 yarn start
 ```
 
-### Gitpod
-
-You can open this project as a [Gitpod workspace](https://www.gitpod.io/) which comes pre-configured with all the tools you will need.
-You can use IntelliJ IDEA (preferred) or VS Code (alternate) in the browser.
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/jenkinsci/jenkins)
-
-If you prefer using IntelliJ IDEA, you can setup Gitpod integration with JetBrains Gateway using the instructions on [gitpod.io](https://www.gitpod.io/docs/ides-and-editors/intellij),
-which will open the workspace in IntelliJ IDEA using JetBrains Gateway.
-
 ### Linting
 
 For linting we use a number of tools:

.gitpod.yml

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6483.vecb_7d34edb_75
+export ATH_VERSION=6518.v018e9d499cf2
 
 if [[ $# -eq 0 ]]; then
 	export JDK=21