Merge branch 'master' into search-overhaul

.editorconfig

@@ -1,6 +1,6 @@
 root = true
 
-[*.{jelly, js, less, css, hbs}]
+[*.{js, less, css, hbs}]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Reformatted: https://github.com/jenkinsci/jenkins/pull/6863
+e3fdfa527e4fefb4b37f04c92a2dd87b8a374b75

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,12 @@
-<!-- Comment: 
+<!-- Comment:
 A great PR typically begins with the line below.
 Replace XXXXX with the numeric part of the issue's id you created on JIRA.
 Please note that if you want your changes backported into LTS, you will need to create a JIRA ticket for it. Read https://www.jenkins.io/download/lts/#backporting-process for more.
 -->
+
 See [JENKINS-XXXXX](https://issues.jenkins.io/browse/JENKINS-XXXXX).
 
-<!-- Comment: 
+<!-- Comment:
 If the issue is not fully described in the ticket, add more information here (justification, pull request links, etc.).
 
  * We do not require JIRA issues for minor improvements.
@@ -15,10 +16,10 @@ If the issue is not fully described in the ticket, add more information here (ju
 
 ### Proposed changelog entries
 
-* Entry 1: Issue, Human-readable Text
-* ...
+- Entry 1: Issue, Human-readable Text
+- ...
 
-<!-- Comment: 
+<!-- Comment:
 The changelogs will be integrated by the core maintainers after the merge.
 The changelog entry should be in the imperative mood; e.g., write "do this"/"return that" rather than "does this"/"returns that".
 For examples, see: https://www.jenkins.io/changelog/
@@ -32,9 +33,9 @@ N/A
 
 - [ ] (If applicable) Jira issue is well described
 - [ ] Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change) and are in the imperative mood. [Examples](https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml)
-  * Fill-in the `Proposed changelog entries` section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
+  - Fill-in the `Proposed changelog entries` section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
 - [ ] Appropriate autotests or explanation to why this change has no tests
-- [ ] New public classes, fields, and methods are annotated with `@Restricted` or have `@since TODO` Javadoc, as appropriate. 
+- [ ] New public classes, fields, and methods are annotated with `@Restricted` or have `@since TODO` Javadoc, as appropriate.
 - [ ] New deprecations are annotated with `@Deprecated(since = "TODO")` or `@Deprecated(forRemoval = true, since = "TODO")` if applicable.
 - [ ] New or substantially changed JavaScript is not defined inline and does not call `eval` to ease future introduction of Content-Security-Policy directives (see [documentation on jenkins.io](https://www.jenkins.io/doc/developer/security/csp/)).
 - [ ] For dependency updates: links to external changelogs and, if possible, full diffs
@@ -51,7 +52,7 @@ If you need an accelerated review process by the community (e.g., for critical b
 
 ### Maintainer checklist
 
-Before the changes are marked as `ready-for-merge`: 
+Before the changes are marked as `ready-for-merge`:
 
 - [ ] There are at least 2 approvals for the pull request and no outstanding requests for change
 - [ ] Conversations in the pull request are over OR it is explicit that a reviewer does not block the change

.github/comment-ops.yml

@@ -0,0 +1,7 @@
+commands:
+  label:
+    enabled: true
+  removeLabel:
+    enabled: true
+  reviewer:
+    enabled: true

.github/dependabot.yml

@@ -27,7 +27,6 @@ updates:
       # Log4j 1.2.17 is the final 1.x release.
       - dependency-name: "log4j:log4j"
 
-
       # Here lies technical debt. Exclusions in this section have been triaged
       # and determined to be temporary. Exclusions should be removed from this
       # section once the remaining action items have been completed.
@@ -56,3 +55,13 @@ updates:
       # Contains incompatible API changes and needs compatibility work. See:
       # https://github.com/jenkinsci/jenkins/pull/4224
       - dependency-name: "org.jfree:jfreechart"
+  - package-ecosystem: "maven"
+    directory: "/"
+    target-branch: "stable-2.361"
+    labels:
+      - "into-lts"
+      - "needs-justification"
+    schedule:
+      interval: "daily"
+    # Include only security updates and exclude version updates.
+    open-pull-requests-limit: 0

.github/release-drafter.yml

@@ -10,5 +10,5 @@ template: |
   See https://www.jenkins.io/changelog/ for the official changelogs._
 
   $CHANGES
-  
+
   All contributors: $CONTRIBUTORS

.github/workflows/changelog.yml

@@ -9,8 +9,15 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read
+
 jobs:
   update_draft_release:
+    permissions:
+      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'
     runs-on: ubuntu-latest
     steps:

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

@@ -4,6 +4,9 @@ on:
   release:
     types: [published]
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   determine-version:
     runs-on: ubuntu-latest
@@ -12,11 +15,11 @@ jobs:
       is-lts: ${{ steps.set-version.outputs.is-lts }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: 8
+          distribution: "temurin"
+          java-version: 11
       - name: Set version
         id: set-version
         run: |
@@ -35,6 +38,9 @@ jobs:
           echo "::set-output name=is-lts::${is_lts}"
           echo "::set-output name=project-version::$version"
   war:
+    permissions:
+      contents: write # to upload release asset (actions/upload-release-asset)
+
     runs-on: ubuntu-latest
     needs: determine-version
     steps:
@@ -67,6 +73,9 @@ jobs:
           asset_name: ${{ steps.fetch-war.outputs.file-name }}
           asset_content_type: application/java-archive
   debian:
+    permissions:
+      contents: write # to upload release asset (actions/upload-release-asset)
+
     runs-on: ubuntu-latest
     needs: determine-version
     steps:
@@ -101,6 +110,9 @@ jobs:
           asset_name: ${{ steps.fetch-deb.outputs.file-name }}
           asset_content_type: application/vnd.debian.binary-package
   redhat:
+    permissions:
+      contents: write # to upload release asset (actions/upload-release-asset)
+
     runs-on: ubuntu-latest
     needs: determine-version
     steps:
@@ -136,6 +148,9 @@ jobs:
           asset_name: ${{ steps.fetch-rpm.outputs.file-name }}
           asset_content_type: application/x-redhat-package-manager
   windows:
+    permissions:
+      contents: write # to upload release asset (actions/upload-release-asset)
+
     runs-on: ubuntu-latest
     needs: determine-version
     steps:
@@ -171,6 +186,9 @@ jobs:
           asset_name: ${{ steps.fetch-msi.outputs.file-name }}
           asset_content_type: application/octet-stream
   suse:
+    permissions:
+      contents: write # to upload release asset (actions/upload-release-asset)
+
     runs-on: ubuntu-latest
     needs: determine-version
     steps:
@@ -193,7 +211,7 @@ jobs:
 
           echo $REPO
 
-          wget -q https://get.jenkins.io/${REPO}/jenkins-${PROJECT_VERSION}-1.2.noarch.rpm -O ${OUTPUT_FILE_NAME} 
+          wget -q https://get.jenkins.io/${REPO}/jenkins-${PROJECT_VERSION}-1.2.noarch.rpm -O ${OUTPUT_FILE_NAME}
       - name: Upload Release Asset
         id: upload-suse-rpm
         if: always()

.gitpod.yml

@@ -1,7 +1,7 @@
 tasks:
   - init: |
       mvn -am -pl war,bom -P quick-build clean install
-    command: |      
+    command: |
       mvn -pl war jetty:run -Dhost=0.0.0.0
     name: Run
   - command: gp await-port 8080 && gp url 8080 && gp preview $(gp url 8080)/jenkins/

.prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "endOfLine": "auto",
+  "htmlWhitespaceSensitivity": "ignore"
+}