From 57d64642be1f6810f964e77f11b7382885d05d0e Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sat, 11 May 2024 00:53:55 +0100
Subject: [PATCH 001/449] Remove 'Disable project' button from project view
 (#9202)

* Update makeDisabled.jelly

* Update ProjectTest.java

* Update ProjectTest.java
---
 .../lib/hudson/project/makeDisabled.jelly          |  9 ---------
 test/src/test/java/hudson/model/ProjectTest.java   | 14 ++++++--------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
index 9eb7f4f6571c..e53f9ab12ad9 100644
--- a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
+++ b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
@@ -41,14 +41,5 @@ THE SOFTWARE.
         </form>
       </div>
     </j:when>
-    <j:otherwise>
-      <div align="right">
-        <form method="post" id="disable-project" action="disable">
-          <l:hasPermission permission="${it.CONFIGURE}">
-            <f:submit value="${%Disable Project}" primary="false" />
-          </l:hasPermission>
-        </form>
-      </div>
-    </j:otherwise>
   </j:choose>
 </j:jelly>
diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java
index 82d9266e0e62..e3f2d84493e3 100644
--- a/test/src/test/java/hudson/model/ProjectTest.java
+++ b/test/src/test/java/hudson/model/ProjectTest.java
@@ -644,15 +644,13 @@ public void testDoDisable() throws Exception {
 
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.withBasicCredentials(user.getId(), "password");
-        HtmlPage p = wc.goTo(project.getUrl());
 
-        List<HtmlForm> forms = p.getForms();
-        for (HtmlForm form : forms) {
-            if ("disable".equals(form.getAttribute("action"))) {
-                j.submit(form);
-            }
-        }
-       assertTrue("Project should be disabled.", project.isDisabled());
+        HtmlPage p = wc.getPage(project, "configure");
+        HtmlForm form = p.getFormByName("config");
+        form.getInputByName("enable").click();
+        j.submit(form);
+
+        assertTrue("Project should be disabled.", project.isDisabled());
     }
 
     @Test

From 53b5e90aa60cebc7d2910b863ab1147ccff8f72e Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Fri, 10 May 2024 18:55:12 -0500
Subject: [PATCH 002/449] [JENKINS-21605] Further reduce number of recorded
 upstream causes (#9248)

* Fix non-determinism in nested cause tests

For deeplyNestedCauses, quickly triggering a jobs with no quiet period
runs the possibility that a job is triggered while it is still in the
queue. Triggering and waiting for the jobs to execute synchronously
avoids this and also simplifies the code.

The broadlyNesstedCauses test suffers from the same problem, but is
additionally not structured in the way the original issue describes to
reproduce the issue. Using the quiet period argument to scheduleBuild2,
we can reliably produce a graph where each build is triggered by the
other two jobs. An additional final job outside of the loop cuts off the
1 second quiet period from the last loop's iteration so that the test is
never waiting for the quiet period of any jobs even though half of the
schedule operations specify one.

* Re-work nested cause trimming algorithm
---
 core/src/main/java/hudson/model/Cause.java    | 18 ++++++++-----
 .../src/test/java/hudson/model/CauseTest.java | 25 ++++++++-----------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java
index 6990dd2b39e0..668587ffc8fc 100644
--- a/core/src/main/java/hudson/model/Cause.java
+++ b/core/src/main/java/hudson/model/Cause.java
@@ -182,6 +182,10 @@ public UpstreamCause(Run<?, ?> up) {
             upstreamCauses = new ArrayList<>();
             Set<String> traversed = new HashSet<>();
             for (Cause c : up.getCauses()) {
+                if (traversed.size() >= MAX_LEAF) {
+                    upstreamCauses.add(new DeeplyNestedUpstreamCause());
+                    break;
+                }
                 upstreamCauses.add(trim(c, MAX_DEPTH, traversed));
             }
         }
@@ -239,14 +243,16 @@ public int hashCode() {
             }
             UpstreamCause uc = (UpstreamCause) c;
             List<Cause> cs = new ArrayList<>();
-            if (depth > 0) {
-                if (traversed.add(uc.upstreamUrl + uc.upstreamBuild)) {
-                    for (Cause c2 : uc.upstreamCauses) {
-                        cs.add(trim(c2, depth - 1, traversed));
+            if (traversed.add(uc.upstreamUrl + uc.upstreamBuild)) {
+                for (Cause c2 : uc.upstreamCauses) {
+                    if (depth <= 0 || traversed.size() >= MAX_LEAF) {
+                        cs.add(new DeeplyNestedUpstreamCause());
+                        break;
                     }
+                    cs.add(trim(c2, depth - 1, traversed));
                 }
-            } else if (traversed.size() < MAX_LEAF) {
-                cs.add(new DeeplyNestedUpstreamCause());
+            } else {
+                traversed.add(uc.upstreamUrl + uc.upstreamBuild + '#' + traversed.size());
             }
             return new UpstreamCause(uc.upstreamProject, uc.upstreamBuild, uc.upstreamUrl, cs);
         }
diff --git a/test/src/test/java/hudson/model/CauseTest.java b/test/src/test/java/hudson/model/CauseTest.java
index 0d4caf54f61b..2484a03c52ed 100644
--- a/test/src/test/java/hudson/model/CauseTest.java
+++ b/test/src/test/java/hudson/model/CauseTest.java
@@ -63,9 +63,9 @@ public class CauseTest {
         FreeStyleProject b = j.createFreeStyleProject("b");
         FreeStyleBuild early = null;
         FreeStyleBuild last = null;
-        List<QueueTaskFuture<FreeStyleBuild>> futures = new ArrayList<>();
         for (int i = 1; i <= 15; i++) {
-            last = recordFuture(b.scheduleBuild2(0, new Cause.UpstreamCause(recordFuture(a.scheduleBuild2(0, last == null ? null : new Cause.UpstreamCause(last)), futures).get())), futures).get();
+            last = j.waitForCompletion(a.scheduleBuild2(0, last == null ? null : new Cause.UpstreamCause(last)).get());
+            last = j.waitForCompletion(b.scheduleBuild2(0, new Cause.UpstreamCause(last)).get());
             if (i == 5) {
                 early = last;
             }
@@ -74,9 +74,6 @@ public class CauseTest {
         assertTrue("keeps full history:\n" + buildXml, buildXml.contains("<upstreamBuild>1</upstreamBuild>"));
         buildXml = new XmlFile(Run.XSTREAM, new File(last.getRootDir(), "build.xml")).asString();
         assertFalse("too big:\n" + buildXml, buildXml.contains("<upstreamBuild>1</upstreamBuild>"));
-        for (QueueTaskFuture<FreeStyleBuild> future : futures) {
-            j.assertBuildStatusSuccess(j.waitForCompletion(future.waitForStart()));
-        }
     }
 
     @Issue("JENKINS-15747")
@@ -88,16 +85,16 @@ public class CauseTest {
         Run<?, ?> last = null;
         for (int i = 1; i <= 10; i++) {
             Cause cause = last == null ? null : new Cause.UpstreamCause(last);
-            QueueTaskFuture<FreeStyleBuild> next1 = recordFuture(a.scheduleBuild2(0, cause), futures);
-            recordFuture(a.scheduleBuild2(0, cause), futures);
-            cause = new Cause.UpstreamCause(next1.get());
-            QueueTaskFuture<FreeStyleBuild> next2 = recordFuture(b.scheduleBuild2(0, cause), futures);
-            recordFuture(b.scheduleBuild2(0, cause), futures);
-            cause = new Cause.UpstreamCause(next2.get());
-            QueueTaskFuture<FreeStyleBuild> next3 = recordFuture(c.scheduleBuild2(0, cause), futures);
-            recordFuture(c.scheduleBuild2(0, cause), futures);
-            last = next3.get();
+            last = j.waitForCompletion(a.scheduleBuild2(0, cause).get());
+            recordFuture(b.scheduleBuild2(1, cause), futures);
+            cause = new Cause.UpstreamCause(last);
+            last = j.waitForCompletion(b.scheduleBuild2(0, cause).get());
+            recordFuture(c.scheduleBuild2(1, cause), futures);
+            cause = new Cause.UpstreamCause(last);
+            last = j.waitForCompletion(c.scheduleBuild2(0, cause).get());
+            recordFuture(a.scheduleBuild2(1, cause), futures);
         }
+        last = j.waitForCompletion(a.scheduleBuild2(0, new Cause.UpstreamCause(last)).get());
         int count = new XmlFile(Run.XSTREAM, new File(last.getRootDir(), "build.xml")).asString().split(Pattern.quote("<hudson.model.Cause_-UpstreamCause")).length;
         assertFalse("too big at " + count, count > 100);
         //j.interactiveBreak();

From 46514cc234734f7524a07d6ce48aa86876618a69 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 10 May 2024 16:55:28 -0700
Subject: [PATCH 003/449] Clean up `executable` package (#9251)

---
 war/src/main/java/executable/Main.java     | 86 ++++++----------------
 war/src/test/java/executable/MainTest.java | 17 ++---
 2 files changed, 28 insertions(+), 75 deletions(-)

diff --git a/war/src/main/java/executable/Main.java b/war/src/main/java/executable/Main.java
index 9812f3d5b9e1..a746a28a4ee6 100644
--- a/war/src/main/java/executable/Main.java
+++ b/war/src/main/java/executable/Main.java
@@ -40,8 +40,8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.MissingResourceException;
@@ -76,8 +76,7 @@ public class Main {
      * This list must remain synchronized with the one in {@code
      * JavaVersionRecommendationAdminMonitor}.
      */
-    private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS =
-            new TreeSet<>(Arrays.asList(11, 17, 21));
+    private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(11, 17, 21));
 
     /**
      * Sets custom session cookie name.
@@ -109,16 +108,15 @@ public class Main {
             // Great!
         } else if (releaseVersion >= SUPPORTED_JAVA_VERSIONS.first()) {
             if (enableFutureJava) {
-                System.err.println(
-                        String.format(
-                                "Running with Java %d from %s, which is not fully supported. "
-                                        + "Continuing because %s is set. "
-                                        + "Supported Java versions are: %s. "
-                                        + "See https://jenkins.io/redirect/java-support/ for more information.",
-                                releaseVersion,
-                                System.getProperty("java.home"),
-                                ENABLE_FUTURE_JAVA_CLI_SWITCH,
-                                SUPPORTED_JAVA_VERSIONS));
+                System.err.printf(
+                        "Running with Java %d from %s, which is not fully supported. "
+                                + "Continuing because %s is set. "
+                                + "Supported Java versions are: %s. "
+                                + "See https://jenkins.io/redirect/java-support/ for more information.%n",
+                        releaseVersion,
+                        System.getProperty("java.home"),
+                        ENABLE_FUTURE_JAVA_CLI_SWITCH,
+                        SUPPORTED_JAVA_VERSIONS);
             } else if (releaseVersion > SUPPORTED_JAVA_VERSIONS.last()) {
                 throw new UnsupportedClassVersionError(
                         String.format(
@@ -152,25 +150,6 @@ public class Main {
         }
     }
 
-    /**
-     * Get the release version of the current JVM.
-     *
-     * @return The release version of the current JVM; e.g., 8, 11, or 17.
-     * @throws NumberFormatException If the release version could not be parsed.
-     */
-    private static int getReleaseVersion() {
-        String version = System.getProperty("java.specification.version");
-        version = version.trim();
-        if (version.startsWith("1.")) {
-            String[] split = version.split("\\.");
-            if (split.length != 2) {
-                throw new NumberFormatException("Invalid Java specification version: " + version);
-            }
-            version = split[1];
-        }
-        return Integer.parseInt(version);
-    }
-
     /**
      * Returns true if the Java runtime version check should not be done, and any version allowed.
      *
@@ -195,7 +174,7 @@ private static boolean hasArgument(@NonNull String argument, @NonNull String[] a
             justification = "User provided values for running the program")
     public static void main(String[] args) throws IllegalAccessException {
         try {
-            verifyJavaVersion(getReleaseVersion(), isFutureJavaEnabled(args));
+            verifyJavaVersion(Runtime.version().feature(), isFutureJavaEnabled(args));
         } catch (UnsupportedClassVersionError e) {
             System.err.println(e.getMessage());
             System.err.println("See https://jenkins.io/redirect/java-support/ for more information.");
@@ -206,12 +185,17 @@ public static void main(String[] args) throws IllegalAccessException {
         //to achieve this use --paramsFromStdIn
         if (hasArgument("--paramsFromStdIn", args)) {
             System.out.println("--paramsFromStdIn detected. Parameters are going to be read from stdin. Other parameters passed directly will be ignored.");
-            String argsInStdIn = readStringNonBlocking(System.in, 131072).trim();
+            String argsInStdIn;
+            try {
+                argsInStdIn = new String(System.in.readNBytes(131072), StandardCharsets.UTF_8).trim();
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
             args = argsInStdIn.split(" +");
         }
         // If someone just wants to know the version, print it out as soon as possible, with no extraneous file or webroot info.
         // This makes it easier to grab the version from a script
-        final List<String> arguments = new ArrayList<>(Arrays.asList(args));
+        final List<String> arguments = new ArrayList<>(List.of(args));
         if (arguments.contains("--version")) {
             System.out.println(getVersion("?"));
             return;
@@ -365,24 +349,6 @@ public static void main(String[] args) throws IllegalAccessException {
         }
     }
 
-    /**
-     * Reads up to maxRead bytes from InputStream if available into a String
-     *
-     * @param in input stream to be read
-     * @param maxToRead maximum number of bytes to read from the in
-     * @return a String read from in
-     */
-    private static String readStringNonBlocking(InputStream in, int maxToRead) {
-        byte[] buffer;
-        try {
-            buffer = new byte[Math.min(in.available(), maxToRead)];
-            in.read(buffer);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-        return new String(buffer);
-    }
-
     private static void trimOffOurOptions(List<String> arguments) {
         arguments.removeIf(arg -> arg.startsWith("--extractedFilesFolder")
                 || arg.startsWith("--pluginroot") || arg.startsWith(ENABLE_FUTURE_JAVA_CLI_SWITCH));
@@ -443,21 +409,13 @@ public static File whoAmI(File directory) {
         myself.deleteOnExit();
         try (InputStream is = Main.class.getProtectionDomain().getCodeSource().getLocation().openStream();
              OutputStream os = new FileOutputStream(myself)) {
-            copyStream(is, os);
+            is.transferTo(os);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
         return myself;
     }
 
-    private static void copyStream(InputStream in, OutputStream out) throws IOException {
-        byte[] buf = new byte[8192];
-        int len;
-        while ((len = in.read(buf)) > 0) {
-            out.write(buf, 0, len);
-        }
-    }
-
     /**
      * Extract a resource from jar, mark it for deletion upon exit, and return its location.
      */
@@ -477,7 +435,7 @@ private static File extractFromJar(String resource, String fileName, String suff
             throw new UncheckedIOException("Jenkins failed to create a temporary file in " + tmpdir + ": " + e, e);
         }
         try (InputStream is = res.openStream(); OutputStream os = new FileOutputStream(tmp)) {
-            copyStream(is, os);
+            is.transferTo(os);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
@@ -524,7 +482,7 @@ private static void deleteWinstoneTempContents(File file) {
 
     /**
      * Determines the home directory for Jenkins.
-     *
+     * <p>
      * People makes configuration mistakes, so we are trying to be nice
      * with those by doing {@link String#trim()}.
      */
diff --git a/war/src/test/java/executable/MainTest.java b/war/src/test/java/executable/MainTest.java
index e690eb3996d0..676cdd5d2986 100644
--- a/war/src/test/java/executable/MainTest.java
+++ b/war/src/test/java/executable/MainTest.java
@@ -1,5 +1,7 @@
 package executable;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import org.junit.jupiter.api.Test;
 
@@ -51,17 +53,10 @@ private static void assertJavaCheckFails(
                     releaseVersion, enableFutureJava);
         }
 
-        // TODO use assertThrows once we drop support for Java 8 in this module
-        boolean failed;
-        try {
-            Main.verifyJavaVersion(releaseVersion, enableFutureJava);
-            failed = false;
-        } catch (UnsupportedClassVersionError error) {
-            failed = true;
-        }
-        if (!failed) {
-            throw new AssertionError(message);
-        }
+        assertThrows(
+                UnsupportedClassVersionError.class,
+                () -> Main.verifyJavaVersion(releaseVersion, enableFutureJava),
+                message);
     }
 
     private static void assertJavaCheckPasses(int releaseVersion, boolean enableFutureJava) {

From e2cace0f1f9c8f1b45bda1539588453e93c9ea46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 17:56:09 -0600
Subject: [PATCH 004/449] Bump eps1lon/actions-label-merge-conflict from 3.0.0
 to 3.0.1 (#9256)

Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases)
- [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/label-conflicting-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/label-conflicting-pr.yml b/.github/workflows/label-conflicting-pr.yml
index 80079296c113..ae90f55bc77d 100644
--- a/.github/workflows/label-conflicting-pr.yml
+++ b/.github/workflows/label-conflicting-pr.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@v3.0.0
+        uses: eps1lon/actions-label-merge-conflict@v3.0.1
         with:
           dirtyLabel: "unresolved-merge-conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

From fea7c82c9678e62851b5a193e3d9e08fb49b46f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 17:56:42 -0600
Subject: [PATCH 005/449] Update dependency sass to v1.77.0 (#9252)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 07fec37bd2ae..d80e680b4745 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.5.11",
     "postcss-scss": "4.0.9",
     "prettier": "3.2.5",
-    "sass": "1.76.0",
+    "sass": "1.77.0",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.5.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index fc38d86a0dec..05f7aa791164 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4391,7 +4391,7 @@ __metadata:
     postcss-preset-env: "npm:9.5.11"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.2.5"
-    sass: "npm:1.76.0"
+    sass: "npm:1.77.0"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6348,16 +6348,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.76.0":
-  version: 1.76.0
-  resolution: "sass@npm:1.76.0"
+"sass@npm:1.77.0":
+  version: 1.77.0
+  resolution: "sass@npm:1.77.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/976baf2c378e104f8d4ffca5375c8aa6f3d24f59d5c0a5db8d68a51f89edce45dedc25cfcd304b309fc8568d146de9e2c6cd189395e97bb2840d39feb13932ff
+  checksum: 10c0/bce0e5f5b535491e4e775045a79f19cbe10d800ef53b5f7698958d2992505d7b124c968169b05a0190842d8e0a24c2aa6d75dfbdd7c213820d9d59e227009c19
   languageName: node
   linkType: hard
 

From a8ceebfa7c98f1bffced783096df66764e050fe7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 11 May 2024 07:54:52 +0100
Subject: [PATCH 006/449] Update dependency node to v20.13.0 (#9261)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index c1ad8601c0eb..3f5ee316b0ee 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -47,7 +47,7 @@ THE SOFTWARE.
     <!-- HTTP listener port -->
     <port>8080</port>
     <mina-sshd-api.version>2.12.1-101.v85b_e08b_780dd</mina-sshd-api.version>
-    <node.version>20.12.2</node.version>
+    <node.version>20.13.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->

From 144e6b1a98fd23cac66f393a0f6c026865357645 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 12 May 2024 15:37:31 +0200
Subject: [PATCH 007/449] Update dependency css-minimizer-webpack-plugin to v7
 (#9255)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   2 +-
 war/yarn.lock    | 391 ++++++++++++++++++++++++-----------------------
 2 files changed, 197 insertions(+), 196 deletions(-)

diff --git a/war/package.json b/war/package.json
index d80e680b4745..d7bf475bb21e 100644
--- a/war/package.json
+++ b/war/package.json
@@ -30,7 +30,7 @@
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.1",
-    "css-minimizer-webpack-plugin": "6.0.0",
+    "css-minimizer-webpack-plugin": "7.0.0",
     "eslint": "9.2.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 05f7aa791164..97cfb92d1118 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1983,7 +1983,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.21, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9":
+"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9":
   version: 0.3.25
   resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
@@ -2952,7 +2952,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colord@npm:^2.9.1, colord@npm:^2.9.3":
+"colord@npm:^2.9.3":
   version: 2.9.3
   resolution: "colord@npm:2.9.3"
   checksum: 10c0/9699e956894d8996b28c686afe8988720785f476f59335c80ce852ded76ab3ebe252703aec53d9bef54f6219aea6b960fb3d9a8300058a1d0c0d4026460cd110
@@ -3063,12 +3063,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-declaration-sorter@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "css-declaration-sorter@npm:7.1.1"
+"css-declaration-sorter@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "css-declaration-sorter@npm:7.2.0"
   peerDependencies:
     postcss: ^8.0.9
-  checksum: 10c0/bea446e441bafde21c3c7b3f7639559311da12eea140db7ee3c61e4f41df455b7b098df107f99bc0cca32a5020841cc94bf8a2d5efb1b383e51f9de478c4816e
+  checksum: 10c0/d8516be94f8f2daa233ef021688b965c08161624cbf830a4d7ee1099429437c0ee124d35c91b1c659cfd891a68e8888aa941726dab12279bc114aaed60a94606
   languageName: node
   linkType: hard
 
@@ -3116,14 +3116,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-minimizer-webpack-plugin@npm:6.0.0":
-  version: 6.0.0
-  resolution: "css-minimizer-webpack-plugin@npm:6.0.0"
+"css-minimizer-webpack-plugin@npm:7.0.0":
+  version: 7.0.0
+  resolution: "css-minimizer-webpack-plugin@npm:7.0.0"
   dependencies:
-    "@jridgewell/trace-mapping": "npm:^0.3.21"
-    cssnano: "npm:^6.0.3"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    cssnano: "npm:^7.0.1"
     jest-worker: "npm:^29.7.0"
-    postcss: "npm:^8.4.33"
+    postcss: "npm:^8.4.38"
     schema-utils: "npm:^4.2.0"
     serialize-javascript: "npm:^6.0.2"
   peerDependencies:
@@ -3141,7 +3141,7 @@ __metadata:
       optional: true
     lightningcss:
       optional: true
-  checksum: 10c0/5ad6690c8700a190851f5dc263ae1086b68f4bfd7eeff715c689c6d1a0742763e7af792fe474854b7ce5ee6d4f2ee4d95b1e0714db32aba5ded69ccbf9aefd30
+  checksum: 10c0/607258ea16b753b42cbcf88b0b20c99406d7f162ad3a4da50ec3e23d1fb652d1304815c0d0c577944256c76dff3df64e1708e5c5e255318694ba8aaba7820ca3
   languageName: node
   linkType: hard
 
@@ -3210,63 +3210,64 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "cssnano-preset-default@npm:6.0.3"
-  dependencies:
-    css-declaration-sorter: "npm:^7.1.1"
-    cssnano-utils: "npm:^4.0.1"
-    postcss-calc: "npm:^9.0.1"
-    postcss-colormin: "npm:^6.0.2"
-    postcss-convert-values: "npm:^6.0.2"
-    postcss-discard-comments: "npm:^6.0.1"
-    postcss-discard-duplicates: "npm:^6.0.1"
-    postcss-discard-empty: "npm:^6.0.1"
-    postcss-discard-overridden: "npm:^6.0.1"
-    postcss-merge-longhand: "npm:^6.0.2"
-    postcss-merge-rules: "npm:^6.0.3"
-    postcss-minify-font-values: "npm:^6.0.1"
-    postcss-minify-gradients: "npm:^6.0.1"
-    postcss-minify-params: "npm:^6.0.2"
-    postcss-minify-selectors: "npm:^6.0.2"
-    postcss-normalize-charset: "npm:^6.0.1"
-    postcss-normalize-display-values: "npm:^6.0.1"
-    postcss-normalize-positions: "npm:^6.0.1"
-    postcss-normalize-repeat-style: "npm:^6.0.1"
-    postcss-normalize-string: "npm:^6.0.1"
-    postcss-normalize-timing-functions: "npm:^6.0.1"
-    postcss-normalize-unicode: "npm:^6.0.2"
-    postcss-normalize-url: "npm:^6.0.1"
-    postcss-normalize-whitespace: "npm:^6.0.1"
-    postcss-ordered-values: "npm:^6.0.1"
-    postcss-reduce-initial: "npm:^6.0.2"
-    postcss-reduce-transforms: "npm:^6.0.1"
-    postcss-svgo: "npm:^6.0.2"
-    postcss-unique-selectors: "npm:^6.0.2"
+"cssnano-preset-default@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "cssnano-preset-default@npm:7.0.1"
+  dependencies:
+    browserslist: "npm:^4.23.0"
+    css-declaration-sorter: "npm:^7.2.0"
+    cssnano-utils: "npm:^5.0.0"
+    postcss-calc: "npm:^10.0.0"
+    postcss-colormin: "npm:^7.0.0"
+    postcss-convert-values: "npm:^7.0.0"
+    postcss-discard-comments: "npm:^7.0.0"
+    postcss-discard-duplicates: "npm:^7.0.0"
+    postcss-discard-empty: "npm:^7.0.0"
+    postcss-discard-overridden: "npm:^7.0.0"
+    postcss-merge-longhand: "npm:^7.0.0"
+    postcss-merge-rules: "npm:^7.0.0"
+    postcss-minify-font-values: "npm:^7.0.0"
+    postcss-minify-gradients: "npm:^7.0.0"
+    postcss-minify-params: "npm:^7.0.0"
+    postcss-minify-selectors: "npm:^7.0.0"
+    postcss-normalize-charset: "npm:^7.0.0"
+    postcss-normalize-display-values: "npm:^7.0.0"
+    postcss-normalize-positions: "npm:^7.0.0"
+    postcss-normalize-repeat-style: "npm:^7.0.0"
+    postcss-normalize-string: "npm:^7.0.0"
+    postcss-normalize-timing-functions: "npm:^7.0.0"
+    postcss-normalize-unicode: "npm:^7.0.0"
+    postcss-normalize-url: "npm:^7.0.0"
+    postcss-normalize-whitespace: "npm:^7.0.0"
+    postcss-ordered-values: "npm:^7.0.0"
+    postcss-reduce-initial: "npm:^7.0.0"
+    postcss-reduce-transforms: "npm:^7.0.0"
+    postcss-svgo: "npm:^7.0.0"
+    postcss-unique-selectors: "npm:^7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d100a1f8ab71adbb6df85e00f4a9e5d04ac06fc50343157eef853aded3f75dd0489dd845a5b2fb43ca701bd88c39c5aa88673f842bc1f94f4318c7b38ced1963
+  checksum: 10c0/bee65239d25de2ba87e85b4091cbc1cac9ba1b57c9f803dff5a71ea8a55a885045805840dd732be284c28cca6343dece37fc76d7096aba37cfa02eff2ee7714c
   languageName: node
   linkType: hard
 
-"cssnano-utils@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "cssnano-utils@npm:4.0.1"
+"cssnano-utils@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "cssnano-utils@npm:5.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/20513a393402f283c85c450ece43d1a6a06a9906b524481043ac203a86888a4ca5cbef878c615a58fdd82a9e870ce62c6f3fea9f51814034a084d8980e17cf96
+  checksum: 10c0/492593fb45151e8622357bb958d0d80475372de38523ef0587d77e9c5f386beb55c30b41f2f3c735a374a230bc61404eb7ae9c2beeab0666afb499442c62ecba
   languageName: node
   linkType: hard
 
-"cssnano@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "cssnano@npm:6.0.3"
+"cssnano@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "cssnano@npm:7.0.1"
   dependencies:
-    cssnano-preset-default: "npm:^6.0.3"
-    lilconfig: "npm:^3.0.0"
+    cssnano-preset-default: "npm:^7.0.1"
+    lilconfig: "npm:^3.1.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d1669eb987fd96159bae262ef2f76c1a64fffefe8fa593918a6bda377977798b60fb4a6a871a9b9a9deb11258130ee254fdb8c3144769b3060ad9f2a95a4ed0a
+  checksum: 10c0/8b17d13efe98ec2db2fbde9ca24e91842b9afe2f80becc5e4271ee1170d77cf73eed3cdc2f35ed51bacdeac763ff85db45ae8e9627a8862bf01d457a819a640e
   languageName: node
   linkType: hard
 
@@ -4375,7 +4376,7 @@ __metadata:
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.1"
-    css-minimizer-webpack-plugin: "npm:6.0.0"
+    css-minimizer-webpack-plugin: "npm:7.0.0"
     eslint: "npm:9.2.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
@@ -4595,10 +4596,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "lilconfig@npm:3.0.0"
-  checksum: 10c0/7f5ee7a658dc016cacf146815e8d88b06f06f4402823b8b0934e305a57a197f55ccc9c5cd4fb5ea1b2b821c8ccaf2d54abd59602a4931af06eabda332388d3e6
+"lilconfig@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "lilconfig@npm:3.1.1"
+  checksum: 10c0/311b559794546894e3fe176663427326026c1c644145be9e8041c58e268aa9328799b8dfe7e4dd8c6a4ae305feae95a1c9e007db3569f35b42b6e1bc8274754c
   languageName: node
   linkType: hard
 
@@ -5306,15 +5307,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "postcss-calc@npm:9.0.1"
+"postcss-calc@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-calc@npm:10.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.11"
+    postcss-selector-parser: "npm:^6.0.16"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.2
-  checksum: 10c0/e0df07337162dbcaac5d6e030c7fd289e21da8766a9daca5d6b2b3c8094bb524ae5d74c70048ea7fe5fe4960ce048c60ac97922d917c3bbff34f58e9d2b0eb0e
+    postcss: ^8.4.38
+  checksum: 10c0/d4d529f2f71b49f17441eed74a7564ccd2779c72ed8648d4bb2530261a27c0ca01fe6a07260e7bf57e55f46dd68dea07e52fd1a6b538db7bc13015124be258a5
   languageName: node
   linkType: hard
 
@@ -5368,29 +5369,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-colormin@npm:6.0.2"
+"postcss-colormin@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-colormin@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
-    colord: "npm:^2.9.1"
+    colord: "npm:^2.9.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/229681f9b89ba0909b4c69563837b0c32cc3d1c17ed1b00c33d4abfb0a0ef455124968e4885b5f92c64482e92074cd1958018ec111ed5d118f1e24baeda19c14
+  checksum: 10c0/d365a5365e0a94748309d32c7208cd06249bc53eb82cc32c771de4073b109fa8552e58d60dbe84d7e69e68081ed8a01fbf645d38a650e90cb2e13b21043cd796
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-convert-values@npm:6.0.2"
+"postcss-convert-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-convert-values@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/882d0b7839ef07ac8ffbf9cb48db0f610939a3496bd0321c7f23096ead676f13e09ab3d9c20ff3dbe2c887e855826051ca7dffeaffce5068cfdc9aaa573a3842
+  checksum: 10c0/5d7cfa06f307e024574a1842016f006691e0c1932352f53a99ce8f2f9930c64c3c1ae17518e9e4e5176630b99f1beaab37bc339bc779fb07dc543670ae66bb21
   languageName: node
   linkType: hard
 
@@ -5448,39 +5449,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-comments@npm:6.0.1"
+"postcss-discard-comments@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-comments@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5e9128ffb8c005081bb0521f5a23cf090e8513d928ed39935504ffde2e335a62a7e1a749c5c7bc2d03f06a8667900d19dd7eed19dfa4273043b5fd760476260d
+  checksum: 10c0/7fef7deea85c1e68161f69057be19a3aedd54d23c9b464c9b1531faa7a115f0c96a4f0ee3a560ce300578599dbc8114fe0fb744208b20b9d2fd8df1b4b39c58a
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-duplicates@npm:6.0.1"
+"postcss-discard-duplicates@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-duplicates@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/b9ea10a3c7528bb1630613c11756f809a95da634822d943fa91b28f2a37787e7cdb9ff96deed9776e2c3753d35e42c8afd5074b630930df7b5150573d4beda23
+  checksum: 10c0/37d568dc18d47b8b9f0fd6d5115b1faf96c2bf429fc4586508a773533479e18627d6260cad6a3ca7d3bfc2f220fd9448410aee40e07f2ec6c6f96bbe3595dbc8
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-empty@npm:6.0.1"
+"postcss-discard-empty@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-empty@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6b95e588a3e8fb262e56bd313060daf29d7c9d44184bb6c4c5858ae81d6cd2907b15b3e3023b6621d50a67cfc10e6077920ff1e908892b207dee29477376498f
+  checksum: 10c0/b54fc9ad59a6015f6b82b8c826717a4a2f82b272608f6ae37a0b568f4f6c503f5ac7d13d415853a946a0422cb37b9fe1d5ddcee91fe0c2086001138710600d8b
   languageName: node
   linkType: hard
 
-"postcss-discard-overridden@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-discard-overridden@npm:6.0.1"
+"postcss-discard-overridden@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-discard-overridden@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/22f9d56e53b90bc0f8e6d1c24d6da6c7c1a9d757644a128a7a4263a5479aaa8eca4ce3bfe9db10358051635ed40e8778a68c3f1831b7163eae10ced001db4a87
+  checksum: 10c0/ca00ed1d4e8793fc780039f235fa2caef123d3aa28cae47cc1472ca03b21386c39fae1f11fbf319dcb94c6bda923824067254c7e20e8b00354b47015dc754658
   languageName: node
   linkType: hard
 
@@ -5595,77 +5596,77 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-merge-longhand@npm:6.0.2"
+"postcss-merge-longhand@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-merge-longhand@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^6.0.2"
+    stylehacks: "npm:^7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/2b3fae51bffc5962258d638bc7f415237593b515f369233e023f0eae5b13116297463c04b8c47a7b7af51cba5faaa7f517b653f6123e51935d670d4d4de5a26d
+  checksum: 10c0/5f814f396a5107dcb5e74c2d4e55ebcd03b9bc2b3619ed7aea63a441854023ce349bc371d30aec1ac33a375139afac02709e7721e055b5e624701ac6576e8a10
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-merge-rules@npm:6.0.3"
+"postcss-merge-rules@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-merge-rules@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
-    cssnano-utils: "npm:^4.0.1"
-    postcss-selector-parser: "npm:^6.0.15"
+    cssnano-utils: "npm:^5.0.0"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c8355db11aa60bedcb1e6535fcd70f6ecec2dadd5c2975d3accf0eedbc92af782ac1f5e91a53866816ce332e4cbf1b94749a9425067935be066bc0c974e30fee
+  checksum: 10c0/d9cb3a4e55db57aa7ba0bb1caefb82db93c8493d2b3db66091dae9d5794ca04729e660115765ff254d0eb960e4db037f6c5b92562b396b05216888d12acc08e0
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-minify-font-values@npm:6.0.1"
+"postcss-minify-font-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-font-values@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/15af236245a6d27f1c83c943ef90d144ca043894bbd86f134506a984811a936a06824739984824965c7c3fd5a0ff4ed299f26a33f3b628662aa4fb40d7536fd0
+  checksum: 10c0/f8be40099a6986d96b9cd2eb9c32a9c681efc6ecd6504c9ab7e01feb9e688c8b9656dfd7f35aa6de2585a86d607f62152ee81d0175e712e4658d184d25f63d58
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-minify-gradients@npm:6.0.1"
+"postcss-minify-gradients@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-gradients@npm:7.0.0"
   dependencies:
-    colord: "npm:^2.9.1"
-    cssnano-utils: "npm:^4.0.1"
+    colord: "npm:^2.9.3"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/e700c3f6dc425072ff739fb18bb71c970599e0d909b326f4a5c84e91cf24c4f1ee78e4d161bd4cdf6e25b7d78f1ad082bb885afdd2a150f9b281520fc6359d5c
+  checksum: 10c0/15d162192b598242e14def81a62e30cf273ab14f1db702c391e6bdd442c570a1aa76fc326874253a2d67f75b4d4fe73ba4f664e85dbff883f24b7090c340bfad
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-minify-params@npm:6.0.2"
+"postcss-minify-params@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-params@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
-    cssnano-utils: "npm:^4.0.1"
+    browserslist: "npm:^4.23.0"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6638460d2be4a2eca8adee8409b70d6c6a19aff8cf93fda1b45c9da627b258b6baaa6acb48f51d26cd287704a235f9c9ae2e4744335b1fd47e163177c33896df
+  checksum: 10c0/28a7ae313a197aeaff8b3fa1e695a6443b11a74258374a05adee6a1b05f5849ef52037b7a5069d6910614b03b4610acdaf4a76f38b89cb42e813a8cb5ec2fc01
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-minify-selectors@npm:6.0.2"
+"postcss-minify-selectors@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-minify-selectors@npm:7.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5437b586c1237fc442e7e6078d4f23c987efc456366368b07a0da67332b04bd55821cedf0441e73e1209689f63139e272d930508e2963ba6e27c46561a661128
+  checksum: 10c0/6baf0ea71b8dfd01bdb5b516d01aa00244c55cad8d9c674358d735cef2a6aca6586dd480d419cc8d3f470e6d2d7d19354592044f19766993caf9800d3d7e0d36
   languageName: node
   linkType: hard
 
@@ -5726,101 +5727,101 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-charset@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-charset@npm:6.0.1"
+"postcss-normalize-charset@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-charset@npm:7.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/8c09eedaf8813123875c65ab35120f14a87d6b9e8d6805fa808e3a714a8f868d15123f34f61e2240d89225f2f5c2bdabbcdf6385ce86b2487370d8994a65a857
+  checksum: 10c0/06d9c4487a4b0e195133a1fb7a115db7014e49d2567cce73e24c59f473f0e65a1999850a726afb3bdb2d36017a3e5c92ac4fd2a7ecc427da4ff79522765fabdd
   languageName: node
   linkType: hard
 
-"postcss-normalize-display-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-display-values@npm:6.0.1"
+"postcss-normalize-display-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-display-values@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d08a92c653fb4f2506e029ceb8e3fdae9bc937fb1a7e80ecde759d02f6d15f69211af384d89d8582b160fd129abd9c77c8c64d75379417098ee5a2ba779e33d3
+  checksum: 10c0/439524e1d3ed36d6265c05da10540e17aa8605e1b396f71ca4364ab3b8b98ca97763c58c211fb9492662429d43613a7fe7009a8638c84a8db327e572c382272a
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-positions@npm:6.0.1"
+"postcss-normalize-positions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-positions@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/bb0267b13c92791543f5e9f94b119a0540e08aa46f600acd73a692cd38d07d2d2fddb11148a81adb58e3f65671eebb05ea38d2ded48f3202b2582f1199aa848e
+  checksum: 10c0/428763c937cd178c8ee544cd93a9d1fef667dc9a8700ffe2e61b0beeea7f64f712492b9aeb8a1ef927ab752ec34be7ddeb23d2b50e4bc6eba02b0e58312b27a7
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-repeat-style@npm:6.0.1"
+"postcss-normalize-repeat-style@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-repeat-style@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/f6e943dbbf9341dd6ce2c9fc6820e8ae2a838d1db84f58f75b1e5c1b8b9d6895d17fb30b320e2189b8747f844713ec687540b5b1d52ccd6c9108d6d35328c659
+  checksum: 10c0/cf7cd9f355fd26f1c9b0c11a923029ac5ea3020520db5a9778dd19c5ee1f48a1f1f368b4ae75fc6b63cb5761eef72333e486ab0de1537b9cb62d213a8c5576d0
   languageName: node
   linkType: hard
 
-"postcss-normalize-string@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-string@npm:6.0.1"
+"postcss-normalize-string@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-string@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/afcdd69522fc3ebafc349c2ef4b62f1e734ade9b6148fd20f2b841477808ac6cf6e5bfbb533c492fdc6bb2184b84be8ebb800a6ae174c4313f87fb0695088cc0
+  checksum: 10c0/8857563f85841ce432bb9a5a9ba129847890b61693adff96d565b69dc2d5456f54dec33f4f6ce5b0abf0a484dbfb0145846d99f988959c5ac875a86a2a180576
   languageName: node
   linkType: hard
 
-"postcss-normalize-timing-functions@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-timing-functions@npm:6.0.1"
+"postcss-normalize-timing-functions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-timing-functions@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c1c81d0dcb2f74fbd69cc45b0b6bd6cde390a0c9df602aabbf3eb2149a49da48e808837e811d22a525ffb036e158e63b4b2cf12c94cf28f2c2f6af858876134e
+  checksum: 10c0/bc5f6999b4c9e28e5be785ef90fe68fd48d44059ecc73ee194c2603260597d685b13a1e1751df9a2cee100fea7abb7e1b1cbcf1a7a428a576961705c9d426788
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-normalize-unicode@npm:6.0.2"
+"postcss-normalize-unicode@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-unicode@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ea696194f65ad31de2a9c022f1946a07c298f04070706d88a20061845e1e052e645c74b5bc785595814db87d14e435f85e968a44855dedc207d8c0b5d43b1aee
+  checksum: 10c0/f2d6ab0076c006dcf3ed33ba30686f2d29e81a408c66acced22e2c942df6d613697ea786137833dd258aafab5fda4d3eb27df13a82df830357dbad9b79154881
   languageName: node
   linkType: hard
 
-"postcss-normalize-url@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-url@npm:6.0.1"
+"postcss-normalize-url@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-url@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/4e3e713a95e01f263feccd041b2b10016a0a09e494c81567f012d1326d9b2d57dc4a68956a820313630370c0ef591bdbb37cc96ed259022559623be179aad436
+  checksum: 10c0/3050e228be48fe0121d1316c267e629b232e8401a547128d142c3dea55eeae1e232c9beeea5c76439009188993b14925c5cf40e3a44856d076a7b8fcf4721f86
   languageName: node
   linkType: hard
 
-"postcss-normalize-whitespace@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-whitespace@npm:6.0.1"
+"postcss-normalize-whitespace@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-normalize-whitespace@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/259c0b7653f033ed14303602a30e458c37dc63ee55f47226b6379a6ea553ca7c9b971d49715b8f3f36a3a06927f6f87d7997c027ad4664af3bca37a5fe30352e
+  checksum: 10c0/8d61234962a4850fc61292592171e1d13de2e90d96a2eaed8c85672a05caceda02a3bd1cb495cb72414741f99d50083362df14923efaca1b3e09657d24cea34b
   languageName: node
   linkType: hard
 
@@ -5833,15 +5834,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-ordered-values@npm:6.0.1"
+"postcss-ordered-values@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-ordered-values@npm:7.0.0"
   dependencies:
-    cssnano-utils: "npm:^4.0.1"
+    cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/2e71f035c90b26d7a8d31e1b716f977532367f75bc76de3318b6ba7b2e1ec43c011cc09e741f59f7d93dff427b7d90a35db0b460d2f171a6f0c6e8c938ef30ad
+  checksum: 10c0/42b14f9518b573318594c2aeb2f13fd1fbe44936d14f1b28a438e7a82644ace9a2946699bebfe7a2d383534dc24e7203c35308d749f3c585a86daa238ad920a4
   languageName: node
   linkType: hard
 
@@ -5957,26 +5958,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-reduce-initial@npm:6.0.2"
+"postcss-reduce-initial@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-reduce-initial@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
+    browserslist: "npm:^4.23.0"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d35ad6f9725cdceb390a97a461e8594df7fbed4c55497c90d07c42f8343bf80139e720eaebc580bf480bf10e92959490aa308af66d8802ba71c327bdf08c93a1
+  checksum: 10c0/ed50cd680ce258df953b82ce9b3fb52564d08548724577810800e236d017d80430cbccb4b1ad38b0f4d521663598e44ab93136b20064231181ef49e1e113ae10
   languageName: node
   linkType: hard
 
-"postcss-reduce-transforms@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-reduce-transforms@npm:6.0.1"
+"postcss-reduce-transforms@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-reduce-transforms@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/de7631302311071d86622166539162e69df506785e3674afab0602c86ed9aa67799e44405b40327f0011d58089d2dc4e2ae481b21812177818e28f9272d350a5
+  checksum: 10c0/b2d4b65e71d38b604b41937850d1d64794964d6eced90f05891cfae8a78c7a9fed49911f51da9dcc5d715ac18e8bc7eacf691f2c5321dfe4d781f3e4442dfea9
   languageName: node
   linkType: hard
 
@@ -6025,7 +6026,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
   version: 6.0.16
   resolution: "postcss-selector-parser@npm:6.0.16"
   dependencies:
@@ -6035,26 +6036,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-svgo@npm:6.0.2"
+"postcss-svgo@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-svgo@npm:7.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
     svgo: "npm:^3.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/db607404d09af256c7957a0ace822d651a00a52a1796da603f93ba3f0a095ac7595e1f624b9dc53f362ab10e382845d7873f485980f9c92fcb86256833f5e835
+  checksum: 10c0/0e724069b5de83aa2b8f8a4746cb60cb663e0a8bbab0e4ba995649cb0562205af57d1f54b89fb90d8ae04a4b7ac3ac6e3751afffc3cff697cb19f7a36b71b195
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-unique-selectors@npm:6.0.2"
+"postcss-unique-selectors@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-unique-selectors@npm:7.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.15"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/a0fe112d1094f90e1bfcfd2174a74b2fd0630a24449e9942923d02956c7d64ea4add5adede53d9efb3f6d40cd388ac150d032a115f6a46b73d5f3d3d26fa1bb7
+  checksum: 10c0/33b532ad0e9271c5a379859e18adfdc72986bb538672cc0fbc06295d824f82dba3f7b57264e18a3214901bc5244ff5408d28b530374d24a088507287c7f520ce
   languageName: node
   linkType: hard
 
@@ -6610,15 +6611,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "stylehacks@npm:6.0.2"
+"stylehacks@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "stylehacks@npm:7.0.0"
   dependencies:
-    browserslist: "npm:^4.22.2"
-    postcss-selector-parser: "npm:^6.0.15"
+    browserslist: "npm:^4.23.0"
+    postcss-selector-parser: "npm:^6.0.16"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/658cac8b28edcb94d1db67808ab3aaa511cb1b9293594fc95607ee42ac4f57e742d9a1fa3ff5d5849db692971dc2a310e9ac1ed0bd4ea4bc48c80f5a6ef823fc
+  checksum: 10c0/c1c0231974ab7922af3a535a9cb78bfe84997767da7defe111cc76d7f10c9e139fe8cb0f9d5bea87b0c0cc0166c82a6ec98a3d6242d7e29ef90adceecfd330ae
   languageName: node
   linkType: hard
 

From ad571f8dec181369de350432cbdaafcf1d01fa47 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 12 May 2024 06:39:20 -0700
Subject: [PATCH 008/449] Clean up file parameter tests (#9260)

---
 .../java/hudson/model/FileParameterValue.java |  7 --
 .../FileParameterValuePersistenceTest.java    | 81 +++++++++++++++++++
 .../src/test/java/hudson/model/QueueTest.java | 68 ----------------
 3 files changed, 81 insertions(+), 75 deletions(-)
 create mode 100644 test/src/test/java/hudson/model/FileParameterValuePersistenceTest.java

diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
index e9e30e63463b..1d9bade1e31c 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -43,7 +43,6 @@
 import jenkins.util.SystemProperties;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemHeaders;
-import org.apache.commons.fileupload.disk.DiskFileItem;
 import org.apache.commons.fileupload.util.FileItemHeadersImpl;
 import org.apache.commons.io.FilenameUtils;
 import org.kohsuke.accmod.Restricted;
@@ -55,12 +54,6 @@
 /**
  * {@link ParameterValue} for {@link FileParameterDefinition}.
  *
- * <h2>Persistence</h2>
- * <p>
- * {@link DiskFileItem} is persistable via serialization,
- * (although the data may get very large in XML) so this object
- * as a whole is persistable.
- *
  * @author Kohsuke Kawaguchi
  */
 public class FileParameterValue extends ParameterValue {
diff --git a/test/src/test/java/hudson/model/FileParameterValuePersistenceTest.java b/test/src/test/java/hudson/model/FileParameterValuePersistenceTest.java
new file mode 100644
index 000000000000..263e60576510
--- /dev/null
+++ b/test/src/test/java/hudson/model/FileParameterValuePersistenceTest.java
@@ -0,0 +1,81 @@
+package hudson.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import hudson.Functions;
+import hudson.tasks.BatchFile;
+import hudson.tasks.Shell;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlPage;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.JenkinsSessionRule;
+
+public class FileParameterValuePersistenceTest {
+
+    private static final String FILENAME = "file.txt";
+    private static final String CONTENTS = "foobar";
+
+    @Rule
+    public JenkinsSessionRule sessions = new JenkinsSessionRule();
+
+    @Rule
+    public TemporaryFolder tmp = new TemporaryFolder();
+
+    @Issue("JENKINS-13536")
+    @Test
+    public void fileParameterValuePersistence() throws Throwable {
+        sessions.then(j -> {
+            FreeStyleProject p = j.createFreeStyleProject("p");
+            p.addProperty(new ParametersDefinitionProperty(new FileParameterDefinition(FILENAME, "The file.")));
+            p.getBuildersList().add(Functions.isWindows() ? new BatchFile("type " + FILENAME) : new Shell("cat " + FILENAME));
+            File test = tmp.newFile();
+            Files.writeString(test.toPath(), CONTENTS, StandardCharsets.UTF_8);
+            try (JenkinsRule.WebClient wc = j.createWebClient()) {
+                // ParametersDefinitionProperty/index.jelly sends a 405
+                wc.setThrowExceptionOnFailingStatusCode(false);
+                HtmlPage page = wc.goTo("job/" + p.getName() + "/build?delay=0sec");
+                assertEquals(405, page.getWebResponse().getStatusCode());
+                HtmlForm form = page.getFormByName("parameters");
+                HtmlInput input = form.getInputByName("file");
+                input.setValue(test.getPath());
+                page = j.submit(form);
+                assertEquals(200, page.getWebResponse().getStatusCode());
+            }
+            FreeStyleBuild b;
+            while ((b = p.getLastBuild()) == null) {
+                Thread.sleep(100);
+            }
+            j.assertBuildStatusSuccess(j.waitForCompletion(b));
+            FileParameterValue fpv = (FileParameterValue) b.getAction(ParametersAction.class).getParameter(FILENAME);
+            fpv.getFile().delete();
+            verifyPersistence(j);
+        });
+        sessions.then(FileParameterValuePersistenceTest::verifyPersistence);
+    }
+
+    private static void verifyPersistence(JenkinsRule j) throws Throwable {
+        FreeStyleProject p = j.jenkins.getItemByFullName("p", FreeStyleProject.class);
+        FreeStyleBuild b = p.getLastBuild();
+        j.assertLogContains(CONTENTS, b);
+        Path saved = b.getRootDir().toPath().resolve("fileParameters").resolve(FILENAME);
+        assertTrue(Files.isRegularFile(saved));
+        assertEquals(CONTENTS, Files.readString(saved, StandardCharsets.UTF_8));
+        assertTrue(b.getWorkspace().child(FILENAME).exists());
+        try (JenkinsRule.WebClient wc = j.createWebClient()) {
+            HtmlPage page = wc.goTo(p.getUrl() + "ws");
+            assertThat(page.getWebResponse().getContentAsString(), containsString(FILENAME));
+        }
+    }
+}
diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java
index 878b04e28df9..fa76fd88ae0d 100644
--- a/test/src/test/java/hudson/model/QueueTest.java
+++ b/test/src/test/java/hudson/model/QueueTest.java
@@ -78,7 +78,6 @@
 import hudson.triggers.SCMTrigger.SCMTriggerCause;
 import hudson.triggers.TimerTrigger.TimerTriggerCause;
 import hudson.util.OneShotEvent;
-import hudson.util.XStream2;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -103,30 +102,17 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.BlockedBecauseOfBuildInProgress;
 import jenkins.model.Jenkins;
 import jenkins.model.queue.QueueIdStrategy;
 import jenkins.security.QueueItemAuthenticatorConfiguration;
 import org.acegisecurity.acls.sid.PrincipalSid;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.htmlunit.HttpMethod;
 import org.htmlunit.Page;
 import org.htmlunit.ScriptResult;
 import org.htmlunit.WebRequest;
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.DomNode;
-import org.htmlunit.html.HtmlFileInput;
-import org.htmlunit.html.HtmlForm;
-import org.htmlunit.html.HtmlFormUtil;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.xml.XmlPage;
 import org.junit.Assert;
@@ -294,60 +280,6 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         r.assertBuildStatusSuccess(r.waitForCompletion(b1));
     }
 
-    public static final class FileItemPersistenceTestServlet extends HttpServlet {
-        private static final long serialVersionUID = 1L;
-
-        @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-            resp.setContentType("text/html");
-            resp.getWriter().println(
-                    "<html><body><form action='/' method=post name=main enctype='multipart/form-data'>" +
-                    "<input type=file name=test><input type=submit>" +
-                    "</form></body></html>"
-            );
-        }
-
-        @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
-            try {
-                ServletFileUpload f = new ServletFileUpload(new DiskFileItemFactory());
-                List<?> v = f.parseRequest(req);
-                assertEquals(1, v.size());
-                XStream2 xs = new XStream2();
-                System.out.println(xs.toXML(v.get(0)));
-            } catch (FileUploadException e) {
-                throw new ServletException(e);
-            }
-        }
-    }
-
-    @Test public void fileItemPersistence() throws Exception {
-        // TODO: write a synchronous connector?
-        byte[] testData = new byte[1024];
-        for (int i = 0; i < testData.length; i++)  testData[i] = (byte) i;
-
-
-        Server server = new Server();
-        ServerConnector connector = new ServerConnector(server);
-        server.addConnector(connector);
-
-        ServletHandler handler = new ServletHandler();
-        handler.addServletWithMapping(new ServletHolder(new FileItemPersistenceTestServlet()), "/");
-        server.setHandler(handler);
-
-        server.start();
-
-        try {
-            JenkinsRule.WebClient wc = r.createWebClient();
-            @SuppressWarnings("deprecation")
-            HtmlPage p = (HtmlPage) wc.getPage("http://localhost:" + connector.getLocalPort() + '/');
-            HtmlForm f = p.getFormByName("main");
-            HtmlFileInput input = f.getInputByName("test");
-            input.setData(testData);
-            HtmlFormUtil.submit(f);
-        } finally {
-            server.stop();
-        }
-    }
-
     @Issue("JENKINS-33467")
     @Test public void foldableCauseAction() throws Exception {
         final OneShotEvent buildStarted = new OneShotEvent();

From e6a5d3e404c1c03ab85390de15a50d1509b3ebef Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 12 May 2024 18:16:19 +0100
Subject: [PATCH 009/449] Update Yarn to v4.2.2 (#9262)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
---
 war/package.json | 2 +-
 war/pom.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/war/package.json b/war/package.json
index d7bf475bb21e..de59cc9e2814 100644
--- a/war/package.json
+++ b/war/package.json
@@ -65,5 +65,5 @@
     "defaults",
     "not IE 11"
   ],
-  "packageManager": "yarn@4.2.1"
+  "packageManager": "yarn@4.2.2"
 }
diff --git a/war/pom.xml b/war/pom.xml
index 3f5ee316b0ee..bb6a4d965f53 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -51,8 +51,8 @@ THE SOFTWARE.
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->
-    <yarn-berry.version>4.2.1</yarn-berry.version>
-    <yarn-berry.sha256sum>15ce76682a8cd2090257b883cd69c637925b29573f9573e8403ec227d5ab6815</yarn-berry.sha256sum>
+    <yarn-berry.version>4.2.2</yarn-berry.version>
+    <yarn-berry.sha256sum>1aa43a5304405be7a7cb9cb5de7b97de9c4e8ddd3273e4dad00d6ae3eb39f0ef</yarn-berry.sha256sum>
   </properties>
 
   <dependencyManagement>

From 6130d2f398836feed755b14cc67d7d24c707907a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 12 May 2024 18:16:30 +0100
Subject: [PATCH 010/449] Update dependency globals to v15.2.0 (#9264)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index de59cc9e2814..9f07be28aeb1 100644
--- a/war/package.json
+++ b/war/package.json
@@ -34,7 +34,7 @@
     "eslint": "9.2.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.1.0",
+    "globals": "15.2.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",
diff --git a/war/yarn.lock b/war/yarn.lock
index 97cfb92d1118..3cab3eaa9fa6 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3957,10 +3957,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.1.0":
-  version: 15.1.0
-  resolution: "globals@npm:15.1.0"
-  checksum: 10c0/ae9cd15057dc6a21d6dbafe9f47b66bd063c6d3c9215fa1e8294bd130d89f188c48370a11a9525a5a33bd8689fc4fdfd3f474d930692d7abb7459cd982503336
+"globals@npm:15.2.0":
+  version: 15.2.0
+  resolution: "globals@npm:15.2.0"
+  checksum: 10c0/ba8c34ef10fc1e65319bfde912a76dbe7654085af8b09d897974cfbe000c6d950ddcf28b4a0de372fe4144836aede32210a97b27ef184f68e1ff8bcd1a74fc5e
   languageName: node
   linkType: hard
 
@@ -4380,7 +4380,7 @@ __metadata:
     eslint: "npm:9.2.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.1.0"
+    globals: "npm:15.2.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"

From b235abaf1435d574c200efd9a5b409190cfd7e1a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 08:18:40 +0100
Subject: [PATCH 011/449] Update dependency node to v20.13.1 (#9267)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index bb6a4d965f53..be061b083bf1 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -47,7 +47,7 @@ THE SOFTWARE.
     <!-- HTTP listener port -->
     <port>8080</port>
     <mina-sshd-api.version>2.12.1-101.v85b_e08b_780dd</mina-sshd-api.version>
-    <node.version>20.13.0</node.version>
+    <node.version>20.13.1</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->

From 6371bc1b5aa8caa742dbdb45a5ce65b7b83c522b Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 13 May 2024 11:46:55 -0700
Subject: [PATCH 012/449] Remove unnecessary references in allowed classes list
 (#9265)

---
 .../src/main/resources/jenkins/security/whitelisted-classes.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/main/resources/jenkins/security/whitelisted-classes.txt b/core/src/main/resources/jenkins/security/whitelisted-classes.txt
index c2f974a7ef9f..b1805a6bd387 100644
--- a/core/src/main/resources/jenkins/security/whitelisted-classes.txt
+++ b/core/src/main/resources/jenkins/security/whitelisted-classes.txt
@@ -133,8 +133,6 @@ java.util.logging.Level
 java.util.logging.LogRecord
 java.util.regex.Pattern
 
-org.apache.commons.fileupload.disk.DiskFileItem
-org.apache.commons.fileupload.util.FileItemHeadersImpl
 org.apache.tools.ant.Location
 
 # TODO remove when https://github.com/jenkinsci/xtrigger-lib/pull/9 is widely adopted in fstrigger-plugin, urltrigger-plugin, etc.

From a751e556c199a9a50188cfb64f4ccf8eb97b12aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 13:50:27 -0700
Subject: [PATCH 013/449] Bump io.jenkins.plugins:design-library from
 296.v56576267b_508 to 303.v6b_23c12334c9 (#9269)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 7ea028b43b7d..6ab4427927ca 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -329,7 +329,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>design-library</artifactId>
-                  <version>296.v56576267b_508</version>
+                  <version>303.v6b_23c12334c9</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>design-library.jpi</destFileName>

From 46237384bd58757a985e0949d5a8c7a998b9e256 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 13 May 2024 18:08:37 -0700
Subject: [PATCH 014/449] Revert "Remove 'Disable project' button from project
 view" (#9272)

This reverts commit 57d64642be1f6810f964e77f11b7382885d05d0e.
---
 .../lib/hudson/project/makeDisabled.jelly          |  9 +++++++++
 test/src/test/java/hudson/model/ProjectTest.java   | 14 ++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
index e53f9ab12ad9..9eb7f4f6571c 100644
--- a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
+++ b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
@@ -41,5 +41,14 @@ THE SOFTWARE.
         </form>
       </div>
     </j:when>
+    <j:otherwise>
+      <div align="right">
+        <form method="post" id="disable-project" action="disable">
+          <l:hasPermission permission="${it.CONFIGURE}">
+            <f:submit value="${%Disable Project}" primary="false" />
+          </l:hasPermission>
+        </form>
+      </div>
+    </j:otherwise>
   </j:choose>
 </j:jelly>
diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java
index e3f2d84493e3..82d9266e0e62 100644
--- a/test/src/test/java/hudson/model/ProjectTest.java
+++ b/test/src/test/java/hudson/model/ProjectTest.java
@@ -644,13 +644,15 @@ public void testDoDisable() throws Exception {
 
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.withBasicCredentials(user.getId(), "password");
+        HtmlPage p = wc.goTo(project.getUrl());
 
-        HtmlPage p = wc.getPage(project, "configure");
-        HtmlForm form = p.getFormByName("config");
-        form.getInputByName("enable").click();
-        j.submit(form);
-
-        assertTrue("Project should be disabled.", project.isDisabled());
+        List<HtmlForm> forms = p.getForms();
+        for (HtmlForm form : forms) {
+            if ("disable".equals(form.getAttribute("action"))) {
+                j.submit(form);
+            }
+        }
+       assertTrue("Project should be disabled.", project.isDisabled());
     }
 
     @Test

From 968f8705ee274b4ea8672d456e75f09e091ee6e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 19:53:46 -0700
Subject: [PATCH 015/449] Bump io.jenkins.plugins:ionicons-api from
 73.vb_f522f227457 to 74.v93d5eb_813d5f (#9270)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 6ab4427927ca..3523fe70d00e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -78,7 +78,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>ionicons-api</artifactId>
-        <version>73.vb_f522f227457</version>
+        <version>74.v93d5eb_813d5f</version>
       </dependency>
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index be061b083bf1..fd636c87e4f9 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -463,7 +463,7 @@ THE SOFTWARE.
                   <!-- dependency of junit and matrix-auth -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>ionicons-api</artifactId>
-                  <version>73.vb_f522f227457</version>
+                  <version>74.v93d5eb_813d5f</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 98103bdccf47bbb927c502d0646a06725a002904 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 21:45:48 -0700
Subject: [PATCH 016/449] Update dependency sass to v1.77.1 (#9273)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 9f07be28aeb1..cd548f1d1814 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.5.11",
     "postcss-scss": "4.0.9",
     "prettier": "3.2.5",
-    "sass": "1.77.0",
+    "sass": "1.77.1",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.5.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 3cab3eaa9fa6..40af33bad843 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4392,7 +4392,7 @@ __metadata:
     postcss-preset-env: "npm:9.5.11"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.2.5"
-    sass: "npm:1.77.0"
+    sass: "npm:1.77.1"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6349,16 +6349,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.0":
-  version: 1.77.0
-  resolution: "sass@npm:1.77.0"
+"sass@npm:1.77.1":
+  version: 1.77.1
+  resolution: "sass@npm:1.77.1"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/bce0e5f5b535491e4e775045a79f19cbe10d800ef53b5f7698958d2992505d7b124c968169b05a0190842d8e0a24c2aa6d75dfbdd7c213820d9d59e227009c19
+  checksum: 10c0/edcfc7d038234b1198c3ddcac5963fcd1e17a9c1ee0f9bd09784ab5353b60ff50b189b4c9154b34f5da9ca0eaab8b189fd3e83a4b43a494151ad4735f8e5f364
   languageName: node
   linkType: hard
 

From f0d4f26bc87ad99954b7f1f7e54570a0f16e41e6 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 14 May 2024 13:15:24 +0000
Subject: [PATCH 017/449] [maven-release-plugin] prepare release jenkins-2.458

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 91fac96bf44b..d0b1bf6dacf6 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.458</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 14d6323ca762..ff3347d3dbce 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.458</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index faef477b9cd2..16a2264d85c4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.458</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..a01a7316c1e0 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.458</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 46793065ac9e..5ac7db0b3e89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.458</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.458</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.458</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-05-07T14:35:14Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-05-14T10:34:13Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 3523fe70d00e..21dfd7fc04ac 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.458</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index fd636c87e4f9..f5f313a56582 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.458</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..2821964882ea 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.458</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..4219bd4624d4 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.458</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 6fd81b8a9ab429eded73a2fe0d239c40c0419d61 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 14 May 2024 13:15:47 +0000
Subject: [PATCH 018/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index d0b1bf6dacf6..91fac96bf44b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.458</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index ff3347d3dbce..14d6323ca762 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.458</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 16a2264d85c4..faef477b9cd2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.458</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index a01a7316c1e0..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.458</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 5ac7db0b3e89..6293399fbd82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.458</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.458</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.458</revision>
+    <revision>2.459</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-05-14T10:34:13Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-05-14T13:15:25Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 21dfd7fc04ac..3523fe70d00e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.458</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index f5f313a56582..fd636c87e4f9 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.458</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 2821964882ea..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.458</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 4219bd4624d4..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.458</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From bcb5ed8f2218208b11b029d023a70bc7c0851418 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 14 May 2024 10:11:54 -0600
Subject: [PATCH 019/449] Update dependency postcss-preset-env to v9.5.12
 (#9274)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 66 ++++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/war/package.json b/war/package.json
index cd548f1d1814..8194b247611a 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "9.5.11",
+    "postcss-preset-env": "9.5.12",
     "postcss-scss": "4.0.9",
     "prettier": "3.2.5",
     "sass": "1.77.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index 40af33bad843..2e5390e52164 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1432,15 +1432,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-cascade-layers@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@csstools/postcss-cascade-layers@npm:4.0.4"
+"@csstools/postcss-cascade-layers@npm:^4.0.5":
+  version: 4.0.6
+  resolution: "@csstools/postcss-cascade-layers@npm:4.0.6"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@csstools/selector-specificity": "npm:^3.1.1"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/87fdd1e3d846e45c2e415f24f66076e04c3c4539e8b802f1114b2a0fef9421d562d9eb61464ba3599d73805555ad8e95c51a8827cb3ddacfda01ec0df4afbfe0
+  checksum: 10c0/134019e9b3f71de39034658e2a284f549883745a309f774d8d272871f9e65680e0981c893766537a8a56ed7f41dba2d0f9fc3cb4fa4057c227bc193976a2ec79
   languageName: node
   linkType: hard
 
@@ -1564,15 +1564,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-is-pseudo-class@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.6"
+"@csstools/postcss-is-pseudo-class@npm:^4.0.7":
+  version: 4.0.8
+  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@csstools/selector-specificity": "npm:^3.1.1"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/aa071954e08dc9368fbeddbec6a8da2dea3a771b33bad53f67f3bc5a6b2f0a270909948f3e7b29ec885f4cceee245f16388809aeb0620284a1d66ad1f2026f28
+  checksum: 10c0/82f191571c3e0973354a54ef15feeb17f9408b4abbefad19fc0f087683b1212fc854cdf09a47324267dd47be4c5cb47d63b8d083695a67c3f8f3e53df3d561f6
   languageName: node
   linkType: hard
 
@@ -1798,12 +1798,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "@csstools/selector-specificity@npm:3.0.3"
+"@csstools/selector-specificity@npm:^3.0.3, @csstools/selector-specificity@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "@csstools/selector-specificity@npm:3.1.1"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
-  checksum: 10c0/e4f0355165882ddde8bd4a2f0252868150e67b9fae927fd2d94a91cee31e438e7041059f20b9c755a93b0bd8e527a9f78b01168fe67b3539be32091240aa63bf
+  checksum: 10c0/1d4a3f8015904d6aeb3203afe0e1f6db09b191d9c1557520e3e960c9204ad852df9db4cbde848643f78a26f6ea09101b4e528dbb9193052db28258dbcc8a6e1d
   languageName: node
   linkType: hard
 
@@ -3079,16 +3079,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "css-has-pseudo@npm:6.0.3"
+"css-has-pseudo@npm:^6.0.4":
+  version: 6.0.5
+  resolution: "css-has-pseudo@npm:6.0.5"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@csstools/selector-specificity": "npm:^3.1.1"
     postcss-selector-parser: "npm:^6.0.13"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/bbe663eff5256233c7bcce256cd8de7d93d82f2d4f2ca104af8e39e2159170d67746d3a2954385d03ec4ea7ef2728fe9a7d8cb62c52c0a6df1ad3d3bb1e3439d
+  checksum: 10c0/946930b7e699d6dbcb8426ebcd593228ee0e2143a148fb2399111ea4c9ed8d6eb3447e944251f1be44ae987d5ab16e450b0b006ca197f318c2a3760ba431fbb9
   languageName: node
   linkType: hard
 
@@ -4389,7 +4389,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.0"
     postcss: "npm:8.4.38"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:9.5.11"
+    postcss-preset-env: "npm:9.5.12"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.2.5"
     sass: "npm:1.77.1"
@@ -5714,16 +5714,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.2":
-  version: 12.1.2
-  resolution: "postcss-nesting@npm:12.1.2"
+"postcss-nesting@npm:^12.1.3":
+  version: 12.1.4
+  resolution: "postcss-nesting@npm:12.1.4"
   dependencies:
     "@csstools/selector-resolve-nested": "npm:^1.1.0"
-    "@csstools/selector-specificity": "npm:^3.0.3"
+    "@csstools/selector-specificity": "npm:^3.1.1"
     postcss-selector-parser: "npm:^6.0.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/39d1d100f61863f904393b17169be83cdf82bd50d530efb3e3ae0c7b0f838b254e10e5d12e25119cf31dce9e351a2b770a03f9b2029ff33bef0ec924c0d2f642
+  checksum: 10c0/b3408de4c04b58a88a56fa81aeff59b12615c78d4f5a57e09c1ee47e74cff51f8c9cad1684da0059067303cf65b4b688f85f0c5ca8d54af8c4ab998f727ab9fd
   languageName: node
   linkType: hard
 
@@ -5877,11 +5877,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-preset-env@npm:9.5.11":
-  version: 9.5.11
-  resolution: "postcss-preset-env@npm:9.5.11"
+"postcss-preset-env@npm:9.5.12":
+  version: 9.5.12
+  resolution: "postcss-preset-env@npm:9.5.12"
   dependencies:
-    "@csstools/postcss-cascade-layers": "npm:^4.0.4"
+    "@csstools/postcss-cascade-layers": "npm:^4.0.5"
     "@csstools/postcss-color-function": "npm:^3.0.16"
     "@csstools/postcss-color-mix-function": "npm:^2.0.16"
     "@csstools/postcss-exponential-functions": "npm:^1.0.7"
@@ -5891,7 +5891,7 @@ __metadata:
     "@csstools/postcss-hwb-function": "npm:^3.0.15"
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
-    "@csstools/postcss-is-pseudo-class": "npm:^4.0.6"
+    "@csstools/postcss-is-pseudo-class": "npm:^4.0.7"
     "@csstools/postcss-light-dark-function": "npm:^1.0.5"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
@@ -5913,7 +5913,7 @@ __metadata:
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.22.3"
     css-blank-pseudo: "npm:^6.0.2"
-    css-has-pseudo: "npm:^6.0.3"
+    css-has-pseudo: "npm:^6.0.4"
     css-prefers-color-scheme: "npm:^9.0.1"
     cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
@@ -5933,7 +5933,7 @@ __metadata:
     postcss-image-set-function: "npm:^6.0.3"
     postcss-lab-function: "npm:^6.0.16"
     postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.2"
+    postcss-nesting: "npm:^12.1.3"
     postcss-opacity-percentage: "npm:^2.0.0"
     postcss-overflow-shorthand: "npm:^5.0.1"
     postcss-page-break: "npm:^3.0.4"
@@ -5943,7 +5943,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9460f4ce18cf1af7582d0a1f366151f59b6e9b0c7cbb62e59081dc91da14760a749f59fa52bc190e5e2c8fd531952c647719d19c4740aa1a0ebcb93f075ad931
+  checksum: 10c0/3e0276b2061baa396547f9c0090fcb0c6149d3735c7aefa99a8e520701aae0b7265578b59d5e4efa9f5e61659c161e39590a5d63bac49469b99da1c549b63231
   languageName: node
   linkType: hard
 

From 9f8da7addbd937f3e6fe429a41862e8263efcb93 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 10:03:50 -0700
Subject: [PATCH 020/449] Update jenkins/ath Docker tag to v5829 (#9278)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index e39c053ef66e..8bde184008c4 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5814.vdc5d6d484b_40
+export ATH_VERSION=5829.v1ea_976c1636e
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From 6aadc6298524c86b85db6d072921be140744fdf2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 10:04:43 -0700
Subject: [PATCH 021/449] Bump commons-logging:commons-logging from 1.3.1 to
 1.3.2 (#9279)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 91fac96bf44b..d137e44beb6e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -340,7 +340,7 @@ THE SOFTWARE.
         <!-- provided by jcl-over-slf4j -->
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
         <scope>provided</scope>
       </dependency>
     </dependencies>

From 1dea9a19ca16dda3d3ea5285e1be3fabcae851d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 19:51:49 -0600
Subject: [PATCH 022/449] Bump org.springframework:spring-framework-bom from
 5.3.34 to 5.3.35 (#9280)

Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.34 to 5.3.35.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.34...v5.3.35)

---
updated-dependencies:
- dependency-name: org.springframework:spring-framework-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index d137e44beb6e..4d4ae6622938 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -55,7 +55,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.3.34</version>
+        <version>5.3.35</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From 24572788ce8b728582aabcaaedffa929ebd4fdcd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 08:03:06 +0100
Subject: [PATCH 023/449] Update dependency postcss-preset-env to v9.5.13
 (#9282)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/war/package.json b/war/package.json
index 8194b247611a..5e37993906c1 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "9.5.12",
+    "postcss-preset-env": "9.5.13",
     "postcss-scss": "4.0.9",
     "prettier": "3.2.5",
     "sass": "1.77.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index 2e5390e52164..a0fe9d620215 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1432,7 +1432,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-cascade-layers@npm:^4.0.5":
+"@csstools/postcss-cascade-layers@npm:^4.0.6":
   version: 4.0.6
   resolution: "@csstools/postcss-cascade-layers@npm:4.0.6"
   dependencies:
@@ -1564,7 +1564,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-is-pseudo-class@npm:^4.0.7":
+"@csstools/postcss-is-pseudo-class@npm:^4.0.8":
   version: 4.0.8
   resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8"
   dependencies:
@@ -3079,7 +3079,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^6.0.4":
+"css-has-pseudo@npm:^6.0.5":
   version: 6.0.5
   resolution: "css-has-pseudo@npm:6.0.5"
   dependencies:
@@ -4389,7 +4389,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.0"
     postcss: "npm:8.4.38"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:9.5.12"
+    postcss-preset-env: "npm:9.5.13"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.2.5"
     sass: "npm:1.77.1"
@@ -5714,7 +5714,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.3":
+"postcss-nesting@npm:^12.1.4":
   version: 12.1.4
   resolution: "postcss-nesting@npm:12.1.4"
   dependencies:
@@ -5877,11 +5877,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-preset-env@npm:9.5.12":
-  version: 9.5.12
-  resolution: "postcss-preset-env@npm:9.5.12"
+"postcss-preset-env@npm:9.5.13":
+  version: 9.5.13
+  resolution: "postcss-preset-env@npm:9.5.13"
   dependencies:
-    "@csstools/postcss-cascade-layers": "npm:^4.0.5"
+    "@csstools/postcss-cascade-layers": "npm:^4.0.6"
     "@csstools/postcss-color-function": "npm:^3.0.16"
     "@csstools/postcss-color-mix-function": "npm:^2.0.16"
     "@csstools/postcss-exponential-functions": "npm:^1.0.7"
@@ -5891,7 +5891,7 @@ __metadata:
     "@csstools/postcss-hwb-function": "npm:^3.0.15"
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
-    "@csstools/postcss-is-pseudo-class": "npm:^4.0.7"
+    "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
     "@csstools/postcss-light-dark-function": "npm:^1.0.5"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
@@ -5913,7 +5913,7 @@ __metadata:
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.22.3"
     css-blank-pseudo: "npm:^6.0.2"
-    css-has-pseudo: "npm:^6.0.4"
+    css-has-pseudo: "npm:^6.0.5"
     css-prefers-color-scheme: "npm:^9.0.1"
     cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
@@ -5933,7 +5933,7 @@ __metadata:
     postcss-image-set-function: "npm:^6.0.3"
     postcss-lab-function: "npm:^6.0.16"
     postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.3"
+    postcss-nesting: "npm:^12.1.4"
     postcss-opacity-percentage: "npm:^2.0.0"
     postcss-overflow-shorthand: "npm:^5.0.1"
     postcss-page-break: "npm:^3.0.4"
@@ -5943,7 +5943,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3e0276b2061baa396547f9c0090fcb0c6149d3735c7aefa99a8e520701aae0b7265578b59d5e4efa9f5e61659c161e39590a5d63bac49469b99da1c549b63231
+  checksum: 10c0/5bbb6e87b1b3acc816ef445836f85df5f50ac96bdc3d571952a83794c80863c652d27ab14c66f6b88f86f5664119d49b357e4184162022cc3436676f3fbe833b
   languageName: node
   linkType: hard
 

From dabf61f3e27dabe53d3183e97dea349bc2d182a5 Mon Sep 17 00:00:00 2001
From: Kevin Guerroudj <91883215+Kevin-CB@users.noreply.github.com>
Date: Fri, 17 May 2024 15:56:10 +0200
Subject: [PATCH 024/449] Clarify artifacts permission description (#9276)

clarify artifacts permission
---
 core/src/main/resources/hudson/model/Messages.properties    | 2 +-
 core/src/main/resources/hudson/model/Messages_fr.properties | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index 96950428fee4..2b1a6559fa58 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -241,7 +241,7 @@ Run.UpdatePermission.Description=\
 Run.ArtifactsPermission.Description=\
   This permission grants the ability to retrieve the artifacts produced by \
   builds. If you don’t want an user to access the artifacts, you can do so by \
-  revoking this permission.
+  revoking this permission. This does not restrict the listing of artifacts.
 Run.InProgressDuration={0} and counting
 Run.NotStartedYet=Not started yet
 Run.ArtifactsBrowserTitle=Artifacts of {0} {1}
diff --git a/core/src/main/resources/hudson/model/Messages_fr.properties b/core/src/main/resources/hudson/model/Messages_fr.properties
index 1d64aee184f3..e6794e6fc49e 100644
--- a/core/src/main/resources/hudson/model/Messages_fr.properties
+++ b/core/src/main/resources/hudson/model/Messages_fr.properties
@@ -231,7 +231,8 @@ Run.UpdatePermission.Description=\
   par exemple pour laisser des notes sur la cause d''échec d''un build.
 Run.ArtifactsPermission.Description=\
   Ce droit permet de récupérer les artefacts produits par les builds. \
-  Si un utilisateur ne doit pas accéder aux artefacts, vous pouvez l''en empêcher en désactivant ce droit.
+  Si un utilisateur ne doit pas accéder aux artefacts, vous pouvez l''en empêcher en désactivant ce droit. \
+  Ce droit ne limite pas la possibilité de lister les artefacts.
 Run.InProgressDuration={0} et décompte
 Run.NotStartedYet=Pas encore commencé
 Run.ArtifactsBrowserTitle=Artefacts de {0} {1}

From 5089ad5e5962d22294d48d57e5cccc68b26c5236 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Fri, 17 May 2024 17:16:27 +0200
Subject: [PATCH 025/449] [JENKINS-73158] avoid jumping layout due to tooltips
 (#9263)

* [JENKINS-73158] avoid jumping layout due to tooltips

The fix for JENKINS-72744 made the tooltip get appended to the parent
element. But this can also cause troubles in some cases.
To avoid this one can now decide whether the tooltip should be appended
to the body (the default) or to the parent.
Adjust all locations where a tooltip is displayed inside a widget to
append it to the parent. This works well with those tooltips and avoids
a jumping layout in the custom-folder-icon and potentially other places.

* explicitly append to parent

* fix attribute
---
 .../jenkins/widgets/HistoryPageFilter/queue-items.jelly    | 4 ++--
 core/src/main/resources/lib/hudson/progressBar.jelly       | 1 +
 core/src/main/resources/lib/hudson/queue.jelly             | 4 +++-
 core/src/main/resources/lib/layout/stopButton.jelly        | 4 ++--
 war/src/main/js/components/tooltips/index.js               | 7 ++++++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
index 74c5535be819..4f51055a7a98 100644
--- a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
+++ b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
@@ -57,8 +57,8 @@ THE SOFTWARE.
 	      </j:otherwise>
 	    </j:choose>
 	  <j:if test="${!item.params.isEmpty()}">
-	    <div style="float:right;margin-right:10px;">
-	      <l:icon src="symbol-parameters" class="icon-sm" tooltip="Build Parameters:${item.params}"/>
+	    <div style="float:right;margin-right:10px;" tooltip="Build Parameters:${item.params}" data-tooltip-append-to-parent="true">
+	      <l:icon src="symbol-parameters" class="icon-sm" />
 	    </div>
 	  </j:if>
 	  </div>
diff --git a/core/src/main/resources/lib/hudson/progressBar.jelly b/core/src/main/resources/lib/hudson/progressBar.jelly
index b4e230263bcc..5a78ca5876e9 100644
--- a/core/src/main/resources/lib/hudson/progressBar.jelly
+++ b/core/src/main/resources/lib/hudson/progressBar.jelly
@@ -55,6 +55,7 @@ THE SOFTWARE.
     <x:attribute name="class">app-progress-bar ${attrs.large?'app-progress-bar--large':null} ${attrs.red?'app-progress-bar--error':null}</x:attribute>
     <x:attribute name="href">${attrs.href}</x:attribute>
     <x:attribute name="tooltip">${attrs.tooltip}</x:attribute>
+    <x:attribute name="data-tooltip-append-to-parent">true</x:attribute>
     <x:attribute name="id">${attrs.id}</x:attribute>
     <x:attribute name="data-tooltip-template">${attrs.tooltipTemplate}</x:attribute>
       <j:choose>
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index f36c84a59d65..8a78c2b70b2f 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -74,7 +74,9 @@ THE SOFTWARE.
               <j:set var="stuck" value="${item.isStuck()}"/>
               <j:choose>
                 <j:when test="${h.hasPermission(item.task,item.task.READ)}">
-                  <a href="${rootURL}/${item.task.url}" class="model-link inside tl-tr" tooltip="${item.causesDescription} ${item.why} ${item.params} \n ${%WaitingFor(item.inQueueForString)}">
+                  <a href="${rootURL}/${item.task.url}" class="model-link inside tl-tr"
+                     tooltip="${item.causesDescription} ${item.why} ${item.params} \n ${%WaitingFor(item.inQueueForString)}"
+                     data-tooltip-append-to-parent="true">
                     <l:breakable value="${item.displayName}"/>
                   </a>
                   <!-- TODO include estimated number as in BuildHistoryWidget/entries.jelly if possible -->
diff --git a/core/src/main/resources/lib/layout/stopButton.jelly b/core/src/main/resources/lib/layout/stopButton.jelly
index 336184090622..a44675e302dd 100644
--- a/core/src/main/resources/lib/layout/stopButton.jelly
+++ b/core/src/main/resources/lib/layout/stopButton.jelly
@@ -39,12 +39,12 @@ THE SOFTWARE.
     </st:documentation>
     <j:choose>
       <j:when test="${confirm == null}">
-        <a class="stop-button-link" href="${href}" tooltip="${alt}">
+        <a class="stop-button-link" href="${href}" tooltip="${alt}" data-tooltip-append-to-parent="true">
           <l:icon src="symbol-close" />
         </a>
       </j:when>
       <j:otherwise>
-        <a class="stop-button-link" href="${href}" data-confirm="${confirm}" tooltip="${alt}">
+        <a class="stop-button-link" href="${href}" data-confirm="${confirm}" tooltip="${alt}" data-tooltip-append-to-parent="true">
           <l:icon src="symbol-close" />
         </a>
       </j:otherwise>
diff --git a/war/src/main/js/components/tooltips/index.js b/war/src/main/js/components/tooltips/index.js
index 3521163917cd..443c4179ed14 100644
--- a/war/src/main/js/components/tooltips/index.js
+++ b/war/src/main/js/components/tooltips/index.js
@@ -5,7 +5,6 @@ const TOOLTIP_BASE = {
   arrow: false,
   theme: "tooltip",
   animation: "tooltip",
-  appendTo: "parent",
 };
 
 /**
@@ -21,6 +20,10 @@ function registerTooltip(element) {
 
   const tooltip = element.getAttribute("tooltip");
   const htmlTooltip = element.getAttribute("data-html-tooltip");
+  let appendTo = document.body;
+  if (element.hasAttribute("data-tooltip-append-to-parent")) {
+    appendTo = "parent";
+  }
   if (
     tooltip !== null &&
     tooltip.trim().length > 0 &&
@@ -40,6 +43,7 @@ function registerTooltip(element) {
           onHidden(instance) {
             instance.reference.setAttribute("title", instance.props.content);
           },
+          appendTo: appendTo,
         },
         TOOLTIP_BASE,
       ),
@@ -58,6 +62,7 @@ function registerTooltip(element) {
               instance.reference.getAttribute("data-tooltip-interactive") ===
               "true";
           },
+          appendTo: appendTo,
         },
         TOOLTIP_BASE,
       ),

From 90a6ac5c38f33b6674ba78bdfee0a5fe2b757166 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sat, 18 May 2024 16:40:17 +0200
Subject: [PATCH 026/449] [JENKINS-73114] avoid conflicts with css classes from
 bootstrap (#9254)

* [JENKINS-73114] avoid conflict of css classes with bootstrap

jenkins and bootstrap both have definitions for alert and alert-warning,
alert-info, alert-danger. Bootstrap css definitions are included when
e.g. the warning-ng plugin is installed and a job is configured to scan
for warnings. The css classes from bootstrap are then chosen instead of
the ones for Jenkins for things like the admin monitors.
To make things umambiguous, add additional classes prefixed with
`jenkins-` and make use of them in code. Keep the old definitions for
backward compatibility with plugins.
Followup changes are needed in plugins (Mostly those that define admin
monitors) and the design-library

* fix test
---
 .../message.jelly                             |  2 +-
 .../PluginDeprecationMonitor/message.jelly    |  2 +-
 .../PluginUpdateMonitor/message.jelly         |  2 +-
 .../hudson/PluginManager/advanced.jelly       |  2 +-
 .../hudson/PluginManager/installed.jelly      | 10 +--
 .../hudson/PluginManager/updates.jelly        | 16 ++---
 .../message.jelly                             |  2 +-
 .../HudsonHomeDiskUsageMonitor/message.jelly  |  2 +-
 .../NullIdDescriptorMonitor/message.jelly     |  2 +-
 .../diagnosis/OldDataMonitor/message.jelly    |  2 +-
 .../ReverseProxySetupMonitor/message.jelly    |  2 +-
 .../TooManyJobsButNoView/message.jelly        |  2 +-
 .../logging/LogRecorder/configure.jelly       |  2 +-
 .../logging/LogRecorderManager/all.jelly      |  2 +-
 .../CoreUpdateMonitor/message.jelly           |  2 +-
 .../MonitorMarkedNodeOffline/message.jelly    |  2 +-
 .../AdministrativeMonitorImpl/message.jelly   |  2 +-
 .../SlowTriggerAdminMonitor/message.groovy    |  2 +-
 .../util/AdministrativeError/message.jelly    |  2 +-
 .../util/DoubleLaunchChecker/message.jelly    |  2 +-
 .../diagnosis/HsErrPidList/message.jelly      |  2 +-
 .../message.jelly                             |  2 +-
 .../ControllerExecutorsAgents/message.jelly   |  2 +-
 .../ControllerExecutorsNoAgents/message.jelly |  2 +-
 .../RootUrlNotSetMonitor/message.jelly        |  2 +-
 .../SecurityIsOffMonitor/message.jelly        |  2 +-
 .../authenticate-security-token.jelly         |  2 +-
 .../install/pluginSetupWizard.properties      |  6 +-
 .../install/pluginSetupWizard_fr.properties   |  4 +-
 .../install/pluginSetupWizard_it.properties   |  6 +-
 .../install/pluginSetupWizard_lt.properties   |  2 +-
 .../install/pluginSetupWizard_pl.properties   |  4 +-
 .../pluginSetupWizard_pt_BR.properties        |  6 +-
 .../install/pluginSetupWizard_sr.properties   |  4 +-
 .../pluginSetupWizard_sv_SE.properties        |  6 +-
 .../pluginSetupWizard_zh_CN.properties        |  6 +-
 .../pluginSetupWizard_zh_TW.properties        |  6 +-
 .../resources.css                             | 17 +++--
 .../model/BuiltInNodeMigration/message.jelly  |  2 +-
 .../message.jelly                             |  2 +-
 .../jenkins/model/Jenkins/downgrade.jelly     |  2 +-
 .../message.jelly                             |  2 +-
 .../message.jelly                             |  2 +-
 .../RekeySecretAdminMonitor/message.groovy    |  8 +--
 .../message.groovy                            |  2 +-
 .../UpdateSiteWarningsMonitor/message.groovy  |  2 +-
 .../message.jelly                             |  2 +-
 .../message.jelly                             |  2 +-
 .../message.jelly                             |  2 +-
 .../CSRFAdministrativeMonitor/message.jelly   |  2 +-
 .../test/java/hudson/PluginManagerTest.java   |  2 +-
 .../js/templates/plugin-manager/available.hbs |  8 +--
 war/src/main/scss/components/_alert.scss      | 71 ++++++++++---------
 war/src/main/scss/pages/_manage-jenkins.scss  | 39 +++++-----
 war/src/main/scss/simple-page.scss            |  3 +-
 55 files changed, 149 insertions(+), 147 deletions(-)

diff --git a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly
index 5ccac430ecd2..cb20ebf8dfe7 100644
--- a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly
+++ b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-danger">
+  <div class="jenkins-alert jenkins-alert-danger">
     <dl>
         <dt>${%PluginCycles}</dt>
         <j:forEach var="p" items="${it.pluginsWithCycle}">
diff --git a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly
index 45c4cead0a44..1f5ec400bd3c 100644
--- a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly
+++ b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
     <dl>
       <dt>${%DeprecatedPlugins}</dt>
       <j:forEach var="e" items="${it.getDeprecatedPlugins()}">
diff --git a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly
index 73182ec483e4..b1f9ba193d49 100644
--- a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly
+++ b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-danger">
+  <div class="jenkins-alert jenkins-alert-danger">
     <dl>
         <dt>${%RequiredPluginUpdates}</dt>
         <j:forEach var="p" items="${it.pluginsToBeUpdated}">
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly
index 8d0e6abcd22e..81948afa6e80 100644
--- a/core/src/main/resources/hudson/PluginManager/advanced.jelly
+++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly
@@ -37,7 +37,7 @@ THE SOFTWARE.
         <l:main-panel>
           <l:app-bar title="${%Advanced settings}"/>
 
-          <div class="alert alert-info">
+          <div class="jenkins-alert jenkins-alert-info">
               <strong>${%proxyMovedBlurb(rootURL+"/manage/configure")}</strong>
           </div>
 
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
index c22c9ddeeba1..3c3ee43e0193 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.jelly
+++ b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -54,7 +54,7 @@ THE SOFTWARE.
             data-is-restart-required="${app.updateCenter.isRestartRequiredForCompletion()}" />
 
       <j:if test="${app.updateCenter.isRestartRequiredForCompletion()}">
-        <div class="alert alert-warning"><strong>${%Warning}</strong>: ${%requires.restart}</div>
+        <div class="jenkins-alert jenkins-alert-warning"><strong>${%Warning}</strong>: ${%requires.restart}</div>
       </j:if>
 
       <template id="i18n"
@@ -130,7 +130,7 @@ THE SOFTWARE.
                       </div>
                     </j:if>
                     <j:if test="${!p.getActiveWarnings().isEmpty()}">
-                      <div class="alert alert-danger">${%securityWarning}
+                      <div class="jenkins-alert jenkins-alert-danger">${%securityWarning}
                         <ul>
                           <j:forEach var="warning" items="${p.getActiveWarnings()}">
                             <li>
@@ -143,13 +143,13 @@ THE SOFTWARE.
                       </div>
                     </j:if>
                     <j:if test="${p.isDeprecated()}">
-                      <div class="alert alert-warning">
+                      <div class="jenkins-alert jenkins-alert-warning">
                         <!-- figure out a way how to present deprecations by multiple update sites instead of just the first one -->
                         ${%deprecationWarning(p.getDeprecations().get(0).url)}
                       </div>
                     </j:if>
                     <j:if test="${it.hasAdoptThisPluginLabel(p)}">
-                      <div class="alert alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0">
+                      <div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0">
                         ${%adoptThisPlugin}
                       </div>
                     </j:if>
@@ -252,7 +252,7 @@ THE SOFTWARE.
                         ${p.name}
                       </div>
                     </j:if>
-                    <div class="alert alert-danger jenkins-!-margin-top-1 jenkins-!-margin-bottom-0">
+                    <div class="jenkins-alert jenkins-alert-danger jenkins-!-margin-top-1 jenkins-!-margin-bottom-0">
                       <pre>${p.cause.message}</pre>
                     </div>
                   </td>
diff --git a/core/src/main/resources/hudson/PluginManager/updates.jelly b/core/src/main/resources/hudson/PluginManager/updates.jelly
index 323799953a5a..2dd759d883cd 100644
--- a/core/src/main/resources/hudson/PluginManager/updates.jelly
+++ b/core/src/main/resources/hudson/PluginManager/updates.jelly
@@ -136,7 +136,7 @@ THE SOFTWARE.
                           </div>
                         </j:if>
                         <j:if test="${!p.isCompatibleWithInstalledVersion()}">
-                          <div class="alert alert-danger">${%compatWarning}
+                          <div class="jenkins-alert jenkins-alert-danger">${%compatWarning}
                             <j:if test="${p.hasIncompatibleParentPlugins()}">
                               <br/>${%parentCompatWarning}
                               <ul>
@@ -153,15 +153,15 @@ THE SOFTWARE.
                           </div>
                         </j:if>
                         <j:if test="${p.isForNewerHudson()}">
-                          <div class="alert alert-danger">${%coreWarning(p.requiredCore)}</div>
+                          <div class="jenkins-alert jenkins-alert-danger">${%coreWarning(p.requiredCore)}</div>
                         </j:if>
                         <j:if test="${p.fixesSecurityVulnerabilities()}">
-                          <div class="alert alert-warning">
+                          <div class="jenkins-alert jenkins-alert-warning">
                             ${%Applying this update will address security vulnerabilities in the currently installed version.}
                           </div>
                         </j:if>
                         <j:if test="${!p.isNeededDependenciesCompatibleWithInstalledVersion(cache)}">
-                          <div class="alert alert-danger">${%depCompatWarning}
+                          <div class="jenkins-alert jenkins-alert-danger">${%depCompatWarning}
                             <br/>${%parentDepCompatWarning}
                             <ul>
                               <j:forEach var="d"
@@ -177,12 +177,12 @@ THE SOFTWARE.
                           </div>
                         </j:if>
                         <j:if test="${p.isNeededDependenciesForNewerJenkins(cache)}">
-                          <div class="alert alert-danger">
+                          <div class="jenkins-alert jenkins-alert-danger">
                             ${%depCoreWarning(p.getNeededDependenciesRequiredCore().toString())}
                           </div>
                         </j:if>
                         <j:if test="${p.hasWarnings()}">
-                          <div class="alert alert-danger">${%securityWarning}
+                          <div class="jenkins-alert jenkins-alert-danger">${%securityWarning}
                             <ul>
                               <j:forEach var="warning" items="${p.getWarnings()}">
                                 <li>
@@ -195,12 +195,12 @@ THE SOFTWARE.
                           </div>
                         </j:if>
                         <j:if test="${p.isDeprecated()}">
-                          <div class="alert alert-warning">
+                          <div class="jenkins-alert jenkins-alert-warning">
                             ${%deprecationWarning(p.getDeprecation().url)}
                           </div>
                         </j:if>
                         <j:if test="${it.hasAdoptThisPluginLabel(p)}">
-                          <div class="alert alert-warning">
+                          <div class="jenkins-alert jenkins-alert-warning">
                             ${%adoptThisPlugin}
                           </div>
                         </j:if>
diff --git a/core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly b/core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly
index d7adbe4b57b6..725457e4aa22 100644
--- a/core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly
+++ b/core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly
@@ -1,6 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-  <div class="alert alert-danger" role="alert">
+  <div class="jenkins-alert jenkins-alert-danger" role="alert">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="correct" value="${%Correct}"/>
     </form>
diff --git a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
index 1ff3673ab660..488407988acf 100644
--- a/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-<div class="alert alert-warning">
+<div class="jenkins-alert jenkins-alert-warning">
   <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
     <f:submit name="yes" value="${%Tell me more}"/>
     <f:submit name="no" value="${%Dismiss}"/>
diff --git a/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly
index 610d36a6be8b..06aee82322cb 100644
--- a/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-<div class="alert alert-danger">
+<div class="jenkins-alert jenkins-alert-danger">
   <dl>
     <dt>${%blurb}</dt>
     <j:forEach var="d" items="${it.problems}">
diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
index c213f7ac2251..c6d274d99031 100644
--- a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="yes" value="${%Manage}"/>
       <f:submit name="no" value="${%Dismiss}"/>
diff --git a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly
index c86699d26751..c7367563a257 100644
--- a/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:l="/lib/layout">
-  <div id="redirect-error" class="alert alert-danger reverse-proxy__hidden"
+  <div id="redirect-error" class="jenkins-alert jenkins-alert-danger reverse-proxy__hidden"
        data-url="${rootURL}/${it.url}/test" data-context="${rootURL}">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="yes" value="${%More Info}"/>
diff --git a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
index 7c93986f6b95..178bbebeddb6 100644
--- a/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
+++ b/core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div id="tooManyJobsButNoView" class="alert alert-warning">
+  <div id="tooManyJobsButNoView" class="jenkins-alert jenkins-alert-warning">
     <l:isAdmin>
       <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
         <f:submit name="yes" value="${%Create a view now}"/>
diff --git a/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly b/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly
index aba5588ccd13..b49ccc278858 100644
--- a/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly
@@ -36,7 +36,7 @@ THE SOFTWARE.
     </l:app-bar>
 
     <f:form method="post" name="config" action="configSubmit">
-      <div class="alert alert-info jenkins-form-item">
+      <div class="jenkins-alert jenkins-alert-info jenkins-form-item">
         ${%fine_warning}
       </div>
       <j:set var="instance" value="${it}" />
diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly
index 71779ed1f4e7..d14eeb77b675 100644
--- a/core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly
@@ -36,7 +36,7 @@ THE SOFTWARE.
       </l:overflowButton>
     </l:app-bar>
 
-    <div class="alert alert-info">
+    <div class="jenkins-alert jenkins-alert-info">
       Log messages at a level more verbose than INFO (i.e., CONFIG, FINE, FINER, FINEST) are never recorded in the Jenkins log. Use <a href=".">log recorders</a> to record these log messages.
     </div>
     <t:logRecords logRecords="${h.logRecords}"/>
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly
index 8419f13ce05c..f11ee8837cdd 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly
+++ b/core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-info">
+  <div class="jenkins-alert jenkins-alert-info">
     <j:set var="ucData" value="${it.data}" />
     <j:set var="upJob" value="${app.updateCenter.hudsonJob}" />
     <j:choose>
diff --git a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly
index dda68d1ea6d2..52a2bd1df659 100644
--- a/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly
+++ b/core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
     <form method="post" action="${rootURL}/${it.url}/disable">
       <f:submit value="${%Dismiss}"/>
     </form>
diff --git a/core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly b/core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly
index 353b1fbc28f7..47cadeea4f34 100644
--- a/core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly
+++ b/core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:t="/lib/hudson">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
     ${%blurb(rootURL)}
   </div>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy b/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy
index 77bcedd36ebd..cef8cd83fae9 100644
--- a/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy
+++ b/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy
@@ -8,7 +8,7 @@ import org.apache.commons.jelly.tags.fmt.FmtTagLibrary
 SlowTriggerAdminMonitor tam = my
 
 dl {
-    div(class: "alert alert-warning") {
+    div(class: "jenkins-alert jenkins-alert-warning") {
         form(method: "post", name: "clear", action: rootURL + "/" + tam.url + "/clear") {
             input(name: "clear", type: "submit", value: _("Dismiss"), class: "submit-button primary")
         }
diff --git a/core/src/main/resources/hudson/util/AdministrativeError/message.jelly b/core/src/main/resources/hudson/util/AdministrativeError/message.jelly
index 7da753ae759a..3dfd16729c28 100644
--- a/core/src/main/resources/hudson/util/AdministrativeError/message.jelly
+++ b/core/src/main/resources/hudson/util/AdministrativeError/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-danger">
+  <div class="jenkins-alert jenkins-alert-danger">
     <j:out value="${it.message}"/>
     <a href="${rootURL}/${it.url}/">${%See the log for more details}</a>.
   </div>
diff --git a/core/src/main/resources/hudson/util/DoubleLaunchChecker/message.jelly b/core/src/main/resources/hudson/util/DoubleLaunchChecker/message.jelly
index 9f7354230dbc..865906efd3ea 100644
--- a/core/src/main/resources/hudson/util/DoubleLaunchChecker/message.jelly
+++ b/core/src/main/resources/hudson/util/DoubleLaunchChecker/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
       <p>
         ${%message(it.home)}
       </p>
diff --git a/core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly b/core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly
index 110d48ba7752..dbd012f51c87 100644
--- a/core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly
+++ b/core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-danger">
+  <div class="jenkins-alert jenkins-alert-danger">
     ${%blurb(rootURL+'/'+it.url)}
   </div>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly b/core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly
index bf56e41455a4..657efb6c2454 100644
--- a/core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly
@@ -1,6 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
       ${%blurb(app.initLevel)}
       ${%Example: usage of} <code>@Initializer(after = InitMilestone.COMPLETED)</code> ${%in a plugin}
       (<a href="https://www.jenkins.io/redirect/troubleshooting/initialization-not-completed" rel="noopener noreferrer" target="_blank">${%See documentation}</a>).
diff --git a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly
index 6824021fe83d..5cbd262425a3 100644
--- a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
      <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="yes" value="${%Manage}"/>
       <f:submit name="no" value="${%Dismiss}"/>
diff --git a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly
index 41c6487d5263..1f8f0fb8bd8c 100644
--- a/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="agent" value="${%Set up agent}"/>
       <f:submit name="cloud" value="${%Set up cloud}"/>
diff --git a/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly b/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly
index dcd5b742511d..94a5b777b58c 100644
--- a/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
     <l:isAdmin>
       <form method="post" action="${rootURL}/${it.url}/disable">
         <f:submit value="${%Dismiss}"/>
diff --git a/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly b/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly
index 1b08c2698a89..65895c8c79c4 100644
--- a/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="yes" value="${%Setup Security}"/>
       <f:submit name="no" value="${%Dismiss}"/>
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
index 8c290f10261c..2adc245beb0f 100644
--- a/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
+++ b/core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
@@ -19,7 +19,7 @@
                     <p>${%jenkins.install.findSecurityTokenMessage(it.initialAdminPasswordFile)}</p>
                     <p>${%authenticate-security-token.copy.password}</p>
                     <j:if test="${error}">
-                        <div class="alert alert-danger">
+                        <div class="jenkins-alert jenkins-alert-danger">
                           <strong>${%authenticate-security-token.error}</strong> ${%authenticate-security-token.password.incorrect}
                         </div>
                     </j:if>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
index 86fd3f21517f..6c74f8b2ab40 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
@@ -66,7 +66,7 @@ installWizard_installIncomplete_message=Jenkins was restarted during installatio
 installWizard_installIncomplete_resumeInstallationButtonLabel=Resume
 installWizard_saveFirstUser=Save and Continue
 installWizard_skipFirstUser=Skip and continue as admin
-installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 You have skipped the <strong>setup of an admin user</strong>. <br /><br />\
 To log in, use the username: "admin" and the administrator password you used to access the setup wizard.\
 </div>
@@ -76,7 +76,7 @@ installWizard_addFirstUser_title=Getting Started
 installWizard_configureInstance_title=Instance Configuration
 installWizard_saveConfigureInstance=Save and Finish
 installWizard_skipConfigureInstance=Not now
-installWizard_configureInstanceSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 You have skipped the configuration of the Jenkins URL. <br/><br/>\
 To configure the Jenkins URL, go to "Manage Jenkins" page.\
 </div>
@@ -103,7 +103,7 @@ installWizard_pluginsInstalled_banner=Welcome to Jenkins {0}!
 installWizard_upgradeComplete_message=Congratulations! You have upgraded to Jenkins {0}.</p><p>To learn more about its great new features, visit <a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">the Jenkins website</a>!
 installWizard_upgradeSkipped_title=Upgrade
 installWizard_upgradeSkipped_banner=Features Not Installed
-installWizard_upgradeSkipped_message=<div class="alert alert-warning fade in">Suggested plugins will not be installed.</div> \
+installWizard_upgradeSkipped_message=<div class="jenkins-alert jenkins-alert-warning fade in">Suggested plugins will not be installed.</div> \
 <p style="padding: 0 4px">You can also install new features from the Plugin Manager, if you change your mind.</p> \
 <p style="padding: 0 4px">Learn how these new features can improve your Jenkins experience by \
 <a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">visiting the homepage</a>.</p>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties
index df38499238db..a20036a079bf 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties
@@ -41,7 +41,7 @@ certains plugins n\'ont pas l\'air d\'avoir été installés.
 installWizard_installIncomplete_resumeInstallationButtonLabel=Reprendre
 installWizard_saveFirstUser=Sauver et continuer
 installWizard_skipFirstUser=Continuer en tant qu\'Administrateur
-installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 Vous avez passé la <strong>création d\'un utilisateur administrateur</strong>. <br /><br />\
 Pour vous connecter, utilisez le login : "admin" et le mot de passe administrateur que vous avez utilisé pour accéder au \
 wizard d\'installation.</div>
@@ -49,7 +49,7 @@ installWizard_addFirstUser_title=Démarrage
 
 # instance configuration page
 installWizard_configureInstance_title=Démarrage
-installWizard_configureInstanceSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 Vous avez passé la <strong>configuration de l\'instance</strong>. <br /><br /> \
 Vous pouvez toujours vous rendre sur les pages de configuration pour remplir les informations qui pourraient manquer.\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties
index 395e4aa864e0..dcf21537815f 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties
@@ -23,7 +23,7 @@
 
 installWizard_addFirstUser_title=Attività iniziali
 installWizard_configureInstanceSkippedMessage=\
-  <div class="alert alert-warning fade in">La configurazione dell''URL di \
+  <div class="jenkins-alert jenkins-alert-warning fade in">La configurazione dell''URL di \
   Jenkins è stata omessa.<br/><br/>Per configurare l''URL di Jenkins, aprire \
   la pagina "Gestisci Jenkins".</div>
 installWizard_configureInstance_title=Configurazione istanza
@@ -37,7 +37,7 @@ installWizard_error_restartNotSupported=Il riavvio non è supportato, \
   riavviare quest''istanza manualmente
 installWizard_error_title=Errore
 installWizard_firstUserSkippedMessage=\
-  <div class="alert alert-warning fade in">La <strong>configurazione di un \
+  <div class="jenkins-alert jenkins-alert-warning fade in">La <strong>configurazione di un \
   utente amministratore</strong> è stata omessa.<br /><br />Per accedere, \
   utilizzare il nome utente "admin" e la password di amministrazione che si \
   è utilizzata per accedere alla configurazione guidata.</div>
@@ -113,7 +113,7 @@ installWizard_upgradePanel_message=Jenkins {0} include delle nuove \
 installWizard_upgradePanel_skipRecommendedPlugins=No, grazie
 installWizard_upgradePanel_title=Aggiornamento
 installWizard_upgradeSkipped_banner=Funzionalità non installate
-installWizard_upgradeSkipped_message=<div class="alert alert-warning fade \
+installWizard_upgradeSkipped_message=<div class="jenkins-alert jenkins-alert-warning fade \
   in">I componenti aggiuntivi consigliati non saranno installati.</div>\
   <p style="padding: 0 4px">È possibile anche installare nuove funzionalità \
   dal Gestore componenti aggiuntivi se si cambia idea.</p><p style="padding: \
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties
index 97f1ae20bc42..91d7f50475a4 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties
@@ -39,7 +39,7 @@ installWizard_installIncomplete_message=Jenkinsas buvo iš naujo paleistas diegi
 installWizard_installIncomplete_resumeInstallationButtonLabel=Tęsti
 installWizard_saveFirstUser=Įrašyti ir baigti
 installWizard_skipFirstUser=Tęsti kaip administratoriumi
-installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 Jūs praleidote administratoriaus naudotojo kūrimą. Norėdami prisijungti, naudokite vardą: „admin“ ir \
 administratoriaus slaptažodį, kurį naudojote prisijungimui prie nustatymo vedlio.\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties
index a5566f816240..5a144b8233e4 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties
@@ -31,7 +31,7 @@ installWizard_jenkinsVersionTitle=Jenkins
 installWizard_installComplete_banner=Jenkins jest gotowy!
 installWizard_installComplete_finishButtonLabel=Zacznij korzystać z Jenkinsa
 installWizard_installComplete_message=Konfiguracja Jenkinsa została zakończona.
-installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 Pominięto utworzenie konta administratora. Aby się zalogować, użyj loginu 'admin' i hasła użytego podczas konfigurowania Jenkinsa.\
 </div>
 installWizard_addFirstUser_title=Dodawanie pierwszego użytkownika
@@ -79,7 +79,7 @@ installWizard_installComplete_installComplete_restartRequiredNotSupportedMessage
 installWizard_gettingStarted_title=Zaczynamy
 installWizard_saveSecurity=Zapisz i kontynuuj
 installWizard_installIncomplete_dependenciesLabel=Zależności
-installWizard_configureInstanceSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 Pominięto konfiguracje bazowego adresu URL Jenkinsa. <br/><br/>\
 Aby go skonfigurować, przejdź do strony "Zarządzaj Jenkinsem".\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties
index 31fee518e999..f633aa0e1ab0 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties
@@ -38,7 +38,7 @@ installWizard_error_connection=Incapaz de conectar ao Jenkins
 installWizard_installing_detailsLink=Detalhes...
 installWizard_gettingStarted_title=Começando
 installWizard_installIncomplete_title=Prosseguir com a instalação
-installWizard_configureInstanceSkippedMessage=<div class="alert alert-warning fade in">Você pulou a configuração da \
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">Você pulou a configuração da \
   URL do Jenkins. <br/><br/>Para configurá-la, vá para a página "Gerenciar o Jenkins".</div>
 installWizard_installIncomplete_banner=Prosseguir com a instalação
 installWizard_welcomePanel_recommendedActionTitle=Instalar as extensões sugeridas
@@ -52,7 +52,7 @@ installWizard_installComplete_installComplete_restartRequiredMessage=A configura
 installWizard_installComplete_bannerRestart=O Jenkins está quase pronto!
 installWizard_skipFirstUser=Pular e continuar como administrador
 installWizard_installCustom_dependenciesPrefix=Dependências
-installWizard_upgradeSkipped_message=<div class="alert alert-warning fade in">As extensões sugeridas não serão \
+installWizard_upgradeSkipped_message=<div class="jenkins-alert jenkins-alert-warning fade in">As extensões sugeridas não serão \
   instaladas.</div> <p style="padding: 0 4px">Você pode instalar extensões com o Gerenciador de Extensões, caso mude \
   de ideia.</p> <p style="padding: 0 4px">Aprenda como estas novas funcionalidades podem melhorar sua experiência com \
   o Jenkins <a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">visitando sua página \
@@ -82,7 +82,7 @@ installWizard_installComplete_finishButtonLabel=Começar a usar o Jenkins
 installWizard_goInstall=Instalar
 installWizard_installCustom_selectNone=Nenhum
 installWizard_installComplete_title=Começar
-installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">Você pulou a <strong>configuração do \
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">Você pulou a <strong>configuração do \
   usuário admin</strong>. <br /><br />Para entrar, use o nome de usuário "admin" e a senha de administrador que você \
   usou para acessar o assistente de configuração.</div>
 installWizard_configureProxy_save=Salvar e continuar
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties
index 14a3affb5905..16c3931e91aa 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties
@@ -40,7 +40,7 @@ installWizard_installIncomplete_banner=Настави са инсталациј
 installWizard_installIncomplete_message=
 installWizard_saveFirstUser=Сачувај и настави
 installWizard_skipFirstUser=Настави са администраторским налогом
-installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 Прескочили сте креирањем административог корисника. Пријавите се како што ће те користити име: 'admin' и лозинку коју сте користили инсталацијом.\
 </div>
 installWizard_addFirstUser_title=Почетак
@@ -65,7 +65,7 @@ installWizard_pluginsInstalled_banner=Добродошли на Jenkins {0}!
 installWizard_upgradeComplete_message=Честитамо! Ажурирали сте Jenkins на верзију {0}.</p><p>Прочитајте још на <a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">Jenkins страници</a>!
 installWizard_upgradeSkipped_title=Ажурирај
 installWizard_upgradeSkipped_banner=Одлике које нису инсталиране
-installWizard_upgradeSkipped_message=<div class="alert alert-warning fade in">предложие модуле неће бити инсталиране.</div> \
+installWizard_upgradeSkipped_message=<div class="jenkins-alert jenkins-alert-warning fade in">предложие модуле неће бити инсталиране.</div> \
 <p style="padding: 0 4px">Ако сте предомислите, можете инсталирати нове модуле са Управљачем модула.</p> \
 <p style="padding: 0 4px">Прочитајте како модуле усавршавају Jenkins \
 <a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">на Jenkins станици</a>.</p>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties
index 795413e50518..8fc30a7b98c0 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties
@@ -66,7 +66,7 @@ installWizard_installIncomplete_message=Jenkins startades om under installatione
 installWizard_installIncomplete_resumeInstallationButtonLabel=Återuppta
 installWizard_saveFirstUser=Spara och fortsätt
 installWizard_skipFirstUser=Hoppa över och fortsätt som administratör
-installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 Du har hoppat över <strong>installationen av en administratörsanvändare</strong>. <br /><br />\
 Använd användarnamnet "admin" och administratörslösenordet du använde för att komma åt installationsguiden för att logga in.\
 </div>
@@ -76,7 +76,7 @@ installWizard_addFirstUser_title=Kom igång
 installWizard_configureInstance_title=Konfigurera instans
 installWizard_saveConfigureInstance=Spara och avsluta
 installWizard_skipConfigureInstance=Inte nu
-installWizard_configureInstanceSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 Du har hoppat över konfigurationen av Jenkins-webbadressen. <br/><br/>\
 Gå till sidan "Hantera Jenkins" för att konfigurera Jenkins-webbadressen.\
 </div>
@@ -103,7 +103,7 @@ installWizard_pluginsInstalled_banner=Välkommen till Jenkins {0}!
 installWizard_upgradeComplete_message=Grattis! Du har uppgraderat till Jenkins {0}.</p><p>Besök <a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">Jenkins webbplats</a> för att läsa mer om dessa fantastiska nya funktioner!
 installWizard_upgradeSkipped_title=Uppgradera
 installWizard_upgradeSkipped_banner=Oinstallerade funktioner
-installWizard_upgradeSkipped_message=<div class="alert alert-warning fade in">Föreslagna insticksprogram kommer inte att installeras.</div> \
+installWizard_upgradeSkipped_message=<div class="jenkins-alert jenkins-alert-warning fade in">Föreslagna insticksprogram kommer inte att installeras.</div> \
 <p style="padding: 0 4px">Du kan också installera nya funktioner från insticksprogramshanteraren om du ångrar dig.</p> \
 <p style="padding: 0 4px">Läs om hur dessa nya funktioner kan förbättra din Jenkins-upplevelse genom att \
 <a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">besöka hemsidan</a>.</p>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties
index 526cf033bf9b..3446a6b21cc4 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties
@@ -64,7 +64,7 @@ installWizard_installIncomplete_message=Jenkins在安装过程已重启，部分
 installWizard_installIncomplete_resumeInstallationButtonLabel=恢复
 installWizard_saveFirstUser=保存并完成
 installWizard_skipFirstUser=使用admin账户继续
-installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 你已跳过创建admin用户的步骤。要登录请使用用户名：'admin' \
 及用于访问安装向导的管理员密码。\
 </div> 
@@ -74,7 +74,7 @@ installWizard_addFirstUser_title=新手入门
 installWizard_configureInstance_title=实例配置
 installWizard_saveConfigureInstance=保存并完成
 installWizard_skipConfigureInstance=现在不要
-installWizard_configureInstanceSkippedMessage=<div class="alert alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
 您已经跳过了 Jenkins URL的配置。 <br/><br/>\
 要配置 Jenkins URL的话，到“Jenkins管理”页面。\
 </div>
@@ -100,7 +100,7 @@ installWizard_pluginsInstalled_banner=欢迎使用Jenkins {0} ！
 installWizard_upgradeComplete_message=恭喜！你已更新到Jenkins {0} 。</p><p>访问<a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">Jenkins网站</a>了解更多新特性的信息。
 installWizard_upgradeSkipped_title=更新
 installWizard_upgradeSkipped_banner=特性未安装
-installWizard_upgradeSkipped_message=<div class="alert alert-warning fade in">建议的插件将不被安装。</div> \
+installWizard_upgradeSkipped_message=<div class="jenkins-alert jenkins-alert-warning fade in">建议的插件将不被安装。</div> \
 <p style="padding: 0 4px">如果你改变主意了，还可以从插件管理器安装新特性。</p>\
 <p style="padding: 0 4px">访问<a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">Jenkins官网</a>，了解这些新特性如何提升Jenkins体验。</p>
 installWizard_upgrading_title=正在安装插件
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties
index 8d42c1f95f86..341d0ae88e70 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties
@@ -61,14 +61,14 @@ installWizard_installIncomplete_message=Jenkins 在安裝期間重新啟動，
 installWizard_installIncomplete_resumeInstallationButtonLabel=繼續
 installWizard_saveFirstUser=儲存並繼續
 installWizard_skipFirstUser=跳過並以 admin 繼續
-installWizard_firstUserSkippedMessage=<div class\="alert alert-warning fade in">您已略過<strong>設定管理員使用者</strong>。<br /><br />請使用帳號：「admin」和您進入安裝精靈的管理員密碼登入。</div>
+installWizard_firstUserSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning fade in">您已略過<strong>設定管理員使用者</strong>。<br /><br />請使用帳號：「admin」和您進入安裝精靈的管理員密碼登入。</div>
 installWizard_addFirstUser_title=開始使用
 
 # instance configuration page
 installWizard_configureInstance_title=執行個體組態
 installWizard_saveConfigureInstance=儲存並完成
 installWizard_skipConfigureInstance=暫時不要
-installWizard_configureInstanceSkippedMessage=<div class\="alert alert-warning fade in">您已略過設定 Jenkins URL。<br/><br/>您之後可以到「管理 Jenkins」頁面設定 Jenkins URL。</div>
+installWizard_configureInstanceSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning fade in">您已略過設定 Jenkins URL。<br/><br/>您之後可以到「管理 Jenkins」頁面設定 Jenkins URL。</div>
 
 installWizard_configureProxy_label=設定代理伺服器
 installWizard_configureProxy_save=儲存並繼續
@@ -91,6 +91,6 @@ installWizard_pluginsInstalled_banner=歡迎使用 Jenkins {0}\!
 installWizard_upgradeComplete_message=恭喜！您已升級到 Jenkins {0}。</p><p>造訪 <a rel\="noopener noreferrer" target\="_blank" href\="https\://www.jenkins.io/2.0/">Jenkins 網站</a>以了解更多新功能的資訊！
 installWizard_upgradeSkipped_title=升级
 installWizard_upgradeSkipped_banner=功能未安裝
-installWizard_upgradeSkipped_message=<div class\="alert alert-warning fade in">不會安裝推薦的外掛。</div> <p style\="padding\: 0 4px">如果您改變主意了，您可從外掛總管安裝新功能。</p> <p style\="padding\: 0 4px">Learn how these new features can improve your Jenkins experience by <a rel\="noopener noreferrer" target\="_blank" href\="https\://www.jenkins.io/2.0/">造訪首頁</a>以了解這些新功能如何提升您的 Jenkins 使用體驗。</p>
+installWizard_upgradeSkipped_message=<div class\="jenkins-alert jenkins-alert-warning fade in">不會安裝推薦的外掛。</div> <p style\="padding\: 0 4px">如果您改變主意了，您可從外掛總管安裝新功能。</p> <p style\="padding\: 0 4px">Learn how these new features can improve your Jenkins experience by <a rel\="noopener noreferrer" target\="_blank" href\="https\://www.jenkins.io/2.0/">造訪首頁</a>以了解這些新功能如何提升您的 Jenkins 使用體驗。</p>
 installWizard_upgrading_title=正在安裝外掛
 installWizard_upgradeComplete_finishButtonLabel=完成
diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css b/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css
index 80fe16c8d8e7..62ba95f86ae3 100644
--- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css
+++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css
@@ -106,7 +106,8 @@
   margin: 0;
 }
 
-.am-container .am-message .alert form {
+.am-container .am-message .alert form,
+.am-container .am-message .jenkins-alert form {
   position: relative;
   float: right;
   margin: -6px 0 0 0 !important;
@@ -115,11 +116,13 @@
   padding-left: 0.5rem;
 }
 
-.am-container .am-message .alert form span {
+.am-container .am-message .alert form span,
+.am-container .am-message .jenkins-alert form span {
   margin: 0 0 0 4px !important;
 }
 
-.am-container .am-message .alert {
+.am-container .am-message .alert,
+.am-container .am-message .jenkins-alert {
   margin-bottom: 0 !important;
 }
 
@@ -148,19 +151,19 @@
   text-decoration: var(--link-text-decoration--hover);
 }
 
-.am-container .am-list .alert-success a {
+.am-container .am-list .jenkins-alert-success a {
   color: var(--alert-success-text-color);
 }
 
-.am-container .am-list .alert-info a {
+.am-container .am-list .jenkins-alert-info a {
   color: var(--alert-info-text-color);
 }
 
-.am-container .am-list .alert-warning a {
+.am-container .am-list .jenkins-alert-warning a {
   color: var(--alert-warning-text-color);
 }
 
-.am-container .am-list .alert-danger a {
+.am-container .am-list .jenkins-alert-danger a {
   color: var(--alert-danger-text-color);
 }
 
diff --git a/core/src/main/resources/jenkins/model/BuiltInNodeMigration/message.jelly b/core/src/main/resources/jenkins/model/BuiltInNodeMigration/message.jelly
index 82037ac2e4f5..b9ea4fd3ed9c 100644
--- a/core/src/main/resources/jenkins/model/BuiltInNodeMigration/message.jelly
+++ b/core/src/main/resources/jenkins/model/BuiltInNodeMigration/message.jelly
@@ -1,6 +1,6 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-    <div class="alert alert-warning">
+    <div class="jenkins-alert jenkins-alert-warning">
         <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
             <f:submit name="yes" value="${%Apply Migration}"/>
             <f:submit name="no" value="${%Dismiss}"/>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly b/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly
index f33ac400a1f4..92bd204e2528 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <div class="alert alert-warning">
+  <div class="jenkins-alert jenkins-alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
       <f:submit name="reset" value="${%reset(it.expectedPort)}"/>
     </form>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/downgrade.jelly b/core/src/main/resources/jenkins/model/Jenkins/downgrade.jelly
index c18a88125db5..d5384588afc8 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/downgrade.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/downgrade.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <j:if test="${app.updateCenter.downgradable}">
-<div class="alert alert-warning">
+<div class="jenkins-alert jenkins-alert-warning">
   ${%Restore the previous version of Jenkins}
   <form method="post" action="${rootURL}/updateCenter/downgrade">
     <f:submit value="${%buttonText(app.updateCenter.backupVersion)}"/>
diff --git a/core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/message.jelly b/core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/message.jelly
index 0265cf145a72..de3c496235bd 100644
--- a/core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/message.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form">
-    <div class="alert alert-${it.severityAsString}">
+    <div class="jenkins-alert jenkins-alert-${it.severityAsString}">
         <form id="JavaVersionRecommendationAdminMonitor" method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
             <f:submit name="yes" value="${%More Info}"/>
             <l:isAdmin>
diff --git a/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/message.jelly b/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/message.jelly
index e61f7a4e88e2..096a8827f3cc 100644
--- a/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/message.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form">
-    <div class="alert alert-danger">
+    <div class="jenkins-alert jenkins-alert-danger">
         <form id="${it.id}" method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
             <f:submit name="yes" value="${%More Info}"/>
             <l:isAdmin>
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
index a0d22cca1196..5ecf28df34c4 100644
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
+++ b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
@@ -26,22 +26,22 @@ package jenkins.security.RekeySecretAdminMonitor
 def f = namespace(lib.FormTagLib)
 
 if (!my.isDone()) {
-    div(class:"alert alert-danger") {
+    div(class:"jenkins-alert jenkins-alert-danger") {
         raw _("pleaseRekeyAsap", app.rootDir, my.url)
     }
 }
 
 if (my.isFixingActive()) {
-    div(class:"alert alert-info") {
+    div(class:"jenkins-alert jenkins-alert-info") {
         raw _("rekeyInProgress", my.url)
     }
 } else if (my.logFile.exists()) {
     if (my.isDone()) {
-        div(class:"alert alert-info") {
+        div(class:"jenkins-alert jenkins-alert-info") {
             raw _("rekeySuccessful", my.url)
         }
     } else {
-        div(class:"alert alert-warning") {
+        div(class:"jenkins-alert jenkins-alert-warning") {
             raw _("rekeyHadProblems", my.url)
         }
     }
diff --git a/core/src/main/resources/jenkins/security/ResourceDomainRecommendation/message.groovy b/core/src/main/resources/jenkins/security/ResourceDomainRecommendation/message.groovy
index d1267f9cca3c..cb31f6204049 100644
--- a/core/src/main/resources/jenkins/security/ResourceDomainRecommendation/message.groovy
+++ b/core/src/main/resources/jenkins/security/ResourceDomainRecommendation/message.groovy
@@ -27,7 +27,7 @@ def f = namespace(lib.FormTagLib)
 def l = namespace(lib.LayoutTagLib)
 
 dl {
-    div(class: "alert alert-info") {
+    div(class: "jenkins-alert jenkins-alert-info") {
         a(name: "resource-root-url")
         l.isAdmin() {
           form(method: "post", action: "${rootURL}/${my.url}/act") {
diff --git a/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy b/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy
index 27f8d66da354..56cbb0bb4ddd 100644
--- a/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy
+++ b/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy
@@ -64,7 +64,7 @@ def listWarnings(warnings, boolean core) {
 def coreWarnings = my.activeCoreWarnings
 def pluginWarnings = my.activePluginWarningsByPlugin
 
-div(class: "alert alert-danger", role: "alert") {
+div(class: "jenkins-alert jenkins-alert-danger", role: "alert") {
 
     l.isAdmin() {
         form(method: "post", action: "${rootURL}/${my.url}/forward") {
diff --git a/core/src/main/resources/jenkins/security/apitoken/ApiTokenPropertyDisabledDefaultAdministrativeMonitor/message.jelly b/core/src/main/resources/jenkins/security/apitoken/ApiTokenPropertyDisabledDefaultAdministrativeMonitor/message.jelly
index 923a29aa38c6..0ff96ab3ebf4 100644
--- a/core/src/main/resources/jenkins/security/apitoken/ApiTokenPropertyDisabledDefaultAdministrativeMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/security/apitoken/ApiTokenPropertyDisabledDefaultAdministrativeMonitor/message.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <div class="alert alert-warning">
+    <div class="jenkins-alert jenkins-alert-warning">
         <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
             <f:submit name="yes" value="${%Disable automatic generation of legacy API tokens}"/>
             <f:submit name="no" value="${%Dismiss}"/>
diff --git a/core/src/main/resources/jenkins/security/apitoken/ApiTokenPropertyEnabledNewLegacyAdministrativeMonitor/message.jelly b/core/src/main/resources/jenkins/security/apitoken/ApiTokenPropertyEnabledNewLegacyAdministrativeMonitor/message.jelly
index 2d57564a4761..0c11b2c72142 100644
--- a/core/src/main/resources/jenkins/security/apitoken/ApiTokenPropertyEnabledNewLegacyAdministrativeMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/security/apitoken/ApiTokenPropertyEnabledNewLegacyAdministrativeMonitor/message.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <div class="alert alert-warning">
+    <div class="jenkins-alert jenkins-alert-warning">
         <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
             <f:submit name="yes" value="${%Prevent users from manually creating legacy API tokens}"/>
             <f:submit name="no" value="${%Dismiss}"/>
diff --git a/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/message.jelly b/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/message.jelly
index 05c3d673415f..376eb6ca57ca 100644
--- a/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/message.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core">
-    <div class="alert alert-warning">
+    <div class="jenkins-alert jenkins-alert-warning">
         ${%warningMessage(rootURL, it.url)}
     </div>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly b/core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly
index 14df02a36328..392a1a8677bf 100644
--- a/core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly
+++ b/core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <div class="alert alert-warning">
+    <div class="jenkins-alert jenkins-alert-warning">
         <form method="post" action="${rootURL}/${it.url}/disable">
             <f:submit value="${%Dismiss}"/>
         </form>
diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
index cd4dddd87ed5..336f4af6f7c5 100644
--- a/test/src/test/java/hudson/PluginManagerTest.java
+++ b/test/src/test/java/hudson/PluginManagerTest.java
@@ -806,7 +806,7 @@ public void noInjectionOnAvailablePluginsPage() throws Exception {
 
             PluginManagerUtil.getCheckForUpdatesButton(p).click();
             HtmlPage available = wc.goTo("pluginManager/available");
-            assertTrue(available.querySelector(".alert-danger")
+            assertTrue(available.querySelector(".jenkins-alert-danger")
                     .getTextContent().contains("This plugin is built for Jenkins 9999999"));
             wc.waitForBackgroundJavaScript(100);
 
diff --git a/war/src/main/js/templates/plugin-manager/available.hbs b/war/src/main/js/templates/plugin-manager/available.hbs
index 2810b7a13d9b..115a7b4d8e21 100644
--- a/war/src/main/js/templates/plugin-manager/available.hbs
+++ b/war/src/main/js/templates/plugin-manager/available.hbs
@@ -31,12 +31,12 @@
                 </div>
             {{/if}}
             {{#if this.newerCoreRequired }}
-                <div class="alert alert-danger">
+                <div class="jenkins-alert jenkins-alert-danger">
                     {{{ this.newerCoreRequired }}}
                 </div>
             {{/if}}
             {{#if this.unresolvedSecurityWarnings }}
-                <div class="alert alert-danger">
+                <div class="jenkins-alert jenkins-alert-danger">
                     {{ this.unresolvedSecurityWarnings.text }}
                     <ul>
                         {{#each this.unresolvedSecurityWarnings.warnings}}
@@ -50,12 +50,12 @@
                 </div>
             {{/if}}
             {{#if this.deprecated }}
-                <div class="alert alert-warning">
+                <div class="jenkins-alert jenkins-alert-warning">
                     {{{ this.deprecated }}}
                 </div>
             {{/if}}
             {{#if this.adoptMe }}
-                <div class="alert alert-warning">
+                <div class="jenkins-alert jenkins-alert-warning">
                     {{{ this.adoptMe }}}
                 </div>
             {{/if}}
diff --git a/war/src/main/scss/components/_alert.scss b/war/src/main/scss/components/_alert.scss
index 3397eeaab91d..16be23858b32 100644
--- a/war/src/main/scss/components/_alert.scss
+++ b/war/src/main/scss/components/_alert.scss
@@ -1,4 +1,5 @@
-.alert {
+.alert,
+.jenkins-alert {
   font-size: var(--font-size-sm);
   padding: 15px;
   margin-bottom: 20px;
@@ -8,47 +9,47 @@
   strong {
     font-weight: 500;
   }
-}
-
-.alert a {
-  color: inherit;
-  text-decoration: underline;
 
-  &:hover,
-  &:focus,
-  &:active {
+  a {
+    color: inherit;
     text-decoration: underline;
+
+    &:hover,
+    &:focus,
+    &:active {
+      text-decoration: underline;
+    }
   }
-}
 
-.alert-success {
-  color: var(--alert-success-text-color);
-  background-color: var(--alert-success-bg-color);
-  border-color: var(--alert-success-border-color);
-}
+  &-success {
+    color: var(--alert-success-text-color);
+    background-color: var(--alert-success-bg-color);
+    border-color: var(--alert-success-border-color);
+  }
 
-.alert-info {
-  color: var(--alert-info-text-color);
-  background-color: var(--alert-info-bg-color);
-  border-color: var(--alert-info-border-color);
-}
+  &-info {
+    color: var(--alert-info-text-color);
+    background-color: var(--alert-info-bg-color);
+    border-color: var(--alert-info-border-color);
+  }
 
-.alert-warning {
-  color: var(--alert-warning-text-color);
-  background-color: var(--alert-warning-bg-color);
-  border-color: var(--alert-warning-border-color);
-}
+  &-warning {
+    color: var(--alert-warning-text-color);
+    background-color: var(--alert-warning-bg-color);
+    border-color: var(--alert-warning-border-color);
 
-.alert-warning p {
-  color: var(--alert-warning-text-color);
-}
+    p {
+      color: var(--alert-warning-text-color);
+    }
+  }
 
-.alert-danger {
-  color: var(--alert-danger-text-color);
-  background-color: var(--alert-danger-bg-color);
-  border-color: var(--alert-danger-border-color);
-}
+  &-danger {
+    color: var(--alert-danger-text-color);
+    background-color: var(--alert-danger-bg-color);
+    border-color: var(--alert-danger-border-color);
 
-.alert-danger p {
-  color: var(--alert-danger-text-color);
+    p {
+      color: var(--alert-danger-text-color);
+    }
+  }
 }
diff --git a/war/src/main/scss/pages/_manage-jenkins.scss b/war/src/main/scss/pages/_manage-jenkins.scss
index 7b4f364cf779..706fe2e49a09 100644
--- a/war/src/main/scss/pages/_manage-jenkins.scss
+++ b/war/src/main/scss/pages/_manage-jenkins.scss
@@ -34,32 +34,29 @@
   content: ": ";
 }
 
-.manage-messages {
-  .alert:last-of-type {
+.manage-messages .alert,
+.manage-messages .jenkins-alert {
+  &:last-of-type {
     margin-bottom: 30px;
   }
-}
 
-.manage-messages .alert a {
-  text-decoration: underline;
-}
+  a {
+    text-decoration: underline;
+  }
 
-.manage-messages .alert a:hover {
-  text-decoration: underline;
-}
+  form {
+    position: relative;
+    float: right;
+    margin: -6px 0 0 !important;
+    display: flex;
+    gap: 0.5rem;
 
-.manage-messages .alert form {
-  position: relative;
-  float: right;
-  margin: -6px 0 0 !important;
-  display: flex;
-  gap: 0.5rem;
+    & > div {
+      display: contents;
+    }
 
-  & > div {
-    display: contents;
+    span {
+      margin: 0 0 0 4px !important;
+    }
   }
 }
-
-.manage-messages .alert form span {
-  margin: 0 0 0 4px !important;
-}
diff --git a/war/src/main/scss/simple-page.scss b/war/src/main/scss/simple-page.scss
index 6c6e05302218..08bb4f1493e2 100644
--- a/war/src/main/scss/simple-page.scss
+++ b/war/src/main/scss/simple-page.scss
@@ -104,6 +104,7 @@
   border-color: var(--danger-color, #c4000a);
 }
 
-.simple-page .alert {
+.simple-page .alert,
+.simple-page .jenkins-alert {
   color: var(--danger-color, #c4000a);
 }

From aaf4b64cc0f99f440e66429abc949aeb4822a695 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Sat, 18 May 2024 11:19:31 -0400
Subject: [PATCH 027/449] [JENKINS-73090] Handle CR from
 `LineTransformationOutputStream` (#9219)

* [JENKINS-73090] Handle CR from `LineTransformationOutputStream`

* Spotless

* Strengthening test to assert that actual linefeed is passed to `eol`

* Also needed to adjust `HyperlinkNote` trick
---
 .../java/hudson/console/HyperlinkNote.java    |  6 +-
 .../LineTransformationOutputStream.java       | 13 +++-
 .../LineTransformationOutputStreamTest.java   | 67 +++++++++++++++++++
 3 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 core/src/test/java/hudson/console/LineTransformationOutputStreamTest.java

diff --git a/core/src/main/java/hudson/console/HyperlinkNote.java b/core/src/main/java/hudson/console/HyperlinkNote.java
index 93e2ff40f493..1e582dab2b4a 100644
--- a/core/src/main/java/hudson/console/HyperlinkNote.java
+++ b/core/src/main/java/hudson/console/HyperlinkNote.java
@@ -88,10 +88,8 @@ static String encodeTo(String url, String text, BiFunction<String, Integer, Cons
         // If text contains newlines, then its stored length will not match its length when being
         // displayed, since the display length will only include text up to the first newline,
         // which will cause an IndexOutOfBoundsException in MarkupText#rangeCheck when
-        // ConsoleAnnotationOutputStream converts the note into markup. That stream treats '\n' as
-        // the sole end-of-line marker on all platforms, so we ignore '\r' because it will not
-        // break the conversion.
-        text = text.replace('\n', ' ');
+        // ConsoleAnnotationOutputStream converts the note into markup.
+        text = text.replace('\n', ' ').replace('\r', ' ');
         try {
             return constructor.apply(url, text.length()).encode() + text;
         } catch (IOException e) {
diff --git a/core/src/main/java/hudson/console/LineTransformationOutputStream.java b/core/src/main/java/hudson/console/LineTransformationOutputStream.java
index e5d84ee770ce..3e31f4b51bd1 100644
--- a/core/src/main/java/hudson/console/LineTransformationOutputStream.java
+++ b/core/src/main/java/hudson/console/LineTransformationOutputStream.java
@@ -38,6 +38,7 @@
  * @since 1.349
  */
 public abstract class LineTransformationOutputStream extends OutputStream {
+    private boolean sawCR;
     private ByteArrayOutputStream2 buf = new ByteArrayOutputStream2();
 
     /**
@@ -53,8 +54,15 @@ public abstract class LineTransformationOutputStream extends OutputStream {
 
     @Override
     public void write(int b) throws IOException {
+        if (sawCR && b != '\n') {
+            eol();
+        }
         buf.write(b);
-        if (b == LF) eol();
+        if (b == '\n') {
+            eol();
+        } else if (b == '\r') {
+            sawCR = true;
+        }
     }
 
     private void eol() throws IOException {
@@ -65,6 +73,7 @@ private void eol() throws IOException {
             buf = new ByteArrayOutputStream2();
         else
             buf.reset();
+        sawCR = false;
     }
 
     @Override
@@ -110,8 +119,6 @@ protected String trimEOL(String line) {
         return line;
     }
 
-    private static final int LF = 0x0A;
-
     /**
      * Convenience subclass for cases where you wish to process lines being sent to an underlying stream.
      * {@link #eol} will typically {@link OutputStream#write(byte[], int, int)} to {@link #out}.
diff --git a/core/src/test/java/hudson/console/LineTransformationOutputStreamTest.java b/core/src/test/java/hudson/console/LineTransformationOutputStreamTest.java
new file mode 100644
index 000000000000..d9fefc29123d
--- /dev/null
+++ b/core/src/test/java/hudson/console/LineTransformationOutputStreamTest.java
@@ -0,0 +1,67 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2024 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.console;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.is;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.atomic.AtomicLong;
+import org.junit.Test;
+
+public final class LineTransformationOutputStreamTest {
+
+    @Test public void nl() throws Exception {
+        test("\n");
+    }
+
+    @Test public void crnl() throws Exception {
+        test("\r\n");
+    }
+
+    @Test public void cr() throws Exception {
+        test("\r");
+    }
+
+    private void test(String linefeed) throws Exception {
+        var count = new AtomicLong();
+        long max = 1_000_000; // to see OOME in cr without fix: 1_000_000_000
+        try (var counter = new LineTransformationOutputStream() {
+            @Override protected void eol(byte[] b, int len) throws IOException {
+                var line = new String(b, 0, len);
+                assertThat(line, endsWith(linefeed));
+                count.addAndGet(Integer.parseInt(trimEOL(line)));
+            }
+        }) {
+            for (long i = 0; i < max; i++) {
+                counter.write((i + linefeed).getBytes(StandardCharsets.UTF_8));
+            }
+        }
+        assertThat(count.get(), is((max * (max - 1)) / 2));
+    }
+
+}

From 94f715407c494d4c0efefd0bd8324d73f97904c7 Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Sat, 18 May 2024 16:20:56 +0100
Subject: [PATCH 028/449] Ensure `ClassLoader`s have names for debugging
 (#9277)

* Ensure Classloaders have names for debugging

* update incremental version

* simplify name of UberClassloader and update since TODOs

Co-authored-by: Jesse Glick <jglick@cloudbees.com>

* use released version of remoting

* set the minimum version of remoting

* pick up backward compatable remoting version

* update from remoting incremental version to release version

https://github.com/jenkinsci/remoting/releases/tag/3248.v65ecb_254c298

---------

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
---
 .../java/hudson/ClassicPluginStrategy.java    | 30 +++++++++++++++----
 .../java/hudson/PluginFirstClassLoader2.java  |  5 ++--
 core/src/main/java/hudson/PluginManager.java  |  4 +--
 .../java/hudson/util/MaskingClassLoader.java  |  2 +-
 .../java/jenkins/util/URLClassLoader2.java    | 29 ++++++++++++++++++
 .../test/java/hudson/PluginWrapperTest.java   |  2 +-
 pom.xml                                       |  2 +-
 war/src/main/java/executable/Main.java        |  2 +-
 8 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 10b0d179fdd7..d9b37f0fac29 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -52,6 +52,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
@@ -235,7 +236,11 @@ private static Manifest loadLinkedManifest(File archive) throws IOException {
         dependencyLoader = getBaseClassLoader(atts, dependencyLoader);
 
         return new PluginWrapper(pluginManager, archive, manifest, baseResourceURL,
-                createClassLoader(paths, dependencyLoader, atts), disableFile, dependencies, optionalDependencies);
+                createClassLoader(computeClassLoaderName(manifest, archive), paths, dependencyLoader, atts), disableFile, dependencies, optionalDependencies);
+    }
+
+    private static String computeClassLoaderName(Manifest mf, File archive) {
+        return "PluginClassLoader for " + PluginWrapper.computeShortName(mf, archive.getName());
     }
 
     private void fix(Attributes atts, List<PluginWrapper.Dependency> optionalDependencies) {
@@ -263,15 +268,28 @@ public static List<PluginWrapper.Dependency> getImpliedDependencies(String plugi
         return DetachedPluginsUtil.getImpliedDependencies(pluginName, jenkinsVersion);
     }
 
-    @Deprecated
+    /**
+     * @deprecated since TODO use {@link #createClassLoader(String, List, ClassLoader, Attributes)}
+     */
+    @Deprecated(since = "TODO")
     protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent) throws IOException {
         return createClassLoader(paths, parent, null);
     }
 
     /**
-     * Creates the classloader that can load all the specified jar files and delegate to the given parent.
+     * @deprecated since TODO use {@link #createClassLoader(String, List, ClassLoader, Attributes)}
      */
+    @Deprecated(since="TODO")
     protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, Attributes atts) throws IOException {
+        // generate a legacy id so at least we can track to something
+        return createClassLoader("unidentified-" + UUID.randomUUID(), paths, parent, atts);
+    }
+
+    /**
+     * Creates a  classloader that can load all the specified jar files and delegate to the given parent.
+     * @since TODO
+     */
+    protected ClassLoader createClassLoader(String name, List<File> paths, ClassLoader parent, Attributes atts) throws IOException {
         boolean usePluginFirstClassLoader =
                 atts != null && Boolean.parseBoolean(atts.getValue("PluginFirstClassLoader"));
 
@@ -285,9 +303,9 @@ protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, At
         }
         URLClassLoader2 classLoader;
         if (usePluginFirstClassLoader) {
-            classLoader = new PluginFirstClassLoader2(urls.toArray(new URL[0]), parent);
+            classLoader = new PluginFirstClassLoader2(name, urls.toArray(new URL[0]), parent);
         } else {
-            classLoader = new URLClassLoader2(urls.toArray(new URL[0]), parent);
+            classLoader = new URLClassLoader2(name, urls.toArray(new URL[0]), parent);
         }
         return classLoader;
     }
@@ -561,7 +579,7 @@ static final class DependencyClassLoader extends ClassLoader {
         }
 
         DependencyClassLoader(ClassLoader parent, File archive, List<Dependency> dependencies, PluginManager pluginManager) {
-            super(parent);
+            super("dependency ClassLoader for " + archive.getPath(), parent);
             this._for = archive;
             this.dependencies = List.copyOf(dependencies);
             this.pluginManager = pluginManager;
diff --git a/core/src/main/java/hudson/PluginFirstClassLoader2.java b/core/src/main/java/hudson/PluginFirstClassLoader2.java
index 974939d53acb..30618835c8a7 100644
--- a/core/src/main/java/hudson/PluginFirstClassLoader2.java
+++ b/core/src/main/java/hudson/PluginFirstClassLoader2.java
@@ -25,8 +25,9 @@ public class PluginFirstClassLoader2 extends URLClassLoader2 {
         registerAsParallelCapable();
     }
 
-    public PluginFirstClassLoader2(@NonNull URL[] urls, @NonNull ClassLoader parent) {
-        super(Objects.requireNonNull(urls), Objects.requireNonNull(parent));
+
+    public PluginFirstClassLoader2(String name, @NonNull URL[] urls, @NonNull ClassLoader parent) {
+        super(name, Objects.requireNonNull(urls), Objects.requireNonNull(parent));
     }
 
     /**
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 1fd5358454a6..0cb02b65b9c1 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -1099,7 +1099,7 @@ protected void copyBundledPlugin(URL src, String fileName) throws IOException {
     }
 
     /*package*/ static @CheckForNull Manifest parsePluginManifest(URL bundledJpi) {
-        try (URLClassLoader cl = new URLClassLoader(new URL[]{bundledJpi})) {
+        try (URLClassLoader cl = new URLClassLoader("Temporary classloader for parsing " + bundledJpi.toString(), new URL[]{bundledJpi}, ClassLoader.getSystemClassLoader())) {
             InputStream in = null;
             try {
                 URL res = cl.findResource(PluginWrapper.MANIFEST_FILENAME);
@@ -2337,7 +2337,7 @@ public static final class UberClassLoader extends ClassLoader {
         }
 
         public UberClassLoader(List<PluginWrapper> activePlugins) {
-            super(PluginManager.class.getClassLoader());
+            super("UberClassLoader", PluginManager.class.getClassLoader());
             this.activePlugins = activePlugins;
         }
 
diff --git a/core/src/main/java/hudson/util/MaskingClassLoader.java b/core/src/main/java/hudson/util/MaskingClassLoader.java
index 74bbbe1a9863..dfad754fc170 100644
--- a/core/src/main/java/hudson/util/MaskingClassLoader.java
+++ b/core/src/main/java/hudson/util/MaskingClassLoader.java
@@ -59,7 +59,7 @@ public MaskingClassLoader(ClassLoader parent, String... masks) {
     }
 
     public MaskingClassLoader(ClassLoader parent, Collection<String> masks) {
-        super(parent);
+        super("Masking ClassLoader of " + parent.getName(), parent);
         this.masksClasses = List.copyOf(masks);
 
         /*
diff --git a/core/src/main/java/jenkins/util/URLClassLoader2.java b/core/src/main/java/jenkins/util/URLClassLoader2.java
index 72611bc49432..3fdedcbeada0 100644
--- a/core/src/main/java/jenkins/util/URLClassLoader2.java
+++ b/core/src/main/java/jenkins/util/URLClassLoader2.java
@@ -17,14 +17,43 @@ public class URLClassLoader2 extends URLClassLoader implements JenkinsClassLoade
         registerAsParallelCapable();
     }
 
+    /**
+     * @deprecated use {@link URLClassLoader2#URLClassLoader2(String, URL[])}
+     */
+    @Deprecated(since = "TODO")
     public URLClassLoader2(URL[] urls) {
         super(urls);
     }
 
+    /**
+     * @deprecated use {@link URLClassLoader2#URLClassLoader2(String, URL[], ClassLoader)}
+     */
+    @Deprecated(since = "TODO")
     public URLClassLoader2(URL[] urls, ClassLoader parent) {
         super(urls, parent);
     }
 
+    /**
+     * Create a new {@link URLClassLoader2} with the given name and URLS and the {@link #getSystemClassLoader()} as its parent.
+     * @param name name of this classloader.
+     * @param urls the list of URLS to find classes in.
+     * @since TODO
+     */
+    public URLClassLoader2(String name, URL[] urls) {
+        super(name, urls, getSystemClassLoader());
+    }
+
+    /**
+     *  Create a new {@link URLClassLoader2} with the given name, URLS parent.
+     * @param name name of this classloader.
+     * @param urls the list of URLS to find classes in.
+     * @param parent the parent to search for classes before we look in the {@code urls}
+     * @since TODO
+     */
+    public URLClassLoader2(String name, URL[] urls, ClassLoader parent) {
+        super(name, urls, parent);
+    }
+
     @Override
     public void addURL(URL url) {
         super.addURL(url);
diff --git a/core/src/test/java/hudson/PluginWrapperTest.java b/core/src/test/java/hudson/PluginWrapperTest.java
index 32c24d8abf36..c33877a3b6fe 100644
--- a/core/src/test/java/hudson/PluginWrapperTest.java
+++ b/core/src/test/java/hudson/PluginWrapperTest.java
@@ -105,7 +105,7 @@ public void dependencyFailedToLoad() {
     @Issue("JENKINS-66563")
     @Test
     public void insertJarsIntoClassPath() throws Exception {
-        try (URLClassLoader2 cl = new URLClassLoader2(new URL[0])) {
+        try (URLClassLoader2 cl = new URLClassLoader2("Test", new URL[0])) {
             assertInjectingJarsWorks(cl);
         }
     }
diff --git a/pom.xml b/pom.xml
index 6293399fbd82..746a43c8ee6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>3206.vb_15dcf73f6a_9</remoting.version>
+    <remoting.version>3248.v65ecb_254c298</remoting.version>
     <!-- Minimum Remoting version, which is tested for API compatibility -->
     <remoting.minimum.supported.version>4.13</remoting.minimum.supported.version>
 
diff --git a/war/src/main/java/executable/Main.java b/war/src/main/java/executable/Main.java
index a746a28a4ee6..410392f96202 100644
--- a/war/src/main/java/executable/Main.java
+++ b/war/src/main/java/executable/Main.java
@@ -266,7 +266,7 @@ public static void main(String[] args) throws IllegalAccessException {
         // locate the Winstone launcher
         ClassLoader cl;
         try {
-            cl = new URLClassLoader(new URL[] {tmpJar.toURI().toURL()});
+            cl = new URLClassLoader("Jenkins Main ClassLoader", new URL[] {tmpJar.toURI().toURL()}, ClassLoader.getSystemClassLoader());
         } catch (MalformedURLException e) {
             throw new UncheckedIOException(e);
         }

From c0c19997c294286a499906bf0ffc42eafb4882e7 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sat, 18 May 2024 17:24:11 +0200
Subject: [PATCH 029/449] move the header parts in a taglib (#9223)

the taglib allows plugins to make use of the searchbox and the login
stuff while easily being able to modify all the other aspects of the
header.
---
 .../views/JenkinsHeader/headerContent.jelly   | 78 +------------------
 .../resources/lib/layout/header/login.jelly   | 37 +++++++++
 .../resources/lib/layout/header/logo.jelly    | 18 +++++
 .../lib/layout/header/searchbox.jelly         | 25 ++++++
 .../main/resources/lib/layout/header/taglib   |  1 +
 5 files changed, 85 insertions(+), 74 deletions(-)
 create mode 100644 core/src/main/resources/lib/layout/header/login.jelly
 create mode 100644 core/src/main/resources/lib/layout/header/logo.jelly
 create mode 100644 core/src/main/resources/lib/layout/header/searchbox.jelly
 create mode 100644 core/src/main/resources/lib/layout/header/taglib

diff --git a/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly b/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly
index ce78d10d37e2..1f22ef506358 100644
--- a/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly
+++ b/core/src/main/resources/jenkins/views/JenkinsHeader/headerContent.jelly
@@ -1,78 +1,8 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:i="jelly:fmt" xmlns:x="jelly:xml">
+<j:jelly xmlns:j="jelly:core" xmlns:h="/lib/layout/header">
     <header id="page-header" class="page-header">
-        <div class="page-header__brand">
-            <div class="logo">
-                <a id="jenkins-home-link" href="${rootURL}/">
-                    <img id="jenkins-head-icon" src="${imagesURL}/svgs/logo.svg" alt="[${logoAlt}]" />
-                    <img id="jenkins-name-icon" src="${imagesURL}/title.svg" alt="${title}" width="139" height="34" />
-                </a>
-            </div>
-
-            <a class="page-header__brand-link" href="${rootURL}/">
-                <img src="${imagesURL}/svgs/logo.svg"
-                     alt="[${logoAlt}]"
-                     class="page-header__brand-image" />
-                <span class="page-header__brand-name">Jenkins</span>
-            </a>
-        </div>
-
-        <div class="searchbox hidden-xs">
-            <!-- search box -->
-            <j:set var="searchURL" value="${h.searchURL}"/>
-            <form action="${searchURL}" method="get" style="position:relative;" class="no-json" name="search" role="search">
-                <!-- this div is used to calculate the width of the text box -->
-                <div id="search-box-sizer"/>
-                <div id="searchform">
-                    <input name="q" placeholder="${searchPlaceholder}" id="search-box" class="main-search__input" value="${request.getParameter('q')}" role="searchbox" />
-
-                    <span class="main-search__icon-leading">
-                        <l:icon src="symbol-search"/>
-                    </span>
-                    <a href="${searchHelpUrl}" class="main-search__icon-trailing">
-                        <l:icon src="symbol-help-circle"/>
-                    </a>
-
-                    <div id="search-box-completion" data-search-url="${searchURL}" />
-                    <st:adjunct includes="jenkins.views.JenkinsHeader.search-box" />
-                </div>
-            </form>
-        </div>
-
-        <div class="login page-header__hyperlinks">
-            <div id="visible-am-insertion" class="page-header__am-wrapper" />
-            <div id="visible-sec-am-insertion" class="page-header__am-wrapper" />
-
-            <!-- user icon and login/logout links; only show if authentication is enabled and we're not handling a servlet error -->
-            <j:if test="${app.useSecurity}">
-                <j:choose>
-                    <j:when test="${!h.isAnonymous()}">
-                        <j:invokeStatic var="user" className="hudson.model.User" method="current" />
-                        <j:choose>
-                            <j:when test="${user.fullName == null || user.fullName.trim().isEmpty()}">
-                                <j:set var="userName" value="${user.id}"/>
-                            </j:when>
-                            <j:otherwise>
-                                <j:set var="userName" value="${user.fullName}"/>
-                            </j:otherwise>
-                        </j:choose>
-                        <a href="${rootURL}/${user.url}" class="model-link">
-                            <l:icon src="symbol-person-circle" class="icon-md"/>
-                            <span class="hidden-xs hidden-sm">${userName}</span>
-                        </a>
-                        <j:if test="${app.securityRealm.canLogOut()}">
-                            <a href="${rootURL}/logout">
-                                <l:icon src="symbol-log-out" class="icon-md" />
-                                <span class="hidden-xs hidden-sm">${logout}</span>
-                            </a>
-                        </j:if>
-                    </j:when>
-                    <j:otherwise>
-                        <st:include it="${app.securityRealm}" page="loginLink.jelly" />
-                    </j:otherwise>
-                </j:choose>
-            </j:if>
-        </div>
+      <h:logo/>
+      <h:searchbox/>
+      <h:login/>
     </header>
-    <script src="${resURL}/jsbundles/keyboard-shortcuts.js" type="text/javascript"/>
 </j:jelly>
diff --git a/core/src/main/resources/lib/layout/header/login.jelly b/core/src/main/resources/lib/layout/header/login.jelly
new file mode 100644
index 000000000000..f546b5d28f11
--- /dev/null
+++ b/core/src/main/resources/lib/layout/header/login.jelly
@@ -0,0 +1,37 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+  <div class="login page-header__hyperlinks">
+    <div id="visible-am-insertion" class="page-header__am-wrapper" />
+    <div id="visible-sec-am-insertion" class="page-header__am-wrapper" />
+
+    <!-- user icon and login/logout links; only show if authentication is enabled and we're not handling a servlet error -->
+    <j:if test="${app.useSecurity}">
+      <j:choose>
+        <j:when test="${!h.isAnonymous()}">
+          <j:invokeStatic var="user" className="hudson.model.User" method="current" />
+          <j:choose>
+            <j:when test="${user.fullName == null || user.fullName.trim().isEmpty()}">
+              <j:set var="userName" value="${user.id}"/>
+            </j:when>
+            <j:otherwise>
+              <j:set var="userName" value="${user.fullName}"/>
+            </j:otherwise>
+          </j:choose>
+          <a href="${rootURL}/${user.url}" class="model-link">
+            <l:icon src="symbol-person-circle" class="icon-md"/>
+            <span class="hidden-xs hidden-sm">${userName}</span>
+          </a>
+          <j:if test="${app.securityRealm.canLogOut()}">
+            <a href="${rootURL}/logout">
+              <l:icon src="symbol-log-out" class="icon-md" />
+              <span class="hidden-xs hidden-sm">${logout}</span>
+            </a>
+          </j:if>
+        </j:when>
+        <j:otherwise>
+          <st:include it="${app.securityRealm}" page="loginLink.jelly" />
+        </j:otherwise>
+      </j:choose>
+    </j:if>
+  </div>
+</j:jelly>
diff --git a/core/src/main/resources/lib/layout/header/logo.jelly b/core/src/main/resources/lib/layout/header/logo.jelly
new file mode 100644
index 000000000000..4bdb29cea7ec
--- /dev/null
+++ b/core/src/main/resources/lib/layout/header/logo.jelly
@@ -0,0 +1,18 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core">
+  <div class="page-header__brand">
+    <div class="logo">
+      <a id="jenkins-home-link" href="${rootURL}/">
+        <img id="jenkins-head-icon" src="${imagesURL}/svgs/logo.svg" alt="[${logoAlt}]" />
+        <img id="jenkins-name-icon" src="${imagesURL}/title.svg" alt="${title}" width="139" height="34" />
+      </a>
+    </div>
+
+    <a class="page-header__brand-link" href="${rootURL}/">
+      <img src="${imagesURL}/svgs/logo.svg"
+           alt="[${logoAlt}]"
+           class="page-header__brand-image" />
+      <span class="page-header__brand-name">Jenkins</span>
+    </a>
+  </div>
+</j:jelly>
diff --git a/core/src/main/resources/lib/layout/header/searchbox.jelly b/core/src/main/resources/lib/layout/header/searchbox.jelly
new file mode 100644
index 000000000000..916f5ad49c22
--- /dev/null
+++ b/core/src/main/resources/lib/layout/header/searchbox.jelly
@@ -0,0 +1,25 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+  <div class="searchbox hidden-xs">
+    <!-- search box -->
+    <j:set var="searchURL" value="${h.searchURL}"/>
+    <form action="${searchURL}" method="get" style="position:relative;" class="no-json" name="search" role="search">
+      <!-- this div is used to calculate the width of the text box -->
+      <div id="search-box-sizer"/>
+      <div id="searchform">
+        <input name="q" placeholder="${searchPlaceholder}" id="search-box" class="main-search__input" value="${request.getParameter('q')}" role="searchbox" />
+
+        <span class="main-search__icon-leading">
+          <l:icon src="symbol-search"/>
+        </span>
+        <a href="${searchHelpUrl}" class="main-search__icon-trailing">
+          <l:icon src="symbol-help-circle"/>
+        </a>
+
+        <div id="search-box-completion" data-search-url="${searchURL}" />
+        <st:adjunct includes="jenkins.views.JenkinsHeader.search-box" />
+      </div>
+    </form>
+  </div>
+  <script src="${resURL}/jsbundles/keyboard-shortcuts.js" type="text/javascript"/>
+</j:jelly>
diff --git a/core/src/main/resources/lib/layout/header/taglib b/core/src/main/resources/lib/layout/header/taglib
new file mode 100644
index 000000000000..43777e443981
--- /dev/null
+++ b/core/src/main/resources/lib/layout/header/taglib
@@ -0,0 +1 @@
+Tag library that defines components for headers

From cf9b6382444135142c2ca2aab2ddfa408e5703a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 May 2024 09:41:15 -0700
Subject: [PATCH 030/449] Bump org.jenkins-ci.plugins.workflow:workflow-api
 from 1291.v51fd2a_625da_7 to 1311.v4250456a_e552 (#9285)

---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 3523fe70d00e..b7b7734be6df 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -116,7 +116,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-api</artifactId>
-        <version>1291.v51fd2a_625da_7</version>
+        <version>1311.v4250456a_e552</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index fd636c87e4f9..1aa72c6dadb8 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -260,7 +260,7 @@ THE SOFTWARE.
                   <!-- dependency of junit, plugin-util-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>1291.v51fd2a_625da_7</version>
+                  <version>1311.v4250456a_e552</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 0117bf3e34ac08a91bea14f09e4b2fd3679ce8ca Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 18 May 2024 09:42:08 -0700
Subject: [PATCH 031/449] [JENKINS-73170] Upgrade Commons FileUpload from 1.5
 to 2.0.0-M2 (#9259)

---
 bom/pom.xml                                   |  43 ++++-
 core/pom.xml                                  |  12 +-
 core/src/main/java/hudson/FilePath.java       |  15 +-
 core/src/main/java/hudson/PluginManager.java  |  28 ++-
 .../hudson/model/FileParameterDefinition.java |   4 +-
 .../java/hudson/model/FileParameterValue.java | 178 +++++++++++++++---
 .../hudson/util/MultipartFormDataParser.java  |  49 +++--
 core/src/main/java/jenkins/model/Jenkins.java |   2 +-
 .../FileParameterValuePersistenceTest.java    |   2 +-
 .../jenkins/security/Security3030Test.java    |  37 ++--
 10 files changed, 290 insertions(+), 80 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 4d4ae6622938..bbbfee874304 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -38,8 +38,9 @@ THE SOFTWARE.
   <description>The module contains dependencies that are used by a specific Jenkins version</description>
 
   <properties>
+    <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <slf4jVersion>2.0.13</slf4jVersion>
-    <stapler.version>1860.vb_89682cf8d96</stapler.version>
+    <stapler.version>1863.vd250086e9885</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
@@ -119,11 +120,6 @@ THE SOFTWARE.
         <artifactId>commons-collections</artifactId>
         <version>3.2.2</version>
       </dependency>
-      <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <version>1.5</version>
-      </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
@@ -189,6 +185,41 @@ THE SOFTWARE.
         <artifactId>commons-compress</artifactId>
         <version>1.26.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-fileupload2</artifactId>
+        <version>${commons-fileupload2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-fileupload2-core</artifactId>
+        <version>${commons-fileupload2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-fileupload2-distribution</artifactId>
+        <version>${commons-fileupload2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
+        <version>${commons-fileupload2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
+        <version>${commons-fileupload2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-fileupload2-javax</artifactId>
+        <version>${commons-fileupload2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-fileupload2-portlet</artifactId>
+        <version>${commons-fileupload2.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-all</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index faef477b9cd2..3b12be43fbd0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -160,10 +160,6 @@ THE SOFTWARE.
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -284,6 +280,14 @@ THE SOFTWARE.
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-fileupload2-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-fileupload2-javax</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 3525b931ef78..b0cf56bf907d 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -80,6 +80,7 @@
 import java.io.OutputStreamWriter;
 import java.io.RandomAccessFile;
 import java.io.Serializable;
+import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -132,7 +133,7 @@
 import jenkins.util.VirtualFile;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
 import org.apache.commons.io.input.CountingInputStream;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -1166,7 +1167,9 @@ public void copyFrom(FilePath src) throws IOException, InterruptedException {
     public void copyFrom(FileItem file) throws IOException, InterruptedException {
         if (channel == null) {
             try {
-                file.write(new File(remote));
+                file.write(Paths.get(remote));
+            } catch (UncheckedIOException e) {
+                throw e.getCause();
             } catch (IOException e) {
                 throw e;
             } catch (Exception e) {
@@ -1180,6 +1183,14 @@ public void copyFrom(FileItem file) throws IOException, InterruptedException {
         }
     }
 
+    /**
+     * @deprecated use {@link #copyFrom(FileItem)}
+     */
+    @Deprecated
+    public void copyFrom(org.apache.commons.fileupload.FileItem file) throws IOException, InterruptedException {
+        copyFrom(file.toFileUpload2FileItem());
+    }
+
     /**
      * Code that gets executed on the machine where the {@link FilePath} is local.
      * Used to act on {@link FilePath}.
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 0cb02b65b9c1..5d80c6e623e4 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -139,10 +139,12 @@
 import jenkins.util.xml.RestrictiveEntityResolver;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItem;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.javax.JavaxServletDiskFileUpload;
+import org.apache.commons.fileupload2.javax.JavaxServletFileUpload;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
@@ -1832,13 +1834,21 @@ static class FileUploadPluginCopier implements PluginCopier {
         }
 
         @Override
-        public void copy(File target) throws Exception {
-            fileItem.write(target);
+        public void copy(File target) throws IOException {
+            try {
+                fileItem.write(Util.fileToPath(target));
+            } catch (UncheckedIOException e) {
+                throw e.getCause();
+            }
         }
 
         @Override
         public void cleanup() {
-            fileItem.delete();
+            try {
+                fileItem.delete();
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
         }
     }
 
@@ -1873,8 +1883,8 @@ public HttpResponse doUploadPlugin(StaplerRequest req) throws IOException, Servl
             String fileName = "";
             PluginCopier copier;
             File tmpDir = Files.createTempDirectory("uploadDir").toFile();
-            ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, tmpDir));
-            List<FileItem> items = upload.parseRequest(req);
+            JavaxServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JavaxServletDiskFileUpload(DiskFileItemFactory.builder().setFile(tmpDir).get());
+            List<DiskFileItem> items = upload.parseRequest(req);
             String string = items.get(1).getString();
             if (string != null && !string.isBlank()) {
                 // this is a URL deployment
diff --git a/core/src/main/java/hudson/model/FileParameterDefinition.java b/core/src/main/java/hudson/model/FileParameterDefinition.java
index 343dd5831203..25cb08336da3 100644
--- a/core/src/main/java/hudson/model/FileParameterDefinition.java
+++ b/core/src/main/java/hudson/model/FileParameterDefinition.java
@@ -35,7 +35,7 @@
 import java.util.Objects;
 import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
 import org.apache.commons.io.FileUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -90,7 +90,7 @@ public String getHelpFile() {
     public ParameterValue createValue(StaplerRequest req) {
         FileItem src;
         try {
-            src = req.getFileItem(getName());
+            src = req.getFileItem2(getName());
         } catch (ServletException | IOException e) {
             // Not sure what to do here. We might want to raise this
             // but that would involve changing the throws for this call
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
index 1d9bade1e31c..343e30bb64f4 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -39,11 +39,13 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.regex.Pattern;
 import jenkins.util.SystemProperties;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemHeaders;
-import org.apache.commons.fileupload.util.FileItemHeadersImpl;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileItemFactory;
+import org.apache.commons.fileupload2.core.FileItemHeaders;
+import org.apache.commons.fileupload2.core.FileItemHeadersProvider;
 import org.apache.commons.io.FilenameUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -90,8 +92,16 @@ public FileParameterValue(String name, FileItem file) {
         this(name, file, FilenameUtils.getName(file.getName()));
     }
 
+    /**
+     * @deprecated use {@link #FileParameterValue(String, FileItem)}
+     */
+    @Deprecated
+    public FileParameterValue(String name, org.apache.commons.fileupload.FileItem file) {
+        this(name, file.toFileUpload2FileItem(), FilenameUtils.getName(file.getName()));
+    }
+
     public FileParameterValue(String name, File file, String originalFileName) {
-        this(name, new FileItemImpl(file), originalFileName);
+        this(name, new FileItemImpl2(file), originalFileName);
     }
 
     protected FileParameterValue(String name, FileItem file, String originalFileName) {
@@ -139,10 +149,18 @@ public String getOriginalFileName() {
         return originalFileName;
     }
 
-    public FileItem getFile() {
+    public FileItem getFile2() {
         return file;
     }
 
+    /**
+     * @deprecated use {@link #getFile2}
+     */
+    @Deprecated
+    public org.apache.commons.fileupload.FileItem getFile() {
+        return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(getFile2());
+    }
+
     @Override
     public BuildWrapper createBuildWrapper(AbstractBuild<?, ?> build) {
         return new BuildWrapper() {
@@ -241,11 +259,120 @@ private File getFileParameterFolderUnderBuild(AbstractBuild<?, ?> build) {
 
     /**
      * Default implementation from {@link File}.
+     *
+     * @deprecated use {@link FileItemImpl2}
      */
-    public static final class FileItemImpl implements FileItem {
-        private final File file;
+    @Deprecated
+    public static final class FileItemImpl implements org.apache.commons.fileupload.FileItem {
+        private final FileItem delegate;
 
         public FileItemImpl(File file) {
+            if (file == null) {
+                throw new NullPointerException("file");
+            }
+            this.delegate = new FileItemImpl2(file);
+        }
+
+        @Override
+        public InputStream getInputStream() throws IOException {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getInputStream();
+        }
+
+        @Override
+        public String getContentType() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getContentType();
+        }
+
+        @Override
+        @SuppressFBWarnings(value = "FILE_UPLOAD_FILENAME", justification = "for compatibility")
+        public String getName() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getName();
+        }
+
+        @Override
+        public boolean isInMemory() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).isInMemory();
+        }
+
+        @Override
+        public long getSize() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getSize();
+        }
+
+        @Override
+        public byte[] get() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).get();
+        }
+
+        @Override
+        public String getString(String encoding) throws UnsupportedEncodingException {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getString(encoding);
+        }
+
+        @Override
+        public String getString() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getString();
+        }
+
+        @Override
+        public void write(File to) throws Exception {
+            org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).write(to);
+        }
+
+        @Override
+        public void delete() {
+            org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).delete();
+        }
+
+        @Override
+        public String getFieldName() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getFieldName();
+        }
+
+        @Override
+        public void setFieldName(String name) {
+            org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).setFieldName(name);
+        }
+
+        @Override
+        public boolean isFormField() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).isFormField();
+        }
+
+        @Override
+        public void setFormField(boolean state) {
+            org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).setFormField(state);
+        }
+
+        @Override
+        @Deprecated
+        public OutputStream getOutputStream() throws IOException {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getOutputStream();
+        }
+
+        @Override
+        public org.apache.commons.fileupload.FileItemHeaders getHeaders() {
+            return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).getHeaders();
+        }
+
+        @Override
+        public void setHeaders(org.apache.commons.fileupload.FileItemHeaders headers) {
+            org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(delegate).setHeaders(headers);
+        }
+
+        @Override
+        public FileItem toFileUpload2FileItem() {
+            return delegate;
+        }
+    }
+
+    /**
+     * Default implementation from {@link File}.
+     */
+    public static final class FileItemImpl2 implements FileItem {
+        private final File file;
+
+        public FileItemImpl2(File file) {
             if (file == null) {
                 throw new NullPointerException("file");
             }
@@ -287,8 +414,12 @@ public byte[] get() {
         }
 
         @Override
-        public String getString(String encoding) throws UnsupportedEncodingException {
-            return new String(get(), encoding);
+        public String getString(Charset toCharset) throws IOException {
+            try {
+                return new String(get(), toCharset);
+            } catch (UncheckedIOException e) {
+                throw e.getCause();
+            }
         }
 
         @Override
@@ -297,17 +428,19 @@ public String getString() {
         }
 
         @Override
-        public void write(File to) throws Exception {
-            new FilePath(file).copyTo(new FilePath(to));
+        public FileItem write(Path to) throws IOException {
+            try {
+                new FilePath(file).copyTo(new FilePath(to.toFile()));
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            return this;
         }
 
         @Override
-        public void delete() {
-            try {
-                Files.deleteIfExists(file.toPath());
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
+        public FileItem delete() throws IOException {
+            Files.deleteIfExists(Util.fileToPath(file));
+            return this;
         }
 
         @Override
@@ -316,7 +449,8 @@ public String getFieldName() {
         }
 
         @Override
-        public void setFieldName(String name) {
+        public FileItem setFieldName(String name) {
+            return this;
         }
 
         @Override
@@ -325,7 +459,8 @@ public boolean isFormField() {
         }
 
         @Override
-        public void setFormField(boolean state) {
+        public FileItem setFormField(boolean state) {
+            return this;
         }
 
         @Override
@@ -336,11 +471,12 @@ public OutputStream getOutputStream() throws IOException {
 
         @Override
         public FileItemHeaders getHeaders() {
-            return new FileItemHeadersImpl();
+            return FileItemFactory.AbstractFileItemBuilder.newFileItemHeaders();
         }
 
         @Override
-        public void setHeaders(FileItemHeaders headers) {
+        public FileItemHeadersProvider setHeaders(FileItemHeaders headers) {
+            return this;
         }
     }
 }
diff --git a/core/src/main/java/hudson/util/MultipartFormDataParser.java b/core/src/main/java/hudson/util/MultipartFormDataParser.java
index 8633a77e1534..f173cff9802b 100644
--- a/core/src/main/java/hudson/util/MultipartFormDataParser.java
+++ b/core/src/main/java/hudson/util/MultipartFormDataParser.java
@@ -27,17 +27,21 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.fileupload.FileCountLimitExceededException;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadBase;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItem;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.core.FileUploadFileCountLimitException;
+import org.apache.commons.fileupload2.core.FileUploadSizeException;
+import org.apache.commons.fileupload2.javax.JavaxServletDiskFileUpload;
+import org.apache.commons.fileupload2.javax.JavaxServletFileUpload;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -52,7 +56,7 @@ public class MultipartFormDataParser implements AutoCloseable {
 
     /**
      * Limits the number of form fields that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload.servlet.ServletFileUpload#setFileCountMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.javax.JavaxServletFileUpload#setFileCountMax(long)}.
      * Despite the name, this applies to all form fields, not just actual file attachments.
      * Set to {@code -1} to disable limits.
      */
@@ -60,7 +64,7 @@ public class MultipartFormDataParser implements AutoCloseable {
 
     /**
      * Limits the size (in bytes) of individual fields that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload.servlet.ServletFileUpload#setFileSizeMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.javax.JavaxServletFileUpload#setFileSizeMax(long)}.
      * Despite the name, this applies to all form fields, not just actual file attachments.
      * Set to {@code -1} to disable limits.
      */
@@ -68,7 +72,7 @@ public class MultipartFormDataParser implements AutoCloseable {
 
     /**
      * Limits the total request size (in bytes) that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload.servlet.ServletFileUpload#setSizeMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.javax.JavaxServletFileUpload#setSizeMax(long)}.
      * Set to {@code -1} to disable limits.
      */
     private static /* nonfinal for Jenkins script console */ long FILEUPLOAD_MAX_SIZE = Long.getLong(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_SIZE", -1);
@@ -82,20 +86,20 @@ public MultipartFormDataParser(HttpServletRequest request, int maxParts, long ma
             throw new ServletException("Error creating temporary directory", e);
         }
         tmpDir.deleteOnExit();
-        ServletFileUpload upload = new ServletFileUpload(new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, tmpDir));
+        JavaxServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JavaxServletDiskFileUpload(DiskFileItemFactory.builder().setFile(tmpDir).get());
         upload.setFileCountMax(maxParts);
         upload.setFileSizeMax(maxPartSize);
         upload.setSizeMax(maxSize);
         try {
             for (FileItem fi : upload.parseRequest(request))
                 byName.put(fi.getFieldName(), fi);
-        } catch (FileCountLimitExceededException e) {
+        } catch (FileUploadFileCountLimitException e) {
             throw new ServletException("File upload field count limit exceeded. Consider setting the Java system property "
                     + MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILES to a value greater than " + FILEUPLOAD_MAX_FILES + ", or to -1 to disable this limit.", e);
-        } catch (FileUploadBase.FileSizeLimitExceededException e) {
+        } catch (FileUploadByteCountLimitException e) {
             throw new ServletException("File upload field size limit exceeded. Consider setting the Java system property "
                     + MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILE_SIZE to a value greater than " + FILEUPLOAD_MAX_FILE_SIZE + ", or to -1 to disable this limit.", e);
-        } catch (FileUploadBase.SizeLimitExceededException e) {
+        } catch (FileUploadSizeException e) {
             throw new ServletException("File upload total size limit exceeded. Consider setting the Java system property "
                     + MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_SIZE to a value greater than " + FILEUPLOAD_MAX_SIZE + ", or to -1 to disable this limit.", e);
         } catch (FileUploadException e) {
@@ -118,17 +122,30 @@ public String get(String key) {
         return fi.getString();
     }
 
-    public FileItem getFileItem(String key) {
+    public FileItem getFileItem2(String key) {
         return byName.get(key);
     }
 
+    /**
+     * @deprecated use {@link #getFileItem2(String)}
+     */
+    @Deprecated
+    public org.apache.commons.fileupload.FileItem getFileItem(String key) {
+        return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(getFileItem2(key));
+    }
+
     /**
      * If any file is created on the disk, delete them all.
      * Even if this method is not called, the resource will be still cleaned up later by GC.
      */
     public void cleanUp() {
-        for (FileItem item : byName.values())
-            item.delete();
+        for (FileItem item : byName.values()) {
+            try {
+                item.delete();
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
     }
 
     /** Alias for {@link #cleanUp}. */
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index b08ac6c8941d..7fe515fddf0e 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -4492,7 +4492,7 @@ public void doDoFingerprintCheck(StaplerRequest req, StaplerResponse rsp) throws
                 rsp.sendError(HttpServletResponse.SC_FORBIDDEN, "No crumb found");
             }
             rsp.sendRedirect2(req.getContextPath() + "/fingerprint/" +
-                Util.getDigestOf(p.getFileItem("name").getInputStream()) + '/');
+                Util.getDigestOf(p.getFileItem2("name").getInputStream()) + '/');
         }
     }
 
diff --git a/test/src/test/java/hudson/model/FileParameterValuePersistenceTest.java b/test/src/test/java/hudson/model/FileParameterValuePersistenceTest.java
index 263e60576510..660c305e055e 100644
--- a/test/src/test/java/hudson/model/FileParameterValuePersistenceTest.java
+++ b/test/src/test/java/hudson/model/FileParameterValuePersistenceTest.java
@@ -59,7 +59,7 @@ public void fileParameterValuePersistence() throws Throwable {
             }
             j.assertBuildStatusSuccess(j.waitForCompletion(b));
             FileParameterValue fpv = (FileParameterValue) b.getAction(ParametersAction.class).getParameter(FILENAME);
-            fpv.getFile().delete();
+            fpv.getFile2().delete();
             verifyPersistence(j);
         });
         sessions.then(FileParameterValuePersistenceTest::verifyPersistence);
diff --git a/test/src/test/java/jenkins/security/Security3030Test.java b/test/src/test/java/jenkins/security/Security3030Test.java
index e2d1e4bf5bf7..919faa5d7da2 100644
--- a/test/src/test/java/jenkins/security/Security3030Test.java
+++ b/test/src/test/java/jenkins/security/Security3030Test.java
@@ -43,9 +43,10 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Random;
 import javax.servlet.ServletException;
-import org.apache.commons.fileupload.FileCountLimitExceededException;
-import org.apache.commons.fileupload.FileUploadBase;
-import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.core.FileUploadFileCountLimitException;
+import org.apache.commons.fileupload2.core.FileUploadSizeException;
 import org.htmlunit.HttpMethod;
 import org.htmlunit.WebRequest;
 import org.junit.Assert;
@@ -71,18 +72,18 @@ public void fewFilesStapler() throws IOException {
 
     @Test
     public void tooManyFilesStapler() throws Exception {
-        ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10, 1000, 20, FileCountLimitExceededException.class);
+        ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10, 1000, 20, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
-        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1000, 10, 10, FileCountLimitExceededException.class);
+        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1000, 10, 10, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
         try (FieldValue v = withStaticField(RequestImpl.class, "FILEUPLOAD_MAX_FILES", 10_000)) {
             assertSubmissionOK(StaplerRequestFormAction.instance(), 1000, 10, 10);
-            ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10_000, 10, 10, FileCountLimitExceededException.class);
+            ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10_000, 10, 10, FileUploadFileCountLimitException.class);
             assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
         }
-        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10, 1000, 20, FileCountLimitExceededException.class);
+        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10, 1000, 20, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
-        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1000, 10, 10, FileCountLimitExceededException.class);
+        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1000, 10, 10, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
     }
 
@@ -91,7 +92,7 @@ public void tooLargeFilesStapler() throws Exception {
         assertSubmissionOK(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024);
         try (FieldValue v = withStaticField(RequestImpl.class, "FILEUPLOAD_MAX_FILE_SIZE", 1024 * 1024)) {
             assertSubmissionOK(StaplerRequestFormAction.instance(), 200, 100, 1024);
-            ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadBase.FileSizeLimitExceededException.class);
+            ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadByteCountLimitException.class);
             assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILE_SIZE"));
         }
         assertSubmissionOK(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024);
@@ -102,7 +103,7 @@ public void tooLargeSubmissionStapler() throws Exception {
         assertSubmissionOK(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024);
         try (FieldValue v = withStaticField(RequestImpl.class, "FILEUPLOAD_MAX_SIZE", 1024 * 1024)) {
             assertSubmissionOK(StaplerRequestFormAction.instance(), 200, 100, 1024);
-            ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadBase.SizeLimitExceededException.class);
+            ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadSizeException.class);
             assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_SIZE"));
         }
         assertSubmissionOK(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024);
@@ -116,18 +117,18 @@ public void fewFilesParser() throws IOException {
 
     @Test
     public void tooManyFilesParser() throws Exception {
-        ServletException ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 10, 1000, 20, FileCountLimitExceededException.class);
+        ServletException ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 10, 1000, 20, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILES"));
-        ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 1000, 10, 10, FileCountLimitExceededException.class);
+        ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 1000, 10, 10, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILES"));
         try (FieldValue v = withStaticField(MultipartFormDataParser.class, "FILEUPLOAD_MAX_FILES", 10_000)) {
             assertSubmissionOK(MultipartFormDataParserAction.instance(), 1000, 10, 10);
-            ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 10_000, 10, 10, FileCountLimitExceededException.class);
+            ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 10_000, 10, 10, FileUploadFileCountLimitException.class);
             assertThat(ex.getMessage(), containsString(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILES"));
         }
-        ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 10, 1000, 20, FileCountLimitExceededException.class);
+        ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 10, 1000, 20, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILES"));
-        ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 1000, 10, 10, FileCountLimitExceededException.class);
+        ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 1000, 10, 10, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILES"));
     }
 
@@ -136,7 +137,7 @@ public void tooLargeFilesParser() throws Exception {
         assertSubmissionOK(MultipartFormDataParserAction.instance(), 1, 50, 10 * 1024 * 1024);
         try (FieldValue v = withStaticField(MultipartFormDataParser.class, "FILEUPLOAD_MAX_FILE_SIZE", 1024 * 1024)) {
             assertSubmissionOK(MultipartFormDataParserAction.instance(), 200, 100, 1024);
-            ServletException ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadBase.FileSizeLimitExceededException.class);
+            ServletException ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadByteCountLimitException.class);
             assertThat(ex.getMessage(), containsString(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILE_SIZE"));
         }
         assertSubmissionOK(MultipartFormDataParserAction.instance(), 1, 50, 10 * 1024 * 1024);
@@ -147,7 +148,7 @@ public void tooLargeSubmissionParser() throws Exception {
         assertSubmissionOK(MultipartFormDataParserAction.instance(), 1, 50, 10 * 1024 * 1024);
         try (FieldValue v = withStaticField(MultipartFormDataParser.class, "FILEUPLOAD_MAX_SIZE", 1024 * 1024)) {
             assertSubmissionOK(MultipartFormDataParserAction.instance(), 200, 100, 1024);
-            ServletException ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadBase.SizeLimitExceededException.class);
+            ServletException ex = assertSubmissionThrows(MultipartFormDataParserAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadSizeException.class);
             assertThat(ex.getMessage(), containsString(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_SIZE"));
         }
         assertSubmissionOK(MultipartFormDataParserAction.instance(), 1, 50, 10 * 1024 * 1024);
@@ -311,7 +312,7 @@ public static StaplerRequestFormAction instance() {
         }
 
         protected HttpResponse processMultipart(StaplerRequest req) throws ServletException, IOException {
-            req.getFileItem("any-name");
+            req.getFileItem2("any-name");
             return HttpResponses.ok();
         }
     }

From 87c5fb916761765f41212af46060c96abd6e9b2e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 18 May 2024 21:38:43 -0700
Subject: [PATCH 032/449] Update jenkins/ath Docker tag to v5851 (#9289)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 8bde184008c4..186160f229a6 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5829.v1ea_976c1636e
+export ATH_VERSION=5851.v18b_c61d9354a_
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From eb65336ed5d45e4be32d7fa9260b150f0cbef59e Mon Sep 17 00:00:00 2001
From: Allan Burdajewicz <aburdajewicz@cloudbees.com>
Date: Sun, 19 May 2024 21:35:47 +1000
Subject: [PATCH 033/449] [JENKINS-72622] Rename CloudSet query parameter to
 avoid conflict (#9198)

* [JENKINS-72622] Rename CloudSet query parameter to avoid conflict

* [JENKINS-72622] Address SpotBugs warning
---
 core/src/main/java/jenkins/agents/CloudSet.java           | 8 ++++++--
 .../src/main/resources/jenkins/agents/CloudSet/_new.jelly | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/jenkins/agents/CloudSet.java b/core/src/main/java/jenkins/agents/CloudSet.java
index e69a3f9add3c..addefceb83ff 100644
--- a/core/src/main/java/jenkins/agents/CloudSet.java
+++ b/core/src/main/java/jenkins/agents/CloudSet.java
@@ -242,9 +242,13 @@ private void handleNewCloudPage(Descriptor<Cloud> descriptor, String name, Stapl
      */
     @POST
     public synchronized void doDoCreate(StaplerRequest req, StaplerResponse rsp,
-                                            @QueryParameter String type) throws IOException, ServletException, Descriptor.FormException {
+                                            @QueryParameter String cloudDescriptorName) throws IOException, ServletException, Descriptor.FormException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
-        Cloud cloud = Cloud.all().find(type).newInstance(req, req.getSubmittedForm());
+        Descriptor<Cloud> cloudDescriptor = Cloud.all().findByName(cloudDescriptorName);
+        if (cloudDescriptor == null) {
+            throw new Failure(String.format("No cloud type ‘%s’ is known", cloudDescriptorName));
+        }
+        Cloud cloud = cloudDescriptor.newInstance(req, req.getSubmittedForm());
         if (!Jenkins.get().clouds.add(cloud)) {
             LOGGER.log(Level.WARNING, () -> "Creating duplicate cloud name " + cloud.name + ". Plugin " + Jenkins.get().getPluginManager().whichPlugin(cloud.getClass()) + " should be updated to support user provided name.");
         }
diff --git a/core/src/main/resources/jenkins/agents/CloudSet/_new.jelly b/core/src/main/resources/jenkins/agents/CloudSet/_new.jelly
index 3ea4d00d6acc..bc882a546e98 100644
--- a/core/src/main/resources/jenkins/agents/CloudSet/_new.jelly
+++ b/core/src/main/resources/jenkins/agents/CloudSet/_new.jelly
@@ -37,7 +37,7 @@ THE SOFTWARE.
         <st:include it="${requestScope.instance}" class="${requestScope.descriptor.clazz}" page="config.jelly" optional="true" />
         
         <f:bottomButtonBar>
-          <input type="hidden" name="type" value="${request.getParameter('mode')}"/>
+          <input type="hidden" name="cloudDescriptorName" value="${request.getParameter('mode')}"/>
 
           <f:submit value="${%Save}"/>
         </f:bottomButtonBar>

From afaf96ebc31e2594c47596d9a7c27bfecaa225e5 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sun, 19 May 2024 13:35:58 +0200
Subject: [PATCH 034/449] [JENKINS-73156] handle svg cleanup of symbols via an
 xml document (#9266)

[JENKINS-71356] handle svg cleanup via a xml document

some attributes and elements where removed via regular expressions.
Additionally `stroke:#000 was replaced with currentColor because there
are some icons that still use that.
This had sideeffects when symbols are used that are not just
black/white, e.g. using svg from jenkins artwork via customizable-header
plugin. There are construct like using class attributes and a style
definition referring to the classes. At other places there where color
definitions with `stroke:#000abc` which were incorrectly modified.

svg cleanup is now implemented with DOM manipulation which is more
robust.
5 icons that still used `stroke:#000` are converted to use
`stroke:currentColor`
---
 .../java/org/jenkins/ui/symbol/Symbol.java    | 54 ++++++++++++++++---
 .../main/resources/images/symbols/journal.svg |  2 +-
 .../resources/images/symbols/lock-closed.svg  |  2 +-
 .../main/resources/images/symbols/play.svg    |  2 +-
 .../main/resources/images/symbols/power.svg   |  2 +-
 .../resources/images/symbols/trash-bin.svg    |  2 +-
 6 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/jenkins/ui/symbol/Symbol.java b/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
index 9973acc18da5..9a07556d7c71 100644
--- a/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
+++ b/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
@@ -8,13 +8,30 @@
 import hudson.Util;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import jenkins.model.Jenkins;
 import org.apache.commons.io.IOUtils;
+import org.apache.tools.ant.filters.StringInputStream;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 /**
  * Helper class to load symbols from Jenkins core or plugins.
@@ -88,12 +105,37 @@ private static String loadSymbol(String namespace, String name) {
                 LOGGER.log(Level.FINE, "Failed to load symbol " + name, e);
             }
         }
-        return markup.replaceAll("(<title>).*?(</title>)", "$1$2")
-                     .replaceAll("<svg", "<svg aria-hidden=\"true\"")
-                     .replaceAll("(class=\").*?(\")", "")
-                     .replaceAll("(tooltip=\").*?(\")", "")
-                     .replaceAll("(data-html-tooltip=\").*?(\")", "")
-                     .replace("stroke:#000", "stroke:currentColor");
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        try {
+            dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            Document doc = db.parse(new StringInputStream(markup));
+            Element root = doc.getDocumentElement();
+            NodeList titleList = root.getElementsByTagName("title");
+            for (int i = 0; i < titleList.getLength(); i++) {
+                Node title = titleList.item(i);
+                NodeList titleChildren = title.getChildNodes();
+                for (int j = 0; j < titleChildren.getLength(); j++) {
+                    title.removeChild(titleChildren.item(j));
+                }
+            }
+            root.removeAttribute("class");
+            root.removeAttribute("id");
+            root.removeAttribute("tooltip");
+            root.removeAttribute("data-html-tooltip");
+            root.setAttribute("aria-hidden", "true");
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer transformer = tf.newTransformer();
+            transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+            StringWriter writer = new StringWriter();
+            transformer.transform(new DOMSource(doc), new StreamResult(writer));
+            markup = writer.getBuffer().toString().replaceAll("\n|\r", "");
+        } catch (ParserConfigurationException | SAXException | IOException | TransformerException e) {
+            LOGGER.log(Level.WARNING, e, () -> "The given src for the svg is not a valid xml document");
+            return PLACEHOLDER_SVG;
+        }
+
+        return markup;
     }
 
     @CheckForNull
diff --git a/war/src/main/resources/images/symbols/journal.svg b/war/src/main/resources/images/symbols/journal.svg
index 7bd396468079..26170aed452d 100644
--- a/war/src/main/resources/images/symbols/journal.svg
+++ b/war/src/main/resources/images/symbols/journal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-o</title><rect x="96" y="48" width="320" height="416" rx="48" ry="48" style="fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px"/><line x1="320" y1="48" x2="320" y2="464" style="fill:none;stroke:#000;stroke-linejoin:round;stroke-width:60px"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-o</title><rect x="96" y="48" width="320" height="416" rx="48" ry="48" style="fill:none;stroke:currentColor;stroke-linejoin:round;stroke-width:32px"/><line x1="320" y1="48" x2="320" y2="464" style="fill:none;stroke:currentColor;stroke-linejoin:round;stroke-width:60px"/></svg>
\ No newline at end of file
diff --git a/war/src/main/resources/images/symbols/lock-closed.svg b/war/src/main/resources/images/symbols/lock-closed.svg
index 96a5e417f4ae..2e0cdde7c7c0 100644
--- a/war/src/main/resources/images/symbols/lock-closed.svg
+++ b/war/src/main/resources/images/symbols/lock-closed.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-g</title><path d="M336,208V113a80,80,0,0,0-160,0v95" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><rect x="96" y="208" width="320" height="272" rx="48" ry="48" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-g</title><path d="M336,208V113a80,80,0,0,0-160,0v95" style="fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><rect x="96" y="208" width="320" height="272" rx="48" ry="48" style="fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
\ No newline at end of file
diff --git a/war/src/main/resources/images/symbols/play.svg b/war/src/main/resources/images/symbols/play.svg
index a9bb95b897a9..ffc227bf89e2 100644
--- a/war/src/main/resources/images/symbols/play.svg
+++ b/war/src/main/resources/images/symbols/play.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-c</title><path d="M112,111V401c0,17.44,17,28.52,31,20.16l247.9-148.37c12.12-7.25,12.12-26.33,0-33.58L143,90.84C129,82.48,112,93.56,112,111Z" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-c</title><path d="M112,111V401c0,17.44,17,28.52,31,20.16l247.9-148.37c12.12-7.25,12.12-26.33,0-33.58L143,90.84C129,82.48,112,93.56,112,111Z" style="fill:none;stroke:currentColor;stroke-miterlimit:10;stroke-width:32px"/></svg>
\ No newline at end of file
diff --git a/war/src/main/resources/images/symbols/power.svg b/war/src/main/resources/images/symbols/power.svg
index cc2d4d57b63c..92886b46a09a 100644
--- a/war/src/main/resources/images/symbols/power.svg
+++ b/war/src/main/resources/images/symbols/power.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-p</title><path d="M378,108a191.41,191.41,0,0,1,70,148c0,106-86,192-192,192S64,362,64,256a192,192,0,0,1,69-148" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="256" y1="64" x2="256" y2="256" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-p</title><path d="M378,108a191.41,191.41,0,0,1,70,148c0,106-86,192-192,192S64,362,64,256a192,192,0,0,1,69-148" style="fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="256" y1="64" x2="256" y2="256" style="fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
\ No newline at end of file
diff --git a/war/src/main/resources/images/symbols/trash-bin.svg b/war/src/main/resources/images/symbols/trash-bin.svg
index d8449544a7a8..572cb143609f 100644
--- a/war/src/main/resources/images/symbols/trash-bin.svg
+++ b/war/src/main/resources/images/symbols/trash-bin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-k</title><path d="M432,144,403.33,419.74A32,32,0,0,1,371.55,448H140.46a32,32,0,0,1-31.78-28.26L80,144" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><rect x="32" y="64" width="448" height="80" rx="16" ry="16" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="312" y1="240" x2="200" y2="352" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="312" y1="352" x2="200" y2="240" style="fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512"><title>ionicons-v5-k</title><path d="M432,144,403.33,419.74A32,32,0,0,1,371.55,448H140.46a32,32,0,0,1-31.78-28.26L80,144" style="fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><rect x="32" y="64" width="448" height="80" rx="16" ry="16" style="fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="312" y1="240" x2="200" y2="352" style="fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/><line x1="312" y1="352" x2="200" y2="240" style="fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px"/></svg>
\ No newline at end of file

From b52201b020400594c2999188f19f0b1ff0f9063c Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Sun, 19 May 2024 13:36:11 +0200
Subject: [PATCH 035/449] Clarify state of
 `{Job,LazyBuildMixIn}#createHistoryWidget()` method. (#9268)

* Clarify state of `{Job,LazyBuildMixIn}#createHistoryWidget()` method.

These methods are no longer needed and should not be called nor overridden.

Instead, history widgets are instantiated via `jenkins.widgets.WidgetFactory` annotated with `@Extension`.

* Javadoc
---
 core/src/main/java/hudson/model/AbstractProject.java      | 6 ------
 core/src/main/java/hudson/model/Job.java                  | 4 ++--
 core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java | 6 +++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index c554ef813440..5de1775b11cd 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -77,7 +77,6 @@
 import hudson.util.AlternativeUiTextProvider.Message;
 import hudson.util.DescribableList;
 import hudson.util.FormValidation;
-import hudson.widgets.HistoryWidget;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -1721,11 +1720,6 @@ protected SearchIndexBuilder makeSearchIndex() {
         return getParameterizedJobMixIn().extendSearchIndex(super.makeSearchIndex());
     }
 
-    @Override
-    protected HistoryWidget createHistoryWidget() {
-        return buildMixIn.createHistoryWidget();
-    }
-
 //
 //
 // actions
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 8c4e3183100a..92f1d374fb08 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -626,11 +626,11 @@ public Collection<?> getOverrides() {
     }
 
     /**
-     * @deprecated see {@link LazyBuildMixIn#createHistoryWidget()}
+     * @deprecated Remove any override, history widget is now created via {@link jenkins.widgets.WidgetFactory} implementation.
      */
     @Deprecated(forRemoval = true, since = "2.410")
     protected HistoryWidget createHistoryWidget() {
-        return new HistoryWidget<Job, RunT>(this, getBuilds(), HISTORY_ADAPTER);
+        throw new IllegalStateException("HistoryWidget is now created via WidgetFactory implementation");
     }
 
     public static final HistoryWidget.Adapter<Run> HISTORY_ADAPTER = new Adapter<>() {
diff --git a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
index 570048c5327f..203ea976bccd 100644
--- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
+++ b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
@@ -39,7 +39,6 @@
 import hudson.model.RunMap;
 import hudson.model.listeners.ItemListener;
 import hudson.model.queue.SubTask;
-import hudson.widgets.BuildHistoryWidget;
 import hudson.widgets.HistoryWidget;
 import java.io.File;
 import java.io.IOException;
@@ -297,10 +296,11 @@ public List<RunT> getEstimatedDurationCandidates() {
     }
 
     /**
-     * Suitable for {@link Job#createHistoryWidget}.
+     * @deprecated Remove any code calling this method, history widget is now created via {@link jenkins.widgets.WidgetFactory} implementation.
      */
+    @Deprecated(forRemoval = true, since = "TODO")
     public final HistoryWidget createHistoryWidget() {
-        return new BuildHistoryWidget(asJob(), builds, Job.HISTORY_ADAPTER);
+        throw new IllegalStateException("HistoryWidget is now created via WidgetFactory implementation");
     }
 
     /**

From 7f44636581cd0f628813681d6ea46ee83bbabfed Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 19 May 2024 12:36:24 +0100
Subject: [PATCH 036/449] [JENKINS-73168] Restore 'No changes' label when there
 are no changes in a build (#9283)

Init
---
 .../jenkins/scm/RunWithSCM/changesets.jelly   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly b/core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly
index da0e2b7c98f0..b4141013c4b8 100644
--- a/core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly
+++ b/core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly
@@ -25,13 +25,18 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/lib/hudson">
   <j:set var="changeSets" value="${it.changeSets}"/>
-  <j:if test="${!changeSets.isEmpty()}">
-    <table>
-      <t:summary icon="symbol-changes">
-        <j:forEach var="changeSet" items="${changeSets}">
-          <st:include it="${changeSet}" page="digest.jelly"/>
-        </j:forEach>
-      </t:summary>
-    </table>
-  </j:if>
+  <table>
+    <t:summary icon="symbol-changes">
+      <j:choose>
+        <j:when test="${!changeSets.isEmpty()}">
+          <j:forEach var="changeSet" items="${changeSets}">
+            <st:include it="${changeSet}" page="digest.jelly"/>
+          </j:forEach>
+        </j:when>
+        <j:otherwise>
+          <st:include class="hudson.scm.EmptyChangeLogSet" page="digest.jelly" />
+        </j:otherwise>
+      </j:choose>
+    </t:summary>
+  </table>
 </j:jelly>

From 35b39593b721f830d6eb75e40ec8d6b323bad788 Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Sun, 19 May 2024 13:36:40 +0200
Subject: [PATCH 037/449] [JENKINS-73166] Fix PKCS#12 certificate save to
 credentials (#9286)

Call eval indirectly from geval
---
 war/src/main/webapp/scripts/hudson-behavior.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 2d48f5fe78ed..8a207dcefc76 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -592,7 +592,7 @@ function parseHtml(html) {
  * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/eval#direct_and_indirect_eval
  */
 function geval(script) {
-  eval(script);
+  (0, eval)(script);
 }
 
 /**

From 02cc1ccd5c0b43bf5bec7bf1d6ac4e919c32b0f4 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 19 May 2024 04:40:24 -0700
Subject: [PATCH 038/449] Manage the version of `jakarta.servlet-api`
 consistently with the version of `jakarta.servlet.jsp.jstl-api` (#9288)

---
 bom/pom.xml  | 5 +++++
 core/pom.xml | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index bbbfee874304..f0c33ab76538 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -145,6 +145,11 @@ THE SOFTWARE.
         <artifactId>jenkins-stapler-support</artifactId>
         <version>1.1</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>4.0.4</version>
+      </dependency>
       <dependency>
         <groupId>jakarta.servlet.jsp.jstl</groupId>
         <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 3b12be43fbd0..61c48e489794 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -443,7 +443,6 @@ THE SOFTWARE.
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

From c31e1f3011c866fd4f230f01f703f23ad7fa62a9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 19 May 2024 20:16:55 -0700
Subject: [PATCH 039/449] Update dependency sass to v1.77.2 (#9290)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 5e37993906c1..2c3585506964 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.5.13",
     "postcss-scss": "4.0.9",
     "prettier": "3.2.5",
-    "sass": "1.77.1",
+    "sass": "1.77.2",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.5.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index a0fe9d620215..2c4b7e67b593 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4392,7 +4392,7 @@ __metadata:
     postcss-preset-env: "npm:9.5.13"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.2.5"
-    sass: "npm:1.77.1"
+    sass: "npm:1.77.2"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6349,16 +6349,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.1":
-  version: 1.77.1
-  resolution: "sass@npm:1.77.1"
+"sass@npm:1.77.2":
+  version: 1.77.2
+  resolution: "sass@npm:1.77.2"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/edcfc7d038234b1198c3ddcac5963fcd1e17a9c1ee0f9bd09784ab5353b60ff50b189b4c9154b34f5da9ca0eaab8b189fd3e83a4b43a494151ad4735f8e5f364
+  checksum: 10c0/0d292339064de3c902e209d41de9c4eb2038cff326476aeebbb5be3eee1d23400d975face2b8e124ae617b10af3e93bec01580f61912f34e4c517fe137a118b6
   languageName: node
   linkType: hard
 

From bf80a0d779842c70366b7faf4232fa4f3f77dbdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 12:07:46 -0700
Subject: [PATCH 040/449] Bump stapler.version from 1863.vd250086e9885 to
 1869.v3605a_771fb_e3 (#9291)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index f0c33ab76538..298891a43cb0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <slf4jVersion>2.0.13</slf4jVersion>
-    <stapler.version>1863.vd250086e9885</stapler.version>
+    <stapler.version>1869.v3605a_771fb_e3</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 

From 4cb317d870a86150237b2024dd31a855e2e5efcb Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 21 May 2024 13:12:34 +0000
Subject: [PATCH 041/449] [maven-release-plugin] prepare release jenkins-2.459

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 298891a43cb0..8ada03bfe55c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.459</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 14d6323ca762..020334670a55 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.459</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 61c48e489794..a11d63d43498 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.459</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..0dd58ab9b784 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.459</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 746a43c8ee6b..5e6f1609a90a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.459</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.459</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.459</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-05-14T13:15:25Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-05-21T10:34:18Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index b7b7734be6df..a2e1675974bc 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.459</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 1aa72c6dadb8..278bebbc4c91 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.459</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..5388f69c3db7 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.459</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..e25c79296533 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.459</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 35e8562d56de9195a3f62a904da73b6ad83fd0d1 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 21 May 2024 13:13:04 +0000
Subject: [PATCH 042/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 8ada03bfe55c..298891a43cb0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.459</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 020334670a55..14d6323ca762 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.459</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index a11d63d43498..61c48e489794 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.459</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 0dd58ab9b784..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.459</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 5e6f1609a90a..c5f81fef70b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.459</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.459</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.459</revision>
+    <revision>2.460</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-05-21T10:34:18Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-05-21T13:12:34Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index a2e1675974bc..b7b7734be6df 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.459</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 278bebbc4c91..1aa72c6dadb8 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.459</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 5388f69c3db7..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.459</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index e25c79296533..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.459</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 519baea9d1fc47b4a4f88372d2b480408ceb7265 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 08:40:28 -0600
Subject: [PATCH 043/449] Update eslint monorepo to v9.3.0 (#9293)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 42 +++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/war/package.json b/war/package.json
index 2c3585506964..6a8ecbae279f 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.24.5",
     "@babel/core": "7.24.5",
     "@babel/preset-env": "7.24.5",
-    "@eslint/js": "9.2.0",
+    "@eslint/js": "9.3.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.1",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.2.0",
+    "eslint": "9.3.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.2.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 2c4b7e67b593..c1fc123c4412 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1848,9 +1848,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@eslint/eslintrc@npm:3.0.2"
+"@eslint/eslintrc@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@eslint/eslintrc@npm:3.1.0"
   dependencies:
     ajv: "npm:^6.12.4"
     debug: "npm:^4.3.2"
@@ -1861,14 +1861,14 @@ __metadata:
     js-yaml: "npm:^4.1.0"
     minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: 10c0/d8c92f06bdf8e2be9fcc0eeac4a9351745174adfcc72571ef3d179101cb55e19f15f6385c2a4f4945a3ba9245802d3371208e2e1e4f00f6bcf6b8711656af85a
+  checksum: 10c0/5b7332ed781edcfc98caa8dedbbb843abfb9bda2e86538529c843473f580e40c69eb894410eddc6702f487e9ee8f8cfa8df83213d43a8fdb549f23ce06699167
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.2.0":
-  version: 9.2.0
-  resolution: "@eslint/js@npm:9.2.0"
-  checksum: 10c0/89632466d329d9dd68c6ec24290e407f0950ca8c4b7f3750b82457daa7f6233799ccbc956cd84231f9544efbefddd69833ee82658883ca673cfca9e4b8e0713a
+"@eslint/js@npm:9.3.0":
+  version: 9.3.0
+  resolution: "@eslint/js@npm:9.3.0"
+  checksum: 10c0/1550c68922eb17c3ce541d9ffbb687e656bc0d4e2fff2d9cb0a75101a9cdb6184b7af7378ccf46c6ca750b280d25d45cc5e7374a83a4ee89d404d3717502fd9d
   languageName: node
   linkType: hard
 
@@ -1897,10 +1897,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/retry@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "@humanwhocodes/retry@npm:0.2.3"
-  checksum: 10c0/0913d89bb5cb1f0a049a6c068dee312d30920d5cce5a07588cd91fcb5453af52f2a9826d07d465066b92ad7bc0545e9f59384c414abe27745c79141c78a25099
+"@humanwhocodes/retry@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@humanwhocodes/retry@npm:0.3.0"
+  checksum: 10c0/7111ec4e098b1a428459b4e3be5a5d2a13b02905f805a2468f4fa628d072f0de2da26a27d04f65ea2846f73ba51f4204661709f05bfccff645e3cedef8781bb6
   languageName: node
   linkType: hard
 
@@ -3534,17 +3534,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.2.0":
-  version: 9.2.0
-  resolution: "eslint@npm:9.2.0"
+"eslint@npm:9.3.0":
+  version: 9.3.0
+  resolution: "eslint@npm:9.3.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
-    "@eslint/eslintrc": "npm:^3.0.2"
-    "@eslint/js": "npm:9.2.0"
+    "@eslint/eslintrc": "npm:^3.1.0"
+    "@eslint/js": "npm:9.3.0"
     "@humanwhocodes/config-array": "npm:^0.13.0"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
-    "@humanwhocodes/retry": "npm:^0.2.3"
+    "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
     ajv: "npm:^6.12.4"
     chalk: "npm:^4.0.0"
@@ -3574,7 +3574,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/eab3265100a359a486e40e1d9d4d3ecff936d2f4d952f4ab107d404e0684fffbe186ecd0fb41791af5bcb13570a27032ddf9a2e628927ed33473f64255b0037b
+  checksum: 10c0/d0cf1923408ce720f2fa0dde39094dbee6b03a71d5e6466402bbeb29c08a618713f7a1e8cfc4b4d50dbe3750ce68adf614a0e973dea6fa36ddc428dfb89d4cac
   languageName: node
   linkType: hard
 
@@ -4372,12 +4372,12 @@ __metadata:
     "@babel/cli": "npm:7.24.5"
     "@babel/core": "npm:7.24.5"
     "@babel/preset-env": "npm:7.24.5"
-    "@eslint/js": "npm:9.2.0"
+    "@eslint/js": "npm:9.3.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.1"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.2.0"
+    eslint: "npm:9.3.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.2.0"

From 96e007f0934784b552eeec8dd8c7474c23364b35 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 08:41:09 -0600
Subject: [PATCH 044/449] Update jenkins/ath Docker tag to v5853 (#9294)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 186160f229a6..13af92578116 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5851.v18b_c61d9354a_
+export ATH_VERSION=5853.v19710fb_b_5d8a_
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From d688b917a725c3c7c546d08690359c6a4a176226 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 20:48:28 +0000
Subject: [PATCH 045/449] Bump io.jenkins.plugins:design-library from
 303.v6b_23c12334c9 to 304.v44f7d19e8537 (#9295)

---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index b7b7734be6df..13c4e77ccdcd 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -329,7 +329,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>design-library</artifactId>
-                  <version>303.v6b_23c12334c9</version>
+                  <version>304.v44f7d19e8537</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>design-library.jpi</destFileName>

From 45139218013b775fbedc6a30a3c5da738ac6cb63 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 07:25:51 -0700
Subject: [PATCH 046/449] Update jenkins/ath Docker tag to v5858 (#9298)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 13af92578116..3ab8d159b66e 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5853.v19710fb_b_5d8a_
+export ATH_VERSION=5858.v4b_c4e3b_16099
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From caea9bd872e0e49c6768fc7a5e2939b1dea8c1e1 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 22 May 2024 16:09:44 +0100
Subject: [PATCH 047/449] Add download option to 'Console output', move 'View
 as plain text' and 'Copy' buttons to app bar (#9169)

---
 .../resources/hudson/model/Run/console.jelly  | 21 +++++++++++++++----
 .../hudson/model/Run/console.properties       |  2 --
 .../resources/lib/hudson/buildCaption.jelly   |  7 +++++++
 .../lib/hudson/project/console-link.jelly     | 13 +-----------
 .../resources/lib/layout/copyButton.jelly     |  6 +++++-
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index 519b61744a27..3609d2b7ee68 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -28,15 +28,28 @@ THE SOFTWARE.
   Displays the console output
 -->
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
   <l:layout title="${it.fullDisplayName} Console">
     <st:include page="sidepanel.jelly" />
-     <l:breadcrumb title="${%Console Output}" />
+
+    <l:breadcrumb title="${%Console Output}" />
+
     <l:main-panel>
-      <t:buildCaption>
+      <j:set var="controls">
+        <a class="jenkins-button" href="consoleText" download="${it.displayName}.txt">
+          <l:icon src="symbol-download" />
+          ${%Download}
+        </a>
+        <l:copyButton ref="out" label="${%Copy}" />
+        <a class="jenkins-button" href="consoleText">
+          ${%View as plain text}
+        </a>
+      </j:set>
+
+      <t:buildCaption controls="${controls}">
         ${%Console Output}
-        <l:copyButton message="${%successfullyCopied}" tooltip="${%clickToCopy}" ref="out"/>
       </t:buildCaption>
+
       <j:set var="threshold" value="${h.getSystemProperty('hudson.consoleTailKB')?:'150'}" />
       <!-- Show at most last 150KB (can override with system property) unless consoleFull is set -->
       <j:set var="offset" value="${empty(consoleFull) ? it.logText.length()-threshold*1024 : 0}" />
diff --git a/core/src/main/resources/hudson/model/Run/console.properties b/core/src/main/resources/hudson/model/Run/console.properties
index d4467f9be774..c9af02ab9aa3 100644
--- a/core/src/main/resources/hudson/model/Run/console.properties
+++ b/core/src/main/resources/hudson/model/Run/console.properties
@@ -21,5 +21,3 @@
 # THE SOFTWARE.
 
 skipSome=Skipping {0,number,integer} KB.. <a href="{1}">Full Log</a>
-clickToCopy=Click to copy
-successfullyCopied=Copied to clipboard
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/buildCaption.jelly b/core/src/main/resources/lib/hudson/buildCaption.jelly
index 338344bdfa6a..398050268107 100644
--- a/core/src/main/resources/lib/hudson/buildCaption.jelly
+++ b/core/src/main/resources/lib/hudson/buildCaption.jelly
@@ -27,6 +27,12 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <st:documentation>
+    <st:attribute name="controls">
+      Optional field to set controls in the app bar
+    </st:attribute>
+  </st:documentation>
+
   <div class="jenkins-app-bar">
     <div class="jenkins-app-bar__content jenkins-build-caption" data-status-url="${rootURL}/${it.url}statusIcon">
       <l:icon alt="${it.iconColor.description}" src="symbol-status-${it.iconColor.iconName}"
@@ -47,6 +53,7 @@ THE SOFTWARE.
         </div>
       </j:if>
       <st:adjunct includes="lib.hudson.build-caption"/>
+      <j:out value="${attrs.controls}" />
     </div>
   </div>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/project/console-link.jelly b/core/src/main/resources/lib/hudson/project/console-link.jelly
index 3a0f9cd5f727..eca6f4d90c04 100644
--- a/core/src/main/resources/lib/hudson/project/console-link.jelly
+++ b/core/src/main/resources/lib/hudson/project/console-link.jelly
@@ -25,16 +25,5 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <!-- Displays a console link for a build. -->
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
-    <j:choose>
-        <j:when test="${it.logFile.length() > 200000}">
-            <!-- Show raw link directly so user need not click through live console page, though this is not so bad now as they would just see: Skipping nnn KB.. Full Log. -->
-            <l:task href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" icon="icon-terminal icon-md" title="${%Console Output}"/>
-            <l:task href="${buildUrl.baseUrl}/consoleText" icon="icon-document icon-md" title="${%View as plain text}"/>
-        </j:when>
-        <j:otherwise>
-            <l:task icon="images/svgs/terminal.svg" href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" title="${%Console Output}">
-                <l:task href="${buildUrl.baseUrl}/consoleText" icon="icon-document icon-md" title="${%View as plain text}"/>
-            </l:task>
-        </j:otherwise>
-    </j:choose>
+    <l:task href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" icon="icon-terminal icon-md"  title="${%Console Output}" />
 </j:jelly>
diff --git a/core/src/main/resources/lib/layout/copyButton.jelly b/core/src/main/resources/lib/layout/copyButton.jelly
index c161e18e3789..8a65c641657a 100644
--- a/core/src/main/resources/lib/layout/copyButton.jelly
+++ b/core/src/main/resources/lib/layout/copyButton.jelly
@@ -43,6 +43,9 @@ THE SOFTWARE.
     <st:attribute name="clazz">
       Additional CSS class names
     </st:attribute>
+    <st:attribute name="label">
+      Optional label for the button, hides the tooltip if set
+    </st:attribute>
     <st:attribute name="ref" use="required">
       The id of the target element to be copied
       @since 2.449
@@ -54,9 +57,10 @@ THE SOFTWARE.
           text="${attrs.text}"
           ref="${attrs.ref}"
           message="${attrs.message ?: '%Copied'}"
-          tooltip="${attrs.tooltip ?: '%Copy'}"
+          tooltip="${attrs.label != null ? null : attrs.tooltip ?: '%Copy'}"
           type="button">
     <span class="jenkins-copy-button__icon" />
+    ${attrs.label}
   </button>
 
   <st:adjunct includes="lib.layout.copyButton.copyButton"/>

From 4885ff18fb257290a7fe663293651461e0c261a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 08:46:34 -0700
Subject: [PATCH 048/449] Bump org.jenkins-ci.main:jenkins-test-harness from
 2202.va_a_4166b_05253 to 2205.v7e19cc98f9c7 (#9299)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 13c4e77ccdcd..317b791cab7c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -142,7 +142,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2202.va_a_4166b_05253</version>
+      <version>2205.v7e19cc98f9c7</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From c7210721237f6c1e609d3d18155e9bc1101eccb0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 08:47:04 -0700
Subject: [PATCH 049/449] Update dependency globals to v15.3.0 (#9300)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 6a8ecbae279f..ad9ba90e75f9 100644
--- a/war/package.json
+++ b/war/package.json
@@ -34,7 +34,7 @@
     "eslint": "9.3.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.2.0",
+    "globals": "15.3.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",
diff --git a/war/yarn.lock b/war/yarn.lock
index c1fc123c4412..6bf69f851ebd 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3957,10 +3957,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.2.0":
-  version: 15.2.0
-  resolution: "globals@npm:15.2.0"
-  checksum: 10c0/ba8c34ef10fc1e65319bfde912a76dbe7654085af8b09d897974cfbe000c6d950ddcf28b4a0de372fe4144836aede32210a97b27ef184f68e1ff8bcd1a74fc5e
+"globals@npm:15.3.0":
+  version: 15.3.0
+  resolution: "globals@npm:15.3.0"
+  checksum: 10c0/edbef1c528185d02636ed6d72a1688168b922d6176031904386214f8b59d893f1d0a28da519b95665f557d366b17ea1affb9f433ea451e7372e2808fb31079d7
   languageName: node
   linkType: hard
 
@@ -4380,7 +4380,7 @@ __metadata:
     eslint: "npm:9.3.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.2.0"
+    globals: "npm:15.3.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"

From 5dfdc5f463b8987d87f5a01754ee45ad58e9ff4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 08:47:31 -0700
Subject: [PATCH 050/449] Bump org.springframework:spring-framework-bom from
 5.3.35 to 5.3.36 (#9301)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 298891a43cb0..d3aed901a32b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -56,7 +56,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.3.35</version>
+        <version>5.3.36</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From 8315030401dfad85ff3c421422968d4a8b11f1ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 14:20:30 -0700
Subject: [PATCH 051/449] Bump org.jenkins-ci.plugins:matrix-project from
 822.824.v14451b_c0fd42 to 830.v7ea_da_561b_a_34 (#9302)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 317b791cab7c..1251c6635037 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -241,7 +241,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>
-      <version>822.824.v14451b_c0fd42</version>
+      <version>830.v7ea_da_561b_a_34</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 1aa72c6dadb8..d64fd03df998 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -239,7 +239,7 @@ THE SOFTWARE.
                   <!-- detached after 1.561 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>matrix-project</artifactId>
-                  <version>822.824.v14451b_c0fd42</version>
+                  <version>830.v7ea_da_561b_a_34</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 22d89b9dc5ebe1c57e69d4d14166376346e879a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 14:17:29 -0700
Subject: [PATCH 052/449] Bump io.jenkins.plugins:javax-mail-api from 1.6.2-9
 to 1.6.2-10 (#9309)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 1251c6635037..961295da9712 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -177,7 +177,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>javax-mail-api</artifactId>
-      <version>1.6.2-9</version>
+      <version>1.6.2-10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index d64fd03df998..bfae99255117 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -414,7 +414,7 @@ THE SOFTWARE.
                   <!-- detached after 2.330 -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>javax-mail-api</artifactId>
-                  <version>1.6.2-9</version>
+                  <version>1.6.2-10</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From ea35bf41cf7ab2b285f6fd6e0b639efe81c632a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 14:18:00 -0700
Subject: [PATCH 053/449] Bump io.jenkins.plugins:javax-activation-api from
 1.2.0-6 to 1.2.0-7 (#9310)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 961295da9712..b6d85114805a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -83,7 +83,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>javax-activation-api</artifactId>
-        <version>1.2.0-6</version>
+        <version>1.2.0-7</version>
       </dependency>
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index bfae99255117..80ef50c945d5 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -407,7 +407,7 @@ THE SOFTWARE.
                   <!-- detached after 2.330 -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>javax-activation-api</artifactId>
-                  <version>1.2.0-6</version>
+                  <version>1.2.0-7</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 56a23f52bc95a5dde32fc9299e7248aedc1ba204 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 14:18:25 -0700
Subject: [PATCH 054/449] Bump org.jenkins-ci.main:jenkins-test-harness from
 2205.v7e19cc98f9c7 to 2206.v84d5d81e76db_ (#9308)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index b6d85114805a..9f2616dd4158 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -142,7 +142,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2205.v7e19cc98f9c7</version>
+      <version>2206.v84d5d81e76db_</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 43932f11b51e6484c752bcc3dcddbdd06eabb02c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 14:18:55 -0700
Subject: [PATCH 055/449] Bump org.jenkins-ci.plugins.workflow:workflow-api
 from 1311.v4250456a_e552 to 1312.ve804c2f2d51e (#9306)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 9f2616dd4158..228e99d4d870 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -116,7 +116,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-api</artifactId>
-        <version>1311.v4250456a_e552</version>
+        <version>1312.ve804c2f2d51e</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 80ef50c945d5..6db85f2fe20d 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -260,7 +260,7 @@ THE SOFTWARE.
                   <!-- dependency of junit, plugin-util-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>1311.v4250456a_e552</version>
+                  <version>1312.ve804c2f2d51e</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 50ba7d4d70f34edd25a0b9b8dc8ed670c8484b14 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 08:58:13 -0700
Subject: [PATCH 056/449] Update dependency org.apache.maven:maven-core to
 v3.9.7 (#9313)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .gitpod/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitpod/Dockerfile b/.gitpod/Dockerfile
index 6b71c6707163..f2475612b107 100644
--- a/.gitpod/Dockerfile
+++ b/.gitpod/Dockerfile
@@ -1,6 +1,6 @@
 FROM gitpod/workspace-full
 
-ARG MAVEN_VERSION=3.9.6
+ARG MAVEN_VERSION=3.9.7
 
 RUN brew install gh && \
     bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && sdk install maven ${MAVEN_VERSION} && sdk default maven ${MAVEN_VERSION}"

From 8c5026a89f0253487f6b4eb181675b253f48bfe7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 22:12:30 +0200
Subject: [PATCH 057/449] Update dependency css-loader to v7.1.2 (#9315)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index ad9ba90e75f9..11909df82667 100644
--- a/war/package.json
+++ b/war/package.json
@@ -29,7 +29,7 @@
     "@eslint/js": "9.3.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
-    "css-loader": "7.1.1",
+    "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
     "eslint": "9.3.0",
     "eslint-config-prettier": "9.1.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 6bf69f851ebd..0114085b0cb1 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3092,9 +3092,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-loader@npm:7.1.1":
-  version: 7.1.1
-  resolution: "css-loader@npm:7.1.1"
+"css-loader@npm:7.1.2":
+  version: 7.1.2
+  resolution: "css-loader@npm:7.1.2"
   dependencies:
     icss-utils: "npm:^5.1.0"
     postcss: "npm:^8.4.33"
@@ -3112,7 +3112,7 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 10c0/ebb4ffe68e9df0036fcce66ae182648d4d16b2fdfdc04a5bf7d7783776d389a23be161bb7139a3f842dc75466882544f46d2183bc9399d0bacf83b66a1802b41
+  checksum: 10c0/edec9ed71e3c416c9c6ad41c138834c94baf7629de3b97a3337ae8cec4a45e05c57bdb7c4b4d267229fc04b8970d0d1c0734ded8dcd0ac8c7c286b36facdbbf0
   languageName: node
   linkType: hard
 
@@ -4375,7 +4375,7 @@ __metadata:
     "@eslint/js": "npm:9.3.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
-    css-loader: "npm:7.1.1"
+    css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
     eslint: "npm:9.3.0"
     eslint-config-prettier: "npm:9.1.0"

From c46dc4becbbfa9574277cb8232e45ba53c293238 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Mon, 27 May 2024 05:13:58 +0200
Subject: [PATCH 058/449] [JENKINS-64356] fix legacyIds missing when creating
 jobs via REST API or CLI (#9303)

* [JENKINS-64356] call onCreatedFromScratch after creating item via api or cli

When creating jobs via the rest api or cli the call to
onCreatedFromScratch was missing. This can lead to long startup times
when many jobs are created this way.

* remove unused import
---
 core/src/main/java/hudson/model/ItemGroupMixIn.java     | 1 +
 test/src/test/java/jenkins/model/RunIdMigratorTest.java | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index 2a6b264db9de..faa214dee621 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -290,6 +290,7 @@ public synchronized TopLevelItem createProjectFromXML(String name, InputStream x
 
             add(result);
 
+            result.onCreatedFromScratch();
             ItemListener.fireOnCreated(result);
             Jenkins.get().rebuildDependencyGraphAsync();
 
diff --git a/test/src/test/java/jenkins/model/RunIdMigratorTest.java b/test/src/test/java/jenkins/model/RunIdMigratorTest.java
index 4ade1afc84e1..cb7903435d80 100644
--- a/test/src/test/java/jenkins/model/RunIdMigratorTest.java
+++ b/test/src/test/java/jenkins/model/RunIdMigratorTest.java
@@ -39,7 +39,6 @@
 import java.nio.charset.StandardCharsets;
 import org.htmlunit.HttpMethod;
 import org.htmlunit.WebRequest;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -58,7 +57,6 @@ public void legacyIdsPresent() throws Exception {
         assertTrue(legacyIds.exists());
     }
 
-    @Ignore("TODO Item#onCreatedFromScratch is not called")
     @Issue("JENKINS-64356")
     @Test
     public void legacyIdsPresentViaRestApi() throws Exception {
@@ -82,7 +80,6 @@ public void legacyIdsPresentViaRestApi() throws Exception {
         assertTrue(legacyIds.exists());
     }
 
-    @Ignore("TODO Item#onCreatedFromScratch is not called")
     @Issue("JENKINS-64356")
     @Test
     public void legacyIdsPresentViaCli() {

From dae17374aa76c3afa9a8d775954e05def00d3072 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Mon, 27 May 2024 05:14:14 +0200
Subject: [PATCH 059/449] [JENKINS-64553] fix ItemListener not called after
 updating job via REST API or CLI (#9304)

[JENKINS-64553] call ItemListener after updating job via cli

when a job is updated via REST API or CLI, the
ItemListener.fireOnUpdated is now called to inform about the change.
---
 .../main/java/hudson/model/AbstractItem.java  |  1 +
 .../model/listeners/ItemListenerTest.java     | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 0649bdb33b10..5bd1d6a02d79 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -937,6 +937,7 @@ public void updateByXml(Source source) throws IOException {
             // if everything went well, commit this new version
             out.commit();
             SaveableListener.fireOnChange(this, getConfigFile());
+            ItemListener.fireOnUpdated(this);
 
         } finally {
             out.abort(); // don't leave anything behind
diff --git a/test/src/test/java/hudson/model/listeners/ItemListenerTest.java b/test/src/test/java/hudson/model/listeners/ItemListenerTest.java
index 6209790f1a97..b7147d3ebfe5 100644
--- a/test/src/test/java/hudson/model/listeners/ItemListenerTest.java
+++ b/test/src/test/java/hudson/model/listeners/ItemListenerTest.java
@@ -35,6 +35,7 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
 /**
@@ -58,6 +59,12 @@ public void setUp() {
             @Override public void onCopied(Item src, Item item) {
                 events.append('Y');
             }
+
+            @Override
+            public void onUpdated(Item item) {
+                events.append('U');
+            }
+
         };
         ItemListener.all().add(0, listener);
     }
@@ -71,4 +78,18 @@ public void onCreatedViaCLI() {
         assertNotNull("job should be created: " + result, j.jenkins.getItem("testJob"));
         assertEquals("onCreated event should be triggered: " + result, "C", events.toString());
     }
+
+    @Issue("JENKINS-64553")
+    @Test
+    public void onUpdatedViaCLI() {
+        CLICommandInvoker.Result result = new CLICommandInvoker(j, "create-job").
+                withStdin(new ByteArrayInputStream("<project/>".getBytes(Charset.defaultCharset()))).
+                invokeWithArgs("testJob");
+        assertThat(result, CLICommandInvoker.Matcher.succeeded());
+        result = new CLICommandInvoker(j, "update-job").
+                withStdin(new ByteArrayInputStream("<project><actions/><builders/><publishers/><buildWrappers/></project>".getBytes(Charset.defaultCharset()))).
+                invokeWithArgs("testJob");
+        assertThat(result, CLICommandInvoker.Matcher.succeeded());
+        assertEquals("onUpdated event should be triggered: " + result, "CU", events.toString());
+    }
 }

From c10cafc2b5aef7bb57da4408832ae93a559df06e Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 26 May 2024 20:14:41 -0700
Subject: [PATCH 060/449] [JENKINS-10629] Migrate from Commons Compress to Ant
 (#9311)

---
 core/src/main/java/hudson/FilePath.java       | 13 ++---
 .../main/java/hudson/util/io/TarArchiver.java | 28 ++++-----
 .../hudson/tasks/ArtifactArchiverTest.java    | 57 +++++++++++++++++++
 3 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index b0cf56bf907d..b5131906e417 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -131,14 +131,14 @@
 import jenkins.util.ContextResettingExecutorService;
 import jenkins.util.SystemProperties;
 import jenkins.util.VirtualFile;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.fileupload2.core.FileItem;
 import org.apache.commons.io.input.CountingInputStream;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.tar.TarEntry;
+import org.apache.tools.tar.TarInputStream;
 import org.apache.tools.zip.ZipEntry;
 import org.apache.tools.zip.ZipFile;
 import org.jenkinsci.remoting.RoleChecker;
@@ -3079,14 +3079,13 @@ private static void readFromTar(String name, File baseDir, InputStream in) throw
 
     /**
      * Reads from a tar stream and stores obtained files to the base dir.
-     * Supports large files > 10 GB since 1.627 when this was migrated to use commons-compress.
+     * Supports large files &gt; 10 GB since 1.627.
      */
     private static void readFromTar(String name, File baseDir, InputStream in, Charset filenamesEncoding) throws IOException {
 
-        // TarInputStream t = new TarInputStream(in);
-        try (TarArchiveInputStream t = new TarArchiveInputStream(in, filenamesEncoding.name())) {
-            TarArchiveEntry te;
-            while ((te = t.getNextTarEntry()) != null) {
+        try (TarInputStream t = new TarInputStream(in, filenamesEncoding.name())) {
+            TarEntry te;
+            while ((te = t.getNextEntry()) != null) {
                 File f = new File(baseDir, te.getName());
                 if (!f.toPath().normalize().startsWith(baseDir.toPath())) {
                     throw new IOException(
diff --git a/core/src/main/java/hudson/util/io/TarArchiver.java b/core/src/main/java/hudson/util/io/TarArchiver.java
index 00b3d1b55d12..597b4ff47339 100644
--- a/core/src/main/java/hudson/util/io/TarArchiver.java
+++ b/core/src/main/java/hudson/util/io/TarArchiver.java
@@ -36,10 +36,10 @@
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.attribute.BasicFileAttributes;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.apache.commons.compress.archivers.tar.TarConstants;
-import org.apache.commons.compress.utils.BoundedInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
+import org.apache.tools.tar.TarConstants;
+import org.apache.tools.tar.TarEntry;
+import org.apache.tools.tar.TarOutputStream;
 
 /**
  * {@link FileVisitor} that creates a tar archive.
@@ -48,17 +48,17 @@
  */
 final class TarArchiver extends Archiver {
     private final byte[] buf = new byte[8192];
-    private final TarArchiveOutputStream tar;
+    private final TarOutputStream tar;
 
     TarArchiver(OutputStream out, Charset filenamesEncoding) {
-        tar = new TarArchiveOutputStream(out, filenamesEncoding.name());
-        tar.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_STAR);
-        tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
+        tar = new TarOutputStream(out, filenamesEncoding.name());
+        tar.setBigNumberMode(TarOutputStream.BIGNUMBER_STAR);
+        tar.setLongFileMode(TarOutputStream.LONGFILE_GNU);
     }
 
     @Override
     public void visitSymlink(File link, String target, String relativePath) throws IOException {
-        TarArchiveEntry e = new TarArchiveEntry(relativePath, TarConstants.LF_SYMLINK);
+        TarEntry e = new TarEntry(relativePath, TarConstants.LF_SYMLINK);
         try {
             int mode = IOUtils.mode(link);
             if (mode != -1) {
@@ -70,8 +70,8 @@ public void visitSymlink(File link, String target, String relativePath) throws I
 
         e.setLinkName(target);
 
-        tar.putArchiveEntry(e);
-        tar.closeArchiveEntry();
+        tar.putNextEntry(e);
+        tar.closeEntry();
         entriesWritten++;
     }
 
@@ -88,7 +88,7 @@ public void visit(File file, String relativePath) throws IOException {
         BasicFileAttributes basicFileAttributes = Files.readAttributes(Util.fileToPath(file), BasicFileAttributes.class);
         if (basicFileAttributes.isDirectory())
             relativePath += '/';
-        TarArchiveEntry te = new TarArchiveEntry(relativePath);
+        TarEntry te = new TarEntry(relativePath);
         int mode = IOUtils.mode(file);
         if (mode != -1)   te.setMode(mode);
         te.setModTime(basicFileAttributes.lastModifiedTime().toMillis());
@@ -98,7 +98,7 @@ public void visit(File file, String relativePath) throws IOException {
             size = basicFileAttributes.size();
             te.setSize(size);
         }
-        tar.putArchiveEntry(te);
+        tar.putNextEntry(te);
         try {
             if (!basicFileAttributes.isDirectory()) {
                 // ensure we don't write more bytes than the declared when we created the entry
@@ -118,7 +118,7 @@ public void visit(File file, String relativePath) throws IOException {
                 }
             }
         } finally { // always close the entry
-            tar.closeArchiveEntry();
+            tar.closeEntry();
         }
         entriesWritten++;
     }
diff --git a/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java b/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
index 2157e89492d7..6ceca40aba88 100644
--- a/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
+++ b/test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
@@ -26,6 +26,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThan;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -51,6 +52,8 @@
 import hudson.slaves.DumbSlave;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -61,6 +64,7 @@
 import org.hamcrest.Matchers;
 import org.jenkinsci.plugins.structs.describable.DescribableModel;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.BuildWatcher;
@@ -392,6 +396,59 @@ public void testDefaultExcludesOff() throws Exception {
         assertTrue(artifacts.child("dir").child(".svn").child("file").exists());
     }
 
+    @Ignore("Test is too slow and requires a lot of disk space")
+    @Issue("JENKINS-10629")
+    @Test
+    public void testLargeArchiveFromAgent() throws Exception {
+        final String filename = "large";
+        final long size = 10L * 1024L * 1024L * 1024L; // 10 GB
+
+        Slave agent = j.createOnlineSlave();
+        FreeStyleProject project = j.createFreeStyleProject();
+        project.setAssignedNode(agent);
+        project.getBuildersList().add(new TestBuilder() {
+            @Override
+            public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
+                FilePath filePath = build.getWorkspace().child(filename);
+                try (OutputStream os = filePath.write()) {
+                    // Create byte array and fill it with data
+                    byte[] megabyte = new byte[1024 * 1024];
+                    for (int i = 0; i < megabyte.length; i++) {
+                        megabyte[i] = (byte) (i % 128);
+                    }
+                    // Fill file with 1 MB chunks
+                    for (int i = 0; i < size / megabyte.length; i++) {
+                        os.write(megabyte);
+                    }
+                }
+                return true;
+            }
+        });
+        project.getPublishersList().add(new ArtifactArchiver(filename));
+
+        // Assert that the build succeeded
+        FreeStyleBuild build = j.buildAndAssertSuccess(project);
+        VirtualFile virtualFile = build.getArtifactManager().root().child(filename);
+
+        // Assert that the artifact was copied
+        assertTrue(virtualFile.exists());
+
+        // Assert that it has the right size
+        assertEquals(size, virtualFile.length());
+
+        // Assert that the data at the end of the file is the expected data
+        try (InputStream is = virtualFile.open()) {
+            is.skip(size - 1024 * 1024);
+            byte[] expected = new byte[1024 * 1024];
+            for (int i = 0; i < expected.length; i++) {
+                expected[i] = (byte) (i % 128);
+            }
+            byte[] actual = new byte[1024 * 1024];
+            is.read(actual);
+            assertArrayEquals(expected, actual);
+        }
+    }
+
     @LocalData
     @Test public void latestOnlyMigration() throws Exception {
         FreeStyleProject p = j.jenkins.getItemByFullName("sample", FreeStyleProject.class);

From f6e928392105f56e2b447da3bc7b63c7376f73a6 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 26 May 2024 20:14:58 -0700
Subject: [PATCH 061/449] Replace usages of JZlib with native Java Platform
 functionality (#9312)

* Replace usages of JZlib with native Java Platform functionality

* Simplify import of class

* Pull in Stapler version of this change
---
 bom/pom.xml                                    |  2 +-
 core/src/main/java/hudson/FilePath.java        | 18 +++++-------------
 .../hudson/console/AnnotatedLargeText.java     |  4 ++--
 .../main/java/hudson/console/ConsoleNote.java  |  4 ++--
 core/src/main/java/hudson/model/Run.java       |  2 +-
 .../java/hudson/model/UsageStatistics.java     |  2 +-
 .../main/java/hudson/util/CompressedFile.java  |  4 ++--
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index d3aed901a32b..273355a332b2 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <slf4jVersion>2.0.13</slf4jVersion>
-    <stapler.version>1869.v3605a_771fb_e3</stapler.version>
+    <stapler.version>1870.v48cc46ef5fee</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index b5131906e417..44a39b22836f 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -31,8 +31,6 @@
 import static hudson.Util.fixEmptyAndTrim;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.jcraft.jzlib.GZIPInputStream;
-import com.jcraft.jzlib.GZIPOutputStream;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -61,7 +59,6 @@
 import hudson.util.ExceptionCatchingThreadFactory;
 import hudson.util.FileVisitor;
 import hudson.util.FormValidation;
-import hudson.util.HeadBufferingStream;
 import hudson.util.IOUtils;
 import hudson.util.NamingThreadFactory;
 import hudson.util.io.Archiver;
@@ -124,6 +121,8 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 import jenkins.MasterToSlaveFileCallable;
 import jenkins.SlaveToMasterFileCallable;
 import jenkins.model.Jenkins;
@@ -888,15 +887,8 @@ public OutputStream compress(OutputStream out) {
         },
         GZIP {
             @Override
-            public InputStream extract(InputStream _in) throws IOException {
-                HeadBufferingStream in = new HeadBufferingStream(_in, SIDE_BUFFER_SIZE);
-                try {
-                    return new GZIPInputStream(in, 8192, true);
-                } catch (IOException e) {
-                    // various people reported "java.io.IOException: Not in GZIP format" here, so diagnose this problem better
-                    in.fillSide();
-                    throw new IOException(e.getMessage() + "\nstream=" + Util.toHexString(in.getSideBuffer()), e);
-                }
+            public InputStream extract(InputStream in) throws IOException {
+                return new GZIPInputStream(new BufferedInputStream(in));
             }
 
             @Override
@@ -2471,7 +2463,7 @@ private OffsetPipeSecureFileCallable(Pipe p, long offset) {
         @Override
         public Void invoke(File f, VirtualChannel channel) throws IOException {
             try (OutputStream os = p.getOut();
-                 OutputStream out = new java.util.zip.GZIPOutputStream(os, 8192);
+                 OutputStream out = new GZIPOutputStream(os, 8192);
                  RandomAccessFile raf = new RandomAccessFile(f, "r")) {
                 raf.seek(offset);
                 byte[] buf = new byte[8192];
diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java
index 8e0a59bee2af..4e0d3b9908af 100644
--- a/core/src/main/java/hudson/console/AnnotatedLargeText.java
+++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java
@@ -28,8 +28,6 @@
 
 import static java.lang.Math.abs;
 
-import com.jcraft.jzlib.GZIPInputStream;
-import com.jcraft.jzlib.GZIPOutputStream;
 import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.remoting.ObjectInputStreamEx;
@@ -45,6 +43,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.concurrent.TimeUnit;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 import javax.crypto.Cipher;
 import javax.crypto.CipherInputStream;
 import javax.crypto.CipherOutputStream;
diff --git a/core/src/main/java/hudson/console/ConsoleNote.java b/core/src/main/java/hudson/console/ConsoleNote.java
index 20ded06e9862..633a5ed54743 100644
--- a/core/src/main/java/hudson/console/ConsoleNote.java
+++ b/core/src/main/java/hudson/console/ConsoleNote.java
@@ -24,8 +24,6 @@
 
 package hudson.console;
 
-import com.jcraft.jzlib.GZIPInputStream;
-import com.jcraft.jzlib.GZIPOutputStream;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.ExtensionPoint;
 import hudson.Functions;
@@ -50,6 +48,8 @@
 import java.util.Base64;
 import java.util.Collection;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 import jenkins.model.Jenkins;
 import jenkins.security.HMACConfidentialKey;
 import jenkins.util.JenkinsJVM;
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index a2061b162b0b..324a5eff3cb9 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -33,7 +33,6 @@
 import static java.util.logging.Level.SEVERE;
 import static java.util.logging.Level.WARNING;
 
-import com.jcraft.jzlib.GZIPInputStream;
 import com.thoughtworks.xstream.XStream;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -106,6 +105,7 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.GZIPInputStream;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 import jenkins.model.ArtifactManager;
diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java
index 9fc052cd1009..341f135c52f1 100644
--- a/core/src/main/java/hudson/model/UsageStatistics.java
+++ b/core/src/main/java/hudson/model/UsageStatistics.java
@@ -26,7 +26,6 @@
 
 import static java.util.concurrent.TimeUnit.DAYS;
 
-import com.jcraft.jzlib.GZIPOutputStream;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
@@ -56,6 +55,7 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.GZIPOutputStream;
 import javax.crypto.Cipher;
 import javax.crypto.CipherInputStream;
 import javax.crypto.CipherOutputStream;
diff --git a/core/src/main/java/hudson/util/CompressedFile.java b/core/src/main/java/hudson/util/CompressedFile.java
index d7f42ca7a9ae..cd08f838a250 100644
--- a/core/src/main/java/hudson/util/CompressedFile.java
+++ b/core/src/main/java/hudson/util/CompressedFile.java
@@ -24,8 +24,6 @@
 
 package hudson.util;
 
-import com.jcraft.jzlib.GZIPInputStream;
-import com.jcraft.jzlib.GZIPOutputStream;
 import hudson.Util;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -43,6 +41,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 /**
  * Represents write-once read-many file that can be optionally compressed

From 4ff2f4183d134bf446261047673aac49b16c7b52 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sun, 26 May 2024 21:15:26 -0600
Subject: [PATCH 062/449] Warn  Java 11 users of 18 Jun 2024 end of life in
 weekly (#9314)

Alert Java 11 users of 18 Jun 2024 end of life in weekly

Also updates the Java 11 end of life date for Java 11 users running with
the long term support release.
---
 .../JavaVersionRecommendationAdminMonitor.java        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
index 86093a634617..4b3642bb059c 100644
--- a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
+++ b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
@@ -78,7 +78,16 @@ public class JavaVersionRecommendationAdminMonitor extends AdministrativeMonitor
 
     static {
         NavigableMap<Integer, LocalDate> supportedVersions = new TreeMap<>();
-        supportedVersions.put(11, LocalDate.of(2024, 9, 30)); // Temurin: 2024-10-31
+        // Adjust Java 11 end of life date for weekly and LTS
+        if (Jenkins.VERSION.split("[.]").length > 2) {
+            // LTS will require Java 17 or newer beginning 30 Oct 2024
+            // https://groups.google.com/g/jenkinsci-dev/c/gsXAqOQQEPc/m/VT9IBYdmAQAJ
+            supportedVersions.put(11, LocalDate.of(2024, 10, 30)); // Temurin: 2024-10-31
+        } else {
+            // Weekly will require Java 17 or newer beginning 18 Jun 2024
+            // https://groups.google.com/g/jenkinsci-dev/c/gsXAqOQQEPc/m/4fn4Un1iAwAJ
+            supportedVersions.put(11, LocalDate.of(2024, 6, 18)); // Temurin: 2024-10-31
+        }
         supportedVersions.put(17, LocalDate.of(2026, 3, 31)); // Temurin: 2027-10-31
         supportedVersions.put(21, LocalDate.of(2027, 9, 30)); // Temurin: 2029-09-30
         SUPPORTED_JAVA_VERSIONS = Collections.unmodifiableNavigableMap(supportedVersions);

From 5af668dd2176a7938dc5e0f843eafbd0fd9580fd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 26 May 2024 21:15:57 -0600
Subject: [PATCH 063/449] Update dependency postcss-preset-env to v9.5.14
 (#9318)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/war/package.json b/war/package.json
index 11909df82667..8316c78911ae 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "9.5.13",
+    "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
     "prettier": "3.2.5",
     "sass": "1.77.2",
diff --git a/war/yarn.lock b/war/yarn.lock
index 0114085b0cb1..8be8c0934732 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4389,7 +4389,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.0"
     postcss: "npm:8.4.38"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:9.5.13"
+    postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.2.5"
     sass: "npm:1.77.2"
@@ -5714,16 +5714,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.4":
-  version: 12.1.4
-  resolution: "postcss-nesting@npm:12.1.4"
+"postcss-nesting@npm:^12.1.5":
+  version: 12.1.5
+  resolution: "postcss-nesting@npm:12.1.5"
   dependencies:
     "@csstools/selector-resolve-nested": "npm:^1.1.0"
     "@csstools/selector-specificity": "npm:^3.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b3408de4c04b58a88a56fa81aeff59b12615c78d4f5a57e09c1ee47e74cff51f8c9cad1684da0059067303cf65b4b688f85f0c5ca8d54af8c4ab998f727ab9fd
+  checksum: 10c0/8f049fe24dccb186707e065ffb697f9f0633a03b0e1139e9c24656f3d2158a738a51c7b1f405b48fdb8b4f19515ad4ad9d3cd4ec9d9fe1dd4e5f18729bf8e589
   languageName: node
   linkType: hard
 
@@ -5877,9 +5877,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-preset-env@npm:9.5.13":
-  version: 9.5.13
-  resolution: "postcss-preset-env@npm:9.5.13"
+"postcss-preset-env@npm:9.5.14":
+  version: 9.5.14
+  resolution: "postcss-preset-env@npm:9.5.14"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.6"
     "@csstools/postcss-color-function": "npm:^3.0.16"
@@ -5933,7 +5933,7 @@ __metadata:
     postcss-image-set-function: "npm:^6.0.3"
     postcss-lab-function: "npm:^6.0.16"
     postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.4"
+    postcss-nesting: "npm:^12.1.5"
     postcss-opacity-percentage: "npm:^2.0.0"
     postcss-overflow-shorthand: "npm:^5.0.1"
     postcss-page-break: "npm:^3.0.4"
@@ -5943,7 +5943,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5bbb6e87b1b3acc816ef445836f85df5f50ac96bdc3d571952a83794c80863c652d27ab14c66f6b88f86f5664119d49b357e4184162022cc3436676f3fbe833b
+  checksum: 10c0/8e0c8f5c2e7b8385a770c13185986dc50d7a73b10b98c65c2f86bb4cd2860de722caef8172b1676962dafbbc044d6be1955f2a092e951976a30d4ee33b0d7571
   languageName: node
   linkType: hard
 
@@ -6026,13 +6026,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
-  version: 6.0.16
-  resolution: "postcss-selector-parser@npm:6.0.16"
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "postcss-selector-parser@npm:6.1.0"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10c0/0e11657cb3181aaf9ff67c2e59427c4df496b4a1b6a17063fae579813f80af79d444bf38f82eeb8b15b4679653fd3089e66ef0283f9aab01874d885e6cf1d2cf
+  checksum: 10c0/91e9c6434772506bc7f318699dd9d19d32178b52dfa05bed24cb0babbdab54f8fb765d9920f01ac548be0a642aab56bce493811406ceb00ae182bbb53754c473
   languageName: node
   linkType: hard
 

From 2c02654e9c032dc0e1b5d3ea98477c8731197a6a Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 27 May 2024 16:06:49 +0100
Subject: [PATCH 064/449] Display how many users there are on the 'Users' page
 (#9221)

Init
---
 .../security/HudsonPrivateSecurityRealm/index.jelly   |  2 +-
 core/src/main/resources/lib/layout/app-bar.jelly      |  6 ++++++
 war/src/main/scss/components/_app-bar.scss            | 11 +++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
index 45e05e870fc0..88939feeaca3 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
   <l:layout permission="${app.ADMINISTER}" title="${%Users}" type="one-column">
     <l:main-panel>
-      <l:app-bar title="${%Users}">
+      <l:app-bar title="${%Users}" subtitle="${it.allUsers.size()}">
         <l:isAdmin>
           <a href="addUser" class="jenkins-button jenkins-button--primary">
             <l:icon src="symbol-add" />
diff --git a/core/src/main/resources/lib/layout/app-bar.jelly b/core/src/main/resources/lib/layout/app-bar.jelly
index 9d8aa6f0fbf3..c435ee19b157 100644
--- a/core/src/main/resources/lib/layout/app-bar.jelly
+++ b/core/src/main/resources/lib/layout/app-bar.jelly
@@ -31,6 +31,9 @@ THE SOFTWARE.
     <st:attribute name="headingLevel">
       Defaults to h1
     </st:attribute>
+    <st:attribute name="subtitle">
+      The subtitle for the application bar
+    </st:attribute>
     Generates a row containing the page title and an optional set of controls
   </st:documentation>
 
@@ -39,6 +42,9 @@ THE SOFTWARE.
       <div class="jenkins-app-bar__content">
         <x:element name="${headingLevel ?: 'h1'}">
           ${title}
+          <j:if test="${attrs.subtitle != null}">
+            <span class="jenkins-app-bar__subtitle">${attrs.subtitle}</span>
+          </j:if>
         </x:element>
       </div>
       <div class="jenkins-app-bar__controls">
diff --git a/war/src/main/scss/components/_app-bar.scss b/war/src/main/scss/components/_app-bar.scss
index 0cff962e7967..cbe9b9e53fc7 100644
--- a/war/src/main/scss/components/_app-bar.scss
+++ b/war/src/main/scss/components/_app-bar.scss
@@ -25,12 +25,6 @@
     }
   }
 
-  &--border {
-    margin-bottom: var(--section-padding);
-    padding-bottom: var(--section-padding);
-    border-bottom: 2px solid var(--panel-border-color);
-  }
-
   &--sticky {
     position: sticky;
     top: 40px;
@@ -69,6 +63,11 @@
     margin: 0;
     font-size: 1.5rem;
   }
+
+  &__subtitle {
+    color: var(--text-color-secondary);
+    margin-left: 0.5ch;
+  }
 }
 
 .jenkins-build-caption {

From 69b320f67dd39214f37156e26e46916c29eb0d97 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 27 May 2024 16:06:58 +0100
Subject: [PATCH 065/449] Remove 'Disable project' button from project view
 (#9287)

Revert "Revert "Remove 'Disable project' button from project view" (#9272)"

This reverts commit 46237384bd58757a985e0949d5a8c7a998b9e256.
---
 .../lib/hudson/project/makeDisabled.jelly          |  9 ---------
 test/src/test/java/hudson/model/ProjectTest.java   | 14 ++++++--------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
index 9eb7f4f6571c..e53f9ab12ad9 100644
--- a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
+++ b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
@@ -41,14 +41,5 @@ THE SOFTWARE.
         </form>
       </div>
     </j:when>
-    <j:otherwise>
-      <div align="right">
-        <form method="post" id="disable-project" action="disable">
-          <l:hasPermission permission="${it.CONFIGURE}">
-            <f:submit value="${%Disable Project}" primary="false" />
-          </l:hasPermission>
-        </form>
-      </div>
-    </j:otherwise>
   </j:choose>
 </j:jelly>
diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java
index 82d9266e0e62..e3f2d84493e3 100644
--- a/test/src/test/java/hudson/model/ProjectTest.java
+++ b/test/src/test/java/hudson/model/ProjectTest.java
@@ -644,15 +644,13 @@ public void testDoDisable() throws Exception {
 
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.withBasicCredentials(user.getId(), "password");
-        HtmlPage p = wc.goTo(project.getUrl());
 
-        List<HtmlForm> forms = p.getForms();
-        for (HtmlForm form : forms) {
-            if ("disable".equals(form.getAttribute("action"))) {
-                j.submit(form);
-            }
-        }
-       assertTrue("Project should be disabled.", project.isDisabled());
+        HtmlPage p = wc.getPage(project, "configure");
+        HtmlForm form = p.getFormByName("config");
+        form.getInputByName("enable").click();
+        j.submit(form);
+
+        assertTrue("Project should be disabled.", project.isDisabled());
     }
 
     @Test

From 3eb79319205a63190d61dfe8cd3bc38ffc66ebd1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 19:45:57 +0200
Subject: [PATCH 066/449] Update babel monorepo to v7.24.6 (#9319)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |    6 +-
 war/yarn.lock    | 1153 +++++++++++++++++++++++-----------------------
 2 files changed, 579 insertions(+), 580 deletions(-)

diff --git a/war/package.json b/war/package.json
index 8316c78911ae..048b286710b7 100644
--- a/war/package.json
+++ b/war/package.json
@@ -23,9 +23,9 @@
     "lint": "yarn lint:js && yarn lint:css"
   },
   "devDependencies": {
-    "@babel/cli": "7.24.5",
-    "@babel/core": "7.24.5",
-    "@babel/preset-env": "7.24.5",
+    "@babel/cli": "7.24.6",
+    "@babel/core": "7.24.6",
+    "@babel/preset-env": "7.24.6",
     "@eslint/js": "9.3.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 8be8c0934732..7b98a54bc9dd 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -22,14 +22,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/cli@npm:7.24.5":
-  version: 7.24.5
-  resolution: "@babel/cli@npm:7.24.5"
+"@babel/cli@npm:7.24.6":
+  version: 7.24.6
+  resolution: "@babel/cli@npm:7.24.6"
   dependencies:
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     "@nicolo-ribaudo/chokidar-2": "npm:2.1.8-no-fsevents.3"
     chokidar: "npm:^3.4.0"
-    commander: "npm:^4.0.1"
+    commander: "npm:^6.2.0"
     convert-source-map: "npm:^2.0.0"
     fs-readdir-recursive: "npm:^1.1.0"
     glob: "npm:^7.2.0"
@@ -45,122 +45,122 @@ __metadata:
   bin:
     babel: ./bin/babel.js
     babel-external-helpers: ./bin/babel-external-helpers.js
-  checksum: 10c0/ec1c0546986b1b2423a125f919701b1c29ea1e999302035379adbfb9104e819d9cecc9d947ac91a26a9da7e6445f1812fc61deabf9d0a5f3894f53ec19fdfa04
+  checksum: 10c0/0abf37d0987cab589098fbdb2894f7486d2d430e99803dc2c9bf655a74d2cef73a0d62f9385142183469a6ed3c847355746da22de1abfe5ec32dad17bad1b1c1
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.2":
-  version: 7.24.2
-  resolution: "@babel/code-frame@npm:7.24.2"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/code-frame@npm:7.24.6"
   dependencies:
-    "@babel/highlight": "npm:^7.24.2"
+    "@babel/highlight": "npm:^7.24.6"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/d1d4cba89475ab6aab7a88242e1fd73b15ecb9f30c109b69752956434d10a26a52cbd37727c4eca104b6d45227bd1dfce39a6a6f4a14c9b2f07f871e968cf406
+  checksum: 10c0/c93c6d1763530f415218c31d07359364397f19b70026abdff766164c21ed352a931cf07f3102c5fb9e04792de319e332d68bcb1f7debef601a02197f90f9ba24
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/compat-data@npm:7.24.4"
-  checksum: 10c0/9cd8a9cd28a5ca6db5d0e27417d609f95a8762b655e8c9c97fd2de08997043ae99f0139007083c5e607601c6122e8432c85fe391731b19bf26ad458fa0c60dd3
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/compat-data@npm:7.24.6"
+  checksum: 10c0/f50abbd4008eb2a5d12139c578809cebbeaeb8e660fb12d546eb2e7c2108ae1836ab8339184a5f5ce0e95bf81bb91e18edce86b387c59db937b01693ec0bc774
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.24.5":
-  version: 7.24.5
-  resolution: "@babel/core@npm:7.24.5"
+"@babel/core@npm:7.24.6":
+  version: 7.24.6
+  resolution: "@babel/core@npm:7.24.6"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.24.2"
-    "@babel/generator": "npm:^7.24.5"
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-module-transforms": "npm:^7.24.5"
-    "@babel/helpers": "npm:^7.24.5"
-    "@babel/parser": "npm:^7.24.5"
-    "@babel/template": "npm:^7.24.0"
-    "@babel/traverse": "npm:^7.24.5"
-    "@babel/types": "npm:^7.24.5"
+    "@babel/code-frame": "npm:^7.24.6"
+    "@babel/generator": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helpers": "npm:^7.24.6"
+    "@babel/parser": "npm:^7.24.6"
+    "@babel/template": "npm:^7.24.6"
+    "@babel/traverse": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/e26ba810a77bc8e21579a12fc36c79a0a60554404dc9447f2d64eb1f26d181c48d3b97d39d9f158e9911ec7162a8280acfaf2b4b210e975f0dd4bd4dbb1ee159
+  checksum: 10c0/e0762a8daef7f417494d555929418cfacd6848c7fc3310ec00e6dd8cecac20b7f590e760bfc9365d2af07874a3f5599832f9c9ff7f1a9d126a168f77ba67945a
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/generator@npm:7.24.5"
+"@babel/generator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/generator@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.6"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/0d64f880150e7dfb92ceff2b4ac865f36aa1e295120920246492ffd0146562dabf79ba8699af1c8833f8a7954818d4d146b7b02f808df4d6024fb99f98b2f78d
+  checksum: 10c0/8d71a17b386536582354afba53cc784396458a88cc9f05f0c6de0ec99475f6f539943b3566b2e733820c4928236952473831765e483c25d68cc007a6e604d782
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
+"@babel/helper-annotate-as-pure@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-annotate-as-pure@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/5a80dc364ddda26b334bbbc0f6426cab647381555ef7d0cd32eb284e35b867c012ce6ce7d52a64672ed71383099c99d32765b3d260626527bb0e3470b0f58e45
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/3fe446e3bd37e5e32152279c84ace4e83815e5b88b9e09a82a83974a0bb22e941d89db26b23aaab4c9eb0f9713772c2f6163feffc1bcb055c4cdb6b67e5dc82f
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.15"
-  checksum: 10c0/2535e3824ca6337f65786bbac98e562f71699f25532cecd196f027d7698b4967a96953d64e36567956658ad1a05ccbdc62d1ba79ee751c79f4f1d2d3ecc2e01c
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/d468ba492163bdcf5b6c53248edcf0aaed6194c0f7bdebef4f29ef626e5b03e9fcc7ed737445eb80a961ec6e687c330e1c5242d8a724efb0af002141f3b3e66c
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/helper-compilation-targets@npm:7.23.6"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-compilation-targets@npm:7.24.6"
   dependencies:
-    "@babel/compat-data": "npm:^7.23.5"
-    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/compat-data": "npm:^7.24.6"
+    "@babel/helper-validator-option": "npm:^7.24.6"
     browserslist: "npm:^4.22.2"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa
+  checksum: 10c0/4d41150086959f5f4d72d27bae29204192e943537ecb71df1711d1f5d8791358a44f3a5882ed3c8238ba0c874b0b55213af43767e14771765f13b8d15b262432
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4, @babel/helper-create-class-features-plugin@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.5"
+"@babel/helper-create-class-features-plugin@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.5"
-    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
-    "@babel/helper-replace-supers": "npm:^7.24.1"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.6"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.6"
+    "@babel/helper-replace-supers": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.6"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/afc72e8075a249663f8024ef1760de4c0b9252bdde16419ac955fa7e15b8d4096ca1e01f796df4fa8cfdb056708886f60b631ad492242a8e47307974fc305920
+  checksum: 10c0/e6734671bc6a5f3cca4ec46e4cc70238e5a2fa063e51225c2be572f157119002af419b33ea0f846dbb1307370fe9f3aa92d199449abbea5e88e0262513c8a821
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
     regexpu-core: "npm:^5.3.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/8eba4c1b7b94a83e7a82df5c3e504584ff0ba6ab8710a67ecc2c434a7fb841a29c2f5c94d2de51f25446119a1df538fa90b37bd570db22ddd5e7147fe98277c6
+  checksum: 10c0/c6e1b07c94b3b93a3f534039da88bc67ec3156080f1959aa07d5d534e9a640de3533e7ded0516dfcbccde955e91687044e6a950852b1d3f402ac5d5001be56cf
   languageName: node
   linkType: hard
 
@@ -179,243 +179,242 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
-  checksum: 10c0/e762c2d8f5d423af89bd7ae9abe35bd4836d2eb401af868a63bbb63220c513c783e25ef001019418560b3fdc6d9a6fb67e6c0b650bcdeb3a2ac44b5c3d2bdd94
+"@babel/helper-environment-visitor@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-environment-visitor@npm:7.24.6"
+  checksum: 10c0/fdcd18ac505ed71f40c05cc992b648a4495b0aa5310a774492a0f74d8dcf3579691102f516561a651d3de6c3a44fe64bfb3049d11c14c5857634ef1823ea409a
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-function-name@npm:7.23.0"
+"@babel/helper-function-name@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-function-name@npm:7.24.6"
   dependencies:
-    "@babel/template": "npm:^7.22.15"
-    "@babel/types": "npm:^7.23.0"
-  checksum: 10c0/d771dd1f3222b120518176733c52b7cadac1c256ff49b1889dbbe5e3fed81db855b8cc4e40d949c9d3eae0e795e8229c1c8c24c0e83f27cfa6ee3766696c6428
+    "@babel/template": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/5ba2f8db789b3f5a2b2239300a217aa212e303cd7bfad9c8b90563807f49215e8c679e8f8f177b6aaca2038038e29bc702b83839e1f7b4896d79c44a75cac97a
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
+"@babel/helper-hoist-variables@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-hoist-variables@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/60a3077f756a1cd9f14eb89f0037f487d81ede2b7cfe652ea6869cd4ec4c782b0fb1de01b8494b9a2d2050e3d154d7d5ad3be24806790acfb8cbe2073bf1e208
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/e10ec6b864aaa419ec4934f5fcb5d0cfcc9d0657584a1b6c3c42ada949d44ca6bffcdab433a90ada4396c747e551cca31ba0e565ea005ab3f50964e3817bf6cf
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.23.0, @babel/helper-member-expression-to-functions@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.5"
+"@babel/helper-member-expression-to-functions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.5"
-  checksum: 10c0/a3c0276a1ede8648a0e6fd86ad846cd57421d05eddfa29446b8b5a013db650462022b9ec1e65ea32c747d0542d729c80866830697f94fb12d603e87c51f080a5
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/7595f62978f55921b24de6ed5252fcedbffacfb8271f71e092f38724179ba554cb3a24a4764a1a3890b8a53504c2bee9c99eab81f1f365582739f566c8e28eaa
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.24.1, @babel/helper-module-imports@npm:^7.24.3":
-  version: 7.24.3
-  resolution: "@babel/helper-module-imports@npm:7.24.3"
+"@babel/helper-module-imports@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-module-imports@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/052c188adcd100f5e8b6ff0c9643ddaabc58b6700d3bbbc26804141ad68375a9f97d9d173658d373d31853019e65f62610239e3295cdd58e573bdcb2fded188d
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/e0db3fbfcd963d138f0792ff626f940a576fcf212d02b8fe6478dccf3421bd1c2a76f8e69c7450c049985e7b63b30be309a24eeeb6ad7c2137a31b676a095a84
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.23.3, @babel/helper-module-transforms@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-module-transforms@npm:7.24.5"
+"@babel/helper-module-transforms@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-module-transforms@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-module-imports": "npm:^7.24.3"
-    "@babel/helper-simple-access": "npm:^7.24.5"
-    "@babel/helper-split-export-declaration": "npm:^7.24.5"
-    "@babel/helper-validator-identifier": "npm:^7.24.5"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-module-imports": "npm:^7.24.6"
+    "@babel/helper-simple-access": "npm:^7.24.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.6"
+    "@babel/helper-validator-identifier": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/6e77d72f62b7e87abaea800ea0bccd4d54cde26485750969f5f493c032eb63251eb50c3522cace557781565d51c1d0c4bcc866407d24becfb109c18fb92c978d
+  checksum: 10c0/9e2e3d0ddb397b36b9e8c7d94e175a36be8cb888ef370cefef2cdfd53ae1f87d567b268bd90ed9a6c706485a8de3da19cac577657613e9cd17210b91cbdfb00b
   languageName: node
   linkType: hard
 
-"@babel/helper-optimise-call-expression@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
+"@babel/helper-optimise-call-expression@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-optimise-call-expression@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/31b41a764fc3c585196cf5b776b70cf4705c132e4ce9723f39871f215f2ddbfb2e28a62f9917610f67c8216c1080482b9b05f65dd195dae2a52cef461f2ac7b8
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/7fce2c4ce22c4ba3c2178d1ce85f34fc9bbe286af5ec153b4b6ea9bf2212390359c4a1e8a54551c4daa4688022d619668bdb8c8060cb185c0c9ad02c5247efc9
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.24.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.5
-  resolution: "@babel/helper-plugin-utils@npm:7.24.5"
-  checksum: 10c0/4ae40094e6a2f183281213344f4df60c66b16b19a2bc38d2bb11810a6dc0a0e7ec638957d0e433ff8b615775b8f3cd1b7edbf59440d1b50e73c389fc22913377
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.6, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.6
+  resolution: "@babel/helper-plugin-utils@npm:7.24.6"
+  checksum: 10c0/636d3ce8cabc0621c1f78187e1d95f1087209921fa452f76aad06224ef5dffb3d934946f5183109920f32a4b94dd75ac91c63bc52813fee639d10cd54d49ba1f
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
+"@babel/helper-remap-async-to-generator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-wrap-function": "npm:^7.22.20"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-wrap-function": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/aa93aa74250b636d477e8d863fbe59d4071f8c2654841b7ac608909e480c1cf3ff7d7af5a4038568829ad09d810bb681668cbe497d9c89ba5c352793dc9edf1e
+  checksum: 10c0/b379b844eba352ac9487d31867e7bb2b8a264057f1739d9161b614145ea6e60969a7a82e75e5e83089e50cf1b6559f53aa085a787942bf40706fee15a2faa33c
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/helper-replace-supers@npm:7.24.1"
+"@babel/helper-replace-supers@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-replace-supers@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
-    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.6"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/d39a3df7892b7c3c0e307fb229646168a9bd35e26a72080c2530729322600e8cff5f738f44a14860a2358faffa741b6a6a0d6749f113387b03ddbfa0ec10e1a0
+  checksum: 10c0/aaf2dfaf25360da1525ecea5979d5afed201b96f0feeed2e15f90883a97776132a720b25039e67fee10a5c537363aea5cc2a46c0f1d13fdb86d0e920244f2da7
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.22.5, @babel/helper-simple-access@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-simple-access@npm:7.24.5"
+"@babel/helper-simple-access@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-simple-access@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.5"
-  checksum: 10c0/d96a0ab790a400f6c2dcbd9457b9ca74b9ba6d0f67ff9cd5bcc73792c8fbbd0847322a0dddbd8987dd98610ee1637c680938c7d83d3ffce7d06d7519d823d996
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/b17e404dd6c9787fc7d558aea5222471a77e29596705f0d10b4c2a58b9d71ff7eae915094204848cc1af99b771553caa69337a768b9abdd82b54a0050ba83eb9
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.22.5"
-  checksum: 10c0/ab7fa2aa709ab49bb8cd86515a1e715a3108c4bb9a616965ba76b43dc346dee66d1004ccf4d222b596b6224e43e04cbc5c3a34459501b388451f8c589fbc3691
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/6928f698362d6082a67ee2bc73991ef6b0cc6b5f2854177389bc8f3c09296580f0ee20134dd1a29dfcb1906ad9e346fa0f7c6fcd7589ab3ff176d4f09504577f
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-split-export-declaration@npm:7.24.5"
+"@babel/helper-split-export-declaration@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.6"
   dependencies:
-    "@babel/types": "npm:^7.24.5"
-  checksum: 10c0/d7a812d67d031a348f3fb0e6263ce2dbe6038f81536ba7fb16db385383bcd6542b71833194303bf6d3d0e4f7b6b584c9c8fae8772122e2ce68fc9bdf07f4135d
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/53a5dd8691fdffc89cc7fcf5aed0ad1d8bc39796a5782a3d170dcbf249eb5c15cc8a290e8d09615711d18798ad04a7d0694ab5195d35fa651abbc1b9c885d6a8
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/helper-string-parser@npm:7.24.1"
-  checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2
+"@babel/helper-string-parser@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-string-parser@npm:7.24.6"
+  checksum: 10c0/95115bf676e92c4e99166395649108d97447e6cabef1fabaec8cdbc53a43f27b5df2268ff6534439d405bc1bd06685b163eb3b470455bd49f69159dada414145
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helper-validator-identifier@npm:7.24.5"
-  checksum: 10c0/05f957229d89ce95a137d04e27f7d0680d84ae48b6ad830e399db0779341f7d30290f863a93351b4b3bde2166737f73a286ea42856bb07c8ddaa95600d38645c
+"@babel/helper-validator-identifier@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-validator-identifier@npm:7.24.6"
+  checksum: 10c0/d29d2e3fca66c31867a009014169b93f7bc21c8fc1dd7d0b9d85d7a4000670526ff2222d966febb75a6e12f9859a31d1e75b558984e28ecb69651314dd0a6fd1
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helper-validator-option@npm:7.23.5"
-  checksum: 10c0/af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94
+"@babel/helper-validator-option@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-validator-option@npm:7.24.6"
+  checksum: 10c0/787268dff5cf77f3b704454b96ab7b58aa4f43b2808247e51859a103a1c28a9c252100f830433f4b37a73f4a61ba745bbeef4cdccbab48c1e9adf037f4ca3491
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-wrap-function@npm:7.22.20"
+"@babel/helper-wrap-function@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helper-wrap-function@npm:7.24.6"
   dependencies:
-    "@babel/helper-function-name": "npm:^7.22.5"
-    "@babel/template": "npm:^7.22.15"
-    "@babel/types": "npm:^7.22.19"
-  checksum: 10c0/97b5f42ff4d305318ff2f99a5f59d3e97feff478333b2d893c4f85456d3c66372070f71d7bf9141f598c8cf2741c49a15918193633c427a88d170d98eb8c46eb
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/template": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/d32844275a544a8e7c71c13e9832d34d80656aafce659dc6c23b02e14d1c1179d8045125ded5096da1a99de83299ffb48211183d0403da2c8584ed55dc0ab646
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/helpers@npm:7.24.5"
+"@babel/helpers@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/helpers@npm:7.24.6"
   dependencies:
-    "@babel/template": "npm:^7.24.0"
-    "@babel/traverse": "npm:^7.24.5"
-    "@babel/types": "npm:^7.24.5"
-  checksum: 10c0/0630b0223c3a9a34027ddc05b3bac54d68d5957f84e92d2d4814b00448a76e12f9188f9c85cfce2011696d82a8ffcbd8189da097c0af0181d32eb27eca34185e
+    "@babel/template": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/e5b5c0919fd6fa56ae11c15a72962d8de0ac19db524849554af28cf08ac32f9ae5aee49a43146eb150f54418cefb8e890fa2b2f33d029434dc7777dbcdfd5bac
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.24.2":
-  version: 7.24.2
-  resolution: "@babel/highlight@npm:7.24.2"
+"@babel/highlight@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/highlight@npm:7.24.6"
   dependencies:
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-validator-identifier": "npm:^7.24.6"
     chalk: "npm:^2.4.2"
     js-tokens: "npm:^4.0.0"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/98ce00321daedeed33a4ed9362dc089a70375ff1b3b91228b9f05e6591d387a81a8cba68886e207861b8871efa0bc997ceabdd9c90f6cce3ee1b2f7f941b42db
+  checksum: 10c0/5bbc31695e5d44e97feb267f7aaf4c52908560d184ffeb2e2e57aae058d40125592931883889413e19def3326895ddb41ff45e090fa90b459d8c294b4ffc238c
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/parser@npm:7.24.5"
+"@babel/parser@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/parser@npm:7.24.6"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/8333a6ad5328bad34fa0e12bcee147c3345ea9a438c0909e7c68c6cfbea43c464834ffd7eabd1cbc1c62df0a558e22ffade9f5b29440833ba7b33d96a71f88c0
+  checksum: 10c0/cbef70923078a20fe163b03f4a6482be65ed99d409a57f3091a23ce3a575ee75716c30e7ea9f40b692ac5660f34055f4cbeb66a354fad15a6cf1fca35c3496c5
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.5"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b471972dcc4a3ba32821329a57725e2b563421e975d7ffec7fcabd70af0fced6a50bcc9ed2a8cbd4a9ac7c09cfbf43c7116e82f3b9064b33a22309500b632108
+  checksum: 10c0/0dbf12de5a7e5d092271124f0d9bff1ceb94871d5563041940512671cd40ab2a93d613715ee37076cd8263cf49579afb805faa3189996c11639bb10d3e9837f1
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.1"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/d4e592e6fc4878654243d2e7b51ea86471b868a8cb09de29e73b65d2b64159990c6c198fd7c9c2af2e38b1cddf70206243792853c47384a84f829dada152f605
+  checksum: 10c0/b0a03d4f587e1fa92312c912864a0af3f68bfc87367b7c93770e94f171767d563d7adfca7ad571d20cd755e89e1373e7414973ce30e694e7b6eb8f57d2b1b889
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.1"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: 10c0/351c36e45795a7890d610ab9041a52f4078a59429f6e74c281984aa44149a10d43e82b3a8172c703c0d5679471e165d1c02b6d2e45a677958ee301b89403f202
+  checksum: 10c0/fdd40fdf7e87f3dbc5396c9a8f92005798865f6f20d2c24c33246ac43aab8df93742b63dfcfcda67c0a5cf1f7b8a987fdbccaceb9ccbb9a67bef10012b522390
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.1"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/d7dd5a59a54635a3152895dcaa68f3370bb09d1f9906c1e72232ff759159e6be48de4a598a993c986997280a2dc29922a48aaa98020f16439f3f57ad72788354
+  checksum: 10c0/cc1e8ee138c71e78ec262a5198d2cf75c305f2fb4ea9771ebd4ded47f51bc1bacbf917db3cb28c681e7499a07f9803ab0bbe5ad50b9576cbe03902189e3871ed
   languageName: node
   linkType: hard
 
@@ -483,25 +482,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.1"
+"@babel/plugin-syntax-import-assertions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/72f0340d73e037f0702c61670054e0af66ece7282c5c2f4ba8de059390fee502de282defdf15959cd9f71aa18dc5c5e4e7a0fde317799a0600c6c4e0a656d82b
+  checksum: 10c0/8e81c7cd3d5812a3dda32f06f84492a1b5640f42c594619ed57bf4017529889f87bfb4e8e95c50ba1527d89501dae71a0c73770502676545c2cd9ce58ce3258d
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.1"
+"@babel/plugin-syntax-import-attributes@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/309634e3335777aee902552b2cf244c4a8050213cc878b3fb9d70ad8cbbff325dc46ac5e5791836ff477ea373b27832238205f6ceaff81f7ea7c4c7e8fbb13bb
+  checksum: 10c0/c4d8554b89c0daa6d3c430582b98c10a3af2de8eab484082e97cb73f2712780ab6dd8d11d783c4b266efef76f4479abf4944ef8f416a4459b05eecaf438f8774
   languageName: node
   linkType: hard
 
@@ -627,605 +626,605 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
+"@babel/plugin-transform-arrow-functions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f44bfacf087dc21b422bab99f4e9344ee7b695b05c947dacae66de05c723ab9d91800be7edc1fa016185e8c819f3aca2b4a5f66d8a4d1e47d9bad80b8fa55b8e
+  checksum: 10c0/46250eb3f535327825db323740a301b76b882b70979f1fb5f89cbb1a820378ab68ee880b912981dd5276dd116deaaee0f4a2a95f1c9cf537a67749fd4209a2d3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.3":
-  version: 7.24.3
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.3"
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.6"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.6"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/55ceed059f819dcccbfe69600bfa1c055ada466bd54eda117cfdd2cf773dd85799e2f6556e4a559b076e93b9704abcca2aef9d72aad7dc8a5d3d17886052f1d3
+  checksum: 10c0/8876431855220ccfbf1ae510a4a7c4e0377b21189d3f73ea6dde5ffd31eee57f03ea2b2d1da59b6a36b6e107e41b38d0c1d1bb015e0d1c2c2fb627962260edb7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.1"
+"@babel/plugin-transform-async-to-generator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.24.1"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
+    "@babel/helper-module-imports": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3731ba8e83cbea1ab22905031f25b3aeb0b97c6467360a2cc685352f16e7c786417d8883bc747f5a0beff32266bdb12a05b6292e7b8b75967087200a7bc012c4
+  checksum: 10c0/52c137668e7a35356c3b1caf25ab3bf90ff61199885bfd9f0232bfe168a53a5cf0ca4c1e283c27e44ad76cc366b73e4ff7042241469d1944c7042fb78c57bfd8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.1"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6fbaa85f5204f34845dfc0bebf62fdd3ac5a286241c85651e59d426001e7a1785ac501f154e093e0b8ee49e1f51e3f8b06575a5ae8d4a9406d43e4816bf18c37
+  checksum: 10c0/0c761b5e3a2959b63edf47d67f6752e01f24777ad1accd82457a2dca059877f8a8297fbc7a062db6b48836309932f2ac645c507070ef6ad4e765b3600822c048
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.5"
+"@babel/plugin-transform-block-scoping@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/85997fc8179b7d26e8af30865aeb91789f3bc1f0cd5643ed25f25891ff9c071460ec1220599b19070b424a3b902422f682e9b02e515872540173eae2e25f760c
+  checksum: 10c0/95c25e501c4553515f92d4e86032a8859a8855cea8aafb6df30f956979caa70af1e126e6dfaf9e51328d1306232ff1e081bda7d84a9aaf23f418d9da120c7018
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-class-properties@npm:7.24.1"
+"@babel/plugin-transform-class-properties@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/00dff042ac9df4ae67b5ef98b1137cc72e0a24e6d911dc200540a8cb1f00b4cff367a922aeb22da17da662079f0abcd46ee1c5f4cdf37ceebf6ff1639bb9af27
+  checksum: 10c0/ae01e00dd528112d542a77f0f1cf6b43726553d2011bbdec9e4fac441dfa161d44bf14449dc4121b45cc971686a8c652652032594e83c5d6cab8e9fd794eecb2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.4"
+"@babel/plugin-transform-class-static-block@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.4"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 10c0/19dfeaf4a2ac03695034f7211a8b5ad89103b224608ac3e91791055107c5fe4d7ebe5d9fbb31b4a91265694af78762260642eb270f4b239c175984ee4b253f80
+  checksum: 10c0/425f237faf62b531d973f23ac3eefe3f29c4f6c988c33c2dd660b6dfb61d4ed1e865a5088574742d87ed02437d26aa6ec6b107468b7df35ca9d3082bad742d8f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-classes@npm:7.24.5"
+"@babel/plugin-transform-classes@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-classes@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
-    "@babel/helper-replace-supers": "npm:^7.24.1"
-    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-replace-supers": "npm:^7.24.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.6"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4affcbb7cb01fa4764c7a4b534c30fd24a4b68e680a2d6e242dd7ca8726490f0f1426c44797deff84a38a162e0629718900c68d28daffe2b12adf5b4194156a7
+  checksum: 10c0/d29c26feea9ad5a64d790aeab1833b7a50d6af2be24140dad7e06510b754b8fe0ffb292d43d96fedaf7765fcb90c0034ac7c42635f814d9235697431076a1cf0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.1"
+"@babel/plugin-transform-computed-properties@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/template": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/template": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8292c508b656b7722e2c2ca0f6f31339852e3ed2b9b80f6e068a4010e961b431ca109ecd467fc906283f4b1574c1e7b1cb68d35a4dea12079d386c15ff7e0eac
+  checksum: 10c0/c464144c2eda8d526d70c8d8e3bf30820f591424991452f816617347ef3ccc5d04133c6e903b90c1d832d95d9c8550e5693ea40ea14856ede54fb8e1cd36c5de
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.5"
+"@babel/plugin-transform-destructuring@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6a37953a95f04b335bf3e2118fb93f50dd9593c658d1b2f8918a380a2ee30f1b420139eccf7ec3873c86a8208527895fcf6b7e21c0e734a6ad6e5d5042eace4d
+  checksum: 10c0/1fcc064e2b0c45a4340418bd70d2cf2b3644d1215eb975ec14f83e4f7615fdc3948e355db5091f81602f6c3d933f9308caa66232091aad4edd6c16b00240fcc7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.1"
+"@babel/plugin-transform-dotall-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/758def705ec5a87ef910280dc2df5d2fda59dc5d4771c1725c7aed0988ae5b79e29aeb48109120301a3e1c6c03dfac84700469de06f38ca92c96834e09eadf5d
+  checksum: 10c0/4a2c98f1c22a18754c6ada1486563865690008df2536066d8a146fa58eed8515b607e162c7efb0b8fa062d755e77afea145495046cffdb4ea56194d38f489254
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.1"
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/41072f57f83a6c2b15f3ee0b6779cdca105ff3d98061efe92ac02d6c7b90fdb6e7e293b8a4d5b9c690d9ae5d3ae73e6bde4596dc4d8c66526a0e5e1abc73c88c
+  checksum: 10c0/44ddba252f0b9f1f0b1ff8d903bbcf8871246670fb2883f65d09d371d403ce9c3e2e582b94b36506c1d042110b464eb3492e53cd1e87c1d479b145bcc01c04fd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.1"
+"@babel/plugin-transform-dynamic-import@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/7e2834780e9b5251ef341854043a89c91473b83c335358620ca721554877e64e416aeb3288a35f03e825c4958e07d5d00ead08c4490fadc276a21fe151d812f1
+  checksum: 10c0/b4411f21112127a02aef15103765e207e4c03e7321d7f4de3522fc181cb377c5abc8484cf0169e6c30f2e51e6c602c09894fa6b15643d24f66273833ef34e4a6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.1"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.6"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f0fc4c5a9add25fd6bf23dabe6752e9b7c0a2b2554933dddfd16601245a2ba332b647951079c782bf3b94c6330e3638b9b4e0227f469a7c1c707446ba0eba6c7
+  checksum: 10c0/c4f15518a5d1614dfac0dbadfb99b0f36a98c1c1ff1c39794a105c3c87cfce00689e0943fcb13368b43b00b2eebaa01136ea12fb8600a574720853b5a8a11de7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.1"
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/510bb23b2423d5fbffef69b356e4050929c21a7627e8194b1506dd935c7d9cbbd696c9ae9d7c3bcd7e6e7b69561b0b290c2d72d446327b40fc20ce40bbca6712
+  checksum: 10c0/bff16d1800d7e5b38d3a3c8d404cc14442a37383dff7769dcc599a0723b2507647cafe9ba7d9b52d2e2f02a78bb78d149676d8d8ddf7357b160f4096b89ae9c5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-for-of@npm:7.24.1"
+"@babel/plugin-transform-for-of@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e4bc92b1f334246e62d4bde079938df940794db564742034f6597f2e38bd426e11ae8c5670448e15dd6e45c462f2a9ab3fa87259bddf7c08553ffd9457fc2b2c
+  checksum: 10c0/c8def2a160783c5c4a1c136c721fc88aca9cd3757a60f1c885a804b5320edb5f143d3f989f698bdd9aae359fdabab0830dba3d35138cea42988a77d2c72c8443
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-function-name@npm:7.24.1"
+"@babel/plugin-transform-function-name@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.6"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/65c1735ec3b5e43db9b5aebf3c16171c04b3050c92396b9e22dda0d2aaf51f43fdcf147f70a40678fd9a4ee2272a5acec4826e9c21bcf968762f4c184897ad75
+  checksum: 10c0/efa6527438ad94df0b7a4c92c33110ec40b086a0aceda567176b150ed291f8eb44b2ce697d8e3e1d4841496c10693add1e88f296418e72a171ead5c76b890a47
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-json-strings@npm:7.24.1"
+"@babel/plugin-transform-json-strings@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/13d9b6a3c31ab4be853b3d49d8d1171f9bd8198562fd75da8f31e7de31398e1cfa6eb1d073bed93c9746e4f9c47a53b20f8f4c255ece3f88c90852ad3181dc2d
+  checksum: 10c0/46af52dcc16f494c6c11dc22c944f2533623b9d9dfce5097bc0bdb99535ad4c4cfe5bca0d8ce8c39a94202e69d99ee60f546ce0be0ad782b681c7b5b4c9ddd6f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-literals@npm:7.24.1"
+"@babel/plugin-transform-literals@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-literals@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a27cc7d565ee57b5a2bf136fa889c5c2f5988545ae7b3b2c83a7afe5dd37dfac80dca88b1c633c65851ce6af7d2095c04c01228657ce0198f918e64b5ccd01fa
+  checksum: 10c0/961b64df79a673706d74cf473d1f4646f250b4f8813f9d7ef5d897e30acdacd1ca104584de2e88546289fce055d71bd7559cdb8ad4a2d5e7eea17f3c829faa97
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.1"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/98a2e0843ddfe51443c1bfcf08ba40ad8856fd4f8e397b392a5390a54f257c8c1b9a99d8ffc0fc7e8c55cce45e2cd9c2795a4450303f48f501bcbd662de44554
+  checksum: 10c0/0ae7f4098c63f442fd038de6034155bcf20214e7e490e92189decb2980932247b97cb069b11ac8bc471b53f71d6859e607969440d63ff400b8932ee3e05b4958
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.1"
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2af731d02aa4c757ef80c46df42264128cbe45bfd15e1812d1a595265b690a44ad036041c406a73411733540e1c4256d8174705ae6b8cfaf757fc175613993fd
+  checksum: 10c0/ec8908a409bd39d20f0428e35425c9e4c540bad252a0e33e08b84e3bea5088c785531197bdcf049afbdba841325962a93030b7be6da3586cb13d0ca0ebab89c9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.1"
+"@babel/plugin-transform-modules-amd@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/71fd04e5e7026e6e52701214b1e9f7508ba371b757e5075fbb938a79235ed66a54ce65f89bb92b59159e9f03f01b392e6c4de6d255b948bec975a90cfd6809ef
+  checksum: 10c0/074d26c79f517b27a07fef00319aff9705df1e6b41a805db855fe719e0f246b9815d6525cf1c5f0890c7f830dd0b9776e9b2493bbc929a3c23c0dee15f10a514
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.1"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-simple-access": "npm:^7.22.5"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-simple-access": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/efb3ea2047604a7eb44a9289311ebb29842fe6510ff8b66a77a60440448c65e1312a60dc48191ed98246bdbd163b5b6f3348a0669bcc0e3809e69c7c776b20fa
+  checksum: 10c0/4fc790136d066105fa773ffc7e249d88c6f0d0126984ede36fedd51ac2b622b46c08565bcdd1ab62ac10195eeedeaba0d26e7e4c676ed50906cbed16540a4e22
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.1"
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.6"
   dependencies:
-    "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    "@babel/helper-hoist-variables": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-validator-identifier": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/38145f8abe8a4ce2b41adabe5d65eb7bd54a139dc58e2885fec975eb5cf247bd938c1dd9f09145c46dbe57d25dd0ef7f00a020e5eb0cbe8195b2065d51e2d93d
+  checksum: 10c0/500962e3ac1bb1a9890e94f1967ec9e3aa3d41e22d4a9d1c739918707e4a8936710fd8d0ed4f3a8aad87260f7566b54566bead77977eb21e90124835cb6bcdca
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.1"
+"@babel/plugin-transform-modules-umd@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.6"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-module-transforms": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/14c90c58562b54e17fe4a8ded3f627f9a993648f8378ef00cb2f6c34532032b83290d2ad54c7fff4f0c2cd49091bda780f8cc28926ec4b77a6c2141105a2e699
+  checksum: 10c0/73c6cecb4f45ca3f665e2c57b6d04d65358518522dfaffb9b6913c026aeb704281d015324d02bf07f2cb026de6bac9308c62e82979364bd39f3687f752652b0d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.5"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b0b072bef303670b5a98307bc37d1ac326cb7ad40ea162b89a03c2ffc465451be7ef05be95cb81ed28bfeb29670dc98fe911f793a67bceab18b4cb4c81ef48f3
+  checksum: 10c0/92547309d81938488753f87b05a679a7557a1cec253756966044367c268b27311e51efad91724aa3e433cf61626e10bf1008e112998350c2013a87824c4cfe0b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-new-target@npm:7.24.1"
+"@babel/plugin-transform-new-target@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c4cabe628163855f175a8799eb73d692b6f1dc347aae5022af0c253f80c92edb962e48ddccc98b691eff3d5d8e53c9a8f10894c33ba4cebc2e2f8f8fe554fb7a
+  checksum: 10c0/5e9b9edfbe46489f64013d2bbd422f29acdb8057ccc85e7c759f7cf1415fde6a82ac13a13f0f246defaba6e2f7f4d424178ba78fc02237bdbf7df6692fc1dca8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c8532951506fb031287280cebeef10aa714f8a7cea2b62a13c805f0e0af945ba77a7c87e4bbbe4c37fe973e0e5d5e649cfac7f0374f57efc54cdf9656362a392
+  checksum: 10c0/53ab5b16bbcf47e842a48f1f0774d238dae0222c3e1f31653307808048e249ed140cba12dfc280cbc9a577cb3bb5b2f50ca0e3e4ffe5260fcf8c3ca0b83fb21e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.1"
+"@babel/plugin-transform-numeric-separator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/15e2b83292e586fb4f5b4b4021d4821a806ca6de2b77d5ad6c4e07aa7afa23704e31b4d683dac041afc69ac51b2461b96e8c98e46311cc1faba54c73f235044f
+  checksum: 10c0/14863e735fc407e065e1574914864a956b8250a84cfb4704592656763c9455d67034c7745e53066725195d9ed042121f424c4aaee00027791640e2639386b701
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.5"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.6"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-transform-parameters": "npm:^7.24.5"
+    "@babel/plugin-transform-parameters": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/91d7303af9b5744b8f569c1b8e45c9c9322ded05e7ee94e71b9ff2327f0d2c7b5aa87e040697a6baacc2dcb5c5e5e00913087c36f24c006bdaa4f958fd5bfd2d
+  checksum: 10c0/1a192b9756ebfa0bc69ad5e285d7d0284963b4b95738ca7721354297329d5c1ab4eb05ff5b198cbfffa3ec00e97a15a712aa7a5011d9407478796966aab54527
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-object-super@npm:7.24.1"
+"@babel/plugin-transform-object-super@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-replace-supers": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-replace-supers": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d30e6b9e59a707efd7ed524fc0a8deeea046011a6990250f2e9280516683138e2d13d9c52daf41d78407bdab0378aef7478326f2a15305b773d851cb6e106157
+  checksum: 10c0/2e48b9e0a1f3b04b439ede2d0c83bcc5324a81c8bab73c70f0c466cf48061a4ff469f283e2feb17b4cc2e20372c1362253604477ecd77e622192d5d7906aa062
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.1"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/68408b9ef772d9aa5dccf166c86dc4d2505990ce93e03dcfc65c73fb95c2511248e009ba9ccf5b96405fb85de1c16ad8291016b1cc5689ee4becb1e3050e0ae7
+  checksum: 10c0/411db3177b1bffd2f9e5b33a6b62e70158380e67d91ff4725755312e8a0a2f2c3fd340c60005295a672115fb593222ab2d7076266aebced6ef087a5505b6f371
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.1, @babel/plugin-transform-optional-chaining@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.5"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f4e9446ec69f58f40b7843ce7603cfc50332976e6e794d4ddbe6b24670cd50ebc7766c4e3cbaecf0fbb744e98cbfbb54146f4e966314b1d58511b8bbf3d2722b
+  checksum: 10c0/8ee5a500a2309444d4fb27979857598e9c91d804fe23217c51cc208b1bc6b9cd0650b355b1ebd625f180c5f1dc4cb89b5f313c982f7c89d90281a69b24a88ccb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-parameters@npm:7.24.5"
+"@babel/plugin-transform-parameters@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e08b8c46a24b1b21dde7783cb0aeb56ffe9ef6d6f1795649ce76273657158d3bfa5370c6594200ed7d371983b599c8e194b76108dffed9ab5746fe630ef2e8f5
+  checksum: 10c0/d9648924b9c0d35a243c0742c22838932a024205c61f4cc419857e5195edd893a33e6be4f2c8fbd89e925051c7cbe8968029ec2d3e7f2f098bfa682f4e2b9731
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-private-methods@npm:7.24.1"
+"@babel/plugin-transform-private-methods@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d8e18587d2a8b71a795da5e8841b0e64f1525a99ad73ea8b9caa331bc271d69646e2e1e749fd634321f3df9d126070208ddac22a27ccf070566b2efb74fecd99
+  checksum: 10c0/55f93959b2e8aeda818db7cdc7dfdcd5076f5bdc8a819566818004a68969fb7297d617f9d108bf76ac232d6056d9f9d20f73ce10380baa43ff1755c5591aa803
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.5"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.6"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.5"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/de7182bfde298e56c08a5d7ee1156f83c9af8c856bbe2248438848846a4ce544e050666bd0482e16a6006195e8be4923abd14650bef51fa0edd7f82014c2efcd
+  checksum: 10c0/c9eb9597362b598a91536375a49ba80cdf13461e849680e040898b103f7998c4d33a7832da5afba9fa51e3473f79cf8605f9ace07a887e386b7801797021631b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-property-literals@npm:7.24.1"
+"@babel/plugin-transform-property-literals@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3bf3e01f7bb8215a8b6d0081b6f86fea23e3a4543b619e059a264ede028bc58cdfb0acb2c43271271915a74917effa547bc280ac636a9901fa9f2fb45623f87e
+  checksum: 10c0/d1195d93406b6c400cdbc9ac57a2b8b58c72cc6480cc03656abfc243be0e2a48133cbb96559c2db95b1c78803daeb538277821540fe19e2a9105905e727ef618
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-regenerator@npm:7.24.1"
+"@babel/plugin-transform-regenerator@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
     regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0a333585d7c0b38d31cc549d0f3cf7c396d1d50b6588a307dc58325505ddd4f5446188bc536c4779431b396251801b3f32d6d8e87db8274bc84e8c41950737f7
+  checksum: 10c0/d17eaa97514d583866182420024b8c22da2c6ca822bdbf16fe7564121564c1844935592dc3315c73d1f78f7c908a4338b1d783618811e694c9bb6d5f9233e58d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.1"
+"@babel/plugin-transform-reserved-words@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/936d6e73cafb2cbb495f6817c6f8463288dbc9ab3c44684b931ebc1ece24f0d55dfabc1a75ba1de5b48843d0fef448dcfdbecb8485e4014f8f41d0d1440c536f
+  checksum: 10c0/5d2d4c579bd90c60fc6468a1285b3384e7b650b47d41a937a1590d4aecfc28bd945e82704c6e71cc91aa016b7e78c5594290c1c386edf11ec98e09e36235c5ae
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8273347621183aada3cf1f3019d8d5f29467ba13a75b72cb405bc7f23b7e05fd85f4edb1e4d9f0103153dddb61826a42dc24d466480d707f8932c1923a4c25fa
+  checksum: 10c0/4141b5da1d0d20d66ca0affaef8dfc45ed5e954bfa9003eb8aa779842599de443b37c2b265da27693f304c35ab68a682b44098e9eea0d39f8f94072ab616657f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-spread@npm:7.24.1"
+"@babel/plugin-transform-spread@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-spread@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/50a0302e344546d57e5c9f4dea575f88e084352eeac4e9a3e238c41739eef2df1daf4a7ebbb3ccb7acd3447f6a5ce9938405f98bf5f5583deceb8257f5a673c9
+  checksum: 10c0/6d12da05311690c4a73d775688ba6931b441e96e512377a166a60184292edeac0b17f5154a49e2f1d262a3f80b96e064bc9c88c63b2a6125f0a2132eff9ed585
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.1"
+"@babel/plugin-transform-sticky-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/786fe2ae11ef9046b9fa95677935abe495031eebf1274ad03f2054a20adea7b9dbd00336ac0b143f7924bc562e5e09793f6e8613607674b97e067d4838ccc4a0
+  checksum: 10c0/2a65f57554f51d3b9cd035513a610f47e46b26dba112b3b9fb42d1c1f2ae153fce8f76294b4721d099817814f57895c656f5b7dccd5df683277da6522c817ee9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
+"@babel/plugin-transform-template-literals@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/f73bcda5488eb81c6e7a876498d9e6b72be32fca5a4d9db9053491a2d1300cd27b889b463fd2558f3cd5826a85ed00f61d81b234aa55cb5a0abf1b6fa1bd5026
+  checksum: 10c0/fcde48e9c3ecd7f5f37ceb6908f1edd537d3115fc2f27d187d58fd83b2a13637a1bb3d24589d841529ed081405b951bf1c5d194ea81eff6ad2d88204d153010d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.5"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5f0b5e33a86b84d89673829ffa2b5f175e102d3d0f45917cda121bc2b3650e1e5bb7a653f8cc1059c5b3a7b2e91e1aafd6623028b96ae752715cc5c2171c96e5
+  checksum: 10c0/a24b3a3c7b87c6496ee13d2438effd4645868f054397357ec3cbe92a2f0df4152ac7fd7228cb956576c1b772c0675b065d6ad5f5053c382e97dd022015e9a028
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.1"
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/67a72a1ed99639de6a93aead35b1993cb3f0eb178a8991fcef48732c38c9f0279c85bbe1e2e2477b85afea873e738ff0955a35057635ce67bc149038e2d8a28e
+  checksum: 10c0/0e4038c589b7a63a2469466a25b78aad4ecb7267732e3c953c3055f9a77c7bee859a71983a08b025179f1b094964f2ebbfca1b6c33de4ead90a0b5ef06ddb47e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d9d9752df7d51bf9357c0bf3762fe16b8c841fca9ecf4409a16f15ccc34be06e8e71abfaee1251b7d451227e70e6b873b36f86b090efdb20f6f7de5fdb6c7a05
+  checksum: 10c0/bca99e00de91d0460dfcb25f285f3606248acc905193c05587e2862c54ddb790c5d8cb45e80927290390cffbcba7620f8af3e74c5301ff0c1c59ce7d47c5629f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6046ab38e5d14ed97dbb921bd79ac1d7ad9d3286da44a48930e980b16896db2df21e093563ec3c916a630dc346639bf47c5924a33902a06fe3bbb5cdc7ef5f2f
+  checksum: 10c0/ab6e253cfc38c7e8a2844d7ad46f85fdcbe33610b7f92f71045cf0b040438a08f1f1717ab4b84c480537f54e5478db8b404a4ccc2ff846b4e3ed33d373e3b47a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.6"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
-    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b6c1f6b90afeeddf97e5713f72575787fcb7179be7b4c961869bfbc66915f66540dc49da93e4369da15596bd44b896d1eb8a50f5e1fd907abd7a1a625901006b
+  checksum: 10c0/a52e84f85519fed330e88f7a17611064d2b5f1d0fe2823f8113ed312828e69787888bd023f404e8d35d0bb96461e42e19cdc4f0a44d35959bc86c219a3062237
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.24.5":
-  version: 7.24.5
-  resolution: "@babel/preset-env@npm:7.24.5"
+"@babel/preset-env@npm:7.24.6":
+  version: 7.24.6
+  resolution: "@babel/preset-env@npm:7.24.6"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.4"
-    "@babel/helper-compilation-targets": "npm:^7.23.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.5"
-    "@babel/helper-validator-option": "npm:^7.23.5"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.5"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
+    "@babel/compat-data": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-validator-option": "npm:^7.24.6"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.6"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.6"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
-    "@babel/plugin-syntax-import-assertions": "npm:^7.24.1"
-    "@babel/plugin-syntax-import-attributes": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.6"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.6"
     "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
@@ -1237,54 +1236,54 @@ __metadata:
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
-    "@babel/plugin-transform-arrow-functions": "npm:^7.24.1"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
-    "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.5"
-    "@babel/plugin-transform-class-properties": "npm:^7.24.1"
-    "@babel/plugin-transform-class-static-block": "npm:^7.24.4"
-    "@babel/plugin-transform-classes": "npm:^7.24.5"
-    "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
-    "@babel/plugin-transform-destructuring": "npm:^7.24.5"
-    "@babel/plugin-transform-dotall-regex": "npm:^7.24.1"
-    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.1"
-    "@babel/plugin-transform-dynamic-import": "npm:^7.24.1"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.1"
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.1"
-    "@babel/plugin-transform-for-of": "npm:^7.24.1"
-    "@babel/plugin-transform-function-name": "npm:^7.24.1"
-    "@babel/plugin-transform-json-strings": "npm:^7.24.1"
-    "@babel/plugin-transform-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.1"
-    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-amd": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.1"
-    "@babel/plugin-transform-modules-umd": "npm:^7.24.1"
-    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
-    "@babel/plugin-transform-new-target": "npm:^7.24.1"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.1"
-    "@babel/plugin-transform-numeric-separator": "npm:^7.24.1"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.5"
-    "@babel/plugin-transform-object-super": "npm:^7.24.1"
-    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.1"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.5"
-    "@babel/plugin-transform-parameters": "npm:^7.24.5"
-    "@babel/plugin-transform-private-methods": "npm:^7.24.1"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.5"
-    "@babel/plugin-transform-property-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-regenerator": "npm:^7.24.1"
-    "@babel/plugin-transform-reserved-words": "npm:^7.24.1"
-    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.1"
-    "@babel/plugin-transform-spread": "npm:^7.24.1"
-    "@babel/plugin-transform-sticky-regex": "npm:^7.24.1"
-    "@babel/plugin-transform-template-literals": "npm:^7.24.1"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.5"
-    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.1"
-    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.1"
-    "@babel/plugin-transform-unicode-regex": "npm:^7.24.1"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.6"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.6"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.6"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.6"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.6"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.6"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.6"
+    "@babel/plugin-transform-classes": "npm:^7.24.6"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.6"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.6"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.6"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.6"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.6"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.6"
+    "@babel/plugin-transform-for-of": "npm:^7.24.6"
+    "@babel/plugin-transform-function-name": "npm:^7.24.6"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.6"
+    "@babel/plugin-transform-literals": "npm:^7.24.6"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.6"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.6"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.6"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-new-target": "npm:^7.24.6"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.6"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.6"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.6"
+    "@babel/plugin-transform-object-super": "npm:^7.24.6"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.6"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.6"
+    "@babel/plugin-transform-parameters": "npm:^7.24.6"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.6"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.6"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.6"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.6"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.6"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.6"
+    "@babel/plugin-transform-spread": "npm:^7.24.6"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.6"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.6"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.6"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.6"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.4"
@@ -1293,7 +1292,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2cc0edae09205d6409a75d02e53aaa1c590e89adbb7b389019c7b75e4c47b6b63eeb1a816df5c42b672ce410747e7ddc23b6747e8e41a6c95d6fa00c665509e2
+  checksum: 10c0/d837d294197803d550e48d9458a356853a54a0528e7cdc51c2b8a5d8dfe41c6fbc597b4fc67464615a7385198a3db2e839da15cca7b9502fedf27170fc6ef673
   languageName: node
   linkType: hard
 
@@ -1326,43 +1325,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0":
-  version: 7.24.0
-  resolution: "@babel/template@npm:7.24.0"
+"@babel/template@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/template@npm:7.24.6"
   dependencies:
-    "@babel/code-frame": "npm:^7.23.5"
-    "@babel/parser": "npm:^7.24.0"
-    "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/9d3dd8d22fe1c36bc3bdef6118af1f4b030aaf6d7d2619f5da203efa818a2185d717523486c111de8d99a8649ddf4bbf6b2a7a64962d8411cf6a8fa89f010e54
+    "@babel/code-frame": "npm:^7.24.6"
+    "@babel/parser": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
+  checksum: 10c0/a4d5805770de908b445f7cdcebfcb6eaa07b1ec9c7b78fd3f375a911b1522c249bddae6b96bc4aac24247cc603e3e6cffcf2fe50b4c929dfeb22de289b517525
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.5":
-  version: 7.24.5
-  resolution: "@babel/traverse@npm:7.24.5"
+"@babel/traverse@npm:^7.24.6":
+  version: 7.24.6
+  resolution: "@babel/traverse@npm:7.24.6"
   dependencies:
-    "@babel/code-frame": "npm:^7.24.2"
-    "@babel/generator": "npm:^7.24.5"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.24.5"
-    "@babel/parser": "npm:^7.24.5"
-    "@babel/types": "npm:^7.24.5"
+    "@babel/code-frame": "npm:^7.24.6"
+    "@babel/generator": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.6"
+    "@babel/helper-function-name": "npm:^7.24.6"
+    "@babel/helper-hoist-variables": "npm:^7.24.6"
+    "@babel/helper-split-export-declaration": "npm:^7.24.6"
+    "@babel/parser": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.6"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/3f22534bc2b2ed9208e55ef48af3b32939032b23cb9dc4037447cb108640df70bbb0b9fea86e9c58648949fdc2cb14e89aa79ffa3c62a5dd43459a52fe8c01d1
+  checksum: 10c0/39027d5fc7a241c6b71bb5872c2bdcec53743cd7ef3c151bbe6fd7cf874d15f4bc09e5d7e19e2f534b0eb2c115f5368553885fa4253aa1bc9441c6e5bf9efdaf
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.0, @babel/types@npm:^7.24.5, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.5
-  resolution: "@babel/types@npm:7.24.5"
+"@babel/types@npm:^7.24.6, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.6
+  resolution: "@babel/types@npm:7.24.6"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.24.1"
-    "@babel/helper-validator-identifier": "npm:^7.24.5"
+    "@babel/helper-string-parser": "npm:^7.24.6"
+    "@babel/helper-validator-identifier": "npm:^7.24.6"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/e1284eb046c5e0451b80220d1200e2327e0a8544a2fe45bb62c952e5fdef7099c603d2336b17b6eac3cc046b7a69bfbce67fe56e1c0ea48cd37c65cb88638f2a
+  checksum: 10c0/1d94d92d97ef49030ad7f9e14cfccfeb70b1706dabcaa69037e659ec9d2c3178fb005d2088cce40d88dfc1306153d9157fe038a79ea2be92e5e6b99a59ef80cc
   languageName: node
   linkType: hard
 
@@ -2980,10 +2979,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^4.0.1":
-  version: 4.1.1
-  resolution: "commander@npm:4.1.1"
-  checksum: 10c0/84a76c08fe6cc08c9c93f62ac573d2907d8e79138999312c92d4155bc2325d487d64d13f669b2000c9f8caf70493c1be2dac74fec3c51d5a04f8bc3ae1830bab
+"commander@npm:^6.2.0":
+  version: 6.2.1
+  resolution: "commander@npm:6.2.1"
+  checksum: 10c0/85748abd9d18c8bc88febed58b98f66b7c591d9b5017cad459565761d7b29ca13b7783ea2ee5ce84bf235897333706c4ce29adf1ce15c8252780e7000e2ce9ea
   languageName: node
   linkType: hard
 
@@ -4369,9 +4368,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "jenkins-ui@workspace:."
   dependencies:
-    "@babel/cli": "npm:7.24.5"
-    "@babel/core": "npm:7.24.5"
-    "@babel/preset-env": "npm:7.24.5"
+    "@babel/cli": "npm:7.24.6"
+    "@babel/core": "npm:7.24.6"
+    "@babel/preset-env": "npm:7.24.6"
     "@eslint/js": "npm:9.3.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"

From a195b4e5c4f749d99e6aacc75cef9020ccef0c5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 11:09:23 -0700
Subject: [PATCH 067/449] Bump com.puppycrawl.tools:checkstyle from 10.16.0 to
 10.17.0 (#9322)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c5f81fef70b9..80bdca2aa2dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,7 +283,7 @@ THE SOFTWARE.
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>10.16.0</version>
+              <version>10.17.0</version>
             </dependency>
           </dependencies>
           <executions>

From bc1c2555a574ed0f07b1d40c055a442543a53479 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 22:25:09 +0100
Subject: [PATCH 068/449] Update dependency stylelint to v16.6.0 (#9320)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 58 ++++++++++++++++++++++++------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/war/package.json b/war/package.json
index 048b286710b7..4d18f656d776 100644
--- a/war/package.json
+++ b/war/package.json
@@ -45,7 +45,7 @@
     "sass": "1.77.2",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
-    "stylelint": "16.5.0",
+    "stylelint": "16.6.0",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.0",
     "webpack": "5.91.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 7b98a54bc9dd..ab00ee688018 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1405,7 +1405,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.1, @csstools/css-parser-algorithms@npm:^2.6.3":
+"@csstools/css-parser-algorithms@npm:^2.6.3":
   version: 2.6.3
   resolution: "@csstools/css-parser-algorithms@npm:2.6.3"
   peerDependencies:
@@ -1414,14 +1414,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.4, @csstools/css-tokenizer@npm:^2.3.1":
+"@csstools/css-tokenizer@npm:^2.3.1":
   version: 2.3.1
   resolution: "@csstools/css-tokenizer@npm:2.3.1"
   checksum: 10c0/fed6619fb5108e109d4dd10b0e967035a92793bae8fb84544e1342058b6df4e306d9d075623e2201fe88831b1ada797aea3546a8d12229d2d81cd7a5dfee4444
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.9":
+"@csstools/media-query-list-parser@npm:^2.1.11":
   version: 2.1.11
   resolution: "@csstools/media-query-list-parser@npm:2.1.11"
   peerDependencies:
@@ -1797,7 +1797,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.3, @csstools/selector-specificity@npm:^3.1.1":
+"@csstools/selector-specificity@npm:^3.1.1":
   version: 3.1.1
   resolution: "@csstools/selector-specificity@npm:3.1.1"
   peerDependencies:
@@ -1822,10 +1822,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@dual-bundle/import-meta-resolve@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@dual-bundle/import-meta-resolve@npm:4.0.0"
-  checksum: 10c0/868b8314fc753b7767887108535afe3288de941d92bc8453164dbcb1abe886b171e338f6f7d02ff556256dee69c90e4ac6360e0c6a856a5ad7190274ab52de2e
+"@dual-bundle/import-meta-resolve@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "@dual-bundle/import-meta-resolve@npm:4.1.0"
+  checksum: 10c0/55069e550ee2710e738dd8bbd34aba796cede456287454b50c3be46fbef8695d00625677f3f41f5ffbec1174c0f57f314da9a908388bc9f8ad41a8438db884d9
   languageName: node
   linkType: hard
 
@@ -4395,7 +4395,7 @@ __metadata:
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
-    stylelint: "npm:16.5.0"
+    stylelint: "npm:16.6.0"
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.0"
     tippy.js: "npm:6.3.7"
@@ -4578,10 +4578,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"known-css-properties@npm:^0.30.0":
-  version: 0.30.0
-  resolution: "known-css-properties@npm:0.30.0"
-  checksum: 10c0/8b487a6b33487affcec41eb392ceb77acf4d093558dde5c88b5ea06b9a3c81781876d7cb09872e0518b9602f27c8f4112c9ac333e02c90a91c8fbd12e202ed48
+"known-css-properties@npm:^0.31.0":
+  version: 0.31.0
+  resolution: "known-css-properties@npm:0.31.0"
+  checksum: 10c0/8e643cbed32d7733278ba215c43dfc38fc7e77d391f66b81f07228af97d69ce2cebba03a9bc1ac859479e162aea812e258b30f4c93cb7b7adfd0622a141d36da
   languageName: node
   linkType: hard
 
@@ -5233,10 +5233,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "picocolors@npm:1.0.0"
-  checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
+"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "picocolors@npm:1.0.1"
+  checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400
   languageName: node
   linkType: hard
 
@@ -6654,15 +6654,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:16.5.0":
-  version: 16.5.0
-  resolution: "stylelint@npm:16.5.0"
+"stylelint@npm:16.6.0":
+  version: 16.6.0
+  resolution: "stylelint@npm:16.6.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.1"
-    "@csstools/css-tokenizer": "npm:^2.2.4"
-    "@csstools/media-query-list-parser": "npm:^2.1.9"
-    "@csstools/selector-specificity": "npm:^3.0.3"
-    "@dual-bundle/import-meta-resolve": "npm:^4.0.0"
+    "@csstools/css-parser-algorithms": "npm:^2.6.3"
+    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/selector-specificity": "npm:^3.1.1"
+    "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
     cosmiconfig: "npm:^9.0.0"
@@ -6679,16 +6679,16 @@ __metadata:
     ignore: "npm:^5.3.1"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.30.0"
+    known-css-properties: "npm:^0.31.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
     micromatch: "npm:^4.0.5"
     normalize-path: "npm:^3.0.0"
-    picocolors: "npm:^1.0.0"
+    picocolors: "npm:^1.0.1"
     postcss: "npm:^8.4.38"
     postcss-resolve-nested-selector: "npm:^0.1.1"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.0"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -6699,7 +6699,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/9281693ff6c1918e07fdcf7a950531f79678a28261a0d5bd36ca2fcf524e53d7305158d20ba890f5dd01c0ff90c09a13453dce2fe6887f4c157d8c2c0acf3666
+  checksum: 10c0/acfb7983a0b71677d066b2aa570eefdac0a7be2e21351bac8884b8156deaeec19e53ad128ae7ae7933c79f6045f1de8d759ba06cfbc373b2711015860805a3e7
   languageName: node
   linkType: hard
 

From 9f0325e90bc40ff01e36b08334ce45293efbf876 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 14:29:44 -0700
Subject: [PATCH 069/449] Bump org.jenkins-ci.main:jenkins-test-harness from
 2206.v84d5d81e76db_ to 2207.v3b_df04c801d4 (#9321)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 228e99d4d870..5e2ce82b9d92 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -142,7 +142,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2206.v84d5d81e76db_</version>
+      <version>2207.v3b_df04c801d4</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From ff4367f8d14bdf9e295941c8fd79c4d2043a30dc Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 28 May 2024 13:18:36 +0000
Subject: [PATCH 070/449] [maven-release-plugin] prepare release jenkins-2.460

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 273355a332b2..a718f8b47a33 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.460</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 14d6323ca762..87253fa03fe7 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.460</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 61c48e489794..40c403b752db 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.460</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..c88263bbd8a4 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.460</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 80bdca2aa2dc..933ebdd1c015 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.460</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.460</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.460</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-05-21T13:12:34Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-05-28T10:34:20Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 5e2ce82b9d92..d249b432e158 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.460</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 6db85f2fe20d..f2cdec763be6 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.460</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..57539bbdf8ed 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.460</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..d728d6069baf 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.460</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 1b145c91a09713213bb83fe6b6533d786abd9ed3 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 28 May 2024 13:18:59 +0000
Subject: [PATCH 071/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index a718f8b47a33..273355a332b2 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.460</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 87253fa03fe7..14d6323ca762 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.460</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 40c403b752db..61c48e489794 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.460</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index c88263bbd8a4..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.460</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 933ebdd1c015..50352feae948 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.460</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.460</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.460</revision>
+    <revision>2.461</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-05-28T10:34:20Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-05-28T13:18:36Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index d249b432e158..5e2ce82b9d92 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.460</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index f2cdec763be6..6db85f2fe20d 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.460</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 57539bbdf8ed..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.460</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index d728d6069baf..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.460</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 7b7c1304ef5da66a82cd7292055fc0d7098a97b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 13:37:00 -0700
Subject: [PATCH 072/449] Bump org.jenkins-ci.plugins:bouncycastle-api from
 2.30.1.77-225.v26ea_c9455fd9 to 2.30.1.78.1-233.vfdcdeb_0a_08a_a_ (#9326)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 6db85f2fe20d..82479805a1fd 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -365,7 +365,7 @@ THE SOFTWARE.
                   <!-- detached after 2.16 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>bouncycastle-api</artifactId>
-                  <version>2.30.1.77-225.v26ea_c9455fd9</version>
+                  <version>2.30.1.78.1-233.vfdcdeb_0a_08a_a_</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 0d26f787128cd526a3f6506d90eee13a3c02247e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 13:37:22 -0700
Subject: [PATCH 073/449] Bump io.jenkins.plugins:gson-api from
 2.10.1-15.v0d99f670e0a_7 to 2.11.0-41.v019fcf6125dc (#9324)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 82479805a1fd..ebab120a3ebc 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -456,7 +456,7 @@ THE SOFTWARE.
                   <!-- dependency of trilead-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>gson-api</artifactId>
-                  <version>2.10.1-15.v0d99f670e0a_7</version>
+                  <version>2.11.0-41.v019fcf6125dc</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From df4abe33962ed437bc2119cc733b821c10b1c9dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 13:37:43 -0700
Subject: [PATCH 074/449] Bump org.jenkins-ci.plugins:cloudbees-folder from
 6.940.v7fa_03b_f14759 to 6.942.vb_43318a_156b_2 (#9325)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 5e2ce82b9d92..b58c932d9708 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -211,7 +211,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>cloudbees-folder</artifactId>
-      <version>6.940.v7fa_03b_f14759</version>
+      <version>6.942.vb_43318a_156b_2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 94861db0c1a57a9b144e4c9ec7d25a8c237ea751 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 14:35:48 -0700
Subject: [PATCH 075/449] Bump stapler.version from 1870.v48cc46ef5fee to
 1872.ve203fa_6b_b_98d (#9327)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 273355a332b2..d055696c3ee2 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <slf4jVersion>2.0.13</slf4jVersion>
-    <stapler.version>1870.v48cc46ef5fee</stapler.version>
+    <stapler.version>1872.ve203fa_6b_b_98d</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 

From 33b22bc7fa83f90e8412ad3efe87057d05c6b09b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 21:49:13 -0700
Subject: [PATCH 076/449] Bump org.jenkins-ci.plugins.workflow:workflow-api
 from 1312.ve804c2f2d51e to 1316.v33eb_726c50b_a_ (#9330)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index b58c932d9708..515969bb605d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -116,7 +116,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-api</artifactId>
-        <version>1312.ve804c2f2d51e</version>
+        <version>1316.v33eb_726c50b_a_</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index ebab120a3ebc..2229dffc36d6 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -260,7 +260,7 @@ THE SOFTWARE.
                   <!-- dependency of junit, plugin-util-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>1312.ve804c2f2d51e</version>
+                  <version>1316.v33eb_726c50b_a_</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 51ba39d5b3a060d41ad479a6046a3d1f409e72fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 18:07:13 +0000
Subject: [PATCH 077/449] Bump org.jenkins-ci.plugins:trilead-api

Bumps [org.jenkins-ci.plugins:trilead-api](https://github.com/jenkinsci/trilead-api-plugin) from 2.142.v748523a_76693 to 2.147.vb_73cc728a_32e.
- [Release notes](https://github.com/jenkinsci/trilead-api-plugin/releases)
- [Commits](https://github.com/jenkinsci/trilead-api-plugin/commits)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:trilead-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 2229dffc36d6..f7423634915f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -400,7 +400,7 @@ THE SOFTWARE.
                   <!-- detached after 2.184 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>trilead-api</artifactId>
-                  <version>2.142.v748523a_76693</version>
+                  <version>2.147.vb_73cc728a_32e</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From ee22f8b8a8e655eee5ce3cef85043659428b776e Mon Sep 17 00:00:00 2001
From: SNanda8895 <168731871+SNanda8895@users.noreply.github.com>
Date: Thu, 30 May 2024 14:47:47 +0530
Subject: [PATCH 078/449] [JENKINS-73047] Fix weather icons (#9227)

Fix weather icons
---
 .../images/symbols/weather-icon-health-00to19.svg  |  8 ++++----
 .../images/symbols/weather-icon-health-20to39.svg  | 12 ++++++------
 .../images/symbols/weather-icon-health-60to79.svg  | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/war/src/main/resources/images/symbols/weather-icon-health-00to19.svg b/war/src/main/resources/images/symbols/weather-icon-health-00to19.svg
index 73e2f674a987..9e11cbcbb9eb 100644
--- a/war/src/main/resources/images/symbols/weather-icon-health-00to19.svg
+++ b/war/src/main/resources/images/symbols/weather-icon-health-00to19.svg
@@ -1,5 +1,5 @@
-<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg" stroke-width="36px" stroke-linecap="round" stroke-linejoin="round">
-  <path d="M208 304L192 400H240V480L320 368H272L288 304" stroke="var(--yellow)" />
-  <path d="M404.33 152.89H392.2C384.71 84.85 326.14 32 256 32C227.819 31.9729 200.322 40.6756 177.289 56.9116C154.255 73.1476 136.817 96.1198 127.37 122.67H122.8C72.86 122.67 32 163.47 32 213.33C32 263.2 72.86 304 122.8 304H404.33C446 304 480 270 480 228.44C480 186.89 446 152.89 404.33 152.89Z" stroke="var(--text-color-secondary)" />
-  <path d="M120 352L96 400M136 432L120 464M400 352L376 400M416 432L400 464" stroke="var(--cyan)"/>
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg"  stroke-linecap="round" stroke-linejoin="round">
+  <path d="M208 304L192 400H240V480L320 368H272L288 304" stroke="var(--yellow)" stroke-width="36px"/>
+  <path d="M404.33 152.89H392.2C384.71 84.85 326.14 32 256 32C227.819 31.9729 200.322 40.6756 177.289 56.9116C154.255 73.1476 136.817 96.1198 127.37 122.67H122.8C72.86 122.67 32 163.47 32 213.33C32 263.2 72.86 304 122.8 304H404.33C446 304 480 270 480 228.44C480 186.89 446 152.89 404.33 152.89Z" stroke="var(--text-color-secondary)" stroke-width="36px"/>
+  <path d="M120 352L96 400M136 432L120 464M400 352L376 400M416 432L400 464" stroke="var(--cyan)" stroke-width="36px"/>
 </svg>
diff --git a/war/src/main/resources/images/symbols/weather-icon-health-20to39.svg b/war/src/main/resources/images/symbols/weather-icon-health-20to39.svg
index f11877eb60db..1766284038bb 100644
--- a/war/src/main/resources/images/symbols/weather-icon-health-20to39.svg
+++ b/war/src/main/resources/images/symbols/weather-icon-health-20to39.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512" stroke="var(--text-color-secondary)" stroke-width="36px">
-    <path fill="transparent" d="M114.61,162.85A16.07,16.07,0,0,0,128,149.6C140.09,76.17,193.63,32,256,32c57.93,0,96.62,37.75,112.2,77.74a15.84,15.84,0,0,0,12.2,9.87c50,8.15,91.6,41.54,91.6,99.59C472,278.6,423.4,320,364,320H130c-49.5,0-90-24.7-90-79.2C40,192.33,78.67,168.58,114.61,162.85Z"/>
-    <line x1="144" y1="384" x2="112" y2="432" stroke="var(--cyan)" stroke-linecap="round" />
-    <line x1="224" y1="384" x2="160" y2="480" stroke="var(--cyan)" stroke-linecap="round" />
-    <line x1="304" y1="384" x2="272" y2="432" stroke="var(--cyan)" stroke-linecap="round" />
-    <line x1="384" y1="384" x2="320" y2="480" stroke="var(--cyan)" stroke-linecap="round" />
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512" stroke="var(--text-color-secondary)" >
+    <path fill="transparent" d="M114.61,162.85A16.07,16.07,0,0,0,128,149.6C140.09,76.17,193.63,32,256,32c57.93,0,96.62,37.75,112.2,77.74a15.84,15.84,0,0,0,12.2,9.87c50,8.15,91.6,41.54,91.6,99.59C472,278.6,423.4,320,364,320H130c-49.5,0-90-24.7-90-79.2C40,192.33,78.67,168.58,114.61,162.85Z" stroke-width="36px"/>
+    <line x1="144" y1="384" x2="112" y2="432" stroke="var(--cyan)" stroke-linecap="round" stroke-width="36px"/>
+    <line x1="224" y1="384" x2="160" y2="480" stroke="var(--cyan)" stroke-linecap="round" stroke-width="36px"/>
+    <line x1="304" y1="384" x2="272" y2="432" stroke="var(--cyan)" stroke-linecap="round" stroke-width="36px"/>
+    <line x1="384" y1="384" x2="320" y2="480" stroke="var(--cyan)" stroke-linecap="round" stroke-width="36px"/>
 </svg>
diff --git a/war/src/main/resources/images/symbols/weather-icon-health-60to79.svg b/war/src/main/resources/images/symbols/weather-icon-health-60to79.svg
index bd4ed3d4c452..c6caf30230ce 100644
--- a/war/src/main/resources/images/symbols/weather-icon-health-60to79.svg
+++ b/war/src/main/resources/images/symbols/weather-icon-health-60to79.svg
@@ -1,8 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512" stroke="var(--text-color-secondary)" stroke-width="36px">
-    <path d="M384.8,271.4a80,80,0,1,0-123.55-92" fill="transparent" stroke="var(--yellow)" />
-    <path d="M90.61,306.85A16.07,16.07,0,0,0,104,293.6C116.09,220.17,169.63,176,232,176c57.93,0,96.62,37.75,112.2,77.74a15.84,15.84,0,0,0,12.2,9.87c50,8.15,91.6,41.54,91.6,99.59C448,422.6,399.4,464,340,464H106c-49.5,0-90-24.7-90-79.2C16,336.33,54.67,312.58,90.61,306.85Z" fill="transparent" />
-    <line x1="464" y1="208" x2="496" y2="208" stroke="var(--yellow)" stroke-linecap="round" />
-    <line x1="336" y1="48" x2="336" y2="80" stroke="var(--yellow)" stroke-linecap="round" />
-    <line x1="222.86" y1="94.86" x2="245.49" y2="117.49" stroke="var(--yellow)" stroke-linecap="round" />
-    <line x1="449.14" y1="94.86" x2="426.51" y2="117.49" stroke="var(--yellow)" stroke-linecap="round" />
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512" stroke="var(--text-color-secondary)">
+    <path d="M384.8,271.4a80,80,0,1,0-123.55-92" fill="transparent" stroke="var(--yellow)" stroke-width="36px"/>
+    <path d="M90.61,306.85A16.07,16.07,0,0,0,104,293.6C116.09,220.17,169.63,176,232,176c57.93,0,96.62,37.75,112.2,77.74a15.84,15.84,0,0,0,12.2,9.87c50,8.15,91.6,41.54,91.6,99.59C448,422.6,399.4,464,340,464H106c-49.5,0-90-24.7-90-79.2C16,336.33,54.67,312.58,90.61,306.85Z" fill="transparent" stroke-width="36px"/>
+    <line x1="464" y1="208" x2="496" y2="208" stroke="var(--yellow)" stroke-linecap="round" stroke-width="36px"/>
+    <line x1="336" y1="48" x2="336" y2="80" stroke="var(--yellow)" stroke-linecap="round" stroke-width="36px"/>
+    <line x1="222.86" y1="94.86" x2="245.49" y2="117.49" stroke="var(--yellow)" stroke-linecap="round" stroke-width="36px"/>
+    <line x1="449.14" y1="94.86" x2="426.51" y2="117.49" stroke="var(--yellow)" stroke-linecap="round" stroke-width="36px"/>
 </svg>

From 4b96f40ccfbe79d8242489d9e159de0f98a32c8c Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Thu, 30 May 2024 11:17:59 +0200
Subject: [PATCH 079/449] move the add/edit description button to the app-bar
 (#9271)

* move the add/edit description button to the app-bar

So far rhe add/edit description button is rendered as button on its own
line to the far right. This leads to additional space the description or
the title and the following content.

This change moves the add/edit description button to the app-bar where
applicable (jobs, runs, computers, users). For views it stays as it is
as they don't have title/app-bar. One also can't just allow to change
the description via the configure page as the All View has no configure
page.

* make secondary button

* feedback

- fix permission in job page
- don't show the button for built-in node
- improve jelly doc
---
 .../hudson/model/Computer/index-top.jelly     |  2 +-
 .../hudson/model/Computer/index.jelly         |  1 +
 .../resources/hudson/model/Job/index.jelly    |  5 ++-
 .../resources/hudson/model/Label/index.jelly  | 11 ++++---
 .../resources/hudson/model/Run/index.jelly    | 17 ++++++----
 .../resources/hudson/model/Run/logKeep.jelly  |  2 +-
 .../resources/hudson/model/User/index.jelly   | 22 +++++++++----
 .../lib/hudson/editDescriptionButton.jelly    | 32 +++++++++++++++++++
 ...rties => editDescriptionButton.properties} |  0
 ...es => editDescriptionButton_bg.properties} |  0
 ...es => editDescriptionButton_ca.properties} |  0
 ...es => editDescriptionButton_cs.properties} |  0
 ...es => editDescriptionButton_da.properties} |  0
 ...es => editDescriptionButton_de.properties} |  0
 ...es => editDescriptionButton_el.properties} |  0
 ...es => editDescriptionButton_es.properties} |  0
 ...=> editDescriptionButton_es_AR.properties} |  0
 ...es => editDescriptionButton_et.properties} |  0
 ...es => editDescriptionButton_fi.properties} |  0
 ...es => editDescriptionButton_fr.properties} |  0
 ...es => editDescriptionButton_he.properties} |  0
 ...es => editDescriptionButton_hu.properties} |  0
 ...es => editDescriptionButton_it.properties} |  0
 ...es => editDescriptionButton_ja.properties} |  0
 ...es => editDescriptionButton_ko.properties} |  0
 ...es => editDescriptionButton_lt.properties} |  0
 ...es => editDescriptionButton_lv.properties} |  0
 ...=> editDescriptionButton_nb_NO.properties} |  0
 ...es => editDescriptionButton_nl.properties} |  0
 ...es => editDescriptionButton_pl.properties} |  0
 ...=> editDescriptionButton_pt_BR.properties} |  0
 ...=> editDescriptionButton_pt_PT.properties} |  0
 ...es => editDescriptionButton_ro.properties} |  0
 ...es => editDescriptionButton_ru.properties} |  0
 ...es => editDescriptionButton_sk.properties} |  0
 ...es => editDescriptionButton_sl.properties} |  0
 ...es => editDescriptionButton_sr.properties} |  0
 ...=> editDescriptionButton_sv_SE.properties} |  0
 ...es => editDescriptionButton_tr.properties} |  0
 ...es => editDescriptionButton_uk.properties} |  0
 ...=> editDescriptionButton_zh_TW.properties} |  0
 .../lib/hudson/editable-description.js        | 17 ++++++----
 .../lib/hudson/editableDescription.jelly      | 24 ++++++--------
 .../main/webapp/scripts/hudson-behavior.js    |  7 ++--
 44 files changed, 96 insertions(+), 44 deletions(-)
 create mode 100644 core/src/main/resources/lib/hudson/editDescriptionButton.jelly
 rename core/src/main/resources/lib/hudson/{editableDescription.properties => editDescriptionButton.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_bg.properties => editDescriptionButton_bg.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_ca.properties => editDescriptionButton_ca.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_cs.properties => editDescriptionButton_cs.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_da.properties => editDescriptionButton_da.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_de.properties => editDescriptionButton_de.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_el.properties => editDescriptionButton_el.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_es.properties => editDescriptionButton_es.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_es_AR.properties => editDescriptionButton_es_AR.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_et.properties => editDescriptionButton_et.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_fi.properties => editDescriptionButton_fi.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_fr.properties => editDescriptionButton_fr.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_he.properties => editDescriptionButton_he.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_hu.properties => editDescriptionButton_hu.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_it.properties => editDescriptionButton_it.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_ja.properties => editDescriptionButton_ja.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_ko.properties => editDescriptionButton_ko.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_lt.properties => editDescriptionButton_lt.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_lv.properties => editDescriptionButton_lv.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_nb_NO.properties => editDescriptionButton_nb_NO.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_nl.properties => editDescriptionButton_nl.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_pl.properties => editDescriptionButton_pl.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_pt_BR.properties => editDescriptionButton_pt_BR.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_pt_PT.properties => editDescriptionButton_pt_PT.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_ro.properties => editDescriptionButton_ro.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_ru.properties => editDescriptionButton_ru.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_sk.properties => editDescriptionButton_sk.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_sl.properties => editDescriptionButton_sl.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_sr.properties => editDescriptionButton_sr.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_sv_SE.properties => editDescriptionButton_sv_SE.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_tr.properties => editDescriptionButton_tr.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_uk.properties => editDescriptionButton_uk.properties} (100%)
 rename core/src/main/resources/lib/hudson/{editableDescription_zh_TW.properties => editDescriptionButton_zh_TW.properties} (100%)

diff --git a/core/src/main/resources/hudson/model/Computer/index-top.jelly b/core/src/main/resources/hudson/model/Computer/index-top.jelly
index 95bab4bf8759..37fd8a2f1945 100644
--- a/core/src/main/resources/hudson/model/Computer/index-top.jelly
+++ b/core/src/main/resources/hudson/model/Computer/index-top.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
   <!-- Node description -->
-  <t:editableDescription permission="${it.CONFIGURE}" description="${it.node.nodeDescription}" submissionUrl="submitDescription" />
+  <t:editableDescription permission="${it.CONFIGURE}" description="${it.node.nodeDescription}" hideButton="true" />
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly
index 2b93c52fe3ee..fa4abce69296 100644
--- a/core/src/main/resources/hudson/model/Computer/index.jelly
+++ b/core/src/main/resources/hudson/model/Computer/index.jelly
@@ -29,6 +29,7 @@ THE SOFTWARE.
     <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
     <l:main-panel>
       <l:app-bar title="${it.caption}">
+        <t:editDescriptionButton permission="${it.CONFIGURE}"/>
         <j:if test="${it.manualLaunchAllowed}">
           <st:include from="${it.launcher}" page="app-bar-controls.jelly" optional="true"/>
         </j:if>
diff --git a/core/src/main/resources/hudson/model/Job/index.jelly b/core/src/main/resources/hudson/model/Job/index.jelly
index 0fb537e267d7..d9b214900c7b 100644
--- a/core/src/main/resources/hudson/model/Job/index.jelly
+++ b/core/src/main/resources/hudson/model/Job/index.jelly
@@ -40,6 +40,9 @@ THE SOFTWARE.
             <l:breakable value="${it.displayName}"/>
           </h1>
         </div>
+        <div class="jenkins-app-bar__controls">
+          <t:editDescriptionButton permission="${it.CONFIGURE}"/>
+        </div>
       </div>
 
       <j:if test="${(it.fullName!=it.fullDisplayName) and (it.class.name!='hudson.matrix.MatrixConfiguration')}"> <!-- TODO rather check for TopLevelItem (how to do this from Jelly?) -->
@@ -52,7 +55,7 @@ THE SOFTWARE.
           </j:otherwise>
         </j:choose>
       </j:if>
-      <t:editableDescription permission="${it.CONFIGURE}"/>
+      <t:editableDescription permission="${it.CONFIGURE}" hideButton="true"/>
 
       <st:include page="jobpropertysummaries.jelly" />
       <!-- inject main part here -->
diff --git a/core/src/main/resources/hudson/model/Label/index.jelly b/core/src/main/resources/hudson/model/Label/index.jelly
index 34ede2f6c8ee..ad75b1dbf4c7 100644
--- a/core/src/main/resources/hudson/model/Label/index.jelly
+++ b/core/src/main/resources/hudson/model/Label/index.jelly
@@ -28,12 +28,13 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
     <l:main-panel>
-      <h1>
-        ${it.name}
-      </h1>
-
+      <l:app-bar title="${it.name}">
+        <j:if test="${it.atom}">
+          <t:editDescriptionButton permission="${app.ADMINISTER}"/>
+        </j:if>
+      </l:app-bar>
       <j:if test="${it.atom}">
-        <t:editableDescription permission="${app.ADMINISTER}"/>
+        <t:editableDescription permission="${app.ADMINISTER}" hideButton="true"/>
       </j:if>
 
       <j:forEach var="a" items="${it.allActions}">
diff --git a/core/src/main/resources/hudson/model/Run/index.jelly b/core/src/main/resources/hudson/model/Run/index.jelly
index 0acdb74fb01f..b164817a164f 100644
--- a/core/src/main/resources/hudson/model/Run/index.jelly
+++ b/core/src/main/resources/hudson/model/Run/index.jelly
@@ -30,10 +30,20 @@ THE SOFTWARE.
 
     <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
     <l:main-panel>
-      <div style="float:right; z-index: 1; position:relative; margin-left: 1em">
+      <j:set var="controls">
+        <t:editDescriptionButton permission="${it.UPDATE}"/>
         <l:hasPermission permission="${it.UPDATE}">
           <st:include page="logKeep.jelly" />
         </l:hasPermission>
+      </j:set>
+
+      <t:buildCaption controls="${controls}">${it.displayName} (<i:formatDate value="${it.timestamp.time}" type="both" dateStyle="medium" timeStyle="medium"/>)</t:buildCaption>
+
+      <div>
+        <t:editableDescription permission="${it.UPDATE}" hideButton="true"/>
+      </div>
+
+      <div style="float:right; z-index: 1; position:relative; margin-left: 1em">
         <div style="margin-top:1em">
           ${%startedAgo(it.timestampString)}
         </div>
@@ -48,11 +58,6 @@ THE SOFTWARE.
         </div>
       </div>
 
-      <t:buildCaption>${it.displayName} (<i:formatDate value="${it.timestamp.time}" type="both" dateStyle="medium" timeStyle="medium"/>)</t:buildCaption>
-
-      <div>
-        <t:editableDescription permission="${it.UPDATE}" />
-      </div>
 
       <table>
         <t:artifactList build="${it}" caption="${%Build Artifacts}"
diff --git a/core/src/main/resources/hudson/model/Run/logKeep.jelly b/core/src/main/resources/hudson/model/Run/logKeep.jelly
index 06bc198b577b..bc4d8c99e3ce 100644
--- a/core/src/main/resources/hudson/model/Run/logKeep.jelly
+++ b/core/src/main/resources/hudson/model/Run/logKeep.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:if test="${it.canToggleLogKeep()}">
-    <form method="post" action="toggleLogKeep" style="margin-top:1em">
+    <form method="post" action="toggleLogKeep">
       <j:if test="${it.keepLog and h.hasPermission(it,it.DELETE)}">
         <f:submit value="${%Don't keep this build forever}" primary="false" />
       </j:if>
diff --git a/core/src/main/resources/hudson/model/User/index.jelly b/core/src/main/resources/hudson/model/User/index.jelly
index db5a8f83022e..a85c46b1a945 100644
--- a/core/src/main/resources/hudson/model/User/index.jelly
+++ b/core/src/main/resources/hudson/model/User/index.jelly
@@ -27,13 +27,21 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <!-- no need for additional breadcrumb here as we're on an index page already including breadcrumb -->
     <l:main-panel>
-      <h1>
-        <span class="icon-lg">
-          <l:icon src="${h.getUserAvatar(it, '48x48')}" />
-        </span>
-        ${it.fullName}
-      </h1>
-      <t:editableDescription permission="${app.ADMINISTER}" />
+      <div class="jenkins-app-bar">
+        <div class="jenkins-app-bar__content jenkins-build-caption" data-status-url="${rootURL}/${it.url}statusIcon">
+          <h1>
+            <span class="icon-lg">
+              <l:icon src="${h.getUserAvatar(it, '48x48')}"/>
+            </span>
+            ${it.fullName}
+          </h1>
+        </div>
+        <div class="jenkins-app-bar__controls">
+          <t:editDescriptionButton permission="${app.ADMINISTER}"/>
+        </div>
+      </div>
+
+      <t:editableDescription permission="${app.ADMINISTER}" hideButton="true"/>
       <div>
         ${%Jenkins User ID}: ${it.id}
       </div>
diff --git a/core/src/main/resources/lib/hudson/editDescriptionButton.jelly b/core/src/main/resources/lib/hudson/editDescriptionButton.jelly
new file mode 100644
index 000000000000..079404c821c1
--- /dev/null
+++ b/core/src/main/resources/lib/hudson/editDescriptionButton.jelly
@@ -0,0 +1,32 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+    <st:documentation>
+        Renders a button to add/edit the description of an item. Typically used when the button should appear in the
+        app-bar instead of appearing below the description. To be used in combination with `editableDescription`.
+        <st:attribute name="permission" use="required">
+            If the current user doesn't have this permission, the description
+            is not editable.
+        </st:attribute>
+        <st:attribute name="description">
+            Optional value of the description. If not specified, will use '${it.description}'.
+        </st:attribute>
+        <st:attribute name="submissionUrl">
+            Optional submission URL. If not specified, will use 'submitDescription'.
+        </st:attribute>
+    </st:documentation>
+    <j:set var="actualDescription" value="${description}" defaultValue="${it.description}"/>
+    <l:hasPermission permission="${permission}">
+        <st:adjunct includes="lib.hudson.editable-description"/>
+        <a class="jenkins-button jenkins-hidden" id="description-link" href="editDescription" data-description="${actualDescription}" data-url="${submissionUrl}">
+            <l:icon src="symbol-edit" />
+            <j:choose>
+                <j:when test="${empty(actualDescription)}">
+                    ${%add description}
+                </j:when>
+                <j:otherwise>
+                    ${%edit description}
+                </j:otherwise>
+            </j:choose>
+        </a>
+    </l:hasPermission>
+</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/editableDescription.properties b/core/src/main/resources/lib/hudson/editDescriptionButton.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_bg.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_bg.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_bg.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_bg.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_ca.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_ca.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_ca.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_ca.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_cs.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_cs.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_cs.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_cs.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_da.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_da.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_da.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_da.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_de.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_de.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_de.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_de.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_el.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_el.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_el.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_el.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_es.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_es.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_es.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_es.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_es_AR.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_es_AR.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_es_AR.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_es_AR.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_et.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_et.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_et.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_et.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_fi.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_fi.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_fi.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_fi.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_fr.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_fr.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_fr.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_fr.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_he.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_he.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_he.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_he.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_hu.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_hu.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_hu.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_hu.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_it.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_it.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_it.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_it.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_ja.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_ja.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_ja.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_ja.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_ko.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_ko.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_ko.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_ko.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_lt.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_lt.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_lt.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_lt.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_lv.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_lv.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_lv.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_lv.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_nb_NO.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_nb_NO.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_nb_NO.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_nb_NO.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_nl.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_nl.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_nl.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_nl.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_pl.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_pl.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_pl.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_pl.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_pt_BR.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_pt_BR.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_pt_BR.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_pt_PT.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_pt_PT.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_pt_PT.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_pt_PT.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_ro.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_ro.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_ro.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_ro.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_ru.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_ru.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_ru.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_ru.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_sk.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_sk.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_sk.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_sk.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_sl.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_sl.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_sl.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_sl.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_sr.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_sr.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_sr.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_sr.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_sv_SE.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_sv_SE.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_sv_SE.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_sv_SE.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_tr.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_tr.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_tr.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_tr.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_uk.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_uk.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_uk.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_uk.properties
diff --git a/core/src/main/resources/lib/hudson/editableDescription_zh_TW.properties b/core/src/main/resources/lib/hudson/editDescriptionButton_zh_TW.properties
similarity index 100%
rename from core/src/main/resources/lib/hudson/editableDescription_zh_TW.properties
rename to core/src/main/resources/lib/hudson/editDescriptionButton_zh_TW.properties
diff --git a/core/src/main/resources/lib/hudson/editable-description.js b/core/src/main/resources/lib/hudson/editable-description.js
index e8d2b43c356e..f9bf0d3f0003 100644
--- a/core/src/main/resources/lib/hudson/editable-description.js
+++ b/core/src/main/resources/lib/hudson/editable-description.js
@@ -2,11 +2,16 @@
 (function () {
   document.addEventListener("DOMContentLoaded", function () {
     let descriptionLink = document.querySelector("#description-link");
-    descriptionLink.addEventListener("click", function (e) {
-      e.preventDefault();
-      let url = descriptionLink.getAttribute("data-url");
-      let description = descriptionLink.getAttribute("data-description");
-      return replaceDescription(description, url);
-    });
+    let description = document.getElementById("description");
+    if (description != null) {
+      descriptionLink.classList.remove("jenkins-hidden");
+      descriptionLink.addEventListener("click", function (e) {
+        e.preventDefault();
+        descriptionLink.classList.add("jenkins-hidden");
+        let url = descriptionLink.getAttribute("data-url");
+        let description = descriptionLink.getAttribute("data-description");
+        return replaceDescription(description, url);
+      });
+    }
   });
 })();
diff --git a/core/src/main/resources/lib/hudson/editableDescription.jelly b/core/src/main/resources/lib/hudson/editableDescription.jelly
index d9c73be6f1c9..30eba0b39318 100644
--- a/core/src/main/resources/lib/hudson/editableDescription.jelly
+++ b/core/src/main/resources/lib/hudson/editableDescription.jelly
@@ -38,30 +38,24 @@ THE SOFTWARE.
     <st:attribute name="submissionUrl">
       Optional submission URL. If not specified, will use 'submitDescription'.
     </st:attribute>
+    <st:attribute name="hideButton">
+      Hide the add/edit description button. Set to true when the button is provided via the app bar.
+      See 'editDescriptionButton'
+    </st:attribute>
   </st:documentation>
 
   <j:set var="actualDescription" value="${description}" defaultValue="${it.description}"/>
+  <j:set var="hideDescriptionButton" value="${hideButton}" defaultValue="false"/>
 
-  <div id="description" class="jenkins-!-margin-bottom-0">
+  <div id="description" class="jenkins-!-margin-bottom-${hideButton?'3':'0'}">
     <div>
       <j:out value="${actualDescription!=null ? app.markupFormatter.translate(actualDescription) : ''}" />
     </div>
 
-    <l:hasPermission permission="${permission}">
+    <j:if test="${!hideDescriptionButton}">
       <div class="jenkins-buttons-row jenkins-buttons-row--invert">
-        <st:adjunct includes="lib.hudson.editable-description"/>
-        <a class="jenkins-button jenkins-button--tertiary" id="description-link" href="editDescription" data-description="${actualDescription}" data-url="${submissionUrl}">
-          <l:icon src="symbol-edit" />
-          <j:choose>
-            <j:when test="${empty(actualDescription)}">
-              ${%add description}
-            </j:when>
-            <j:otherwise>
-              ${%edit description}
-            </j:otherwise>
-          </j:choose>
-        </a>
+        <t:editDescriptionButton permission="${permission}" description="${actualDescription}" submissionUrl="${submissionUrl}"/>
       </div>
-    </l:hasPermission>
+    </j:if>
   </div>
 </j:jelly>
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 8a207dcefc76..099443c665eb 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1901,8 +1901,11 @@ function xor(a, b) {
 // eslint-disable-next-line no-unused-vars
 function replaceDescription(initialDescription, submissionUrl) {
   var d = document.getElementById("description");
-  d.firstElementChild.nextElementSibling.innerHTML =
-    "<div class='jenkins-spinner'></div>";
+  let button = d.firstElementChild.nextElementSibling;
+  if (button !== null) {
+    d.firstElementChild.nextElementSibling.innerHTML =
+      "<div class='jenkins-spinner'></div>";
+  }
   let parameters = {};
   if (initialDescription !== null && initialDescription !== "") {
     parameters["description"] = initialDescription;

From 9758b76153fced28aa0dadbb9e0b55311156e113 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Thu, 30 May 2024 10:18:07 +0100
Subject: [PATCH 080/449] Remove 'button-with-dropdown' JS (#9317)

Remove 'button-with-dropdown'
---
 war/src/main/webapp/scripts/hudson-behavior.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 099443c665eb..161db88cfd72 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1756,15 +1756,6 @@ function rowvgStartEachRow(recursive, f) {
     },
   );
 
-  Behaviour.specify(
-    ".button-with-dropdown",
-    "-button-with-dropdown",
-    ++p,
-    function (e) {
-      new YAHOO.widget.Button(e, { type: "menu", menu: e.nextElementSibling });
-    },
-  );
-
   window.addEventListener("load", function () {
     // Add a class to the bottom bar when it's stuck to the bottom of the screen
     const el = document.querySelector("#bottom-sticker");

From 62bdd5229cfa00e3e3ea6291972870eaf1e45593 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 30 May 2024 03:18:17 -0600
Subject: [PATCH 081/449] Retain Java 11 EOL date for LTS lines (#9323)

Return to the Java 11 end of life date of 30 Sep 2024 for the LTS lines
rather than changing it to match the expected 30 Oct 2024 release date
of the first LTS to require Java 17.

Little benefit to LTS users to extend the end of life message until end of October.

Changing the date will cause the administrative monitor to reappear.
Better to leave it hidden if they have decided to hide it.
---
 .../jenkins/monitor/JavaVersionRecommendationAdminMonitor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
index 4b3642bb059c..2f746a9b1bfb 100644
--- a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
+++ b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
@@ -82,7 +82,7 @@ public class JavaVersionRecommendationAdminMonitor extends AdministrativeMonitor
         if (Jenkins.VERSION.split("[.]").length > 2) {
             // LTS will require Java 17 or newer beginning 30 Oct 2024
             // https://groups.google.com/g/jenkinsci-dev/c/gsXAqOQQEPc/m/VT9IBYdmAQAJ
-            supportedVersions.put(11, LocalDate.of(2024, 10, 30)); // Temurin: 2024-10-31
+            supportedVersions.put(11, LocalDate.of(2024, 9, 30)); // Temurin: 2024-10-31
         } else {
             // Weekly will require Java 17 or newer beginning 18 Jun 2024
             // https://groups.google.com/g/jenkinsci-dev/c/gsXAqOQQEPc/m/4fn4Un1iAwAJ

From da5964da3ebbedc304140dd6d52bb48ceecf5b6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 10:03:43 -0700
Subject: [PATCH 082/449] Bump eps1lon/actions-label-merge-conflict from 3.0.1
 to 3.0.2 (#9333)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/label-conflicting-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/label-conflicting-pr.yml b/.github/workflows/label-conflicting-pr.yml
index ae90f55bc77d..8b78edd6004c 100644
--- a/.github/workflows/label-conflicting-pr.yml
+++ b/.github/workflows/label-conflicting-pr.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@v3.0.1
+        uses: eps1lon/actions-label-merge-conflict@v3.0.2
         with:
           dirtyLabel: "unresolved-merge-conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

From f1c901c386fe9ec3bf307fd84edec0212908cf45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 20:08:37 -0700
Subject: [PATCH 083/449] Bump org.jenkins-ci.plugins:script-security from
 1336.vf33a_a_9863911 to 1341.va_2819b_414686 (#9335)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 515969bb605d..385dd661d9cc 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -111,7 +111,7 @@ THE SOFTWARE.
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
-        <version>1336.vf33a_a_9863911</version>
+        <version>1341.va_2819b_414686</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 2229dffc36d6..108ca4a90536 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -246,7 +246,7 @@ THE SOFTWARE.
                   <!-- dependency of command-launcher, junit, matrix-project, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>script-security</artifactId>
-                  <version>1336.vf33a_a_9863911</version>
+                  <version>1341.va_2819b_414686</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From cca5d6610f6370926d8ab878b72823e4a879a385 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 20:08:53 -0700
Subject: [PATCH 084/449] Bump org.jenkins-ci.plugins:matrix-project from
 830.v7ea_da_561b_a_34 to 831.v084e85a_b_4ea_d (#9334)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 385dd661d9cc..54f0bf3468df 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -241,7 +241,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>
-      <version>830.v7ea_da_561b_a_34</version>
+      <version>831.v084e85a_b_4ea_d</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 108ca4a90536..939c1dd2b0c0 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -239,7 +239,7 @@ THE SOFTWARE.
                   <!-- detached after 1.561 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>matrix-project</artifactId>
-                  <version>830.v7ea_da_561b_a_34</version>
+                  <version>831.v084e85a_b_4ea_d</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 935eaed78e98bdc7774fb617a94dba3de705596c Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Fri, 31 May 2024 13:05:34 +0100
Subject: [PATCH 085/449] add eddsa-api plugin to detached as a dependency of
 trilead-api

---
 war/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index f7423634915f..3e4ab9aa4deb 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -307,7 +307,13 @@ THE SOFTWARE.
                   <version>5.5.0-1</version>
                   <type>hpi</type>
                 </artifactItem>
-
+                <artifactItem>
+                  <!-- dependency of trilead-api -->
+                  <groupId>io.jenkins.plugins</groupId>
+                  <artifactId>eddsa-api</artifactId>
+                  <version>0.3.0-4.v84c6f0f4969e</version>
+                  <type>hpi</type>
+                </artifactItem>
                 <artifactItem>
                   <!-- dependency of jackson2-api -->
                   <groupId>io.jenkins.plugins</groupId>

From f47ce08a9e0f358f12866f36e6d0920e60e7c609 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 08:35:16 -0700
Subject: [PATCH 086/449] Bump org.apache.maven.plugins:maven-shade-plugin from
 3.5.3 to 3.6.0 (#9337)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 cli/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 14d6323ca762..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -119,7 +119,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.5.3</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <goals>

From 08d4fa11b1adb119a38613b26f788a07ea662c78 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 08:35:47 -0700
Subject: [PATCH 087/449] Update dependency stylelint to v16.6.1 (#9338)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 69 ++++++++++++++++++++++++++++++------------------
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/war/package.json b/war/package.json
index 4d18f656d776..17282fa90d5c 100644
--- a/war/package.json
+++ b/war/package.json
@@ -45,7 +45,7 @@
     "sass": "1.77.2",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
-    "stylelint": "16.6.0",
+    "stylelint": "16.6.1",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.0",
     "webpack": "5.91.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index ab00ee688018..3d65c0b7f9d9 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -2753,12 +2753,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"braces@npm:^3.0.2, braces@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
+"braces@npm:^3.0.3, braces@npm:~3.0.2":
+  version: 3.0.3
+  resolution: "braces@npm:3.0.3"
   dependencies:
-    fill-range: "npm:^7.0.1"
-  checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
+    fill-range: "npm:^7.1.1"
+  checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04
   languageName: node
   linkType: hard
 
@@ -3717,12 +3717,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
+"file-entry-cache@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "file-entry-cache@npm:9.0.0"
+  dependencies:
+    flat-cache: "npm:^5.0.0"
+  checksum: 10c0/07b0a4f062dc0aa258f3e1b06ac083ea25313f5e289943e146fafdaf3315dcc031635545eea7fe98fe5598b91d6c7f48dba7a251dd7ac20108a6ebf7d00b0b1c
+  languageName: node
+  linkType: hard
+
+"fill-range@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "fill-range@npm:7.1.1"
   dependencies:
     to-regex-range: "npm:^5.0.1"
-  checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
+  checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018
   languageName: node
   linkType: hard
 
@@ -3777,6 +3786,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flat-cache@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "flat-cache@npm:5.0.0"
+  dependencies:
+    flatted: "npm:^3.3.1"
+    keyv: "npm:^4.5.4"
+  checksum: 10c0/847f25eefec5d6614fdce76dc6097ee98f63fd4dfbcb908718905ac56610f939f4c28b1f908d6e8857d49286fe73235095d2e7ac9df096c35a3e8a15204c361b
+  languageName: node
+  linkType: hard
+
 "flat@npm:^5.0.2":
   version: 5.0.2
   resolution: "flat@npm:5.0.2"
@@ -3786,10 +3805,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flatted@npm:^3.2.9":
-  version: 3.2.9
-  resolution: "flatted@npm:3.2.9"
-  checksum: 10c0/5c91c5a0a21bbc0b07b272231e5b4efe6b822bcb4ad317caf6bb06984be4042a9e9045026307da0fdb4583f1f545e317a67ef1231a59e71f7fced3cc429cfc53
+"flatted@npm:^3.2.9, flatted@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "flatted@npm:3.3.1"
+  checksum: 10c0/324166b125ee07d4ca9bcf3a5f98d915d5db4f39d711fba640a3178b959919aae1f7cfd8aabcfef5826ed8aa8a2aa14cc85b2d7d18ff638ddf4ae3df39573eaf
   languageName: node
   linkType: hard
 
@@ -4395,7 +4414,7 @@ __metadata:
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
-    stylelint: "npm:16.6.0"
+    stylelint: "npm:16.6.1"
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.0"
     tippy.js: "npm:6.3.7"
@@ -4792,13 +4811,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "micromatch@npm:4.0.5"
+"micromatch@npm:^4.0.4, micromatch@npm:^4.0.7":
+  version: 4.0.7
+  resolution: "micromatch@npm:4.0.7"
   dependencies:
-    braces: "npm:^3.0.2"
+    braces: "npm:^3.0.3"
     picomatch: "npm:^2.3.1"
-  checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
+  checksum: 10c0/58fa99bc5265edec206e9163a1d2cec5fabc46a5b473c45f4a700adce88c2520456ae35f2b301e4410fb3afb27e9521fb2813f6fc96be0a48a89430e0916a772
   languageName: node
   linkType: hard
 
@@ -6654,9 +6673,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:16.6.0":
-  version: 16.6.0
-  resolution: "stylelint@npm:16.6.0"
+"stylelint@npm:16.6.1":
+  version: 16.6.1
+  resolution: "stylelint@npm:16.6.1"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.6.3"
     "@csstools/css-tokenizer": "npm:^2.3.1"
@@ -6671,7 +6690,7 @@ __metadata:
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
-    file-entry-cache: "npm:^8.0.0"
+    file-entry-cache: "npm:^9.0.0"
     global-modules: "npm:^2.0.0"
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
@@ -6682,7 +6701,7 @@ __metadata:
     known-css-properties: "npm:^0.31.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
-    micromatch: "npm:^4.0.5"
+    micromatch: "npm:^4.0.7"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
     postcss: "npm:^8.4.38"
@@ -6699,7 +6718,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/acfb7983a0b71677d066b2aa570eefdac0a7be2e21351bac8884b8156deaeec19e53ad128ae7ae7933c79f6045f1de8d759ba06cfbc373b2711015860805a3e7
+  checksum: 10c0/8dc9b0024d6fb109380a142171ab8a134c3863aa8b8736f0083310a0d05f173dcda5680f29267697dfa0aaeb2f08aef4ef113e4bb4f8582fcfdd97f35be51d71
   languageName: node
   linkType: hard
 

From 4969fdc448243255dda69274ccb952d226e0caf6 Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Fri, 31 May 2024 17:08:23 +0100
Subject: [PATCH 088/449] adapt HudsonPrivateSecurityRealmFIPSTest

---
 .../HudsonPrivateSecurityRealmFIPSTest.java   | 96 +++++++++++++------
 1 file changed, 66 insertions(+), 30 deletions(-)

diff --git a/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmFIPSTest.java b/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmFIPSTest.java
index 155e9cab1adc..ab1352807117 100644
--- a/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmFIPSTest.java
+++ b/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmFIPSTest.java
@@ -25,25 +25,30 @@
 package hudson.security;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertThrows;
 
+import hudson.logging.LogRecorder;
+import hudson.logging.LogRecorderManager;
 import hudson.model.User;
 import hudson.security.HudsonPrivateSecurityRealm.Details;
+import java.lang.reflect.Method;
+import java.util.List;
 import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import jenkins.model.Jenkins;
 import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
 import org.htmlunit.FailingHttpStatusCodeException;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.jvnet.hudson.test.FlagRule;
 import org.jvnet.hudson.test.For;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.JenkinsRule.WebClient;
-import org.jvnet.hudson.test.LoggerRule;
+import org.jvnet.hudson.test.RealJenkinsRule;
 
 
 @For(HudsonPrivateSecurityRealm.class)
@@ -52,18 +57,18 @@ public class HudsonPrivateSecurityRealmFIPSTest {
     // the jbcrypt encoded for of "a" without the quotes
     private static final String JBCRYPT_ENCODED_PASSWORD = "#jbcrypt:$2a$06$m0CrhHm10qJ3lXRY.5zDGO3rS2KdeeWLuGmsfGlMfOxih58VYVfxe";
 
-    @ClassRule
-    // do not use the FIPS140 class here as that initializes the field before we set the property!
-    public static TestRule flagRule = FlagRule.systemProperty("jenkins.security.FIPS140.COMPLIANCE", "true");
+    private static final String LOG_RECORDER_NAME = "HPSR_LOG_RECORDER";
 
     @Rule
-    public LoggerRule lr = new LoggerRule().record(HudsonPrivateSecurityRealm.class, Level.WARNING).capture(5);
-
-    @Rule
-    public JenkinsRule j = new JenkinsRule();
+    public RealJenkinsRule rjr = new RealJenkinsRule().includeTestClasspathPlugins(false)
+                                                       .javaOptions("-Xmx256M", "-Djenkins.security.FIPS140.COMPLIANCE=true");
 
     @Test
-    public void generalLogin() throws Exception {
+    public void generalLogin() throws Throwable {
+        rjr.then(HudsonPrivateSecurityRealmFIPSTest::generalLoginStep);
+    }
+
+    private static void generalLoginStep(JenkinsRule j) throws Exception {
         HudsonPrivateSecurityRealm securityRealm = new HudsonPrivateSecurityRealm(false, false, null);
         j.jenkins.setSecurityRealm(securityRealm);
 
@@ -75,37 +80,50 @@ public void generalLogin() throws Exception {
         String hashedPassword = u1.getProperty(Details.class).getPassword();
         assertThat(hashedPassword, startsWith("$PBKDF2$HMACSHA512:210000:"));
 
-        WebClient wc = j.createWebClient();
-        wc.login("user", "password");
-
-        assertThrows(FailingHttpStatusCodeException.class, () -> wc.login("user", "wrongPass"));
+        try (WebClient wc = j.createWebClient()) {
+            wc.login("user", "password");
+            assertThrows(FailingHttpStatusCodeException.class, () -> wc.login("user", "wrongPass"));
+        }
     }
 
     @Test
-    public void userCreationWithHashedPasswords() throws Exception {
+    public void userCreationWithHashedPasswords() throws Throwable {
+        rjr.then(HudsonPrivateSecurityRealmFIPSTest::userCreationWithHashedPasswordsStep);
+    }
+
+    private static void userCreationWithHashedPasswordsStep(JenkinsRule j) throws Exception {
+        setupLogRecorder();
         HudsonPrivateSecurityRealm securityRealm = new HudsonPrivateSecurityRealm(false, false, null);
         j.jenkins.setSecurityRealm(securityRealm);
         // "password" after it has gone through the KDF
         securityRealm.createAccountWithHashedPassword("user_hashed",
                 "$PBKDF2$HMACSHA512:210000:ffbb207b847010af98cdd2b09c79392c$f67c3b985daf60db83a9088bc2439f7b77016d26c1439a9877c4f863c377272283ce346edda4578a5607ea620a4beb662d853b800f373297e6f596af797743a6");
-        WebClient wc = j.createWebClient();
 
-        // login should succeed
-        wc.login("user_hashed", "password");
-
-        assertThrows(FailingHttpStatusCodeException.class, () -> wc.login("user_hashed", "password2"));
-        assertThat(lr, not(hasIncorrectHashingLogEntry()));
+        try (WebClient wc = j.createWebClient()) {
+            // login should succeed
+            wc.login("user_hashed", "password");
+            assertThrows(FailingHttpStatusCodeException.class, () -> wc.login("user_hashed", "password2"));
+        }
+        assertThat(getLogRecords(), not(hasItem(incorrectHashingLogEntry())));
     }
 
     @Test
-    public void userLoginAfterEnablingFIPS() throws Exception {
+    public void userLoginAfterEnablingFIPS() throws Throwable {
+        rjr.then(HudsonPrivateSecurityRealmFIPSTest::userLoginAfterEnablingFIPSStep);
+    }
+
+    private static void userLoginAfterEnablingFIPSStep(JenkinsRule j) throws Exception {
+        setupLogRecorder();
         HudsonPrivateSecurityRealm securityRealm = new HudsonPrivateSecurityRealm(false, false, null);
         j.jenkins.setSecurityRealm(securityRealm);
 
         User u1 = securityRealm.createAccount("user", "a");
         u1.setFullName("A User");
         // overwrite the password property using an password created using an incorrect algorithm
-        u1.addProperty(Details.fromHashedPassword(JBCRYPT_ENCODED_PASSWORD));
+        Method m = Details.class.getDeclaredMethod("fromHashedPassword", String.class);
+        m.setAccessible(true);
+        Details d = (Details) m.invoke(null, JBCRYPT_ENCODED_PASSWORD);
+        u1.addProperty(d);
 
         u1.save();
         assertThat(u1.getProperty(Details.class).getPassword(), is(JBCRYPT_ENCODED_PASSWORD));
@@ -113,11 +131,16 @@ public void userLoginAfterEnablingFIPS() throws Exception {
         try (WebClient wc = j.createWebClient()) {
             assertThrows(FailingHttpStatusCodeException.class, () -> wc.login("user", "a"));
         }
-        assertThat(lr, hasIncorrectHashingLogEntry());
+        assertThat(getLogRecords(), hasItem(incorrectHashingLogEntry()));
     }
 
     @Test
-    public void userCreationWithJBCryptPasswords() throws Exception {
+    public void userCreationWithJBCryptPasswords() throws Throwable {
+        rjr.then(HudsonPrivateSecurityRealmFIPSTest::userCreationWithJBCryptPasswordsStep);
+
+    }
+
+    private static void userCreationWithJBCryptPasswordsStep(JenkinsRule j) throws Exception {
         HudsonPrivateSecurityRealm securityRealm = new HudsonPrivateSecurityRealm(false, false, null);
 
         IllegalArgumentException illegalArgumentException = assertThrows(IllegalArgumentException.class,
@@ -126,8 +149,21 @@ public void userCreationWithJBCryptPasswords() throws Exception {
                 is("The hashed password was hashed with an incorrect algorithm. Jenkins is expecting $PBKDF2"));
     }
 
-    private static Matcher<LoggerRule> hasIncorrectHashingLogEntry() {
-        return LoggerRule.recorded(is(
-                "A password appears to be stored (or is attempting to be stored) that was created with a different hashing/encryption algorithm, check the FIPS-140 state of the system has not changed inadvertently"));
+    private static Matcher<LogRecord> incorrectHashingLogEntry() {
+        return Matchers.hasProperty("message",
+                is("A password appears to be stored (or is attempting to be stored) that was created with a different hashing/encryption algorithm, check the FIPS-140 state of the system has not changed inadvertently"));
+    }
+
+    private static List<LogRecord> getLogRecords() {
+        return Jenkins.get().getLog().getLogRecorder(LOG_RECORDER_NAME).getLogRecords();
+    }
+
+    private static void setupLogRecorder() {
+        LogRecorderManager lrm = Jenkins.get().getLog();
+        LogRecorder lr = new LogRecorder(LOG_RECORDER_NAME);
+        LogRecorder.Target target = new LogRecorder.Target(HudsonPrivateSecurityRealm.class.getName(), Level.WARNING);
+        lr.setLoggers(List.of(target));
+
+        lrm.getRecorders().add(lr);
     }
 }

From c5ff16e30a8d329450e943bea4f19a36bc9ca178 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 11:11:12 +0200
Subject: [PATCH 089/449] Update dependency node to v20.14.0 (#9339)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index e393bf00900e..87a7b2c743ae 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -47,7 +47,7 @@ THE SOFTWARE.
     <!-- HTTP listener port -->
     <port>8080</port>
     <mina-sshd-api.version>2.12.1-101.v85b_e08b_780dd</mina-sshd-api.version>
-    <node.version>20.13.1</node.version>
+    <node.version>20.14.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->

From dfcf5c73aca18bb6e34949679aafef3beaa7f744 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 2 Jun 2024 22:32:12 +0200
Subject: [PATCH 090/449] Update dependency sass to v1.77.3 (#9340)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 17282fa90d5c..ef8ea5ffb7bf 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
     "prettier": "3.2.5",
-    "sass": "1.77.2",
+    "sass": "1.77.3",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.6.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index 3d65c0b7f9d9..c640a8000ff2 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4410,7 +4410,7 @@ __metadata:
     postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.2.5"
-    sass: "npm:1.77.2"
+    sass: "npm:1.77.3"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6367,16 +6367,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.2":
-  version: 1.77.2
-  resolution: "sass@npm:1.77.2"
+"sass@npm:1.77.3":
+  version: 1.77.3
+  resolution: "sass@npm:1.77.3"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/0d292339064de3c902e209d41de9c4eb2038cff326476aeebbb5be3eee1d23400d975face2b8e124ae617b10af3e93bec01580f61912f34e4c517fe137a118b6
+  checksum: 10c0/131469168a4c41f9c3eeaac8a91b3ada0ff4746c8588ce1bc4b819c9245281075a895d5fc74f6edeeb32142a572af8a0799bd0ae698614a1fcfcfbd97b0b1256
   languageName: node
   linkType: hard
 

From 072e79f349bcbcce5eb1a13fcdd678103c3e2a96 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 2 Jun 2024 13:32:27 -0700
Subject: [PATCH 091/449] Ban library plugins (#9332)

---
 core/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 61c48e489794..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -507,6 +507,62 @@ THE SOFTWARE.
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <!-- Version specified in parent POM -->
+        <executions>
+          <execution>
+            <id>enforce-banned-dependencies</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes combine.children="append">
+                    <!-- Library plugins -->
+                    <exclude>com.fasterxml.jackson.*</exclude>
+                    <exclude>com.github.ben-manes.caffeine:caffeine</exclude>
+                    <exclude>com.github.jnr:jnr-posix</exclude>
+                    <exclude>com.github.mwiede:jsch</exclude>
+                    <exclude>com.google.code.gson:gson</exclude>
+                    <exclude>com.jayway.jsonpath:json-path</exclude>
+                    <exclude>commons-httpclient:commons-httpclient</exclude>
+                    <exclude>com.sun.activation:javax.activation</exclude>
+                    <exclude>com.sun.mail:javax.mail</exclude>
+                    <exclude>com.sun.xml.bind:jaxb-impl</exclude>
+                    <exclude>io.jsonwebtoken</exclude>
+                    <!-- Used in unit tests, so exclude from compile and runtime scope only -->
+                    <exclude>jakarta.activation:jakarta.activation-api:*:jar:compile</exclude>
+                    <exclude>jakarta.activation:jakarta.activation-api:*:jar:runtime</exclude>
+                    <exclude>jakarta.mail:jakarta.mail-api</exclude>
+                    <exclude>javax.activation:javax.activation-api</exclude>
+                    <exclude>javax.mail:javax.mail-api</exclude>
+                    <exclude>javax.xml.bind:jaxb-api</exclude>
+                    <exclude>joda-time:joda-time</exclude>
+                    <!-- Used in unit tests, so exclude from compile and runtime scope only -->
+                    <exclude>net.bytebuddy:byte-buddy:*:jar:compile</exclude>
+                    <exclude>net.bytebuddy:byte-buddy:*:jar:runtime</exclude>
+                    <exclude>net.i2p.crypto:eddsa</exclude>
+                    <exclude>net.minidev</exclude>
+                    <exclude>org.apache.commons:commons-lang3</exclude>
+                    <exclude>org.apache.commons:commons-text</exclude>
+                    <exclude>org.apache.httpcomponents</exclude>
+                    <exclude>org.bouncycastle</exclude>
+                    <exclude>org.eclipse.angus:angus-activation</exclude>
+                    <exclude>org.eclipse.angus:angus-mail</exclude>
+                    <exclude>org.glassfish.jersey.*</exclude>
+                    <exclude>org.json:json</exclude>
+                    <exclude>org.ow2.asm</exclude>
+                    <exclude>org.yaml:snakeyaml</exclude>
+                  </excludes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>

From 71a6a0c4c00934af6e3ce086c707a73dc6e3a03a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:04:36 +0100
Subject: [PATCH 092/449] Update dependency sass to v1.77.4 (#9341)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index ef8ea5ffb7bf..c9357ee10ae1 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
     "prettier": "3.2.5",
-    "sass": "1.77.3",
+    "sass": "1.77.4",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.6.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index c640a8000ff2..1e6d513da3d8 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4410,7 +4410,7 @@ __metadata:
     postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.2.5"
-    sass: "npm:1.77.3"
+    sass: "npm:1.77.4"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6367,16 +6367,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.3":
-  version: 1.77.3
-  resolution: "sass@npm:1.77.3"
+"sass@npm:1.77.4":
+  version: 1.77.4
+  resolution: "sass@npm:1.77.4"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/131469168a4c41f9c3eeaac8a91b3ada0ff4746c8588ce1bc4b819c9245281075a895d5fc74f6edeeb32142a572af8a0799bd0ae698614a1fcfcfbd97b0b1256
+  checksum: 10c0/b9cb4882bded282aabe38d011adfce375e1f282184fcf93dc3da5d5be834c6aa53c474c15634c351ef7bd85146cfd1cc81343654cc3bcf000d78e856da4225ef
   languageName: node
   linkType: hard
 

From b6403a16a2cb5432535dba17069aed24e4460064 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 10:17:54 -0700
Subject: [PATCH 093/449] Bump org.jenkins-ci.main:jenkins-test-harness from
 2207.v3b_df04c801d4 to 2211.v29b_b_b_2e79c5a_ (#9344)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 54f0bf3468df..44cfca3669bb 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -142,7 +142,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2207.v3b_df04c801d4</version>
+      <version>2211.v29b_b_b_2e79c5a_</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 8eaaaf460d9e972d73f3810e2a68caa67fb319ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 10:18:23 -0700
Subject: [PATCH 094/449] Bump io.jenkins.plugins:design-library from
 304.v44f7d19e8537 to 307.vecc0205ca_707 (#9343)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 44cfca3669bb..004cfb939189 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -329,7 +329,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>design-library</artifactId>
-                  <version>304.v44f7d19e8537</version>
+                  <version>307.vecc0205ca_707</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>design-library.jpi</destFileName>

From 52401f1f7c53182ae8953c0c944ce69bd43f38a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 10:18:53 -0700
Subject: [PATCH 095/449] Bump com.google.guava:guava from 33.2.0-jre to
 33.2.1-jre (#9342)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index d055696c3ee2..14fcd61775ed 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -82,7 +82,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>33.2.0-jre</version>
+        <version>33.2.1-jre</version>
       </dependency>
       <dependency>
         <!-- Overriding Stapler’s 1.1.3 version to diagnose JENKINS-20618: -->

From f70f0d606719761ec1e5cf8784975ccaec5eb0e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 10:29:12 -0700
Subject: [PATCH 096/449] Bump org.jenkins-ci:jenkins from 1.114 to 1.115
 (#9345)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 50352feae948..e6ceedb7bb2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.114</version>
+    <version>1.115</version>
     <relativePath />
   </parent>
 

From c716729dc32f4cba168655d7ebdfa07cd52de965 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 16:47:42 -0600
Subject: [PATCH 097/449] Update eslint monorepo to v9.4.0 (#9346)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 54 ++++++++++++++++++++++++------------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/war/package.json b/war/package.json
index c9357ee10ae1..995851996559 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.24.6",
     "@babel/core": "7.24.6",
     "@babel/preset-env": "7.24.6",
-    "@eslint/js": "9.3.0",
+    "@eslint/js": "9.4.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.3.0",
+    "eslint": "9.4.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.3.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 1e6d513da3d8..d8fff0ede5d3 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1847,6 +1847,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint/config-array@npm:^0.15.1":
+  version: 0.15.1
+  resolution: "@eslint/config-array@npm:0.15.1"
+  dependencies:
+    "@eslint/object-schema": "npm:^2.1.3"
+    debug: "npm:^4.3.1"
+    minimatch: "npm:^3.0.5"
+  checksum: 10c0/60947a188157f2f811cc2aedf3c2494fa10932178838f6a7c7e9a8bb106ab51b4b4e571f49ae63cdd3884002b78631e4395be25d4ae52470360fc7fb463303d2
+  languageName: node
+  linkType: hard
+
 "@eslint/eslintrc@npm:^3.1.0":
   version: 3.1.0
   resolution: "@eslint/eslintrc@npm:3.1.0"
@@ -1864,21 +1875,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.3.0":
-  version: 9.3.0
-  resolution: "@eslint/js@npm:9.3.0"
-  checksum: 10c0/1550c68922eb17c3ce541d9ffbb687e656bc0d4e2fff2d9cb0a75101a9cdb6184b7af7378ccf46c6ca750b280d25d45cc5e7374a83a4ee89d404d3717502fd9d
+"@eslint/js@npm:9.4.0":
+  version: 9.4.0
+  resolution: "@eslint/js@npm:9.4.0"
+  checksum: 10c0/7ffc508d3e9cd496cab7f08c5ba8f97851c8adaea3ebff8804b1c3b4662aa7aac7e9c3b597f7e47fdc29319a107bcf892865070a6b113c2e4d19f8fa1f99f569
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.13.0":
-  version: 0.13.0
-  resolution: "@humanwhocodes/config-array@npm:0.13.0"
-  dependencies:
-    "@humanwhocodes/object-schema": "npm:^2.0.3"
-    debug: "npm:^4.3.1"
-    minimatch: "npm:^3.0.5"
-  checksum: 10c0/205c99e756b759f92e1f44a3dc6292b37db199beacba8f26c2165d4051fe73a4ae52fdcfd08ffa93e7e5cb63da7c88648f0e84e197d154bbbbe137b2e0dd332e
+"@eslint/object-schema@npm:^2.1.3":
+  version: 2.1.3
+  resolution: "@eslint/object-schema@npm:2.1.3"
+  checksum: 10c0/ee892d0112ee7ec86312dfb1fa718da76b2d446e3495b9ec1f3ef31382a335d31420b76f3def175b96f7c3517c88fc860fec049d62a81d444237a23881559403
   languageName: node
   linkType: hard
 
@@ -1889,13 +1896,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "@humanwhocodes/object-schema@npm:2.0.3"
-  checksum: 10c0/80520eabbfc2d32fe195a93557cef50dfe8c8905de447f022675aaf66abc33ae54098f5ea78548d925aa671cd4ab7c7daa5ad704fe42358c9b5e7db60f80696c
-  languageName: node
-  linkType: hard
-
 "@humanwhocodes/retry@npm:^0.3.0":
   version: 0.3.0
   resolution: "@humanwhocodes/retry@npm:0.3.0"
@@ -3533,15 +3533,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.3.0":
-  version: 9.3.0
-  resolution: "eslint@npm:9.3.0"
+"eslint@npm:9.4.0":
+  version: 9.4.0
+  resolution: "eslint@npm:9.4.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
+    "@eslint/config-array": "npm:^0.15.1"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.3.0"
-    "@humanwhocodes/config-array": "npm:^0.13.0"
+    "@eslint/js": "npm:9.4.0"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3573,7 +3573,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/d0cf1923408ce720f2fa0dde39094dbee6b03a71d5e6466402bbeb29c08a618713f7a1e8cfc4b4d50dbe3750ce68adf614a0e973dea6fa36ddc428dfb89d4cac
+  checksum: 10c0/826c901812536451e1bdb151359098db3a01ee9ff41775d5e97553626d07f7319cb2a0fd54176ef8e2e057105874077426b5d408ee6e8cff06bb814651f4c004
   languageName: node
   linkType: hard
 
@@ -4390,12 +4390,12 @@ __metadata:
     "@babel/cli": "npm:7.24.6"
     "@babel/core": "npm:7.24.6"
     "@babel/preset-env": "npm:7.24.6"
-    "@eslint/js": "npm:9.3.0"
+    "@eslint/js": "npm:9.4.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.3.0"
+    eslint: "npm:9.4.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.3.0"

From 291771a349c8792f2904852fa4fe535e564b6b91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 02:41:26 +0000
Subject: [PATCH 098/449] Bump org.jenkins-ci.plugins:matrix-project from
 831.v084e85a_b_4ea_d to 832.va_66e270d2946 (#9348)

---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 004cfb939189..777505cf0fed 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -241,7 +241,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>
-      <version>831.v084e85a_b_4ea_d</version>
+      <version>832.va_66e270d2946</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 87a7b2c743ae..3131e0c7e567 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -239,7 +239,7 @@ THE SOFTWARE.
                   <!-- detached after 1.561 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>matrix-project</artifactId>
-                  <version>831.v084e85a_b_4ea_d</version>
+                  <version>832.va_66e270d2946</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 896e0f30e8c5ea8afbdcb0b503aa197372113027 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:14:56 +0000
Subject: [PATCH 099/449] [maven-release-plugin] prepare release jenkins-2.461

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 14fcd61775ed..6a9bb05a0055 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.461</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..ed2e40b91cee 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.461</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..de99f1fa628b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.461</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..cf984f9e17a7 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.461</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index e6ceedb7bb2c..87cd13c96409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.461</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.461</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.461</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-05-28T13:18:36Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-04T10:36:32Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 777505cf0fed..c32ec4524243 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.461</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 3131e0c7e567..3f588e522c86 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.461</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..c11127661675 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.461</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..37d57d80fa26 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.461</version>
     <relativePath>../..</relativePath>
   </parent>
 

From d201db6af26141a7867f8436dcfa2b84a4d6c48c Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:15:21 +0000
Subject: [PATCH 100/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 6a9bb05a0055..14fcd61775ed 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.461</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index ed2e40b91cee..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.461</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index de99f1fa628b..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.461</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index cf984f9e17a7..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.461</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 87cd13c96409..2629524e85fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.461</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.461</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.461</revision>
+    <revision>2.462</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-06-04T10:36:32Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-04T13:14:56Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index c32ec4524243..777505cf0fed 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.461</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 3f588e522c86..3131e0c7e567 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.461</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c11127661675..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.461</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 37d57d80fa26..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.461</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 76a59a55580e593d9ddc71241b759a630e0afead Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 15:44:01 -0700
Subject: [PATCH 101/449] Bump mina-sshd-api.version from
 2.12.1-101.v85b_e08b_780dd to 2.12.1-113.v4d3ea_5eb_7f72 (#9349)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 5 +++++
 war/pom.xml  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 777505cf0fed..79d7d0e4a94c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -95,6 +95,11 @@ THE SOFTWARE.
         <artifactId>ant</artifactId>
         <version>497.v94e7d9fffa_b_9</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>bouncycastle-api</artifactId>
+        <version>2.30.1.78.1-233.vfdcdeb_0a_08a_a_</version>
+      </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps via mailer and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 3131e0c7e567..1dcf62b427f1 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -46,7 +46,7 @@ THE SOFTWARE.
     <host>localhost</host>
     <!-- HTTP listener port -->
     <port>8080</port>
-    <mina-sshd-api.version>2.12.1-101.v85b_e08b_780dd</mina-sshd-api.version>
+    <mina-sshd-api.version>2.12.1-113.v4d3ea_5eb_7f72</mina-sshd-api.version>
     <node.version>20.14.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>

From 7aad67832442b8cd1dfaf363a3630d2687ddf3e3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 15:44:46 -0700
Subject: [PATCH 102/449] Update dependency prettier to v3.3.0 (#9350)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 995851996559..af7fe3c45764 100644
--- a/war/package.json
+++ b/war/package.json
@@ -41,7 +41,7 @@
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
-    "prettier": "3.2.5",
+    "prettier": "3.3.0",
     "sass": "1.77.4",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index d8fff0ede5d3..7b8a9273e492 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4409,7 +4409,7 @@ __metadata:
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
-    prettier: "npm:3.2.5"
+    prettier: "npm:3.3.0"
     sass: "npm:1.77.4"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
@@ -6102,12 +6102,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:3.2.5":
-  version: 3.2.5
-  resolution: "prettier@npm:3.2.5"
+"prettier@npm:3.3.0":
+  version: 3.3.0
+  resolution: "prettier@npm:3.3.0"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/ea327f37a7d46f2324a34ad35292af2ad4c4c3c3355da07313339d7e554320f66f65f91e856add8530157a733c6c4a897dc41b577056be5c24c40f739f5ee8c6
+  checksum: 10c0/d033c356320aa2e468bf29c931b094ac730d2f4defd5eb2989d8589313dec901d2fc866e3788f3d161e420b142ea4ec3dda535dbe0169ef4d0026397a68ba9cf
   languageName: node
   linkType: hard
 

From 8088382929a16aad6b713c0b92f0eace9c9e76fa Mon Sep 17 00:00:00 2001
From: Dmitry Platonov <47667812+Pldi23@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:20:27 +0300
Subject: [PATCH 103/449] [JENKINS-72854] fix the enum jelly to take
 readOnlyMode into account (#9336)

---
 core/src/main/resources/lib/form/enum.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/form/enum.jelly b/core/src/main/resources/lib/form/enum.jelly
index a1bca499ba86..7cbfeb189195 100644
--- a/core/src/main/resources/lib/form/enum.jelly
+++ b/core/src/main/resources/lib/form/enum.jelly
@@ -41,7 +41,7 @@ THE SOFTWARE.
     <j:set target="${attrs}" property="field" value="${entry.field}" />
   </j:if>
   <div class="jenkins-select">
-    <select class="jenkins-select__input" name="${attrs.field}">
+    <select disabled="${readOnlyMode ? 'true' : null}" class="jenkins-select__input" name="${attrs.field}">
       <j:forEach var="it" items="${descriptor.getPropertyType(instance,attrs.field).getEnumConstants()}">
         <f:option value="${it.name()}" selected="${instance[attrs.field]!=null ? it==instance[attrs.field] : it.name()==attrs.default}">
           <d:invokeBody />

From 5978ebe594585ea6ebff22d0e34f3b2ada70f898 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Thu, 6 Jun 2024 14:20:38 +0200
Subject: [PATCH 104/449] [JENKINS-73243] quote replacement string in symbol
 tooltips (#9347)

---
 .../main/java/org/jenkins/ui/symbol/Symbol.java |  7 ++++---
 .../jenkins/ui/symbol/SymbolJenkinsTest.java    | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/jenkins/ui/symbol/Symbol.java b/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
index 9a07556d7c71..52c7faee0249 100644
--- a/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
+++ b/core/src/main/java/org/jenkins/ui/symbol/Symbol.java
@@ -14,6 +14,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -72,13 +73,13 @@ public static String get(@NonNull SymbolRequest request) {
                 .computeIfAbsent(identifier, key -> new ConcurrentHashMap<>())
                 .computeIfAbsent(name, key -> loadSymbol(identifier, key));
         if ((tooltip != null && !tooltip.isBlank()) && (htmlTooltip == null || htmlTooltip.isBlank())) {
-            symbol = symbol.replaceAll("<svg", "<svg tooltip=\"" + Functions.htmlAttributeEscape(tooltip) + "\"");
+            symbol = symbol.replaceAll("<svg", Matcher.quoteReplacement("<svg tooltip=\"" + Functions.htmlAttributeEscape(tooltip) + "\""));
         }
         if (htmlTooltip != null && !htmlTooltip.isBlank()) {
-            symbol = symbol.replaceAll("<svg", "<svg data-html-tooltip=\"" + Functions.htmlAttributeEscape(htmlTooltip) + "\"");
+            symbol = symbol.replaceAll("<svg", Matcher.quoteReplacement("<svg data-html-tooltip=\"" + Functions.htmlAttributeEscape(htmlTooltip) + "\""));
         }
         if (id != null && !id.isBlank()) {
-            symbol = symbol.replaceAll("<svg", "<svg id=\"" + Functions.htmlAttributeEscape(id) + "\"");
+            symbol = symbol.replaceAll("<svg", Matcher.quoteReplacement("<svg id=\"" + Functions.htmlAttributeEscape(id) + "\""));
         }
         if (classes != null && !classes.isBlank()) {
             symbol = symbol.replaceAll("<svg", "<svg class=\"" + Functions.htmlAttributeEscape(classes) + "\"");
diff --git a/test/src/test/java/org/jenkins/ui/symbol/SymbolJenkinsTest.java b/test/src/test/java/org/jenkins/ui/symbol/SymbolJenkinsTest.java
index 1609e5ff0e3c..49aaa9cd4f52 100644
--- a/test/src/test/java/org/jenkins/ui/symbol/SymbolJenkinsTest.java
+++ b/test/src/test/java/org/jenkins/ui/symbol/SymbolJenkinsTest.java
@@ -7,6 +7,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.jupiter.api.DisplayName;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.RealJenkinsRule;
 
@@ -15,6 +16,22 @@ public class SymbolJenkinsTest {
     public RealJenkinsRule rjr = new RealJenkinsRule()
             .addPlugins("plugins/design-library.jpi", "plugins/prism-api.jpi", "plugins/bootstrap5-api.jpi");
 
+    @Test
+    @Issue("JENKINS-73243")
+    @DisplayName("When resolving a symbol where the tooltip contains '$' no error is thrown")
+    public void dollarInToolTipSucceeds() throws Throwable {
+        rjr.then(SymbolJenkinsTest::_dollarInTooltipSucceeds);
+    }
+
+    private static void _dollarInTooltipSucceeds(JenkinsRule j) {
+        String symbol = Symbol.get(new SymbolRequest.Builder()
+                .withName("add")
+                .withTooltip("$test")
+                .build()
+        );
+        assertThat(symbol, containsString("tooltip=\"$test\""));
+    }
+
     @Test
     @DisplayName("When resolving a symbol from a missing plugin, the placeholder is generated instead")
     public void missingSymbolFromPluginDefaultsToPlaceholder() throws Throwable {

From 9a30fa3d0086b70194938d48dc3fa5fdfb95a7cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 13:05:08 -0700
Subject: [PATCH 105/449] Bump org.jenkins-ci.modules:sshd from
 3.322.v159e91f6a_550 to 3.328.v659088899699 (#9351)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml                                               | 2 +-
 test/src/test/java/hudson/slaves/JNLPLauncherRealTest.java | 5 +++--
 war/pom.xml                                                | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 79d7d0e4a94c..8589922bbb17 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,7 +147,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2211.v29b_b_b_2e79c5a_</version>
+      <version>2216.v8f497401120d</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/test/src/test/java/hudson/slaves/JNLPLauncherRealTest.java b/test/src/test/java/hudson/slaves/JNLPLauncherRealTest.java
index 544e8383de8c..557231f5d140 100644
--- a/test/src/test/java/hudson/slaves/JNLPLauncherRealTest.java
+++ b/test/src/test/java/hudson/slaves/JNLPLauncherRealTest.java
@@ -49,13 +49,14 @@ public class JNLPLauncherRealTest {
 
     private static final String STATIC_AGENT_NAME = "static";
 
-    @Rule public RealJenkinsRule rr = new RealJenkinsRule().includeTestClasspathPlugins(false).withColor(PrefixedOutputStream.Color.BLUE);
+    @Rule public RealJenkinsRule rr = new RealJenkinsRule().withColor(PrefixedOutputStream.Color.BLUE);
 
     @Rule public InboundAgentRule iar = new InboundAgentRule();
 
     @Issue("JEP-230")
     @Test public void smokes() throws Throwable {
-        /* Since RealJenkinsRuleInit.jpi will load detached plugins, to reproduce a failure use:
+        /* Since RealJenkinsRuleInit.jpi will load detached and test scope plugins, to reproduce a failure use:
+        rr.includeTestClasspathPlugins(false);
         FileUtils.touch(new File(rr.getHome(), "plugins/instance-identity.jpi.disabled"));
         */
         then(false);
diff --git a/war/pom.xml b/war/pom.xml
index 1dcf62b427f1..6033d6bb65b6 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -399,7 +399,7 @@ THE SOFTWARE.
                   <!-- detached after 2.281 -->
                   <groupId>org.jenkins-ci.modules</groupId>
                   <artifactId>sshd</artifactId>
-                  <version>3.322.v159e91f6a_550</version>
+                  <version>3.328.v659088899699</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From f8e55c78f8b89678131450d302e31c4f7805eac4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 13:06:26 -0700
Subject: [PATCH 106/449] Bump io.jenkins.plugins:commons-lang3-api from
 3.13.0-62.v7d18e55f51e2 to 3.14.0-76.vda_5591261cfe (#9356)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 8589922bbb17..3c08eb52595a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -61,7 +61,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>commons-lang3-api</artifactId>
-        <version>3.13.0-62.v7d18e55f51e2</version>
+        <version>3.14.0-76.vda_5591261cfe</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps between checks-api, plugin-util-api, and font-awesome-api -->
diff --git a/war/pom.xml b/war/pom.xml
index 6033d6bb65b6..ac9236316ea3 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -448,7 +448,7 @@ THE SOFTWARE.
                   <!-- dependency of bootstrap5-api, checks-api, commons-text-api, echarts-api, font-awesome-api, jquery3-api, and plugin-util-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>commons-lang3-api</artifactId>
-                  <version>3.13.0-62.v7d18e55f51e2</version>
+                  <version>3.14.0-76.vda_5591261cfe</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From a6665f89eba300b00c8539f4f6b23eb6c1c5f425 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 8 Jun 2024 09:28:31 +0200
Subject: [PATCH 107/449] Update dependency lit to v3.1.4 (#9360)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 core/src/site/site.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/site/site.xml b/core/src/site/site.xml
index b7a552afc266..9f5eb7448565 100644
--- a/core/src/site/site.xml
+++ b/core/src/site/site.xml
@@ -6,7 +6,7 @@
         </breadcrumbs>
         <head>
             <![CDATA[
-                <script src="https://cdn.jsdelivr.net/npm/lit@3.1.3/polyfill-support.js"></script>
+                <script src="https://cdn.jsdelivr.net/npm/lit@3.1.4/polyfill-support.js"></script>
                 <script src="https://cdn.jsdelivr.net/npm/@webcomponents/webcomponentsjs@2.8.0/webcomponents-loader.js"></script>
                 <script data="jio" src="https://cdn.jsdelivr.net/npm/@jenkinsci/jenkins-io-components/+esm" type="module"></script>
                 <script data="jio" nomodule="" src="https://cdn.jsdelivr.net/npm/@jenkinsci/jenkins-io-components"></script>

From c6ceb1051d89e962d973c1c9d6570b50c4831038 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 8 Jun 2024 16:07:19 +0100
Subject: [PATCH 108/449] Update dependency prettier to v3.3.1 (#9363)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index af7fe3c45764..9a235d0507a1 100644
--- a/war/package.json
+++ b/war/package.json
@@ -41,7 +41,7 @@
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
-    "prettier": "3.3.0",
+    "prettier": "3.3.1",
     "sass": "1.77.4",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 7b8a9273e492..e9bd73fcded2 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4409,7 +4409,7 @@ __metadata:
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
-    prettier: "npm:3.3.0"
+    prettier: "npm:3.3.1"
     sass: "npm:1.77.4"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
@@ -6102,12 +6102,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:3.3.0":
-  version: 3.3.0
-  resolution: "prettier@npm:3.3.0"
+"prettier@npm:3.3.1":
+  version: 3.3.1
+  resolution: "prettier@npm:3.3.1"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/d033c356320aa2e468bf29c931b094ac730d2f4defd5eb2989d8589313dec901d2fc866e3788f3d161e420b142ea4ec3dda535dbe0169ef4d0026397a68ba9cf
+  checksum: 10c0/c25a709c9f0be670dc6bcb190b622347e1dbeb6c3e7df8b0711724cb64d8647c60b839937a4df4df18e9cfb556c2b08ca9d24d9645eb5488a7fc032a2c4d5cb3
   languageName: node
   linkType: hard
 

From 14dad30b9df2d27e58e13a8c274781cdea03465f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 8 Jun 2024 22:13:47 +0200
Subject: [PATCH 109/449] Update babel monorepo to v7.24.7 (#9364)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |    6 +-
 war/yarn.lock    | 1150 +++++++++++++++++++++++-----------------------
 2 files changed, 582 insertions(+), 574 deletions(-)

diff --git a/war/package.json b/war/package.json
index 9a235d0507a1..17ad3cb8a77d 100644
--- a/war/package.json
+++ b/war/package.json
@@ -23,9 +23,9 @@
     "lint": "yarn lint:js && yarn lint:css"
   },
   "devDependencies": {
-    "@babel/cli": "7.24.6",
-    "@babel/core": "7.24.6",
-    "@babel/preset-env": "7.24.6",
+    "@babel/cli": "7.24.7",
+    "@babel/core": "7.24.7",
+    "@babel/preset-env": "7.24.7",
     "@eslint/js": "9.4.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index e9bd73fcded2..d6346436f919 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -22,9 +22,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/cli@npm:7.24.6":
-  version: 7.24.6
-  resolution: "@babel/cli@npm:7.24.6"
+"@babel/cli@npm:7.24.7":
+  version: 7.24.7
+  resolution: "@babel/cli@npm:7.24.7"
   dependencies:
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     "@nicolo-ribaudo/chokidar-2": "npm:2.1.8-no-fsevents.3"
@@ -45,122 +45,123 @@ __metadata:
   bin:
     babel: ./bin/babel.js
     babel-external-helpers: ./bin/babel-external-helpers.js
-  checksum: 10c0/0abf37d0987cab589098fbdb2894f7486d2d430e99803dc2c9bf655a74d2cef73a0d62f9385142183469a6ed3c847355746da22de1abfe5ec32dad17bad1b1c1
+  checksum: 10c0/0d29ffa7c817c70cf39243567a17e9e60b1f9632632f2a0f3aef061e28c228146fd98d262e09173f34e963dc7e8c29fb3e535243ffed641980691a0e4386b189
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/code-frame@npm:7.24.6"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/code-frame@npm:7.24.7"
   dependencies:
-    "@babel/highlight": "npm:^7.24.6"
+    "@babel/highlight": "npm:^7.24.7"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/c93c6d1763530f415218c31d07359364397f19b70026abdff766164c21ed352a931cf07f3102c5fb9e04792de319e332d68bcb1f7debef601a02197f90f9ba24
+  checksum: 10c0/ab0af539473a9f5aeaac7047e377cb4f4edd255a81d84a76058595f8540784cc3fbe8acf73f1e073981104562490aabfb23008cd66dc677a456a4ed5390fdde6
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/compat-data@npm:7.24.6"
-  checksum: 10c0/f50abbd4008eb2a5d12139c578809cebbeaeb8e660fb12d546eb2e7c2108ae1836ab8339184a5f5ce0e95bf81bb91e18edce86b387c59db937b01693ec0bc774
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/compat-data@npm:7.24.7"
+  checksum: 10c0/dcd93a5632b04536498fbe2be5af1057f635fd7f7090483d8e797878559037e5130b26862ceb359acbae93ed27e076d395ddb4663db6b28a665756ffd02d324f
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.24.6":
-  version: 7.24.6
-  resolution: "@babel/core@npm:7.24.6"
+"@babel/core@npm:7.24.7":
+  version: 7.24.7
+  resolution: "@babel/core@npm:7.24.7"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
-    "@babel/code-frame": "npm:^7.24.6"
-    "@babel/generator": "npm:^7.24.6"
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helpers": "npm:^7.24.6"
-    "@babel/parser": "npm:^7.24.6"
-    "@babel/template": "npm:^7.24.6"
-    "@babel/traverse": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helpers": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/e0762a8daef7f417494d555929418cfacd6848c7fc3310ec00e6dd8cecac20b7f590e760bfc9365d2af07874a3f5599832f9c9ff7f1a9d126a168f77ba67945a
+  checksum: 10c0/4004ba454d3c20a46ea66264e06c15b82e9f6bdc35f88819907d24620da70dbf896abac1cb4cc4b6bb8642969e45f4d808497c9054a1388a386cf8c12e9b9e0d
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/generator@npm:7.24.6"
+"@babel/generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/generator@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
+    "@babel/types": "npm:^7.24.7"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/8d71a17b386536582354afba53cc784396458a88cc9f05f0c6de0ec99475f6f539943b3566b2e733820c4928236952473831765e483c25d68cc007a6e604d782
+  checksum: 10c0/06b1f3350baf527a3309e50ffd7065f7aee04dd06e1e7db794ddfde7fe9d81f28df64edd587173f8f9295496a7ddb74b9a185d4bf4de7bb619e6d4ec45c8fd35
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-annotate-as-pure@npm:7.24.6"
+"@babel/helper-annotate-as-pure@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-annotate-as-pure@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/3fe446e3bd37e5e32152279c84ace4e83815e5b88b9e09a82a83974a0bb22e941d89db26b23aaab4c9eb0f9713772c2f6163feffc1bcb055c4cdb6b67e5dc82f
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/4679f7df4dffd5b3e26083ae65228116c3da34c3fff2c11ae11b259a61baec440f51e30fd236f7a0435b9d471acd93d0bc5a95df8213cbf02b1e083503d81b9a
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.6"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/d468ba492163bdcf5b6c53248edcf0aaed6194c0f7bdebef4f29ef626e5b03e9fcc7ed737445eb80a961ec6e687c330e1c5242d8a724efb0af002141f3b3e66c
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/0ed84abf848c79fb1cd4c1ddac12c771d32c1904d87fc3087f33cfdeb0c2e0db4e7892b74b407d9d8d0c000044f3645a7391a781f788da8410c290bb123a1f13
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-compilation-targets@npm:7.24.6"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-compilation-targets@npm:7.24.7"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.6"
-    "@babel/helper-validator-option": "npm:^7.24.6"
+    "@babel/compat-data": "npm:^7.24.7"
+    "@babel/helper-validator-option": "npm:^7.24.7"
     browserslist: "npm:^4.22.2"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/4d41150086959f5f4d72d27bae29204192e943537ecb71df1711d1f5d8791358a44f3a5882ed3c8238ba0c874b0b55213af43767e14771765f13b8d15b262432
+  checksum: 10c0/1d580a9bcacefe65e6bf02ba1dafd7ab278269fef45b5e281d8354d95c53031e019890464e7f9351898c01502dd2e633184eb0bcda49ed2ecd538675ce310f51
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.6"
+"@babel/helper-create-class-features-plugin@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.6"
-    "@babel/helper-optimise-call-expression": "npm:^7.24.6"
-    "@babel/helper-replace-supers": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
-    "@babel/helper-split-export-declaration": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/e6734671bc6a5f3cca4ec46e4cc70238e5a2fa063e51225c2be572f157119002af419b33ea0f846dbb1307370fe9f3aa92d199449abbea5e88e0262513c8a821
+  checksum: 10c0/6b7b47d70b41c00f39f86790cff67acf2bce0289d52a7c182b28e797f4e0e6d69027e3d06eccf1d54dddc2e5dde1df663bb1932437e5f447aeb8635d8d64a6ab
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.6"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
     regexpu-core: "npm:^5.3.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/c6e1b07c94b3b93a3f534039da88bc67ec3156080f1959aa07d5d534e9a640de3533e7ded0516dfcbccde955e91687044e6a950852b1d3f402ac5d5001be56cf
+  checksum: 10c0/ed611a7eb0c71843f9cdc471eeb38767972229f9225f7aaa90d124d7ee0062cf6908fd53ee9c34f731394c429594f06049a7738a71d342e0191d4047b2fc0ac2
   languageName: node
   linkType: hard
 
@@ -179,242 +180,249 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-environment-visitor@npm:7.24.6"
-  checksum: 10c0/fdcd18ac505ed71f40c05cc992b648a4495b0aa5310a774492a0f74d8dcf3579691102f516561a651d3de6c3a44fe64bfb3049d11c14c5857634ef1823ea409a
+"@babel/helper-environment-visitor@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
+  dependencies:
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/36ece78882b5960e2d26abf13cf15ff5689bf7c325b10a2895a74a499e712de0d305f8d78bb382dd3c05cfba7e47ec98fe28aab5674243e0625cd38438dd0b2d
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-function-name@npm:7.24.6"
+"@babel/helper-function-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-function-name@npm:7.24.7"
   dependencies:
-    "@babel/template": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/5ba2f8db789b3f5a2b2239300a217aa212e303cd7bfad9c8b90563807f49215e8c679e8f8f177b6aaca2038038e29bc702b83839e1f7b4896d79c44a75cac97a
+    "@babel/template": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/e5e41e6cf86bd0f8bf272cbb6e7c5ee0f3e9660414174435a46653efba4f2479ce03ce04abff2aa2ef9359cf057c79c06cb7b134a565ad9c0e8a50dcdc3b43c4
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-hoist-variables@npm:7.24.6"
+"@babel/helper-hoist-variables@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/e10ec6b864aaa419ec4934f5fcb5d0cfcc9d0657584a1b6c3c42ada949d44ca6bffcdab433a90ada4396c747e551cca31ba0e565ea005ab3f50964e3817bf6cf
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/19ee37563bbd1219f9d98991ad0e9abef77803ee5945fd85aa7aa62a67c69efca9a801696a1b58dda27f211e878b3327789e6fd2a6f6c725ccefe36774b5ce95
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.6"
+"@babel/helper-member-expression-to-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/7595f62978f55921b24de6ed5252fcedbffacfb8271f71e092f38724179ba554cb3a24a4764a1a3890b8a53504c2bee9c99eab81f1f365582739f566c8e28eaa
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/9638c1d33cf6aba028461ccd3db6061c76ff863ca0d5013dd9a088bf841f2f77c46956493f9da18355c16759449d23b74cc1de4da357ade5c5c34c858f840f0a
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-module-imports@npm:7.24.6"
+"@babel/helper-module-imports@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-module-imports@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/e0db3fbfcd963d138f0792ff626f940a576fcf212d02b8fe6478dccf3421bd1c2a76f8e69c7450c049985e7b63b30be309a24eeeb6ad7c2137a31b676a095a84
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/97c57db6c3eeaea31564286e328a9fb52b0313c5cfcc7eee4bc226aebcf0418ea5b6fe78673c0e4a774512ec6c86e309d0f326e99d2b37bfc16a25a032498af0
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-module-transforms@npm:7.24.6"
+"@babel/helper-module-transforms@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-module-transforms@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-module-imports": "npm:^7.24.6"
-    "@babel/helper-simple-access": "npm:^7.24.6"
-    "@babel/helper-split-export-declaration": "npm:^7.24.6"
-    "@babel/helper-validator-identifier": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-module-imports": "npm:^7.24.7"
+    "@babel/helper-simple-access": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/9e2e3d0ddb397b36b9e8c7d94e175a36be8cb888ef370cefef2cdfd53ae1f87d567b268bd90ed9a6c706485a8de3da19cac577657613e9cd17210b91cbdfb00b
+  checksum: 10c0/4f311755fcc3b4cbdb689386309cdb349cf0575a938f0b9ab5d678e1a81bbb265aa34ad93174838245f2ac7ff6d5ddbd0104638a75e4e961958ed514355687b6
   languageName: node
   linkType: hard
 
-"@babel/helper-optimise-call-expression@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-optimise-call-expression@npm:7.24.6"
+"@babel/helper-optimise-call-expression@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-optimise-call-expression@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/7fce2c4ce22c4ba3c2178d1ce85f34fc9bbe286af5ec153b4b6ea9bf2212390359c4a1e8a54551c4daa4688022d619668bdb8c8060cb185c0c9ad02c5247efc9
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/ca6a9884705dea5c95a8b3ce132d1e3f2ae951ff74987d400d1d9c215dae9c0f9e29924d8f8e131e116533d182675bc261927be72f6a9a2968eaeeaa51eb1d0f
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.6, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.6
-  resolution: "@babel/helper-plugin-utils@npm:7.24.6"
-  checksum: 10c0/636d3ce8cabc0621c1f78187e1d95f1087209921fa452f76aad06224ef5dffb3d934946f5183109920f32a4b94dd75ac91c63bc52813fee639d10cd54d49ba1f
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.7
+  resolution: "@babel/helper-plugin-utils@npm:7.24.7"
+  checksum: 10c0/c3d38cd9b3520757bb4a279255cc3f956fc0ac1c193964bd0816ebd5c86e30710be8e35252227e0c9d9e0f4f56d9b5f916537f2bc588084b0988b4787a967d31
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.6"
+"@babel/helper-remap-async-to-generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-wrap-function": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-wrap-function": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b379b844eba352ac9487d31867e7bb2b8a264057f1739d9161b614145ea6e60969a7a82e75e5e83089e50cf1b6559f53aa085a787942bf40706fee15a2faa33c
+  checksum: 10c0/4e7fa2cdcbc488e41c27066c16e562857ef3c5c2bfe70d2f1e32e9ee7546b17c3fc1c20d05bf2a7f1c291bd9e7a0a219f6a9fa387209013294be79a26fcfe64d
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-replace-supers@npm:7.24.6"
+"@babel/helper-replace-supers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-replace-supers@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.6"
-    "@babel/helper-optimise-call-expression": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-optimise-call-expression": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/aaf2dfaf25360da1525ecea5979d5afed201b96f0feeed2e15f90883a97776132a720b25039e67fee10a5c537363aea5cc2a46c0f1d13fdb86d0e920244f2da7
+  checksum: 10c0/0e133bb03371dee78e519c334a09c08e1493103a239d9628db0132dfaac3fc16380479ca3c590d278a9b71b624030a338c18ebbfe6d430ebb2e4653775c4b3e3
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-simple-access@npm:7.24.6"
+"@babel/helper-simple-access@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-simple-access@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/b17e404dd6c9787fc7d558aea5222471a77e29596705f0d10b4c2a58b9d71ff7eae915094204848cc1af99b771553caa69337a768b9abdd82b54a0050ba83eb9
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/7230e419d59a85f93153415100a5faff23c133d7442c19e0cd070da1784d13cd29096ee6c5a5761065c44e8164f9f80e3a518c41a0256df39e38f7ad6744fed7
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.6"
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/6928f698362d6082a67ee2bc73991ef6b0cc6b5f2854177389bc8f3c09296580f0ee20134dd1a29dfcb1906ad9e346fa0f7c6fcd7589ab3ff176d4f09504577f
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/e3a9b8ac9c262ac976a1bcb5fe59694db5e6f0b4f9e7bdba5c7693b8b5e28113c23bdaa60fe8d3ec32a337091b67720b2053bcb3d5655f5406536c3d0584242b
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.24.6"
+"@babel/helper-split-export-declaration@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
   dependencies:
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/53a5dd8691fdffc89cc7fcf5aed0ad1d8bc39796a5782a3d170dcbf249eb5c15cc8a290e8d09615711d18798ad04a7d0694ab5195d35fa651abbc1b9c885d6a8
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/0254577d7086bf09b01bbde98f731d4fcf4b7c3fa9634fdb87929801307c1f6202a1352e3faa5492450fa8da4420542d44de604daf540704ff349594a78184f6
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-string-parser@npm:7.24.6"
-  checksum: 10c0/95115bf676e92c4e99166395649108d97447e6cabef1fabaec8cdbc53a43f27b5df2268ff6534439d405bc1bd06685b163eb3b470455bd49f69159dada414145
+"@babel/helper-string-parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-string-parser@npm:7.24.7"
+  checksum: 10c0/47840c7004e735f3dc93939c77b099bb41a64bf3dda0cae62f60e6f74a5ff80b63e9b7cf77b5ec25a324516381fc994e1f62f922533236a8e3a6af57decb5e1e
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-validator-identifier@npm:7.24.6"
-  checksum: 10c0/d29d2e3fca66c31867a009014169b93f7bc21c8fc1dd7d0b9d85d7a4000670526ff2222d966febb75a6e12f9859a31d1e75b558984e28ecb69651314dd0a6fd1
+"@babel/helper-validator-identifier@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
+  checksum: 10c0/87ad608694c9477814093ed5b5c080c2e06d44cb1924ae8320474a74415241223cc2a725eea2640dd783ff1e3390e5f95eede978bc540e870053152e58f1d651
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-validator-option@npm:7.24.6"
-  checksum: 10c0/787268dff5cf77f3b704454b96ab7b58aa4f43b2808247e51859a103a1c28a9c252100f830433f4b37a73f4a61ba745bbeef4cdccbab48c1e9adf037f4ca3491
+"@babel/helper-validator-option@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-option@npm:7.24.7"
+  checksum: 10c0/21aea2b7bc5cc8ddfb828741d5c8116a84cbc35b4a3184ec53124f08e09746f1f67a6f9217850188995ca86059a7942e36d8965a6730784901def777b7e8a436
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helper-wrap-function@npm:7.24.6"
+"@babel/helper-wrap-function@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-wrap-function@npm:7.24.7"
   dependencies:
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/template": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/d32844275a544a8e7c71c13e9832d34d80656aafce659dc6c23b02e14d1c1179d8045125ded5096da1a99de83299ffb48211183d0403da2c8584ed55dc0ab646
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/d5689f031bf0eb38c0d7fad6b7e320ddef4bfbdf08d12d7d76ef41b7ca365a32721e74cb5ed5a9a9ec634bc20f9b7a27314fa6fb08f1576b8f6d8330fcea6f47
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/helpers@npm:7.24.6"
+"@babel/helpers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helpers@npm:7.24.7"
   dependencies:
-    "@babel/template": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/e5b5c0919fd6fa56ae11c15a72962d8de0ac19db524849554af28cf08ac32f9ae5aee49a43146eb150f54418cefb8e890fa2b2f33d029434dc7777dbcdfd5bac
+    "@babel/template": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/aa8e230f6668773e17e141dbcab63e935c514b4b0bf1fed04d2eaefda17df68e16b61a56573f7f1d4d1e605ce6cc162b5f7e9fdf159fde1fd9b77c920ae47d27
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/highlight@npm:7.24.6"
+"@babel/highlight@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/highlight@npm:7.24.7"
   dependencies:
-    "@babel/helper-validator-identifier": "npm:^7.24.6"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
     chalk: "npm:^2.4.2"
     js-tokens: "npm:^4.0.0"
     picocolors: "npm:^1.0.0"
-  checksum: 10c0/5bbc31695e5d44e97feb267f7aaf4c52908560d184ffeb2e2e57aae058d40125592931883889413e19def3326895ddb41ff45e090fa90b459d8c294b4ffc238c
+  checksum: 10c0/674334c571d2bb9d1c89bdd87566383f59231e16bcdcf5bb7835babdf03c9ae585ca0887a7b25bdf78f303984af028df52831c7989fecebb5101cc132da9393a
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/parser@npm:7.24.6"
+"@babel/parser@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/parser@npm:7.24.7"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/cbef70923078a20fe163b03f4a6482be65ed99d409a57f3091a23ce3a575ee75716c30e7ea9f40b692ac5660f34055f4cbeb66a354fad15a6cf1fca35c3496c5
+  checksum: 10c0/8b244756872185a1c6f14b979b3535e682ff08cb5a2a5fd97cc36c017c7ef431ba76439e95e419d43000c5b07720495b00cf29a7f0d9a483643d08802b58819b
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.6"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/0dbf12de5a7e5d092271124f0d9bff1ceb94871d5563041940512671cd40ab2a93d613715ee37076cd8263cf49579afb805faa3189996c11639bb10d3e9837f1
+  checksum: 10c0/394c30e2b708ad385fa1219528e039066a1f1cb40f47986f283878848fd354c745e6397f588b4e5a046ee8d64bfdf4c208e4c3dfbdcfb2fd34315ec67c64e7af
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.6"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b0a03d4f587e1fa92312c912864a0af3f68bfc87367b7c93770e94f171767d563d7adfca7ad571d20cd755e89e1373e7414973ce30e694e7b6eb8f57d2b1b889
+  checksum: 10c0/a36307428ecc1a01b00cf90812335eed1575d13f211ab24fe4d0c55c28a2fcbd4135f142efabc3b277b2a8e09ee05df594a1272353f061b63829495b5dcfdb96
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.6"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: 10c0/fdd40fdf7e87f3dbc5396c9a8f92005798865f6f20d2c24c33246ac43aab8df93742b63dfcfcda67c0a5cf1f7b8a987fdbccaceb9ccbb9a67bef10012b522390
+  checksum: 10c0/aeb6e7aa363a47f815cf956ea1053c5dd8b786a17799f065c9688ba4b0051fe7565d258bbe9400bfcbfb3114cb9fda66983e10afe4d750bc70ff75403e15dd36
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.6"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/cc1e8ee138c71e78ec262a5198d2cf75c305f2fb4ea9771ebd4ded47f51bc1bacbf917db3cb28c681e7499a07f9803ab0bbe5ad50b9576cbe03902189e3871ed
+  checksum: 10c0/2b52a73e444f6adc73f927b623e53a4cf64397170dd1071268536df1b3db1e02131418c8dc91351af48837a6298212118f4a72d5407f8005cf9a732370a315b0
   languageName: node
   linkType: hard
 
@@ -482,25 +490,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.6"
+"@babel/plugin-syntax-import-assertions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8e81c7cd3d5812a3dda32f06f84492a1b5640f42c594619ed57bf4017529889f87bfb4e8e95c50ba1527d89501dae71a0c73770502676545c2cd9ce58ce3258d
+  checksum: 10c0/b82c53e095274ee71c248551352d73441cf65b3b3fc0107258ba4e9aef7090772a425442b3ed1c396fa207d0efafde8929c87a17d3c885b3ca2021316e87e246
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.6"
+"@babel/plugin-syntax-import-attributes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c4d8554b89c0daa6d3c430582b98c10a3af2de8eab484082e97cb73f2712780ab6dd8d11d783c4b266efef76f4479abf4944ef8f416a4459b05eecaf438f8774
+  checksum: 10c0/eccc54d0f03c96d0eec7a6e2fa124dadbc7298345b62ffc4238f173308c4325b5598f139695ff05a95cf78412ef6903599e4b814496612bf39aad4715a16375b
   languageName: node
   linkType: hard
 
@@ -626,605 +634,605 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.6"
+"@babel/plugin-transform-arrow-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/46250eb3f535327825db323740a301b76b882b70979f1fb5f89cbb1a820378ab68ee880b912981dd5276dd116deaaee0f4a2a95f1c9cf537a67749fd4209a2d3
+  checksum: 10c0/6ac05a54e5582f34ac6d5dc26499e227227ec1c7fa6fc8de1f3d40c275f140d3907f79bbbd49304da2d7008a5ecafb219d0b71d78ee3290ca22020d878041245
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.6"
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-remap-async-to-generator": "npm:^7.24.6"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8876431855220ccfbf1ae510a4a7c4e0377b21189d3f73ea6dde5ffd31eee57f03ea2b2d1da59b6a36b6e107e41b38d0c1d1bb015e0d1c2c2fb627962260edb7
+  checksum: 10c0/6b5e33ae66dce0afce9b06d8dace6fa052528e60f7622aa6cfd3e71bd372ca5079d426e78336ca564bc0d5f37acbcda1b21f4fe656fcb642f1a93a697ab39742
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.6"
+"@babel/plugin-transform-async-to-generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-remap-async-to-generator": "npm:^7.24.6"
+    "@babel/helper-module-imports": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/52c137668e7a35356c3b1caf25ab3bf90ff61199885bfd9f0232bfe168a53a5cf0ca4c1e283c27e44ad76cc366b73e4ff7042241469d1944c7042fb78c57bfd8
+  checksum: 10c0/83c82e243898875af8457972a26ab29baf8a2078768ee9f35141eb3edff0f84b165582a2ff73e90a9e08f5922bf813dbf15a85c1213654385198f4591c0dc45d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.6"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0c761b5e3a2959b63edf47d67f6752e01f24777ad1accd82457a2dca059877f8a8297fbc7a062db6b48836309932f2ac645c507070ef6ad4e765b3600822c048
+  checksum: 10c0/113e86de4612ae91773ff5cb6b980f01e1da7e26ae6f6012127415d7ae144e74987bc23feb97f63ba4bc699331490ddea36eac004d76a20d5369e4cc6a7f61cd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.6"
+"@babel/plugin-transform-block-scoping@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/95c25e501c4553515f92d4e86032a8859a8855cea8aafb6df30f956979caa70af1e126e6dfaf9e51328d1306232ff1e081bda7d84a9aaf23f418d9da120c7018
+  checksum: 10c0/dcbc5e385c0ca5fb5736b1c720c90755cffe9f91d8c854f82e61e59217dd3f6c91b3633eeee4b55a89d3f59e5275d0f5b0b1b1363d4fa70c49c468b55aa87700
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-class-properties@npm:7.24.6"
+"@babel/plugin-transform-class-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/ae01e00dd528112d542a77f0f1cf6b43726553d2011bbdec9e4fac441dfa161d44bf14449dc4121b45cc971686a8c652652032594e83c5d6cab8e9fd794eecb2
+  checksum: 10c0/75018a466c7ede3d2397e158891c224ba7fca72864506ce067ddbc02fc65191d44da4d6379c996d0c7f09019e26b5c3f5f1d3a639cd98366519723886f0689d0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.6"
+"@babel/plugin-transform-class-static-block@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 10c0/425f237faf62b531d973f23ac3eefe3f29c4f6c988c33c2dd660b6dfb61d4ed1e865a5088574742d87ed02437d26aa6ec6b107468b7df35ca9d3082bad742d8f
+  checksum: 10c0/b0ade39a3d09dce886f79dbd5907c3d99b48167eddb6b9bbde24a0598129654d7017e611c20494cdbea48b07ac14397cd97ea34e3754bbb2abae4e698128eccb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-classes@npm:7.24.6"
+"@babel/plugin-transform-classes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-classes@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-replace-supers": "npm:^7.24.6"
-    "@babel/helper-split-export-declaration": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d29c26feea9ad5a64d790aeab1833b7a50d6af2be24140dad7e06510b754b8fe0ffb292d43d96fedaf7765fcb90c0034ac7c42635f814d9235697431076a1cf0
+  checksum: 10c0/e51dba7ce8b770d1eee929e098d5a3be3efc3e8b941e22dda7d0097dc4e7be5feabd2da7b707ac06fcac5661b31223c541941dec08ce76c1faa55544d87d06ec
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.6"
+"@babel/plugin-transform-computed-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/template": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/template": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c464144c2eda8d526d70c8d8e3bf30820f591424991452f816617347ef3ccc5d04133c6e903b90c1d832d95d9c8550e5693ea40ea14856ede54fb8e1cd36c5de
+  checksum: 10c0/25636dbc1f605c0b8bc60aa58628a916b689473d11551c9864a855142e36742fe62d4a70400ba3b74902338e77fb3d940376c0a0ba154b6b7ec5367175233b49
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.6"
+"@babel/plugin-transform-destructuring@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/1fcc064e2b0c45a4340418bd70d2cf2b3644d1215eb975ec14f83e4f7615fdc3948e355db5091f81602f6c3d933f9308caa66232091aad4edd6c16b00240fcc7
+  checksum: 10c0/929f07a807fb62230bfbf881cfcedf187ac5daf2f1b01da94a75c7a0f6f72400268cf4bcfee534479e43260af8193e42c31ee03c8b0278ba77d0036ed6709c27
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.6"
+"@babel/plugin-transform-dotall-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4a2c98f1c22a18754c6ada1486563865690008df2536066d8a146fa58eed8515b607e162c7efb0b8fa062d755e77afea145495046cffdb4ea56194d38f489254
+  checksum: 10c0/793f14c9494972d294b7e7b97b747f47874b6d57d7804d3443c701becf5db192c9311be6a1835c07664486df1f5c60d33196c36fb7e11a53015e476b4c145b33
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.6"
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/44ddba252f0b9f1f0b1ff8d903bbcf8871246670fb2883f65d09d371d403ce9c3e2e582b94b36506c1d042110b464eb3492e53cd1e87c1d479b145bcc01c04fd
+  checksum: 10c0/75ff7ec1117ac500e77bf20a144411d39c0fdd038f108eec061724123ce6d1bb8d5bd27968e466573ee70014f8be0043361cdb0ef388f8a182d1d97ad67e51b9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.6"
+"@babel/plugin-transform-dynamic-import@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b4411f21112127a02aef15103765e207e4c03e7321d7f4de3522fc181cb377c5abc8484cf0169e6c30f2e51e6c602c09894fa6b15643d24f66273833ef34e4a6
+  checksum: 10c0/eeda48372efd0a5103cb22dadb13563c975bce18ae85daafbb47d57bb9665d187da9d4fe8d07ac0a6e1288afcfcb73e4e5618bf75ff63fddf9736bfbf225203b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.6"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.7"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c4f15518a5d1614dfac0dbadfb99b0f36a98c1c1ff1c39794a105c3c87cfce00689e0943fcb13368b43b00b2eebaa01136ea12fb8600a574720853b5a8a11de7
+  checksum: 10c0/ace3e11c94041b88848552ba8feb39ae4d6cad3696d439ff51445bd2882d8b8775d85a26c2c0edb9b5e38c9e6013cc11b0dea89ec8f93c7d9d7ee95e3645078c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.6"
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/bff16d1800d7e5b38d3a3c8d404cc14442a37383dff7769dcc599a0723b2507647cafe9ba7d9b52d2e2f02a78bb78d149676d8d8ddf7357b160f4096b89ae9c5
+  checksum: 10c0/4e144d7f1c57bc63b4899dbbbdfed0880f2daa75ea9c7251c7997f106e4b390dc362175ab7830f11358cb21f6b972ca10a43a2e56cd789065f7606b082674c0c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-for-of@npm:7.24.6"
+"@babel/plugin-transform-for-of@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c8def2a160783c5c4a1c136c721fc88aca9cd3757a60f1c885a804b5320edb5f143d3f989f698bdd9aae359fdabab0830dba3d35138cea42988a77d2c72c8443
+  checksum: 10c0/77629b1173e55d07416f05ba7353caa09d2c2149da2ca26721ab812209b63689d1be45116b68eadc011c49ced59daf5320835b15245eb7ae93ae0c5e8277cfc0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-function-name@npm:7.24.6"
+"@babel/plugin-transform-function-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.7"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/efa6527438ad94df0b7a4c92c33110ec40b086a0aceda567176b150ed291f8eb44b2ce697d8e3e1d4841496c10693add1e88f296418e72a171ead5c76b890a47
+  checksum: 10c0/3e9642428d6952851850d89ea9307d55946528d18973784d0e2f04a651b23bd9924dd8a2641c824b483bd4ab1223bab1d2f6a1106a939998f7ced512cb60ac5b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-json-strings@npm:7.24.6"
+"@babel/plugin-transform-json-strings@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/46af52dcc16f494c6c11dc22c944f2533623b9d9dfce5097bc0bdb99535ad4c4cfe5bca0d8ce8c39a94202e69d99ee60f546ce0be0ad782b681c7b5b4c9ddd6f
+  checksum: 10c0/17c72cd5bf3e90e722aabd333559275f3309e3fa0b9cea8c2944ab83ae01502c71a2be05da5101edc02b3fc8df15a8dbb9b861cbfcc8a52bf5e797cf01d3a40a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-literals@npm:7.24.6"
+"@babel/plugin-transform-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/961b64df79a673706d74cf473d1f4646f250b4f8813f9d7ef5d897e30acdacd1ca104584de2e88546289fce055d71bd7559cdb8ad4a2d5e7eea17f3c829faa97
+  checksum: 10c0/9f3f6f3831929cd2a977748c07addf9944d5cccb50bd3a24a58beb54f91f00d6cacd3d7831d13ffe1ad6f8aba0aefd7bca5aec65d63b77f39c62ad1f2d484a3e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.6"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0ae7f4098c63f442fd038de6034155bcf20214e7e490e92189decb2980932247b97cb069b11ac8bc471b53f71d6859e607969440d63ff400b8932ee3e05b4958
+  checksum: 10c0/dbe882eb9053931f2ab332c50fc7c2a10ef507d6421bd9831adbb4cb7c9f8e1e5fbac4fbd2e007f6a1bf1df1843547559434012f118084dc0bf42cda3b106272
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.6"
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/ec8908a409bd39d20f0428e35425c9e4c540bad252a0e33e08b84e3bea5088c785531197bdcf049afbdba841325962a93030b7be6da3586cb13d0ca0ebab89c9
+  checksum: 10c0/e789ae359bdf2d20e90bedef18dfdbd965c9ebae1cee398474a0c349590fda7c8b874e1a2ceee62e47e5e6ec1730e76b0f24e502164357571854271fc12cc684
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.6"
+"@babel/plugin-transform-modules-amd@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/074d26c79f517b27a07fef00319aff9705df1e6b41a805db855fe719e0f246b9815d6525cf1c5f0890c7f830dd0b9776e9b2493bbc929a3c23c0dee15f10a514
+  checksum: 10c0/6df7de7fce34117ca4b2fa07949b12274c03668cbfe21481c4037b6300796d50ae40f4f170527b61b70a67f26db906747797e30dbd0d9809a441b6e220b5728f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.6"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-simple-access": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-simple-access": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4fc790136d066105fa773ffc7e249d88c6f0d0126984ede36fedd51ac2b622b46c08565bcdd1ab62ac10195eeedeaba0d26e7e4c676ed50906cbed16540a4e22
+  checksum: 10c0/9442292b3daf6a5076cdc3c4c32bf423bda824ccaeb0dd0dc8b3effaa1fecfcb0130ae6e647fef12a5d5ff25bcc99a0d6bfc6d24a7525345e1bcf46fcdf81752
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.6"
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.7"
   dependencies:
-    "@babel/helper-hoist-variables": "npm:^7.24.6"
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-validator-identifier": "npm:^7.24.6"
+    "@babel/helper-hoist-variables": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/500962e3ac1bb1a9890e94f1967ec9e3aa3d41e22d4a9d1c739918707e4a8936710fd8d0ed4f3a8aad87260f7566b54566bead77977eb21e90124835cb6bcdca
+  checksum: 10c0/e2a795e0a6baafe26f4a74010622212ddd873170742d673f450e0097f8d984f6e6a95eb8ce41b05071ee9790c4be088b33801aaab3f78ee202c567634e52a331
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.6"
+"@babel/plugin-transform-modules-umd@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-module-transforms": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/73c6cecb4f45ca3f665e2c57b6d04d65358518522dfaffb9b6913c026aeb704281d015324d02bf07f2cb026de6bac9308c62e82979364bd39f3687f752652b0d
+  checksum: 10c0/7791d290121db210e4338b94b4a069a1a79e4c7a8d7638d8159a97b281851bbed3048dac87a4ae718ad963005e6c14a5d28e6db2eeb2b04e031cee92fb312f85
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.6"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/92547309d81938488753f87b05a679a7557a1cec253756966044367c268b27311e51efad91724aa3e433cf61626e10bf1008e112998350c2013a87824c4cfe0b
+  checksum: 10c0/41a0b0f2d0886318237440aa3b489f6d0305361d8671121777d9ff89f9f6de9d0c02ce93625049061426c8994064ef64deae8b819d1b14c00374a6a2336fb5d9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-new-target@npm:7.24.6"
+"@babel/plugin-transform-new-target@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5e9b9edfbe46489f64013d2bbd422f29acdb8057ccc85e7c759f7cf1415fde6a82ac13a13f0f246defaba6e2f7f4d424178ba78fc02237bdbf7df6692fc1dca8
+  checksum: 10c0/2540808a35e1a978e537334c43dab439cf24c93e7beb213a2e71902f6710e60e0184316643790c0a6644e7a8021e52f7ab8165e6b3e2d6651be07bdf517b67df
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.6"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/53ab5b16bbcf47e842a48f1f0774d238dae0222c3e1f31653307808048e249ed140cba12dfc280cbc9a577cb3bb5b2f50ca0e3e4ffe5260fcf8c3ca0b83fb21e
+  checksum: 10c0/7243c8ff734ed5ef759dd8768773c4b443c12e792727e759a1aec2c7fa2bfdd24f1ecb42e292a7b3d8bd3d7f7b861cf256a8eb4ba144fc9cc463892c303083d9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.6"
+"@babel/plugin-transform-numeric-separator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/14863e735fc407e065e1574914864a956b8250a84cfb4704592656763c9455d67034c7745e53066725195d9ed042121f424c4aaee00027791640e2639386b701
+  checksum: 10c0/e18e09ca5a6342645d00ede477731aa6e8714ff357efc9d7cda5934f1703b3b6fb7d3298dce3ce3ba53e9ff1158eab8f1aadc68874cc21a6099d33a1ca457789
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.6"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.7"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-transform-parameters": "npm:^7.24.6"
+    "@babel/plugin-transform-parameters": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/1a192b9756ebfa0bc69ad5e285d7d0284963b4b95738ca7721354297329d5c1ab4eb05ff5b198cbfffa3ec00e97a15a712aa7a5011d9407478796966aab54527
+  checksum: 10c0/9ad64bc003f583030f9da50614b485852f8edac93f8faf5d1cd855201a4852f37c5255ae4daf70dd4375bdd4874e16e39b91f680d4668ec219ba05441ce286eb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-object-super@npm:7.24.6"
+"@babel/plugin-transform-object-super@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-replace-supers": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2e48b9e0a1f3b04b439ede2d0c83bcc5324a81c8bab73c70f0c466cf48061a4ff469f283e2feb17b4cc2e20372c1362253604477ecd77e622192d5d7906aa062
+  checksum: 10c0/770cebb4b4e1872c216b17069db9a13b87dfee747d359dc56d9fcdd66e7544f92dc6ab1861a4e7e0528196aaff2444e4f17dc84efd8eaf162d542b4ba0943869
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.6"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/411db3177b1bffd2f9e5b33a6b62e70158380e67d91ff4725755312e8a0a2f2c3fd340c60005295a672115fb593222ab2d7076266aebced6ef087a5505b6f371
+  checksum: 10c0/1e2f10a018f7d03b3bde6c0b70d063df8d5dd5209861d4467726cf834f5e3d354e2276079dc226aa8e6ece35f5c9b264d64b8229a8bb232829c01e561bcfb07a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.6"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/8ee5a500a2309444d4fb27979857598e9c91d804fe23217c51cc208b1bc6b9cd0650b355b1ebd625f180c5f1dc4cb89b5f313c982f7c89d90281a69b24a88ccb
+  checksum: 10c0/b9e3649b299e103b0d1767bbdba56574d065ff776e5350403b7bfd4e3982743c0cdb373d33bdbf94fa3c322d155e45d0aad946acf0aa741b870aed22dfec8b8e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-parameters@npm:7.24.6"
+"@babel/plugin-transform-parameters@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d9648924b9c0d35a243c0742c22838932a024205c61f4cc419857e5195edd893a33e6be4f2c8fbd89e925051c7cbe8968029ec2d3e7f2f098bfa682f4e2b9731
+  checksum: 10c0/53bf190d6926771545d5184f1f5f3f5144d0f04f170799ad46a43f683a01fab8d5fe4d2196cf246774530990c31fe1f2b9f0def39f0a5ddbb2340b924f5edf01
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-private-methods@npm:7.24.6"
+"@babel/plugin-transform-private-methods@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/55f93959b2e8aeda818db7cdc7dfdcd5076f5bdc8a819566818004a68969fb7297d617f9d108bf76ac232d6056d9f9d20f73ce10380baa43ff1755c5591aa803
+  checksum: 10c0/5b7bf923b738fbe3ad6c33b260e0a7451be288edfe4ef516303fa787a1870cd87533bfbf61abb779c22ed003c2fc484dec2436fe75a48756f686c0241173d364
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.6"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.24.6"
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-annotate-as-pure": "npm:^7.24.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c9eb9597362b598a91536375a49ba80cdf13461e849680e040898b103f7998c4d33a7832da5afba9fa51e3473f79cf8605f9ace07a887e386b7801797021631b
+  checksum: 10c0/c6fa7defb90b1b0ed46f24ff94ff2e77f44c1f478d1090e81712f33cf992dda5ba347016f030082a2f770138bac6f4a9c2c1565e9f767a125901c77dd9c239ba
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-property-literals@npm:7.24.6"
+"@babel/plugin-transform-property-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d1195d93406b6c400cdbc9ac57a2b8b58c72cc6480cc03656abfc243be0e2a48133cbb96559c2db95b1c78803daeb538277821540fe19e2a9105905e727ef618
+  checksum: 10c0/52564b58f3d111dc02d241d5892a4b01512e98dfdf6ef11b0ed62f8b11b0acacccef0fc229b44114fe8d1a57a8b70780b11bdd18b807d3754a781a07d8f57433
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-regenerator@npm:7.24.6"
+"@babel/plugin-transform-regenerator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
     regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d17eaa97514d583866182420024b8c22da2c6ca822bdbf16fe7564121564c1844935592dc3315c73d1f78f7c908a4338b1d783618811e694c9bb6d5f9233e58d
+  checksum: 10c0/d2dc2c788fdae9d97217e70d46ba8ca9db0035c398dc3e161552b0c437113719a75c04f201f9c91ddc8d28a1da60d0b0853f616dead98a396abb9c845c44892b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.6"
+"@babel/plugin-transform-reserved-words@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5d2d4c579bd90c60fc6468a1285b3384e7b650b47d41a937a1590d4aecfc28bd945e82704c6e71cc91aa016b7e78c5594290c1c386edf11ec98e09e36235c5ae
+  checksum: 10c0/2229de2768615e7f5dc0bbc55bc121b5678fd6d2febd46c74a58e42bb894d74cd5955c805880f4e02d0e1cf94f6886270eda7fafc1be9305a1ec3b9fd1d063f5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.6"
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4141b5da1d0d20d66ca0affaef8dfc45ed5e954bfa9003eb8aa779842599de443b37c2b265da27693f304c35ab68a682b44098e9eea0d39f8f94072ab616657f
+  checksum: 10c0/41b155bdbb3be66618358488bf7731b3b2e8fff2de3dbfd541847720a9debfcec14db06a117abedd03c9cd786db20a79e2a86509a4f19513f6e1b610520905cf
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-spread@npm:7.24.6"
+"@babel/plugin-transform-spread@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-spread@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6d12da05311690c4a73d775688ba6931b441e96e512377a166a60184292edeac0b17f5154a49e2f1d262a3f80b96e064bc9c88c63b2a6125f0a2132eff9ed585
+  checksum: 10c0/facba1553035f76b0d2930d4ada89a8cd0f45b79579afd35baefbfaf12e3b86096995f4b0c402cf9ee23b3f2ea0a4460c3b1ec0c192d340962c948bb223d4e66
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.6"
+"@babel/plugin-transform-sticky-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2a65f57554f51d3b9cd035513a610f47e46b26dba112b3b9fb42d1c1f2ae153fce8f76294b4721d099817814f57895c656f5b7dccd5df683277da6522c817ee9
+  checksum: 10c0/5a74ed2ed0a3ab51c3d15fcaf09d9e2fe915823535c7a4d7b019813177d559b69677090e189ec3d5d08b619483eb5ad371fbcfbbff5ace2a76ba33ee566a1109
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-template-literals@npm:7.24.6"
+"@babel/plugin-transform-template-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/fcde48e9c3ecd7f5f37ceb6908f1edd537d3115fc2f27d187d58fd83b2a13637a1bb3d24589d841529ed081405b951bf1c5d194ea81eff6ad2d88204d153010d
+  checksum: 10c0/3630f966257bcace122f04d3157416a09d40768c44c3a800855da81146b009187daa21859d1c3b7d13f4e19e8888e60613964b175b2275d451200fb6d8d6cfe6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.6"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a24b3a3c7b87c6496ee13d2438effd4645868f054397357ec3cbe92a2f0df4152ac7fd7228cb956576c1b772c0675b065d6ad5f5053c382e97dd022015e9a028
+  checksum: 10c0/5649e7260a138681e68b296ab5931e2b1f132f287d6b4131d49b24f9dc20d62902b7e9d63c4d2decd5683b41df35ef4b9b03f58c7f9f65e4c25a6d8bbf04e9e9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.6"
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/0e4038c589b7a63a2469466a25b78aad4ecb7267732e3c953c3055f9a77c7bee859a71983a08b025179f1b094964f2ebbfca1b6c33de4ead90a0b5ef06ddb47e
+  checksum: 10c0/8b18e2e66af33471a6971289492beff5c240e56727331db1d34c4338a6a368a82a7ed6d57ec911001b6d65643aed76531e1e7cac93265fb3fb2717f54d845e69
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.6"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/bca99e00de91d0460dfcb25f285f3606248acc905193c05587e2862c54ddb790c5d8cb45e80927290390cffbcba7620f8af3e74c5301ff0c1c59ce7d47c5629f
+  checksum: 10c0/bc57656eb94584d1b74a385d378818ac2b3fca642e3f649fead8da5fb3f9de22f8461185936915dfb33d5a9104e62e7a47828331248b09d28bb2d59e9276de3e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.6"
+"@babel/plugin-transform-unicode-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/ab6e253cfc38c7e8a2844d7ad46f85fdcbe33610b7f92f71045cf0b040438a08f1f1717ab4b84c480537f54e5478db8b404a4ccc2ff846b4e3ed33d373e3b47a
+  checksum: 10c0/83f72a345b751566b601dc4d07e9f2c8f1bc0e0c6f7abb56ceb3095b3c9d304de73f85f2f477a09f8cc7edd5e65afd0ff9e376cdbcbea33bc0c28f3705b38fd9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.6"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/a52e84f85519fed330e88f7a17611064d2b5f1d0fe2823f8113ed312828e69787888bd023f404e8d35d0bb96461e42e19cdc4f0a44d35959bc86c219a3062237
+  checksum: 10c0/7457c0ee8e80a80cb6fdc1fe54ab115b52815627616ce9151be8ef292fc99d04a910ec24f11382b4f124b89374264396892b086886bd2a9c2317904d87c9b21b
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.24.6":
-  version: 7.24.6
-  resolution: "@babel/preset-env@npm:7.24.6"
+"@babel/preset-env@npm:7.24.7":
+  version: 7.24.7
+  resolution: "@babel/preset-env@npm:7.24.7"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.6"
-    "@babel/helper-compilation-targets": "npm:^7.24.6"
-    "@babel/helper-plugin-utils": "npm:^7.24.6"
-    "@babel/helper-validator-option": "npm:^7.24.6"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.6"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.6"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.6"
+    "@babel/compat-data": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-validator-option": "npm:^7.24.7"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.7"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.7"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
     "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
     "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
     "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
-    "@babel/plugin-syntax-import-assertions": "npm:^7.24.6"
-    "@babel/plugin-syntax-import-attributes": "npm:^7.24.6"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.7"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.7"
     "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
     "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
@@ -1236,54 +1244,54 @@ __metadata:
     "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
-    "@babel/plugin-transform-arrow-functions": "npm:^7.24.6"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.6"
-    "@babel/plugin-transform-async-to-generator": "npm:^7.24.6"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.6"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.6"
-    "@babel/plugin-transform-class-properties": "npm:^7.24.6"
-    "@babel/plugin-transform-class-static-block": "npm:^7.24.6"
-    "@babel/plugin-transform-classes": "npm:^7.24.6"
-    "@babel/plugin-transform-computed-properties": "npm:^7.24.6"
-    "@babel/plugin-transform-destructuring": "npm:^7.24.6"
-    "@babel/plugin-transform-dotall-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.6"
-    "@babel/plugin-transform-dynamic-import": "npm:^7.24.6"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.6"
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.6"
-    "@babel/plugin-transform-for-of": "npm:^7.24.6"
-    "@babel/plugin-transform-function-name": "npm:^7.24.6"
-    "@babel/plugin-transform-json-strings": "npm:^7.24.6"
-    "@babel/plugin-transform-literals": "npm:^7.24.6"
-    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.6"
-    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-amd": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.6"
-    "@babel/plugin-transform-modules-umd": "npm:^7.24.6"
-    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-new-target": "npm:^7.24.6"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.6"
-    "@babel/plugin-transform-numeric-separator": "npm:^7.24.6"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.6"
-    "@babel/plugin-transform-object-super": "npm:^7.24.6"
-    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.6"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.6"
-    "@babel/plugin-transform-parameters": "npm:^7.24.6"
-    "@babel/plugin-transform-private-methods": "npm:^7.24.6"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.6"
-    "@babel/plugin-transform-property-literals": "npm:^7.24.6"
-    "@babel/plugin-transform-regenerator": "npm:^7.24.6"
-    "@babel/plugin-transform-reserved-words": "npm:^7.24.6"
-    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.6"
-    "@babel/plugin-transform-spread": "npm:^7.24.6"
-    "@babel/plugin-transform-sticky-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-template-literals": "npm:^7.24.6"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.6"
-    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.6"
-    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-unicode-regex": "npm:^7.24.6"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.6"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.7"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
+    "@babel/plugin-transform-classes": "npm:^7.24.7"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.7"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.7"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.7"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.7"
+    "@babel/plugin-transform-for-of": "npm:^7.24.7"
+    "@babel/plugin-transform-function-name": "npm:^7.24.7"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.7"
+    "@babel/plugin-transform-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.7"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-new-target": "npm:^7.24.7"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.7"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.7"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.7"
+    "@babel/plugin-transform-object-super": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
+    "@babel/plugin-transform-parameters": "npm:^7.24.7"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.7"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.7"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.7"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-spread": "npm:^7.24.7"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.7"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.4"
@@ -1292,7 +1300,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d837d294197803d550e48d9458a356853a54a0528e7cdc51c2b8a5d8dfe41c6fbc597b4fc67464615a7385198a3db2e839da15cca7b9502fedf27170fc6ef673
+  checksum: 10c0/c6714346f3ccc1271eaa90051c75b8bb57b20ef57408ab68740e2f3552693ae0ee5a4bcce3a00211d40e4947af1f7b8ab422066b953f0095461937fb72d11274
   languageName: node
   linkType: hard
 
@@ -1325,43 +1333,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/template@npm:7.24.6"
+"@babel/template@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/template@npm:7.24.7"
   dependencies:
-    "@babel/code-frame": "npm:^7.24.6"
-    "@babel/parser": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
-  checksum: 10c0/a4d5805770de908b445f7cdcebfcb6eaa07b1ec9c7b78fd3f375a911b1522c249bddae6b96bc4aac24247cc603e3e6cffcf2fe50b4c929dfeb22de289b517525
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
+  checksum: 10c0/95b0b3ee80fcef685b7f4426f5713a855ea2cd5ac4da829b213f8fb5afe48a2a14683c2ea04d446dbc7f711c33c5cd4a965ef34dcbe5bc387c9e966b67877ae3
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.6":
-  version: 7.24.6
-  resolution: "@babel/traverse@npm:7.24.6"
+"@babel/traverse@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/traverse@npm:7.24.7"
   dependencies:
-    "@babel/code-frame": "npm:^7.24.6"
-    "@babel/generator": "npm:^7.24.6"
-    "@babel/helper-environment-visitor": "npm:^7.24.6"
-    "@babel/helper-function-name": "npm:^7.24.6"
-    "@babel/helper-hoist-variables": "npm:^7.24.6"
-    "@babel/helper-split-export-declaration": "npm:^7.24.6"
-    "@babel/parser": "npm:^7.24.6"
-    "@babel/types": "npm:^7.24.6"
+    "@babel/code-frame": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.7"
+    "@babel/helper-environment-visitor": "npm:^7.24.7"
+    "@babel/helper-function-name": "npm:^7.24.7"
+    "@babel/helper-hoist-variables": "npm:^7.24.7"
+    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.7"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/39027d5fc7a241c6b71bb5872c2bdcec53743cd7ef3c151bbe6fd7cf874d15f4bc09e5d7e19e2f534b0eb2c115f5368553885fa4253aa1bc9441c6e5bf9efdaf
+  checksum: 10c0/a5135e589c3f1972b8877805f50a084a04865ccb1d68e5e1f3b94a8841b3485da4142e33413d8fd76bc0e6444531d3adf1f59f359c11ffac452b743d835068ab
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.24.6, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.6
-  resolution: "@babel/types@npm:7.24.6"
+"@babel/types@npm:^7.24.7, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.7
+  resolution: "@babel/types@npm:7.24.7"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.24.6"
-    "@babel/helper-validator-identifier": "npm:^7.24.6"
+    "@babel/helper-string-parser": "npm:^7.24.7"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/1d94d92d97ef49030ad7f9e14cfccfeb70b1706dabcaa69037e659ec9d2c3178fb005d2088cce40d88dfc1306153d9157fe038a79ea2be92e5e6b99a59ef80cc
+  checksum: 10c0/d9ecbfc3eb2b05fb1e6eeea546836ac30d990f395ef3fe3f75ced777a222c3cfc4489492f72e0ce3d9a5a28860a1ce5f81e66b88cf5088909068b3ff4fab72c1
   languageName: node
   linkType: hard
 
@@ -4387,9 +4395,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "jenkins-ui@workspace:."
   dependencies:
-    "@babel/cli": "npm:7.24.6"
-    "@babel/core": "npm:7.24.6"
-    "@babel/preset-env": "npm:7.24.6"
+    "@babel/cli": "npm:7.24.7"
+    "@babel/core": "npm:7.24.7"
+    "@babel/preset-env": "npm:7.24.7"
     "@eslint/js": "npm:9.4.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"

From 9f4d116b8e9d0a91949f1c0630d6d59b9c760094 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 10:24:19 -0700
Subject: [PATCH 110/449] Update dependency globals to v15.4.0 (#9369)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 17ad3cb8a77d..6d3b18cd8dd3 100644
--- a/war/package.json
+++ b/war/package.json
@@ -34,7 +34,7 @@
     "eslint": "9.4.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.3.0",
+    "globals": "15.4.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",
diff --git a/war/yarn.lock b/war/yarn.lock
index d6346436f919..28e49ff969d5 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3983,10 +3983,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.3.0":
-  version: 15.3.0
-  resolution: "globals@npm:15.3.0"
-  checksum: 10c0/edbef1c528185d02636ed6d72a1688168b922d6176031904386214f8b59d893f1d0a28da519b95665f557d366b17ea1affb9f433ea451e7372e2808fb31079d7
+"globals@npm:15.4.0":
+  version: 15.4.0
+  resolution: "globals@npm:15.4.0"
+  checksum: 10c0/19041b8fd49deb154e1cb706c82756ab7184c8ae3495aab183efcad9edd1b6320cc54af1a9110d8699245bef124834b004a8156ca988ba7814c25ec71a43f6a4
   languageName: node
   linkType: hard
 
@@ -4406,7 +4406,7 @@ __metadata:
     eslint: "npm:9.4.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.3.0"
+    globals: "npm:15.4.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"

From 967db8566c4f09631da67bb2ce82aaf3eb090066 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 12:17:27 -0700
Subject: [PATCH 111/449] Bump org.jenkins-ci.modules:sshd from
 3.328.v659088899699 to 3.330.vc866a_8389b_58 (#9372)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index ac9236316ea3..773a263deef1 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -399,7 +399,7 @@ THE SOFTWARE.
                   <!-- detached after 2.281 -->
                   <groupId>org.jenkins-ci.modules</groupId>
                   <artifactId>sshd</artifactId>
-                  <version>3.328.v659088899699</version>
+                  <version>3.330.vc866a_8389b_58</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 386e04c4e5574a4dbbbf004391cca7bb75ee6cdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 12:17:51 -0700
Subject: [PATCH 112/449] Bump org.jenkins-ci.main:jenkins-test-harness from
 2216.v8f497401120d to 2223.v062296742946 (#9371)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 3c08eb52595a..5a59b64ea49c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,7 +147,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2216.v8f497401120d</version>
+      <version>2223.v062296742946</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 0ad66571bf1f9b7bc4550862dd7a9a5f39684ddc Mon Sep 17 00:00:00 2001
From: Bob Du <i@bobdu.cc>
Date: Tue, 11 Jun 2024 09:02:09 +0800
Subject: [PATCH 113/449] [JENKINS-73246] Fix text shown in unexpected locale
 (#9370)

Signed-off-by: Bob Du <i@bobdu.cc>
---
 .../main/java/hudson/model/Descriptor.java    |  4 ++++
 .../hudson/GetLocaleStaticHelpUrlTest.java    | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 817115c3ad17..32b9f1dd0cf0 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -1007,6 +1007,10 @@ public static URL getStaticHelpUrl(StaplerRequest req, Klass<?> c, String suffix
             if (url != null)    return url;
             url = c.getResource(base + '_' + locale.getLanguage() + ".html");
             if (url != null)    return url;
+            if (locale.getLanguage().equals("en")) {
+                url = c.getResource(base + ".html");
+                if (url != null)    return url;
+            }
         }
 
         // default
diff --git a/core/src/test/java/hudson/GetLocaleStaticHelpUrlTest.java b/core/src/test/java/hudson/GetLocaleStaticHelpUrlTest.java
index 5fd822bc1c55..a61fc0d54656 100644
--- a/core/src/test/java/hudson/GetLocaleStaticHelpUrlTest.java
+++ b/core/src/test/java/hudson/GetLocaleStaticHelpUrlTest.java
@@ -36,6 +36,7 @@
 import java.util.Enumeration;
 import java.util.Locale;
 import org.junit.jupiter.api.Test;
+import org.jvnet.hudson.test.Issue;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.lang.Klass;
 
@@ -191,6 +192,24 @@ public void getStaticHelpUrlAcceptZhResMore() {
         assertThatLocaleResourceIs(id, "help-id_zh_CN.html");
     }
 
+    @Issue("JENKINS-73246")
+    @Test
+    public void getStaticHelpUrlAcceptEnFirst() {
+        // Accept-Language: en-US,en;q=0.9,de;q=0.8
+        StaplerRequest req = mockStaplerRequest(
+                Locale.US,
+                Locale.ENGLISH,
+                Locale.GERMAN
+        );
+
+        Klass klass = mockKlass(
+                "help-id.html",
+                "help-id_de.html"
+        );
+        URL id = Descriptor.getStaticHelpUrl(req, klass, "-id");
+        assertThatLocaleResourceIs(id, "help-id.html");
+    }
+
     private StaplerRequest mockStaplerRequest(Locale... localeArr) {
         StaplerRequest req = mock(StaplerRequest.class);
         Enumeration<Locale> locales = Collections.enumeration(Arrays.asList(localeArr));

From a6542b98a95e960be61b30bdb6f261e3216ec11c Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Tue, 11 Jun 2024 02:03:54 +0100
Subject: [PATCH 114/449] Adjust heading weights and sizes (#9366)

* Init

* Update _app-bar.scss
---
 war/src/main/scss/base/_typography.scss    | 10 +++++-----
 war/src/main/scss/components/_section.scss | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/war/src/main/scss/base/_typography.scss b/war/src/main/scss/base/_typography.scss
index 2b35478325fa..0dceec4624a6 100644
--- a/war/src/main/scss/base/_typography.scss
+++ b/war/src/main/scss/base/_typography.scss
@@ -49,7 +49,7 @@ h5,
 h6,
 .h6 {
   line-height: var(--line-height-heading);
-  font-weight: 650;
+  font-weight: 600;
   display: block;
   margin-top: 0;
   margin-bottom: var(--section-padding);
@@ -62,12 +62,12 @@ h1,
 
 h2,
 .h2 {
-  font-size: 1.35rem;
+  font-size: 1.375rem;
 }
 
 h3,
 .h3 {
-  font-size: 1.2rem;
+  font-size: 1.1875rem;
 }
 
 h4,
@@ -77,12 +77,12 @@ h4,
 
 h5,
 .h5 {
-  font-size: 0.8rem;
+  font-size: 0.8125rem;
 }
 
 h6,
 .h6 {
-  font-size: 0.6rem;
+  font-size: 0.625rem;
 }
 
 .jenkins-description {
diff --git a/war/src/main/scss/components/_section.scss b/war/src/main/scss/components/_section.scss
index a637deb6181e..9a53a7238339 100644
--- a/war/src/main/scss/components/_section.scss
+++ b/war/src/main/scss/components/_section.scss
@@ -30,8 +30,8 @@
 
 .jenkins-section__title {
   margin: 0 0 var(--section-padding) 0;
-  font-size: 1.1rem;
-  font-weight: 600;
+  font-size: 1rem;
+  font-weight: 500;
 }
 
 .jenkins-section__items {
@@ -106,17 +106,17 @@
   }
 
   dt {
-    font-size: 0.925rem;
-    font-weight: 600;
+    font-size: 0.9375rem;
+    font-weight: 500;
     margin: 0.1rem 0 0.2rem;
     color: var(--text-color);
   }
 
   dd {
     color: var(--text-color-secondary);
-    font-weight: 500;
+    font-weight: 450;
     line-height: 1.6;
     margin: 0 0.66rem 0 0;
-    font-size: 0.925rem;
+    font-size: 0.9375rem;
   }
 }

From 73de53a7b669f61d14b34a4287f6e1d78a1fc342 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Tue, 11 Jun 2024 02:08:08 +0100
Subject: [PATCH 115/449] Refine button appearances in sidebars, menus, pages
 and breadcrumbs (#9367)

* Push

* Push

* Update _buttons.scss
---
 war/src/main/scss/components/_app-bar.scss          |  6 +++---
 war/src/main/scss/components/_breadcrumbs.scss      |  2 +-
 war/src/main/scss/components/_buttons.scss          | 12 +++++-------
 war/src/main/scss/components/_dropdowns.scss        |  4 ++--
 war/src/main/scss/components/_side-panel-tasks.scss | 12 ++++++------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/war/src/main/scss/components/_app-bar.scss b/war/src/main/scss/components/_app-bar.scss
index cbe9b9e53fc7..b1b30048ca70 100644
--- a/war/src/main/scss/components/_app-bar.scss
+++ b/war/src/main/scss/components/_app-bar.scss
@@ -9,7 +9,7 @@
     justify-content: center;
     flex-direction: column;
     width: 100%;
-    min-height: 36px;
+    min-height: 2.25rem;
   }
 
   .jenkins-app-bar__controls {
@@ -17,8 +17,8 @@
     align-items: center;
     justify-content: center;
     margin-left: var(--section-padding);
-    min-height: 36px;
-    gap: 1rem;
+    min-height: 2.25rem;
+    gap: 0.75rem;
 
     .jenkins-search {
       min-width: 260px;
diff --git a/war/src/main/scss/components/_breadcrumbs.scss b/war/src/main/scss/components/_breadcrumbs.scss
index dda12847140e..f50677846430 100644
--- a/war/src/main/scss/components/_breadcrumbs.scss
+++ b/war/src/main/scss/components/_breadcrumbs.scss
@@ -26,7 +26,7 @@
       justify-content: center;
       color: var(--text-color);
       font-weight: 500;
-      font-size: 0.85rem;
+      font-size: 0.875rem;
       padding: 0.2rem 0.4rem;
 
       & > a {
diff --git a/war/src/main/scss/components/_buttons.scss b/war/src/main/scss/components/_buttons.scss
index 5108aca2c6eb..4812949af07c 100644
--- a/war/src/main/scss/components/_buttons.scss
+++ b/war/src/main/scss/components/_buttons.scss
@@ -14,15 +14,14 @@
   border: none;
   outline: none;
   margin: 0;
-  padding: 0.5rem 0.85rem;
-  font-size: 0.8125rem;
-  font-weight: 500;
+  padding: 0.5rem 0.9rem;
+  font-size: 0.875rem;
   text-decoration: none !important;
   background: transparent;
   color: var(--text-color) !important;
   border-radius: 0.66rem;
   cursor: pointer;
-  min-height: 36px;
+  min-height: 2.25rem;
   white-space: nowrap;
   gap: 1ch;
   transition: var(--standard-transition);
@@ -32,8 +31,8 @@
   }
 
   svg {
-    width: 1.1rem;
-    height: 1.1rem;
+    width: 1.125rem;
+    height: 1.125rem;
   }
 
   &:disabled {
@@ -45,7 +44,6 @@
 
 .jenkins-button--primary {
   color: var(--button-color--primary) !important;
-  font-weight: 600;
 
   &::before {
     background: var(--accent-color) !important;
diff --git a/war/src/main/scss/components/_dropdowns.scss b/war/src/main/scss/components/_dropdowns.scss
index 586a07fc5adf..3a4ce4435977 100644
--- a/war/src/main/scss/components/_dropdowns.scss
+++ b/war/src/main/scss/components/_dropdowns.scss
@@ -92,7 +92,7 @@ $dropdown-padding: 0.4rem;
     color: var(--text-color-secondary) !important;
     margin: $dropdown-padding 0.55rem;
     font-size: 0.8125rem;
-    font-weight: 600;
+    font-weight: 500;
     opacity: 0.8;
 
     &:not(:first-of-type) {
@@ -133,7 +133,7 @@ $dropdown-padding: 0.4rem;
     margin: 0;
     padding: $dropdown-padding 1.75rem $dropdown-padding 0.6rem;
     font-size: 0.8125rem;
-    font-weight: 500;
+    font-weight: 450;
     text-decoration: none !important;
     background: transparent;
     color: var(--text-color) !important;
diff --git a/war/src/main/scss/components/_side-panel-tasks.scss b/war/src/main/scss/components/_side-panel-tasks.scss
index df5a362315d0..1ae9168ce235 100644
--- a/war/src/main/scss/components/_side-panel-tasks.scss
+++ b/war/src/main/scss/components/_side-panel-tasks.scss
@@ -8,7 +8,7 @@ $background-outset: 0.7rem;
   display: flex;
   flex-direction: column;
   margin: var(--section-padding);
-  gap: 5px;
+  gap: 0.125rem;
 
   /* stylelint-disable-next-line media-query-no-invalid */
   @media (min-width: breakpoints.$tablet-breakpoint) {
@@ -63,11 +63,11 @@ $background-outset: 0.7rem;
   align-items: center;
   justify-content: flex-start;
   padding: 0.55rem $background-outset;
-  gap: 0.75rem;
+  gap: 0.65rem;
   width: 100%;
   cursor: pointer;
-  font-weight: 500 !important;
-  font-size: 0.9rem;
+  font-weight: 450 !important;
+  font-size: 0.875rem;
   color: var(--text-color) !important;
   background: transparent;
   outline: none;
@@ -101,11 +101,11 @@ $background-outset: 0.7rem;
   }
 
   &--active {
-    font-weight: 600 !important;
+    font-weight: 500 !important;
     cursor: default;
 
     svg * {
-      stroke-width: 38px;
+      stroke-width: 35px;
     }
 
     &::before {

From cfdc7a5949c968b33fe616ac3be1289b6706a42b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 19:14:48 -0700
Subject: [PATCH 116/449] Bump org.jenkins-ci.main:jenkins-test-harness from
 2223.v062296742946 to 2225.v04fa_3929c9b_5 (#9373)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 5a59b64ea49c..3f34e19b8925 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,7 +147,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2223.v062296742946</version>
+      <version>2225.v04fa_3929c9b_5</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 7edc099b67fada48c80f280419fe7102afe143d8 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 11 Jun 2024 13:29:40 +0000
Subject: [PATCH 117/449] [maven-release-plugin] prepare release jenkins-2.462

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 14fcd61775ed..efe9e8bb1f6a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.462</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..f7dcc0826f7b 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.462</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..7ada4d57b925 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.462</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..55385fc92b42 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.462</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 2629524e85fd..bf4fbbfd3ba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.462</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.462</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.462</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-06-04T13:14:56Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-11T10:34:13Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 3f34e19b8925..5361bb59915e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.462</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 773a263deef1..c3aaa3a21880 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.462</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..346be9802e60 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.462</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..0d26adf548f9 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.462</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 624270f58d9a84541dfeb1a0441248135662d97a Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 11 Jun 2024 13:30:17 +0000
Subject: [PATCH 118/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index efe9e8bb1f6a..14fcd61775ed 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.462</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index f7dcc0826f7b..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.462</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 7ada4d57b925..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.462</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 55385fc92b42..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.462</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index bf4fbbfd3ba1..05077eb98737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.462</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.462</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.462</revision>
+    <revision>2.463</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-06-11T10:34:13Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-11T13:29:41Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 5361bb59915e..3f34e19b8925 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.462</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index c3aaa3a21880..773a263deef1 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.462</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 346be9802e60..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.462</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 0d26adf548f9..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.462</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From d4e970faeeb46f07a21bd6c941852287b89bb881 Mon Sep 17 00:00:00 2001
From: Damien Duportal <damien.duportal@gmail.com>
Date: Tue, 11 Jun 2024 16:52:11 +0200
Subject: [PATCH 119/449] [JENKINS-72577] Revert "Increase
 MavenTest#sensitiveParameters() timeout to 500s" (#9374)

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
 test/src/test/java/hudson/tasks/MavenTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/src/test/java/hudson/tasks/MavenTest.java b/test/src/test/java/hudson/tasks/MavenTest.java
index dbf745b672d9..bd366adce71d 100644
--- a/test/src/test/java/hudson/tasks/MavenTest.java
+++ b/test/src/test/java/hudson/tasks/MavenTest.java
@@ -66,7 +66,6 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.ToolInstallations;
-import org.jvnet.hudson.test.recipes.WithTimeout;
 import org.kohsuke.stapler.jelly.JellyFacet;
 
 /**
@@ -191,7 +190,7 @@ private void verify() throws Exception {
         assertNotNull(isp.installers.get(MavenInstaller.class));
     }
 
-    @Test @WithTimeout(500) public void sensitiveParameters() throws Exception {
+    @Test public void sensitiveParameters() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject();
         ParametersDefinitionProperty pdb = new ParametersDefinitionProperty(
                 new StringParameterDefinition("string", "defaultValue", "string description"),

From 75f6c56c77f6365234af7e178dc8d54a25798ad9 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 11 Jun 2024 07:52:23 -0700
Subject: [PATCH 120/449] Require Java 17 or newer (#9358)

---
 Jenkinsfile                                   |  4 +-
 ...JavaVersionRecommendationAdminMonitor.java | 10 -----
 pom.xml                                       |  2 +-
 war/pom.xml                                   | 45 +++++++++++++++++++
 war/src/main/java/executable/Main.java        |  2 +-
 war/src/test/java/executable/MainTest.java    | 18 +++-----
 6 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8b87983f43fc..2380b3b66d9a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,12 +14,12 @@ properties([
 
 def axes = [
   platforms: ['linux', 'windows'],
-  jdks: [11, 17, 21],
+  jdks: [17, 21],
 ]
 
 stage('Record build') {
   retry(conditions: [kubernetesAgent(handleNonKubernetes: true), nonresumable()], count: 2) {
-    node('maven-11') {
+    node('maven-17') {
       infra.checkoutSCM()
 
       /*
diff --git a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
index 2f746a9b1bfb..c95740613765 100644
--- a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
+++ b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
@@ -78,16 +78,6 @@ public class JavaVersionRecommendationAdminMonitor extends AdministrativeMonitor
 
     static {
         NavigableMap<Integer, LocalDate> supportedVersions = new TreeMap<>();
-        // Adjust Java 11 end of life date for weekly and LTS
-        if (Jenkins.VERSION.split("[.]").length > 2) {
-            // LTS will require Java 17 or newer beginning 30 Oct 2024
-            // https://groups.google.com/g/jenkinsci-dev/c/gsXAqOQQEPc/m/VT9IBYdmAQAJ
-            supportedVersions.put(11, LocalDate.of(2024, 9, 30)); // Temurin: 2024-10-31
-        } else {
-            // Weekly will require Java 17 or newer beginning 18 Jun 2024
-            // https://groups.google.com/g/jenkinsci-dev/c/gsXAqOQQEPc/m/4fn4Un1iAwAJ
-            supportedVersions.put(11, LocalDate.of(2024, 6, 18)); // Temurin: 2024-10-31
-        }
         supportedVersions.put(17, LocalDate.of(2026, 3, 31)); // Temurin: 2027-10-31
         supportedVersions.put(21, LocalDate.of(2027, 9, 30)); // Temurin: 2029-09-30
         SUPPORTED_JAVA_VERSIONS = Collections.unmodifiableNavigableMap(supportedVersions);
diff --git a/pom.xml b/pom.xml
index 05077eb98737..61f57e16bae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.115</version>
+    <version>1.116</version>
     <relativePath />
   </parent>
 
diff --git a/war/pom.xml b/war/pom.xml
index 773a263deef1..d654d67d4d50 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -136,6 +136,51 @@ THE SOFTWARE.
   <build>
     <finalName>jenkins</finalName>
     <plugins>
+      <!-- TODO When Java 11 usage declines to a terminal level, this can be deleted. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>display-info</id>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>11</version>
+                </requireJavaVersion>
+                <enforceBytecodeVersion>
+                  <maxJdkVersion>11</maxJdkVersion>
+                  <excludes>
+                    <exclude>org.jenkins-ci:commons-jelly</exclude>
+                    <exclude>org.jenkins-ci.main:cli</exclude>
+                    <exclude>org.jenkins-ci.main:jenkins-core</exclude>
+                    <exclude>org.jenkins-ci.main:websocket-jetty10</exclude>
+                    <exclude>org.jenkins-ci.main:websocket-spi</exclude>
+                    <exclude>org.kohsuke.stapler:stapler</exclude>
+                    <exclude>org.kohsuke.stapler:stapler-groovy</exclude>
+                    <exclude>org.kohsuke.stapler:stapler-jelly</exclude>
+                  </excludes>
+                </enforceBytecodeVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>11</release>
+          <testRelease>11</testRelease>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <release>11</release>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <!-- version specified in grandparent pom -->
diff --git a/war/src/main/java/executable/Main.java b/war/src/main/java/executable/Main.java
index 410392f96202..8a8cf67a87a5 100644
--- a/war/src/main/java/executable/Main.java
+++ b/war/src/main/java/executable/Main.java
@@ -76,7 +76,7 @@ public class Main {
      * This list must remain synchronized with the one in {@code
      * JavaVersionRecommendationAdminMonitor}.
      */
-    private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(11, 17, 21));
+    private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(17, 21));
 
     /**
      * Sets custom session cookie name.
diff --git a/war/src/test/java/executable/MainTest.java b/war/src/test/java/executable/MainTest.java
index 676cdd5d2986..106b835ac3e7 100644
--- a/war/src/test/java/executable/MainTest.java
+++ b/war/src/test/java/executable/MainTest.java
@@ -11,34 +11,28 @@ class MainTest {
     void unsupported() {
         assertJavaCheckFails(8, false);
         assertJavaCheckFails(8, true);
+        assertJavaCheckFails(11, false);
+        assertJavaCheckFails(11, true);
     }
 
     @Test
     void supported() {
-        assertJavaCheckPasses(11, false);
-        assertJavaCheckPasses(11, true);
         assertJavaCheckPasses(17, false);
         assertJavaCheckPasses(17, true);
+        assertJavaCheckPasses(21, false);
+        assertJavaCheckPasses(21, true);
     }
 
     @Test
     void future() {
-        assertJavaCheckFails(12, false);
-        assertJavaCheckFails(13, false);
-        assertJavaCheckFails(14, false);
-        assertJavaCheckFails(15, false);
-        assertJavaCheckFails(16, false);
         assertJavaCheckFails(18, false);
         assertJavaCheckFails(19, false);
         assertJavaCheckFails(20, false);
-        assertJavaCheckPasses(12, true);
-        assertJavaCheckPasses(13, true);
-        assertJavaCheckPasses(14, true);
-        assertJavaCheckPasses(15, true);
-        assertJavaCheckPasses(16, true);
+        assertJavaCheckFails(22, false);
         assertJavaCheckPasses(18, true);
         assertJavaCheckPasses(19, true);
         assertJavaCheckPasses(20, true);
+        assertJavaCheckPasses(22, true);
     }
 
     private static void assertJavaCheckFails(int releaseVersion, boolean enableFutureJava) {

From e7f3e23342819b081e2451cb46fa0abe28e7e04b Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Tue, 11 Jun 2024 15:52:44 +0100
Subject: [PATCH 121/449] Refine form controls appearance (#9365)

---
 war/src/main/scss/abstracts/_theme.scss | 32 +++++++++++++++++--------
 war/src/main/scss/form/_checkbox.scss   |  1 +
 war/src/main/scss/form/_codemirror.scss | 10 ++++++++
 war/src/main/scss/form/_layout.scss     |  7 +++---
 war/src/main/scss/form/_radio.scss      |  2 +-
 war/src/main/scss/form/_search-bar.scss |  2 +-
 war/src/main/scss/form/_select.scss     |  4 ++--
 7 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss
index 673ba34dcfb4..c2af1a1ff06c 100644
--- a/war/src/main/scss/abstracts/_theme.scss
+++ b/war/src/main/scss/abstracts/_theme.scss
@@ -52,9 +52,9 @@ $semantics: (
   --dark-grey: #4d545d;
 
   // branding
-  --secondary: hsl(240, 10%, 50%);
-  --focus-input-border: #063f61;
-  --focus-input-glow: #{color.change(#0b6aa2, $alpha: 0.25)};
+  --secondary: rgb(96, 125, 159);
+  --focus-input-border: var(--accent-color);
+  --focus-input-glow: color-mix(in sRGB, var(--accent-color) 15%, transparent);
 
   // Deprecated
   --focus-btn-primary: #{color.change(#0b6aa2, $alpha: 0.5)};
@@ -277,10 +277,22 @@ $semantics: (
   --task-link-bg-color--hover: var(--very-light-grey);
 
   // Form
-  --section-padding: 1.75rem;
-  --input-color: var(--white);
-  --input-border: #c3ccd1;
-  --input-border-hover: #5c7889;
+  --section-padding: 1.625rem;
+  --input-color: color-mix(
+    in sRGB,
+    var(--text-color-secondary) 1.5%,
+    var(--background)
+  );
+  --input-border: color-mix(
+    in sRGB,
+    var(--text-color-secondary) 25%,
+    transparent
+  );
+  --input-border-hover: color-mix(
+    in sRGB,
+    var(--text-color-secondary) 50%,
+    transparent
+  );
   --input-hidden-password-bg-color: #f9f9f9;
   --form-item-max-width: min(65vw, 1600px);
   --form-item-max-width--medium: min(50vw, 1400px);
@@ -294,9 +306,9 @@ $semantics: (
     --form-item-max-width--small: 100%;
   }
 
-  --form-label-font-weight: 500;
-  --form-input-padding: 0.5rem;
-  --form-input-border-radius: 6px;
+  --form-label-font-weight: 450;
+  --form-input-padding: 0.625rem;
+  --form-input-border-radius: 0.625rem;
   --form-input-glow: 0 0 0 10px transparent;
   --form-input-glow--focus: 0 0 0 5px var(--focus-input-glow);
   --pre-background: rgba(0, 0, 0, 0.05);
diff --git a/war/src/main/scss/form/_checkbox.scss b/war/src/main/scss/form/_checkbox.scss
index 8d23d9e3977d..d9cd5f18c951 100644
--- a/war/src/main/scss/form/_checkbox.scss
+++ b/war/src/main/scss/form/_checkbox.scss
@@ -140,6 +140,7 @@
     box-shadow:
       0 0 0 10px transparent,
       inset 0 0 0 2px var(--input-border);
+    background: var(--input-color);
   }
 
   &::after {
diff --git a/war/src/main/scss/form/_codemirror.scss b/war/src/main/scss/form/_codemirror.scss
index 67520192c0e5..a34165e8ba57 100644
--- a/war/src/main/scss/form/_codemirror.scss
+++ b/war/src/main/scss/form/_codemirror.scss
@@ -42,6 +42,16 @@
   .CodeMirror-selected {
     background-color: var(--selection-color) !important;
   }
+
+  .CodeMirror-lines {
+    padding: var(--form-input-padding);
+  }
+
+  .CodeMirror-gutter-text {
+    padding: var(--form-input-padding) calc(var(--form-input-padding) * 0.5)
+      var(--form-input-padding) var(--form-input-padding);
+    color: var(--text-color-secondary);
+  }
 }
 
 .jenkins-codemirror-resizer {
diff --git a/war/src/main/scss/form/_layout.scss b/war/src/main/scss/form/_layout.scss
index 0214d596c112..e32b9db9e2c0 100644
--- a/war/src/main/scss/form/_layout.scss
+++ b/war/src/main/scss/form/_layout.scss
@@ -93,7 +93,7 @@
     background: var(--text-color);
     color: transparent;
     mask-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='262px' height='482px' viewBox='0 0 262 482' version='1.1' xmlns='http://www.w3.org/2000/svg'%3E%3Cg stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M69.9217381,109.622622 L69.9347383,109.509526 L69.9838606,109.158807 L70.0463523,108.766768 C70.2927563,107.286617 70.7336,105.509397 71.3554148,103.600821 C73.4488365,97.1753443 76.974163,91.0239622 81.9750299,85.3670497 C84.5508811,82.453282 87.4853512,79.7201177 90.8001215,77.1662697 C100.73686,69.5111158 114.003751,65.6584363 131.476234,65.4354882 C133.731084,65.4096204 135.996257,65.4453704 138.232058,65.5407008 L139.478148,65.6000218 C140.992957,65.679511 142.536904,65.7906863 144.04662,65.9294921 L145.210323,66.0424992 C145.886163,66.1116384 146.60564,66.1925244 147.313561,66.2795642 L148.414194,66.420922 L149.377674,66.5545415 L150.375686,66.7050246 L151.398071,66.8714663 L152.049055,66.9841252 L152.731845,67.1083183 L153.642724,67.2845248 L154.549432,67.4714994 C155.036905,67.5756456 155.574038,67.6978797 156.090422,67.8232778 L156.917997,68.0311744 C158.666031,68.484436 160.136789,68.9816723 161.141416,69.4394425 C170.146558,73.5618171 177.044937,78.1235016 182.224862,83.4639805 C188.857993,90.3027083 191.999176,97.8308192 191.999176,107.499034 C191.999176,119.466025 188.796962,127.918279 181.370643,136.250976 C181.093904,136.561492 180.816698,136.867422 180.538309,137.169526 L180.089688,137.652102 L179.736214,138.026258 L179.002023,138.784568 L178.579132,139.213445 L178.134441,139.655368 L177.707007,140.071619 L177.021999,140.726828 L176.298991,141.400731 L175.788688,141.867317 L175.318979,142.286805 L174.54297,142.970055 L173.990783,143.446079 L173.448394,143.905722 L172.625948,144.588916 L171.799887,145.262466 L170.811596,146.050172 L169.864089,146.789794 L169.222049,147.28309 L168.549302,147.793886 L167.493519,148.583956 L166.782836,149.108414 L165.65246,149.931951 L164.484527,150.770371 L163.266904,151.632649 L161.555386,152.827104 L160.682666,153.429152 L159.298283,154.375903 L157.864408,155.346877 L155.333592,157.040637 L153.750968,158.088827 L151.524574,159.551762 L148.580787,161.468911 L144.800696,163.908618 C105.775292,188.991858 87.997951,218.376069 87.997951,257.047472 L87.997951,283.286279 L88.0016284,283.748414 C88.3121212,301.66652 103.883328,316 122.998363,316 C142.328557,316 157.998775,301.353568 157.998775,283.286279 L157.998775,257.047472 L158.001383,256.432449 C158.064604,248.820487 159.375708,243.378146 162.208358,238.456376 C165.925109,231.998468 172.860638,225.357973 183.865352,218.206756 L186.747913,216.348707 L189.667785,214.457346 L192.470459,212.628123 L195.158954,210.857753 L197.739048,209.141153 L199.612339,207.881962 L201.424999,206.651521 L203.184757,205.444126 L204.893987,204.257626 L206.014818,203.471391 L207.63679,202.320739 L208.708154,201.551674 L209.751591,200.795045 L210.776652,200.043916 L211.783987,199.29767 L212.774236,198.555696 L213.748026,197.81739 L214.705977,197.082156 L215.983535,196.08689 L217.035512,195.253661 L217.94273,194.524595 L218.836751,193.796023 L219.718133,193.067399 L220.587422,192.33819 L221.445157,191.607874 L222.291869,190.87594 L223.128081,190.141889 L224.349696,189.048475 L225.176062,188.294328 L225.979581,187.549096 L227.15568,186.436436 L227.953672,185.666523 L228.73078,184.904536 L229.501513,184.136777 L230.633743,182.986693 L231.403964,182.189294 L232.15663,181.397931 L232.905389,180.598844 L233.650817,179.791592 L234.393505,178.975725 L235.134055,178.150785 C253.063009,158.033696 262,134.778085 262,107.499034 C262,81.4013251 252.315995,58.3143983 234.08637,39.5197386 C222.737894,27.8195118 209.350637,18.7642961 192.813373,11.0878005 L191.857565,10.6472715 C176.144833,3.48753386 154.016249,-0.255558118 130.568693,0.0135609187 C97.385459,0.43694412 69.212387,9.00946009 46.2762841,26.6791815 C39.5211589,31.8836333 33.4271839,37.5663685 28.0119541,43.6920026 C17.038175,56.105392 9.16079603,69.8997291 4.39056696,84.5413054 C2.80350137,89.4125897 1.62984552,94.1870463 0.865737279,98.781619 L0.782196688,99.2931802 L0.614828552,100.383438 L0.559658337,100.765066 L0.426811303,101.749189 L0.318522027,102.638537 L0.226704214,103.487005 L0.123646908,104.617718 L0.0652556787,105.43714 L0.0342145373,105.994277 C-0.81250758,124.122996 14.1596716,139.394013 33.4714881,140.181654 L33.9656162,140.198367 L34.5332314,140.20872 C53.0445487,140.409453 68.5022596,127.170521 69.8964399,109.989591 L69.9217381,109.622622 Z' fill='currentColor' fill-rule='nonzero'%3E%3C/path%3E%3Ccircle fill='currentColor' cx='123' cy='434' r='48'%3E%3C/circle%3E%3C/g%3E%3C/svg%3E");
-    mask-size: 50% 50%;
+    mask-size: 45% 45%;
     mask-position: center;
     mask-repeat: no-repeat;
   }
@@ -102,7 +102,7 @@
     content: "";
     position: absolute;
     inset: 0;
-    background: var(--text-color);
+    background: var(--text-color-secondary);
     opacity: 0.1;
     border-radius: inherit;
     transition: var(--standard-transition);
@@ -112,7 +112,8 @@
     content: "";
     position: absolute;
     inset: 0;
-    border: 1px solid rgba(125, 125, 125, 0.35);
+    border: 1px solid
+      color-mix(in sRGB, var(--text-color-secondary), transparent);
     box-shadow: var(--form-input-glow);
     border-radius: inherit;
     opacity: 0.1;
diff --git a/war/src/main/scss/form/_radio.scss b/war/src/main/scss/form/_radio.scss
index 68f95df38f4b..38052a82bcfe 100644
--- a/war/src/main/scss/form/_radio.scss
+++ b/war/src/main/scss/form/_radio.scss
@@ -104,7 +104,7 @@
       width: 22px;
       height: 22px;
       border-radius: 50%;
-      background: transparent;
+      background: var(--input-color);
       box-shadow:
         0 0 0 10px transparent,
         inset 0 0 0 2px var(--input-border);
diff --git a/war/src/main/scss/form/_search-bar.scss b/war/src/main/scss/form/_search-bar.scss
index 81f7450570e4..0a04e25b331c 100644
--- a/war/src/main/scss/form/_search-bar.scss
+++ b/war/src/main/scss/form/_search-bar.scss
@@ -21,7 +21,7 @@
       0 0 0 2px transparent,
       0 0 0 12px transparent;
     transition: var(--standard-transition);
-    font-weight: 500;
+    font-weight: 450;
     height: var(--search-bar-height);
 
     &::placeholder {
diff --git a/war/src/main/scss/form/_select.scss b/war/src/main/scss/form/_select.scss
index acdedfc17728..e8b2b2973b94 100644
--- a/war/src/main/scss/form/_select.scss
+++ b/war/src/main/scss/form/_select.scss
@@ -21,10 +21,10 @@
     appearance: none;
     display: block;
     border: 2px solid var(--input-border);
-    padding: 8px;
+    padding: var(--form-input-padding);
     width: 100% !important; // TODO remove important after https://github.com/jenkinsci/credentials-plugin/pull/255
     max-width: 100% !important; // TODO remove important after https://github.com/jenkinsci/credentials-plugin/pull/255
-    border-radius: 6px;
+    border-radius: var(--form-input-border-radius);
     box-shadow: 0 0 0 10px transparent;
     transition: var(--standard-transition);
     min-height: 38px;

From a2a852b0ba4882a0a905c5584de48c9f312e0ce0 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Tue, 11 Jun 2024 22:49:39 +0200
Subject: [PATCH 122/449] Needs Java 17 for development now (#9376)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 77c012b44c68..58af2c65852e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ 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) 11, 17 or 21.
+   - 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.
    - Apache Maven 3.8.1 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.

From d2d1d0d20fe932846c32d105d8b968f569884004 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 12 Jun 2024 22:04:42 -0700
Subject: [PATCH 123/449] Use pattern matching for `instanceof` (#9382)

---
 core/src/main/java/hudson/EnvVars.java                   | 3 +--
 core/src/main/java/hudson/FilePath.java                  | 3 +--
 core/src/main/java/hudson/Functions.java                 | 9 +++------
 core/src/main/java/hudson/model/AbstractBuild.java       | 3 +--
 core/src/main/java/hudson/model/AbstractItem.java        | 3 +--
 core/src/main/java/hudson/model/AbstractProject.java     | 3 +--
 .../java/hudson/model/BooleanParameterDefinition.java    | 3 +--
 core/src/main/java/hudson/model/Descriptor.java          | 9 +++------
 core/src/main/java/hudson/model/Job.java                 | 6 ++----
 core/src/main/java/hudson/model/View.java                | 6 ++----
 core/src/main/java/hudson/util/DescribableList.java      | 3 +--
 core/src/main/java/hudson/views/ListViewColumn.java      | 3 +--
 .../jenkins/fingerprints/FileFingerprintStorage.java     | 3 +--
 core/src/main/java/jenkins/model/Jenkins.java            | 3 +--
 .../jenkins/security/ResourceDomainConfiguration.java    | 3 +--
 core/src/main/java/jenkins/widgets/HistoryPageEntry.java | 3 +--
 test/src/test/java/hudson/PluginManagerTest.java         | 3 +--
 17 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java
index 286151e46bf7..97def5f11a7f 100644
--- a/core/src/main/java/hudson/EnvVars.java
+++ b/core/src/main/java/hudson/EnvVars.java
@@ -114,8 +114,7 @@ public EnvVars(@NonNull Map<String, String> m) {
 
         // because of the backward compatibility, some parts of Jenkins passes
         // EnvVars as Map<String,String> so downcasting is safer.
-        if (m instanceof EnvVars) {
-            EnvVars lhs = (EnvVars) m;
+        if (m instanceof EnvVars lhs) {
             this.platform = lhs.platform;
         }
     }
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 44a39b22836f..99199e8eb461 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -997,8 +997,7 @@ private boolean installIfNecessaryFrom(@NonNull URL archive, @NonNull TaskListen
                 }
             }
 
-            if (con instanceof HttpURLConnection) {
-                HttpURLConnection httpCon = (HttpURLConnection) con;
+            if (con instanceof HttpURLConnection httpCon) {
                 int responseCode = httpCon.getResponseCode();
                 if (responseCode == HttpURLConnection.HTTP_MOVED_PERM
                         || responseCode == HttpURLConnection.HTTP_MOVED_TEMP) {
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 2e6abc978540..f9ec7f6baebe 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -316,8 +316,7 @@ public static void initPageVariables(JellyContext context) {
      */
     public static <B> Class getTypeParameter(Class<? extends B> c, Class<B> base, int n) {
         Type parameterization = Types.getBaseClass(c, base);
-        if (parameterization instanceof ParameterizedType) {
-            ParameterizedType pt = (ParameterizedType) parameterization;
+        if (parameterization instanceof ParameterizedType pt) {
             return Types.erasure(Types.getTypeArgument(pt, n));
         } else {
             throw new AssertionError(c + " doesn't properly parameterize " + base);
@@ -1979,8 +1978,7 @@ public String getServerName() {
     @Deprecated
     public String getCheckUrl(String userDefined, Object descriptor, String field) {
         if (userDefined != null || field == null)   return userDefined;
-        if (descriptor instanceof Descriptor) {
-            Descriptor d = (Descriptor) descriptor;
+        if (descriptor instanceof Descriptor d) {
             return d.getCheckUrl(field);
         }
         return null;
@@ -1993,8 +1991,7 @@ public String getCheckUrl(String userDefined, Object descriptor, String field) {
     public void calcCheckUrl(Map attributes, String userDefined, Object descriptor, String field) {
         if (userDefined != null || field == null)   return;
 
-        if (descriptor instanceof Descriptor) {
-            Descriptor d = (Descriptor) descriptor;
+        if (descriptor instanceof Descriptor d) {
             CheckMethod m = d.getCheckMethod(field);
             attributes.put("checkUrl", m.toStemUrl());
             attributes.put("checkDependsOn", m.getDependsOn());
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index bcd29082ebe1..85d62df78896 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -607,8 +607,7 @@ protected Launcher createLauncher(@NonNull BuildListener listener) throws IOExce
             final Node currentNode = getCurrentNode();
             Launcher l = currentNode.createLauncher(listener);
 
-            if (project instanceof BuildableItemWithBuildWrappers) {
-                BuildableItemWithBuildWrappers biwbw = (BuildableItemWithBuildWrappers) project;
+            if (project instanceof BuildableItemWithBuildWrappers biwbw) {
                 for (BuildWrapper bw : biwbw.getBuildWrappersList())
                     l = bw.decorateLauncher(AbstractBuild.this, l, listener);
             }
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 5bd1d6a02d79..614b1c13eb4d 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -551,8 +551,7 @@ public final String getUrl() {
             List<Ancestor> ancestors = req.getAncestors();
             if (!ancestors.isEmpty()) {
                 Ancestor last = ancestors.get(ancestors.size() - 1);
-                if (last.getObject() instanceof View) {
-                    View view = (View) last.getObject();
+                if (last.getObject() instanceof View view) {
                     if (view.getOwner().getItemGroup() == getParent() && !view.isDefault()) {
                         // Showing something inside a view, so should use that as the base URL.
                         String prefix = req.getContextPath() + "/";
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 5de1775b11cd..c323f50bca0b 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -518,8 +518,7 @@ private AbstractBuild getBuildForDeprecatedMethods() {
         Executor e = Executor.currentExecutor();
         if (e != null) {
             Executable exe = e.getCurrentExecutable();
-            if (exe instanceof AbstractBuild) {
-                AbstractBuild b = (AbstractBuild) exe;
+            if (exe instanceof AbstractBuild b) {
                 if (b.getProject() == this)
                     return b;
             }
diff --git a/core/src/main/java/hudson/model/BooleanParameterDefinition.java b/core/src/main/java/hudson/model/BooleanParameterDefinition.java
index 5e270ef46da1..6e9db32216fd 100644
--- a/core/src/main/java/hudson/model/BooleanParameterDefinition.java
+++ b/core/src/main/java/hudson/model/BooleanParameterDefinition.java
@@ -59,8 +59,7 @@ public BooleanParameterDefinition(@NonNull String name, boolean defaultValue, @C
 
     @Override
     public ParameterDefinition copyWithDefaultValue(ParameterValue defaultValue) {
-        if (defaultValue instanceof BooleanParameterValue) {
-            BooleanParameterValue value = (BooleanParameterValue) defaultValue;
+        if (defaultValue instanceof BooleanParameterValue value) {
             return new BooleanParameterDefinition(getName(), value.value, getDescription());
         } else {
             return this;
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 32b9f1dd0cf0..07789531e94d 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -294,8 +294,7 @@ protected Descriptor() {
 
         // detect an type error
         Type bt = Types.getBaseClass(getClass(), Descriptor.class);
-        if (bt instanceof ParameterizedType) {
-            ParameterizedType pt = (ParameterizedType) bt;
+        if (bt instanceof ParameterizedType pt) {
             // this 't' is the closest approximation of T of Descriptor<T>.
             Class t = Types.erasure(pt.getActualTypeArguments()[0]);
             if (!t.isAssignableFrom(clazz))
@@ -688,8 +687,7 @@ public Object instantiate(Class actualType, JSONObject json) {
 
         @Override
         public Object onConvert(Type targetType, Class targetTypeErasure, Object jsonSource) {
-            if (jsonSource instanceof JSONObject) {
-                JSONObject json = (JSONObject) jsonSource;
+            if (jsonSource instanceof JSONObject json) {
                 if (isApplicable(targetTypeErasure, json)) {
                     LOGGER.log(Level.FINE, "switching to newInstance {0} {1}", new Object[] {targetTypeErasure.getName(), json});
                     try {
@@ -895,8 +893,7 @@ protected final String getViewPage(Class<?> clazz, String pageName) {
     protected List<String> getPossibleViewNames(String baseName) {
         List<String> names = new ArrayList<>();
         for (Facet f : WebApp.get(Jenkins.get().servletContext).facets) {
-            if (f instanceof JellyCompatibleFacet) {
-                JellyCompatibleFacet jcf = (JellyCompatibleFacet) f;
+            if (f instanceof JellyCompatibleFacet jcf) {
                 for (String ext : jcf.getScriptExtensions())
                     names.add(baseName + ext);
             }
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 92f1d374fb08..4bd28ff2e325 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -266,8 +266,7 @@ public void onCopied(Item src, Item item) {
             // If any of the other ItemListeners modify the job, they effect
             // a save, which will clear the holdOffBuildUntilUserSave and
             // causing a regression of JENKINS-2494
-            if (item instanceof Job) {
-                Job job = (Job) item;
+            if (item instanceof Job job) {
                 synchronized (job) {
                     job.holdOffBuildUntilUserSave = false;
                 }
@@ -1110,8 +1109,7 @@ class FeedItem {
 
         List<FeedItem> entries = new ArrayList<>();
         String scmDisplayName = "";
-        if (this instanceof SCMTriggerItem) {
-            SCMTriggerItem scmItem = (SCMTriggerItem) this;
+        if (this instanceof SCMTriggerItem scmItem) {
             List<String> scmNames = new ArrayList<>();
             for (SCM s : scmItem.getSCMs()) {
                 scmNames.add(s.getDescriptor().getDisplayName());
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index e3775143730a..7b1bd98eb9ee 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -510,8 +510,7 @@ private boolean filterQueueItemTest(Queue.Item item, Collection<TopLevelItem> vi
             }
         }
         // Check root project for sub-job projects (e.g. matrix jobs).
-        if (item.task instanceof AbstractProject<?, ?>) {
-            AbstractProject<?, ?> project = (AbstractProject<?, ?>) item.task;
+        if (item.task instanceof AbstractProject<?, ?> project) {
             return viewItems.contains(project.getRootProject());
         }
         return false;
@@ -855,8 +854,7 @@ public BuildTimelineWidget getTimeline() {
     public void doRssLatest(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
         List<Run> lastBuilds = new ArrayList<>();
         for (TopLevelItem item : getItems()) {
-            if (item instanceof Job) {
-                Job job = (Job) item;
+            if (item instanceof Job job) {
                 Run lb = job.getLastBuild();
                 if (lb != null)    lastBuilds.add(lb);
             }
diff --git a/core/src/main/java/hudson/util/DescribableList.java b/core/src/main/java/hudson/util/DescribableList.java
index a73dac196b2c..9c62af2f191a 100644
--- a/core/src/main/java/hudson/util/DescribableList.java
+++ b/core/src/main/java/hudson/util/DescribableList.java
@@ -219,8 +219,7 @@ public void rebuildHetero(StaplerRequest req, JSONObject formData, Collection<?
      */
     public void buildDependencyGraph(AbstractProject owner, DependencyGraph graph) {
         for (Object o : this) {
-            if (o instanceof DependencyDeclarer) {
-                DependencyDeclarer dd = (DependencyDeclarer) o;
+            if (o instanceof DependencyDeclarer dd) {
                 try {
                     dd.buildDependencyGraph(owner, graph);
                 } catch (RuntimeException e) {
diff --git a/core/src/main/java/hudson/views/ListViewColumn.java b/core/src/main/java/hudson/views/ListViewColumn.java
index 1796f4cc495c..91e93e2145da 100644
--- a/core/src/main/java/hudson/views/ListViewColumn.java
+++ b/core/src/main/java/hudson/views/ListViewColumn.java
@@ -157,8 +157,7 @@ private static List<ListViewColumn> createDefaultInitialColumnList(List<Descript
         final JSONObject emptyJSON = new JSONObject();
         for (Descriptor<ListViewColumn> d : descriptors)
             try {
-                if (d instanceof ListViewColumnDescriptor) {
-                    ListViewColumnDescriptor ld = (ListViewColumnDescriptor) d;
+                if (d instanceof ListViewColumnDescriptor ld) {
                     if (!ld.shownByDefault()) {
                         continue;   // skip this
                     }
diff --git a/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java b/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java
index d3154e6db6a3..409788ba5706 100644
--- a/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java
+++ b/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java
@@ -101,11 +101,10 @@ public FileFingerprintStorage() {}
 
         try {
             Object loaded = configFile.read();
-            if (!(loaded instanceof Fingerprint)) {
+            if (!(loaded instanceof Fingerprint f)) {
                 throw new IOException("Unexpected Fingerprint type. Expected " + Fingerprint.class + " or subclass but got "
                         + (loaded != null ? loaded.getClass() : "null"));
             }
-            Fingerprint f = (Fingerprint) loaded;
             if (f.getPersistedFacets() == null) {
                 logger.log(Level.WARNING, "Malformed fingerprint {0}: Missing facets", configFile);
                 Files.deleteIfExists(Util.fileToPath(file));
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 7fe515fddf0e..c79f714bc637 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -3106,8 +3106,7 @@ public Item getItem(String pathName, ItemGroup context) {
                 continue;
             }
 
-            if (ctx instanceof ItemGroup) {
-                ItemGroup g = (ItemGroup) ctx;
+            if (ctx instanceof ItemGroup g) {
                 Item i = g.getItem(s);
                 if (i == null || !i.hasPermission(Item.READ)) { // TODO consider DISCOVER
                     ctx = null;    // can't go up further
diff --git a/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java b/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java
index 5c569ce40d50..cd552fc65130 100644
--- a/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java
+++ b/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java
@@ -150,8 +150,7 @@ private FormValidation checkUrl(String resourceRootUrlString, boolean allowOnlin
         // Send a request to /instance-identity/ at the resource root URL and check whether it is this Jenkins
         try {
             URLConnection urlConnection = new URI(resourceRootUrlString + "instance-identity/").toURL().openConnection();
-            if (urlConnection instanceof HttpURLConnection) {
-                HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
+            if (urlConnection instanceof HttpURLConnection httpURLConnection) {
                 int responseCode = httpURLConnection.getResponseCode();
 
                 if (responseCode == 200) {
diff --git a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java
index ac5e0a772692..98f0a7aac58e 100644
--- a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java
+++ b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java
@@ -57,8 +57,7 @@ public long getEntryId() {
     protected static long getEntryId(@NonNull Object entry) {
         if (entry instanceof QueueItem) {
             return ((QueueItem) entry).getId();
-        } else if (entry instanceof Run) {
-            Run run = (Run) entry;
+        } else if (entry instanceof Run run) {
             return Long.MIN_VALUE + run.getNumber();
         } else if (entry instanceof Number) {
             // Used for testing purposes because of JENKINS-30899 and JENKINS-30909
diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
index 336f4af6f7c5..91a236db0266 100644
--- a/test/src/test/java/hudson/PluginManagerTest.java
+++ b/test/src/test/java/hudson/PluginManagerTest.java
@@ -578,8 +578,7 @@ private void dynamicLoadAndDisable(String plugin) throws IOException, Interrupte
             Thread.sleep(100);
             done = true;
             for (UpdateCenterJob job : r.jenkins.getUpdateCenter().getJobs()) {
-                if (job instanceof UpdateCenter.DownloadJob) {
-                    UpdateCenter.DownloadJob j = (UpdateCenter.DownloadJob) job;
+                if (job instanceof UpdateCenter.DownloadJob j) {
                     assertFalse(j.status instanceof UpdateCenter.DownloadJob.Failure);
                     done &= !(j.status instanceof UpdateCenter.DownloadJob.Pending ||
                             j.status instanceof UpdateCenter.DownloadJob.Installing);

From 975b55aeea8870367b5a8fdc07f16418383c842a Mon Sep 17 00:00:00 2001
From: KevinRealAlcalde <95503519+KevinRealAlcalde@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:43:46 +0100
Subject: [PATCH 124/449] Fix description of View/Read permission (#9375)

Update Messages.properties
---
 core/src/main/resources/hudson/model/Messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index 2b1a6559fa58..9cd382511856 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -279,7 +279,7 @@ View.DeletePermission.Description=\
 View.ConfigurePermission.Description=\
   This permission allows users to change the configuration of views.
 View.ReadPermission.Description=\
-  This permission allows users to see views (implied by generic read access).
+  This permission allows users to see views.
 View.MissingMode=No view type is specified
 View.DisplayNameNotUniqueWarning=The display name, "{0}", is already in use by another view and \
   could cause confusion and delay.

From 2077112c4c5139672bdc3d0f182975f1ac392f1a Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:44:43 +0100
Subject: [PATCH 125/449] Fix badge color in dropdowns (#9381)

Init
---
 war/src/main/js/components/dropdowns/templates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/src/main/js/components/dropdowns/templates.js b/war/src/main/js/components/dropdowns/templates.js
index 9b97c8cd7f66..713bf8b6ce0f 100644
--- a/war/src/main/js/components/dropdowns/templates.js
+++ b/war/src/main/js/components/dropdowns/templates.js
@@ -60,7 +60,7 @@ function menuItem(options) {
           ${label}
                     ${
                       itemOptions.badge != null
-                        ? `<span class="jenkins-dropdown__item__badge jenkins-badge alert-${badgeSeverity}" tooltip="${badgeTooltip}">${badgeText}</span>`
+                        ? `<span class="jenkins-dropdown__item__badge jenkins-badge jenkins-!-${badgeSeverity}-color" tooltip="${badgeTooltip}">${badgeText}</span>`
                         : ``
                     }
           ${

From 3081a5cb5a1d0b64934672bdc42a9a3502a16edf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 10:53:35 -0700
Subject: [PATCH 126/449] Bump org.springframework:spring-framework-bom from
 5.3.36 to 5.3.37 (#9385)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 14fcd61775ed..4bc7502b04ac 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -56,7 +56,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.3.36</version>
+        <version>5.3.37</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From f983c8ac6a0984cb2139db94d54a3502be162926 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 10:54:00 -0700
Subject: [PATCH 127/449] Bump io.jenkins.plugins:commons-text-api from
 1.11.0-109.vfe16c66636eb_ to 1.12.0-119.v73ef73f2345d (#9386)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 3f34e19b8925..6e7ed30ed48d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -67,7 +67,7 @@ THE SOFTWARE.
         <!-- RequireUpperBoundDeps between checks-api, plugin-util-api, and font-awesome-api -->
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>commons-text-api</artifactId>
-        <version>1.11.0-109.vfe16c66636eb_</version>
+        <version>1.12.0-119.v73ef73f2345d</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps between bootstrap5-api and echarts-api -->
diff --git a/war/pom.xml b/war/pom.xml
index d654d67d4d50..a3e8b90c7017 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -500,7 +500,7 @@ THE SOFTWARE.
                   <!-- dependency of bootstrap5-api, checks-api, echarts-api, font-awesome-api, jquery3-api, and plugin-util-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>commons-text-api</artifactId>
-                  <version>1.11.0-109.vfe16c66636eb_</version>
+                  <version>1.12.0-119.v73ef73f2345d</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 9459e1e0616070d0ad813e580efe8665f16cb405 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 14:56:09 -0700
Subject: [PATCH 128/449] Bump stapler.version from 1872.ve203fa_6b_b_98d to
 1880.vb_6d94a_3b_05db_ (#9388)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 4bc7502b04ac..1086bd414607 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <slf4jVersion>2.0.13</slf4jVersion>
-    <stapler.version>1872.ve203fa_6b_b_98d</stapler.version>
+    <stapler.version>1880.vb_6d94a_3b_05db_</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 

From 0419465f4dea7652dd9d85ae8a53a70a46fd834b Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Fri, 14 Jun 2024 14:21:23 +0100
Subject: [PATCH 129/449] Rewrite the build history widget (#9148)

* Squashed commit of the following:

commit 1ce4cb39c7df313ad000225f1f06c21d9d55d7d8
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Tue Apr 9 09:22:36 2024 +0100

    Rename classes

commit 107d7947874a974fc16df00dcdef46a4d55ed0bc
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Tue Apr 9 08:59:54 2024 +0100

    Update HistoryWidget.java

commit 13575bc27caaf902c6685e8dfdb8ecd2ffc6e64a
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Tue Apr 9 08:59:29 2024 +0100

    Hide buttons

commit e5de5465814c810f9bb09722a00727f73b1158b9
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Tue Apr 9 08:39:04 2024 +0100

    Rename classes

commit 47c84afcd1c4e45f1e202a1a38fc68ef9ec8c702
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 23:21:36 2024 +0100

    Add animation

commit e7432b693357b800b91bf355a610fbd3ab62223e
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 23:03:19 2024 +0100

    Add navigation buttons

commit 448a09419a0706bd83fb73b555ef55c54916da13
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 22:29:32 2024 +0100

    Update _dashboard.scss

commit bb85734be0884e7cb244b13267970722db2f8c05
Merge: c451a7223c 27433f19f3
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 22:23:38 2024 +0100

    Merge branch 'master' into new-build-history-2

commit c451a7223cfc68651d11c8f83134c0ee000db363
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 13:17:05 2024 +0100

    Update _job.scss

commit 960b162dcd95715f6d1567f57d53fcf79591966d
Merge: d020eb66e5 af655e3fdc
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 13:16:54 2024 +0100

    Merge branch 'remove-table-usage' into new-build-history-2

commit af655e3fdce9d0aeb7d741a143777effffbd779f
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 13:13:38 2024 +0100

    Init

commit d020eb66e54a63c880dc3c335485aff92c86aaad
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 13:09:57 2024 +0100

    Update card.jelly

commit 81bc1d45f17adb021d67c15531d51b8421f78132
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 13:07:41 2024 +0100

    Update _buttons.scss

commit 4023460b9aa9243f45870e98ca2299a91263bcce
Merge: 875fb8fb4b da5f593fb0
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Apr 8 13:03:18 2024 +0100

    Merge branch 'master' into new-build-history-2

commit 875fb8fb4baa86c45284d71ee6f5a2a39af68aa0
Merge: 2dc9964871 fe60facf91
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Apr 6 19:29:20 2024 +0100

    Merge branch 'master' into new-build-history-2

commit 2dc9964871734a6e8386392d32a13366bc3752e9
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Apr 5 22:17:08 2024 +0100

    Reset files

commit 2da1e14f046e518bc9c22050ddf9f394d65bbc31
Merge: dce466a846 b9fac75ac8
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Apr 5 22:14:46 2024 +0100

    Merge branch 'master' into new-build-history-2

commit dce466a846b5e7bcad40625c8c5bcbd6c6477cf8
Merge: 935c16e1c1 0eed048866
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Wed Feb 28 13:55:35 2024 +0000

    Merge branch 'master' into new-build-history-2

commit 935c16e1c1033c8e33fff49b0e47f9a47615f540
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Feb 18 17:54:32 2024 +0000

    Update entry.jelly

commit 2a19a045970d65e446e4ce894d769fb27bdfd921
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Feb 18 17:51:58 2024 +0000

    Rename classes

commit 3ef46abe52ba75573bb4e634ad3baad95c2b07ba
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Feb 18 17:29:25 2024 +0000

    Update index.jelly

commit da0b2126cdc5f959905ae7eba514a68f891f6620
Merge: 281fac04c0 9d9e2ab467
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Feb 18 17:27:12 2024 +0000

    Merge branch 'revamp-dropdowns' into new-build-history-2

commit 281fac04c00e25ab05ff21c71ab30b263d0e3b9b
Merge: 9c69bd02be a6423541f0
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Feb 18 17:19:14 2024 +0000

    Merge branch 'master' into new-build-history-2

commit 9d9e2ab4673136cb41f1cd948676fe2aaf8b0c52
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Feb 10 19:39:24 2024 +0000

    Update templates.js

commit 1c19e431cee21bcbd43bfc1d5d675556dc9c5a4c
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Feb 10 19:38:13 2024 +0000

    Add clazz

commit 8b944e9e3fe9369af00621c20a14d9d527cac12f
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Feb 10 15:19:30 2024 +0000

    Update utils.js

commit 069fefbe36edca7203d3215bdd3d76868d9402fd
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Feb 10 13:23:16 2024 +0000

    Linting

commit 72707122491b727296200ad9111f15f29ed826d2
Merge: 9865811d38 a6423541f0
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Feb 10 12:20:02 2024 +0000

    Merge branch 'master' into revamp-dropdowns

commit 9865811d3879c0f3450285303e70d8349d49aced
Merge: 1e22c34016 86d39dd23b
Author: Mark Waite <mark.earl.waite@gmail.com>
Date:   Thu Jan 18 05:39:13 2024 -0700

    Merge branch 'master' into revamp-dropdowns

commit 9c69bd02bebcc13b695f112952a0ec97b297a8bb
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Jan 14 13:56:49 2024 +0000

    Push

commit 347e966aebbe013f171329c4fb00dee4acd27b33
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Jan 14 13:53:52 2024 +0000

    Update filter-build-history.js

commit 0b4a5dd5f4834824d70324b0698f9194a2ffb64b
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Jan 14 13:49:54 2024 +0000

    Renam

commit a8277bf932fc3ff5c99ec9f3496c05ed977e7990
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Jan 14 13:46:53 2024 +0000

    Fix

commit 855bf1317e8d7187cf4b2016f8571379c841ba91
Merge: 61b0a87e6c 1eb29a8792
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Jan 14 13:38:51 2024 +0000

    Merge branch 'master' into new-build-history-2

commit 1e22c340167b851096e40bce0f3601e075ec0db5
Merge: 44981c2a66 48661db9d1
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Jan 14 13:33:14 2024 +0000

    Merge branch 'master' into revamp-dropdowns

commit 44981c2a6654374500781996e2215736878f9109
Merge: 0075375c9a 1eb29a8792
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Jan 8 21:14:51 2024 +0000

    Merge branch 'master' into revamp-dropdowns

commit 0075375c9a82ac6f80e60eeb9d72e5c03a4e2f4f
Merge: 2dd9e32fab 78cdaa9f29
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Jan 4 13:26:24 2024 +0000

    Merge branch 'master' into revamp-dropdowns

commit 2dd9e32fab3b699e5cd5130b0a37df02cf4e28de
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Jan 4 13:24:53 2024 +0000

    Remove translations

commit 6800c8886a064faa7d23b7e77f759a74ce7f4075
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Jan 4 13:16:19 2024 +0000

    Update header.jelly

commit 1c3961bb64ade88f1c327d48e100611c951bd1f7
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Jan 4 13:15:49 2024 +0000

    Add additional docs

commit 163be529e7dc8c83a8796b8b782eb96ed6444366
Merge: 4cc43e47f9 444f2de993
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Wed Jan 3 21:22:20 2024 +0000

    Merge branch 'master' into revamp-dropdowns

commit 61b0a87e6c3412496e65269e20055d6123d9adb8
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 14 19:38:45 2023 +0000

    More

commit dcd6aaa54576bd1524d071b4cbe75d51aa4244f8
Merge: 0c40b9f3fc edce488000
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 14 19:38:25 2023 +0000

    Merge branch 'stop-button' into new-build-history-2

commit edce4880007e6863f283e8cdebd42fbfa6edb734
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 14 16:06:00 2023 +0000

    Tidy up

commit 157ba0b5bc9369317a393d1d6279752d3fa4cf59
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 14 16:04:46 2023 +0000

    Fix i18n

commit a112bd90c16449ec3a82bf9ca0d64e51913950e5
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Wed Dec 13 22:57:17 2023 +0000

    Update _buttons.scss

commit 91751cf650143442c71f11f10092545dd1753cb0
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Wed Dec 13 22:39:18 2023 +0000

    Update executors.jelly

commit cd89aeabf45e530ab947bfda4e44e8e41945292d
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Wed Dec 13 22:31:06 2023 +0000

    Fixes

commit 1384091663fcd4ba5d584f152dd20c7ea95b5c9b
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Wed Dec 13 22:28:54 2023 +0000

    Init

commit 0c40b9f3fcb4f12fba2f0e0d45bffd94bb1e196b
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Wed Dec 13 16:50:53 2023 +0000

    Update _buttons.scss

commit 50fe8fc74312296ba6ae1b4a43f6a67680846970
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Wed Dec 13 13:13:10 2023 +0000

    add view transitions

commit d1fd7a9a93b241e93b18ed97af696bd32997d8b7
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Tue Dec 12 20:25:44 2023 +0000

    Tidy up

commit 512b9a1baaa8482aa597785a92e6183316f60030
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Tue Dec 12 19:29:16 2023 +0000

    Push

commit 4f1569079c353c0eddd5f665867d4239a35d8797
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Dec 11 23:30:09 2023 +0000

    push

commit ad75b0f10f5afae5b61e2ac97d44b51ede5801a4
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Dec 11 23:24:11 2023 +0000

    Update _buttons.scss

commit cec222e3bdd9104095abfaa82f07e953fa69d097
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Dec 11 23:23:52 2023 +0000

    Update _buttons.scss

commit 4cc43e47f94abd36690f666ec6d2737ddf7d1ba9
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Dec 10 16:04:28 2023 +0000

    Add docs

commit a4c7f4f28cbced0f89af992095e19cdfcb9cd981
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Dec 10 16:00:23 2023 +0000

    Update taglib

commit c01db44de32a02e9c2ec87807eb82fd575ae52e2
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Dec 10 15:56:50 2023 +0000

    Init

commit 21bb3f4262cf65d30c48b76dc43b16a424d357ca
Merge: d3e2920434 428d0e560a
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Dec 10 13:22:00 2023 +0000

    Merge branch 'restyle-cards' into new-build-history-2

commit 428d0e560afcb2096a914debf21fcaba099a7ed8
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 7 20:17:10 2023 +0000

    Lower weight

commit ac5c255530fbda6fb0143f0e3009948685ae1bf8
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 7 20:15:28 2023 +0000

    Remove more bold weights

commit 2922a690bb3889faa2c95574181a47ffbb8e999d
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 7 20:11:33 2023 +0000

    Update _style.scss

commit 9657d460acfbd9e1f70ec7bec66817717d264d6c
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 7 20:06:16 2023 +0000

    Init

commit d3e2920434d44a45e968392c7617ad1ba140a062
Merge: a2bd9a08b2 cabc8f67b9
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Thu Dec 7 19:50:43 2023 +0000

    Merge branch 'master' into new-build-history-2

commit a2bd9a08b2679cc706f89cd12908197bf0244b13
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sun Nov 26 11:58:22 2023 +0000

    Fixes

commit 7cda5049b75bc7e7d7dcc8516ac6b3983d17b3b0
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 12:28:04 2023 +0000

    Working build

commit abd994ebe9680f846e13029faa44a2119c861345
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 11:58:42 2023 +0000

    Working build

commit 9b6defbf444b35127a81bb4cfd298f7648704e49
Merge: 29fcb64a74 7a0e57e35c
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 11:51:24 2023 +0000

    Merge branch 'progress-bar-new' into new-build-history-2

commit 29fcb64a74e37b445cde8b1847a6be988ad3b85c
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 11:51:10 2023 +0000

    More

commit 2f946d3f6494223351fc9da3a98654b9a666f766
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 09:17:06 2023 +0000

    Update _buttons.scss

commit f5474b33429ff8615c74e7be0cf622904c177a65
Merge: 00c3879a27 982bc48fa0
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 09:16:14 2023 +0000

    Merge branch 'use-symbols-for-build-status-new' into new-build-history-2

commit 982bc48fa0595221fac29f597090733b33be036a
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 09:15:56 2023 +0000

    Fix app bar build status icon being incorrect

commit 00c3879a2740e40d81d65463028c82f32782fecf
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 09:12:10 2023 +0000

    Fixes

commit a4960e9f2c9b9c17ec6f85fd24ef98ca7362455e
Merge: d28aada2e1 c6f5db0be7
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 08:56:01 2023 +0000

    Merge branch 'use-symbols-for-build-status-new' into new-build-history-2

commit d28aada2e1d5434a542d95afadc4c582a691319a
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 08:55:18 2023 +0000

    Update _buttons.scss

commit 1d24a19982838f50a6aa6b4510c0fe1090eef364
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Sat Nov 25 08:52:58 2023 +0000

    Init

commit 7a0e57e35c71073258a5635ebba1a87d5456aeda
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Nov 24 21:19:23 2023 +0000

    More

commit 67d4264da9a9ff8539ea74f7462b111d7da46f82
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Nov 24 21:17:09 2023 +0000

    Update _spinner.scss

commit 9befc76209eede89b3e3fd9d124c6ac92ee75c81
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Nov 24 21:07:55 2023 +0000

    Update _spinner.scss

commit 528b46acb3be57f43cf18f09a46cd7caa4ba2120
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Nov 24 21:01:06 2023 +0000

    More

commit ea0c4878137141193ece81a1970007f34e603478
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Nov 24 20:36:53 2023 +0000

    Init

commit c6f5db0be74d9cf4ff979c19294349cf3a5ee590
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Nov 24 17:52:28 2023 +0000

    Fix icon position

commit 18a84076b5bae7969e6ce9af37dc69bc34b17277
Merge: aea4d9786e a9c34d7393
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Nov 24 09:58:54 2023 +0000

    Merge branch 'master' into use-symbols-for-build-status-new

commit aea4d9786eb4f059c0c37a204361c4ff1d8c6a67
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Fri Nov 24 09:58:29 2023 +0000

    Rename ID

commit 5f76f3840c2fe61d3937f947df0bdca293832fb7
Author: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date:   Mon Nov 20 16:00:14 2023 +0000

    Init

* Update _job.scss

* Lint

* Update filter-build-history.js

* Hide controls if not navigable

* Update RunTest.java

* Add basic JSDoc

* Use dataset rather than attributes

* Update filter-build-history.js

* Rename JS

* Update RunTest.java

* Update jenkins-test-harness version (thanks again Tim!)

* Update _job.scss

* Remove unused SCSS

* Update AbstractScmTagActionTest.java

* Update builds-card.js

* Update builds-card.js

* Rewrite SCSS/Jelly to handle more complex scenarios

* Lint

* Tidy up

* Update _side-panel-widgets.scss

* Add background to card

* Fix lint

* Update queue-items.jelly

* Fix cancel button

* Update queue-items.jelly

* Use debounce properly and adjust time to make it smoother

* Use jenkins-hidden

* Replace TODOs with comments, fix card controls showing when there are no builds

* Add hidden text for previous/next buttons

* Update builds-card.js

* Add data-tooltip-append-to-parent="true" to tooltips

* Wrap badges

* Fix relative expandable link

* Use chevron-down rather than menu icon

---------

Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>
---
 .../widgets/HistoryWidget/entries.jelly       |  17 +-
 .../hudson/widgets/HistoryWidget/entry.jelly  |  96 +--
 .../hudson/widgets/HistoryWidget/index.jelly  | 106 ++--
 .../widgets/HistoryWidget/index.properties    |   2 +-
 .../HistoryPageFilter/ajaxBuildHistory.jelly  |  22 +-
 .../HistoryPageFilter/queue-items.jelly       |  85 ++-
 core/src/main/resources/lib/layout/card.jelly |  58 ++
 test/src/test/java/hudson/model/RunTest.java  |   2 +-
 .../hudson/scm/AbstractScmTagActionTest.java  |   2 +-
 .../main/js/components/dropdowns/jumplists.js |   2 +-
 war/src/main/js/filter-build-history.js       | 590 ------------------
 war/src/main/js/pages/project/builds-card.js  | 142 +++++
 .../js/pages/project/builds-card.types.js     |  16 +
 .../main/resources/images/symbols/expand.svg  |   1 +
 .../main/resources/images/symbols/menu.svg    |   5 +
 war/src/main/scss/abstracts/_theme.scss       |   2 +-
 war/src/main/scss/base/_style.scss            | 183 ------
 war/src/main/scss/components/_cards.scss      |  97 +++
 war/src/main/scss/components/_dropdowns.scss  |  15 +
 war/src/main/scss/components/_index.scss      |   3 +-
 .../main/scss/components/_progress-bar.scss   |   1 -
 .../scss/components/_side-panel-widgets.scss  | 162 -----
 war/src/main/scss/pages/_index.scss           |   1 +
 war/src/main/scss/pages/_job.scss             | 184 ++++++
 .../main/webapp/scripts/hudson-behavior.js    |  29 -
 war/webpack.config.js                         |   4 +-
 26 files changed, 681 insertions(+), 1146 deletions(-)
 create mode 100644 core/src/main/resources/lib/layout/card.jelly
 delete mode 100644 war/src/main/js/filter-build-history.js
 create mode 100644 war/src/main/js/pages/project/builds-card.js
 create mode 100644 war/src/main/js/pages/project/builds-card.types.js
 create mode 100644 war/src/main/resources/images/symbols/expand.svg
 create mode 100644 war/src/main/resources/images/symbols/menu.svg
 create mode 100644 war/src/main/scss/components/_cards.scss
 create mode 100644 war/src/main/scss/pages/_job.scss

diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly
index 8c07368d68f8..7462269378a4 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entries.jelly
@@ -26,10 +26,19 @@ THE SOFTWARE.
   Render build histories. 
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <j:set target="${it}" property="nextBuildNumberToFetch" value="${it.nextBuildNumber}"/>
-  <!-- build history -->
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:i="jelly:fmt">
+  <j:set target="${it}" property="nextBuildNumberToFetch" value="${it.nextBuildNumber}" />
+  <j:invokeStatic className="java.time.LocalDate" method="now" var="now" />
+
   <j:forEach var="pageEntry" items="${it.runs}">
+    <i:formatDate value="${pageEntry.entry.timestamp.time}" var="date" type="date" dateStyle="long" />
+    <i:formatDate value="${pageEntry.entry.timestamp.time}" var="simpleDate" type="date" pattern="YYYY-MM-dd" />
+
+    <j:if test="${pastDate != date}">
+      <span class="app-builds-container__heading">${simpleDate == now ? "%Today" : date}</span>
+      <j:set var="pastDate" value="${date}" />
+    </j:if>
+
     <st:include page="/hudson/widgets/HistoryWidget/entry.jelly" />
   </j:forEach>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
index 31dbb322fbd0..dc367464b57c 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
@@ -34,54 +34,58 @@ THE SOFTWARE.
   <j:if test="${h.isUserTimeZoneOverride()}">
     <i:setTimeZone value="${h.getUserTimeZone()}" />
    </j:if>
-  <tr class="build-row ${transitive} single-line" page-entry-id="${pageEntry.entryId}">
-    <td class="build-row-cell">
-      <div class="pane build-name">
-        <div class="build-icon">
-          <a class="build-status-link" href="${h.getConsoleUrl(build)}" tooltip="${build.iconColor.description} > ${%Console Output}">
-            <l:icon src="symbol-status-${build.iconColor.iconName}" />
-          </a>
-        </div>
-        <a class="model-link inside build-link display-name" update-parent-class=".build-row" href="${link}">${build.displayName}</a>
-      </div>
-      <div class="pane build-details" time="${build.timestamp.time.time}">
-        <j:set var="linkTitleAttr" value=""/> 
-        <j:if test="${!build.building}">
-          <j:set var="linkTitleAttr">${%Took} ${build.durationString}</j:set>
-        </j:if>
-        <a class="model-link inside build-link" href="${link}" update-parent-class=".build-row" tooltip="${linkTitleAttr}">
-          <i:formatDate value="${build.timestamp.time}" type="both" dateStyle="medium" timeStyle="short" /> ${h.getUserTimeZonePostfix(build.timestamp.time)}
-        </a>
-        <j:if test="${build.building}">
-	  <j:set target="${it.widget}" property="nextBuildNumberToFetch" value="${build.number}"/>
-          <t:buildProgressBar build="${build}"/>
-        </j:if>
-      </div>
-      <div class="pane build-controls">
-        <div class="middle-align build-badge">
-          <j:set var="badges" value="${build.badgeActions}"/>
-          <j:if test="${!empty(badges)}">
-            <st:nbsp/>
-            <j:forEach var="badge" items="${badges}">
-              <st:include it="${badge}" page="badge.jelly" />
-            </j:forEach>
+
+  <div class="app-builds-container__item" page-entry-id="${pageEntry.entryId}">
+    <a class="app-builds-container__item__icon"
+       href="${h.getConsoleUrl(build)}"
+       tooltip="${build.iconColor.description}"
+       data-tooltip-append-to-parent="true">
+      <l:icon src="symbol-status-${build.iconColor.iconName}" />
+    </a>
+
+    <div class="app-builds-container__item__inner">
+      <a href="${link}" class="app-builds-container__item__inner__link">
+        ${build.displayName}
+        <span class="app-builds-container__item__time" time="${build.timestamp.time.time}">
+          <j:set var="linkTitleAttr" value="${null}" />
+          <j:if test="${!build.building}">
+            <j:set var="linkTitleAttr">${%Took} ${build.durationString}</j:set>
           </j:if>
-        </div>
-        <j:if test="${build.building}">
-          <div class="build-stop">
-            <!-- Check CANCEL permission for Project, Admin permission otherwise -->
-            <j:if test="${empty(it.widget.owner.CANCEL) ? h.hasPermission(app.ADMINISTER) : it.widget.owner.hasPermission(it.widget.owner.CANCEL)}">
-              <l:stopButton href="${link}stop" alt="${%Cancel}" confirm="${%confirm(build.fullDisplayName)}" />
-            </j:if>
+          <div tooltip="${linkTitleAttr}" data-tooltip-append-to-parent="true">
+            <i:formatDate value="${build.timestamp.time}" type="time" timeStyle="short" />
+            ${h.getUserTimeZonePostfix()}
           </div>
+        </span>
+      </a>
+      <div class="app-builds-container__item__inner__controls">
+        <j:if test="${build.building}">
+          <j:if test="${build.building}">
+            <j:set target="${it.widget}" property="nextBuildNumberToFetch" value="${build.number}"/>
+            <t:buildProgressBar build="${build}"/>
+          </j:if>
+
+          <!-- Check CANCEL permission for Project, Admin permission otherwise -->
+          <j:if test="${empty(it.widget.owner.CANCEL) ? h.hasPermission(app.ADMINISTER) : it.widget.owner.hasPermission(it.widget.owner.CANCEL)}">
+            <l:stopButton href="${link}stop" alt="${%Cancel}" confirm="${%confirm(build.fullDisplayName)}" />
+          </j:if>
         </j:if>
+
+        <j:set var="badges" value="${build.badgeActions}"/>
+        <j:if test="${!empty(badges)}">
+          <j:forEach var="badge" items="${badges}">
+            <st:include it="${badge}" page="badge.jelly" />
+          </j:forEach>
+        </j:if>
+      </div>
+    </div>
+
+    <button class="jenkins-card__reveal jenkins-jumplist-link" data-href="${link}">
+      <l:icon src="symbol-chevron-down" />
+    </button>
+    <j:if test="${!empty build.truncatedDescription}">
+      <div class="app-builds-container__item__description">
+        <j:out value="${app.markupFormatter.translate(build.truncatedDescription)}"/>
       </div>
-      <j:if test="${!empty build.truncatedDescription}">
-        <div class="pane desc indent-multiline">
-          <j:out value="${app.markupFormatter.translate(build.truncatedDescription)}"/>
-        </div>
-      </j:if>
-      <div class="left-bar" />
-    </td>
-  </tr>
+    </j:if>
+  </div>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
index e9043c2b32d0..8d4663bb00dd 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
@@ -23,76 +23,54 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <j:parse var="paneTitle">
-    <j:invokeStatic var="currentThread" className="java.lang.Thread" method="currentThread"/>
-    <j:invoke var="jobClass" on="${currentThread.contextClassLoader}" method="loadClass">
-      <j:arg value="hudson.model.Job"/>
-    </j:invoke>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:dd="/lib/layout/dropdowns">
+  <script src="${resURL}/jsbundles/pages/project/builds-card.js" type="text/javascript" defer="true" />
 
-    <div class="jenkins-pane__header--build-history">
-      <j:if test="${jobClass.isAssignableFrom(it.owner.class)}">
-        <t:buildHealth job="${it.owner}" iconSizeClass="icon-sm" link="${it.baseUrl}/lastBuild"/>
-      </j:if>
-      ${it.displayName}
-      <j:if test="${jobClass.isAssignableFrom(it.owner.class)}">
-        <a href="${it.baseUrl}/buildTimeTrend">${%trend}</a>
-      </j:if>
-    </div>
-  </j:parse>
+  <j:set var="page" value="${it.historyPageFilter}" />
 
-  <j:parse var="paneFooter">
-    <!--
-      RSS link
-    -->
-    <span class="build-rss-links">
-        <a class="build-rss-all-link" href="${it.baseUrl}/rssAll">
-          <span class="build-rss-all-icon">
-            <l:icon src="symbol-rss" />
-          </span>
-          Atom feed ${%for all}
-        </a>
-        <a class="build-rss-failed-link" href="${it.baseUrl}/rssFailed">
-          <span class="build-rss-failed-icon">
-            <l:icon src="symbol-rss" />
-          </span>
-          Atom feed ${%for failures}
-        </a>
-    </span>
-  </j:parse>
+  <j:set var="controls">
+    <l:overflowButton icon="symbol-menu" clazz="jenkins-card__reveal">
+      <dd:item icon="symbol-rss"
+               text="Atom feed ${%for all}"
+               href="${it.baseUrl}/rssAll" />
+      <dd:item icon="symbol-rss"
+               text="Atom feed ${%for failures}"
+               href="${it.baseUrl}/rssFailed" />
+    </l:overflowButton>
+  </j:set>
 
-  <j:set var="page" value="${it.historyPageFilter}" />
-  <div id="buildHistoryPage" page-ajax="${it.baseUrl}/buildHistory/ajax" page-entry-newest="${page.newestOnPage}" page-entry-oldest="${page.oldestOnPage}" page-has-up="${page.hasUpPage}" page-has-down="${page.hasDownPage}">
-    <div id="buildHistoryPageNav">
-      <div class="buildHistoryPageNav__item buildHistoryPageNav__item--page-one pageOne" title="Page 1 (Newest/Latest Builds)">
-        <div class="buildHistoryPageNav__item-page-one-top"></div>
-        <l:svgIcon href="${resURL}/images/svgs/go-up.svg#arrow" viewBox="0 0 16 16" />
-      </div>
-      <div class="buildHistoryPageNav__item pageUp" title="Newer Builds">
-        <l:svgIcon href="${resURL}/images/svgs/go-up.svg#arrow" viewBox="0 0 16 16" />
-      </div>
-      <div class="buildHistoryPageNav__item pageDown" title="Older Builds">
-        <l:svgIcon href="${resURL}/images/svgs/go-down.svg#arrow" viewBox="0 0 16 16" />
-      </div>
-    </div>
+  <div id="buildHistoryPage" page-ajax="${it.baseUrl}/buildHistory/ajax"
+       data-page-entry-newest="${page.newestOnPage}"
+       data-page-entry-oldest="${page.oldestOnPage}"
+       data-page-has-up="${page.hasUpPage}"
+       data-page-has-down="${page.hasDownPage}">
+    <l:card id="jenkins-builds" title="Builds" controls="${controls}" expandable="${it.baseUrl}/buildTimeTrend">
+      <l:search-bar placeholder="${%find}"
+                    clazz="${page.runs.isEmpty() and page.queueItems.isEmpty() ? 'jenkins-hidden' : ''}"/>
 
-    <l:pane width="3" title="${h.runScript(paneTitle)}" footer="${h.runScript(paneFooter)}" id="buildHistory" class="jenkins-pane stripped">
-      <tr class="build-search-row">
-        <td>
-          <l:search-bar placeholder="${%find}" clazz="${page.runs.isEmpty() and page.queueItems.isEmpty() ? 'jenkins-hidden' : ''}"/>
-          <div id="no-builds" class="jenkins-pane__information" style="${page.runs.isEmpty() and page.queueItems.isEmpty() ? '' : 'display: none;'}">
-            ${%No builds}
-          </div>
-        </td>
-      </tr>
+      <div class="app-builds-container">
+        <div id="no-builds" class="app-builds-container__placeholder">
+          ${%No builds}
+        </div>
 
-      <st:include page="entries.jelly" it="${page}" />
+        <div id="jenkins-build-history" class="app-builds-container__items">
+        </div>
 
-    </l:pane>
+        <div class="app-builds-container__controls" id="controls">
+          <button class="jenkins-button jenkins-button--tertiary jenkins-card__unveil" id="up">
+            <l:icon src="symbol-arrow-left" />
+            <span class="jenkins-visually-hidden">${%Newer builds}</span>
+          </button>
+          <button class="jenkins-button jenkins-button--tertiary jenkins-card__unveil" id="down">
+            <l:icon src="symbol-arrow-right" />
+            <span class="jenkins-visually-hidden">${%Older builds}</span>
+          </button>
+        </div>
+      </div>
 
-    <!--The value for `page-next-build` is modified inside of `entries.jelly` on render, so set the attribute-->
-    <!--after that component has been rendered to get the correct value to use in `filter-build-history.js`-->
-    <div id="properties" page-next-build="${it.nextBuildNumberToFetch ?: it.owner.nextBuildNumber}"/>
+      <!--The value for `page-next-build` is modified inside of `entries.jelly` on render, so set the attribute-->
+      <!--after that component has been rendered to get the correct value to use in `builds-card.js`-->
+      <div id="properties" page-next-build="${it.nextBuildNumberToFetch ?: it.owner.nextBuildNumber}"/>
+    </l:card>
   </div>
-  <script src="${resURL}/jsbundles/filter-build-history.js" type="text/javascript"/>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.properties b/core/src/main/resources/hudson/widgets/HistoryWidget/index.properties
index 160484221909..f88fe7c51e93 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.properties
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.properties
@@ -1 +1 @@
-find=Filter...
+find=Filter
diff --git a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/ajaxBuildHistory.jelly b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/ajaxBuildHistory.jelly
index 6fdf095c515a..bb5d5afac359 100644
--- a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/ajaxBuildHistory.jelly
+++ b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/ajaxBuildHistory.jelly
@@ -22,20 +22,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!--
--->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
   <l:ajax>
-    <j:choose>
-      <j:when test="${it.size() > 0}">
-	<table class="pane hasPageData" page-entry-newest="${it.newestOnPage}" page-entry-oldest="${it.oldestOnPage}" page-has-up="${it.hasUpPage}" page-has-down="${it.hasDownPage}">
-	  <st:include page="entries.jelly" />
-	</table>
-      </j:when>
-      <j:otherwise>
-	<table class="pane"></table>
-      </j:otherwise>
-    </j:choose>
+    <j:if test="${it.size() > 0}">
+      <div data-page-entry-newest="${it.newestOnPage}"
+           data-page-entry-oldest="${it.oldestOnPage}"
+           data-page-has-up="${it.hasUpPage}"
+           data-page-has-down="${it.hasDownPage}">
+        <st:include page="entries.jelly" />
+      </div>
+    </j:if>
   </l:ajax>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
index 4f51055a7a98..ea07c6114279 100644
--- a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
+++ b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
@@ -28,50 +28,43 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
-  <!-- pending build -->
-  <j:set var="queuedItems" value="${it.queueItems}" />
-  <j:if test="${!queuedItems.isEmpty()}">
-    <j:forEach var="pageEntry" items="${queuedItems}" indexVar="i">
-      <j:set var="item" value="${pageEntry.entry}"/>
-      <j:set var="id" value="${h.generateId()}"/>
-      <tr class="build-row build-pending transitive single-line" id="${item.id}"  page-entry-id="${pageEntry.entryId}">
-	<td class="build-row-cell">
-	  <div class="pane build-name">
-	    <div class="build-icon">
-        <l:icon src="symbol-status-nobuilt" class="icon-sm"/>
-	    </div>
-	    <!-- Don't use math unless needed, in case nextBuildNumber is not numeric -->
-	    <div class="display-name" title="${%Expected build number}">
-	    #${queuedItems.size()==1 ? it.widget.owner.nextBuildNumber
-	       : it.widget.owner.nextBuildNumber+queuedItems.size()-i-1}
-	    </div>
-	  </div>
-	  <div class="pane build-details indent-multiline">
-	    <j:set var="cause" value="${item.getCauseOfBlockage()}"/>
-	    <j:choose>
-	      <j:when test="${cause!=null}">
-		(${%pending}—<st:include it="${cause}" page="summary.jelly"/>)
-	      </j:when>
-	      <j:otherwise>
-		(${%pending})
-	      </j:otherwise>
-	    </j:choose>
-	  <j:if test="${!item.params.isEmpty()}">
-	    <div style="float:right;margin-right:10px;" tooltip="Build Parameters:${item.params}" data-tooltip-append-to-parent="true">
-	      <l:icon src="symbol-parameters" class="icon-sm" />
-	    </div>
-	  </j:if>
-	  </div>
-	  <div class="pane build-controls">
-	    <div class="build-stop">
-	      <j:if test="${item.hasCancelPermission()}">
-		<l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="${%Cancel this build}"/>
-	      </j:if>
-	    </div>
-	  </div>
-	  <div class="left-bar"></div>
-	</td>
-      </tr>
-    </j:forEach>
-  </j:if>
+    <!-- pending build -->
+    <j:set var="queuedItems" value="${it.queueItems}"/>
+    <j:if test="${!queuedItems.isEmpty()}">
+        <span class="app-builds-container__heading">${%Pending}</span>
+        <j:forEach var="pageEntry" items="${queuedItems}">
+            <j:set var="item" value="${pageEntry.entry}"/>
+            <j:set var="id" value="${h.generateId()}"/>
+
+            <div class="app-builds-container__item app-builds-container__item--not-interactable" page-entry-id="${pageEntry.entryId}">
+                <div class="app-builds-container__item__icon">
+                    <l:icon src="symbol-status-nobuilt" />
+                </div>
+                <div class="app-builds-container__item__inner">
+                    <div class="app-builds-container__item__inner__link">
+                        <!-- Don't use math unless needed, in case nextBuildNumber is not numeric -->
+                        #${queuedItems.size() == 1 ? it.widget.owner.nextBuildNumber : it.widget.owner.nextBuildNumber+queuedItems.size()-i-1}
+                    </div>
+                    <div class="app-builds-container__item__inner__controls">
+                        <j:if test="${!item.params.isEmpty()}">
+                            <div tooltip="Build Parameters: ${item.params}" data-tooltip-append-to-parent="true">
+                                <l:icon src="symbol-parameters" class="icon-sm" />
+                            </div>
+                        </j:if>
+                        <j:if test="${item.hasCancelPermission()}">
+                            <l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="${%Cancel}"/>
+                        </j:if>
+                    </div>
+                </div>
+                <div class="app-builds-container__item__description">
+                    <j:set var="cause" value="${item.getCauseOfBlockage()}"/>
+                    <j:choose>
+                        <j:when test="${cause!=null}">
+                            <st:include it="${cause}" page="summary.jelly"/>
+                        </j:when>
+                    </j:choose>
+                </div>
+            </div>
+        </j:forEach>
+    </j:if>
 </j:jelly>
diff --git a/core/src/main/resources/lib/layout/card.jelly b/core/src/main/resources/lib/layout/card.jelly
new file mode 100644
index 000000000000..2c6845738227
--- /dev/null
+++ b/core/src/main/resources/lib/layout/card.jelly
@@ -0,0 +1,58 @@
+<!--
+The MIT License
+
+Copyright (c) 2024 Jan Faracik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
+  <st:documentation>
+    <st:attribute name="title" use="required">
+        Title of the card
+    </st:attribute>
+    <st:attribute name="id">
+        Optional ID for the card
+    </st:attribute>
+    <st:attribute name="controls">
+      Shows controls in the top right of the card
+    </st:attribute>
+    <st:attribute name="expandable">
+      Shows the expand icon if set, navigates to the value provided on click
+    </st:attribute>
+  </st:documentation>
+
+  <div class="jenkins-card" id="${attrs.id}">
+    <div class="jenkins-card__title">
+      ${attrs.title}
+      <div class="jenkins-card__controls">
+        <j:out value="${controls}"/>
+        <j:if test="${attrs.expandable != null}">
+          <a href="${attrs.expandable}" class="jenkins-card__reveal" tooltip="${%Expand}">
+            <l:icon src="symbol-expand" />
+          </a>
+        </j:if>
+      </div>
+    </div>
+    <div class="jenkins-card__content">
+      <d:invokeBody />
+    </div>
+  </div>
+</j:jelly>
diff --git a/test/src/test/java/hudson/model/RunTest.java b/test/src/test/java/hudson/model/RunTest.java
index c59245c78c2c..b6a145857020 100644
--- a/test/src/test/java/hudson/model/RunTest.java
+++ b/test/src/test/java/hudson/model/RunTest.java
@@ -157,7 +157,7 @@ private void ensureXssIsPrevented(FreeStyleProject upProject, String validationP
         HtmlPage htmlPage = wc.goTo(upProject.getUrl());
 
         // trigger the tooltip display
-        htmlPage.executeJavaScript("document.querySelector('#buildHistory table .build-badge svg')._tippy.show()");
+        htmlPage.executeJavaScript("document.querySelector('#jenkins-build-history .app-builds-container__item__inner__controls svg')._tippy.show()");
         wc.waitForBackgroundJavaScript(500);
         ScriptResult result = htmlPage.executeJavaScript("document.querySelector('.tippy-content').innerHTML;");
         Object jsResult = result.getJavaScriptResult();
diff --git a/test/src/test/java/hudson/scm/AbstractScmTagActionTest.java b/test/src/test/java/hudson/scm/AbstractScmTagActionTest.java
index 4fe53f261657..1df03bfacd64 100644
--- a/test/src/test/java/hudson/scm/AbstractScmTagActionTest.java
+++ b/test/src/test/java/hudson/scm/AbstractScmTagActionTest.java
@@ -66,7 +66,7 @@ private String buildAndExtractTooltipAttribute(FreeStyleProject p) throws Except
 
         HtmlPage page = wc.getPage(p);
 
-        DomElement buildHistory = page.getElementById("buildHistory");
+        DomElement buildHistory = page.getElementById("buildHistoryPage");
         DomNodeList<HtmlElement> imgs = buildHistory.getElementsByTagName("img");
         HtmlImage tagImage = (HtmlImage) imgs.stream()
                 .filter(i -> i.getAttribute("class").contains("icon-save"))
diff --git a/war/src/main/js/components/dropdowns/jumplists.js b/war/src/main/js/components/dropdowns/jumplists.js
index 3297da22e9ea..f831f452bafe 100644
--- a/war/src/main/js/components/dropdowns/jumplists.js
+++ b/war/src/main/js/components/dropdowns/jumplists.js
@@ -31,7 +31,7 @@ function generateJumplistAccessors() {
  */
 function generateDropdowns() {
   behaviorShim.specify(
-    "li.children, #menuSelector, .jenkins-menu-dropdown-chevron",
+    "li.children, .jenkins-jumplist-link, #menuSelector, .jenkins-menu-dropdown-chevron",
     "-dropdown-",
     1000,
     (element) =>
diff --git a/war/src/main/js/filter-build-history.js b/war/src/main/js/filter-build-history.js
deleted file mode 100644
index 06a83a5b503d..000000000000
--- a/war/src/main/js/filter-build-history.js
+++ /dev/null
@@ -1,590 +0,0 @@
-import debounce from "lodash/debounce";
-
-const buildHistoryContainer = document.getElementById("buildHistory");
-const pageSearchInputContainer = buildHistoryContainer.querySelector(
-  ".build-search-row .jenkins-search",
-);
-const pageSearchInput = buildHistoryContainer.querySelector(
-  ".build-search-row input",
-);
-const buildHistoryPage = document.getElementById("buildHistoryPage");
-const properties = document.getElementById("properties");
-const ajaxUrl = buildHistoryPage.getAttribute("page-ajax");
-const nextBuild = properties.getAttribute("page-next-build");
-const noBuildsBanner = document.getElementById("no-builds");
-
-const sidePanel = document.getElementById("side-panel");
-const buildHistoryPageNav = document.getElementById("buildHistoryPageNav");
-
-const pageOne = buildHistoryPageNav.querySelector(".pageOne");
-const pageUp = buildHistoryPageNav.querySelector(".pageUp");
-const pageDown = buildHistoryPageNav.querySelector(".pageDown");
-
-const leftRightPadding = 4;
-const updateBuildsRefreshInterval = 5000;
-
-function updateBuilds(params) {
-  if (isPageVisible()) {
-    fetch(ajaxUrl + toQueryString(params), {
-      headers: {
-        n: buildHistoryContainer.headers[1],
-      },
-    }).then((rsp) => {
-      if (rsp.ok) {
-        rsp.text().then((responseText) => {
-          var dataTable = getDataTable(buildHistoryContainer);
-          var rows = dataTable.rows;
-
-          // Check there are no existing rows (except the search bar) before showing the no builds banner
-          if (
-            rows.length <= 1 &&
-            responseText === '<table class="pane"></table>'
-          ) {
-            noBuildsBanner.style.display = "block";
-            if (
-              typeof params === "object" &&
-              "search" in params &&
-              params.search !== ""
-            ) {
-              pageSearchInputContainer.classList.remove("jenkins-hidden");
-            } else {
-              pageSearchInputContainer.classList.add("jenkins-hidden");
-            }
-          } else {
-            noBuildsBanner.style.display = "none";
-            pageSearchInputContainer.classList.remove("jenkins-hidden");
-          }
-
-          //delete rows with transitive data
-          var firstBuildRow = 0;
-          if (rows[firstBuildRow].classList.contains("build-search-row")) {
-            firstBuildRow++;
-          }
-          while (
-            rows.length > 1 &&
-            rows[firstBuildRow].classList.contains("transitive")
-          ) {
-            rows[firstBuildRow].remove();
-          }
-
-          // insert new rows
-          var div = document.createElement("div");
-          div.innerHTML = responseText;
-          Behaviour.applySubtree(div);
-
-          var pivot = rows[firstBuildRow];
-          var newDataTable = getDataTable(div);
-          var newRows = newDataTable.rows;
-          while (newRows.length > 0) {
-            if (pivot !== undefined) {
-              // The data table has rows.  Insert before a "pivot" row (first row).
-              pivot.parentNode.insertBefore(newRows[0], pivot);
-            } else {
-              // The data table has no rows.  In this case, we just add all new rows directly to the
-              // table, one after the other i.e. we don't insert before a "pivot" row (first row).
-              dataTable
-                .getElementsByTagName("tbody")[0]
-                .appendChild(newRows[0]);
-            }
-          }
-
-          if (newDataTable.classList.contains("hasPageData")) {
-            buildHistoryPage.setAttribute(
-              "page-entry-newest",
-              newDataTable.getAttribute("page-entry-newest"),
-            );
-          }
-
-          // next update
-          buildHistoryContainer.headers = ["n", rsp.headers.get("n")];
-          checkAllRowCellOverflows();
-          createRefreshTimeout(params);
-        });
-      }
-    });
-  } else {
-    createRefreshTimeout(params);
-  }
-}
-
-var buildRefreshTimeout;
-function createRefreshTimeout(params) {
-  cancelRefreshTimeout();
-  buildRefreshTimeout = window.setTimeout(
-    () => updateBuilds(params),
-    updateBuildsRefreshInterval,
-  );
-}
-
-function cancelRefreshTimeout() {
-  if (buildRefreshTimeout) {
-    window.clearTimeout(buildRefreshTimeout);
-    buildRefreshTimeout = undefined;
-  }
-}
-
-function hasPageUp() {
-  return buildHistoryPage.getAttribute("page-has-up") === "true";
-}
-function hasPageDown() {
-  return buildHistoryPage.getAttribute("page-has-down") === "true";
-}
-function getNewestEntryId() {
-  return buildHistoryPage.getAttribute("page-entry-newest");
-}
-function getOldestEntryId() {
-  return buildHistoryPage.getAttribute("page-entry-oldest");
-}
-
-function getDataTable(buildHistoryDiv) {
-  return buildHistoryDiv.querySelector("table.pane");
-}
-
-function updatePageParams(dataTable) {
-  buildHistoryPage.setAttribute(
-    "page-has-up",
-    dataTable.getAttribute("page-has-up"),
-  );
-  buildHistoryPage.setAttribute(
-    "page-has-down",
-    dataTable.getAttribute("page-has-down"),
-  );
-  buildHistoryPage.setAttribute(
-    "page-entry-newest",
-    dataTable.getAttribute("page-entry-newest"),
-  );
-  buildHistoryPage.setAttribute(
-    "page-entry-oldest",
-    dataTable.getAttribute("page-entry-oldest"),
-  );
-}
-function togglePageUpDown() {
-  buildHistoryPageNav.classList.remove("hasUpPage");
-  buildHistoryPageNav.classList.remove("hasDownPage");
-  if (hasPageUp()) {
-    buildHistoryPageNav.classList.add("hasUpPage");
-  }
-  if (hasPageDown()) {
-    buildHistoryPageNav.classList.add("hasDownPage");
-  }
-}
-
-function checkRowCellOverflows(row) {
-  if (!row) {
-    return;
-  }
-
-  if (row.classList.contains("overflow-checked")) {
-    // already done.
-    return;
-  }
-
-  function markSingleline() {
-    row.classList.add("single-line");
-    row.classList.remove("multi-line");
-  }
-  function markMultiline() {
-    row.classList.remove("single-line");
-    row.classList.add("multi-line");
-  }
-  function indentMultiline(element) {
-    element.classList.add("indent-multiline");
-  }
-
-  function blockWrap(el1, el2) {
-    var div = document.createElement("div");
-
-    div.classList.add("block");
-    div.classList.add("wrap");
-    el1.classList.add("wrapped");
-    el2.classList.add("wrapped");
-
-    el1.parentNode.insertBefore(div, el1);
-    el1.parentNode.removeChild(el1);
-    el2.parentNode.removeChild(el2);
-    div.appendChild(el1);
-    div.appendChild(el2);
-
-    return div;
-  }
-  function blockUnwrap(element) {
-    element.querySelectorAll(".wrapped").forEach(function (wrappedEl) {
-      wrappedEl.parentNode.removeChild(wrappedEl);
-      element.parentNode.insertBefore(wrappedEl, element);
-      wrappedEl.classList.remove("wrapped");
-    });
-    element.parentNode.removeChild(element);
-  }
-
-  var buildName = row.querySelector(".build-name");
-  var buildDetails = row.querySelector(".build-details");
-
-  if (!buildName || !buildDetails) {
-    return;
-  }
-
-  var buildControls = row.querySelector(".build-controls");
-  var desc = row.querySelector(".desc");
-
-  function resetCellOverflows() {
-    markSingleline();
-
-    // undo block wraps
-    row.querySelectorAll(".block.wrap").forEach(function (blockWrap) {
-      blockUnwrap(blockWrap);
-    });
-
-    buildName.classList.remove("block");
-    buildName.removeAttribute("style");
-    buildDetails.classList.remove("block");
-    buildDetails.removeAttribute("style");
-    if (buildControls) {
-      buildControls.classList.remove("block");
-      buildDetails.removeAttribute("style");
-    }
-  }
-
-  // Undo everything from the previous poll.
-  resetCellOverflows();
-
-  // Mark the text as multiline, if it has more than one line
-  if (desc) {
-    markMultiline();
-  }
-
-  var rowWidth = buildHistoryContainer.clientWidth;
-  var usableRowWidth = rowWidth - leftRightPadding * 2;
-  var nameOverflowParams = getElementOverflowParams(buildName);
-  var detailsOverflowParams = getElementOverflowParams(buildDetails);
-
-  var controlsOverflowParams;
-  if (buildControls) {
-    controlsOverflowParams = getElementOverflowParams(buildControls);
-  }
-
-  function fitToControlsHeight(element) {
-    if (buildControls) {
-      if (element.clientHeight < buildControls.clientHeight) {
-        element.style.height = buildControls.clientHeight.toString() + "px";
-      }
-    }
-  }
-
-  function setBuildControlWidths() {
-    if (buildControls) {
-      var buildBadge = buildControls.querySelector(".build-badge");
-
-      if (buildBadge) {
-        var buildControlsWidth = buildControls.clientWidth;
-        var buildBadgeWidth;
-
-        var buildStop = buildControls.querySelector(".build-stop");
-        if (buildStop) {
-          buildStop.style.width = "24px";
-          // Minus 24 for the buildStop width,
-          // minus 4 for left+right padding in the controls container
-          buildBadgeWidth = buildControlsWidth - 24 - leftRightPadding;
-          if (buildControls.classList.contains("indent-multiline")) {
-            buildBadgeWidth = buildBadgeWidth - 20;
-          }
-          buildBadge.style.width = buildBadgeWidth + "px";
-        } else {
-          buildBadge.style.width = "100%";
-        }
-      }
-      controlsOverflowParams = getElementOverflowParams(buildControls);
-    }
-  }
-  setBuildControlWidths();
-
-  var controlsRepositioned = false;
-
-  if (nameOverflowParams.isOverflowed || detailsOverflowParams.isOverflowed) {
-    // At least one of the cells (name or details) needs to move to a row of its own.
-
-    markMultiline();
-
-    if (buildControls) {
-      // We have build controls. Lets see can we find a combination that allows the build controls
-      // to sit beside either the build name or the build details.
-
-      var badgesOverflowing = false;
-      var nameLessThanHalf = true;
-      var detailsLessThanHalf = true;
-      var buildBadge = buildControls.querySelector(".build-badge");
-      if (buildBadge) {
-        var badgeOverflowParams = getElementOverflowParams(buildBadge);
-
-        if (badgeOverflowParams.isOverflowed) {
-          // The badges are also overflowing. In this case, we will only attempt to
-          // put the controls on the same line as the name or details (see below)
-          // if the name or details is using less than half the width of the build history
-          // widget.
-          badgesOverflowing = true;
-          nameLessThanHalf =
-            nameOverflowParams.scrollWidth < usableRowWidth / 2;
-          detailsLessThanHalf =
-            detailsOverflowParams.scrollWidth < usableRowWidth / 2;
-        }
-      }
-      function expandLeftWithRight(
-        leftCellOverFlowParams,
-        rightCellOverflowParams,
-      ) {
-        // Float them left and right...
-        leftCellOverFlowParams.element.style.float = "left";
-        rightCellOverflowParams.element.style.float = "right";
-
-        if (
-          !leftCellOverFlowParams.isOverflowed &&
-          !rightCellOverflowParams.isOverflowed
-        ) {
-          // If neither left nor right are overflowed, just leave as is and let them float left and right.
-          return;
-        }
-        if (
-          leftCellOverFlowParams.isOverflowed &&
-          !rightCellOverflowParams.isOverflowed
-        ) {
-          leftCellOverFlowParams.element.style.width =
-            leftCellOverFlowParams.scrollWidth + "px";
-          return;
-        }
-        if (
-          !leftCellOverFlowParams.isOverflowed &&
-          rightCellOverflowParams.isOverflowed
-        ) {
-          rightCellOverflowParams.element.style.width =
-            rightCellOverflowParams.scrollWidth + "px";
-          return;
-        }
-      }
-
-      if (
-        (!badgesOverflowing || nameLessThanHalf) &&
-        nameOverflowParams.scrollWidth + controlsOverflowParams.scrollWidth <=
-          usableRowWidth
-      ) {
-        // Build name and controls can go on one row (first row). Need to move build details down
-        // to a row of its own (second row) by making it a block element, forcing it to wrap. If there
-        // are controls, we move them up to position them after the build name by inserting before the
-        // build details.
-        buildDetails.classList.add("block");
-        buildControls.parentNode.removeChild(buildControls);
-        buildDetails.parentNode.insertBefore(buildControls, buildDetails);
-        var wrap = blockWrap(buildName, buildControls);
-        wrap.classList.add("build-name-controls");
-        indentMultiline(buildDetails);
-        nameOverflowParams = getElementOverflowParams(buildName); // recalculate
-        expandLeftWithRight(nameOverflowParams, controlsOverflowParams);
-        setBuildControlWidths();
-        fitToControlsHeight(buildName);
-      } else if (
-        (!badgesOverflowing || detailsLessThanHalf) &&
-        detailsOverflowParams.scrollWidth +
-          controlsOverflowParams.scrollWidth <=
-          usableRowWidth
-      ) {
-        // Build details and controls can go on one row. Need to make the
-        // build name (first field) a block element, forcing the details and controls to wrap
-        // onto the next row (creating a second row).
-        buildName.classList.add("block");
-        wrap = blockWrap(buildDetails, buildControls);
-        indentMultiline(wrap);
-        wrap.classList.add("build-details-controls");
-        detailsOverflowParams = getElementOverflowParams(buildDetails); // recalculate
-        expandLeftWithRight(detailsOverflowParams, controlsOverflowParams);
-        setBuildControlWidths();
-        fitToControlsHeight(buildDetails);
-      } else {
-        // No suitable combo fits on a row. All need to go on rows of their own.
-        buildName.classList.add("block");
-        buildDetails.classList.add("block");
-        buildControls.classList.add("block");
-        indentMultiline(buildDetails);
-        indentMultiline(buildControls);
-        nameOverflowParams = getElementOverflowParams(buildName); // recalculate
-        detailsOverflowParams = getElementOverflowParams(buildDetails); // recalculate
-        setBuildControlWidths();
-      }
-      controlsRepositioned = true;
-    } else {
-      buildName.classList.add("block");
-      buildDetails.classList.add("block");
-      indentMultiline(buildDetails);
-    }
-  }
-
-  if (buildControls && !controlsRepositioned) {
-    buildBadge = buildControls.querySelector(".build-badge");
-    if (buildBadge) {
-      badgeOverflowParams = getElementOverflowParams(buildBadge);
-
-      if (badgeOverflowParams.isOverflowed) {
-        markMultiline();
-        indentMultiline(buildControls);
-        buildControls.classList.add("block");
-        controlsRepositioned = true;
-        setBuildControlWidths();
-      }
-    }
-  }
-
-  if (
-    !nameOverflowParams.isOverflowed &&
-    !detailsOverflowParams.isOverflowed &&
-    !controlsRepositioned
-  ) {
-    fitToControlsHeight(buildName);
-    fitToControlsHeight(buildDetails);
-  }
-
-  row.classList.add("overflow-checked");
-}
-
-function checkAllRowCellOverflows() {
-  if (isRunAsTest) {
-    return;
-  }
-
-  var dataTable = getDataTable(buildHistoryContainer);
-  var rows = dataTable.rows;
-
-  for (var i = 0; i < rows.length; i++) {
-    var row = rows[i];
-    checkRowCellOverflows(row);
-  }
-}
-
-function loadPage(params, focusOnSearch) {
-  var searchString = pageSearchInput.value;
-
-  if (searchString !== "") {
-    if (params === undefined) {
-      params = {};
-    }
-    params.search = searchString;
-  }
-
-  fetch(ajaxUrl + toQueryString(params)).then((rsp) => {
-    if (rsp.ok) {
-      rsp.text().then((responseText) => {
-        pageSearchInputContainer.classList.remove("jenkins-search--loading");
-        buildHistoryContainer.classList.remove("jenkins-pane--loading");
-
-        if (responseText === '<table class="pane"></table>') {
-          noBuildsBanner.style.display = "block";
-          if (
-            typeof params === "object" &&
-            "search" in params &&
-            params.search !== ""
-          ) {
-            pageSearchInputContainer.classList.remove("jenkins-hidden");
-          } else {
-            pageSearchInputContainer.classList.add("jenkins-hidden");
-          }
-        } else {
-          noBuildsBanner.style.display = "none";
-          pageSearchInputContainer.classList.remove("jenkins-hidden");
-        }
-
-        var dataTable = getDataTable(buildHistoryContainer);
-        var tbody = dataTable.getElementsByTagName("tbody")[0];
-        var rows = tbody.getElementsByClassName("build-row");
-
-        // Delete all build rows
-        while (rows.length > 0) {
-          rows[0].remove();
-        }
-
-        // insert new rows
-        var div = document.createElement("div");
-        div.innerHTML = responseText;
-        Behaviour.applySubtree(div);
-
-        var newDataTable = getDataTable(div);
-        var newRows = newDataTable.rows;
-        while (newRows.length > 0) {
-          tbody.appendChild(newRows[0]);
-        }
-
-        checkAllRowCellOverflows();
-        updatePageParams(newDataTable);
-        togglePageUpDown();
-        if (!hasPageUp()) {
-          createRefreshTimeout(params);
-        }
-
-        if (focusOnSearch) {
-          pageSearchInput.focus();
-        }
-      });
-    }
-  });
-}
-
-const handleFilter = function () {
-  loadPage({}, true);
-};
-
-const debouncedFilter = debounce(handleFilter, 300);
-
-document.addEventListener("DOMContentLoaded", function () {
-  // Apply correct styling upon filter bar text change, call API after wait
-  if (pageSearchInput !== null) {
-    pageSearchInput.addEventListener("input", function () {
-      pageSearchInputContainer.classList.add("jenkins-search--loading");
-      buildHistoryContainer.classList.add("jenkins-pane--loading");
-      noBuildsBanner.style.display = "none";
-
-      debouncedFilter();
-    });
-  }
-
-  if (isRunAsTest) {
-    return;
-  }
-
-  // If the build history pane is collapsed, just return immediately and don't set up
-  // the build history refresh.
-  if (buildHistoryContainer.classList.contains("collapsed")) {
-    return;
-  }
-
-  buildHistoryContainer.headers = ["n", nextBuild];
-
-  createRefreshTimeout();
-  checkAllRowCellOverflows();
-
-  // Show/hide the nav as the mouse moves into the sidepanel and build history.
-  sidePanel.addEventListener("mouseover", function () {
-    buildHistoryPageNav.classList.add("mouseOverSidePanel");
-  });
-  sidePanel.addEventListener("mouseout", function () {
-    buildHistoryPageNav.classList.remove("mouseOverSidePanel");
-  });
-  buildHistoryContainer.addEventListener("mouseover", function () {
-    buildHistoryPageNav.classList.add("mouseOverSidePanelBuildHistory");
-  });
-  buildHistoryContainer.addEventListener("mouseout", function () {
-    buildHistoryPageNav.classList.remove("mouseOverSidePanelBuildHistory");
-  });
-
-  pageOne.addEventListener("click", function () {
-    loadPage();
-  });
-  pageUp.addEventListener("click", function () {
-    loadPage({ "newer-than": getNewestEntryId() });
-  });
-  pageDown.addEventListener("click", function () {
-    if (hasPageDown()) {
-      cancelRefreshTimeout();
-      loadPage({ "older-than": getOldestEntryId() });
-    } else {
-      // wrap back around to the top
-      loadPage();
-    }
-  });
-
-  togglePageUpDown();
-});
diff --git a/war/src/main/js/pages/project/builds-card.js b/war/src/main/js/pages/project/builds-card.js
new file mode 100644
index 000000000000..bea375d337d8
--- /dev/null
+++ b/war/src/main/js/pages/project/builds-card.js
@@ -0,0 +1,142 @@
+import debounce from "lodash/debounce";
+import behaviorShim from "@/util/behavior-shim";
+
+// Card/item controls
+const buildHistoryPage = document.getElementById("buildHistoryPage");
+const pageSearch = buildHistoryPage.querySelector(".jenkins-search");
+const pageSearchInput = buildHistoryPage.querySelector("input");
+const ajaxUrl = buildHistoryPage.getAttribute("page-ajax");
+const card = document.querySelector("#jenkins-builds");
+const contents = card.querySelector("#jenkins-build-history");
+const container = card.querySelector(".app-builds-container");
+const noBuilds = card.querySelector("#no-builds");
+
+// Pagination controls
+const paginationControls = document.querySelector("#controls");
+const paginationPrevious = document.querySelector("#up");
+const paginationNext = document.querySelector("#down");
+
+// Refresh variables
+let buildRefreshTimeout;
+const updateBuildsRefreshInterval = 5000;
+
+/**
+ * Refresh the 'Builds' card
+ * @param {QueryParameters}  options
+ */
+function load(options = {}) {
+  /** @type {QueryParameters} */
+  const params = Object.assign({}, options, { search: pageSearchInput.value });
+
+  // Avoid fetching if the page isn't active
+  if (document.hidden) {
+    return;
+  }
+
+  fetch(ajaxUrl + toQueryString(params)).then((rsp) => {
+    if (rsp.ok) {
+      rsp.text().then((responseText) => {
+        container.classList.remove("app-builds-container--loading");
+        pageSearch.classList.remove("jenkins-search--loading");
+
+        // Show the 'No builds' text if there are no builds
+        if (responseText.trim() === "") {
+          contents.innerHTML = "";
+          noBuilds.style.display = "block";
+          updateCardControls({
+            pageHasUp: false,
+            pageHasDown: false,
+            pageEntryNewest: false,
+            pageEntryOldest: false,
+          });
+          return;
+        }
+
+        // Show the refreshed builds list
+        contents.innerHTML = responseText;
+        noBuilds.style.display = "none";
+        behaviorShim.applySubtree(contents);
+
+        // Show the card controls
+        const div = document.createElement("div");
+        div.innerHTML = responseText;
+        const innerChild = div.children[0];
+        updateCardControls({
+          pageHasUp: innerChild.dataset.pageHasUp === "true",
+          pageHasDown: innerChild.dataset.pageHasDown === "true",
+          pageEntryNewest: innerChild.dataset.pageEntryNewest,
+          pageEntryOldest: innerChild.dataset.pageEntryOldest,
+        });
+      });
+    } else {
+      console.error("Failed to load 'Builds' card, response from API is:", rsp);
+    }
+  });
+}
+
+/**
+ * Shows/hides the card's pagination controls depending on the passed parameter
+ * @param {CardControlsOptions}  parameters
+ */
+function updateCardControls(parameters) {
+  paginationControls.classList.toggle(
+    "jenkins-hidden",
+    !parameters.pageHasUp && !parameters.pageHasDown,
+  );
+  paginationPrevious.classList.toggle(
+    "app-builds-container__button--disabled",
+    !parameters.pageHasUp,
+  );
+  paginationNext.classList.toggle(
+    "app-builds-container__button--disabled",
+    !parameters.pageHasDown,
+  );
+
+  // We only want the list to refresh if the user is on the first page of results
+  if (!parameters.pageHasUp) {
+    createRefreshTimeout();
+  } else {
+    cancelRefreshTimeout();
+  }
+
+  buildHistoryPage.dataset.pageEntryNewest = parameters.pageEntryNewest;
+  buildHistoryPage.dataset.pageEntryOldest = parameters.pageEntryOldest;
+}
+
+paginationPrevious.addEventListener("click", () => {
+  load({ "newer-than": buildHistoryPage.dataset.pageEntryNewest });
+});
+
+paginationNext.addEventListener("click", () => {
+  cancelRefreshTimeout();
+  load({ "older-than": buildHistoryPage.dataset.pageEntryOldest });
+});
+
+function createRefreshTimeout() {
+  cancelRefreshTimeout();
+  buildRefreshTimeout = window.setTimeout(
+    () => load(),
+    updateBuildsRefreshInterval,
+  );
+}
+
+function cancelRefreshTimeout() {
+  if (buildRefreshTimeout) {
+    window.clearTimeout(buildRefreshTimeout);
+    buildRefreshTimeout = undefined;
+  }
+}
+
+const debouncedLoad = debounce(() => {
+  load();
+}, 150);
+
+document.addEventListener("DOMContentLoaded", function () {
+  pageSearchInput.addEventListener("input", function () {
+    container.classList.add("app-builds-container--loading");
+    pageSearch.classList.add("jenkins-search--loading");
+    debouncedLoad();
+  });
+
+  load();
+});
diff --git a/war/src/main/js/pages/project/builds-card.types.js b/war/src/main/js/pages/project/builds-card.types.js
new file mode 100644
index 000000000000..4745f088bd43
--- /dev/null
+++ b/war/src/main/js/pages/project/builds-card.types.js
@@ -0,0 +1,16 @@
+/**
+ * @typedef QueryParameters
+ * @type {object}
+ * @property {string | undefined} search
+ * @property {string | undefined} older-than
+ * @property {string | undefined} newer-than
+ */
+
+/**
+ * @typedef CardControlsOptions
+ * @type {object}
+ * @property {boolean} pageHasUp
+ * @property {boolean} pageHasDown
+ * @property {string | undefined} pageEntryNewest
+ * @property {string | undefined} pageEntryOldest
+ */
diff --git a/war/src/main/resources/images/symbols/expand.svg b/war/src/main/resources/images/symbols/expand.svg
new file mode 100644
index 000000000000..0ad346df7f67
--- /dev/null
+++ b/war/src/main/resources/images/symbols/expand.svg
@@ -0,0 +1 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M10 4H15C15.5523 4 16 4.44772 16 5V10M10 16H5C4.44772 16 4 15.5523 4 15V10" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"></path></svg>
diff --git a/war/src/main/resources/images/symbols/menu.svg b/war/src/main/resources/images/symbols/menu.svg
new file mode 100644
index 000000000000..fadc2bab3081
--- /dev/null
+++ b/war/src/main/resources/images/symbols/menu.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="ionicon" viewBox="0 0 512 512">
+    <circle cx="256" cy="256" r="45" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/>
+    <circle cx="441" cy="256" r="45" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/>
+    <circle cx="71" cy="256" r="45" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/>
+</svg>
diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss
index c2af1a1ff06c..bb272b106323 100644
--- a/war/src/main/scss/abstracts/_theme.scss
+++ b/war/src/main/scss/abstracts/_theme.scss
@@ -244,7 +244,7 @@ $semantics: (
   --pane-link-color--visited: black;
 
   // Cards
-  --card-background: transparent;
+  --card-background: var(--background);
   --card-background--hover: transparent;
   --card-background--active: transparent;
   --card-border-color: hsla(240, 25%, 75%, 0.25);
diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss
index b4a6effefdb0..56b8e40161bf 100644
--- a/war/src/main/scss/base/_style.scss
+++ b/war/src/main/scss/base/_style.scss
@@ -449,189 +449,6 @@ div.listview-jobs {
   display: block;
 }
 
-/* ========================= build history ========================= */
-#buildHistory a:visited {
-  color: fuchsia;
-}
-
-#buildHistory tr.no-wrap td.middle-align {
-  padding: 0;
-}
-
-#buildHistory .desc {
-  position: relative;
-  padding: 0;
-  margin-top: 5px;
-  white-space: normal;
-  color: var(--text-color-secondary);
-  word-break: break-word;
-}
-
-#buildHistory .build-row-cell {
-  position: relative;
-}
-
-#buildHistory .build-rss-links {
-  display: flex;
-  justify-content: end;
-}
-
-#buildHistory .build-rss-links a {
-  display: inline-flex;
-  align-items: center;
-  margin-right: 0.5rem;
-}
-
-#buildHistory .build-rss-all-icon,
-#buildHistory .build-rss-failed-icon {
-  margin-right: 0.25rem;
-
-  svg {
-    width: 16px;
-    height: 16px;
-  }
-}
-
-#buildHistoryPage {
-  position: relative;
-
-  .build-search-row,
-  .build-search-no-results-row {
-    &:hover {
-      background: transparent !important;
-    }
-
-    td {
-      padding: 0 8px 8px;
-    }
-  }
-
-  .build-search-no-results-row {
-    border: none !important;
-    width: 100% !important;
-    background: transparent;
-
-    td {
-      padding-top: 0 !important;
-    }
-  }
-}
-
-#buildHistoryPageNav {
-  position: absolute;
-  right: -28px;
-  top: 96px;
-  border-radius: 6px;
-  background: var(--input-color);
-  border: 2px solid var(--input-border);
-  visibility: hidden;
-  z-index: 0;
-  opacity: 0;
-  transition: 0.2s ease;
-
-  // Invisible pseudo element on the left so #buildHistoryPageNav
-  // doesn't disappear when moving cursor over gap
-  &::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: -8px;
-    bottom: 0;
-    width: 8px;
-    background: transparent;
-    z-index: -1;
-  }
-
-  .buildHistoryPageNav__item {
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-    padding: 0 8px;
-    height: 30px;
-    cursor: pointer;
-    transition: opacity 0.2s ease;
-
-    &:hover {
-      opacity: 0.5;
-    }
-
-    &:active {
-      opacity: 0.25;
-    }
-
-    &:not(:last-child) {
-      border-bottom: 2px solid rgba(0, 0, 0, 0.05);
-    }
-
-    &-page-one-top {
-      width: 12px;
-      height: 2px;
-      background: currentColor;
-      margin: 2px 0;
-      border-radius: 2px;
-    }
-
-    svg {
-      fill: currentColor;
-      width: 12px;
-      height: 12px;
-    }
-  }
-}
-
-#buildHistoryPageNav.mouseOverSidePanel {
-  visibility: visible;
-  right: -32px;
-  opacity: 1;
-}
-
-.build-row.model-link-active {
-  background: var(--light-grey) !important;
-}
-
-.build-row-cell {
-  font-size: var(--font-size-xs);
-}
-
-.build-row-cell .pane.build-name {
-  width: 25%;
-  font-weight: 500;
-  vertical-align: top;
-}
-
-.build-row-cell .pane.build-details {
-  width: 50%;
-}
-
-.build-row-cell .pane.build-controls {
-  width: 25%;
-  text-align: right;
-}
-
-.build-row-cell .pane.build-details.block {
-  width: 100%;
-}
-
-.pane.build-name a,
-.pane.build-name a:visited {
-  color: var(--pane-link-color);
-  text-decoration: underline;
-}
-
-.pane.build-details a,
-.pane.build-details a:visited {
-  color: var(--pane-link-color--visited);
-  opacity: 0.6;
-  text-decoration: none;
-}
-
-.pane.build-details a:hover {
-  opacity: 1;
-  text-decoration: underline;
-}
-
 /* ================ Element overflow calculation helper styles ================ */
 
 .force-wrap,
diff --git a/war/src/main/scss/components/_cards.scss b/war/src/main/scss/components/_cards.scss
new file mode 100644
index 000000000000..be86bb390337
--- /dev/null
+++ b/war/src/main/scss/components/_cards.scss
@@ -0,0 +1,97 @@
+$card-padding: 1rem;
+
+.jenkins-card {
+  position: relative;
+  border-radius: 1rem;
+  margin-bottom: calc(var(--section-padding) / 2);
+  background: var(--card-background);
+
+  &__title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 $card-padding;
+    height: 50px;
+    font-size: var(--font-size-sm) !important;
+    font-weight: 500;
+    width: 100%;
+    z-index: 1;
+  }
+
+  &__controls {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.4rem;
+    margin-right: -0.2rem;
+  }
+
+  &:not(:hover) {
+    .jenkins-card__unveil {
+      color: var(--text-color-secondary) !important;
+    }
+  }
+
+  &:hover {
+    .jenkins-card__reveal {
+      color: var(--text-color) !important;
+    }
+  }
+
+  &__content {
+    display: flex;
+    flex-direction: column;
+    padding: 0 $card-padding $card-padding;
+    color: var(--text-color-secondary);
+
+    &:empty {
+      display: none;
+    }
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    inset: 0;
+    border-radius: inherit;
+    border: var(--card-border-width) solid var(--card-border-color);
+    z-index: 1;
+    pointer-events: none;
+  }
+
+  .jenkins-card__reveal {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-block: -0.5rem;
+    min-height: 0;
+    padding: 0;
+    width: 26px;
+    height: 26px;
+    border-radius: 0.33rem;
+    color: var(--text-color-secondary) !important;
+    transition:
+      scale var(--standard-transition),
+      opacity var(--standard-transition);
+
+    svg {
+      width: 1rem;
+      height: 1rem;
+      transition: color var(--standard-transition);
+    }
+
+    &::before,
+    &::after {
+      opacity: 0;
+    }
+
+    &:hover {
+      opacity: 0.75;
+    }
+
+    &:active {
+      scale: 95%;
+      opacity: 0.5;
+    }
+  }
+}
diff --git a/war/src/main/scss/components/_dropdowns.scss b/war/src/main/scss/components/_dropdowns.scss
index 3a4ce4435977..7268773f8fab 100644
--- a/war/src/main/scss/components/_dropdowns.scss
+++ b/war/src/main/scss/components/_dropdowns.scss
@@ -254,3 +254,18 @@ $dropdown-padding: 0.4rem;
     border-radius: 50%;
   }
 }
+
+.jenkins-jumplist-link {
+  appearance: none;
+  border: none;
+  background: none;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+
+  svg {
+    width: 1.25rem;
+    height: 1.25rem;
+  }
+}
diff --git a/war/src/main/scss/components/_index.scss b/war/src/main/scss/components/_index.scss
index 3048d06ae2c5..f3167bd091f9 100644
--- a/war/src/main/scss/components/_index.scss
+++ b/war/src/main/scss/components/_index.scss
@@ -2,8 +2,9 @@
 @use "alert";
 @use "badges";
 @use "breadcrumbs";
-@use "buttons-deprecated";
 @use "buttons";
+@use "buttons-deprecated";
+@use "cards";
 @use "content-blocks";
 @use "dialogs";
 @use "dropdowns";
diff --git a/war/src/main/scss/components/_progress-bar.scss b/war/src/main/scss/components/_progress-bar.scss
index 1e1faf37d630..2a92b570a226 100644
--- a/war/src/main/scss/components/_progress-bar.scss
+++ b/war/src/main/scss/components/_progress-bar.scss
@@ -10,7 +10,6 @@
     var(--text-color-secondary) 25%,
     transparent
   );
-  margin-top: 2px;
   display: block;
   opacity: 1 !important;
 
diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/war/src/main/scss/components/_side-panel-widgets.scss
index 6772890bbffa..449646aaad4a 100644
--- a/war/src/main/scss/components/_side-panel-widgets.scss
+++ b/war/src/main/scss/components/_side-panel-widgets.scss
@@ -90,165 +90,3 @@
 #executors th.pane {
   text-align: left;
 }
-
-/**
- * Build history
- */
-.build-row {
-  padding: 3px 4px;
-}
-
-.build-row.model-link-active {
-  background: var(--very-light-grey) !important;
-}
-
-.build-row-cell {
-  font-size: var(--font-size-xs);
-}
-
-.build-row-cell .pane.build-name {
-  width: 32%;
-  font-weight: 500;
-  vertical-align: top;
-}
-
-.build-row-cell .pane.build-details {
-  width: 50%;
-}
-
-.build-row-cell .pane.build-controls {
-  width: 18%;
-  text-align: right;
-}
-
-.build-row-cell .pane.build-details.block {
-  width: 100%;
-}
-
-.build-row.multi-line .build-row-cell .pane.build-name.block {
-  width: 100%;
-}
-
-.build-row-cell .pane.build-controls.block {
-  width: 100%;
-}
-
-.build-row-cell .pane.build-name .build-icon,
-.build-row-cell .pane.build-name .display-name {
-  display: inline-block;
-}
-
-.build-row-cell .pane.build-name .build-icon {
-  position: absolute;
-  margin-top: 2px;
-  z-index: 1;
-}
-
-.build-row-cell .build-stop {
-  display: inline-block;
-  width: 30%;
-}
-
-.build-row-cell .build-badge {
-  display: inline-block;
-  text-align: right;
-  width: 70%;
-  padding: 2px 0;
-}
-
-.build-row-cell .build-badge > span {
-  display: inline-block;
-  max-width: 256px;
-  padding: 0 1px;
-  overflow: hidden;
-}
-
-.build-row-cell .build-badge > span + span {
-  margin: 0 0 0 2px !important;
-}
-
-@media (width >= 1170px) {
-  .build-row-cell .build-badge > span {
-    max-width: 296px;
-  }
-}
-
-.build-row .build-name-controls .pane.build-name,
-.build-row .build-details-controls .pane.build-details {
-  width: 70%;
-}
-
-.build-row .build-row-cell .pane,
-#side-panel .build-row .build-row-cell .pane {
-  padding: 0 2px; /* Sync changes with func expandControlsTo50Percent in hudson-behavior.js */
-  display: inline-block;
-  overflow: hidden;
-}
-
-.build-row.multi-line .build-row-cell .block {
-  display: block;
-  overflow: auto;
-}
-
-.build-row.multi-line .build-row-cell .indent-multiline {
-  margin-top: 5px;
-}
-
-.build-row.multi-line .build-row-cell .left-bar {
-  position: absolute;
-  top: 31px;
-  bottom: 10px;
-  left: 17px;
-  border-left: 1px solid var(--medium-grey);
-}
-
-.build-row-cell .pane.build-name .display-name {
-  margin-left: 20px;
-  word-break: break-all;
-}
-
-.build-row-cell .indent-multiline {
-  padding-left: 20px !important; /* Sync changes with func expandControlsTo50Percent in hudson-behavior.js */
-}
-
-.build-row.overflow-checked .build-row-cell {
-  visibility: visible;
-}
-
-.jenkins-pane {
-  &__information {
-    text-align: center;
-    line-height: 80px;
-    background-color: var(--panel-header-bg-color);
-    margin-top: 10px;
-    font-weight: 600;
-    border-radius: var(--form-input-border-radius);
-  }
-
-  .build-row {
-    transition: opacity 0.2s ease;
-
-    &-cell {
-      padding: 4px 8px;
-    }
-  }
-
-  &--loading .build-row {
-    opacity: 0.5;
-  }
-}
-
-.jenkins-pane__header--build-history {
-  display: grid;
-  grid-template-columns: auto 1fr auto;
-  font-weight: 500 !important;
-
-  .build-health-link {
-    margin: -9px -15px;
-  }
-
-  .jenkins-table__cell--tight {
-    width: auto;
-    margin-right: 1rem;
-  }
-}
diff --git a/war/src/main/scss/pages/_index.scss b/war/src/main/scss/pages/_index.scss
index 0e0b224dc6a0..c8e20e272271 100644
--- a/war/src/main/scss/pages/_index.scss
+++ b/war/src/main/scss/pages/_index.scss
@@ -2,6 +2,7 @@
 @use "build";
 @use "dashboard";
 @use "icon-legend";
+@use "job";
 @use "manage-jenkins";
 @use "plugin-manager";
 @use "setupWizardFirstUser";
diff --git a/war/src/main/scss/pages/_job.scss b/war/src/main/scss/pages/_job.scss
new file mode 100644
index 000000000000..3b982fcffcf4
--- /dev/null
+++ b/war/src/main/scss/pages/_job.scss
@@ -0,0 +1,184 @@
+@use "../abstracts/mixins";
+
+#buildHistoryPage {
+  margin: 10px 0 10px 10px;
+
+  .jenkins-search {
+    margin-inline: -0.25rem;
+    margin-bottom: 5px;
+  }
+}
+
+.app-builds-container {
+  transition: opacity var(--standard-transition);
+
+  &__items {
+    margin-bottom: -0.5rem;
+  }
+
+  &__placeholder {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    padding: 3rem;
+    animation: fade-in-builds-placeholder var(--standard-transition);
+
+    @keyframes fade-in-builds-placeholder {
+      from {
+        opacity: 0;
+      }
+    }
+  }
+
+  &__heading {
+    display: flex;
+    font-size: 0.75rem;
+    color: var(--text-color-secondary);
+    margin-top: 10px;
+    font-weight: 450;
+    margin-bottom: 4px;
+  }
+
+  &__controls {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 15px;
+    margin: 0 -0.35rem;
+    margin-top: 1rem;
+    margin-bottom: -0.5rem;
+
+    .jenkins-button {
+      padding: 10px;
+
+      svg {
+        transition: translate var(--standard-transition);
+      }
+
+      &:first-of-type {
+        justify-content: start;
+
+        &:hover {
+          translate: -2px 0;
+
+          svg {
+            translate: -4px 0;
+          }
+        }
+      }
+
+      &:last-of-type {
+        justify-content: end;
+
+        &:hover {
+          translate: 2px 0;
+
+          svg {
+            translate: 4px 0;
+          }
+        }
+      }
+    }
+
+    .app-builds-container__button--disabled {
+      color: var(--text-color-secondary) !important;
+      opacity: 0.25;
+      pointer-events: none;
+    }
+  }
+
+  &--loading {
+    opacity: 0.4;
+    filter: blur(0.5px);
+  }
+}
+
+.app-builds-container__item {
+  @include mixins.item();
+
+  display: grid;
+  grid-template-columns: auto 1fr auto;
+  gap: 0.5rem 0.65rem;
+  padding: 0 0 0.25rem;
+  margin: 0 -0.5rem;
+  font-size: 0.8125rem !important;
+  min-height: 2rem;
+
+  &__icon {
+    display: inline-flex;
+    justify-content: center;
+    padding: 0 0 0 0.5rem;
+    margin-top: 0.385rem;
+
+    svg {
+      width: 1.25rem;
+      height: 1.25rem;
+    }
+  }
+
+  .app-builds-container__item__inner {
+    display: flex;
+    align-items: stretch;
+    flex-wrap: wrap;
+
+    &__link {
+      display: flex;
+      color: var(--text-color);
+      gap: 0.5rem;
+      text-decoration: none;
+      font-weight: 450;
+      flex-grow: 1;
+      padding: 0.45rem 0 0;
+
+      .app-builds-container__item__time {
+        color: var(--text-color-secondary);
+      }
+    }
+
+    &__controls {
+      display: flex;
+      align-items: center;
+      justify-content: start;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+      margin-top: 0.3rem;
+    }
+  }
+
+  &--not-interactable {
+    cursor: default;
+
+    &::before,
+    &::after {
+      display: none;
+    }
+
+    .app-builds-container__item__description {
+      margin-bottom: 0;
+    }
+  }
+
+  .jenkins-jumplist-link {
+    margin-top: 0.2rem;
+    padding-right: 0.8rem;
+  }
+
+  &__description {
+    color: var(--text-color-secondary);
+    padding-left: 2.25rem;
+    margin-top: -2px;
+    grid-column: 1 / span 2;
+
+    &::before {
+      content: "";
+      position: absolute;
+      left: 17px;
+      top: 34px;
+      bottom: 6px;
+      width: 2px;
+      background: var(--text-color-secondary);
+      border-radius: 10px;
+      opacity: 0.3;
+    }
+  }
+}
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 161db88cfd72..ff6a506e77f6 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -2220,35 +2220,6 @@ function toQueryString(params) {
   return query;
 }
 
-// eslint-disable-next-line no-unused-vars
-function getElementOverflowParams(element) {
-  // First we force it to wrap so we can get those dimension.
-  // Then we force it to "nowrap", so we can get those dimension.
-  // We can then compare the two sets, which will indicate if
-  // wrapping is potentially happening, or not.
-
-  // Force it to wrap.
-  element.classList.add("force-wrap");
-  var wrappedClientWidth = element.clientWidth;
-  var wrappedClientHeight = element.clientHeight;
-  element.classList.remove("force-wrap");
-
-  // Force it to nowrap. Return the comparisons.
-  element.classList.add("force-nowrap");
-  var nowrapClientHeight = element.clientHeight;
-  try {
-    var overflowParams = {
-      element: element,
-      clientWidth: wrappedClientWidth,
-      scrollWidth: element.scrollWidth,
-      isOverflowed: wrappedClientHeight > nowrapClientHeight,
-    };
-    return overflowParams;
-  } finally {
-    element.classList.remove("force-nowrap");
-  }
-}
-
 // get the cascaded computed style value. 'a' is the style name like 'backgroundColor'
 function getStyle(e, a) {
   if (document.defaultView && document.defaultView.getComputedStyle) {
diff --git a/war/webpack.config.js b/war/webpack.config.js
index c5e8e17442d1..b9f012095ff4 100644
--- a/war/webpack.config.js
+++ b/war/webpack.config.js
@@ -50,8 +50,8 @@ module.exports = (env, argv) => ({
     "components/row-selection-controller": [
       path.join(__dirname, "src/main/js/components/row-selection-controller"),
     ],
-    "filter-build-history": [
-      path.join(__dirname, "src/main/js/filter-build-history.js"),
+    "pages/project/builds-card": [
+      path.join(__dirname, "src/main/js/pages/project/builds-card.js"),
     ],
     "simple-page": [path.join(__dirname, "src/main/scss/simple-page.scss")],
     styles: [path.join(__dirname, "src/main/scss/styles.scss")],

From df0a13d8fb5395e47349bd8a82b78196556afc16 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Fri, 14 Jun 2024 15:21:40 +0200
Subject: [PATCH 130/449] Fix web references in comment on obtaining process
 info on Mac OS (#9378)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
---
 core/src/main/java/hudson/util/ProcessTree.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
index 8fbb80c8a8db..ac07f7196892 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -2115,12 +2115,12 @@ public <T> T act(ProcessCallable<T> callable) throws IOException, InterruptedExc
     }
 
     /*
-        On MacOS X, there's no procfs <http://www.osxbook.com/book/bonus/chapter11/procfs/>
-        instead you'd do it with the sysctl <http://search.cpan.org/src/DURIST/Proc-ProcessTable-0.42/os/darwin.c>
-        <http://developer.apple.com/documentation/Darwin/Reference/ManPages/man3/sysctl.3.html>
+        On MacOS X, there's no procfs <https://web.archive.org/web/20200513034043/https://osxbook.com/book/bonus/chapter11/procfs/>
+        instead you'd do it with sysctl <https://metacpan.org/release/DURIST/Proc-ProcessTable-0.42/source/os/darwin.c>
+        <https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/sysctl.3.html>
 
         There's CLI but that doesn't seem to offer the access to per-process info
-        <http://developer.apple.com/documentation/Darwin/Reference/ManPages/man8/sysctl.8.html>
+        <https://web.archive.org/web/20090819232443/http://developer.apple.com/documentation/Darwin/Reference/ManPages/man8/sysctl.8.html>
 
 
 

From 1381726b2f96c89472cf4c9cdd6289843f9fa85f Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 14 Jun 2024 06:21:57 -0700
Subject: [PATCH 131/449] Use `isEmpty()` where possible (#9383)

---
 core/src/main/java/hudson/DependencyRunner.java             | 2 +-
 core/src/main/java/hudson/FilePath.java                     | 4 ++--
 core/src/main/java/hudson/Functions.java                    | 6 +++---
 core/src/main/java/hudson/cli/CLIAction.java                | 2 +-
 core/src/main/java/hudson/cli/GroovyshCommand.java          | 2 +-
 core/src/main/java/hudson/diagnosis/OldDataMonitor.java     | 2 +-
 core/src/main/java/hudson/logging/LogRecorder.java          | 4 ++--
 .../src/main/java/hudson/model/DirectoryBrowserSupport.java | 6 +++---
 core/src/main/java/hudson/model/DownloadService.java        | 2 +-
 core/src/main/java/hudson/model/Fingerprint.java            | 4 ++--
 core/src/main/java/hudson/model/Items.java                  | 2 +-
 core/src/main/java/hudson/model/Label.java                  | 2 +-
 core/src/main/java/hudson/model/ListView.java               | 2 +-
 core/src/main/java/hudson/model/Run.java                    | 2 +-
 core/src/main/java/hudson/model/TopLevelItemDescriptor.java | 2 +-
 core/src/main/java/hudson/scm/ChangeLogSet.java             | 2 +-
 core/src/main/java/hudson/scm/browsers/QueryBuilder.java    | 2 +-
 core/src/main/java/hudson/search/ParsedQuickSilver.java     | 2 +-
 core/src/main/java/hudson/search/SuggestedItem.java         | 2 +-
 .../java/hudson/security/HudsonPrivateSecurityRealm.java    | 2 +-
 core/src/main/java/hudson/security/SecurityRealm.java       | 2 +-
 core/src/main/java/hudson/security/csrf/CrumbFilter.java    | 2 +-
 core/src/main/java/hudson/security/csrf/CrumbIssuer.java    | 2 +-
 core/src/main/java/hudson/tasks/Fingerprinter.java          | 2 +-
 .../main/java/hudson/tools/AbstractCommandInstaller.java    | 4 ++--
 core/src/main/java/hudson/util/ArgumentListBuilder.java     | 6 +++---
 core/src/main/java/jenkins/install/InstallUtil.java         | 2 +-
 .../jenkins/management/AdministrativeMonitorsDecorator.java | 2 +-
 .../org/apache/commons/validator/routines/UrlValidator.java | 4 ++--
 core/src/main/java/jenkins/util/TreeString.java             | 2 +-
 core/src/main/java/org/jenkins/ui/icon/Icon.java            | 2 +-
 core/src/test/java/hudson/UtilTest.java                     | 2 +-
 32 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/core/src/main/java/hudson/DependencyRunner.java b/core/src/main/java/hudson/DependencyRunner.java
index b7db91fb9416..f577440659cf 100644
--- a/core/src/main/java/hudson/DependencyRunner.java
+++ b/core/src/main/java/hudson/DependencyRunner.java
@@ -58,7 +58,7 @@ public void run() {
             // Get all top-level projects
             LOGGER.fine("assembling top level projects");
             for (AbstractProject p : Jenkins.get().allItems(AbstractProject.class))
-                if (p.getUpstreamProjects().size() == 0) {
+                if (p.getUpstreamProjects().isEmpty()) {
                     LOGGER.fine("adding top level project " + p.getName());
                     topLevelProjects.add(p);
                 } else {
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 99199e8eb461..6b2b4ff0a8cc 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -321,7 +321,7 @@ public static String normalize(@NonNull String path) {
             buf.append(m.group(1));
             path = path.substring(m.end());
         }
-        boolean isAbsolute = buf.length() > 0;
+        boolean isAbsolute = !buf.isEmpty();
         // Split remaining path into tokens, trimming any duplicate or trailing separators
         List<String> tokens = new ArrayList<>();
         int s = 0, end = path.length();
@@ -366,7 +366,7 @@ public static String normalize(@NonNull String path) {
         }
         // Recombine tokens
         for (String token : tokens) buf.append(token);
-        if (buf.length() == 0) buf.append('.');
+        if (buf.isEmpty()) buf.append('.');
         return buf.toString();
     }
 
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index f9ec7f6baebe..cd25f9bc9871 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -1421,7 +1421,7 @@ public static String getRelativeNameFrom(@CheckForNull Item p, @CheckForNull Ite
         StringBuilder buf = new StringBuilder();
         Item i = p;
         while (true) {
-            if (buf.length() > 0) buf.insert(0, separationString);
+            if (!buf.isEmpty()) buf.insert(0, separationString);
             buf.insert(0, useDisplayName ? i.getDisplayName() : i.getName());
             ItemGroup gr = i.getParent();
 
@@ -1872,7 +1872,7 @@ public static String joinPath(String... components) {
         for (String s : components) {
             if (s.isEmpty())  continue;
 
-            if (buf.length() > 0) {
+            if (!buf.isEmpty()) {
                 if (buf.charAt(buf.length() - 1) != '/')
                     buf.append('/');
                 if (s.charAt(0) == '/')   s = s.substring(1);
@@ -2054,7 +2054,7 @@ public static List<Descriptor<Cloud>> getCloudDescriptors() {
      * Prepend a prefix only when there's the specified body.
      */
     public String prepend(String prefix, String body) {
-        if (body != null && body.length() > 0)
+        if (body != null && !body.isEmpty())
             return prefix + body;
         return body;
     }
diff --git a/core/src/main/java/hudson/cli/CLIAction.java b/core/src/main/java/hudson/cli/CLIAction.java
index 4265a6283a2b..9e29b141560c 100644
--- a/core/src/main/java/hudson/cli/CLIAction.java
+++ b/core/src/main/java/hudson/cli/CLIAction.java
@@ -217,7 +217,7 @@ protected void closed(int statusCode, String reason) {
     @Override
     public Object getTarget() {
         StaplerRequest req = Stapler.getCurrentRequest();
-        if (req.getRestOfPath().length() == 0 && "POST".equals(req.getMethod())) {
+        if (req.getRestOfPath().isEmpty() && "POST".equals(req.getMethod())) {
             // CLI connection request
             if ("false".equals(req.getParameter("remoting"))) {
                 throw new PlainCliEndpointResponse();
diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java
index 8bc4d522e254..18cbc6da7513 100644
--- a/core/src/main/java/hudson/cli/GroovyshCommand.java
+++ b/core/src/main/java/hudson/cli/GroovyshCommand.java
@@ -77,7 +77,7 @@ protected int run() {
 
         StringBuilder commandLine = new StringBuilder();
         for (String arg : args) {
-            if (commandLine.length() > 0) {
+            if (!commandLine.isEmpty()) {
                 commandLine.append(" ");
             }
             commandLine.append(arg);
diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
index b389221f763e..e2bfa4678fc9 100644
--- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -218,7 +218,7 @@ public static void report(Saveable obj, Collection<Throwable> errors) {
                 buf.append(e.getClass().getSimpleName()).append(": ").append(e.getMessage());
             }
         }
-        if (buf.length() == 0) return;
+        if (buf.isEmpty()) return;
         Jenkins j = Jenkins.getInstanceOrNull();
         if (j == null) { // Need this path, at least for unit tests, but also in case of very broken startup
             // Startup failed, something is very broken, so report what we can.
diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java
index 23ebc72cde6a..86aea6575048 100644
--- a/core/src/main/java/hudson/logging/LogRecorder.java
+++ b/core/src/main/java/hudson/logging/LogRecorder.java
@@ -393,7 +393,7 @@ private static final class SetLevel extends MasterToSlaveCallable<Void, Error> {
 
         void broadcast() {
             for (Computer c : Jenkins.get().getComputers()) {
-                if (c.getName().length() > 0) { // i.e. not master
+                if (!c.getName().isEmpty()) { // i.e. not master
                     VirtualChannel ch = c.getChannel();
                     if (ch != null) {
                         try {
@@ -595,7 +595,7 @@ public int compare(Computer c1, Computer c2) {
             }
         });
         for (Computer c : Jenkins.get().getComputers()) {
-            if (c.getName().length() == 0) {
+            if (c.getName().isEmpty()) {
                 continue; // master
             }
             List<LogRecord> recs = new ArrayList<>();
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index 8083efa72dbf..f51e145ab195 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -230,7 +230,7 @@ private void serveFile(StaplerRequest req, StaplerResponse rsp, VirtualFile root
                 String pathElement = pathTokens.nextToken();
                 // Treat * and ? as wildcard unless they match a literal filename
                 if ((pathElement.contains("?") || pathElement.contains("*"))
-                        && inBase && !root.child((_base.length() > 0 ? _base + "/" : "") + pathElement).exists())
+                        && inBase && !root.child((!_base.isEmpty() ? _base + "/" : "") + pathElement).exists())
                     inBase = false;
                 if (pathElement.equals("*zip*")) {
                     // the expected syntax is foo/bar/*zip*/bar.zip
@@ -245,7 +245,7 @@ private void serveFile(StaplerRequest req, StaplerResponse rsp, VirtualFile root
                 }
 
                 StringBuilder sb = inBase ? _base : _rest;
-                if (sb.length() > 0)   sb.append('/');
+                if (!sb.isEmpty())   sb.append('/');
                 sb.append(pathElement);
                 if (!inBase)
                     restSize++;
@@ -315,7 +315,7 @@ private void serveFile(StaplerRequest req, StaplerResponse rsp, VirtualFile root
             }
 
             List<List<Path>> glob = null;
-            boolean patternUsed = rest.length() > 0;
+            boolean patternUsed = !rest.isEmpty();
             boolean containsSymlink = false;
             boolean containsTmpDir = false;
                 if (patternUsed) {
diff --git a/core/src/main/java/hudson/model/DownloadService.java b/core/src/main/java/hudson/model/DownloadService.java
index b9a5610c4e35..0988b36785dd 100644
--- a/core/src/main/java/hudson/model/DownloadService.java
+++ b/core/src/main/java/hudson/model/DownloadService.java
@@ -404,7 +404,7 @@ public FormValidation updateNow() throws IOException {
                 }
                 jsonList.add(o);
             }
-            if (jsonList.size() == 0 && toolInstallerMetadataExists) {
+            if (jsonList.isEmpty() && toolInstallerMetadataExists) {
                 return FormValidation.warning("None of the tool installer metadata passed the signature check");
             } else if (!toolInstallerMetadataExists) {
                 LOGGER.log(Level.WARNING, "No tool installer metadata found for " + id);
diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java
index bd7721906b5f..df482e28e03c 100644
--- a/core/src/main/java/hudson/model/Fingerprint.java
+++ b/core/src/main/java/hudson/model/Fingerprint.java
@@ -608,7 +608,7 @@ public synchronized boolean removeAll(RangeSet that) {
         public synchronized String toString() {
             StringBuilder buf = new StringBuilder();
             for (Range r : ranges) {
-                if (buf.length() > 0)  buf.append(',');
+                if (!buf.isEmpty())  buf.append(',');
                 buf.append(r);
             }
             return buf.toString();
@@ -787,7 +787,7 @@ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingC
             public static String serialize(RangeSet src) {
                 StringBuilder buf = new StringBuilder(src.ranges.size() * 10);
                 for (Range r : src.ranges) {
-                    if (buf.length() > 0)  buf.append(',');
+                    if (!buf.isEmpty())  buf.append(',');
                     if (r.isSingle())
                         buf.append(r.start);
                     else
diff --git a/core/src/main/java/hudson/model/Items.java b/core/src/main/java/hudson/model/Items.java
index a1386565cfd0..fac4ae8a4a01 100644
--- a/core/src/main/java/hudson/model/Items.java
+++ b/core/src/main/java/hudson/model/Items.java
@@ -208,7 +208,7 @@ public static TopLevelItemDescriptor getDescriptor(String fqcn) {
     public static String toNameList(Collection<? extends Item> items) {
         StringBuilder buf = new StringBuilder();
         for (Item item : items) {
-            if (buf.length() > 0)
+            if (!buf.isEmpty())
                 buf.append(", ");
             buf.append(item.getFullName());
         }
diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java
index 94d8b9683ed7..88661c6df690 100644
--- a/core/src/main/java/hudson/model/Label.java
+++ b/core/src/main/java/hudson/model/Label.java
@@ -591,7 +591,7 @@ public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingCont
     public static Set<LabelAtom> parse(@CheckForNull String labels) {
         final Set<LabelAtom> r = new TreeSet<>();
         labels = fixNull(labels);
-        if (labels.length() > 0) {
+        if (!labels.isEmpty()) {
             Jenkins j = Jenkins.get();
             LabelAtom labelAtom = j.tryGetLabelAtom(labels);
             if (labelAtom == null) {
diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java
index 77852e994ece..d8f6a8d48bcb 100644
--- a/core/src/main/java/hudson/model/ListView.java
+++ b/core/src/main/java/hudson/model/ListView.java
@@ -359,7 +359,7 @@ public boolean isAddToCurrentView() {
 
     private boolean needToAddToCurrentView(StaplerRequest req) throws ServletException {
         String json = req.getParameter("json");
-        if (json != null && json.length() > 0) {
+        if (json != null && !json.isEmpty()) {
             // Submitted via UI
             JSONObject form = req.getSubmittedForm();
             return form.has("addToCurrentView") && form.getBoolean("addToCurrentView");
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 324a5eff3cb9..d2ce976e1add 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -1341,7 +1341,7 @@ public void computeDisplayName() {
         private String combineLast(String[] token, int n) {
             StringBuilder buf = new StringBuilder();
             for (int i = Math.max(0, token.length - n); i < token.length; i++) {
-                if (buf.length() > 0)  buf.append('/');
+                if (!buf.isEmpty())  buf.append('/');
                 buf.append(token[i]);
             }
             return buf.toString();
diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
index 16aa01807ff8..d2ebe3065349 100644
--- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
+++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
@@ -239,7 +239,7 @@ public String getIconClassName() {
                 // this one is easy... too easy... also will never happen
                 return IconSet.toNormalizedIconNameClass(path);
             }
-            if (Jenkins.RESOURCE_PATH.length() > 0 && path.startsWith(Jenkins.RESOURCE_PATH)) {
+            if (!Jenkins.RESOURCE_PATH.isEmpty() && path.startsWith(Jenkins.RESOURCE_PATH)) {
                 // will to live falling
                 path = path.substring(Jenkins.RESOURCE_PATH.length());
             }
diff --git a/core/src/main/java/hudson/scm/ChangeLogSet.java b/core/src/main/java/hudson/scm/ChangeLogSet.java
index a0c4a4c9cd79..f9f29720355f 100644
--- a/core/src/main/java/hudson/scm/ChangeLogSet.java
+++ b/core/src/main/java/hudson/scm/ChangeLogSet.java
@@ -238,7 +238,7 @@ public Collection<? extends AffectedFile> getAffectedFiles() {
             ChangeLogSet parent = getParent();
             if (null != parent) {
                 String kind = parent.getKind();
-                if (null != kind && kind.trim().length() > 0) scm = kind;
+                if (null != kind && !kind.trim().isEmpty()) scm = kind;
             }
             throw new UnsupportedOperationException("getAffectedFiles() is not implemented by " + scm);
         }
diff --git a/core/src/main/java/hudson/scm/browsers/QueryBuilder.java b/core/src/main/java/hudson/scm/browsers/QueryBuilder.java
index 06d933aa7ef3..72e6ebc0d557 100644
--- a/core/src/main/java/hudson/scm/browsers/QueryBuilder.java
+++ b/core/src/main/java/hudson/scm/browsers/QueryBuilder.java
@@ -38,7 +38,7 @@ public QueryBuilder(String s) {
 
     public QueryBuilder add(String s) {
         if (s == null)     return this; // nothing to add
-        if (buf.length() == 0) buf.append('?');
+        if (buf.isEmpty()) buf.append('?');
         else                buf.append('&');
         buf.append(s);
         return this;
diff --git a/core/src/main/java/hudson/search/ParsedQuickSilver.java b/core/src/main/java/hudson/search/ParsedQuickSilver.java
index dc214892ac00..879f9c080d16 100644
--- a/core/src/main/java/hudson/search/ParsedQuickSilver.java
+++ b/core/src/main/java/hudson/search/ParsedQuickSilver.java
@@ -85,7 +85,7 @@ private ParsedQuickSilver(Class<? extends SearchableModelObject> clazz) {
     private String splitName(String url) {
         StringBuilder buf = new StringBuilder(url.length() + 5);
         for (String token : url.split("(?<=[a-z])(?=[A-Z])")) {
-            if (buf.length() > 0)  buf.append(' ');
+            if (!buf.isEmpty())  buf.append(' ');
             buf.append(Introspector.decapitalize(token));
         }
         return buf.toString();
diff --git a/core/src/main/java/hudson/search/SuggestedItem.java b/core/src/main/java/hudson/search/SuggestedItem.java
index 86dbc36b5fe3..9ba455270e58 100644
--- a/core/src/main/java/hudson/search/SuggestedItem.java
+++ b/core/src/main/java/hudson/search/SuggestedItem.java
@@ -111,7 +111,7 @@ private void getUrl(StringBuilder buf) {
             buf.setLength(0);
             buf.append(f);
         } else {
-            if (buf.length() == 0 || buf.charAt(buf.length() - 1) != '/')
+            if (buf.isEmpty() || buf.charAt(buf.length() - 1) != '/')
                 buf.append('/');
             buf.append(f);
         }
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index 6305a69a6abb..53b798d941db 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -449,7 +449,7 @@ private SignupInfo validateAccountCreationForm(StaplerRequest req, boolean valid
             si.errors.put("password1", Messages.HudsonPrivateSecurityRealm_CreateAccount_PasswordNotMatch());
         }
 
-        if (!(si.password1 != null && si.password1.length() != 0)) {
+        if (!(si.password1 != null && !si.password1.isEmpty())) {
             si.errors.put("password1", Messages.HudsonPrivateSecurityRealm_CreateAccount_PasswordRequired());
         }
 
diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index 525368f65692..b969a57eb781 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -326,7 +326,7 @@ public void doLogout(StaplerRequest req, StaplerResponse rsp) throws IOException
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         SecurityContextHolder.clearContext();
 
-        String contextPath = req.getContextPath().length() > 0 ? req.getContextPath() : "/";
+        String contextPath = !req.getContextPath().isEmpty() ? req.getContextPath() : "/";
         resetRememberMeCookie(req, rsp, contextPath);
         clearStaleSessionCookies(req, rsp, contextPath);
 
diff --git a/core/src/main/java/hudson/security/csrf/CrumbFilter.java b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
index 03e17a0fd894..8b4b558938e7 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbFilter.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
@@ -105,7 +105,7 @@ private static String canonicalPath(String path) {
                 buf.append(token);
             }
             // translation: if (path.endsWith("/") && !buf.endsWith("/"))
-            if (path.endsWith("/") && (buf.length() == 0 || buf.charAt(buf.length() - 1) != '/'))
+            if (path.endsWith("/") && (buf.isEmpty() || buf.charAt(buf.length() - 1) != '/'))
                 buf.append('/');
             return buf.toString();
         }
diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
index 384f0a765ddd..c753ddaa5d62 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
@@ -78,7 +78,7 @@ public String getCrumb(ServletRequest request) {
         if (crumb == null) {
             crumb = issueCrumb(request, getDescriptor().getCrumbSalt());
             if (request != null) {
-                if (crumb != null && crumb.length() > 0) {
+                if (crumb != null && !crumb.isEmpty()) {
                     request.setAttribute(CRUMB_ATTRIBUTE, crumb);
                 } else {
                     request.removeAttribute(CRUMB_ATTRIBUTE);
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index 3be7631bb1f0..4d843b27b003 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -182,7 +182,7 @@ public void perform(Run<?, ?> build, FilePath workspace, EnvVars environment, La
 
             Map<String, String> record = new HashMap<>();
 
-            if (targets.length() != 0) {
+            if (!targets.isEmpty()) {
                 String expandedTargets = targets;
                 if (build instanceof AbstractBuild) { // no expansion for pipelines
                     expandedTargets = environment.expand(expandedTargets);
diff --git a/core/src/main/java/hudson/tools/AbstractCommandInstaller.java b/core/src/main/java/hudson/tools/AbstractCommandInstaller.java
index 46e7bc6657a2..88cbe5915cc0 100644
--- a/core/src/main/java/hudson/tools/AbstractCommandInstaller.java
+++ b/core/src/main/java/hudson/tools/AbstractCommandInstaller.java
@@ -90,7 +90,7 @@ public abstract static class Descriptor<TInstallerClass extends AbstractCommandI
             extends ToolInstallerDescriptor<TInstallerClass> {
 
         public FormValidation doCheckCommand(@QueryParameter String value) {
-            if (value.length() > 0) {
+            if (!value.isEmpty()) {
                 return FormValidation.ok();
             } else {
                 return FormValidation.error(Messages.CommandInstaller_no_command());
@@ -98,7 +98,7 @@ public FormValidation doCheckCommand(@QueryParameter String value) {
         }
 
         public FormValidation doCheckToolHome(@QueryParameter String value) {
-            if (value.length() > 0) {
+            if (!value.isEmpty()) {
                 return FormValidation.ok();
             } else {
                 return FormValidation.error(Messages.CommandInstaller_no_toolHome());
diff --git a/core/src/main/java/hudson/util/ArgumentListBuilder.java b/core/src/main/java/hudson/util/ArgumentListBuilder.java
index 245f3e74a99b..9b2c7bebb594 100644
--- a/core/src/main/java/hudson/util/ArgumentListBuilder.java
+++ b/core/src/main/java/hudson/util/ArgumentListBuilder.java
@@ -295,7 +295,7 @@ public List<String> toList() {
     public String toStringWithQuote() {
         StringBuilder buf = new StringBuilder();
         for (String arg : args) {
-            if (buf.length() > 0)  buf.append(' ');
+            if (!buf.isEmpty())  buf.append(' ');
 
             if (arg.indexOf(' ') >= 0 || arg.isEmpty())
                 buf.append('"').append(arg).append('"');
@@ -400,7 +400,7 @@ private static boolean startQuoting(StringBuilder buf, String arg, int atIndex)
      * @return true if there are any masked arguments; false otherwise
      */
     public boolean hasMaskedArguments() {
-        return mask.length() > 0;
+        return !mask.isEmpty();
     }
 
     /**
@@ -437,7 +437,7 @@ public String toString() {
             if (mask.get(i))
                 arg = "******";
 
-            if (buf.length() > 0)  buf.append(' ');
+            if (!buf.isEmpty())  buf.append(' ');
 
             if (arg.indexOf(' ') >= 0 || arg.isEmpty())
                 buf.append('"').append(arg).append('"');
diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java
index 3d1bf24e267d..6fb37e20bf3a 100644
--- a/core/src/main/java/jenkins/install/InstallUtil.java
+++ b/core/src/main/java/jenkins/install/InstallUtil.java
@@ -234,7 +234,7 @@ public static void saveLastExecVersion() {
             if (configFile.exists()) {
                 try {
                     String lastVersion = XMLUtils.getValue("/hudson/version", configFile);
-                    if (lastVersion.length() > 0) {
+                    if (!lastVersion.isEmpty()) {
                         LOGGER.log(Level.FINE, "discovered serialized lastVersion {0}", lastVersion);
                         return lastVersion;
                     }
diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
index cc1d5214e0ae..21cc0ba1df0c 100644
--- a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
+++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
@@ -150,7 +150,7 @@ public Collection<AdministrativeMonitor> getMonitorsToDisplay() {
         }
         List<Ancestor> ancestors = req.getAncestors();
 
-        if (ancestors == null || ancestors.size() == 0) {
+        if (ancestors == null || ancestors.isEmpty()) {
             // ???
             return null;
         }
diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
index 40c0eae1d13f..555d0c58f5e3 100644
--- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
+++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java
@@ -420,7 +420,7 @@ protected boolean isValidAuthority(String authority) {
                 }
             }
             String port = authorityMatcher.group(PARSE_AUTHORITY_PORT);
-            if (port != null && port.length() > 0) {
+            if (port != null && !port.isEmpty()) {
                 try {
                     int iPort = Integer.parseInt(port);
                     if (iPort < 0 || iPort > MAX_UNSIGNED_16_BIT_INT) {
@@ -433,7 +433,7 @@ protected boolean isValidAuthority(String authority) {
         }
 
         String extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
-        if (extra != null && extra.trim().length() > 0) {
+        if (extra != null && !extra.trim().isEmpty()) {
             return false;
         }
 
diff --git a/core/src/main/java/jenkins/util/TreeString.java b/core/src/main/java/jenkins/util/TreeString.java
index 3bcdc95d90ca..58890d225893 100644
--- a/core/src/main/java/jenkins/util/TreeString.java
+++ b/core/src/main/java/jenkins/util/TreeString.java
@@ -64,7 +64,7 @@ public final class TreeString implements Serializable {
     }
 
     /* package */TreeString(final TreeString parent, final String label) {
-        assert parent == null || label.length() > 0; // if there's a parent,
+        assert parent == null || !label.isEmpty(); // if there's a parent,
                                                      // label can't be empty.
 
         this.parent = parent;
diff --git a/core/src/main/java/org/jenkins/ui/icon/Icon.java b/core/src/main/java/org/jenkins/ui/icon/Icon.java
index e99822dac653..95524c8c4b74 100644
--- a/core/src/main/java/org/jenkins/ui/icon/Icon.java
+++ b/core/src/main/java/org/jenkins/ui/icon/Icon.java
@@ -279,7 +279,7 @@ public static String toNormalizedCSSSelector(String classNames) {
         // Trim all tokens first
         for (String classNameTok : classNameTokA) {
             String trimmedToken = classNameTok.trim();
-            if (trimmedToken.length() > 0) {
+            if (!trimmedToken.isEmpty()) {
                 classNameTokL.add(trimmedToken);
             }
         }
diff --git a/core/src/test/java/hudson/UtilTest.java b/core/src/test/java/hudson/UtilTest.java
index 3fd34ff5c2ad..ac08dccb5d22 100644
--- a/core/src/test/java/hudson/UtilTest.java
+++ b/core/src/test/java/hudson/UtilTest.java
@@ -248,7 +248,7 @@ public void testSymlink() throws Exception {
             Util.createSymlink(d, buf.toString(), "x", l);
 
             String log = baos.toString(Charset.defaultCharset());
-            if (log.length() > 0)
+            if (!log.isEmpty())
                 System.err.println("log output: " + log);
 
             assertEquals(buf.toString(), Util.resolveSymlink(new File(d, "x")));

From 0f25980ac357eed8a21fee3b2b589f1edca1caa3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 07:22:38 -0600
Subject: [PATCH 132/449] Update Yarn to v4.3.0 (#9389)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/package.json b/war/package.json
index 6d3b18cd8dd3..461ee2d18c14 100644
--- a/war/package.json
+++ b/war/package.json
@@ -65,5 +65,5 @@
     "defaults",
     "not IE 11"
   ],
-  "packageManager": "yarn@4.2.2"
+  "packageManager": "yarn@4.3.0"
 }

From 923957d045334119462325b59269045a21cd24c8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 07:23:00 -0600
Subject: [PATCH 133/449] Update dependency prettier to v3.3.2 (#9390)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 461ee2d18c14..3699cf5d8ad4 100644
--- a/war/package.json
+++ b/war/package.json
@@ -41,7 +41,7 @@
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
-    "prettier": "3.3.1",
+    "prettier": "3.3.2",
     "sass": "1.77.4",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 28e49ff969d5..6352aa7513cb 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4417,7 +4417,7 @@ __metadata:
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
-    prettier: "npm:3.3.1"
+    prettier: "npm:3.3.2"
     sass: "npm:1.77.4"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
@@ -6110,12 +6110,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:3.3.1":
-  version: 3.3.1
-  resolution: "prettier@npm:3.3.1"
+"prettier@npm:3.3.2":
+  version: 3.3.2
+  resolution: "prettier@npm:3.3.2"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/c25a709c9f0be670dc6bcb190b622347e1dbeb6c3e7df8b0711724cb64d8647c60b839937a4df4df18e9cfb556c2b08ca9d24d9645eb5488a7fc032a2c4d5cb3
+  checksum: 10c0/39ed27d17f0238da6dd6571d63026566bd790d3d0edac57c285fbab525982060c8f1e01955fe38134ab10f0951a6076da37f015db8173c02f14bc7f0803a384c
   languageName: node
   linkType: hard
 

From a88b1f430531011018374ad56b56c6c3970b094a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 22:36:05 -0600
Subject: [PATCH 134/449] Update dependency sass to v1.77.5 (#9394)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 3699cf5d8ad4..be811d82c01c 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.2",
-    "sass": "1.77.4",
+    "sass": "1.77.5",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.6.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index 6352aa7513cb..7ff4ede89623 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4418,7 +4418,7 @@ __metadata:
     postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.2"
-    sass: "npm:1.77.4"
+    sass: "npm:1.77.5"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6375,16 +6375,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.4":
-  version: 1.77.4
-  resolution: "sass@npm:1.77.4"
+"sass@npm:1.77.5":
+  version: 1.77.5
+  resolution: "sass@npm:1.77.5"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/b9cb4882bded282aabe38d011adfce375e1f282184fcf93dc3da5d5be834c6aa53c474c15634c351ef7bd85146cfd1cc81343654cc3bcf000d78e856da4225ef
+  checksum: 10c0/9da049b0a3fadab419084d6becdf471e107cf6e3c8ac87cabea2feb845afac75e86c99e06ee721a5aa4f6a2d833ec5380137c4e540ab2f760edf1e4eb6139e69
   languageName: node
   linkType: hard
 

From 307ec7e2c77cf710c678771b84deccd705c1bcdc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 22:36:32 -0600
Subject: [PATCH 135/449] Update dependency webpack to v5.92.0 (#9391)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/war/package.json b/war/package.json
index be811d82c01c..bce7b412d6ef 100644
--- a/war/package.json
+++ b/war/package.json
@@ -48,7 +48,7 @@
     "stylelint": "16.6.1",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.0",
-    "webpack": "5.91.0",
+    "webpack": "5.92.0",
     "webpack-cli": "5.1.4",
     "webpack-remove-empty-scripts": "1.0.4"
   },
diff --git a/war/yarn.lock b/war/yarn.lock
index 7ff4ede89623..75a5a9b6bedb 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -2427,12 +2427,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-import-assertions@npm:^1.9.0":
-  version: 1.9.0
-  resolution: "acorn-import-assertions@npm:1.9.0"
+"acorn-import-attributes@npm:^1.9.5":
+  version: 1.9.5
+  resolution: "acorn-import-attributes@npm:1.9.5"
   peerDependencies:
     acorn: ^8
-  checksum: 10c0/3b4a194e128efdc9b86c2b1544f623aba4c1aa70d638f8ab7dc3971a5b4aa4c57bd62f99af6e5325bb5973c55863b4112e708a6f408bad7a138647ca72283afe
+  checksum: 10c0/5926eaaead2326d5a86f322ff1b617b0f698aa61dc719a5baa0e9d955c9885cc71febac3fb5bacff71bbf2c4f9c12db2056883c68c53eb962c048b952e1e013d
   languageName: node
   linkType: hard
 
@@ -3412,13 +3412,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "enhanced-resolve@npm:5.16.0"
+"enhanced-resolve@npm:^5.17.0":
+  version: 5.17.0
+  resolution: "enhanced-resolve@npm:5.17.0"
   dependencies:
     graceful-fs: "npm:^4.2.4"
     tapable: "npm:^2.2.0"
-  checksum: 10c0/dd69669cbb638ccacefd03e04d5e195ee6a99b7f5f8012f86d2df7781834de357923e06064ea621137c4ce0b37cc12b872b4e6d1ac6ab15fe98e7f1dfbbb08c4
+  checksum: 10c0/90065e58e4fd08e77ba47f827eaa17d60c335e01e4859f6e644bb3b8d0e32b203d33894aee92adfa5121fa262f912b48bdf0d0475e98b4a0a1132eea1169ad37
   languageName: node
   linkType: hard
 
@@ -4426,7 +4426,7 @@ __metadata:
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.0"
     tippy.js: "npm:6.3.7"
-    webpack: "npm:5.91.0"
+    webpack: "npm:5.92.0"
     webpack-cli: "npm:5.1.4"
     webpack-remove-empty-scripts: "npm:1.0.4"
     window-handle: "npm:1.0.1"
@@ -7075,9 +7075,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5.91.0":
-  version: 5.91.0
-  resolution: "webpack@npm:5.91.0"
+"webpack@npm:5.92.0":
+  version: 5.92.0
+  resolution: "webpack@npm:5.92.0"
   dependencies:
     "@types/eslint-scope": "npm:^3.7.3"
     "@types/estree": "npm:^1.0.5"
@@ -7085,10 +7085,10 @@ __metadata:
     "@webassemblyjs/wasm-edit": "npm:^1.12.1"
     "@webassemblyjs/wasm-parser": "npm:^1.12.1"
     acorn: "npm:^8.7.1"
-    acorn-import-assertions: "npm:^1.9.0"
+    acorn-import-attributes: "npm:^1.9.5"
     browserslist: "npm:^4.21.10"
     chrome-trace-event: "npm:^1.0.2"
-    enhanced-resolve: "npm:^5.16.0"
+    enhanced-resolve: "npm:^5.17.0"
     es-module-lexer: "npm:^1.2.1"
     eslint-scope: "npm:5.1.1"
     events: "npm:^3.2.0"
@@ -7108,7 +7108,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 10c0/74a3e0ea1c9a492accf035317f31769ffeaaab415811524b9f17bc7bf7012c5b6e1a9860df5ca6903f3ae2618727b801eb47d9351a2595dfffb25941d368b88c
+  checksum: 10c0/588de5ce6f1e8fb4fec7300c2c36a8fc844fe71f4c871b06aca1a68553bea8f6479697615abb53cbbeb2e3859fc1b982f2f48ff23dd0e60024f69bb3d46d0712
   languageName: node
   linkType: hard
 

From 879361968266b82a169b61ac5cfdbdc2e7d58ead Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 15 Jun 2024 05:27:17 -0700
Subject: [PATCH 136/449] Miscellaneous code cleanup (#9384)

---
 core/src/main/java/hudson/FilePath.java                    | 6 +++---
 core/src/main/java/hudson/model/CauseAction.java           | 3 +--
 .../main/java/hudson/model/DirectoryBrowserSupport.java    | 3 ++-
 core/src/main/java/hudson/model/UpdateCenter.java          | 2 +-
 core/src/main/java/hudson/model/UpdateSite.java            | 2 +-
 core/src/main/java/hudson/tools/InstallerTranslator.java   | 7 ++-----
 core/src/main/java/hudson/util/ProcessTree.java            | 2 +-
 core/src/main/java/hudson/util/XStream2.java               | 2 +-
 core/src/main/java/jenkins/agents/CloudSet.java            | 5 ++---
 .../java/jenkins/diagnostics/URICheckEncodingMonitor.java  | 3 ++-
 core/src/main/java/jenkins/model/Jenkins.java              | 7 +++----
 .../src/main/java/jenkins/model/ParameterizedJobMixIn.java | 2 +-
 .../security/RedactSecretJsonInErrorMessageSanitizer.java  | 1 -
 core/src/main/java/jenkins/util/VirtualFile.java           | 3 ++-
 core/src/test/java/hudson/cli/ListJobsCommandTest.java     | 2 +-
 core/src/test/java/hudson/model/RunTest.java               | 2 +-
 core/src/test/java/hudson/util/RetrierTest.java            | 2 +-
 core/src/test/java/hudson/util/SecretRewriterTest.java     | 2 +-
 .../src/test/java/jenkins/model/PeepholePermalinkTest.java | 2 +-
 test/src/test/java/hudson/cli/Security3315Test.java        | 2 +-
 .../src/test/java/hudson/console/ConsoleAnnotatorTest.java | 4 ++--
 test/src/test/java/hudson/model/DownloadService2Test.java  | 2 +-
 test/src/test/java/hudson/model/DownloadServiceTest.java   | 2 +-
 test/src/test/java/hudson/model/SlaveTest.java             | 2 +-
 test/src/test/java/jenkins/ClassPathTest.java              | 6 ++----
 .../security/SecurityContextExecutorServiceTest.java       | 4 ++--
 26 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 6b2b4ff0a8cc..06773dd9a9ee 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -1444,7 +1444,7 @@ private static class DeleteSuffixesRecursive extends MasterToSlaveFileCallable<V
         public Void invoke(File f, VirtualChannel channel) throws IOException {
             for (File file : listParentFiles(f)) {
                 if (file.getName().startsWith(f.getName() + WorkspaceList.COMBINATOR)) {
-                    Util.deleteRecursive(file.toPath(), path -> path.toFile());
+                    Util.deleteRecursive(file.toPath(), Path::toFile);
                 }
             }
 
@@ -1475,7 +1475,7 @@ private static class DeleteRecursive extends MasterToSlaveFileCallable<Void> {
 
         @Override
         public Void invoke(File f, VirtualChannel channel) throws IOException {
-            Util.deleteRecursive(fileToPath(f), path -> path.toFile());
+            Util.deleteRecursive(fileToPath(f), Path::toFile);
             return null;
         }
     }
@@ -1492,7 +1492,7 @@ private static class DeleteContents extends MasterToSlaveFileCallable<Void> {
 
         @Override
         public Void invoke(File f, VirtualChannel channel) throws IOException {
-            Util.deleteContentsRecursive(fileToPath(f), path -> path.toFile());
+            Util.deleteContentsRecursive(fileToPath(f), Path::toFile);
             return null;
         }
     }
diff --git a/core/src/main/java/hudson/model/CauseAction.java b/core/src/main/java/hudson/model/CauseAction.java
index eca42ffb6999..316cf3a182d6 100644
--- a/core/src/main/java/hudson/model/CauseAction.java
+++ b/core/src/main/java/hudson/model/CauseAction.java
@@ -61,8 +61,7 @@ public CauseAction(Cause c) {
 
     private void addCause(Cause c) {
         synchronized (causeBag) {
-            Integer cnt = causeBag.get(c);
-            causeBag.put(c, cnt == null ? 1 : cnt + 1);
+            causeBag.compute(c, (unused, cnt) -> cnt == null ? 1 : cnt + 1);
         }
     }
 
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index f51e145ab195..3aaca2a9cc6e 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -33,6 +33,7 @@
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.LinkOption;
 import java.nio.file.OpenOption;
@@ -530,7 +531,7 @@ private static String createBackRef(int times) {
     private static void zip(StaplerResponse rsp, VirtualFile root, VirtualFile dir, String glob) throws IOException, InterruptedException {
         OutputStream outputStream = rsp.getOutputStream();
         try (ZipOutputStream zos = new ZipOutputStream(outputStream)) {
-            zos.setEncoding(System.getProperty("file.encoding")); // TODO JENKINS-20663 make this overridable via query parameter
+            zos.setEncoding(Charset.defaultCharset().displayName()); // TODO JENKINS-20663 make this overridable via query parameter
             // TODO consider using run(Callable) here
 
             if (glob.isEmpty()) {
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 56fd6e77c988..03ab31314372 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -390,7 +390,7 @@ public Badge getBadge() {
         if (size > 0) {
             StringBuilder tooltip = new StringBuilder();
             Badge.Severity severity = Badge.Severity.WARNING;
-            int securityFixSize = (int) plugins.stream().filter(plugin -> plugin.fixesSecurityVulnerabilities()).count();
+            int securityFixSize = (int) plugins.stream().filter(Plugin::fixesSecurityVulnerabilities).count();
             int incompatibleSize = (int) plugins.stream().filter(plugin -> !plugin.isCompatibleWithInstalledVersion()).count();
             if (size > 1) {
                 tooltip.append(jenkins.management.Messages.PluginsLink_updatesAvailable(size));
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 7488a9c85b57..8a38ef2d470b 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -192,7 +192,7 @@ public long getDataTimestamp() {
     @Deprecated
     public @CheckForNull Future<FormValidation> updateDirectly(final boolean signatureCheck) {
         if (! getDataFile().exists() || isDue()) {
-            return Jenkins.get().getUpdateCenter().updateService.submit(new Callable<FormValidation>() {
+            return Jenkins.get().getUpdateCenter().updateService.submit(new Callable<>() {
                 @Override public FormValidation call() throws Exception {
                     return updateDirectlyNow(signatureCheck);
                 }
diff --git a/core/src/main/java/hudson/tools/InstallerTranslator.java b/core/src/main/java/hudson/tools/InstallerTranslator.java
index 35db845dd2e6..45e24cadf60d 100644
--- a/core/src/main/java/hudson/tools/InstallerTranslator.java
+++ b/core/src/main/java/hudson/tools/InstallerTranslator.java
@@ -59,11 +59,8 @@ public String getToolHome(Node node, ToolInstallation tool, TaskListener log) th
             if (installer.appliesTo(node)) {
                 Semaphore semaphore;
                 synchronized (mutexByNode) {
-                    Map<ToolInstallation, Semaphore> mutexByTool = mutexByNode.computeIfAbsent(node, k -> new WeakHashMap<>());
-                    semaphore = mutexByTool.get(tool);
-                    if (semaphore == null) {
-                        mutexByTool.put(tool, semaphore = new Semaphore(1));
-                    }
+                    Map<ToolInstallation, Semaphore> mutexByTool = mutexByNode.computeIfAbsent(node, unused -> new WeakHashMap<>());
+                    semaphore = mutexByTool.computeIfAbsent(tool, unused -> new Semaphore(1));
                 }
                 semaphore.acquire();
                 try {
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
index ac07f7196892..21e811a877fd 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -455,7 +455,7 @@ public static ProcessTree get() {
         }
 
         // Null-check in case the previous call worked
-        boolean vetoes = vetoersExist == null ? true : vetoersExist;
+        boolean vetoes = vetoersExist == null || vetoersExist;
 
         try {
             if (File.pathSeparatorChar == ';')
diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java
index cf1b5e9bcaab..774008e5e694 100644
--- a/core/src/main/java/hudson/util/XStream2.java
+++ b/core/src/main/java/hudson/util/XStream2.java
@@ -469,7 +469,7 @@ public Class realClass(String elementName) {
      */
     private static final class AssociatedConverterImpl implements Converter {
         private final XStream xstream;
-        private static final ClassValue<Class<? extends ConverterMatcher>> classCache = new ClassValue<Class<? extends ConverterMatcher>>() {
+        private static final ClassValue<Class<? extends ConverterMatcher>> classCache = new ClassValue<>() {
             @Override
             protected Class<? extends ConverterMatcher> computeValue(Class<?> type) {
                 return computeConverterClass(type);
diff --git a/core/src/main/java/jenkins/agents/CloudSet.java b/core/src/main/java/jenkins/agents/CloudSet.java
index addefceb83ff..163556a001d1 100644
--- a/core/src/main/java/jenkins/agents/CloudSet.java
+++ b/core/src/main/java/jenkins/agents/CloudSet.java
@@ -41,7 +41,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.logging.Level;
@@ -131,7 +130,7 @@ public String getCloudUpdateCenterCategoryLabel() {
     @Override
     public ModelObjectWithContextMenu.ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
         ModelObjectWithContextMenu.ContextMenu m = new ModelObjectWithContextMenu.ContextMenu();
-        Jenkins.get().clouds.stream().forEach(c -> m.add(c));
+        Jenkins.get().clouds.stream().forEach(m::add);
         return m;
     }
 
@@ -265,7 +264,7 @@ public void doReorder(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
         }
         var namesList = Arrays.asList(names);
         var clouds = new ArrayList<>(Jenkins.get().clouds);
-        Collections.sort(clouds, Comparator.comparingInt(c -> getIndexOf(namesList, c)));
+        clouds.sort(Comparator.comparingInt(c -> getIndexOf(namesList, c)));
         Jenkins.get().clouds.replaceBy(clouds);
         rsp.sendRedirect2(".");
     }
diff --git a/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java b/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java
index 3563699b19b7..9fdd7bc38436 100644
--- a/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java
+++ b/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java
@@ -7,6 +7,7 @@
 import hudson.model.AdministrativeMonitor;
 import hudson.util.FormValidation;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -22,7 +23,7 @@ public class URICheckEncodingMonitor extends AdministrativeMonitor {
     private static final Logger LOGGER = Logger.getLogger(URICheckEncodingMonitor.class.getName());
 
     public boolean isCheckEnabled() {
-        return !"ISO-8859-1".equalsIgnoreCase(System.getProperty("file.encoding"));
+        return !"ISO-8859-1".equalsIgnoreCase(Charset.defaultCharset().displayName());
     }
 
     @Override
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index c79f714bc637..4782e4b321f2 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -499,7 +499,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      *     STARTUP_MARKER_FILE.get(); // returns false if we are on a fresh startup. True for next startups.
      * }
      */
-    private static transient FileBoolean STARTUP_MARKER_FILE;
+    private static FileBoolean STARTUP_MARKER_FILE;
 
     private volatile List<JDK> jdks = new ArrayList<>();
 
@@ -3476,10 +3476,9 @@ private void setBuildsAndWorkspacesDir() throws IOException, InvalidBuildsDir {
         File d = new File(replacedValue);
         if (!d.isDirectory()) {
             // if dir does not exist (almost guaranteed) need to make sure nearest existing ancestor can be written to
-            d = d.getParentFile();
-            while (!d.exists()) {
+            do {
                 d = d.getParentFile();
-            }
+            } while (!d.exists());
             if (!d.canWrite()) {
                 throw new InvalidBuildsDir(newBuildsDirValue +  " does not exist and probably cannot be created");
             }
diff --git a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
index be71a97c7379..734534220901 100644
--- a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
+++ b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
@@ -346,7 +346,7 @@ static ParameterizedJob resolveForCLI(@Argument(required = true, metaVar = "NAME
          * (Would have been done entirely as an interface with default methods had this been designed for Java 8.)
          */
         default ParameterizedJobMixIn<JobT, RunT> getParameterizedJobMixIn() {
-            return new ParameterizedJobMixIn<JobT, RunT>() {
+            return new ParameterizedJobMixIn<>() {
                 @SuppressWarnings("unchecked") // untypable
                 @Override protected JobT asJob() {
                     return (JobT) ParameterizedJob.this;
diff --git a/core/src/main/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizer.java b/core/src/main/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizer.java
index 733a6c89a1f2..1e201bcd3dbc 100644
--- a/core/src/main/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizer.java
+++ b/core/src/main/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizer.java
@@ -88,7 +88,6 @@ private Object copyAndSanitize(Object value) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     private JSONObject copyAndSanitizeObject(JSONObject jsonObject) {
         Set<String> redactedKeySet = retrieveRedactedKeys(jsonObject);
         JSONObject result = new JSONObject();
diff --git a/core/src/main/java/jenkins/util/VirtualFile.java b/core/src/main/java/jenkins/util/VirtualFile.java
index bf9fc49bd48d..6c754a50bbc4 100644
--- a/core/src/main/java/jenkins/util/VirtualFile.java
+++ b/core/src/main/java/jenkins/util/VirtualFile.java
@@ -46,6 +46,7 @@
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.OpenOption;
@@ -375,7 +376,7 @@ public int zip(OutputStream outputStream, String includes, String excludes, bool
 
         Collection<String> files = list(includes, excludes, useDefaultExcludes, openOptions);
         try (ZipOutputStream zos = new ZipOutputStream(outputStream)) {
-            zos.setEncoding(System.getProperty("file.encoding")); // TODO JENKINS-20663 make this overridable via query parameter
+            zos.setEncoding(Charset.defaultCharset().displayName()); // TODO JENKINS-20663 make this overridable via query parameter
 
             for (String relativePath : files) {
                 VirtualFile virtualFile = this.child(relativePath);
diff --git a/core/src/test/java/hudson/cli/ListJobsCommandTest.java b/core/src/test/java/hudson/cli/ListJobsCommandTest.java
index 6be35fded558..8baa6814b95b 100644
--- a/core/src/test/java/hudson/cli/ListJobsCommandTest.java
+++ b/core/src/test/java/hudson/cli/ListJobsCommandTest.java
@@ -191,7 +191,7 @@ protected boolean matchesSafely(ByteArrayOutputStream item) {
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
                 }
-                Set<String> jobs = new HashSet<>(Arrays.asList(item.toString(charset).split(System.getProperty("line.separator"))));
+                Set<String> jobs = new HashSet<>(Arrays.asList(item.toString(charset).split(System.lineSeparator())));
 
                 return new HashSet<>(Arrays.asList(expected)).equals(jobs);
             }
diff --git a/core/src/test/java/hudson/model/RunTest.java b/core/src/test/java/hudson/model/RunTest.java
index 59b32ab915c5..04448da1f12a 100644
--- a/core/src/test/java/hudson/model/RunTest.java
+++ b/core/src/test/java/hudson/model/RunTest.java
@@ -197,7 +197,7 @@ public void getLogReturnsAnRightOrder() throws Exception {
         for (int i = 1; i < 10; i++) {
             assertEquals("dummy" + (10 + i), logLines.get(i));
         }
-        int truncatedCount = 10 * ("dummyN".length() + System.getProperty("line.separator").length()) - 2;
+        int truncatedCount = 10 * ("dummyN".length() + System.lineSeparator().length()) - 2;
         assertEquals("[...truncated " + truncatedCount + " B...]", logLines.get(0));
     }
 
diff --git a/core/src/test/java/hudson/util/RetrierTest.java b/core/src/test/java/hudson/util/RetrierTest.java
index 50abb7ded2b1..42242b44f4c7 100644
--- a/core/src/test/java/hudson/util/RetrierTest.java
+++ b/core/src/test/java/hudson/util/RetrierTest.java
@@ -160,7 +160,7 @@ public void failedActionWithExceptionAfterThreeAttemptsWithoutListenerTest() thr
                             throw new IndexOutOfBoundsException("Exception allowed considered as failure");
                         },
                         // check the result and return true (boolean primitive type) if success
-                        (currentAttempt, result) -> result == null ? false : result,
+                        (currentAttempt, result) -> result != null && result,
                         //name of the action
                         ACTION
                 )
diff --git a/core/src/test/java/hudson/util/SecretRewriterTest.java b/core/src/test/java/hudson/util/SecretRewriterTest.java
index ff13cd915254..4c13761a4caf 100644
--- a/core/src/test/java/hudson/util/SecretRewriterTest.java
+++ b/core/src/test/java/hudson/util/SecretRewriterTest.java
@@ -54,7 +54,7 @@ private String roundtrip(String before) throws Exception {
         Files.writeString(path, before, Charset.defaultCharset());
         sr.rewrite(path.toFile());
         //assert after.replaceAll(System.getProperty("line.separator"), "\n").trim()==f.text.replaceAll(System.getProperty("line.separator"), "\n").trim()
-        return Files.readString(path, Charset.defaultCharset()).replaceAll(System.getProperty("line.separator"), "\n").trim();
+        return Files.readString(path, Charset.defaultCharset()).replaceAll(System.lineSeparator(), "\n").trim();
     }
 
     @SuppressWarnings("deprecation")
diff --git a/core/src/test/java/jenkins/model/PeepholePermalinkTest.java b/core/src/test/java/jenkins/model/PeepholePermalinkTest.java
index 8a2cb059b230..50a3934700cf 100644
--- a/core/src/test/java/jenkins/model/PeepholePermalinkTest.java
+++ b/core/src/test/java/jenkins/model/PeepholePermalinkTest.java
@@ -39,7 +39,7 @@ public void classLoadingDeadlock() throws Exception {
         PeepholePermalink.initialized();
         Thread t = new Thread(() -> {
             assertThat("successfully loaded permalinks",
-                PermalinkProjectAction.Permalink.BUILTIN.stream().map(p -> p.getId()).collect(Collectors.toSet()),
+                PermalinkProjectAction.Permalink.BUILTIN.stream().map(PermalinkProjectAction.Permalink::getId).collect(Collectors.toSet()),
                 containsInAnyOrder("lastBuild", "lastStableBuild", "lastSuccessfulBuild", "lastFailedBuild", "lastUnstableBuild", "lastUnsuccessfulBuild", "lastCompletedBuild"));
         });
         t.start();
diff --git a/test/src/test/java/hudson/cli/Security3315Test.java b/test/src/test/java/hudson/cli/Security3315Test.java
index 83d207a49c66..c48129cdfccf 100644
--- a/test/src/test/java/hudson/cli/Security3315Test.java
+++ b/test/src/test/java/hudson/cli/Security3315Test.java
@@ -34,7 +34,7 @@ public static List<String> escapeHatchValues() {
 
     public Security3315Test(String allowWs) {
         this.allowWs = allowWs == null ? null : Boolean.valueOf(allowWs);
-        this.escapeHatch = new FlagRule<>(() -> CLIAction.ALLOW_WEBSOCKET, v -> { CLIAction.ALLOW_WEBSOCKET = v; }, this.allowWs);
+        this.escapeHatch = new FlagRule<>(() -> CLIAction.ALLOW_WEBSOCKET, v -> CLIAction.ALLOW_WEBSOCKET = v, this.allowWs);
     }
 
     @Test
diff --git a/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java b/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
index 60b08b0936de..3e6d0ec82196 100644
--- a/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
+++ b/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
@@ -76,7 +76,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         // make sure raw console output doesn't include the garbage
         TextPage raw = (TextPage) r.createWebClient().goTo(b.getUrl() + "consoleText", "text/plain");
         System.out.println(raw.getContent());
-        String nl = System.getProperty("line.separator");
+        String nl = System.lineSeparator();
         assertTrue(raw.getContent().contains(nl + "---" + nl + "ooo" + nl + "ooo" + nl));
 
         // there should be two 'ooo's
@@ -96,7 +96,7 @@ public ConsoleAnnotator<FreeStyleBuild> newInstance(FreeStyleBuild context) {
     }
 
     public static class DemoAnnotator extends ConsoleAnnotator<FreeStyleBuild> {
-        private static final String ANNOTATE_TEXT = "ooo" + System.getProperty("line.separator");
+        private static final String ANNOTATE_TEXT = "ooo" + System.lineSeparator();
 
         @Override
         public ConsoleAnnotator<FreeStyleBuild> annotate(FreeStyleBuild build, MarkupText text) {
diff --git a/test/src/test/java/hudson/model/DownloadService2Test.java b/test/src/test/java/hudson/model/DownloadService2Test.java
index 0b4fe687d3eb..73a15c64be6d 100644
--- a/test/src/test/java/hudson/model/DownloadService2Test.java
+++ b/test/src/test/java/hudson/model/DownloadService2Test.java
@@ -60,7 +60,7 @@ private static void assertRoots(String expected, String file) throws Exception {
         URL resource = DownloadService2Test.class.getResource(file);
         assertNotNull(file, resource);
         JSONObject json = JSONObject.fromObject(DownloadService.loadJSONHTML(resource));
-        @SuppressWarnings("unchecked") Set<String> keySet = json.keySet();
+        Set<String> keySet = json.keySet();
         assertEquals(expected, new TreeSet<>(keySet).toString());
     }
 
diff --git a/test/src/test/java/hudson/model/DownloadServiceTest.java b/test/src/test/java/hudson/model/DownloadServiceTest.java
index f5fc53730029..cb9337c72096 100644
--- a/test/src/test/java/hudson/model/DownloadServiceTest.java
+++ b/test/src/test/java/hudson/model/DownloadServiceTest.java
@@ -34,7 +34,7 @@ public void testLoadJSON() throws Exception {
     private static void assertRoots(String expected, URL resource) throws Exception {
         assertNotNull(resource);
         JSONObject json = JSONObject.fromObject(DownloadService.loadJSON(resource));
-        @SuppressWarnings("unchecked") Set<String> keySet = json.keySet();
+        Set<String> keySet = json.keySet();
         assertEquals(expected, new TreeSet<>(keySet).toString());
     }
 
diff --git a/test/src/test/java/hudson/model/SlaveTest.java b/test/src/test/java/hudson/model/SlaveTest.java
index b66130bfc4ea..f7177b9d08fc 100644
--- a/test/src/test/java/hudson/model/SlaveTest.java
+++ b/test/src/test/java/hudson/model/SlaveTest.java
@@ -160,7 +160,7 @@ public void shouldNotEscapeJnlpSlavesResources() throws Exception {
     private void assertJnlpJarUrlFails(@NonNull Slave slave, @NonNull String url) throws Exception {
         // Raw access to API
         Slave.JnlpJar jnlpJar = slave.getComputer().getJnlpJars(url);
-        assertThrows(MalformedURLException.class, () -> jnlpJar.getURL());
+        assertThrows(MalformedURLException.class, jnlpJar::getURL);
     }
 
     private void assertJnlpJarUrlIsAllowed(@NonNull Slave slave, @NonNull String url) throws Exception {
diff --git a/test/src/test/java/jenkins/ClassPathTest.java b/test/src/test/java/jenkins/ClassPathTest.java
index 01b29253e0cc..4629a8f65faf 100644
--- a/test/src/test/java/jenkins/ClassPathTest.java
+++ b/test/src/test/java/jenkins/ClassPathTest.java
@@ -26,9 +26,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -46,7 +44,7 @@ public class ClassPathTest {
     @Rule
     public ErrorCollector errors = new ErrorCollector();
 
-    private static final Set<String> KNOWN_VIOLATIONS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+    private static final Set<String> KNOWN_VIOLATIONS = Set.of(
             // TODO duplicated in [jline-2.14.6.jar, jansi-1.11.jar]
             "org/fusesource/hawtjni/runtime/Callback.class",
             "org/fusesource/hawtjni/runtime/JNIEnv.class",
@@ -75,7 +73,7 @@ public class ClassPathTest {
             "org/fusesource/jansi/internal/Kernel32$SMALL_RECT.class",
             "org/fusesource/jansi/internal/Kernel32.class",
             "org/fusesource/jansi/internal/WindowsSupport.class",
-            "org/fusesource/jansi/WindowsAnsiOutputStream.class")));
+            "org/fusesource/jansi/WindowsAnsiOutputStream.class");
 
     @Issue("JENKINS-46754")
     @Test
diff --git a/test/src/test/java/jenkins/security/SecurityContextExecutorServiceTest.java b/test/src/test/java/jenkins/security/SecurityContextExecutorServiceTest.java
index 76f64ab67096..ac9df83a2f55 100644
--- a/test/src/test/java/jenkins/security/SecurityContextExecutorServiceTest.java
+++ b/test/src/test/java/jenkins/security/SecurityContextExecutorServiceTest.java
@@ -106,7 +106,7 @@ public void testRunnableAgainstAllContexts() throws Exception {
     @Test
     @PresetData(PresetData.DataSet.NO_ANONYMOUS_READACCESS)
     public void testCallableAgainstAllContexts() throws Exception {
-        Callable<SecurityContext> c = () -> SecurityContextHolder.getContext();
+        Callable<SecurityContext> c = SecurityContextHolder::getContext;
         SecurityContextHolder.setContext(systemContext);
         Future<SecurityContext> result = wrappedService.submit(c);
         // Assert the context inside the callable thread was set to ACL.SYSTEM2
@@ -127,7 +127,7 @@ public void testCallableAgainstAllContexts() throws Exception {
     @PresetData(PresetData.DataSet.NO_ANONYMOUS_READACCESS)
     public void testCallableCollectionAgainstAllContexts() throws Exception {
         Collection<Callable<SecurityContext>> callables = new ArrayList<>();
-        Callable<SecurityContext> c = () -> SecurityContextHolder.getContext();
+        Callable<SecurityContext> c = SecurityContextHolder::getContext;
         callables.add(c);
         callables.add(c);
         callables.add(c);

From 0e544786630c1be8c812030197fd49d6f513c102 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sat, 15 Jun 2024 13:27:35 +0100
Subject: [PATCH 137/449] Refine radio inputs (#9380)

Init
---
 war/src/main/scss/base/_style.scss |   3 +-
 war/src/main/scss/form/_radio.scss | 128 +++++++++++------------------
 2 files changed, 49 insertions(+), 82 deletions(-)

diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss
index 56b8e40161bf..46e60633e474 100644
--- a/war/src/main/scss/base/_style.scss
+++ b/war/src/main/scss/base/_style.scss
@@ -595,7 +595,7 @@ table.fingerprint-in-build td {
 }
 
 .radioBlock-container {
-  margin-bottom: calc(var(--section-padding) / 3);
+  margin-bottom: 0.875rem;
 
   &:last-of-type {
     margin-bottom: var(--section-padding);
@@ -604,6 +604,7 @@ table.fingerprint-in-build td {
 
 .optionalBlock-container > .form-container,
 .radioBlock-container > .form-container,
+.jenkins-radio__children,
 .dropdownList-container {
   position: relative;
   padding-left: 32px;
diff --git a/war/src/main/scss/form/_radio.scss b/war/src/main/scss/form/_radio.scss
index 38052a82bcfe..a673e86d6daf 100644
--- a/war/src/main/scss/form/_radio.scss
+++ b/war/src/main/scss/form/_radio.scss
@@ -1,3 +1,11 @@
+$jenkins-radio-size: 1.375rem;
+$jenkins-radio-border-size: 0.125rem;
+$jenkins-radio-border-hover-size: 0.3125rem;
+$jenkins-radio-border-active-size: 0.5rem;
+$jenkins-radio-border-checked-size: 0.4rem;
+$jenkins-radio-glow-size: 0.625rem;
+$jenkins-radio-glow-active-size: 0.3125rem;
+
 .jenkins-radio-help-wrapper {
   display: flex;
   align-items: center;
@@ -5,69 +13,59 @@
 }
 
 .jenkins-radio {
-  margin-top: 3px;
-
   &:not(:last-of-type) {
-    margin-bottom: calc(var(--section-padding) / 3);
+    margin-bottom: 0.875rem;
   }
 
   &__input {
     position: absolute;
     opacity: 0;
-    margin-top: 10px;
+    margin-top: 0.625rem;
 
-    &:hover {
-      & + label {
-        &::before {
+    &:not(:checked) {
+      &:hover {
+        & + label::before {
           box-shadow:
-            0 0 0 10px transparent,
-            inset 0 0 0 5px var(--input-border-hover);
+            0 0 0 $jenkins-radio-glow-size transparent,
+            inset 0 0 0 $jenkins-radio-border-hover-size
+              var(--input-border-hover);
         }
       }
-    }
 
-    &:not(:disabled) {
+      &:focus-visible,
       &:focus,
       &:active {
-        & + label {
-          &::before {
-            transition: box-shadow var(--elastic-transition);
-            box-shadow:
-              0 0 0 5px var(--focus-input-glow),
-              inset 0 0 0 5px var(--focus-input-border);
-          }
-        }
-      }
-
-      &:checked {
-        &:focus,
-        &:active {
-          & + label {
-            &::before {
-              box-shadow:
-                0 0 0 5px var(--focus-input-glow),
-                inset 0 0 0 8px var(--focus-input-border);
-            }
-          }
+        & + label::before {
+          box-shadow:
+            0 0 0 $jenkins-radio-glow-active-size var(--focus-input-glow),
+            inset 0 0 0 $jenkins-radio-border-active-size
+              var(--focus-input-border);
         }
       }
     }
 
     &:checked {
       & + label {
-        &:active,
-        &:focus {
-          &::before {
-            box-shadow:
-              0 0 0 5px var(--focus-input-glow),
-              inset 0 0 0 12px var(--focus-input-border);
-          }
+        cursor: default;
+
+        &::before {
+          box-shadow:
+            0 0 0 $jenkins-radio-glow-size transparent,
+            inset 0 0 0 $jenkins-radio-border-checked-size
+              var(--focus-input-border);
         }
       }
 
-      & + label {
-        &::before {
-          box-shadow: inset 0 0 0 8px var(--focus-input-border);
+      &:not(:disabled) {
+        &:focus-visible,
+        &:focus,
+        &:active {
+          & + label::before {
+            box-shadow:
+              0 0 0 $jenkins-radio-glow-active-size var(--focus-input-glow),
+              inset 0 0 0 $jenkins-radio-border-active-size
+                var(--focus-input-border);
+          }
         }
       }
     }
@@ -85,11 +83,9 @@
 
   &__label {
     position: relative;
-    top: -5px;
     display: inline-block;
-    margin-top: 10px;
     margin-bottom: 0;
-    padding: 0 0 5px 32px;
+    padding: 0 0 0 2rem;
     cursor: pointer;
     font-weight: var(--form-label-font-weight);
     // remove 300ms pause on mobile
@@ -101,54 +97,24 @@
       position: absolute;
       top: 0;
       left: 0;
-      width: 22px;
-      height: 22px;
+      width: $jenkins-radio-size;
+      height: $jenkins-radio-size;
       border-radius: 50%;
       background: var(--input-color);
       box-shadow:
-        0 0 0 10px transparent,
-        inset 0 0 0 2px var(--input-border);
+        0 0 0 $jenkins-radio-glow-size transparent,
+        inset 0 0 0 $jenkins-radio-border-size var(--input-border);
       transition: box-shadow var(--standard-transition);
     }
   }
 
   &__description {
-    margin: 0 0 0 32px;
+    margin: 0 0 0 2rem;
     color: var(--text-color-secondary);
     line-height: 1.66;
   }
 
-  &__children {
-    position: relative;
-    margin-top: 10px;
-    opacity: 0;
-    padding-left: 32px;
-    transition: var(--standard-transition);
-    visibility: hidden;
-    max-height: 0;
-
-    &::after {
-      content: "";
-      position: absolute;
-      top: 0;
-      left: 10px;
-      bottom: 0;
-      width: 2px;
-      background: var(--input-border);
-      border-radius: 2px;
-      transition: var(--standard-transition);
-    }
-
-    &:focus-within {
-      &::after {
-        background: var(--focus-input-border);
-      }
-    }
-  }
-
-  &__input:checked + &__label + &__children {
-    visibility: visible;
-    opacity: 1;
-    max-height: none;
+  &__input:not(:checked) + &__label + &__children {
+    display: none;
   }
 }

From 3015251174a96b96b24713746d776ed60bb49b8c Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 15 Jun 2024 06:27:53 -0600
Subject: [PATCH 138/449] [JENKINS-73129] Remove Windows path traversal escape
 hatch from SECURITY-2481  (#9387)

Remove SECURITY-2481 escape hatch

https://www.jenkins.io/security/advisory/2021-10-06/#SECURITY-2481 was
published in October 2021 with an escape hatch that allows users to
enable the path traversal vulnerability on Windows. Jetty 12 detects
the vulernability even before the request reaches Jenkins and returns
an HTTP error, as required by the Servlet API specification.

Remove the escape hatch because the escape hatch is intended to be
temporary and we don't want to reimplement the escape hatch within
Jetty configuration.

https://issues.jenkins.io/browse/JENKINS-73129 includes further discussion
of the alternatives.
---
 .../hudson/model/DirectoryBrowserSupport.java | 17 ++++--------
 .../model/DirectoryBrowserSupportTest.java    | 27 -------------------
 2 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index 3aaca2a9cc6e..9d455f4c1bd3 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -91,11 +91,6 @@ public final class DirectoryBrowserSupport implements HttpResponse {
 
     private static final Pattern TMPDIR_PATTERN = Pattern.compile(".+@tmp/.*");
 
-    /**
-     * Escape hatch for the protection against SECURITY-2481. If enabled, the absolute paths on Windows will be allowed.
-     */
-    static final String ALLOW_ABSOLUTE_PATH_PROPERTY_NAME = DirectoryBrowserSupport.class.getName() + ".allowAbsolutePath";
-
     public final ModelObject owner;
 
     public final String title;
@@ -261,13 +256,11 @@ private void serveFile(StaplerRequest req, StaplerResponse rsp, VirtualFile root
         if (base.isEmpty()) {
             baseFile = root;
         } else {
-            if (!SystemProperties.getBoolean(ALLOW_ABSOLUTE_PATH_PROPERTY_NAME, false)) {
-                boolean isAbsolute = root.run(new IsAbsolute(base));
-                if (isAbsolute) {
-                    LOGGER.info(() -> "SECURITY-2481 The path provided in the URL (" + base + ") is absolute and thus is refused.");
-                    rsp.sendError(HttpServletResponse.SC_NOT_FOUND);
-                    return;
-                }
+            boolean isAbsolute = root.run(new IsAbsolute(base));
+            if (isAbsolute) {
+                LOGGER.info(() -> "SECURITY-2481 The path provided in the URL (" + base + ") is absolute and thus is refused.");
+                rsp.sendError(HttpServletResponse.SC_NOT_FOUND);
+                return;
             }
             baseFile = root.child(base);
         }
diff --git a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
index 7b1bbdb7c9bd..e73cbec70359 100644
--- a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
+++ b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
@@ -1114,33 +1114,6 @@ public void windows_cannotViewAbsolutePath() throws Exception {
         MatcherAssert.assertThat(page.getWebResponse().getStatusCode(), equalTo(404));
     }
 
-    @Test
-    @Issue("SECURITY-2481")
-    public void windows_canViewAbsolutePath_withEscapeHatch() throws Exception {
-        Assume.assumeTrue("can only be tested this on Windows", Functions.isWindows());
-
-        String originalValue = System.getProperty(DirectoryBrowserSupport.ALLOW_ABSOLUTE_PATH_PROPERTY_NAME);
-        System.setProperty(DirectoryBrowserSupport.ALLOW_ABSOLUTE_PATH_PROPERTY_NAME, "true");
-        try {
-            Path targetTmpPath = Files.createTempFile("sec2481", "tmp");
-            String content = "random data provided as fixed value";
-            Files.writeString(targetTmpPath, content, StandardCharsets.UTF_8);
-
-            JenkinsRule.WebClient wc = j.createWebClient().withThrowExceptionOnFailingStatusCode(false);
-            Page page = wc.goTo("userContent/" + targetTmpPath.toAbsolutePath() + "/*view*", null);
-
-            MatcherAssert.assertThat(page.getWebResponse().getStatusCode(), equalTo(200));
-            MatcherAssert.assertThat(page.getWebResponse().getContentAsString(), containsString(content));
-        } finally {
-            if (originalValue == null) {
-                System.clearProperty(DirectoryBrowserSupport.ALLOW_ABSOLUTE_PATH_PROPERTY_NAME);
-            } else {
-                System.setProperty(DirectoryBrowserSupport.ALLOW_ABSOLUTE_PATH_PROPERTY_NAME, originalValue);
-            }
-        }
-
-    }
-
     @Test
     @Issue("SECURITY-1807")
     public void tmpNotListed() throws Exception {

From 82a37a7f1e3a4eb9e8b44ac0696496967a72de84 Mon Sep 17 00:00:00 2001
From: Munawar <munawar.hafiz@gmail.com>
Date: Sat, 15 Jun 2024 16:11:59 -0700
Subject: [PATCH 139/449] Add a null check for a method return result that may
 return null (#9354)

* Add a null check for a method return result that may return null.

In file PluginManager.java the parsePluginManifest method may return null. In other parts of the code (https://github.com/jenkinsci/jenkins/blob/7aad67832442b8cd1dfaf363a3630d2687ddf3e3/core/src/main/java/hudson/PluginManager.java#L868), the return value was checked for null. But the null check is missing in this part of the code.

The fix just adds the missing null check in the code.

**Sponsorship and Support:**

This work is done by the security researchers from OpenRefactory and is supported by the Open Source Security Foundation (OpenSSF): Project Alpha-Omega. Alpha-Omega is a project partnering with open source software project maintainers to systematically find new, as-yet-undiscovered vulnerabilities in open source code - and get them fixed - to improve global software supply chain security.

The bug is found by running the iCR tool by OpenRefactory, Inc. and then manually triaging the results.

* Comment: Applied mvn spotless to clean up formating issues.

---------

Co-authored-by: Munawar Hafiz <munawar@munawars-mbp.lan>
---
 core/src/main/java/hudson/PluginManager.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 5d80c6e623e4..eda266735173 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -716,6 +716,10 @@ protected static void addDependencies(URL hpiResUrl, String fromPath, Set<URL> d
         }
 
         Manifest manifest = parsePluginManifest(hpiResUrl);
+        if (manifest == null) {
+            return;
+        }
+
         String dependencySpec = manifest.getMainAttributes().getValue("Plugin-Dependencies");
         if (dependencySpec != null) {
             String[] dependencyTokens = dependencySpec.split(",");

From d99b83b1271be5f1a694fad6fe82b4874c2113c9 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Mon, 17 Jun 2024 06:12:55 -0600
Subject: [PATCH 140/449] Update javadoc and other docs with dates of API
 changes (#9396)

Several of the changes are not detected by the Python script but were
detected by `git grep TODO | grep since` with review of the output.

The cases that are not detected by the Python script seem obscure enough
to not bother with additions to the script.  If they become common
practice, then we can extend the Python script.
---
 core/src/main/java/hudson/ClassicPluginStrategy.java   | 10 +++++-----
 core/src/main/java/hudson/model/ExecutorListener.java  |  2 +-
 .../main/java/jenkins/model/lazy/LazyBuildMixIn.java   |  2 +-
 .../jenkins/security/seed/UserSeedChangeListener.java  |  2 +-
 core/src/main/java/jenkins/util/URLClassLoader2.java   |  8 ++++----
 core/src/main/resources/lib/layout/search-bar.jelly    |  2 +-
 core/src/main/resources/lib/layout/task.jelly          |  4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index d9b37f0fac29..8c39f14ef2d5 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -269,17 +269,17 @@ public static List<PluginWrapper.Dependency> getImpliedDependencies(String plugi
     }
 
     /**
-     * @deprecated since TODO use {@link #createClassLoader(String, List, ClassLoader, Attributes)}
+     * @deprecated since 2.459 use {@link #createClassLoader(String, List, ClassLoader, Attributes)}
      */
-    @Deprecated(since = "TODO")
+    @Deprecated(since = "2.459")
     protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent) throws IOException {
         return createClassLoader(paths, parent, null);
     }
 
     /**
-     * @deprecated since TODO use {@link #createClassLoader(String, List, ClassLoader, Attributes)}
+     * @deprecated since 2.459 use {@link #createClassLoader(String, List, ClassLoader, Attributes)}
      */
-    @Deprecated(since="TODO")
+    @Deprecated(since="2.459")
     protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, Attributes atts) throws IOException {
         // generate a legacy id so at least we can track to something
         return createClassLoader("unidentified-" + UUID.randomUUID(), paths, parent, atts);
@@ -287,7 +287,7 @@ protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, At
 
     /**
      * Creates a  classloader that can load all the specified jar files and delegate to the given parent.
-     * @since TODO
+     * @since 2.459
      */
     protected ClassLoader createClassLoader(String name, List<File> paths, ClassLoader parent, Attributes atts) throws IOException {
         boolean usePluginFirstClassLoader =
diff --git a/core/src/main/java/hudson/model/ExecutorListener.java b/core/src/main/java/hudson/model/ExecutorListener.java
index 6500e6acc2ec..beff34804d92 100644
--- a/core/src/main/java/hudson/model/ExecutorListener.java
+++ b/core/src/main/java/hudson/model/ExecutorListener.java
@@ -30,7 +30,7 @@
 /**
  * A listener for task related events from executors.
  * A {@link Computer#getRetentionStrategy} or {@link SlaveComputer#getLauncher} may implement this interface.
- * Or you may create an implementation as an extension (since TODO).
+ * Or you may create an implementation as an extension (since 2.318).
 * @author Stephen Connolly
 * @since 1.312
 */
diff --git a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
index 203ea976bccd..c73c5cbf80f1 100644
--- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
+++ b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
@@ -298,7 +298,7 @@ public List<RunT> getEstimatedDurationCandidates() {
     /**
      * @deprecated Remove any code calling this method, history widget is now created via {@link jenkins.widgets.WidgetFactory} implementation.
      */
-    @Deprecated(forRemoval = true, since = "TODO")
+    @Deprecated(forRemoval = true, since = "2.459")
     public final HistoryWidget createHistoryWidget() {
         throw new IllegalStateException("HistoryWidget is now created via WidgetFactory implementation");
     }
diff --git a/core/src/main/java/jenkins/security/seed/UserSeedChangeListener.java b/core/src/main/java/jenkins/security/seed/UserSeedChangeListener.java
index 02753addb79d..e87506315a41 100644
--- a/core/src/main/java/jenkins/security/seed/UserSeedChangeListener.java
+++ b/core/src/main/java/jenkins/security/seed/UserSeedChangeListener.java
@@ -35,7 +35,7 @@
 
 /**
  * Listener notified when a user was requested to changed their seed
- * @since 2.160 and 2.150.2, but restricted (unavailable to plugins) before TODO
+ * @since 2.160 and 2.150.2, but restricted (unavailable to plugins) before 2.406
  */
 public abstract class UserSeedChangeListener implements ExtensionPoint {
     private static final Logger LOGGER = Logger.getLogger(SecurityListener.class.getName());
diff --git a/core/src/main/java/jenkins/util/URLClassLoader2.java b/core/src/main/java/jenkins/util/URLClassLoader2.java
index 3fdedcbeada0..a6e5194e14f3 100644
--- a/core/src/main/java/jenkins/util/URLClassLoader2.java
+++ b/core/src/main/java/jenkins/util/URLClassLoader2.java
@@ -20,7 +20,7 @@ public class URLClassLoader2 extends URLClassLoader implements JenkinsClassLoade
     /**
      * @deprecated use {@link URLClassLoader2#URLClassLoader2(String, URL[])}
      */
-    @Deprecated(since = "TODO")
+    @Deprecated(since = "2.459")
     public URLClassLoader2(URL[] urls) {
         super(urls);
     }
@@ -28,7 +28,7 @@ public URLClassLoader2(URL[] urls) {
     /**
      * @deprecated use {@link URLClassLoader2#URLClassLoader2(String, URL[], ClassLoader)}
      */
-    @Deprecated(since = "TODO")
+    @Deprecated(since = "2.459")
     public URLClassLoader2(URL[] urls, ClassLoader parent) {
         super(urls, parent);
     }
@@ -37,7 +37,7 @@ public URLClassLoader2(URL[] urls, ClassLoader parent) {
      * Create a new {@link URLClassLoader2} with the given name and URLS and the {@link #getSystemClassLoader()} as its parent.
      * @param name name of this classloader.
      * @param urls the list of URLS to find classes in.
-     * @since TODO
+     * @since 2.459
      */
     public URLClassLoader2(String name, URL[] urls) {
         super(name, urls, getSystemClassLoader());
@@ -48,7 +48,7 @@ public URLClassLoader2(String name, URL[] urls) {
      * @param name name of this classloader.
      * @param urls the list of URLS to find classes in.
      * @param parent the parent to search for classes before we look in the {@code urls}
-     * @since TODO
+     * @since 2.459
      */
     public URLClassLoader2(String name, URL[] urls, ClassLoader parent) {
         super(name, urls, parent);
diff --git a/core/src/main/resources/lib/layout/search-bar.jelly b/core/src/main/resources/lib/layout/search-bar.jelly
index b86a15fef0d6..d4c64baf11a5 100644
--- a/core/src/main/resources/lib/layout/search-bar.jelly
+++ b/core/src/main/resources/lib/layout/search-bar.jelly
@@ -33,7 +33,7 @@ THE SOFTWARE.
     <st:attribute name="hasKeyboardShortcut">
       If false the default keyboard shortcut for the input is disabled. Defaults to true.
     </st:attribute>
-    <st:attribute name="enabled" since="TODO">
+    <st:attribute name="enabled" since="2.420">
       Defaults to true. Sets whether the search bar is enabled or not.
     </st:attribute>
     Creates a search input
diff --git a/core/src/main/resources/lib/layout/task.jelly b/core/src/main/resources/lib/layout/task.jelly
index 6b4066ce8683..7afcbcfef821 100644
--- a/core/src/main/resources/lib/layout/task.jelly
+++ b/core/src/main/resources/lib/layout/task.jelly
@@ -80,7 +80,7 @@ THE SOFTWARE.
     <st:attribute name="onclick" deprecated="true">
       Onclick inline JS handler. Deprecated, specify data-callback attribute instead.
     </st:attribute>
-    <st:attribute name="data-callback" since="TODO">
+    <st:attribute name="data-callback" since="2.437">
       Name of a global function to call when clicked.
       It will be called with an element (currently 'a') as first argument, and the event as second argument.
       You can specify further data-* attributes to customize behavior, those will be defined on the element passed as first argument.
@@ -97,7 +97,7 @@ THE SOFTWARE.
       Message to use for confirmation, if requested; defaults to title.
       (since 1.512)
     </st:attribute>
-    <st:attribute name="destructive" type="boolean" since="TODO">
+    <st:attribute name="destructive" type="boolean" since="2.415">
       Show red confirmation button.
     </st:attribute>
   </st:documentation>

From cbb12f2cdcef0b20a7dc9815849ad961b3c4d7ae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 06:13:34 -0600
Subject: [PATCH 141/449] Update dependency org.apache.maven:maven-core to
 v3.9.8 (#9397)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .gitpod/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitpod/Dockerfile b/.gitpod/Dockerfile
index f2475612b107..63c4aff7d91a 100644
--- a/.gitpod/Dockerfile
+++ b/.gitpod/Dockerfile
@@ -1,6 +1,6 @@
 FROM gitpod/workspace-full
 
-ARG MAVEN_VERSION=3.9.7
+ARG MAVEN_VERSION=3.9.8
 
 RUN brew install gh && \
     bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && sdk install maven ${MAVEN_VERSION} && sdk default maven ${MAVEN_VERSION}"

From 04874323c868aa6b4f51d5f2181a1d2ded2dc832 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 07:33:03 +0100
Subject: [PATCH 142/449] Update eslint monorepo to v9.5.0 (#9399)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/war/package.json b/war/package.json
index bce7b412d6ef..fbf719af81f9 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.24.7",
     "@babel/core": "7.24.7",
     "@babel/preset-env": "7.24.7",
-    "@eslint/js": "9.4.0",
+    "@eslint/js": "9.5.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.4.0",
+    "eslint": "9.5.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.4.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 75a5a9b6bedb..0befa953b6cb 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1855,14 +1855,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-array@npm:^0.15.1":
-  version: 0.15.1
-  resolution: "@eslint/config-array@npm:0.15.1"
+"@eslint/config-array@npm:^0.16.0":
+  version: 0.16.0
+  resolution: "@eslint/config-array@npm:0.16.0"
   dependencies:
-    "@eslint/object-schema": "npm:^2.1.3"
+    "@eslint/object-schema": "npm:^2.1.4"
     debug: "npm:^4.3.1"
     minimatch: "npm:^3.0.5"
-  checksum: 10c0/60947a188157f2f811cc2aedf3c2494fa10932178838f6a7c7e9a8bb106ab51b4b4e571f49ae63cdd3884002b78631e4395be25d4ae52470360fc7fb463303d2
+  checksum: 10c0/b9d04409151dc95ec6b5e04e1e185a808d58e18cfc7340adc1e9420a5ff15843a0a308fb2cd9a2b354652885c2bebbcd5515814e93e9c9133f423891b6e53c70
   languageName: node
   linkType: hard
 
@@ -1883,17 +1883,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.4.0":
-  version: 9.4.0
-  resolution: "@eslint/js@npm:9.4.0"
-  checksum: 10c0/7ffc508d3e9cd496cab7f08c5ba8f97851c8adaea3ebff8804b1c3b4662aa7aac7e9c3b597f7e47fdc29319a107bcf892865070a6b113c2e4d19f8fa1f99f569
+"@eslint/js@npm:9.5.0":
+  version: 9.5.0
+  resolution: "@eslint/js@npm:9.5.0"
+  checksum: 10c0/dacf51ec2d5b4c8d1315d21a0ff761235d9e39b2391cb945138c58dc512a6c18949c40b644235f5c4fdf5b637ef8f881214acc496dddf46b718529bf22af42ac
   languageName: node
   linkType: hard
 
-"@eslint/object-schema@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "@eslint/object-schema@npm:2.1.3"
-  checksum: 10c0/ee892d0112ee7ec86312dfb1fa718da76b2d446e3495b9ec1f3ef31382a335d31420b76f3def175b96f7c3517c88fc860fec049d62a81d444237a23881559403
+"@eslint/object-schema@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "@eslint/object-schema@npm:2.1.4"
+  checksum: 10c0/e9885532ea70e483fb007bf1275968b05bb15ebaa506d98560c41a41220d33d342e19023d5f2939fed6eb59676c1bda5c847c284b4b55fce521d282004da4dda
   languageName: node
   linkType: hard
 
@@ -3541,15 +3541,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.4.0":
-  version: 9.4.0
-  resolution: "eslint@npm:9.4.0"
+"eslint@npm:9.5.0":
+  version: 9.5.0
+  resolution: "eslint@npm:9.5.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
-    "@eslint/config-array": "npm:^0.15.1"
+    "@eslint/config-array": "npm:^0.16.0"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.4.0"
+    "@eslint/js": "npm:9.5.0"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3561,7 +3561,7 @@ __metadata:
     eslint-scope: "npm:^8.0.1"
     eslint-visitor-keys: "npm:^4.0.0"
     espree: "npm:^10.0.1"
-    esquery: "npm:^1.4.2"
+    esquery: "npm:^1.5.0"
     esutils: "npm:^2.0.2"
     fast-deep-equal: "npm:^3.1.3"
     file-entry-cache: "npm:^8.0.0"
@@ -3581,7 +3581,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/826c901812536451e1bdb151359098db3a01ee9ff41775d5e97553626d07f7319cb2a0fd54176ef8e2e057105874077426b5d408ee6e8cff06bb814651f4c004
+  checksum: 10c0/1c83d94ccfd6d97474aaaf463714eba7afa040639ad9191db430d34e9e2851ba14510651de69b52f26ee30611caf0fa4c66b3fb73bb71df6ab10cef5bb44bb32
   languageName: node
   linkType: hard
 
@@ -3606,7 +3606,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.4.2":
+"esquery@npm:^1.5.0":
   version: 1.5.0
   resolution: "esquery@npm:1.5.0"
   dependencies:
@@ -4398,12 +4398,12 @@ __metadata:
     "@babel/cli": "npm:7.24.7"
     "@babel/core": "npm:7.24.7"
     "@babel/preset-env": "npm:7.24.7"
-    "@eslint/js": "npm:9.4.0"
+    "@eslint/js": "npm:9.5.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.4.0"
+    eslint: "npm:9.5.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.4.0"

From 16b5d210525f1e0b31d15b6cf4a06c291099e049 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <das7pad@outlook.com>
Date: Tue, 18 Jun 2024 08:33:46 +0200
Subject: [PATCH 143/449] [JENKINS-14789] Configurable interval for computer
 retention check (#7037)

* [JENKINS-14789] Configurable interval for computer retention check

Also update the lower bound delay as returned by each RetentionStrategy
 from 1min to 0min. This is enabling check intervals of <1min to trigger
 a re-check in the next cycle (previously, the nextCheck tracking would
 defer the next re-check into the 2nd cycle -- one for the timer loop
 and once for the nextCheck timestamp).

Includes a bug fix:
`CloudSlaveRetentionStrategy` tracks the agent timeout in milliseconds
 internally and returned the nextCheck delay as a tenth of that.
The nextCheck delay is consumed in minutes, leading to the max delay
 of one hour being used.
Fix: Convert the delay from milliseconds to minutes.

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

* [JENKINS-14789] Allow a check interval of one second

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

* [JENKINS-14789] Apply review feedback

- Double down on JavaDoc
- Migrate UI to jelly

Co-Authored-By: Alexander Brandes <mc.cache@web.de>
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

* [JENKINS-14789] Store computerRetentionCheckInterval in model instance

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

* [JENKINS-14789] Add missing javadoc comment

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

* [JENKINS-14789] Add tests for model

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

* [JENKINS-14789] Use AperiodicWork for ComputerRetentionWork

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

* [JENKINS-14789] limit computer retention check interval to 60s

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

* [JENKINS-14789] apply review feedback

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>

---------

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
 .../hudson/slaves/CloudRetentionStrategy.java |   2 +-
 .../slaves/CloudSlaveRetentionStrategy.java   |   2 +-
 .../hudson/slaves/ComputerRetentionWork.java  |  19 ++-
 .../java/hudson/slaves/RetentionStrategy.java |   4 +-
 .../SimpleScheduledRetentionStrategy.java     |   4 +-
 ...erRetentionCheckIntervalConfiguration.java |  72 +++++++++
 .../config.jelly                              |  10 ++
 ...tentionCheckIntervalConfigurationTest.java | 146 ++++++++++++++++++
 .../computerRetentionCheckInterval.html       |  13 ++
 9 files changed, 260 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
 create mode 100644 core/src/main/resources/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration/config.jelly
 create mode 100644 test/src/test/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfigurationTest.java
 create mode 100644 war/src/main/webapp/help/system-config/computerRetentionCheckInterval.html

diff --git a/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java b/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java
index ec0142dd4768..e4601a2fad31 100644
--- a/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/CloudRetentionStrategy.java
@@ -64,7 +64,7 @@ public long check(final AbstractCloudComputer c) {
                 }
             }
         }
-        return 1;
+        return 0;
     }
 
     /**
diff --git a/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java b/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java
index 4e1b376caffe..a8dfeba1b20a 100644
--- a/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/CloudSlaveRetentionStrategy.java
@@ -37,7 +37,7 @@ public long check(T c) {
                 }
             }
         }
-        return checkCycle();
+        return TimeUnit.MILLISECONDS.toMinutes(checkCycle());
     }
 
     /**
diff --git a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
index ddee61115a03..42256855117d 100644
--- a/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
+++ b/core/src/main/java/hudson/slaves/ComputerRetentionWork.java
@@ -25,13 +25,15 @@
 package hudson.slaves;
 
 import hudson.Extension;
+import hudson.ExtensionList;
+import hudson.model.AperiodicWork;
 import hudson.model.Computer;
 import hudson.model.Node;
-import hudson.model.PeriodicWork;
 import hudson.model.Queue;
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.TimeUnit;
+import jenkins.model.GlobalComputerRetentionCheckIntervalConfiguration;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
 
@@ -42,7 +44,7 @@
  * @author Stephen Connolly
  */
 @Extension @Symbol("computerRetention")
-public class ComputerRetentionWork extends PeriodicWork {
+public class ComputerRetentionWork extends AperiodicWork {
 
     /**
      * Use weak hash map to avoid leaking {@link Computer}.
@@ -51,12 +53,18 @@ public class ComputerRetentionWork extends PeriodicWork {
 
     @Override
     public long getRecurrencePeriod() {
-        return MIN;
+        return ExtensionList.lookupSingleton(GlobalComputerRetentionCheckIntervalConfiguration.class).getComputerRetentionCheckInterval() * 1000L;
+    }
+
+    @Override
+    public AperiodicWork getNewInstance() {
+        // ComputerRetentionWork is a singleton.
+        return this;
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    protected void doRun() {
+    protected void doAperiodicRun() {
         final long startRun = System.currentTimeMillis();
         for (final Computer c : Jenkins.get().getComputers()) {
             Queue.withLock(new Runnable() {
@@ -67,8 +75,7 @@ public void run() {
                         return;
                     if (!nextCheck.containsKey(c) || startRun > nextCheck.get(c)) {
                         // at the moment I don't trust strategies to wait more than 60 minutes
-                        // strategies need to wait at least one minute
-                        final long waitInMins = Math.max(1, Math.min(60, c.getRetentionStrategy().check(c)));
+                        final long waitInMins = Math.max(0, Math.min(60, c.getRetentionStrategy().check(c)));
                         nextCheck.put(c, startRun + TimeUnit.MINUTES.toMillis(waitInMins));
                     }
                 }
diff --git a/core/src/main/java/hudson/slaves/RetentionStrategy.java b/core/src/main/java/hudson/slaves/RetentionStrategy.java
index e06b8e42c069..687e44d5c172 100644
--- a/core/src/main/java/hudson/slaves/RetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/RetentionStrategy.java
@@ -171,7 +171,7 @@ public Always() {
         public long check(SlaveComputer c) {
             if (c.isOffline() && !c.isConnecting() && c.isLaunchSupported())
                 c.tryReconnect();
-            return 1;
+            return 0;
         }
 
         @Extension(ordinal = 100) @Symbol("always")
@@ -285,7 +285,7 @@ public long check(final SlaveComputer c) {
                     return TimeUnit.MILLISECONDS.toMinutes(TimeUnit.MINUTES.toMillis(idleDelay) - idleMilliseconds);
                 }
             }
-            return 1;
+            return 0;
         }
 
         @Extension @Symbol("demand")
diff --git a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
index ef6e3d0c8658..ea90529b29b4 100644
--- a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
+++ b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java
@@ -209,7 +209,7 @@ public void run() {
                         LOGGER.log(INFO,
                                 "Disabling new jobs for computer {0} as it has finished its scheduled uptime",
                                 new Object[]{c.getName()});
-                        return 1;
+                        return 0;
                     } else if (c.isIdle() && c.isAcceptingTasks()) {
                         Queue.withLock(new Runnable() {
                             @Override
@@ -243,7 +243,7 @@ public void run() {
                 }
             }
         }
-        return 1;
+        return 0;
     }
 
     private synchronized boolean isOnlineScheduled() {
diff --git a/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java b/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
new file mode 100644
index 000000000000..c73b862ef1e5
--- /dev/null
+++ b/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
@@ -0,0 +1,72 @@
+package jenkins.model;
+
+import hudson.Extension;
+import hudson.model.PersistentDescriptor;
+import java.util.logging.Logger;
+import net.sf.json.JSONException;
+import net.sf.json.JSONObject;
+import org.jenkinsci.Symbol;
+import org.kohsuke.stapler.StaplerRequest;
+
+/**
+ * Configures check interval for computer retention.
+ *
+ * @author Jakob Ackermann
+ */
+@Extension(ordinal = 401) @Symbol("computerRetentionCheckInterval")
+public class GlobalComputerRetentionCheckIntervalConfiguration extends GlobalConfiguration implements PersistentDescriptor {
+    /**
+     * For {@link hudson.slaves.ComputerRetentionWork#getRecurrencePeriod()}
+     */
+    private int computerRetentionCheckInterval = 60;
+
+    /**
+     * Gets the check interval for computer retention.
+     *
+     * @since TODO
+     */
+    public int getComputerRetentionCheckInterval() {
+        if (computerRetentionCheckInterval <= 0) {
+            LOGGER.info("computerRetentionCheckInterval must be greater than zero, falling back to 60s");
+            return 60;
+        }
+        if (computerRetentionCheckInterval > 60) {
+            LOGGER.info("computerRetentionCheckInterval is limited to 60s");
+            return 60;
+        }
+        return computerRetentionCheckInterval;
+    }
+
+    /**
+     * Updates the check interval for computer retention and restarts the check cycle.
+     *
+     * @param interval new check interval in seconds
+     * @throws IllegalArgumentException interval must be greater than zero
+     * @since TODO
+     */
+    private void setComputerRetentionCheckInterval(int interval) throws IllegalArgumentException {
+        if (interval <= 0) {
+            throw new IllegalArgumentException("interval must be greater than zero");
+        }
+        if (interval > 60) {
+            throw new IllegalArgumentException("interval must be below or equal 60s");
+        }
+        computerRetentionCheckInterval = interval;
+        save();
+    }
+
+    @Override
+    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+        try {
+            final int interval = json.getInt("computerRetentionCheckInterval");
+            setComputerRetentionCheckInterval(interval);
+            return true;
+        } catch (IllegalArgumentException e) {
+            throw new FormException(e, "computerRetentionCheckInterval");
+        } catch (JSONException e) {
+            throw new FormException(e.getMessage(), "computerRetentionCheckInterval");
+        }
+    }
+
+    private static final Logger LOGGER = Logger.getLogger(GlobalComputerRetentionCheckIntervalConfiguration.class.getName());
+}
diff --git a/core/src/main/resources/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration/config.jelly b/core/src/main/resources/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration/config.jelly
new file mode 100644
index 000000000000..0d58e66b406a
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration/config.jelly
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+  <f:entry title="${%Computer Retention Check Interval}" help="/help/system-config/computerRetentionCheckInterval.html">
+    <f:number
+      clazz="required number" min="1" max="60"
+      field="computerRetentionCheckInterval"
+      checkMessage="${%The Computer Retention Check Interval is mandatory and must be a number greater than zero.}" />
+  </f:entry>
+</j:jelly>
diff --git a/test/src/test/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfigurationTest.java b/test/src/test/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfigurationTest.java
new file mode 100644
index 000000000000..9e7cf9f4ff81
--- /dev/null
+++ b/test/src/test/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfigurationTest.java
@@ -0,0 +1,146 @@
+package jenkins.model;
+
+import static org.junit.Assert.assertEquals;
+
+import hudson.model.Descriptor;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.logging.Level;
+import net.sf.json.JSONObject;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.LoggerRule;
+import org.kohsuke.stapler.Stapler;
+
+
+/**
+ * Ensure interval bounds are enforced when re-configuring and loading from disk. Also ensure default value handling.
+ *
+ * @author Jakob Ackermann
+ */
+public class GlobalComputerRetentionCheckIntervalConfigurationTest {
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+    @Rule
+    public LoggerRule logging = new LoggerRule();
+
+    private File getConfig(GlobalComputerRetentionCheckIntervalConfiguration c) {
+        return new File(j.jenkins.getRootDir(), c.getId() + ".xml");
+    }
+
+    private void recordWarnings() {
+        logging.record(GlobalComputerRetentionCheckIntervalConfiguration.class, Level.INFO).capture(100);
+    }
+
+    @Test
+    public void bootWithMissingCfg() {
+        recordWarnings();
+        GlobalComputerRetentionCheckIntervalConfiguration c = new GlobalComputerRetentionCheckIntervalConfiguration();
+        c.load();
+        assertEquals("default", 60, c.getComputerRetentionCheckInterval());
+        assertEquals("no fallback message", logging.getRecords().size(), 0);
+    }
+
+    private void writeConfig(GlobalComputerRetentionCheckIntervalConfiguration c, int interval) throws IOException {
+        String bad = "" +
+                "<?xml version='1.1' encoding='UTF-8'?>\n" +
+                "<jenkins.model.GlobalComputerRetentionCheckIntervalConfiguration>\n" +
+                "  <computerRetentionCheckInterval>" + interval + "</computerRetentionCheckInterval>\n" +
+                "</jenkins.model.GlobalComputerRetentionCheckIntervalConfiguration>";
+        Files.writeString(getConfig(c).toPath(), bad, StandardCharsets.UTF_8);
+    }
+
+    private void checkUsesFallbackAfterLoadOf(int interval) throws IOException {
+        recordWarnings();
+        GlobalComputerRetentionCheckIntervalConfiguration c = new GlobalComputerRetentionCheckIntervalConfiguration();
+        writeConfig(c, interval);
+        c.load();
+        assertEquals("uses default", 60, c.getComputerRetentionCheckInterval());
+        assertEquals("prints one fallback message", 1, logging.getRecords().size());
+        assertEquals("fallback message content", "computerRetentionCheckInterval must be greater than zero, falling back to 60s", logging.getRecords().get(0).getMessage());
+    }
+
+    @Test
+    public void bootWithNegative() throws IOException {
+        checkUsesFallbackAfterLoadOf(-1);
+    }
+
+    @Test
+    public void bootWithZero() throws IOException {
+        checkUsesFallbackAfterLoadOf(0);
+    }
+
+    @Test
+    public void bootWithPositive() throws IOException {
+        recordWarnings();
+        GlobalComputerRetentionCheckIntervalConfiguration c = new GlobalComputerRetentionCheckIntervalConfiguration();
+        writeConfig(c, 1);
+        c.load();
+        assertEquals("uses custom value", 1, c.getComputerRetentionCheckInterval());
+        assertEquals("no fallback message", 0, logging.getRecords().size());
+    }
+
+    @Test
+    public void bootWithTooLargeValue() throws IOException {
+        recordWarnings();
+        GlobalComputerRetentionCheckIntervalConfiguration c = new GlobalComputerRetentionCheckIntervalConfiguration();
+        writeConfig(c, 1337);
+        c.load();
+        assertEquals("uses default", 60, c.getComputerRetentionCheckInterval());
+        assertEquals("prints one fallback message", 1, logging.getRecords().size());
+        assertEquals("fallback message content", "computerRetentionCheckInterval is limited to 60s", logging.getRecords().get(0).getMessage());
+    }
+
+    @Test
+    public void saveCycle() {
+        recordWarnings();
+        GlobalComputerRetentionCheckIntervalConfiguration c = new GlobalComputerRetentionCheckIntervalConfiguration();
+
+        JSONObject json = new JSONObject();
+        json.element("computerRetentionCheckInterval", 5);
+        try {
+            c.configure(Stapler.getCurrentRequest(), json);
+        } catch (Descriptor.FormException e) {
+            throw new RuntimeException(e);
+        }
+        assertEquals("stores value", 5, c.getComputerRetentionCheckInterval());
+
+        GlobalComputerRetentionCheckIntervalConfiguration c2 = new GlobalComputerRetentionCheckIntervalConfiguration();
+        c2.load();
+        assertEquals("round trip value", 5, c2.getComputerRetentionCheckInterval());
+        assertEquals("no fallback message", 0, logging.getRecords().size());
+    }
+
+    private void checkSaveInvalidValueOf(int interval, String message) {
+        recordWarnings();
+        GlobalComputerRetentionCheckIntervalConfiguration c = new GlobalComputerRetentionCheckIntervalConfiguration();
+
+        JSONObject json = new JSONObject();
+        json.element("computerRetentionCheckInterval", interval);
+        try {
+            c.configure(Stapler.getCurrentRequest(), json);
+            throw new RuntimeException("expected .configure() to throw");
+        } catch (Descriptor.FormException e) {
+            assertEquals(e.getMessage(), message);
+        }
+        assertEquals("does not store value", 60, c.getComputerRetentionCheckInterval());
+
+        GlobalComputerRetentionCheckIntervalConfiguration c2 = new GlobalComputerRetentionCheckIntervalConfiguration();
+        c2.load();
+        assertEquals("does not persist value", 60, c2.getComputerRetentionCheckInterval());
+        assertEquals("no fallback message", 0, logging.getRecords().size());
+    }
+
+    @Test
+    public void saveInvalidValueTooLow() {
+        checkSaveInvalidValueOf(0, "java.lang.IllegalArgumentException: interval must be greater than zero");
+    }
+
+    @Test
+    public void saveInvalidValueTooHigh() {
+        checkSaveInvalidValueOf(1337, "java.lang.IllegalArgumentException: interval must be below or equal 60s");
+    }
+}
diff --git a/war/src/main/webapp/help/system-config/computerRetentionCheckInterval.html b/war/src/main/webapp/help/system-config/computerRetentionCheckInterval.html
new file mode 100644
index 000000000000..1c85b796d431
--- /dev/null
+++ b/war/src/main/webapp/help/system-config/computerRetentionCheckInterval.html
@@ -0,0 +1,13 @@
+<div>
+  Configure the check interval (in seconds) of computer retention strategies.
+  Retention strategies are configured in the individual agent configuration
+  under "Availability". Administrators can trade elevated CPU usage from
+  frequent agent checks for responsiveness to capacity needs.
+  <p>
+    For example, if you run your build agents on short-lived VMs that boot fast,
+    you may want to scale up new capacity as soon as builds queue up and scale
+    VMs down as soon as no more work is available to cut delays for users and
+    costs of keeping idle VMs alive. Be sure to adjust the delays in the
+    respective retention strategies accordingly as well.
+  </p>
+</div>

From 92ac1d88375c373aeccd7342af98ddda307f4a79 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Tue, 18 Jun 2024 08:34:05 +0200
Subject: [PATCH 144/449] remove idle executors from widget (#9177)

* remove idle executors from widget

showing idle executors brings no value. They only blow up the widget.
Instead the busy/total number of executors are added behind the agent
name when the agent is online.
The executor name is kept intentionally to distinguish regular executors
from oneoffexecutors

* feedback

use an icon for oneoffexecutors (FlyweightTask), instead of using a
number for normal executors (which is also not really interesting).

When there are no agents and no builds running use the same text as when
collapsed to show that nothing is running.

* busy in widget header

* fine tuning styling

* icon-xs symbols

* show offline

* show collapsed with no executors

* fix css

* append tooltip to parent

---------

Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
---
 .../main/resources/lib/hudson/executors.jelly | 286 +++++++++++-------
 .../resources/lib/hudson/executors.properties |   4 +
 .../lib/hudson/executors_de.properties        |   4 +
 .../main/resources/images/symbols/error.svg   |   1 +
 .../images/symbols/paper-plane-outline.svg    |   1 +
 war/src/main/scss/base/_style.scss            |  12 +
 .../scss/components/_side-panel-widgets.scss  |  62 +++-
 7 files changed, 258 insertions(+), 112 deletions(-)
 create mode 100644 war/src/main/resources/images/symbols/error.svg
 create mode 100644 war/src/main/resources/images/symbols/paper-plane-outline.svg

diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index ce01688e2ee6..f7ed2b22b70a 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -33,130 +33,196 @@ THE SOFTWARE.
   </st:documentation>
   <d:taglib uri="local">
     <d:tag name="computerCaption">
-
       <a href="${rootURL}/${c.url}" class="jenkins-link--with-icon model-link inside"><l:icon src="${c.iconClassName}" alt="${altText}"/>
         <span style="margin-left: 1ch;">${title}</span>
       </a>
-      <span style="float: right; font-weight: normal;">
-        <j:if test="${c.offline}">
-          <j:choose>
-            <j:when test="${c.offlineCause!=null and !c.connecting}">
-              (<img src="${imagesURL}/svgs/error.svg" width="16" height="16" title="${c.offlineCause}"/> ${%offline})
-            </j:when>
-            <j:when test="${c.connecting}">
-              (<l:icon src="symbol-hourglass" class="icon-sm"/>${%launching})
-            </j:when>
-            <j:otherwise>
-              (${%offline})
-            </j:otherwise>
-          </j:choose>
-        </j:if>
-        <j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
-      </span>
-    </d:tag>
-    <d:tag name="executor">
-      <j:if test="${!c.offline or (c.offline and !e.idle)}">
-          <tr>
-            <td class="pane" align="right" style="vertical-align: top">
-              ${name}
-            </td>
+        <j:choose>
+          <j:when test="${c.offline}">
             <j:choose>
-              <j:when test="${e.idle}">
-                <td class="pane">
-                  <j:choose>
-                    <j:when test="${c.offline}">
-                      <a href="${rootURL}/${c.url}" class="model-link inside">${%Offline}</a>
-                    </j:when>
-                    <j:otherwise>
-                      ${%Idle}
-                    </j:otherwise>
-                  </j:choose>
-                </td>
-                <td class="pane"/>
-                <td class="pane"/>
+              <j:when test="${c.offlineCause!=null and !c.connecting}">
+                <div>
+                  (<l:icon src="symbol-error" class="icon-xs jenkins-!-error-color" title="${c.offlineCause}"/> ${%offline})
+                </div>
+              </j:when>
+              <j:when test="${c.connecting}">
+                <div>(<l:icon src="symbol-hourglass" class="icon-xs"/>${%launching})</div>
               </j:when>
               <j:otherwise>
-                <!-- not actually optional, but it helps with backward compatibility -->
-                <j:set var="executor" value="${e}" />
-                <st:include it="${e.currentExecutable}" page="executorCell.jelly" optional="true">
-                  <td class="pane">
-                    <div style="white-space: normal">
-                      <j:set var="exe" value="${e.currentExecutable}" />
-                      <j:set var="wu" value="${e.currentWorkUnit}" />
-                      <j:choose>
-                        <j:when test="${exe == null and wu != null}">
-                          <j:set var="exeparent" value="${wu.work}"/>
-                          <j:choose>
-                            <j:when test="${h.hasPermission(exeparent,exeparent.READ)}">
-                              <a href="${rootURL}/${exeparent.url}"><l:breakable value="${exeparent.fullDisplayName}"/></a>
-                              <t:progressBar tooltip="${%Pending}" pos="-1" href="${rootURL}/${exeparent.url}"/>
-                            </j:when>
-                            <j:otherwise>
-                              <span>${%Unknown Task}</span>
-                            </j:otherwise>
-                          </j:choose>
-                        </j:when>
-                        <j:when test="${exe == null and wu == null}">
-                          <!-- went idle concurrent with testing for idle -->
-                          ${%Idle}
-                        </j:when>
-                        <j:otherwise>
-                      <j:invokeStatic var="exeparent"
-                         className="hudson.model.queue.Executables" method="getParentOf">
-                        <j:arg type="hudson.model.Queue$Executable" value="${exe}" />
-                      </j:invokeStatic>
-                      <j:choose>
-                        <j:when test="${h.hasPermission(exeparent,exeparent.READ)}">
-                          <a href="${rootURL}/${exeparent.url}"><l:breakable value="${exeparent.fullDisplayName}"/></a>
-                          <t:buildProgressBar build="${exe}" executor="${executor}"/>
-                        </j:when>
-                        <j:otherwise>
-                          <span>${%Unknown Task}</span>
-                        </j:otherwise>
-                      </j:choose>
-                        </j:otherwise>
-                      </j:choose>
-                    </div>
-                  </td>
-                <td class="pane">
-                  <j:if test="${h.hasPermission(exeparent,exeparent.READ)}">
-                      <a href="${rootURL}/${exe.url}" class="model-link inside" style="display: block;"><l:breakable value="${exe.displayName}"/></a>
-                  </j:if>
-                </td>
-                </st:include>
-                <td class="pane" align="center" valign="middle">
-                  <j:if test="${h.hasPermission(exeparent,exeparent.READ) and e.hasStopPermission()}">
-                    <l:stopButton href="${rootURL}/${c.url}${url}/stopBuild?runExtId=${h.urlEncode(exe.externalizableId)}" confirm="${%confirm(exe.fullDisplayName)}" alt="${%terminate this build}"  />
-                  </j:if>
-                </td>
+                <div>(${%offline})</div>
               </j:otherwise>
             </j:choose>
-          </tr>
+          </j:when>
+          <j:otherwise>
+            <div tooltip="${%busy(c.countBusy(), c.countExecutors())}" data-tooltip-append-to-parent="true">${c.countBusy()}/${c.countExecutors()}</div>
+          </j:otherwise>
+        </j:choose>
+        <j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
+    </d:tag>
+    <d:tag name="executor">
+      <j:if test="${!e.idle}">
+          <div class="executor-row">
+            <div class="executor-type">
+              <j:if test="${name == ''}">
+                <span tooltip="${%Light weight executor}" data-tooltip-append-to-parent="true">
+                  <l:icon src="symbol-paper-plane-outline" class="icon-sm"/>
+                </span>
+              </j:if>
+            </div>
+            <div class="executor-cell">
+              <table class="executor-cell-table">
+                <tr>
+                  <!-- not actually optional, but it helps with backward compatibility -->
+                  <j:set var="executor" value="${e}" />
+                  <st:include it="${e.currentExecutable}" page="executorCell.jelly" optional="true">
+                    <td class="pane">
+                      <div style="white-space: normal">
+                        <j:set var="exe" value="${e.currentExecutable}" />
+                        <j:set var="wu" value="${e.currentWorkUnit}" />
+                        <j:choose>
+                          <j:when test="${exe == null and wu != null}">
+                            <j:set var="exeparent" value="${wu.work}"/>
+                            <j:choose>
+                              <j:when test="${h.hasPermission(exeparent,exeparent.READ)}">
+                                <a href="${rootURL}/${exeparent.url}"><l:breakable value="${exeparent.fullDisplayName}"/></a>
+                                <t:progressBar tooltip="${%Pending}" pos="-1" href="${rootURL}/${exeparent.url}"/>
+                              </j:when>
+                              <j:otherwise>
+                                <span>${%Unknown Task}</span>
+                              </j:otherwise>
+                            </j:choose>
+                          </j:when>
+                          <j:when test="${exe == null and wu == null}">
+                            <!-- went idle concurrent with testing for idle -->
+                            ${%Idle}
+                          </j:when>
+                          <j:otherwise>
+                        <j:invokeStatic var="exeparent"
+                           className="hudson.model.queue.Executables" method="getParentOf">
+                          <j:arg type="hudson.model.Queue$Executable" value="${exe}" />
+                        </j:invokeStatic>
+                        <j:choose>
+                          <j:when test="${h.hasPermission(exeparent,exeparent.READ)}">
+                            <a href="${rootURL}/${exeparent.url}"><l:breakable value="${exeparent.fullDisplayName}"/></a>
+                            <t:buildProgressBar build="${exe}" executor="${executor}"/>
+                          </j:when>
+                          <j:otherwise>
+                            <span>${%Unknown Task}</span>
+                          </j:otherwise>
+                        </j:choose>
+                          </j:otherwise>
+                        </j:choose>
+                      </div>
+                    </td>
+                    <td class="pane">
+                      <j:if test="${h.hasPermission(exeparent,exeparent.READ)}">
+                          <a href="${rootURL}/${exe.url}" class="model-link inside" style="display: block;"><l:breakable value="${exe.displayName}"/></a>
+                      </j:if>
+                    </td>
+                  </st:include>
+                </tr>
+              </table>
+            </div>
+            <div class="executor-stop">
+              <j:if test="${h.hasPermission(exeparent,exeparent.READ) and e.hasStopPermission()}">
+                <l:stopButton href="${rootURL}/${c.url}${url}/stopBuild?runExtId=${h.urlEncode(exe.externalizableId)}" confirm="${%confirm(exe.fullDisplayName)}" alt="${%terminate this build}"  />
+              </j:if>
+            </div>
+          </div>
       </j:if>
     </d:tag>
   </d:taglib>
+  <j:set var="paneIsCollapsed" value="${h.isCollapsed('executors')}" />
   <j:set var="computers" value="${attrs.computers?:app.computers}" />
+  <j:set var="origComputersSize" value="${computers.size()}"/>
+
+  <!-- Check if the built-in has to be shown, this is the case when it has either executors configured or is running
+       an asynchronous execution that doesn't want to hide the displaycell -->
+  <j:set var="builtInHasExecutors" value="${!app.toComputer().displayExecutors.isEmpty()}"/>
+  <j:set var="singleComputer" value="${computers.size() == 1
+                                      or (computers.size() == 2 and computers.get(0).node == app
+                                      and !builtInHasExecutors)}"/>
+  <!-- Remove the built-in from the list when it is included but has no executors to show -->
+  <j:choose>
+    <j:when test="${!builtInHasExecutors and computers.get(0).node == app and computers.size() gt 1}">
+      <j:set var="computers" value="${computers.subList(1, computers.size())}"/>
+    </j:when>
+  </j:choose>
+
   <j:set var="computersSize" value="${computers.size()}"/>
-    <l:pane width="3" id="executors"
-        title="&lt;a href='${rootURL}/computer/'>${%Build Executor Status}&lt;/a>"
-        collapsedText="${%Computers(computersSize - 1, app.unlabeledLoad.computeTotalExecutors() - app.unlabeledLoad.computeIdleExecutors(), app.unlabeledLoad.computeTotalExecutors())}">
-      <colgroup><col width="30"/><col width="200*"/><col width="24"/></colgroup>
+  <j:choose>
+    <j:when test="${!builtInHasExecutors and app.clouds.isEmpty() and app.nodes.isEmpty()}">
+      <j:set var="collapsedText" value="${%noExecutors}"/>
+      <j:set var="showCollapsedText" value="true" />
+    </j:when>
+    <j:when test="${singleComputer}">
+      <j:set var="sc" value="${computers.get(0)}"/>
+      <j:set var="executorDetails" value="${sc.countBusy()}/${sc.countExecutors()}"/>
+      <j:set var="collapsedText" value="${%CollapsedSingle(sc.countBusy(), sc.countExecutors())}"/>
+      <j:set var="singleToolTip" value="${%busy(sc.countBusy(), sc.countExecutors())}"/>
+    </j:when>
+    <j:when test="${computersSize > 1 and !builtInHasExecutors}">
+      <j:set var="collapsedText" value="${%CollapsedMulti(computersSize, app.unlabeledLoad.computeTotalExecutors() - app.unlabeledLoad.computeIdleExecutors(), app.unlabeledLoad.computeTotalExecutors())}"/>
+    </j:when>
+    <j:when test="${computersSize > 1 and builtInHasExecutors}">
+      <j:set var="collapsedText" value="${%Computers(computersSize - 1, app.unlabeledLoad.computeTotalExecutors() - app.unlabeledLoad.computeIdleExecutors(), app.unlabeledLoad.computeTotalExecutors())}"/>
+    </j:when>
+  </j:choose>
+  <div class="pane-frame ${paneIsCollapsed ? 'collapsed' : 'expanded'}" id="executors">
+    <div class="pane-header">
+      <span class="pane-header-title">
+        <a href="${rootURL}/computer/">${%Build Executor Status}</a>
+      </span>
+      <j:if test="${origComputersSize == 1 and !paneIsCollapsed}">
+        <span class="pane-header-details" tooltip="${singleToolTip}" data-tooltip-append-to-parent="true">
+          ${executorDetails}
+        </span>
+      </j:if>
+      <a class="collapse" href="${rootURL}/toggleCollapse?paneId=executors"
+         tooltip="${paneIsCollapsed ? '%Expand' : '%Collapse'}" data-tooltip-append-to-parent="true">
+        <j:set var="svgIconId" value="${paneIsCollapsed ? 'chevron-up' : 'chevron-down'}" />
+        <l:icon src="symbol-${svgIconId}" />
+      </a>
+    </div>
+    <j:choose>
+      <div class="pane-content">
+        <j:when test="${paneIsCollapsed or showCollapsedText}">
+          <div class="executors-collapsed">
+            ${collapsedText}
+          </div>
+        </j:when>
+        <j:otherwise>
+          <j:forEach var="c" items="${computers}">
+            <div class="computer-row">
+              <j:set var="cDisplayExecutors" value="${c.displayExecutors}"/>
+              <j:choose>
+                <j:when test="${!singleComputer or origComputersSize > 1 or c.offline}">
+                  <j:if test="${!cDisplayExecutors.isEmpty()}">
+                    <div class="computer-caption">
+                      <local:computerCaption title="${c.displayName}" />
+                    </div>
+                  </j:if>
+                </j:when>
+              </j:choose>
+              <j:if test="${!cDisplayExecutors.isEmpty()}">
+                <div class="executors-cell">
+                  <j:forEach var="de" items="${cDisplayExecutors}" varStatus="eloop">
+                    <j:set var="e" value="${de.executor}"/>
+                    <local:executor name="${de.displayName}" url="${de.url}" />
+                  </j:forEach>
+                </div>
+              </j:if>
+            </div>
+          </j:forEach>
+        </j:otherwise>
+      </div>
+    </j:choose>
+    <j:if test="${attrs.footer != null}">
+      <div class="pane-footer">
+        <j:out value="${attrs.footer}"/>
+      </div>
+    </j:if>
+  </div>
 
-      <j:forEach var="c" items="${computers}">
-        <j:set var="cDisplayExecutors" value="${c.displayExecutors}"/>
-        <tr>
-          <j:if test="${(computersSize gt 1 and !cDisplayExecutors.isEmpty()) or (c.node == app and c.offline)}">
-            <th class="pane" colspan="4">
-              <local:computerCaption title="${c.displayName}" />
-            </th>
-          </j:if>
-        </tr>
-        <j:forEach var="de" items="${cDisplayExecutors}" varStatus="eloop">
-          <j:set var="e" value="${de.executor}"/>
-          <local:executor name="${de.displayName}" url="${de.url}" />
-        </j:forEach>
-      </j:forEach>
-    </l:pane>
     <!-- schedule updates only for the full page reload -->
     <j:if test="${ajax==null and h.hasPermission(app.READ)}">
       <div class="widget-refresh-reference" data-id="executors" data-url="${rootURL}/${it.url}ajax"/>
diff --git a/core/src/main/resources/lib/hudson/executors.properties b/core/src/main/resources/lib/hudson/executors.properties
index 8438e6602a32..b4ac14a2b8b6 100644
--- a/core/src/main/resources/lib/hudson/executors.properties
+++ b/core/src/main/resources/lib/hudson/executors.properties
@@ -3,3 +3,7 @@ Computers=built-in node{0,choice,0# ({1} of {2} executors busy)|1# + {0,number}
 confirm=Are you sure you want to abort {0}?
 launching=launching...
 terminate\ this\ build=Cancel
+busy={1,choice,1# {0} of {1} executor busy|1< {0} of {1} executors busy}
+CollapsedSingle={1,choice,1# ({0} of {1} executor busy)|1< ({0} of {1} executors busy)}
+CollapsedMulti={0} agents ({1} of {2} executors busy)}
+noExecutors=No executors, agents or clouds are configured.
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/executors_de.properties b/core/src/main/resources/lib/hudson/executors_de.properties
index 2e501efc27d5..06d7d01cfb53 100644
--- a/core/src/main/resources/lib/hudson/executors_de.properties
+++ b/core/src/main/resources/lib/hudson/executors_de.properties
@@ -30,3 +30,7 @@ Unknown\ Task=Unbekannter Task
 Pending=Wartend
 Computers=Master{0,choice,0#|1# + {0,number} Agent ({1} von {2} Build-Prozessoren)|1< + {0,number} Agenten ({1} von {2} Build-Prozessoren)}
 confirm=Möchten Sie {0} wirklich abbrechen?
+busy={0} von {1} Build-Prozessoren belegt
+CollapsedSingle={1,choice,1# ({0} von {1} Prozessor belegt)|1< ({0} von {1} Prozessoren belegt)}
+CollapsedMulti={0} Agenten ({1} von {2} Build-Prozessoren belegt)}
+noExecutors=Es sind keine Prozessoren, Agenten oder Clouds konfiguriert.
diff --git a/war/src/main/resources/images/symbols/error.svg b/war/src/main/resources/images/symbols/error.svg
new file mode 100644
index 000000000000..1c236a7a2cf1
--- /dev/null
+++ b/war/src/main/resources/images/symbols/error.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><circle cx="256" cy="256" r="250" fill="red"/><rect x="90" y="210" width="332" height="92" fill="white"/></svg>
\ No newline at end of file
diff --git a/war/src/main/resources/images/symbols/paper-plane-outline.svg b/war/src/main/resources/images/symbols/paper-plane-outline.svg
new file mode 100644
index 000000000000..5ff87689259a
--- /dev/null
+++ b/war/src/main/resources/images/symbols/paper-plane-outline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="ionicon" viewBox="0 0 512 512"><path d="M53.12 199.94l400-151.39a8 8 0 0110.33 10.33l-151.39 400a8 8 0 01-15-.34l-67.4-166.09a16 16 0 00-10.11-10.11L53.46 215a8 8 0 01-.34-15.06zM460 52L227 285" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>
\ No newline at end of file
diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss
index 46e60633e474..780aa7dd35ff 100644
--- a/war/src/main/scss/base/_style.scss
+++ b/war/src/main/scss/base/_style.scss
@@ -881,6 +881,18 @@ body.no-sticker #bottom-sticker {
 }
 
 /* see the Icon class for the definition of these CSS classes */
+.icon-xs,
+svg.icon-xs {
+  width: 12px;
+  height: 12px;
+  vertical-align: middle;
+
+  svg {
+    width: 12px;
+    height: 12px;
+  }
+}
+
 .icon-sm,
 svg.icon-sm {
   width: 16px;
diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/war/src/main/scss/components/_side-panel-widgets.scss
index 449646aaad4a..6771da8d1d92 100644
--- a/war/src/main/scss/components/_side-panel-widgets.scss
+++ b/war/src/main/scss/components/_side-panel-widgets.scss
@@ -49,6 +49,11 @@
   }
 }
 
+#side-panel .pane-header-details {
+  font-weight: normal;
+  font-size: var(--font-size-xs);
+}
+
 #side-panel .pane-content {
   font-size: var(--font-size-xs);
 }
@@ -87,6 +92,59 @@
 /**
  * Executors
  */
-#executors th.pane {
-  text-align: left;
+#executors {
+  th.pane {
+    text-align: left;
+  }
+
+  .pane-header {
+    align-items: center;
+  }
+
+  .computer-caption {
+    display: flex;
+    gap: 5px;
+    padding: 0.5rem 1rem;
+
+    & > div {
+      margin-left: auto;
+      align-self: end;
+    }
+  }
+
+  .executors-cell {
+    padding: 0 1rem;
+  }
+
+  .executors-collapsed {
+    padding: 0 1rem 0.5rem;
+  }
+
+  .executor-row {
+    display: flex;
+    padding: 0 0 0.5rem;
+    align-items: center;
+  }
+
+  .executor-type {
+    width: 16px;
+    margin-right: 1ch;
+  }
+
+  .executor-cell {
+    width: 100%;
+  }
+
+  .executor-cell-table .pane {
+    margin: 0 !important;
+    padding: 0 !important;
+
+    & > div {
+      margin-right: 15px;
+    }
+  }
+
+  .executor-stop {
+    width: 16px;
+  }
 }

From 500169be5787b5e7e524be02576248fe42731112 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 17 Jun 2024 23:34:19 -0700
Subject: [PATCH 145/449] Delegate compression to servlet container (#9379)

* Delegate compression to servlet container

* Update incrementals

* Use released versions
---
 bom/pom.xml                                   |  2 +-
 .../impl/InstallUncaughtExceptionHandler.java |  4 +--
 core/src/main/java/hudson/model/Api.java      |  3 +-
 core/src/main/java/hudson/model/Computer.java |  2 +-
 core/src/main/java/hudson/model/Run.java      |  2 +-
 .../hudson/security/csrf/CrumbIssuer.java     |  2 +-
 .../main/java/hudson/triggers/SCMTrigger.java |  2 +-
 .../java/hudson/util/RemotingDiagnostics.java |  2 +-
 .../hudson/model/Computer/_scriptText.jelly   |  4 +--
 .../resources/hudson/model/Run/console.jelly  |  4 +--
 .../hudson/model/Run/consoleFull.jelly        |  4 +--
 .../hudson/model/Run/statusIcon.jelly         |  4 +--
 .../resources/hudson/model/View/index.jelly   |  4 +--
 .../SCMTrigger/BuildAction/index.jelly        |  4 +--
 pom.xml                                       |  2 +-
 .../stapler/StaplerDispatchValidatorTest.java |  9 -----
 .../Groovy/compress.groovy                    | 34 -------------------
 .../Jelly/compress.jelly                      | 31 -----------------
 war/src/main/webapp/WEB-INF/web.xml           |  6 ++--
 19 files changed, 25 insertions(+), 100 deletions(-)
 delete mode 100644 test/src/test/resources/jenkins/security/stapler/StaplerDispatchValidatorTest/Groovy/compress.groovy
 delete mode 100644 test/src/test/resources/jenkins/security/stapler/StaplerDispatchValidatorTest/Jelly/compress.jelly

diff --git a/bom/pom.xml b/bom/pom.xml
index 1086bd414607..49f9c739fdc4 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <slf4jVersion>2.0.13</slf4jVersion>
-    <stapler.version>1880.vb_6d94a_3b_05db_</stapler.version>
+    <stapler.version>1881.vd39f3ee5c629</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
diff --git a/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java b/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java
index 8873925847dc..c305e9a6febc 100644
--- a/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java
+++ b/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java
@@ -18,8 +18,8 @@
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.UncaughtExceptionFilter;
 import org.kohsuke.stapler.WebApp;
-import org.kohsuke.stapler.compression.CompressionFilter;
 
 /**
  * Deals with exceptions that get thrown all the way up to the Stapler rendering layer.
@@ -30,7 +30,7 @@ public class InstallUncaughtExceptionHandler {
 
     @Initializer
     public static void init(final Jenkins j) throws IOException {
-        CompressionFilter.setUncaughtExceptionHandler(j.servletContext, (e, context, req, rsp) -> handleException(j, e, req, rsp, 500));
+        UncaughtExceptionFilter.setUncaughtExceptionHandler(j.servletContext, (e, context, req, rsp) -> handleException(j, e, req, rsp, 500));
         try {
             Thread.setDefaultUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler());
             LOGGER.log(Level.FINE, "Successfully installed a global UncaughtExceptionHandler.");
diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java
index 11db76c3581d..23e72072112f 100644
--- a/core/src/main/java/hudson/model/Api.java
+++ b/core/src/main/java/hudson/model/Api.java
@@ -190,8 +190,7 @@ public void doXml(StaplerRequest req, StaplerResponse rsp,
             return;
         }
 
-        // switch to gzipped output
-        try (OutputStream o = rsp.getCompressedOutputStream(req)) {
+        try (OutputStream o = rsp.getOutputStream()) {
             if (isSimpleOutput(result)) {
                 // simple output allowed
                 rsp.setContentType("text/plain;charset=UTF-8");
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 3470ad4d15c4..14a311381a37 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -1457,7 +1457,7 @@ public void doDumpExportTable(StaplerRequest req, StaplerResponse rsp) throws IO
         checkPermission(Jenkins.ADMINISTER);
 
         rsp.setContentType("text/plain");
-        try (PrintWriter w = new PrintWriter(rsp.getCompressedWriter(req))) {
+        try (PrintWriter w = new PrintWriter(rsp.getWriter())) {
             VirtualChannel vc = getChannel();
             if (vc instanceof Channel) {
                 w.println("Controller to agent");
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index d2ce976e1add..33658252b922 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -2286,7 +2286,7 @@ public void doBuildTimestamp(StaplerRequest req, StaplerResponse rsp, @QueryPara
     public void doConsoleText(StaplerRequest req, StaplerResponse rsp) throws IOException {
         rsp.setContentType("text/plain;charset=UTF-8");
         try (InputStream input = getLogInputStream();
-             OutputStream os = rsp.getCompressedOutputStream(req);
+             OutputStream os = rsp.getOutputStream();
              PlainTextConsoleOutputStream out = new PlainTextConsoleOutputStream(os)) {
             IOUtils.copy(input, out);
         }
diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
index c753ddaa5d62..cd0c51b03fb0 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
@@ -204,7 +204,7 @@ public static class RestrictedApi extends Api {
                 text = null;
             }
             if (text != null) {
-                try (OutputStream o = rsp.getCompressedOutputStream(req)) {
+                try (OutputStream o = rsp.getOutputStream()) {
                     rsp.setContentType("text/plain;charset=UTF-8");
                     o.write(text.getBytes(StandardCharsets.UTF_8));
                 }
diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java
index e35a3b66af69..43fdc6bb1062 100644
--- a/core/src/main/java/hudson/triggers/SCMTrigger.java
+++ b/core/src/main/java/hudson/triggers/SCMTrigger.java
@@ -468,7 +468,7 @@ public String getUrlName() {
          */
         public void doPollingLog(StaplerRequest req, StaplerResponse rsp) throws IOException {
             rsp.setContentType("text/plain;charset=UTF-8");
-            try (OutputStream os = rsp.getCompressedOutputStream(req);
+            try (OutputStream os = rsp.getOutputStream();
                  // Prevent jelly from flushing stream so Content-Length header can be added afterwards
                  FlushProofOutputStream out = new FlushProofOutputStream(os)) {
                 getPollingLogText().writeLogTo(0, out);
diff --git a/core/src/main/java/hudson/util/RemotingDiagnostics.java b/core/src/main/java/hudson/util/RemotingDiagnostics.java
index 1756d2933b18..06a42beee69d 100644
--- a/core/src/main/java/hudson/util/RemotingDiagnostics.java
+++ b/core/src/main/java/hudson/util/RemotingDiagnostics.java
@@ -217,7 +217,7 @@ public void doHeapDump(StaplerRequest req, StaplerResponse rsp) throws IOExcepti
 
             FilePath dump = obtain();
             try {
-                dump.copyTo(rsp.getCompressedOutputStream(req));
+                dump.copyTo(rsp.getOutputStream());
             } finally {
                 dump.delete();
             }
diff --git a/core/src/main/resources/hudson/model/Computer/_scriptText.jelly b/core/src/main/resources/hudson/model/Computer/_scriptText.jelly
index f87b23b69df5..f5aa6304ee2b 100644
--- a/core/src/main/resources/hudson/model/Computer/_scriptText.jelly
+++ b/core/src/main/resources/hudson/model/Computer/_scriptText.jelly
@@ -26,8 +26,8 @@ THE SOFTWARE.
   Called from doScriptText() to display the execution result.
 -->
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
     <l:view contentType="text/plain;charset=UTF-8">
         <j:out value="${output}"/>
     </l:view>
-</st:compress>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
index 3609d2b7ee68..ad38828dad5a 100644
--- a/core/src/main/resources/hudson/model/Run/console.jelly
+++ b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
   Displays the console output
 -->
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
   <l:layout title="${it.fullDisplayName} Console">
     <st:include page="sidepanel.jelly" />
 
@@ -84,4 +84,4 @@ THE SOFTWARE.
       </j:choose>
     </l:main-panel>
   </l:layout>
-</st:compress>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/Run/consoleFull.jelly b/core/src/main/resources/hudson/model/Run/consoleFull.jelly
index 6e4a820d9d33..feed99c66479 100644
--- a/core/src/main/resources/hudson/model/Run/consoleFull.jelly
+++ b/core/src/main/resources/hudson/model/Run/consoleFull.jelly
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <j:set var="consoleFull" value="true" />
   <st:include page="console.jelly" />
-</st:compress>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/Run/statusIcon.jelly b/core/src/main/resources/hudson/model/Run/statusIcon.jelly
index e481fd48761d..548d5176bcea 100644
--- a/core/src/main/resources/hudson/model/Run/statusIcon.jelly
+++ b/core/src/main/resources/hudson/model/Run/statusIcon.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
   Displays the console output
 -->
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <st:setHeader name="X-Building" value="${it.building}" />
   <st:setHeader name="X-Progress" value="${it.executor.progress}" />
   <st:setHeader name="X-Executor-Runtime" value="${it.executor.timestampString}" />
@@ -37,4 +37,4 @@ THE SOFTWARE.
   <l:ajax>
     <l:icon alt="${it.iconColor.description}" src="symbol-status-${it.iconColor.iconName}" class="icon-xlg" tooltip="${it.iconColor.description}"/>
   </l:ajax>
-</st:compress>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
index 3f20913e81cc..f359162bc75d 100644
--- a/core/src/main/resources/hudson/model/View/index.jelly
+++ b/core/src/main/resources/hudson/model/View/index.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
     <l:layout title="${(it.class.name=='hudson.model.AllView' and it.ownerItemGroup == app) ? '%Dashboard' : it.displayName}${not empty it.ownerItemGroup.fullDisplayName?' ['+it.ownerItemGroup.fullDisplayName+']':''}">
       <j:set var="view" value="${it}"/> <!-- expose view to the scripts we include from owner -->
         <st:include page="sidepanel.jelly" />
@@ -49,4 +49,4 @@ THE SOFTWARE.
           <st:adjunct includes="hudson.model.View.screen-resolution"/>
         </l:header>
     </l:layout>
-</st:compress>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/triggers/SCMTrigger/BuildAction/index.jelly b/core/src/main/resources/hudson/triggers/SCMTrigger/BuildAction/index.jelly
index e05ffc91d005..5dc56654b440 100644
--- a/core/src/main/resources/hudson/triggers/SCMTrigger/BuildAction/index.jelly
+++ b/core/src/main/resources/hudson/triggers/SCMTrigger/BuildAction/index.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
   Displays the polling log output
 -->
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.run.parent.displayName} #${it.run.number} ${%Polling Log}">
     <st:include it="${it.run}" page="sidepanel.jelly" />
     <l:main-panel>
@@ -39,4 +39,4 @@ THE SOFTWARE.
       </pre>
     </l:main-panel>
   </l:layout>
-</st:compress>
+</j:jelly>
diff --git a/pom.xml b/pom.xml
index 61f57e16bae6..e6b8c18d5ec1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
-    <winstone.version>6.19</winstone.version>
+    <winstone.version>6.20</winstone.version>
   </properties>
 
   <!--
diff --git a/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java b/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
index c5b523073f89..0483b2825e43 100644
--- a/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
+++ b/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
@@ -109,15 +109,6 @@ public void canViewPagesThatRedirectToViews() throws Exception {
         }
     }
 
-    @Test
-    public void canViewCompressedViews() throws Exception {
-        String[] urls = {"groovy/compress", "jelly/compress"};
-        for (String url : urls) {
-            HtmlPage root = j.createWebClient().goTo(url);
-            assertEquals("Fragment", root.getElementById("frag").asNormalizedText());
-        }
-    }
-
     @Test
     public void cannotViewFragment() throws Exception {
         String[] urls = {"annotated/frag", "groovy/frag", "jelly/frag", "whitelist/frag"};
diff --git a/test/src/test/resources/jenkins/security/stapler/StaplerDispatchValidatorTest/Groovy/compress.groovy b/test/src/test/resources/jenkins/security/stapler/StaplerDispatchValidatorTest/Groovy/compress.groovy
deleted file mode 100644
index 2c342e42bf97..000000000000
--- a/test/src/test/resources/jenkins/security/stapler/StaplerDispatchValidatorTest/Groovy/compress.groovy
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2019 CloudBees, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package jenkins.security.stapler.StaplerDispatchValidatorTest.Groovy
-
-def st = namespace('jelly:stapler')
-def l = namespace('/lib/layout')
-st.compress {
-    l.view {
-        st.contentType(value: 'text/html')
-        st.include(page: 'frag')
-    }
-}
diff --git a/test/src/test/resources/jenkins/security/stapler/StaplerDispatchValidatorTest/Jelly/compress.jelly b/test/src/test/resources/jenkins/security/stapler/StaplerDispatchValidatorTest/Jelly/compress.jelly
deleted file mode 100644
index 8ef1c236f51c..000000000000
--- a/test/src/test/resources/jenkins/security/stapler/StaplerDispatchValidatorTest/Jelly/compress.jelly
+++ /dev/null
@@ -1,31 +0,0 @@
-<?jelly escape-by-default="true"?>
-<!--
-  ~ The MIT License
-  ~
-  ~ Copyright (c) 2019 CloudBees, Inc.
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
-    <st:compress>
-        <l:view contentType="text/html;charset=UTF-8">
-            <st:include page="frag"/>
-        </l:view>
-    </st:compress>
-</j:jelly>
diff --git a/war/src/main/webapp/WEB-INF/web.xml b/war/src/main/webapp/WEB-INF/web.xml
index 29e9194decd2..4ef6db9e3fb5 100644
--- a/war/src/main/webapp/WEB-INF/web.xml
+++ b/war/src/main/webapp/WEB-INF/web.xml
@@ -66,8 +66,8 @@ THE SOFTWARE.
     <async-supported>true</async-supported>
   </filter>
   <filter>
-    <filter-name>compression-filter</filter-name>
-    <filter-class>org.kohsuke.stapler.compression.CompressionFilter</filter-class>
+    <filter-name>uncaught-exception-filter</filter-name>
+    <filter-class>org.kohsuke.stapler.UncaughtExceptionFilter</filter-class>
     <async-supported>true</async-supported>
   </filter>
   <filter>
@@ -149,7 +149,7 @@ THE SOFTWARE.
     <url-pattern>/*</url-pattern>
   </filter-mapping>
   <filter-mapping>
-    <filter-name>compression-filter</filter-name>
+    <filter-name>uncaught-exception-filter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
   <filter-mapping>

From d041c4395881c1d52e41795541232b63c7488029 Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Tue, 18 Jun 2024 08:34:31 +0200
Subject: [PATCH 146/449] Replace usages of YUI framework by simple JS/CSS
 (#9395)

---
 .../hudson/console/ExpandableDetailsNote.java |  5 +-
 .../console/ExpandableDetailsNote/script.js   |  6 +--
 .../console/ExpandableDetailsNote/style.css   |  2 +-
 .../resources/hudson/model/View/index.jelly   |  1 -
 .../SlowTriggerAdminMonitor/message.groovy    |  4 +-
 .../RekeySecretAdminMonitor/message.groovy    |  4 +-
 .../lib/form/repeatable/repeatable.js         | 40 +++++++--------
 .../jenkins/security/Security3245Test.java    | 13 ++---
 .../js/components/dropdowns/hetero-list.js    | 14 +-----
 war/src/main/scss/form/_reorderable-list.scss |  8 +++
 .../main/webapp/scripts/hudson-behavior.js    |  3 +-
 war/src/main/webapp/scripts/sortable.js       | 49 ++++++-------------
 12 files changed, 62 insertions(+), 87 deletions(-)

diff --git a/core/src/main/java/hudson/console/ExpandableDetailsNote.java b/core/src/main/java/hudson/console/ExpandableDetailsNote.java
index 1f558e6a260b..beb623b5034c 100644
--- a/core/src/main/java/hudson/console/ExpandableDetailsNote.java
+++ b/core/src/main/java/hudson/console/ExpandableDetailsNote.java
@@ -26,8 +26,8 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
-import hudson.Functions;
 import hudson.MarkupText;
+import hudson.Util;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -53,7 +53,8 @@ public ExpandableDetailsNote(String caption, String html) {
     @Override
     public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
         text.addMarkup(charPos,
-                "<input type=button value='" + Functions.htmlAttributeEscape(caption) + "' class='reveal-expandable-detail'><div class='expandable-detail'>" + html + "</div>");
+                "<button type='button' class='jenkins-button reveal-expandable-detail'>"
+                        + Util.xmlEscape(caption) + "</button><div class='expandable-detail'>" + html + "</div>");
         return null;
     }
 
diff --git a/core/src/main/resources/hudson/console/ExpandableDetailsNote/script.js b/core/src/main/resources/hudson/console/ExpandableDetailsNote/script.js
index bd71b5fec807..f42f4113802d 100644
--- a/core/src/main/resources/hudson/console/ExpandableDetailsNote/script.js
+++ b/core/src/main/resources/hudson/console/ExpandableDetailsNote/script.js
@@ -1,11 +1,11 @@
 (function () {
   Behaviour.specify(
-    "INPUT.reveal-expandable-detail",
+    "BUTTON.reveal-expandable-detail",
     "ExpandableDetailsNote",
     0,
     function (e) {
-      var detail = e.nextSibling;
-      makeButton(e, function () {
+      e.addEventListener("click", () => {
+        const detail = e.nextSibling;
         detail.style.display =
           detail.style.display == "block" ? "none" : "block";
       });
diff --git a/core/src/main/resources/hudson/console/ExpandableDetailsNote/style.css b/core/src/main/resources/hudson/console/ExpandableDetailsNote/style.css
index 3015eb2ba7e8..b3636a127219 100644
--- a/core/src/main/resources/hudson/console/ExpandableDetailsNote/style.css
+++ b/core/src/main/resources/hudson/console/ExpandableDetailsNote/style.css
@@ -1,6 +1,6 @@
 DIV.expandable-detail {
   display: none;
-  background-color: #d3d7cf;
+  background-color: var(--background);
   margin: 0.5em;
   padding: 0.5em;
 }
diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
index f359162bc75d..14632b8e60e8 100644
--- a/core/src/main/resources/hudson/model/View/index.jelly
+++ b/core/src/main/resources/hudson/model/View/index.jelly
@@ -44,7 +44,6 @@ THE SOFTWARE.
         </l:main-panel>
         <l:header>
           <!-- for screen resolution detection -->
-          <l:yui module="cookie" />
           <script id="screenResolution-script" data-use-secure-cookie="${request.secure}"/>
           <st:adjunct includes="hudson.model.View.screen-resolution"/>
         </l:header>
diff --git a/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy b/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy
index cef8cd83fae9..22a175909c0c 100644
--- a/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy
+++ b/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy
@@ -10,7 +10,9 @@ SlowTriggerAdminMonitor tam = my
 dl {
     div(class: "jenkins-alert jenkins-alert-warning") {
         form(method: "post", name: "clear", action: rootURL + "/" + tam.url + "/clear") {
-            input(name: "clear", type: "submit", value: _("Dismiss"), class: "submit-button primary")
+            button(name: "clear", type: "submit", class: "jenkins-button jenkins-submit-button jenkins-button--primary") {
+                raw _("Dismiss")
+            }
         }
 
         text(_("blurb"))
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
index 5ecf28df34c4..e481b7009465 100644
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
+++ b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
@@ -50,7 +50,9 @@ if (my.isFixingActive()) {
 form(method: "post", action: "${rootURL}/${my.url}/scan", name:"rekey") {
     f.submit(name: "background", value:_("Re-key in background now"))
     if (my.isScanOnBoot()) {
-        input(type: "button", class: "yui-button", disabled: "true", value:_("Re-keying currently scheduled during the next startup"))
+        button(type: "button", class: "jenkins-button jenkins-button--primary", disabled: "true") {
+            raw _("Re-keying currently scheduled during the next startup")
+        }
     } else {
         f.submit(name: "schedule", value:_("Schedule a re-key during the next startup"))
     }
diff --git a/core/src/main/resources/lib/form/repeatable/repeatable.js b/core/src/main/resources/lib/form/repeatable/repeatable.js
index 89f2d57b12d6..d985b92d0806 100644
--- a/core/src/main/resources/lib/form/repeatable/repeatable.js
+++ b/core/src/main/resources/lib/form/repeatable/repeatable.js
@@ -43,8 +43,7 @@ var repeatableSupport = {
     // importNode isn't supported in IE.
     // nc = document.importNode(node,true);
     var nc = document.createElement("div");
-    nc.className = "repeated-chunk";
-    nc.style.opacity = 0;
+    nc.className = "repeated-chunk fade-in";
     nc.setAttribute("name", this.name);
     nc.innerHTML = this.blockHTML;
     if (!addOnTop) {
@@ -60,15 +59,7 @@ var repeatableSupport = {
       registerSortableDragDrop(nc);
     }
 
-    new YAHOO.util.Anim(
-      nc,
-      {
-        opacity: { to: 1 },
-      },
-      0.2,
-      YAHOO.util.Easing.easeIn,
-    ).animate();
-
+    nc.classList.remove("fade-in");
     Behaviour.applySubtree(nc, true);
     this.update();
   },
@@ -126,24 +117,27 @@ var repeatableSupport = {
   // called when 'delete' button is clicked
   onDelete: function (n) {
     n = n.closest(".repeated-chunk");
-    var a = new YAHOO.util.Anim(
-      n,
-      {
-        opacity: { to: 0 },
-        height: { to: 0 },
-      },
-      0.2,
-      YAHOO.util.Easing.easeIn,
-    );
-    a.onComplete.subscribe(function () {
+    n.ontransitionend = function (evt) {
+      if (evt.pseudoElement || !n.parentNode) {
+        return;
+      }
       var p = n.parentNode;
       p.removeChild(n);
       if (p.tag) {
         p.tag.update();
       }
+
       layoutUpdateCallback.call();
-    });
-    a.animate();
+    };
+    if (isRunAsTest) {
+      // transition end not triggered in tests
+      n.ontransitionend.call(n, {});
+    }
+    n.style.maxHeight = n.offsetHeight + "px";
+    n.classList.add("fade-out");
+    setTimeout(() => {
+      n.style.maxHeight = "0";
+    }, 0);
   },
 
   // called when 'add' button is clicked
diff --git a/test/src/test/java/jenkins/security/Security3245Test.java b/test/src/test/java/jenkins/security/Security3245Test.java
index 9c9a37b46581..2202632b26e6 100644
--- a/test/src/test/java/jenkins/security/Security3245Test.java
+++ b/test/src/test/java/jenkins/security/Security3245Test.java
@@ -30,9 +30,9 @@ public class Security3245Test {
 
     @Issue("SECURITY-3245")
     @Test
-    public void captionCannotAttributeEscape() throws Exception {
+    public void captionCannotElementEscape() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject("p");
-        p.getBuildersList().add(new ExpandableDetailsNoteTestAction("' onclick=alert(1) foo='bar", "<h1></h1>"));
+        p.getBuildersList().add(new ExpandableDetailsNoteTestAction("<script>alert(1)</script>", "<h1></h1>"));
         FreeStyleBuild build = j.buildAndAssertSuccess(p);
 
         AtomicBoolean alerts = new AtomicBoolean();
@@ -40,12 +40,9 @@ public void captionCannotAttributeEscape() throws Exception {
             wc.setAlertHandler((pr, s) -> alerts.set(true));
             final HtmlPage page = wc.goTo(build.getUrl() + "console");
             String content = page.getWebResponse().getContentAsString();
-            assertThat(content, containsString("<input type=button value='&#39; onclick=alert(1) foo=&#39;bar' class='reveal-expandable-detail'>"));
-
-            // Execute JavaScript code to simulate click event
-            String jsCode = "document.querySelector('.reveal-expandable-detail').dispatchEvent(new MouseEvent('click'));";
-            page.executeJavaScript(jsCode);
-
+            assertThat(content, containsString("<button type='button' class='jenkins-button " +
+                    "reveal-expandable-detail'>&lt;script&gt;alert(1)&lt;/script&gt;</button>"));
+            // check that alert was not executed
             Assert.assertFalse("Alert not expected", alerts.get());
         }
     }
diff --git a/war/src/main/js/components/dropdowns/hetero-list.js b/war/src/main/js/components/dropdowns/hetero-list.js
index 2b216bc20168..0eab2b9ea324 100644
--- a/war/src/main/js/components/dropdowns/hetero-list.js
+++ b/war/src/main/js/components/dropdowns/hetero-list.js
@@ -77,11 +77,10 @@ function generateButtons() {
 
       function insert(instance, template) {
         let nc = document.createElement("div");
-        nc.className = "repeated-chunk";
+        nc.className = "repeated-chunk fade-in";
         nc.setAttribute("name", template.name);
         nc.setAttribute("descriptorId", template.descriptorId);
         nc.innerHTML = template.html;
-        nc.style.opacity = "0";
 
         instance.hide();
 
@@ -150,18 +149,9 @@ function generateButtons() {
             if (withDragDrop) {
               registerSortableDragDrop(nc);
             }
-
-            new YAHOO.util.Anim(
-              nc,
-              {
-                opacity: { to: 1 },
-              },
-              0.2,
-              YAHOO.util.Easing.easeIn,
-            ).animate();
-
             Behaviour.applySubtree(nc, true);
             ensureVisible(nc);
+            nc.classList.remove("fade-in");
             layoutUpdateCallback.call();
           },
           true,
diff --git a/war/src/main/scss/form/_reorderable-list.scss b/war/src/main/scss/form/_reorderable-list.scss
index c19152975d2e..7cd726556df1 100644
--- a/war/src/main/scss/form/_reorderable-list.scss
+++ b/war/src/main/scss/form/_reorderable-list.scss
@@ -7,6 +7,14 @@
   border-radius: 10px;
   margin-bottom: 1rem;
   margin-top: 1rem;
+  transition:
+    opacity 0.2s ease-in,
+    max-height 0.2s ease-in;
+}
+
+.repeated-chunk.fade-in,
+.repeated-chunk.fade-out {
+  opacity: 0;
 }
 
 .repeated-chunk .show-if-last {
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index ff6a506e77f6..8d1a0a9e8e8a 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1661,7 +1661,8 @@ function rowvgStartEachRow(recursive, f) {
         }
       }
       changeTo(e, "-hover.png");
-      YAHOO.util.Event.stopEvent(event);
+      event.stopPropagation();
+      event.preventDefault();
       return false;
     };
     e = null; // memory leak prevention
diff --git a/war/src/main/webapp/scripts/sortable.js b/war/src/main/webapp/scripts/sortable.js
index 7b4b9e8f4da8..b42be9ee945b 100644
--- a/war/src/main/webapp/scripts/sortable.js
+++ b/war/src/main/webapp/scripts/sortable.js
@@ -133,16 +133,14 @@ var Sortable = (function () {
      */
     getStoredPreference: function () {
       var key = this.getStorageKey();
-      if (storage.hasKey(key)) {
-        var val = storage.getItem(key);
-        if (val) {
-          var vals = val.split(":");
-          if (vals.length == 2) {
-            return {
-              column: parseInt(vals[0]),
-              direction: arrowTable[vals[1]],
-            };
-          }
+      var val = sessionStorage.getItem(key);
+      if (val) {
+        var vals = val.split(":");
+        if (vals.length == 2) {
+          return {
+            column: parseInt(vals[0]),
+            direction: arrowTable[vals[1]],
+          };
         }
       }
       return null;
@@ -156,7 +154,13 @@ var Sortable = (function () {
 
     savePreference: function () {
       var key = this.getStorageKey();
-      storage.setItem(key, this.pref.column + ":" + this.pref.direction.id);
+      var value = this.pref.column + ":" + this.pref.direction.id;
+      try {
+        sessionStorage.setItem(key, value);
+      } catch (e) {
+        // storage could be full
+        console.warn(e);
+      }
     },
 
     /**
@@ -442,29 +446,6 @@ var Sortable = (function () {
     },
   };
 
-  var storage;
-  try {
-    storage = YAHOO.util.StorageManager.get(
-      YAHOO.util.StorageEngineHTML5.ENGINE_NAME,
-      YAHOO.util.StorageManager.LOCATION_SESSION,
-      {
-        order: [YAHOO.util.StorageEngineGears],
-      },
-    );
-    // eslint-disable-next-line no-unused-vars
-  } catch (e) {
-    // no storage available
-    storage = {
-      setItem: function () {},
-      getItem: function () {
-        return null;
-      },
-      hasKey: function () {
-        return false;
-      },
-    };
-  }
-
   return {
     Sortable: Sortable,
     sorter: sorter,

From 713aa9a163fb335782966fa478761c0111e5eebf Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 18 Jun 2024 13:25:00 +0000
Subject: [PATCH 147/449] [maven-release-plugin] prepare release jenkins-2.463

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 49f9c739fdc4..78c40469cb02 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.463</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..5a5d7580886a 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.463</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..3db7d34a5638 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.463</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..0a406e6b8755 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.463</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index e6b8c18d5ec1..9d90885d4911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.463</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.463</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.463</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-06-11T13:29:41Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-18T10:33:53Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 6e7ed30ed48d..2be027c3043c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.463</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index a3e8b90c7017..06b53fa77b4f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.463</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..842dc35d6b3e 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.463</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..3d8a2eb742bc 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.463</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 61a8c3656e8bcb627c54581fab21a2f96e8891ff Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 18 Jun 2024 13:25:19 +0000
Subject: [PATCH 148/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 78c40469cb02..49f9c739fdc4 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.463</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 5a5d7580886a..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.463</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 3db7d34a5638..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.463</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 0a406e6b8755..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.463</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 9d90885d4911..f8cf93333e39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.463</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.463</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.463</revision>
+    <revision>2.464</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-06-18T10:33:53Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-18T13:25:00Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 2be027c3043c..6e7ed30ed48d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.463</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 06b53fa77b4f..a3e8b90c7017 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.463</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 842dc35d6b3e..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.463</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 3d8a2eb742bc..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.463</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From c674d94e29784ea35973fd11e3ed8f8aa0888356 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:05:16 -0700
Subject: [PATCH 149/449] Bump org.springframework.security:spring-security-bom
 from 5.8.12 to 5.8.13 (#9398)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 49f9c739fdc4..ce0ee8c65d3a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -64,7 +64,7 @@ THE SOFTWARE.
         <!-- https://docs.spring.io/spring-security/site/docs/5.5.4/reference/html5/#getting-maven-no-boot -->
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-bom</artifactId>
-        <version>5.8.12</version>
+        <version>5.8.13</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From 7d5b8ec036903f4e2d8a3b2dfe8c4525eab3d608 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 09:11:06 +0100
Subject: [PATCH 150/449] Update dependency globals to v15.5.0 (#9402)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index fbf719af81f9..b1ed23a51351 100644
--- a/war/package.json
+++ b/war/package.json
@@ -34,7 +34,7 @@
     "eslint": "9.5.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.4.0",
+    "globals": "15.5.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",
diff --git a/war/yarn.lock b/war/yarn.lock
index 0befa953b6cb..3b3a1c69b54d 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3983,10 +3983,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.4.0":
-  version: 15.4.0
-  resolution: "globals@npm:15.4.0"
-  checksum: 10c0/19041b8fd49deb154e1cb706c82756ab7184c8ae3495aab183efcad9edd1b6320cc54af1a9110d8699245bef124834b004a8156ca988ba7814c25ec71a43f6a4
+"globals@npm:15.5.0":
+  version: 15.5.0
+  resolution: "globals@npm:15.5.0"
+  checksum: 10c0/f13c3cb0c6d49b9d23e447b86e33ca6139753087060c3063863c0dd2b5d79f4a114c48d20e321916e6c3701adb3f6b67d6ac8d8ed2bae6da45482c968532d4e2
   languageName: node
   linkType: hard
 
@@ -4406,7 +4406,7 @@ __metadata:
     eslint: "npm:9.5.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.4.0"
+    globals: "npm:15.5.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"

From 5200591ad81e37703c5809614b041178afed0e82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 08:55:02 -0700
Subject: [PATCH 151/449] Bump softprops/action-gh-release from 2.0.5 to 2.0.6
 (#9406)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/publish-release-artifact.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-release-artifact.yml b/.github/workflows/publish-release-artifact.yml
index 31854bf8266f..04e3d0aa993e 100644
--- a/.github/workflows/publish-release-artifact.yml
+++ b/.github/workflows/publish-release-artifact.yml
@@ -73,7 +73,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@69320dbe05506a9a39fc8ae11030b214ec2d1f87
+        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -108,7 +108,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-deb
         if: always()
-        uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87
+        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -144,7 +144,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-rpm
         if: always()
-        uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87
+        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -180,7 +180,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-msi
         if: always()
-        uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87
+        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -216,7 +216,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-suse-rpm
         if: always()
-        uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87
+        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

From 2f56764b864af4b54372dd0bd56d64316d60cfb6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 20:55:02 +0200
Subject: [PATCH 152/449] Update dependency globals to v15.6.0 (#9404)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index b1ed23a51351..ca6f41355d31 100644
--- a/war/package.json
+++ b/war/package.json
@@ -34,7 +34,7 @@
     "eslint": "9.5.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.5.0",
+    "globals": "15.6.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",
diff --git a/war/yarn.lock b/war/yarn.lock
index 3b3a1c69b54d..35b7e1a44158 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3983,10 +3983,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.5.0":
-  version: 15.5.0
-  resolution: "globals@npm:15.5.0"
-  checksum: 10c0/f13c3cb0c6d49b9d23e447b86e33ca6139753087060c3063863c0dd2b5d79f4a114c48d20e321916e6c3701adb3f6b67d6ac8d8ed2bae6da45482c968532d4e2
+"globals@npm:15.6.0":
+  version: 15.6.0
+  resolution: "globals@npm:15.6.0"
+  checksum: 10c0/ba488ec5bd770336a3e1ffec3f718077768aec99e16f30c33c0eeaed09e0b93fa06a24fc0d3844d1d81a678c86d22f04547703e87e2e4353601eddcb800479ec
   languageName: node
   linkType: hard
 
@@ -4406,7 +4406,7 @@ __metadata:
     eslint: "npm:9.5.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.5.0"
+    globals: "npm:15.6.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"

From 252b7dce8a96257c28e8946b338efc78bb489f6b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 07:46:41 +0100
Subject: [PATCH 153/449] Update dependency sass to v1.77.6 (#9407)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index ca6f41355d31..46fb9f5f6736 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.2",
-    "sass": "1.77.5",
+    "sass": "1.77.6",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.6.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index 35b7e1a44158..d4860cfa2b22 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4418,7 +4418,7 @@ __metadata:
     postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.2"
-    sass: "npm:1.77.5"
+    sass: "npm:1.77.6"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6375,16 +6375,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.5":
-  version: 1.77.5
-  resolution: "sass@npm:1.77.5"
+"sass@npm:1.77.6":
+  version: 1.77.6
+  resolution: "sass@npm:1.77.6"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/9da049b0a3fadab419084d6becdf471e107cf6e3c8ac87cabea2feb845afac75e86c99e06ee721a5aa4f6a2d833ec5380137c4e540ab2f760edf1e4eb6139e69
+  checksum: 10c0/fe5a393c0aa29eda9f83c06be9b94788b61fe8bad0616ee6e3a25d21ab504f430d40c0064fdca89b02b8e426411ae6dcd906c91f2e48c263575c3d392b6daeb1
   languageName: node
   linkType: hard
 

From 83044f3b24fb18b2a9adb5c177110439b19b0edf Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 22 Jun 2024 05:15:34 -0700
Subject: [PATCH 154/449] Remove duplicate Enforcer configuration (#9408)

---
 war/pom.xml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index a3e8b90c7017..de3696dd3245 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -719,30 +719,6 @@ THE SOFTWARE.
       </activation>
       <build>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <!-- Version specified in grandparent POM -->
-            <executions>
-              <execution>
-                <id>enforce-versions</id>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <requireMavenVersion>
-                      <version>3.1.0</version>
-                    </requireMavenVersion>
-                    <requireJavaVersion>
-                      <!-- let's encrypt certs used for https://updates.jenkins.io -->
-                      <version>[1.8.0-101,]</version>
-                    </requireJavaVersion>
-                  </rules>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>

From e3540f50b7fbb4135173516d0de3fc6f878c7e35 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 08:31:58 +0100
Subject: [PATCH 155/449] Update dependency node to v20.15.0 (#9414)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index de3696dd3245..29fdb1a5ead2 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -47,7 +47,7 @@ THE SOFTWARE.
     <!-- HTTP listener port -->
     <port>8080</port>
     <mina-sshd-api.version>2.12.1-113.v4d3ea_5eb_7f72</mina-sshd-api.version>
-    <node.version>20.14.0</node.version>
+    <node.version>20.15.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->

From a369f97e6865f0a611096d3644d5e0785205549e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 06:00:52 -0600
Subject: [PATCH 156/449] Update Yarn to v4.3.1 (#9416)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/package.json b/war/package.json
index 46fb9f5f6736..74c799ec9f04 100644
--- a/war/package.json
+++ b/war/package.json
@@ -65,5 +65,5 @@
     "defaults",
     "not IE 11"
   ],
-  "packageManager": "yarn@4.3.0"
+  "packageManager": "yarn@4.3.1"
 }

From 654cfd47d395ab0a5c5b2e626d869ca90dcdaa61 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 06:01:17 -0600
Subject: [PATCH 157/449] Update dependency stylelint-config-standard to
 v36.0.1 (#9417)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/war/package.json b/war/package.json
index 74c799ec9f04..a19d4a27e6dc 100644
--- a/war/package.json
+++ b/war/package.json
@@ -47,7 +47,7 @@
     "style-loader": "4.0.0",
     "stylelint": "16.6.1",
     "stylelint-checkstyle-reporter": "1.0.0",
-    "stylelint-config-standard": "36.0.0",
+    "stylelint-config-standard": "36.0.1",
     "webpack": "5.92.0",
     "webpack-cli": "5.1.4",
     "webpack-remove-empty-scripts": "1.0.4"
diff --git a/war/yarn.lock b/war/yarn.lock
index d4860cfa2b22..5a447219167c 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4424,7 +4424,7 @@ __metadata:
     style-loader: "npm:4.0.0"
     stylelint: "npm:16.6.1"
     stylelint-checkstyle-reporter: "npm:1.0.0"
-    stylelint-config-standard: "npm:36.0.0"
+    stylelint-config-standard: "npm:36.0.1"
     tippy.js: "npm:6.3.7"
     webpack: "npm:5.92.0"
     webpack-cli: "npm:5.1.4"
@@ -6661,23 +6661,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint-config-recommended@npm:^14.0.0":
-  version: 14.0.0
-  resolution: "stylelint-config-recommended@npm:14.0.0"
+"stylelint-config-recommended@npm:^14.0.1":
+  version: 14.0.1
+  resolution: "stylelint-config-recommended@npm:14.0.1"
   peerDependencies:
-    stylelint: ^16.0.0
-  checksum: 10c0/4ad15c36e8c03291aa7bbe4b672ebfb0f46ab698e7580a0da8d29644046d102d7f31dbf00a2a6eab94b565c390c6fb0d5d528737b83ac3acf6dc2ef085a90b11
+    stylelint: ^16.1.0
+  checksum: 10c0/a0a0ecd91f4d193bbe2cc3408228f8a2d8fcb2b2578d77233f86780c9247c796a04e16aad7a91d97cb918e2de34b6a8062bab66ee017c3835d855081d94f4828
   languageName: node
   linkType: hard
 
-"stylelint-config-standard@npm:36.0.0":
-  version: 36.0.0
-  resolution: "stylelint-config-standard@npm:36.0.0"
+"stylelint-config-standard@npm:36.0.1":
+  version: 36.0.1
+  resolution: "stylelint-config-standard@npm:36.0.1"
   dependencies:
-    stylelint-config-recommended: "npm:^14.0.0"
+    stylelint-config-recommended: "npm:^14.0.1"
   peerDependencies:
     stylelint: ^16.1.0
-  checksum: 10c0/1fc9adddfc5cf0a1d7a443182a0731712a3950ace72a24081b4ede2b0bb6fc1eebd003c009f1d8d06c3a64ba9b31b0ed12512db2f91c8fa549238d8341580e4b
+  checksum: 10c0/7f9b954694358e77be5110418f31335be579ce59dd952bc3c6a9449265297db3170ec520e0905769253b48b99c3109a95c71f5b985bf402e48fd6c89b5364cb2
   languageName: node
   linkType: hard
 

From b00c2ad2ff2a4ccb5369225ffa707e6ef50ac813 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 24 Jun 2024 18:12:52 +0100
Subject: [PATCH 158/449] Align font weights and font sizes (#9393)

* Init

* Update _theme.scss

* Update _theme.scss

* Update _style.scss

* Update _tooltips.scss
---
 war/src/main/scss/abstracts/_theme.scss     | 4 ++--
 war/src/main/scss/base/_style.scss          | 2 +-
 war/src/main/scss/components/_dialogs.scss  | 6 +++---
 war/src/main/scss/components/_spinner.scss  | 4 ++--
 war/src/main/scss/components/_table.scss    | 5 ++---
 war/src/main/scss/components/_tabs.scss     | 4 ++--
 war/src/main/scss/components/_tooltips.scss | 2 +-
 war/src/main/scss/form/_search-bar.scss     | 5 ++---
 war/src/main/scss/pages/_about.scss         | 4 ++--
 war/src/main/scss/pages/_dashboard.scss     | 2 +-
 war/src/main/scss/pages/_icon-legend.scss   | 2 +-
 11 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss
index bb272b106323..8bb1a6024169 100644
--- a/war/src/main/scss/abstracts/_theme.scss
+++ b/war/src/main/scss/abstracts/_theme.scss
@@ -39,7 +39,7 @@ $semantics: (
   --font-size-base: 1rem; // 16px
   --font-size-sm: 0.875rem; // 14px
   --font-size-xs: 0.75rem; // 12px
-  --font-size-monospace: 0.95em;
+  --font-size-monospace: 1em;
 
   // Line height
   --line-height-base: 1.5;
@@ -197,7 +197,7 @@ $semantics: (
   --link-text-decoration: none;
   --link-text-decoration--hover: underline;
   --link-text-decoration--active: underline;
-  --link-font-weight: 500;
+  --link-font-weight: 450;
 
   // Tooltips
   --tooltip-backdrop-filter: contrast(0.6) brightness(2.4) saturate(2)
diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss
index 780aa7dd35ff..e586248d18a8 100644
--- a/war/src/main/scss/base/_style.scss
+++ b/war/src/main/scss/base/_style.scss
@@ -155,7 +155,7 @@ pre {
   background-color: var(--pre-background);
   color: var(--pre-color);
   font-family: var(--font-family-mono);
-  font-weight: 500;
+  font-weight: 400;
   line-height: 1.66;
 
   a {
diff --git a/war/src/main/scss/components/_dialogs.scss b/war/src/main/scss/components/_dialogs.scss
index a53831e5acb1..3de2d0c883a0 100644
--- a/war/src/main/scss/components/_dialogs.scss
+++ b/war/src/main/scss/components/_dialogs.scss
@@ -19,8 +19,8 @@ $jenkins-dialog-padding: 1.3rem;
   }
 
   &__title {
-    font-size: 1.1rem;
-    font-weight: 600;
+    font-size: 1.125rem;
+    font-weight: 500;
     padding: 0 $jenkins-dialog-padding;
     color: var(--text-color);
   }
@@ -58,7 +58,7 @@ $jenkins-dialog-padding: 1.3rem;
 
   &__subtitle {
     font-size: 1rem;
-    font-weight: 600;
+    font-weight: 500;
     color: var(--text-color-secondary);
     padding: 0;
     margin: 0 0 1rem;
diff --git a/war/src/main/scss/components/_spinner.scss b/war/src/main/scss/components/_spinner.scss
index a538e89c355c..af5732ca8320 100644
--- a/war/src/main/scss/components/_spinner.scss
+++ b/war/src/main/scss/components/_spinner.scss
@@ -2,8 +2,8 @@
   position: relative;
   display: inline-flex;
   align-items: center;
-  font-size: 0.85rem;
-  font-weight: 600;
+  font-size: 0.875rem;
+  font-weight: 500;
   margin: 0;
 
   &::before,
diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss
index 73b033f0c1b6..126c05d6a12a 100644
--- a/war/src/main/scss/components/_table.scss
+++ b/war/src/main/scss/components/_table.scss
@@ -24,8 +24,8 @@
         padding-top: calc((var(--table-padding) * 1.7) - 7.5px);
         padding-bottom: calc((var(--table-padding) * 1.7) - 2.5px);
         padding-left: 1.6rem;
-        font-weight: 600;
-        font-size: 0.85rem;
+        font-weight: 500;
+        font-size: 0.875rem;
 
         &[align="center"] {
           text-align: center;
@@ -69,7 +69,6 @@
         background: var(--table-body-background);
         vertical-align: middle;
         padding: var(--table-padding) 0 var(--table-padding) 1.6rem;
-        font-weight: 500;
         height: 3rem;
 
         &:first-of-type {
diff --git a/war/src/main/scss/components/_tabs.scss b/war/src/main/scss/components/_tabs.scss
index 565d62e2f81a..a41b56109f4d 100644
--- a/war/src/main/scss/components/_tabs.scss
+++ b/war/src/main/scss/components/_tabs.scss
@@ -28,8 +28,8 @@
   border-radius: 100px;
   background: var(--tabs-item-background);
   color: var(--tabs-item-foreground);
-  font-weight: 600;
-  font-size: 0.85rem;
+  font-weight: 500;
+  font-size: 0.875rem;
   transition: var(--standard-transition);
   cursor: pointer;
 
diff --git a/war/src/main/scss/components/_tooltips.scss b/war/src/main/scss/components/_tooltips.scss
index 80a030b8c9c3..d864f98bd941 100644
--- a/war/src/main/scss/components/_tooltips.scss
+++ b/war/src/main/scss/components/_tooltips.scss
@@ -3,7 +3,7 @@
   padding: 0.45rem 0.8rem;
   border-radius: 0.66rem;
   box-shadow: var(--tooltip-box-shadow);
-  font-weight: 550;
+  font-weight: 500;
   font-size: 0.75rem;
   line-height: 1.6;
   max-width: min(50vw, 1000px) !important;
diff --git a/war/src/main/scss/form/_search-bar.scss b/war/src/main/scss/form/_search-bar.scss
index 0a04e25b331c..ed552e85c987 100644
--- a/war/src/main/scss/form/_search-bar.scss
+++ b/war/src/main/scss/form/_search-bar.scss
@@ -21,7 +21,6 @@
       0 0 0 2px transparent,
       0 0 0 12px transparent;
     transition: var(--standard-transition);
-    font-weight: 450;
     height: var(--search-bar-height);
 
     &::placeholder {
@@ -142,7 +141,7 @@
     justify-content: center;
     transition: 0.25s ease;
     text-align: center;
-    font-size: 0.8em;
+    font-size: 0.6875rem;
     font-weight: 500;
     line-height: 1;
     color: var(--text-color-secondary);
@@ -257,7 +256,7 @@
     align-items: center;
     gap: 0.7rem;
     padding: 0.5rem 0.7rem;
-    font-size: 0.85rem;
+    font-size: 0.875rem;
     border-radius: 10px;
     color: var(--text-color);
     font-weight: 500;
diff --git a/war/src/main/scss/pages/_about.scss b/war/src/main/scss/pages/_about.scss
index 08be61408749..b39fc84e4cd9 100644
--- a/war/src/main/scss/pages/_about.scss
+++ b/war/src/main/scss/pages/_about.scss
@@ -124,13 +124,13 @@
 }
 
 .app-about-version {
-  font-weight: 600;
+  font-weight: 500;
   color: var(--text-color-secondary);
   margin: 0;
 }
 
 .app-about-paragraph {
-  font-size: 1.1rem;
+  font-size: 1.125rem;
   margin-bottom: var(--section-padding);
   font-weight: 500;
 }
diff --git a/war/src/main/scss/pages/_dashboard.scss b/war/src/main/scss/pages/_dashboard.scss
index cb029a9861a9..3ace60fac309 100644
--- a/war/src/main/scss/pages/_dashboard.scss
+++ b/war/src/main/scss/pages/_dashboard.scss
@@ -121,7 +121,7 @@ $min-button-size: 36px;
 
     &__label {
       color: var(--link-color);
-      font-weight: 600;
+      font-weight: 500;
       margin: 0;
       font-size: 1rem;
     }
diff --git a/war/src/main/scss/pages/_icon-legend.scss b/war/src/main/scss/pages/_icon-legend.scss
index 02cb37cff584..9d62a5c084aa 100644
--- a/war/src/main/scss/pages/_icon-legend.scss
+++ b/war/src/main/scss/pages/_icon-legend.scss
@@ -23,7 +23,7 @@
   dd {
     margin: 0;
     padding: 0;
-    font-size: 0.95rem;
+    font-size: 0.9375rem;
     font-weight: 500;
     line-height: 1.6;
   }

From b27fe8876a898dc6c21b9c2eafcc5264484f263c Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 24 Jun 2024 18:13:42 +0100
Subject: [PATCH 159/449] Refine table and tabs (#9411)

* Init

* Update _table.scss
---
 war/src/main/scss/abstracts/_theme.scss  |  4 ++--
 war/src/main/scss/components/_table.scss | 21 ++++++++++++++++-----
 war/src/main/scss/components/_tabs.scss  | 14 ++++++++++++--
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss
index 8bb1a6024169..cc21f1e8ab90 100644
--- a/war/src/main/scss/abstracts/_theme.scss
+++ b/war/src/main/scss/abstracts/_theme.scss
@@ -174,8 +174,8 @@ $semantics: (
   --table-header-foreground: var(--text-color);
   --table-body-background: var(--background);
   --table-body-foreground: var(--text-color);
-  --table-border-radius: 10px;
-  --table-row-border-radius: 4px;
+  --table-border-radius: 0.75rem;
+  --table-row-border-radius: 0.3125rem;
 
   // Deprecated
   --even-row-color: var(--very-light-grey);
diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss
index 126c05d6a12a..685b740de69a 100644
--- a/war/src/main/scss/components/_table.scss
+++ b/war/src/main/scss/components/_table.scss
@@ -3,14 +3,25 @@
 .jenkins-table {
   --table-padding: 0.55rem;
 
+  position: relative;
   width: 100%;
   background: var(--table-background);
-  border-radius: calc(var(--table-border-radius) + 2px);
-  border: 5px solid var(--table-background);
-  border-bottom-width: 3px;
+  border-radius: calc(var(--table-border-radius) + 4px);
+  border: 4px solid var(--table-background);
+  border-bottom-width: 2px;
   border-spacing: 0 2px;
+  background-clip: padding-box;
   margin-bottom: var(--section-padding);
 
+  &::before {
+    content: "";
+    position: absolute;
+    inset: -4px -4px -2px;
+    border: var(--card-border-width) solid var(--table-border-color);
+    border-radius: inherit;
+    pointer-events: none;
+  }
+
   * {
     -webkit-border-horizontal-spacing: 0;
     -webkit-border-vertical-spacing: 0;
@@ -21,8 +32,8 @@
       & > th {
         color: var(--table-header-foreground);
         text-align: left;
-        padding-top: calc((var(--table-padding) * 1.7) - 7.5px);
-        padding-bottom: calc((var(--table-padding) * 1.7) - 2.5px);
+        padding-top: calc(var(--table-padding) * 0.9);
+        padding-bottom: calc((var(--table-padding) * 0.9) + 2px);
         padding-left: 1.6rem;
         font-weight: 500;
         font-size: 0.875rem;
diff --git a/war/src/main/scss/components/_tabs.scss b/war/src/main/scss/components/_tabs.scss
index a41b56109f4d..0e54d9646a99 100644
--- a/war/src/main/scss/components/_tabs.scss
+++ b/war/src/main/scss/components/_tabs.scss
@@ -3,14 +3,24 @@
 }
 
 .tabBar {
+  position: relative;
   display: inline-flex;
   align-items: center;
   flex-wrap: wrap;
   background: var(--tabs-background);
   border-radius: var(--tabs-border-radius);
-  padding: 2.5px;
+  padding: 2px;
   margin-bottom: var(--section-padding);
 
+  &::before {
+    content: "";
+    position: absolute;
+    inset: 0;
+    border: var(--card-border-width) solid var(--tabs-border-color);
+    border-radius: inherit;
+    pointer-events: none;
+  }
+
   .tab {
     float: left;
   }
@@ -23,7 +33,7 @@
   justify-content: center;
   min-width: 3rem;
   text-decoration: none;
-  margin: 2.5px;
+  margin: 2px;
   padding: 0.4rem 1.2rem;
   border-radius: 100px;
   background: var(--tabs-item-background);

From 22b3a740da3415226378b5e09839b931989c770b Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 24 Jun 2024 10:13:58 -0700
Subject: [PATCH 160/449] Upgrade Remoting from 3248.v65ecb_254c298 to
 3256.v88a_f6e922152 (#9412)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f8cf93333e39..f5093719329a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>3248.v65ecb_254c298</remoting.version>
+    <remoting.version>3256.v88a_f6e922152</remoting.version>
     <!-- Minimum Remoting version, which is tested for API compatibility -->
     <remoting.minimum.supported.version>4.13</remoting.minimum.supported.version>
 

From bf45ad0c58d38de19264a70e5bbf4f673c48c12d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:14:23 -0600
Subject: [PATCH 161/449] Update dependency webpack to v5.92.1 (#9413)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index a19d4a27e6dc..56226d33d7a6 100644
--- a/war/package.json
+++ b/war/package.json
@@ -48,7 +48,7 @@
     "stylelint": "16.6.1",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
-    "webpack": "5.92.0",
+    "webpack": "5.92.1",
     "webpack-cli": "5.1.4",
     "webpack-remove-empty-scripts": "1.0.4"
   },
diff --git a/war/yarn.lock b/war/yarn.lock
index 5a447219167c..9878416cabf5 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4426,7 +4426,7 @@ __metadata:
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.1"
     tippy.js: "npm:6.3.7"
-    webpack: "npm:5.92.0"
+    webpack: "npm:5.92.1"
     webpack-cli: "npm:5.1.4"
     webpack-remove-empty-scripts: "npm:1.0.4"
     window-handle: "npm:1.0.1"
@@ -7075,9 +7075,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5.92.0":
-  version: 5.92.0
-  resolution: "webpack@npm:5.92.0"
+"webpack@npm:5.92.1":
+  version: 5.92.1
+  resolution: "webpack@npm:5.92.1"
   dependencies:
     "@types/eslint-scope": "npm:^3.7.3"
     "@types/estree": "npm:^1.0.5"
@@ -7108,7 +7108,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 10c0/588de5ce6f1e8fb4fec7300c2c36a8fc844fe71f4c871b06aca1a68553bea8f6479697615abb53cbbeb2e3859fc1b982f2f48ff23dd0e60024f69bb3d46d0712
+  checksum: 10c0/43ca7c76b9c1005bd85f05303d048f918bac10276a209e3ef5e359353fbfef4e5fcee876265e6bc305bf5ef326576e02df63bc7e5af878fb7f06d7e1795b811a
   languageName: node
   linkType: hard
 

From d8925acb0ed616c635e98c9cf0aacfc5fe712f2e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 11:53:34 +0100
Subject: [PATCH 162/449] Update jenkins/ath Docker tag to v5883 (#9418)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 3ab8d159b66e..36af3cea0e85 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5858.v4b_c4e3b_16099
+export ATH_VERSION=5883.vdea_99c1762a_d
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From 9581d4dc55e6f78c282434e9d735a0b39f07475c Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 25 Jun 2024 13:25:01 +0000
Subject: [PATCH 163/449] [maven-release-plugin] prepare release jenkins-2.464

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index ce0ee8c65d3a..46582a7043e8 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.464</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..904b27c34120 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.464</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..721149b14204 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.464</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..1499bede4de0 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.464</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index f5093719329a..742db15fbab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.464</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.464</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.464</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-06-18T13:25:00Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-25T10:33:33Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 6e7ed30ed48d..634f1ec57a88 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.464</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 29fdb1a5ead2..ef90e4e3de1a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.464</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..5435420cae49 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.464</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..982136f144ca 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.464</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 174c3b39a83bccdaa24519959f0ff22b7010c450 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 25 Jun 2024 13:25:26 +0000
Subject: [PATCH 164/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 46582a7043e8..ce0ee8c65d3a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.464</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 904b27c34120..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.464</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 721149b14204..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.464</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 1499bede4de0..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.464</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 742db15fbab8..0c0170e25a29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.464</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.464</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.464</revision>
+    <revision>2.465</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-06-25T10:33:33Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-06-25T13:25:02Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 634f1ec57a88..6e7ed30ed48d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.464</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index ef90e4e3de1a..29fdb1a5ead2 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.464</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 5435420cae49..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.464</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 982136f144ca..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.464</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 15272668146027ed04342f58d1f7f03d3088e13a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 13:02:49 -0700
Subject: [PATCH 165/449] Bump org.jenkins-ci.plugins:credentials from
 1337.v60b_d7b_c7b_c9f to 1344.v5a_3f65a_1e173 (#9420)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 6e7ed30ed48d..94aead25a272 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -222,7 +222,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1337.v60b_d7b_c7b_c9f</version>
+      <version>1344.v5a_3f65a_1e173</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 4761c15de9561a584102056558eff3ce4819aa6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 13:03:12 -0700
Subject: [PATCH 166/449] Bump org.jenkins-ci.plugins:structs from
 337.v1b_04ea_4df7c8 to 338.v848422169819 (#9419)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 94aead25a272..c85e96622f3d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -252,7 +252,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>structs</artifactId>
-      <version>337.v1b_04ea_4df7c8</version>
+      <version>338.v848422169819</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 29fdb1a5ead2..7ae056503c8f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -409,7 +409,7 @@ THE SOFTWARE.
                   <!-- dependency of scm-api and workflow-step-api -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>structs</artifactId>
-                  <version>337.v1b_04ea_4df7c8</version>
+                  <version>338.v848422169819</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 2336ac5ffac2a06d4377a7c7623d95311dc8ea46 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 28 Jun 2024 16:54:02 -0700
Subject: [PATCH 167/449] Upgrade HtmlUnit from 4.2.0 to 4.3.0 (#9423)

---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index c85e96622f3d..e02259d50830 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,7 +147,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2225.v04fa_3929c9b_5</version>
+      <version>2225.2227.vfc00092c557a_</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 87a8ef6ee8d94fd97b517bd8d668ea6c8f782066 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:02:14 -0700
Subject: [PATCH 168/449] Bump org.jenkins-ci:jenkins from 1.116 to 1.117
 (#9426)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0c0170e25a29..92ee48aaf9f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.116</version>
+    <version>1.117</version>
     <relativePath />
   </parent>
 

From fb4eeecd737715551a4cd22459f5d3a59425c6fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:03:05 -0700
Subject: [PATCH 169/449] Bump org.jenkins-ci.plugins:credentials from
 1344.v5a_3f65a_1e173 to 1350.v1b_df4d227d1b_ (#9425)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index e02259d50830..06647be7d443 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -222,7 +222,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1344.v5a_3f65a_1e173</version>
+      <version>1350.v1b_df4d227d1b_</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From dd7a6874e6704bb7163a98c728b3b11a78be53f6 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:43:58 +0000
Subject: [PATCH 170/449] [maven-release-plugin] prepare release jenkins-2.465

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 92ee48aaf9f6..1e87b7806267 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.465</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.465</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-06-25T13:25:02Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-02T10:33:29Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>

From d0e050b90f6926f2e56d7e634deed2bc57d83d54 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:44:19 +0000
Subject: [PATCH 171/449] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1e87b7806267..829754f3a871 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.465</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.465</revision>
+    <revision>2.466-SNAPSHOT</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-02T10:33:29Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-02T13:43:58Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>

From 292a58c7d09861f026decfd81f88fd8865acd9b0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 07:53:00 -0700
Subject: [PATCH 172/449] Update eslint monorepo to v9.6.0 (#9427)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 56 ++++++++++++++++++++++++------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/war/package.json b/war/package.json
index 56226d33d7a6..4cba67ddcd95 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.24.7",
     "@babel/core": "7.24.7",
     "@babel/preset-env": "7.24.7",
-    "@eslint/js": "9.5.0",
+    "@eslint/js": "9.6.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.5.0",
+    "eslint": "9.6.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.6.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 9878416cabf5..4ef98df584ab 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1855,14 +1855,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-array@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "@eslint/config-array@npm:0.16.0"
+"@eslint/config-array@npm:^0.17.0":
+  version: 0.17.0
+  resolution: "@eslint/config-array@npm:0.17.0"
   dependencies:
     "@eslint/object-schema": "npm:^2.1.4"
     debug: "npm:^4.3.1"
-    minimatch: "npm:^3.0.5"
-  checksum: 10c0/b9d04409151dc95ec6b5e04e1e185a808d58e18cfc7340adc1e9420a5ff15843a0a308fb2cd9a2b354652885c2bebbcd5515814e93e9c9133f423891b6e53c70
+    minimatch: "npm:^3.1.2"
+  checksum: 10c0/97eb23ef0948dbc5f24884a3b75c537ca37ee2b1f27a864cd0d9189c089bc1a724dc6e1a4d9b7dd304d9f732ca02aa7916243a7715d6f1f17159d8a8c83f0c9e
   languageName: node
   linkType: hard
 
@@ -1883,10 +1883,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.5.0":
-  version: 9.5.0
-  resolution: "@eslint/js@npm:9.5.0"
-  checksum: 10c0/dacf51ec2d5b4c8d1315d21a0ff761235d9e39b2391cb945138c58dc512a6c18949c40b644235f5c4fdf5b637ef8f881214acc496dddf46b718529bf22af42ac
+"@eslint/js@npm:9.6.0":
+  version: 9.6.0
+  resolution: "@eslint/js@npm:9.6.0"
+  checksum: 10c0/83967a7e59f2e958c9bbb3acd0929cad00d59d927ad786ed8e0d30b07f983c6bea3af6f4ad32da32145db40b7a741a816ba339bdd8960fc7fc8231716d943b7f
   languageName: node
   linkType: hard
 
@@ -2445,12 +2445,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.11.3, acorn@npm:^8.7.1, acorn@npm:^8.8.2":
-  version: 8.11.3
-  resolution: "acorn@npm:8.11.3"
+"acorn@npm:^8.12.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2":
+  version: 8.12.0
+  resolution: "acorn@npm:8.12.0"
   bin:
     acorn: bin/acorn
-  checksum: 10c0/3ff155f8812e4a746fee8ecff1f227d527c4c45655bb1fad6347c3cb58e46190598217551b1500f18542d2bbe5c87120cb6927f5a074a59166fbdd9468f0a299
+  checksum: 10c0/a19f9dead009d3b430fa3c253710b47778cdaace15b316de6de93a68c355507bc1072a9956372b6c990cbeeb167d4a929249d0faeb8ae4bb6911d68d53299549
   languageName: node
   linkType: hard
 
@@ -3541,15 +3541,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.5.0":
-  version: 9.5.0
-  resolution: "eslint@npm:9.5.0"
+"eslint@npm:9.6.0":
+  version: 9.6.0
+  resolution: "eslint@npm:9.6.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
-    "@eslint/config-array": "npm:^0.16.0"
+    "@eslint/config-array": "npm:^0.17.0"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.5.0"
+    "@eslint/js": "npm:9.6.0"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3560,7 +3560,7 @@ __metadata:
     escape-string-regexp: "npm:^4.0.0"
     eslint-scope: "npm:^8.0.1"
     eslint-visitor-keys: "npm:^4.0.0"
-    espree: "npm:^10.0.1"
+    espree: "npm:^10.1.0"
     esquery: "npm:^1.5.0"
     esutils: "npm:^2.0.2"
     fast-deep-equal: "npm:^3.1.3"
@@ -3581,18 +3581,18 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/1c83d94ccfd6d97474aaaf463714eba7afa040639ad9191db430d34e9e2851ba14510651de69b52f26ee30611caf0fa4c66b3fb73bb71df6ab10cef5bb44bb32
+  checksum: 10c0/82ea5ad3f28aaef89e2a98f4e6df0eae9d4e16ccd6d667c69977042e0b103fa5df98bf16d3df72d1ae77edd8c1dccfdf4afa2a55309aa8081a1bc54af6229826
   languageName: node
   linkType: hard
 
-"espree@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "espree@npm:10.0.1"
+"espree@npm:^10.0.1, espree@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "espree@npm:10.1.0"
   dependencies:
-    acorn: "npm:^8.11.3"
+    acorn: "npm:^8.12.0"
     acorn-jsx: "npm:^5.3.2"
     eslint-visitor-keys: "npm:^4.0.0"
-  checksum: 10c0/7c0f84afa0f9db7bb899619e6364ed832ef13fe8943691757ddde9a1805ae68b826ed66803323015f707a629a5507d0d290edda2276c25131fe0ad883b8b5636
+  checksum: 10c0/52e6feaa77a31a6038f0c0e3fce93010a4625701925b0715cd54a2ae190b3275053a0717db698697b32653788ac04845e489d6773b508d6c2e8752f3c57470a0
   languageName: node
   linkType: hard
 
@@ -4398,12 +4398,12 @@ __metadata:
     "@babel/cli": "npm:7.24.7"
     "@babel/core": "npm:7.24.7"
     "@babel/preset-env": "npm:7.24.7"
-    "@eslint/js": "npm:9.5.0"
+    "@eslint/js": "npm:9.6.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.5.0"
+    eslint: "npm:9.6.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.6.0"
@@ -4857,7 +4857,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
+"minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
   dependencies:

From 2f8424c0d7248ab7d78f0a2d70971f2129a7144e Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 2 Jul 2024 07:53:14 -0700
Subject: [PATCH 173/449] [JENKINS-73381] Downloading `tar.gz` artifacts in
 Firefox is broken (#9428)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 829754f3a871..e1ac9bc151cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
-    <winstone.version>6.20</winstone.version>
+    <winstone.version>6.21</winstone.version>
   </properties>
 
   <!--

From 4bfdcd7f9a07ea01d2bb70eb2474c2203cba9442 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 08:03:27 -0700
Subject: [PATCH 174/449] Bump org.jenkins-ci:jenkins from 1.117 to 1.118
 (#9430)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e1ac9bc151cd..53843c7837cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.117</version>
+    <version>1.118</version>
     <relativePath />
   </parent>
 
@@ -73,7 +73,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.466-SNAPSHOT</revision>
+    <revision>2.466</revision>
     <changelist>-SNAPSHOT</changelist>
     <project.build.outputTimestamp>2024-07-02T13:43:58Z</project.build.outputTimestamp>
 

From 0f9daf95bf871a4223a9b04e12eaa405bdd56801 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:29:58 +0000
Subject: [PATCH 175/449] [maven-release-plugin] prepare release jenkins-2.466

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index ce0ee8c65d3a..c72ee63f1ee0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.466</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..4161614cd2ce 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.466</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..29265a8b54cb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.466</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..9827cf240b9e 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.466</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 53843c7837cb..69bae38b5902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.466</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.466</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.466</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-02T13:43:58Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-02T15:19:55Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 06647be7d443..38a98aad0475 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.466</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 7ae056503c8f..753b2f41932d 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.466</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..f352df4bb2e2 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.466</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..85b30d566cfd 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.466</version>
     <relativePath>../..</relativePath>
   </parent>
 

From e022cb37cc03538b4f65de8e38c14bf6cc9abe50 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 2 Jul 2024 18:30:22 +0000
Subject: [PATCH 176/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index c72ee63f1ee0..ce0ee8c65d3a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.466</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 4161614cd2ce..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.466</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 29265a8b54cb..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.466</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 9827cf240b9e..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.466</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 69bae38b5902..6e0b0dd81212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.466</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.466</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.466</revision>
+    <revision>2.467</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-02T15:19:55Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-02T18:29:59Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 38a98aad0475..06647be7d443 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.466</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 753b2f41932d..7ae056503c8f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.466</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index f352df4bb2e2..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.466</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 85b30d566cfd..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.466</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From bfcf054223e666adcd123127b12d4ff19d704524 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 13:04:33 -0700
Subject: [PATCH 177/449] Bump org.jenkins-ci.plugins:credentials from
 1350.v1b_df4d227d1b_ to 1355.v46f52a_b_98d64 (#9431)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 06647be7d443..c4830c487cfc 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -222,7 +222,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1350.v1b_df4d227d1b_</version>
+      <version>1355.v46f52a_b_98d64</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 2e5bd996cb78cebc849091f16185c0225fc95fd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 08:05:30 -0700
Subject: [PATCH 178/449] Bump mina-sshd-api.version from
 2.12.1-113.v4d3ea_5eb_7f72 to 2.13.1-117.v2f1a_b_66ff91d (#9429)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 7ae056503c8f..1b1ea50a9a45 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -46,7 +46,7 @@ THE SOFTWARE.
     <host>localhost</host>
     <!-- HTTP listener port -->
     <port>8080</port>
-    <mina-sshd-api.version>2.12.1-113.v4d3ea_5eb_7f72</mina-sshd-api.version>
+    <mina-sshd-api.version>2.13.1-117.v2f1a_b_66ff91d</mina-sshd-api.version>
     <node.version>20.15.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>

From 026d486a4fe06b2a86131a5733ba286055028ead Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 08:05:52 -0700
Subject: [PATCH 179/449] Update dependency postcss to v8.4.39 (#9432)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/war/package.json b/war/package.json
index 4cba67ddcd95..de467318cd00 100644
--- a/war/package.json
+++ b/war/package.json
@@ -37,7 +37,7 @@
     "globals": "15.6.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
-    "postcss": "8.4.38",
+    "postcss": "8.4.39",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "9.5.14",
     "postcss-scss": "4.0.9",
diff --git a/war/yarn.lock b/war/yarn.lock
index 4ef98df584ab..abd0aeb78e1f 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4413,7 +4413,7 @@ __metadata:
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.0"
-    postcss: "npm:8.4.38"
+    postcss: "npm:8.4.39"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:9.5.14"
     postcss-scss: "npm:4.0.9"
@@ -6092,14 +6092,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.38, postcss@npm:^8.4.33, postcss@npm:^8.4.38":
-  version: 8.4.38
-  resolution: "postcss@npm:8.4.38"
+"postcss@npm:8.4.39, postcss@npm:^8.4.33, postcss@npm:^8.4.38":
+  version: 8.4.39
+  resolution: "postcss@npm:8.4.39"
   dependencies:
     nanoid: "npm:^3.3.7"
-    picocolors: "npm:^1.0.0"
+    picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06
+  checksum: 10c0/16f5ac3c4e32ee76d1582b3c0dcf1a1fdb91334a45ad755eeb881ccc50318fb8d64047de4f1601ac96e30061df203f0f2e2edbdc0bfc49b9c57bc9fb9bedaea3
   languageName: node
   linkType: hard
 

From 771ba79b4530fb899244fe40fe1272ca242b5bb9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 08:06:15 -0700
Subject: [PATCH 180/449] Update dependency postcss-preset-env to v9.5.15
 (#9433)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   2 +-
 war/yarn.lock    | 456 +++++++++++++++++++++++------------------------
 2 files changed, 229 insertions(+), 229 deletions(-)

diff --git a/war/package.json b/war/package.json
index de467318cd00..f25de535f85a 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.39",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "9.5.14",
+    "postcss-preset-env": "9.5.15",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.2",
     "sass": "1.77.6",
diff --git a/war/yarn.lock b/war/yarn.lock
index abd0aeb78e1f..640963e660f7 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1373,69 +1373,69 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.11"
+"@csstools/cascade-layer-name-parser@npm:^1.0.12":
+  version: 1.0.12
+  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.12"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.3
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/52ac8369877c8072ff5c111f656bd87e9a2a4b9e44e48fe005c26faeb6cffd83bfe2f463f4f385a2ae5cfe1f82bbf95d26ddaabca18b66c6b657c4fe1520fb43
+    "@csstools/css-parser-algorithms": ^2.7.0
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/5f92aefcbb3f4b660cf7b0db54f6a4ba21a32fa1b64ea4f050a6370233152d4f561ecf5c8e98ca231e73c16e0d9f75b20b0a65153e18b14957658c81e0f68213
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "@csstools/color-helpers@npm:4.2.0"
-  checksum: 10c0/3f1feac43c2ef35f38b3b06fe74e0acc130283d7efb6874f6624e45e178c1a7b3c7e39816c7421cddbffc2666430906aa6f0d3dd7c7209db1369c0afd4a29b1b
+"@csstools/color-helpers@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "@csstools/color-helpers@npm:4.2.1"
+  checksum: 10c0/72e11b186ad0f6019a9b4b3752e620fa798c2a40cf47e8cad565dff46e572c9342eb8cf804542d7886344a1e540555d77f20119ace6b2d8a45b6e5ef8a41685c
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "@csstools/css-calc@npm:1.2.2"
+"@csstools/css-calc@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "@csstools/css-calc@npm:1.2.3"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.3
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/6032b482764a11c1b882d7502928950ab11760044fa7a2c23ecee802002902f6ea8fca045ee2919302af5a5c399e7baa9f68dff001ac6246ac7fef48fb3f6df7
+    "@csstools/css-parser-algorithms": ^2.7.0
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/fb34767ea9638b837167bcecaf945bcc0c5e8f0d811067c4e8c7a57bc8f0955f61107b1ed5e017b95c54acacc8088473e5497a9986bee95b37ec92999e792871
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@csstools/css-color-parser@npm:2.0.2"
+"@csstools/css-color-parser@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@csstools/css-color-parser@npm:2.0.3"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.2.0"
-    "@csstools/css-calc": "npm:^1.2.2"
+    "@csstools/color-helpers": "npm:^4.2.1"
+    "@csstools/css-calc": "npm:^1.2.3"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.3
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/c5ae4ad78745e425dce56da9f1ab053fb4f7963399735df3303305b32123bed0b2237689c2e7e99da2c62387e3226c12ea85e70e275c4027c7507e4ac929bffa
+    "@csstools/css-parser-algorithms": ^2.7.0
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/d8860e6b9c65de4f90d4c21e4d66471fd858434cf63af80f812a900371343b753b86a256627e8bd024cb8903a6a0181d2d9c0c65ab5d78cf29d084a761e2adba
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.3":
-  version: 2.6.3
-  resolution: "@csstools/css-parser-algorithms@npm:2.6.3"
+"@csstools/css-parser-algorithms@npm:^2.6.3, @csstools/css-parser-algorithms@npm:^2.7.0":
+  version: 2.7.0
+  resolution: "@csstools/css-parser-algorithms@npm:2.7.0"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/6648fda75a1c08096320fb5c04fd13656a0168de13584d2795547fecfb26c2c7d8b3b1fb79ba7aa758714851e98bfbec20d89e28697f999f41f91133eafe4207
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/fb84fefdf37c41d170f81b687bf1ee1847a970e51cc1fe3a320e3eaf225383ae9a3c4eb6208b83357dfe18c5114353d780e0c65f05d86d6435e5a9ad9334c834
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "@csstools/css-tokenizer@npm:2.3.1"
-  checksum: 10c0/fed6619fb5108e109d4dd10b0e967035a92793bae8fb84544e1342058b6df4e306d9d075623e2201fe88831b1ada797aea3546a8d12229d2d81cd7a5dfee4444
+"@csstools/css-tokenizer@npm:^2.3.1, @csstools/css-tokenizer@npm:^2.3.2":
+  version: 2.3.2
+  resolution: "@csstools/css-tokenizer@npm:2.3.2"
+  checksum: 10c0/f7d0d8b3e9e2dcdc6547a387253a09dbbacaaffb5c8718bcd7f15dddeefdd441b73fc5f9fad3f03fabef3b37ec4b62be7ff79caab366427fa90eaf54cd8fc452
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.11":
-  version: 2.1.11
-  resolution: "@csstools/media-query-list-parser@npm:2.1.11"
+"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.12":
+  version: 2.1.12
+  resolution: "@csstools/media-query-list-parser@npm:2.1.12"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.6.3
-    "@csstools/css-tokenizer": ^2.3.1
-  checksum: 10c0/9bcd99f7d28ae3cdaba73fbbfef571b0393dd4e841f522cc796fe5161744f17e327ba1713dad3c481626fade1357c55890e3d365177abed50e857b69130a9be5
+    "@csstools/css-parser-algorithms": ^2.7.0
+    "@csstools/css-tokenizer": ^2.3.2
+  checksum: 10c0/7395cc710d8f54670c1e7a418a88dcf1ae726316272294ec645f6d79a8e931f5d390ba7ed5d0141d29ad7280cd447b8773143dc7676659413de79228130e1a65
   languageName: node
   linkType: hard
 
@@ -1451,46 +1451,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.16":
-  version: 3.0.16
-  resolution: "@csstools/postcss-color-function@npm:3.0.16"
+"@csstools/postcss-color-function@npm:^3.0.17":
+  version: 3.0.17
+  resolution: "@csstools/postcss-color-function@npm:3.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/41756a4601a3f1086290dab6ca92b54e201bd94637b54b439c66a04fd628a14e2a0bd1452ad294d2981e2f4bb306758fa5f44639b1c4332320435050749aa487
+  checksum: 10c0/6d347fc9fe65cb897c275c129103576e551b74a7c47a1a4dc8160da2fad7752bf51e3cfbff339f86b39c723efac33643168d2dfaac4d3624d072875d18a65a4b
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.16":
-  version: 2.0.16
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.16"
+"@csstools/postcss-color-mix-function@npm:^2.0.17":
+  version: 2.0.17
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/70cd5b291dd615e20e4475517bf0027c90c433241397a66866f89acedb12cb91f45552a162bdd1000636ec56f7d6a099b65e44fe100fd03228fc65f17cfae285
+  checksum: 10c0/ba9a406ebe4caba6709878ee26debb06780be5cbf4e6ab7e902d79ca6e21ec6a8409b9dc0a5ef36fc4bf54bf2bd8f9642b72da8d7939145f99dc40fedd2be9d2
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "@csstools/postcss-exponential-functions@npm:1.0.7"
+"@csstools/postcss-exponential-functions@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "@csstools/postcss-exponential-functions@npm:1.0.8"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2079c81c3437686ef432d88502fa3a13bf8a27b7af105b4c6c2eb8e779f14adc8967a5a3ed03271ab919eeaf999fc4489fe4b37d32a8f61ab3212439517bddcc
+  checksum: 10c0/6b049801fc1275b34f43ffbb915f447a54cbff7bf48ab0705c3ad1ffde055cb876c4dc24e7a9162cd65e219457328e298a673f6176446493db17cf7af6f90dc0
   languageName: node
   linkType: hard
 
@@ -1506,46 +1506,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.9"
+"@csstools/postcss-gamut-mapping@npm:^1.0.10":
+  version: 1.0.10
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.10"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/412ae1410f3fce240401576441637c2c4e71d1a54153ac9b7a991b3de7519c253d03e10db78b09872eb10b0776d7f960b442779efabc11332b5be6672163c836
+  checksum: 10c0/6c2dab6a84f81904bed89cb584bd9bc6a904b49a4fa315b17be65c7d68baefe592561ee439660d5602b7481bac3be9a93189dc45404764524495400f34c6b6e6
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.17":
-  version: 4.0.17
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.17"
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.18":
+  version: 4.0.18
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.18"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/465ac42856ca1a57aa2b9ea41ede31d9e2bcf2fe84345dbc182ae41f463069a0cfd41041b834b5133108c702cd85ecb8636b51b0b88fff8a221628639b59f386
+  checksum: 10c0/23c431068ac205392b4953dbce411e208e79e221ba8030c5e23c0b82e8fd53bc3bc4f2cdc47050f5d91a4ac69cb80f4f1853b213aa8072fa60a6cb6ff0621e04
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.15":
-  version: 3.0.15
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.15"
+"@csstools/postcss-hwb-function@npm:^3.0.16":
+  version: 3.0.16
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.16"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/fdfaeefbab1008ab1e4a98a2b45cc3db002b2724c404fa0600954b411a68b1fa4028286250bf9898eed10fa80c44e4d6b4e55f1aca073c3dfce8198a0aaedf3f
+  checksum: 10c0/4deca8831a69038aff719a77df92c53578bb28e23cc61dc4ea7b1d912b1b685683a9c6232396c2616948ac2e8488ad1e2009c9c8ed30c493d97ba8ad37b6418d
   languageName: node
   linkType: hard
 
@@ -1583,17 +1583,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.5"
+"@csstools/postcss-light-dark-function@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.6"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4fbeda98372d0da25d3ed87da09903c9a0a5d0b8c13cc9de82a98acce4a8f8367e5ba33bfc25c2534d10f2b1db9d5b4278df4ebab755e27ef2b03a95e0ebe264
+  checksum: 10c0/6b2c64860d789cd3e3ce875c01259333911f6e32a751a7475604de8022c13abcb578e5cb941b51bd3a2022bee883df3f6b64800c6e3559b06da283d968aeb615
   languageName: node
   linkType: hard
 
@@ -1635,42 +1635,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^2.0.9":
-  version: 2.0.9
-  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.9"
+"@csstools/postcss-logical-viewport-units@npm:^2.0.10":
+  version: 2.0.10
+  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.10"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/25b01e36b08c571806d09046be63582dbebf97a4612df59be405fa8a92e6eebcd4e768ad7fbe53b0b8739d6ab04d56957964fb04d6a3ea129fc5f72e6d0adf95
+  checksum: 10c0/fe142b11e0e8ccab4667cc5db90b45e67b7d11eaf5c038e91d867e1b18a315ef0859114185aeb48fdc1ce05986be8b644d6157fe9e19da7281f7023c99eb8877
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "@csstools/postcss-media-minmax@npm:1.1.6"
+"@csstools/postcss-media-minmax@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "@csstools/postcss-media-minmax@npm:1.1.7"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/media-query-list-parser": "npm:^2.1.12"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2cbfb3728a232c655d82f63d5ac7da36876d14e5fee5d62a0738efed40c58f20ef11f600395ade24d5063d750e8e093251dd93cc361f782b5a6c0e0f80288f51
+  checksum: 10c0/a02943a17b540cbd909b55bbb1f8c9331badc51b613279bbdb7127c9921a5d0675bb41675a3b4d0f15e9586120e5a96d9b9786b63b2c594fbb3a238e860c6ad8
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.9":
-  version: 2.0.9
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.9"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.10":
+  version: 2.0.10
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.10"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/media-query-list-parser": "npm:^2.1.12"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d431d2900a7177c938d9dc2d5bdf3c1930758adc214cc72f94b34e6bbd02fd917c200dc81482db515519c97d4f1e766ba3200f3ec9b55081887f2f8111f68e20
+  checksum: 10c0/d7879e72df98d9fe2e5d85a64837e7a73c2df1aea8659d65516f0acb070317edd353531882f0bdfd81510703d1da30d6da861052a0bda85fde1f9eab94b1e467
   languageName: node
   linkType: hard
 
@@ -1697,18 +1697,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.16":
-  version: 3.0.16
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.16"
+"@csstools/postcss-oklab-function@npm:^3.0.17":
+  version: 3.0.17
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9c67ee5f51116df16ab6baffa1b3c6c7aa93d53b836f421125ae8824075bd3cfaa1a93594466de0ac935c89c4fc8171e80974e1a15bafa23ea864e4cf1f1c1f2
+  checksum: 10c0/ff27a4b6fd8490439aa0f3c91ffa2a42a8cf539d7306d9329cef7ca59f28317cee40253f402d19a18c196471fd39a05842d2974d92f1b131dc748074d91ac4ee
   languageName: node
   linkType: hard
 
@@ -1723,18 +1723,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.16":
-  version: 2.0.16
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.16"
+"@csstools/postcss-relative-color-syntax@npm:^2.0.17":
+  version: 2.0.17
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/cdc965706212dcbc03394f55c79a0ad043d1e0174059c4d0d90e4267fe8e6fd9eef7cfed4f5bbc1f8e89c225c1c042ae792e115bba198eb2daae763d65f44679
+  checksum: 10c0/46226351b3825323e3496dcee44ff354cd3ccc9241d837659e1311f428f0b4dc878d9bb762cbb8f63243b7af346728ab7a46c311f9dc38bb609147523c698eab
   languageName: node
   linkType: hard
 
@@ -1749,41 +1749,41 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^3.0.8":
-  version: 3.0.8
-  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.8"
+"@csstools/postcss-stepped-value-functions@npm:^3.0.9":
+  version: 3.0.9
+  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.9"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2be66aa769808245137be8ff14308aa17c3a0d75433f6fd6789114966a78c365dbf173d087e7ff5bc80118c75be2ff740baab83ed39fc0671980f6217779956b
+  checksum: 10c0/bafe80947abc8613903f1f3f1939ece9780696774f15960aef229733e40e483dc2830145426d49c4f6d0b1dabb35f812c8a2dda0d0dcddc930321e36b5c6ca0b
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.6"
+"@csstools/postcss-text-decoration-shorthand@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.7"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.2.0"
+    "@csstools/color-helpers": "npm:^4.2.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5abdc4fad1c3f15e9d47c7af3995dec9cdf4e6f87c5857eb2e149764779b8389f4f4b21d11e6f2509c57c554a0dc5c11f68f212acd04bbc47defa15911ac3eb9
+  checksum: 10c0/072b9893ca2409aa16e53e84747d7b7e13071ce19738a0800a139bf71b535e439958d9093df2b85f83eee2e0c44bc22a14bf3a39b5a7508bca9e747a12273d02
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^3.0.8":
-  version: 3.0.8
-  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.8"
+"@csstools/postcss-trigonometric-functions@npm:^3.0.9":
+  version: 3.0.9
+  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.9"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/aeed8d1026f4a5cb7afafbadd739af84291d5bfcbcdef2f79b77174f003d0cd0c7f9deb3fe0b9377efab37ce9bb17a2499efd4af8211f5ff9eb01b878b0b62b3
+  checksum: 10c0/7a439d31a63d35986dab634d9e415f7ce7c32a2d3d382052b5b730a259a12e44c5f1b14e318d79086253e3d5d4f7d942d0e7317d92eb3421dd08824eebec45fb
   languageName: node
   linkType: hard
 
@@ -2770,17 +2770,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2, browserslist@npm:^4.22.3, browserslist@npm:^4.23.0":
-  version: 4.23.0
-  resolution: "browserslist@npm:4.23.0"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
+  version: 4.23.1
+  resolution: "browserslist@npm:4.23.1"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001587"
-    electron-to-chromium: "npm:^1.4.668"
+    caniuse-lite: "npm:^1.0.30001629"
+    electron-to-chromium: "npm:^1.4.796"
     node-releases: "npm:^2.0.14"
-    update-browserslist-db: "npm:^1.0.13"
+    update-browserslist-db: "npm:^1.0.16"
   bin:
     browserslist: cli.js
-  checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943
+  checksum: 10c0/eb47c7ab9d60db25ce2faca70efeb278faa7282a2f62b7f2fa2f92e5f5251cf65144244566c86559419ff4f6d78f59ea50e39911321ad91f3b27788901f1f5e9
   languageName: node
   linkType: hard
 
@@ -2830,10 +2830,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
-  version: 1.0.30001605
-  resolution: "caniuse-lite@npm:1.0.30001605"
-  checksum: 10c0/ceb96a0ecfdaee6510c00aebaaa63db20aaeafab03450d4e3b214e009cb632f87385a70c299cdd1ca4c17e1473883d8fa2051c5b2d083a454338c0c779b25cbc
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629":
+  version: 1.0.30001639
+  resolution: "caniuse-lite@npm:1.0.30001639"
+  checksum: 10c0/3f56ce3d516a4fba959ad10ed6ecb15c6329233fc01f9f2714234a2ca91f408296d708a366ece510ca6566f71cb80d20d4c019441a1451ac1456e0128c8de78a
   languageName: node
   linkType: hard
 
@@ -3375,10 +3375,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.668":
-  version: 1.4.680
-  resolution: "electron-to-chromium@npm:1.4.680"
-  checksum: 10c0/f5877042ee84fce419b1c475ca1f75d1c19c0ecf358572635dffed97d8591a25c169ee1b5abfb8a14d741c699fcc4a92b1ef1f771fbd7887f3a18499a8eaf260
+"electron-to-chromium@npm:^1.4.796":
+  version: 1.4.816
+  resolution: "electron-to-chromium@npm:1.4.816"
+  checksum: 10c0/1a84bc42234484cbc5e8b521de57fd3ab9984a2111d8605eab26b3525f382c0c7b83b45bf8b34e5fa4a730cd183fef5dffa4a0627754c7f4fb0aae9cb3c16b37
   languageName: node
   linkType: hard
 
@@ -3468,10 +3468,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escalade@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "escalade@npm:3.1.1"
-  checksum: 10c0/afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d
+"escalade@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "escalade@npm:3.1.2"
+  checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287
   languageName: node
   linkType: hard
 
@@ -4415,7 +4415,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.0"
     postcss: "npm:8.4.39"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:9.5.14"
+    postcss-preset-env: "npm:9.5.15"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.2"
     sass: "npm:1.77.6"
@@ -5356,18 +5356,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.11":
-  version: 6.0.11
-  resolution: "postcss-color-functional-notation@npm:6.0.11"
+"postcss-color-functional-notation@npm:^6.0.12":
+  version: 6.0.12
+  resolution: "postcss-color-functional-notation@npm:6.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/7fd75e6881cf62f536f79dfc0ae1b709ea0b8b84833cce1671372711f6019ab4360c6a17089b654b2d376b87e7f9455b94f0d13b45ab0ab767e547b604709b3d
+  checksum: 10c0/2e8faecd2609e1b4eb8c1cab21ecca5e746916795df20e6997d66eb61c29fbb01d3e75fef3e0b3e1c181918a2186570441b81779b1fc429d6d8823fbfa164231
   languageName: node
   linkType: hard
 
@@ -5421,46 +5421,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^10.0.6":
-  version: 10.0.6
-  resolution: "postcss-custom-media@npm:10.0.6"
+"postcss-custom-media@npm:^10.0.7":
+  version: 10.0.7
+  resolution: "postcss-custom-media@npm:10.0.7"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/media-query-list-parser": "npm:^2.1.12"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/98a524bc46b780a86094bbe8007f1e577137da5490823631a683d4b3df4a13e40c5e1ab52380275a54f7011abfd98bb597c6293d964c14f9f22ec6cf9d75c550
+  checksum: 10c0/4171385ab9370806861dcf7597e53fd6aa1862e77b475c9c565c95bfcc2b950f920f8da26a6dbec42e257388bca97c274635662b5e81fe3905b5e37babe06569
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.10":
-  version: 13.3.10
-  resolution: "postcss-custom-properties@npm:13.3.10"
+"postcss-custom-properties@npm:^13.3.11":
+  version: 13.3.11
+  resolution: "postcss-custom-properties@npm:13.3.11"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/52688fd0aaadccfdf4a3d86d3a2ab988163e8108088c5e33fc9145d261f75b92b8321c044a8161345abda10df5715d674330309dcc0c17f2980db5515f6a76d6
+  checksum: 10c0/4aa95628aa5d5b6df4dfeedbc3891b9666db88d75930cadc14d2fbba0a1b72f4e3cc3d83b5a0c0b8ce44f85b4fda6ebd7fe7792a1abc0a14d7d63b9f170d299c
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^7.1.10":
-  version: 7.1.10
-  resolution: "postcss-custom-selectors@npm:7.1.10"
+"postcss-custom-selectors@npm:^7.1.11":
+  version: 7.1.11
+  resolution: "postcss-custom-selectors@npm:7.1.11"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.11"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/11311ae6f306420223c6bf926fb1798738f3aa525a267de204de8e8ee9de467bf63b580d9ad5dbb0fff4bd9266770a3fa7e27a24af08a2e0a4115d0727d1d043
+  checksum: 10c0/f37d2e34239e868b35b7970ec97a7a8f657a9f92ed2b221af44f19949f7c3aedcecd0abb5fa1acb120c5ceffdf7a20869338956a37d7bfc37a83d8088f5d3dd2
   languageName: node
   linkType: hard
 
@@ -5576,18 +5576,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.16":
-  version: 6.0.16
-  resolution: "postcss-lab-function@npm:6.0.16"
+"postcss-lab-function@npm:^6.0.17":
+  version: 6.0.17
+  resolution: "postcss-lab-function@npm:6.0.17"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.2"
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
+    "@csstools/css-color-parser": "npm:^2.0.3"
+    "@csstools/css-parser-algorithms": "npm:^2.7.0"
+    "@csstools/css-tokenizer": "npm:^2.3.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ba8717cd8a197ec17acaac1b61631cd4403f07bd406b0c92f2e430a55e3f786cd6c338b626c3326e9178a0f3e58ff838ebaded19f480f39197a9cb17349ecdcd
+  checksum: 10c0/a331f188b02cc8beb315150232b6b58bc5793e8d61585973d352a9b4d370b908ff354ccf9ea1ba20a956fd37ea4ada918ea975c8d4f69e850d26edf0106436e8
   languageName: node
   linkType: hard
 
@@ -5903,53 +5903,53 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-preset-env@npm:9.5.14":
-  version: 9.5.14
-  resolution: "postcss-preset-env@npm:9.5.14"
+"postcss-preset-env@npm:9.5.15":
+  version: 9.5.15
+  resolution: "postcss-preset-env@npm:9.5.15"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.6"
-    "@csstools/postcss-color-function": "npm:^3.0.16"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.16"
-    "@csstools/postcss-exponential-functions": "npm:^1.0.7"
+    "@csstools/postcss-color-function": "npm:^3.0.17"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.17"
+    "@csstools/postcss-exponential-functions": "npm:^1.0.8"
     "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.9"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.17"
-    "@csstools/postcss-hwb-function": "npm:^3.0.15"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.10"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.18"
+    "@csstools/postcss-hwb-function": "npm:^3.0.16"
     "@csstools/postcss-ic-unit": "npm:^3.0.6"
     "@csstools/postcss-initial": "npm:^1.0.1"
     "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.5"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.6"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
     "@csstools/postcss-logical-resize": "npm:^2.0.1"
-    "@csstools/postcss-logical-viewport-units": "npm:^2.0.9"
-    "@csstools/postcss-media-minmax": "npm:^1.1.6"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.9"
+    "@csstools/postcss-logical-viewport-units": "npm:^2.0.10"
+    "@csstools/postcss-media-minmax": "npm:^1.1.7"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.10"
     "@csstools/postcss-nested-calc": "npm:^3.0.2"
     "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.16"
+    "@csstools/postcss-oklab-function": "npm:^3.0.17"
     "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.16"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.17"
     "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
-    "@csstools/postcss-stepped-value-functions": "npm:^3.0.8"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.6"
-    "@csstools/postcss-trigonometric-functions": "npm:^3.0.8"
+    "@csstools/postcss-stepped-value-functions": "npm:^3.0.9"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.7"
+    "@csstools/postcss-trigonometric-functions": "npm:^3.0.9"
     "@csstools/postcss-unset-value": "npm:^3.0.1"
     autoprefixer: "npm:^10.4.19"
-    browserslist: "npm:^4.22.3"
+    browserslist: "npm:^4.23.1"
     css-blank-pseudo: "npm:^6.0.2"
     css-has-pseudo: "npm:^6.0.5"
     css-prefers-color-scheme: "npm:^9.0.1"
     cssdb: "npm:^8.0.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.11"
+    postcss-color-functional-notation: "npm:^6.0.12"
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
-    postcss-custom-media: "npm:^10.0.6"
-    postcss-custom-properties: "npm:^13.3.10"
-    postcss-custom-selectors: "npm:^7.1.10"
+    postcss-custom-media: "npm:^10.0.7"
+    postcss-custom-properties: "npm:^13.3.11"
+    postcss-custom-selectors: "npm:^7.1.11"
     postcss-dir-pseudo-class: "npm:^8.0.1"
     postcss-double-position-gradients: "npm:^5.0.6"
     postcss-focus-visible: "npm:^9.0.1"
@@ -5957,7 +5957,7 @@ __metadata:
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^5.0.1"
     postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.16"
+    postcss-lab-function: "npm:^6.0.17"
     postcss-logical: "npm:^7.0.1"
     postcss-nesting: "npm:^12.1.5"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -5969,7 +5969,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8e0c8f5c2e7b8385a770c13185986dc50d7a73b10b98c65c2f86bb4cd2860de722caef8172b1676962dafbbc044d6be1955f2a092e951976a30d4ee33b0d7571
+  checksum: 10c0/e2ee0b5d7dbaddb82ff6d51b5882120862d6be184973ae3d55642923183ab441d421d5f9810fe02e680a70dbc85b20b1c2eb02c68f167dcaf3ef80a71dd40e78
   languageName: node
   linkType: hard
 
@@ -6974,17 +6974,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.13":
-  version: 1.0.13
-  resolution: "update-browserslist-db@npm:1.0.13"
+"update-browserslist-db@npm:^1.0.16":
+  version: 1.1.0
+  resolution: "update-browserslist-db@npm:1.1.0"
   dependencies:
-    escalade: "npm:^3.1.1"
-    picocolors: "npm:^1.0.0"
+    escalade: "npm:^3.1.2"
+    picocolors: "npm:^1.0.1"
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: 10c0/e52b8b521c78ce1e0c775f356cd16a9c22c70d25f3e01180839c407a5dc787fb05a13f67560cbaf316770d26fa99f78f1acd711b1b54a4f35d4820d4ea7136e6
+  checksum: 10c0/a7452de47785842736fb71547651c5bbe5b4dc1e3722ccf48a704b7b34e4dcf633991eaa8e4a6a517ffb738b3252eede3773bef673ef9021baa26b056d63a5b9
   languageName: node
   linkType: hard
 

From ed0a3be3ac3459cb2b310cee8dcdb48cb8f3aa8c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 13:55:36 -0700
Subject: [PATCH 181/449] Update dependency globals to v15.7.0 (#9435)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index f25de535f85a..64fb417b8e3d 100644
--- a/war/package.json
+++ b/war/package.json
@@ -34,7 +34,7 @@
     "eslint": "9.6.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.6.0",
+    "globals": "15.7.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.39",
diff --git a/war/yarn.lock b/war/yarn.lock
index 640963e660f7..ad8107731711 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3983,10 +3983,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.6.0":
-  version: 15.6.0
-  resolution: "globals@npm:15.6.0"
-  checksum: 10c0/ba488ec5bd770336a3e1ffec3f718077768aec99e16f30c33c0eeaed09e0b93fa06a24fc0d3844d1d81a678c86d22f04547703e87e2e4353601eddcb800479ec
+"globals@npm:15.7.0":
+  version: 15.7.0
+  resolution: "globals@npm:15.7.0"
+  checksum: 10c0/5294e3e521a1957e9930843cfd9ff6f70090f21c2c13f0df2f857787fb4f00af36d30411aa4b3cd654ec274e4b9205ee16ce347ad95b9519427bd3146c80e7aa
   languageName: node
   linkType: hard
 
@@ -4406,7 +4406,7 @@ __metadata:
     eslint: "npm:9.6.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.6.0"
+    globals: "npm:15.7.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"

From 2adc34b35df6e15b2829fbfcccf20db6a254800e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 16:31:56 -0700
Subject: [PATCH 182/449] Bump commons-logging:commons-logging from 1.3.2 to
 1.3.3 (#9436)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index ce0ee8c65d3a..150deffe0389 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -376,7 +376,7 @@ THE SOFTWARE.
         <!-- provided by jcl-over-slf4j -->
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
         <scope>provided</scope>
       </dependency>
     </dependencies>

From 7df974eea1f8c9be48ae88a66e90a96a80d4c721 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Thu, 4 Jul 2024 13:00:32 +0200
Subject: [PATCH 183/449] Allow administrative monitors to be displayed for
 users with `Overall/MANAGE` permission

This allows users with `Overall/MANAGE` permission but not `Overall/SYSTEM_READ` to display administrative monitors if the administrative monitor has been implemented to allow it.
---
 .../hudson/model/AdministrativeMonitor.java   | 13 ++++-
 .../AdministrativeMonitorsDecorator.java      |  2 +-
 core/src/main/java/jenkins/model/Jenkins.java |  2 +-
 .../AdministrativeMonitorsDecoratorTest.java  | 52 +++++++++++++++++++
 4 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java
index 7a9a0dde970c..f02d98811861 100644
--- a/core/src/main/java/hudson/model/AdministrativeMonitor.java
+++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java
@@ -183,7 +183,7 @@ public void doDisable(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
 
     /**
      * Required permission to view this admin monitor.
-     * By default {@link Jenkins#ADMINISTER}, but {@link Jenkins#SYSTEM_READ} is also supported.
+     * By default {@link Jenkins#ADMINISTER}, but {@link Jenkins#SYSTEM_READ} or {@link Jenkins#MANAGE} are also supported.
      * <p>
      *     Changing this permission check to return {@link Jenkins#SYSTEM_READ} will make the active
      *     administrative monitor appear on {@code manage.jelly} and on the globally visible
@@ -201,6 +201,17 @@ public Permission getRequiredPermission() {
         return Jenkins.ADMINISTER;
     }
 
+    /**
+     * Checks if the current user has the minimum required permission to view any administrative monitor.
+     *
+     * @return true if the current user has the minimum required permission to view any administrative monitor.
+     *
+     * @since TODO
+     */
+    public static boolean hasPermissionToDisplay() {
+        return Jenkins.get().hasAnyPermission(Jenkins.SYSTEM_READ, Jenkins.MANAGE);
+    }
+
     /**
      * Ensure that URLs in this administrative monitor are only accessible to users with {@link #getRequiredPermission()}.
      */
diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
index 21cc0ba1df0c..5b94090f4e3b 100644
--- a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
+++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
@@ -139,7 +139,7 @@ private Collection<AdministrativeMonitor> getAllActiveAdministrativeMonitors() {
      * @return the list of active monitors if we should display them, otherwise null.
      */
     public Collection<AdministrativeMonitor> getMonitorsToDisplay() {
-        if (!Jenkins.get().hasPermission(Jenkins.SYSTEM_READ)) {
+        if (!(AdministrativeMonitor.hasPermissionToDisplay())) {
             return null;
         }
 
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 4782e4b321f2..a4640680006b 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -2355,7 +2355,7 @@ public AdministrativeMonitor getAdministrativeMonitor(String id) {
      * @since 2.64
      */
     public List<AdministrativeMonitor> getActiveAdministrativeMonitors() {
-        if (!Jenkins.get().hasPermission(SYSTEM_READ)) {
+        if (!AdministrativeMonitor.hasPermissionToDisplay()) {
             return Collections.emptyList();
         }
         return administrativeMonitors.stream().filter(m -> {
diff --git a/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java b/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
index 37d28638e65b..c67cc2f6529c 100644
--- a/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
+++ b/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
@@ -24,13 +24,21 @@
 
 package jenkins.management;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 
 import hudson.ExtensionList;
 import hudson.model.AdministrativeMonitor;
 import hudson.model.User;
+import hudson.security.ACL;
+import hudson.security.Permission;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -43,6 +51,16 @@ public class AdministrativeMonitorsDecoratorTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
+    @BeforeClass
+    public static void enablePermissions() {
+        System.setProperty("jenkins.security.ManagePermission", "true");
+    }
+
+    @AfterClass
+    public static void disablePermissions() {
+        System.clearProperty("jenkins.security.ManagePermission");
+    }
+
     @Test
     public void ensureAdminMonitorsAreNotRunPerNonAdminPage() throws Exception {
         j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
@@ -131,4 +149,38 @@ public boolean isSecurity() {
             return true;
         }
     }
+
+    @Test
+    public void ensureAdminMonitorsCanBeSeenByManagers() {
+        j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
+        var managerLogin = "manager";
+        var systemReadLogin = "system-reader";
+        var managerUser = User.getById(managerLogin, true);
+        var systemReadUser = User.getById(systemReadLogin, true);
+
+        j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy()
+                .grant(Jenkins.MANAGE, Jenkins.READ).everywhere().to(managerLogin)
+                .grant(Jenkins.READ, Jenkins.SYSTEM_READ).everywhere().to(systemReadLogin)
+        );
+
+        try (var ignored = ACL.as2(managerUser.impersonate2())) {
+            assertThat(Jenkins.get().getActiveAdministrativeMonitors(), hasItem(instanceOf(ManagerAdministrativeMonitor.class)));
+        }
+        try (var ignored = ACL.as2(systemReadUser.impersonate2())) {
+            assertThat(Jenkins.get().getActiveAdministrativeMonitors(), not(hasItem(instanceOf(ManagerAdministrativeMonitor.class))));
+        }
+    }
+
+    @TestExtension("ensureAdminMonitorsCanBeSeenByManagers")
+    public static class ManagerAdministrativeMonitor extends AdministrativeMonitor {
+        @Override
+        public Permission getRequiredPermission() {
+            return Jenkins.MANAGE;
+        }
+
+        @Override
+        public boolean isActivated() {
+            return true;
+        }
+    }
 }

From 57c4854cae7a8b48c0300ce9df8748010c38c248 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 09:46:42 -0700
Subject: [PATCH 184/449] Update dependency globals to v15.8.0 (#9438)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 64fb417b8e3d..849077f3d93f 100644
--- a/war/package.json
+++ b/war/package.json
@@ -34,7 +34,7 @@
     "eslint": "9.6.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.7.0",
+    "globals": "15.8.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.39",
diff --git a/war/yarn.lock b/war/yarn.lock
index ad8107731711..fc3c5e4c02e7 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3983,10 +3983,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.7.0":
-  version: 15.7.0
-  resolution: "globals@npm:15.7.0"
-  checksum: 10c0/5294e3e521a1957e9930843cfd9ff6f70090f21c2c13f0df2f857787fb4f00af36d30411aa4b3cd654ec274e4b9205ee16ce347ad95b9519427bd3146c80e7aa
+"globals@npm:15.8.0":
+  version: 15.8.0
+  resolution: "globals@npm:15.8.0"
+  checksum: 10c0/b96ec86e1244806920a80a1a7c4d64b68c55336887cfa1b52886927e0f9035133e4acd354fcda63b49e53df2089c41a11dd2b02281a6439a58cbc0d63ae083cb
   languageName: node
   linkType: hard
 
@@ -4406,7 +4406,7 @@ __metadata:
     eslint: "npm:9.6.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.7.0"
+    globals: "npm:15.8.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"

From 53bbf72852200133e6b1086f9bca0ae2ba490949 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 12:15:56 -0700
Subject: [PATCH 185/449] Bump org.jenkins-ci.plugins:bouncycastle-api from
 2.30.1.78.1-233.vfdcdeb_0a_08a_a_ to 2.30.1.78.1-248.ve27176eb_46cb_ (#9439)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index c4830c487cfc..6a11e82a32bd 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -98,7 +98,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>bouncycastle-api</artifactId>
-        <version>2.30.1.78.1-233.vfdcdeb_0a_08a_a_</version>
+        <version>2.30.1.78.1-248.ve27176eb_46cb_</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps via mailer and junit -->
diff --git a/war/pom.xml b/war/pom.xml
index 1b1ea50a9a45..356622c1e120 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -416,7 +416,7 @@ THE SOFTWARE.
                   <!-- detached after 2.16 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>bouncycastle-api</artifactId>
-                  <version>2.30.1.78.1-233.vfdcdeb_0a_08a_a_</version>
+                  <version>2.30.1.78.1-248.ve27176eb_46cb_</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 8f59df58d72ae6cac123134efc86dc899485c37a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 22:56:58 -0700
Subject: [PATCH 186/449] Bump org.jenkins-ci.plugins:credentials from
 1355.v46f52a_b_98d64 to 1361.v56f5ca_35d21c (#9441)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 6a11e82a32bd..ccb2910da26e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -222,7 +222,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1355.v46f52a_b_98d64</version>
+      <version>1361.v56f5ca_35d21c</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 4152c5726b272a1fd5bb1ccef08a39f5d8921980 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Mon, 8 Jul 2024 09:35:49 +0200
Subject: [PATCH 187/449] Add a method to check for permission instead

---
 .../hudson/model/AdministrativeMonitor.java    | 18 +++++++++++++++++-
 .../AdministrativeMonitorsDecoratorTest.java   | 14 +++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java
index f02d98811861..30008d4ba0ad 100644
--- a/core/src/main/java/hudson/model/AdministrativeMonitor.java
+++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java
@@ -191,6 +191,10 @@ public void doDisable(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
      *     {@link #doDisable(StaplerRequest, StaplerResponse)} will still always require Administer permission.
      * </p>
      * <p>
+     *     This method only allows for a single permission to be returned. If more complex permission checks are required,
+     *     override {@link #checkRequiredPermission()} instead.
+     * </p>
+     * <p>
      *     Implementers need to ensure that {@code doAct} and other web methods perform necessary permission checks:
      *     Users with System Read permissions are expected to be limited to read-only access.
      *     Form UI elements that change system state, e.g. toggling a feature on or off, need to be hidden from users
@@ -201,6 +205,18 @@ public Permission getRequiredPermission() {
         return Jenkins.ADMINISTER;
     }
 
+    /**
+     * Checks if the current user has the minimum required permission to view this administrative monitor.
+     * <p>
+     * Subclasses may override this method instead of {@link #getRequiredPermission()} to perform more complex permission checks,
+     * for example, checking either {@link Jenkins#MANAGE} or {@link Jenkins#SYSTEM_READ}.
+     * </p>
+     * @see #getRequiredPermission()
+     */
+    public void checkRequiredPermission() {
+        Jenkins.get().checkPermission(getRequiredPermission());
+    }
+
     /**
      * Checks if the current user has the minimum required permission to view any administrative monitor.
      *
@@ -218,7 +234,7 @@ public static boolean hasPermissionToDisplay() {
     @Override
     @Restricted(NoExternalUse.class)
     public Object getTarget() {
-        Jenkins.get().checkPermission(getRequiredPermission());
+        checkRequiredPermission();
         return this;
     }
 
diff --git a/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java b/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
index c67cc2f6529c..edbf5f27e48f 100644
--- a/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
+++ b/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
@@ -37,10 +37,9 @@
 import hudson.security.Permission;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.FlagRule;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
@@ -51,15 +50,8 @@ public class AdministrativeMonitorsDecoratorTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
-    @BeforeClass
-    public static void enablePermissions() {
-        System.setProperty("jenkins.security.ManagePermission", "true");
-    }
-
-    @AfterClass
-    public static void disablePermissions() {
-        System.clearProperty("jenkins.security.ManagePermission");
-    }
+    @Rule
+    public final FlagRule<String> managePermissionRule = FlagRule.systemProperty("jenkins.security.ManagePermission", "true");
 
     @Test
     public void ensureAdminMonitorsAreNotRunPerNonAdminPage() throws Exception {

From dc36857468f76e74ea7686bd863b2943d0107223 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Mon, 8 Jul 2024 09:53:43 +0200
Subject: [PATCH 188/449] Cover new logic and fix check

---
 .../hudson/model/AdministrativeMonitor.java   | 18 +++++++-
 core/src/main/java/jenkins/model/Jenkins.java |  2 +-
 .../AdministrativeMonitorsDecoratorTest.java  | 42 +++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java
index 30008d4ba0ad..e2f69d654ca8 100644
--- a/core/src/main/java/hudson/model/AdministrativeMonitor.java
+++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java
@@ -192,7 +192,7 @@ public void doDisable(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
      * </p>
      * <p>
      *     This method only allows for a single permission to be returned. If more complex permission checks are required,
-     *     override {@link #checkRequiredPermission()} instead.
+     *     override {@link #checkRequiredPermission()} and {@link #hasRequiredPermission()} instead.
      * </p>
      * <p>
      *     Implementers need to ensure that {@code doAct} and other web methods perform necessary permission checks:
@@ -208,15 +208,29 @@ public Permission getRequiredPermission() {
     /**
      * Checks if the current user has the minimum required permission to view this administrative monitor.
      * <p>
-     * Subclasses may override this method instead of {@link #getRequiredPermission()} to perform more complex permission checks,
+     * Subclasses may override this method and {@link #hasRequiredPermission()} instead of {@link #getRequiredPermission()} to perform more complex permission checks,
      * for example, checking either {@link Jenkins#MANAGE} or {@link Jenkins#SYSTEM_READ}.
      * </p>
      * @see #getRequiredPermission()
+     * @see #hasRequiredPermission()
      */
     public void checkRequiredPermission() {
         Jenkins.get().checkPermission(getRequiredPermission());
     }
 
+    /**
+     * Checks if the current user has the minimum required permission to view this administrative monitor.
+     * <p>
+     * Subclasses may override this method and {@link #checkRequiredPermission} instead of {@link #getRequiredPermission()} to perform more complex permission checks,
+     * for example, checking either {@link Jenkins#MANAGE} or {@link Jenkins#SYSTEM_READ}.
+     * </p>
+     * @see #getRequiredPermission()
+     * @see #checkRequiredPermission()
+     */
+    public boolean hasRequiredPermission() {
+        return Jenkins.get().hasPermission(getRequiredPermission());
+    }
+
     /**
      * Checks if the current user has the minimum required permission to view any administrative monitor.
      *
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index a4640680006b..a3376f99d75e 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -2360,7 +2360,7 @@ public List<AdministrativeMonitor> getActiveAdministrativeMonitors() {
         }
         return administrativeMonitors.stream().filter(m -> {
             try {
-                return Jenkins.get().hasPermission(m.getRequiredPermission()) && m.isEnabled() && m.isActivated();
+                return m.hasRequiredPermission() && m.isEnabled() && m.isActivated();
             } catch (Throwable x) {
                 LOGGER.log(Level.WARNING, null, x);
                 return false;
diff --git a/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java b/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
index edbf5f27e48f..691b9d2c8868 100644
--- a/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
+++ b/test/src/test/java/jenkins/management/AdministrativeMonitorsDecoratorTest.java
@@ -175,4 +175,46 @@ public boolean isActivated() {
             return true;
         }
     }
+
+    @Test
+    public void ensureAdminMonitorsCanBeSeenByManagersOrSystemReaders() {
+        j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
+        var managerLogin = "manager";
+        var systemReadLogin = "system-reader";
+        var managerUser = User.getById(managerLogin, true);
+        var systemReadUser = User.getById(systemReadLogin, true);
+
+        j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy()
+                .grant(Jenkins.MANAGE, Jenkins.READ).everywhere().to(managerLogin)
+                .grant(Jenkins.READ, Jenkins.SYSTEM_READ).everywhere().to(systemReadLogin)
+        );
+
+        try (var ignored = ACL.as2(managerUser.impersonate2())) {
+            assertThat(Jenkins.get().getActiveAdministrativeMonitors(), hasItem(instanceOf(ManagerOrSystemReaderAdministrativeMonitor.class)));
+        }
+        try (var ignored = ACL.as2(systemReadUser.impersonate2())) {
+            assertThat(Jenkins.get().getActiveAdministrativeMonitors(), hasItem(instanceOf(ManagerOrSystemReaderAdministrativeMonitor.class)));
+        }
+    }
+
+    @TestExtension("ensureAdminMonitorsCanBeSeenByManagersOrSystemReaders")
+    public static class ManagerOrSystemReaderAdministrativeMonitor extends AdministrativeMonitor {
+
+        private static final Permission[] REQUIRED_ANY_PERMISSIONS = {Jenkins.MANAGE, Jenkins.SYSTEM_READ};
+
+        @Override
+        public void checkRequiredPermission() {
+            Jenkins.get().checkAnyPermission(REQUIRED_ANY_PERMISSIONS);
+        }
+
+        @Override
+        public boolean hasRequiredPermission() {
+            return Jenkins.get().hasAnyPermission(REQUIRED_ANY_PERMISSIONS);
+        }
+
+        @Override
+        public boolean isActivated() {
+            return true;
+        }
+    }
 }

From 57569071c7c093890c424356257536d2fd11f1ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:37:38 -0700
Subject: [PATCH 189/449] Bump
 org.jenkins-ci.plugins.workflow:workflow-step-api from 657.v03b_e8115821b_ to
 678.v3ee58b_469476 (#9444)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index ccb2910da26e..16c8bd26459e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -126,7 +126,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-step-api</artifactId>
-        <version>657.v03b_e8115821b_</version>
+        <version>678.v3ee58b_469476</version>
       </dependency>
       <dependency>
         <!-- Required by plugin-util-api -->
diff --git a/war/pom.xml b/war/pom.xml
index 356622c1e120..0be9e087f034 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -395,7 +395,7 @@ THE SOFTWARE.
                   <!-- dependency of checks-api, junit, plugin-util-api, workflow-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-step-api</artifactId>
-                  <version>657.v03b_e8115821b_</version>
+                  <version>678.v3ee58b_469476</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 63570124efd8e174fce3e248a72fac7f38c29902 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 8 Jul 2024 17:06:17 -0700
Subject: [PATCH 190/449] Increase minimum required Remoting version from 4.13
 to 3107.v665000b_51092 (#9440)

---
 pom.xml      | 2 +-
 test/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e0b0dd81212..aa698d401af1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@ THE SOFTWARE.
     <!-- Bundled Remoting version -->
     <remoting.version>3256.v88a_f6e922152</remoting.version>
     <!-- Minimum Remoting version, which is tested for API compatibility -->
-    <remoting.minimum.supported.version>4.13</remoting.minimum.supported.version>
+    <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
 
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Medium</spotbugs.threshold>
diff --git a/test/pom.xml b/test/pom.xml
index 16c8bd26459e..00f39ee99297 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -326,7 +326,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>org.jenkins-ci.main</groupId>
                   <artifactId>remoting</artifactId>
-                  <version>4.12</version>
+                  <version>3085.vc4c6977c075a</version>
                   <type>jar</type>
                   <outputDirectory>${project.build.outputDirectory}/old-remoting</outputDirectory>
                   <destFileName>remoting-unsupported.jar</destFileName>

From 1abde0811866f5f9c5569ed43fe355415c1de461 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 9 Jul 2024 17:52:36 +0000
Subject: [PATCH 191/449] [maven-release-plugin] prepare release jenkins-2.467

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 150deffe0389..0af74dcb4593 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.467</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..e530a7d8ffcc 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.467</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..3e5aa3e6b15d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.467</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..e9f08e548a3c 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.467</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index aa698d401af1..34aab7dacb22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.467</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.467</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.467</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-02T18:29:59Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-09T14:36:13Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 00f39ee99297..72cbf8735b98 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.467</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 0be9e087f034..98c53dff08c1 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.467</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..316fd7920b5b 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.467</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..a2b039c3c790 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.467</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 2eb4456cf334db24cc67c5f49de62b9c32bd310a Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 9 Jul 2024 17:52:58 +0000
Subject: [PATCH 192/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 0af74dcb4593..150deffe0389 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.467</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index e530a7d8ffcc..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.467</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 3e5aa3e6b15d..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.467</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index e9f08e548a3c..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.467</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 34aab7dacb22..858fffab01bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.467</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.467</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.467</revision>
+    <revision>2.468</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-09T14:36:13Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-09T17:52:36Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 72cbf8735b98..00f39ee99297 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.467</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 98c53dff08c1..0be9e087f034 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.467</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 316fd7920b5b..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.467</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a2b039c3c790..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.467</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From f9a935b08257f034ab2e2aeed4ecec562a98fed3 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 10 Jul 2024 11:28:30 +0200
Subject: [PATCH 193/449] Show plugin source URL when downloading it

Example: Downloading email-ext from https://updates.jenkins.io/download/plugins/email-ext/1814.v404722f34263/email-ext.hpi
---
 core/src/main/java/hudson/model/UpdateCenter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 03ab31314372..e452a73123fe 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -1311,7 +1311,7 @@ public File download(DownloadJob job, URL src) throws IOException {
                 File dst = job.getDestination();
                 File tmp = new File(dst.getPath() + ".tmp");
 
-                LOGGER.info("Downloading " + job.getName());
+                LOGGER.info(() -> "Downloading " + job.getName() + " from " + src);
                 Thread t = Thread.currentThread();
                 String oldName = t.getName();
                 t.setName(oldName + ": " + src);

From ce7c859a08e105a5371591189ec62da10cc99c40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 12:42:23 -0700
Subject: [PATCH 194/449] Bump org.jenkins-ci.plugins.workflow:workflow-support
 from 907.v6713a_ed8a_573 to 920.v59f71ce16f04 (#9452)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 00f39ee99297..763287b95706 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -132,7 +132,7 @@ THE SOFTWARE.
         <!-- Required by plugin-util-api -->
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-support</artifactId>
-        <version>907.v6713a_ed8a_573</version>
+        <version>920.v59f71ce16f04</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/war/pom.xml b/war/pom.xml
index 0be9e087f034..228c7c6b7351 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -334,7 +334,7 @@ THE SOFTWARE.
                   <!-- dependency of checks-api and plugin-util-api -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-support</artifactId>
-                  <version>907.v6713a_ed8a_573</version>
+                  <version>920.v59f71ce16f04</version>
                   <type>hpi</type>
                 </artifactItem>
 

From e1a86ef2598b7ca226fe71cb593a4ec9bb4c9e23 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 07:59:23 +0100
Subject: [PATCH 195/449] Update dependency postcss-preset-env to v9.6.0
 (#9445)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   2 +-
 war/yarn.lock    | 457 ++++++++++++++++++++++++-----------------------
 2 files changed, 237 insertions(+), 222 deletions(-)

diff --git a/war/package.json b/war/package.json
index 849077f3d93f..74cd8d6954a3 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.39",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "9.5.15",
+    "postcss-preset-env": "9.6.0",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.2",
     "sass": "1.77.6",
diff --git a/war/yarn.lock b/war/yarn.lock
index fc3c5e4c02e7..705806a75440 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1373,13 +1373,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^1.0.12":
-  version: 1.0.12
-  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.12"
+"@csstools/cascade-layer-name-parser@npm:^1.0.13":
+  version: 1.0.13
+  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.13"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.0
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/5f92aefcbb3f4b660cf7b0db54f6a4ba21a32fa1b64ea4f050a6370233152d4f561ecf5c8e98ca231e73c16e0d9f75b20b0a65153e18b14957658c81e0f68213
+    "@csstools/css-parser-algorithms": ^2.7.1
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/a6412fc8601af1baadc8195934aa668d3476e799891c9d0883390f31ec8678e9b565ac14d919bec633bbc086657ac12aa4cd852c718851a2d34517ee6856ff8e
   languageName: node
   linkType: hard
 
@@ -1390,52 +1390,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "@csstools/css-calc@npm:1.2.3"
+"@csstools/css-calc@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "@csstools/css-calc@npm:1.2.4"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.0
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/fb34767ea9638b837167bcecaf945bcc0c5e8f0d811067c4e8c7a57bc8f0955f61107b1ed5e017b95c54acacc8088473e5497a9986bee95b37ec92999e792871
+    "@csstools/css-parser-algorithms": ^2.7.1
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/6233746eb642797b7fbc2cf6e7651e95700b294e78e3c29e8730c3236bb92cf62903efb6e54639e8f877683c40646e137c95e615c4450809b21b61a6192888ca
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "@csstools/css-color-parser@npm:2.0.3"
+"@csstools/css-color-parser@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "@csstools/css-color-parser@npm:2.0.4"
   dependencies:
     "@csstools/color-helpers": "npm:^4.2.1"
-    "@csstools/css-calc": "npm:^1.2.3"
+    "@csstools/css-calc": "npm:^1.2.4"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.0
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/d8860e6b9c65de4f90d4c21e4d66471fd858434cf63af80f812a900371343b753b86a256627e8bd024cb8903a6a0181d2d9c0c65ab5d78cf29d084a761e2adba
+    "@csstools/css-parser-algorithms": ^2.7.1
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/e009a2f34b6c328daad54262deb86b71c6a7a9a1da1db8ad39cf719641e1a728ed8ddbd23613d519d26deee33b89ba12cb15a6928718c1b3cc5e24ac1ed02f47
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.3, @csstools/css-parser-algorithms@npm:^2.7.0":
-  version: 2.7.0
-  resolution: "@csstools/css-parser-algorithms@npm:2.7.0"
+"@csstools/css-parser-algorithms@npm:^2.6.3, @csstools/css-parser-algorithms@npm:^2.7.1":
+  version: 2.7.1
+  resolution: "@csstools/css-parser-algorithms@npm:2.7.1"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/fb84fefdf37c41d170f81b687bf1ee1847a970e51cc1fe3a320e3eaf225383ae9a3c4eb6208b83357dfe18c5114353d780e0c65f05d86d6435e5a9ad9334c834
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/7d29bef6f5790ddb67d922ad232253bf910e4fa5293f5e4a5ed8b920ae9bd4e8171942df7d8943af23b42fd4e9fb460181394d20c97da9562e6ce98a875e8c47
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.3.1, @csstools/css-tokenizer@npm:^2.3.2":
-  version: 2.3.2
-  resolution: "@csstools/css-tokenizer@npm:2.3.2"
-  checksum: 10c0/f7d0d8b3e9e2dcdc6547a387253a09dbbacaaffb5c8718bcd7f15dddeefdd441b73fc5f9fad3f03fabef3b37ec4b62be7ff79caab366427fa90eaf54cd8fc452
+"@csstools/css-tokenizer@npm:^2.3.1, @csstools/css-tokenizer@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "@csstools/css-tokenizer@npm:2.4.1"
+  checksum: 10c0/fe71cee85ec7372da07083d088b6a704f43e5d3d2d8071c4b8a86fae60408b559a218a43f8625bf2f0be5c7f90c8f3ad20a1aae1921119a1c02b51c310cc2b6b
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.12":
-  version: 2.1.12
-  resolution: "@csstools/media-query-list-parser@npm:2.1.12"
+"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.13":
+  version: 2.1.13
+  resolution: "@csstools/media-query-list-parser@npm:2.1.13"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.0
-    "@csstools/css-tokenizer": ^2.3.2
-  checksum: 10c0/7395cc710d8f54670c1e7a418a88dcf1ae726316272294ec645f6d79a8e931f5d390ba7ed5d0141d29ad7280cd447b8773143dc7676659413de79228130e1a65
+    "@csstools/css-parser-algorithms": ^2.7.1
+    "@csstools/css-tokenizer": ^2.4.1
+  checksum: 10c0/8bf72342c15581b8f658633436d83c26a214056f6b960ff121b940271f4b1b5b07e9cc3990a73e684fb72319592f0c392408b4f0e08bbe242b2065aa456e2733
   languageName: node
   linkType: hard
 
@@ -1451,46 +1451,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.17":
-  version: 3.0.17
-  resolution: "@csstools/postcss-color-function@npm:3.0.17"
+"@csstools/postcss-color-function@npm:^3.0.19":
+  version: 3.0.19
+  resolution: "@csstools/postcss-color-function@npm:3.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6d347fc9fe65cb897c275c129103576e551b74a7c47a1a4dc8160da2fad7752bf51e3cfbff339f86b39c723efac33643168d2dfaac4d3624d072875d18a65a4b
+  checksum: 10c0/067e33d7dfc32b56fe63d4f97464a3eaf27dde720961e44feab6076bd2c172dd4c1bad16aa37a922dcbba470756bd6a13e728d9e71eab6937d48d83873cd1879
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.17":
-  version: 2.0.17
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.17"
+"@csstools/postcss-color-mix-function@npm:^2.0.19":
+  version: 2.0.19
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ba9a406ebe4caba6709878ee26debb06780be5cbf4e6ab7e902d79ca6e21ec6a8409b9dc0a5ef36fc4bf54bf2bd8f9642b72da8d7939145f99dc40fedd2be9d2
+  checksum: 10c0/e967d93672a065806dc78da0153f8b4f5087f7c3ddfe361eba4942780760d47b317124913c9b0dda7f9bfff1253f77d1b6debd8a6a2aa3a6c80e263101da5e8c
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "@csstools/postcss-exponential-functions@npm:1.0.8"
+"@csstools/postcss-content-alt-text@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/postcss-content-alt-text@npm:1.0.0"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
+    "@csstools/utilities": "npm:^1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/0c2c64857ac652989d00c3d2ba49d0cd1cc245193cba6724d2f5841aa990ee6a07267cfebc6fabde6a6246616df60373006d17c5ea9b904129fbfd826dc10a8d
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-exponential-functions@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "@csstools/postcss-exponential-functions@npm:1.0.9"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6b049801fc1275b34f43ffbb915f447a54cbff7bf48ab0705c3ad1ffde055cb876c4dc24e7a9162cd65e219457328e298a673f6176446493db17cf7af6f90dc0
+  checksum: 10c0/eaec29ef6ec201786c606176235dced4af1922d5ac56c6b0993ad2e7d87464a32702d9b28cae9a76e8527f741b50cbc31d4c646f45d02dc69d520f241b3e7878
   languageName: node
   linkType: hard
 
@@ -1506,59 +1520,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.10":
-  version: 1.0.10
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.10"
+"@csstools/postcss-gamut-mapping@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.11"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6c2dab6a84f81904bed89cb584bd9bc6a904b49a4fa315b17be65c7d68baefe592561ee439660d5602b7481bac3be9a93189dc45404764524495400f34c6b6e6
+  checksum: 10c0/29e755013f1d1de34eb62a931ed410d2830ca3dfc81476cb3c72d9d3260b85a9adedc51aa548550c6e308f3f9640c489e6953db40e9cac9835d0421d5b14ef1f
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.18":
-  version: 4.0.18
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.18"
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.20":
+  version: 4.0.20
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.20"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/23c431068ac205392b4953dbce411e208e79e221ba8030c5e23c0b82e8fd53bc3bc4f2cdc47050f5d91a4ac69cb80f4f1853b213aa8072fa60a6cb6ff0621e04
+  checksum: 10c0/6588825a72a1471e2d6036c8cf7dbad2bf05f369d96dbdd68ff5ce7ff91803b8ee1146f5f1bf6f3ab6299944549da872914664c3f9e8ae5a31847f76f0085c74
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.16":
-  version: 3.0.16
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.16"
+"@csstools/postcss-hwb-function@npm:^3.0.18":
+  version: 3.0.18
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.18"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4deca8831a69038aff719a77df92c53578bb28e23cc61dc4ea7b1d912b1b685683a9c6232396c2616948ac2e8488ad1e2009c9c8ed30c493d97ba8ad37b6418d
+  checksum: 10c0/e9d76b0b2f9c54920124ca1804b49e3f5b26e003729418b5ef4b340ff1baa4779da1c02be618888fdbcc2d0747182352efbbd3ffe128e2417928c35c25443789
   languageName: node
   linkType: hard
 
-"@csstools/postcss-ic-unit@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@csstools/postcss-ic-unit@npm:3.0.6"
+"@csstools/postcss-ic-unit@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@csstools/postcss-ic-unit@npm:3.0.7"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a4b962327d433419fdcfdcf620ce6a5cf09aa3c93029ad08b035df1e2bc35caae31de49f1d14218de0656fced35c0d2e07e5ff7b8099c29dbfb40395fc283234
+  checksum: 10c0/2add905b75860c64d7174886fecfc76d86e3818f42f003f4bbfc0604cc7f0f31c6dbd1651e6b9512fea876190d80033578ae49e813b64b17c8cf3b1f03d8e146
   languageName: node
   linkType: hard
 
@@ -1583,17 +1597,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.6"
+"@csstools/postcss-light-dark-function@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "@csstools/postcss-light-dark-function@npm:1.0.8"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6b2c64860d789cd3e3ce875c01259333911f6e32a751a7475604de8022c13abcb578e5cb941b51bd3a2022bee883df3f6b64800c6e3559b06da283d968aeb615
+  checksum: 10c0/78fa6d799d38f14af1b32b534eedbec9478033e1fbc5a4e820f2421e865673d010b69b391546686ceb408ead64d79bb4eba2a4fb1fc9f0de70ff21e3ff8477c6
   languageName: node
   linkType: hard
 
@@ -1635,42 +1649,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^2.0.10":
-  version: 2.0.10
-  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.10"
+"@csstools/postcss-logical-viewport-units@npm:^2.0.11":
+  version: 2.0.11
+  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.11"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/fe142b11e0e8ccab4667cc5db90b45e67b7d11eaf5c038e91d867e1b18a315ef0859114185aeb48fdc1ce05986be8b644d6157fe9e19da7281f7023c99eb8877
+  checksum: 10c0/20207e9b7fc3ab52df5fcd06fde71fca4fd22bd6bd451cfc2ec6ea69994708b7fc5381e203dc4367293a8de00b1eca7a3ebe89cfa9b933d2f2cb8e3ac4d5aa86
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "@csstools/postcss-media-minmax@npm:1.1.7"
+"@csstools/postcss-media-minmax@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "@csstools/postcss-media-minmax@npm:1.1.8"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/media-query-list-parser": "npm:^2.1.12"
+    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a02943a17b540cbd909b55bbb1f8c9331badc51b613279bbdb7127c9921a5d0675bb41675a3b4d0f15e9586120e5a96d9b9786b63b2c594fbb3a238e860c6ad8
+  checksum: 10c0/7d666905282c7a89387dbce84f3429bad04870e0de264c5b1ce3e6f042b8eb72d585a18b2d7ac5e1a8c7f6785892da3cc7f6ea0b48069b06e9d383bdbc149b4a
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.10":
-  version: 2.0.10
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.10"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.11":
+  version: 2.0.11
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.11"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/media-query-list-parser": "npm:^2.1.12"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d7879e72df98d9fe2e5d85a64837e7a73c2df1aea8659d65516f0acb070317edd353531882f0bdfd81510703d1da30d6da861052a0bda85fde1f9eab94b1e467
+  checksum: 10c0/b4023a1951b7661196332852ce714a4e2fb4f1a67164ec0944e28a009b389e59c67e9de790920fcd082b122276414dd39c12ae12a4566e59e1bbcc794560a870
   languageName: node
   linkType: hard
 
@@ -1697,44 +1711,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.17":
-  version: 3.0.17
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.17"
+"@csstools/postcss-oklab-function@npm:^3.0.19":
+  version: 3.0.19
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ff27a4b6fd8490439aa0f3c91ffa2a42a8cf539d7306d9329cef7ca59f28317cee40253f402d19a18c196471fd39a05842d2974d92f1b131dc748074d91ac4ee
+  checksum: 10c0/2909f76ba408c9f60b61c479994c96200b0e1d3dbf524d5ae6dc5ca1e21d38caf974595e0d071c3900dbe3568376928085dd811aa24ea3e715bcd9de26fb0fa9
   languageName: node
   linkType: hard
 
-"@csstools/postcss-progressive-custom-properties@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.2.0"
+"@csstools/postcss-progressive-custom-properties@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.3.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/829880844fbbeef1c67e0b380057e574659b4caed38c8414c17d7eb4a0cc727afa1cd74a889bc7ca79c819ecae757810356706901cf6bb677a36ca123915cbb7
+  checksum: 10c0/6c9987d65049a70b5090dcfe42fde9ab2b3cb88911a81bb6651ed81c8baf99502ff2cbec0cb3e022426fa994b558b4bf33fd791ccdcdf683dde75b4865d34f39
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.17":
-  version: 2.0.17
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.17"
+"@csstools/postcss-relative-color-syntax@npm:^2.0.19":
+  version: 2.0.19
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/46226351b3825323e3496dcee44ff354cd3ccc9241d837659e1311f428f0b4dc878d9bb762cbb8f63243b7af346728ab7a46c311f9dc38bb609147523c698eab
+  checksum: 10c0/f0aff764f4889ff664b6fa94ddfa5a22daf39354aa2d2ac0eab893eb3ed841b7d2a72131393334d6a5379445fc80f92ab5bd63d4dc3b43746bc7c9055da46591
   languageName: node
   linkType: hard
 
@@ -1749,16 +1763,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^3.0.9":
-  version: 3.0.9
-  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.9"
+"@csstools/postcss-stepped-value-functions@npm:^3.0.10":
+  version: 3.0.10
+  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.10"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/bafe80947abc8613903f1f3f1939ece9780696774f15960aef229733e40e483dc2830145426d49c4f6d0b1dabb35f812c8a2dda0d0dcddc930321e36b5c6ca0b
+  checksum: 10c0/f9ebe50fb884d002aa40070196a827816f635b891fd2147ae5ddf1ad6df5bddbb50783d6786897bb3dffa33052565e38289392040cf4454aaa179ab00353117d
   languageName: node
   linkType: hard
 
@@ -1774,16 +1788,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^3.0.9":
-  version: 3.0.9
-  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.9"
+"@csstools/postcss-trigonometric-functions@npm:^3.0.10":
+  version: 3.0.10
+  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.10"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/7a439d31a63d35986dab634d9e415f7ce7c32a2d3d382052b5b730a259a12e44c5f1b14e318d79086253e3d5d4f7d942d0e7317d92eb3421dd08824eebec45fb
+  checksum: 10c0/31adcc66510d9788ccb0669d2761517a6135b13692007d8e4334bc0e8d3515dfecfbdcd04e060d0c09a0f5fc2f12db92221b9d53e92b65b044c89cde9a3424cb
   languageName: node
   linkType: hard
 
@@ -3201,10 +3215,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssdb@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "cssdb@npm:8.0.0"
-  checksum: 10c0/d9a31b760214624352000b16a8f7194c357f66b6c445e663ab58dd03b6f0f53efaaca6d6f96200d666e205894d2d1c346664ad993d9522ff9fc1c331804a8d62
+"cssdb@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "cssdb@npm:8.1.0"
+  checksum: 10c0/1fa1f1566c7e9964f5c71e443583eaba16a90933a3ef6803815c4281d084b75da948c415bade33d7085894fe0929c082fcb3135bf4400048cfff40d227ebd5dd
   languageName: node
   linkType: hard
 
@@ -4415,7 +4429,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.0"
     postcss: "npm:8.4.39"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:9.5.15"
+    postcss-preset-env: "npm:9.6.0"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.2"
     sass: "npm:1.77.6"
@@ -5356,18 +5370,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.12":
-  version: 6.0.12
-  resolution: "postcss-color-functional-notation@npm:6.0.12"
+"postcss-color-functional-notation@npm:^6.0.14":
+  version: 6.0.14
+  resolution: "postcss-color-functional-notation@npm:6.0.14"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2e8faecd2609e1b4eb8c1cab21ecca5e746916795df20e6997d66eb61c29fbb01d3e75fef3e0b3e1c181918a2186570441b81779b1fc429d6d8823fbfa164231
+  checksum: 10c0/fdc5188e19c3923da32fe08d50e55d0b3ca1cedf99f46331baa0a4bbd73a1fc6b4447b0346ab16049032b56ab84b98b4758a0ede7c237637e35a4cc60caac141
   languageName: node
   linkType: hard
 
@@ -5421,46 +5435,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^10.0.7":
-  version: 10.0.7
-  resolution: "postcss-custom-media@npm:10.0.7"
+"postcss-custom-media@npm:^10.0.8":
+  version: 10.0.8
+  resolution: "postcss-custom-media@npm:10.0.8"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/media-query-list-parser": "npm:^2.1.12"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.13"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4171385ab9370806861dcf7597e53fd6aa1862e77b475c9c565c95bfcc2b950f920f8da26a6dbec42e257388bca97c274635662b5e81fe3905b5e37babe06569
+  checksum: 10c0/673ca0058a2f2357a83b33ce00bbeee7cda92621c08472fa55d7ac7ae56f5f8f979132528d537f2dedf715d35a8f9b14b2f0ab6b45423d49e2554c19aab3c827
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.11":
-  version: 13.3.11
-  resolution: "postcss-custom-properties@npm:13.3.11"
+"postcss-custom-properties@npm:^13.3.12":
+  version: 13.3.12
+  resolution: "postcss-custom-properties@npm:13.3.12"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4aa95628aa5d5b6df4dfeedbc3891b9666db88d75930cadc14d2fbba0a1b72f4e3cc3d83b5a0c0b8ce44f85b4fda6ebd7fe7792a1abc0a14d7d63b9f170d299c
+  checksum: 10c0/6af9f6ac94a6ac887749cd38d4586349f6aca29269ebfdb837019a3ba0130032f0ff4899b431b5c348f4ac79a7b16fb7300a256514a6a68e32a63489c18a70e7
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^7.1.11":
-  version: 7.1.11
-  resolution: "postcss-custom-selectors@npm:7.1.11"
+"postcss-custom-selectors@npm:^7.1.12":
+  version: 7.1.12
+  resolution: "postcss-custom-selectors@npm:7.1.12"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.12"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
+    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f37d2e34239e868b35b7970ec97a7a8f657a9f92ed2b221af44f19949f7c3aedcecd0abb5fa1acb120c5ceffdf7a20869338956a37d7bfc37a83d8088f5d3dd2
+  checksum: 10c0/78a7930e4f97c42b544f00c06272264432d47f9df777684b57673bb971b7ab49d5d6fb9289a5a869125e7e50dcd0cad65cf8846501253084b73a42ffab41b2c5
   languageName: node
   linkType: hard
 
@@ -5511,16 +5525,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^5.0.6":
-  version: 5.0.6
-  resolution: "postcss-double-position-gradients@npm:5.0.6"
+"postcss-double-position-gradients@npm:^5.0.7":
+  version: 5.0.7
+  resolution: "postcss-double-position-gradients@npm:5.0.7"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9b24b13043fe506c0ddd94e707fe4f21f4f9a6c05ca49a4f45e23412951fd6a4cfa0095002d10b322ca8be60df0badae3715a27eefdeb7bf8da4fdd1ecd5d7a2
+  checksum: 10c0/52d96a34aa3e2e251edeaa2d4c2dd106c687f7910ec18266693656c0edd003384b927c855cecac07f52b5c7bdccd140abdc7e27082ce4c3755e3a966206a2cb9
   languageName: node
   linkType: hard
 
@@ -5576,18 +5590,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.17":
-  version: 6.0.17
-  resolution: "postcss-lab-function@npm:6.0.17"
+"postcss-lab-function@npm:^6.0.19":
+  version: 6.0.19
+  resolution: "postcss-lab-function@npm:6.0.19"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.3"
-    "@csstools/css-parser-algorithms": "npm:^2.7.0"
-    "@csstools/css-tokenizer": "npm:^2.3.2"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
+    "@csstools/css-color-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
     "@csstools/utilities": "npm:^1.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a331f188b02cc8beb315150232b6b58bc5793e8d61585973d352a9b4d370b908ff354ccf9ea1ba20a956fd37ea4ada918ea975c8d4f69e850d26edf0106436e8
+  checksum: 10c0/d9a91fb57dcbe967260df86e22ca335a5444f1f34d128fa7b5dbf2522772f2138ad708f1f20f0a59035d66ed736e82972ca7f1b669a157534a17ee8898af1921
   languageName: node
   linkType: hard
 
@@ -5903,61 +5917,62 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-preset-env@npm:9.5.15":
-  version: 9.5.15
-  resolution: "postcss-preset-env@npm:9.5.15"
+"postcss-preset-env@npm:9.6.0":
+  version: 9.6.0
+  resolution: "postcss-preset-env@npm:9.6.0"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^4.0.6"
-    "@csstools/postcss-color-function": "npm:^3.0.17"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.17"
-    "@csstools/postcss-exponential-functions": "npm:^1.0.8"
+    "@csstools/postcss-color-function": "npm:^3.0.19"
+    "@csstools/postcss-color-mix-function": "npm:^2.0.19"
+    "@csstools/postcss-content-alt-text": "npm:^1.0.0"
+    "@csstools/postcss-exponential-functions": "npm:^1.0.9"
     "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.10"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.18"
-    "@csstools/postcss-hwb-function": "npm:^3.0.16"
-    "@csstools/postcss-ic-unit": "npm:^3.0.6"
+    "@csstools/postcss-gamut-mapping": "npm:^1.0.11"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.20"
+    "@csstools/postcss-hwb-function": "npm:^3.0.18"
+    "@csstools/postcss-ic-unit": "npm:^3.0.7"
     "@csstools/postcss-initial": "npm:^1.0.1"
     "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.6"
+    "@csstools/postcss-light-dark-function": "npm:^1.0.8"
     "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
     "@csstools/postcss-logical-overflow": "npm:^1.0.1"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
     "@csstools/postcss-logical-resize": "npm:^2.0.1"
-    "@csstools/postcss-logical-viewport-units": "npm:^2.0.10"
-    "@csstools/postcss-media-minmax": "npm:^1.1.7"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.10"
+    "@csstools/postcss-logical-viewport-units": "npm:^2.0.11"
+    "@csstools/postcss-media-minmax": "npm:^1.1.8"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.11"
     "@csstools/postcss-nested-calc": "npm:^3.0.2"
     "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.17"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.2.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.17"
+    "@csstools/postcss-oklab-function": "npm:^3.0.19"
+    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
+    "@csstools/postcss-relative-color-syntax": "npm:^2.0.19"
     "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
-    "@csstools/postcss-stepped-value-functions": "npm:^3.0.9"
+    "@csstools/postcss-stepped-value-functions": "npm:^3.0.10"
     "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.7"
-    "@csstools/postcss-trigonometric-functions": "npm:^3.0.9"
+    "@csstools/postcss-trigonometric-functions": "npm:^3.0.10"
     "@csstools/postcss-unset-value": "npm:^3.0.1"
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.23.1"
     css-blank-pseudo: "npm:^6.0.2"
     css-has-pseudo: "npm:^6.0.5"
     css-prefers-color-scheme: "npm:^9.0.1"
-    cssdb: "npm:^8.0.0"
+    cssdb: "npm:^8.1.0"
     postcss-attribute-case-insensitive: "npm:^6.0.3"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.12"
+    postcss-color-functional-notation: "npm:^6.0.14"
     postcss-color-hex-alpha: "npm:^9.0.4"
     postcss-color-rebeccapurple: "npm:^9.0.3"
-    postcss-custom-media: "npm:^10.0.7"
-    postcss-custom-properties: "npm:^13.3.11"
-    postcss-custom-selectors: "npm:^7.1.11"
+    postcss-custom-media: "npm:^10.0.8"
+    postcss-custom-properties: "npm:^13.3.12"
+    postcss-custom-selectors: "npm:^7.1.12"
     postcss-dir-pseudo-class: "npm:^8.0.1"
-    postcss-double-position-gradients: "npm:^5.0.6"
+    postcss-double-position-gradients: "npm:^5.0.7"
     postcss-focus-visible: "npm:^9.0.1"
     postcss-focus-within: "npm:^8.0.1"
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^5.0.1"
     postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.17"
+    postcss-lab-function: "npm:^6.0.19"
     postcss-logical: "npm:^7.0.1"
     postcss-nesting: "npm:^12.1.5"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -5969,7 +5984,7 @@ __metadata:
     postcss-selector-not: "npm:^7.0.2"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e2ee0b5d7dbaddb82ff6d51b5882120862d6be184973ae3d55642923183ab441d421d5f9810fe02e680a70dbc85b20b1c2eb02c68f167dcaf3ef80a71dd40e78
+  checksum: 10c0/caa91ba4d3b897d43ab2669b3edf40b24ef32c88e23b113be8956412e64b28deed6ba229c331848fcbc0d143bfde155173fb1e1ada9ccae5037b2ee8f7e554b7
   languageName: node
   linkType: hard
 

From 6fa26d23a70340b79afd835873b6ace72332073d Mon Sep 17 00:00:00 2001
From: Wadeck Follonier <Wadeck@users.noreply.github.com>
Date: Thu, 11 Jul 2024 09:00:54 +0200
Subject: [PATCH 196/449] [JENKINS-69869] Categorize the user properties
 (#7268)

Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>
---
 .../java/hudson/model/MyViewsProperty.java    |   6 +
 .../hudson/model/PaneStatusProperties.java    |   6 +
 .../java/hudson/model/TimeZoneProperty.java   |   5 +
 core/src/main/java/hudson/model/User.java     |  69 ++----
 .../main/java/hudson/model/UserProperty.java  |  26 +++
 .../hudson/model/UserPropertyDescriptor.java  |  53 +++++
 .../userproperty/UserPropertyCategory.java    | 204 ++++++++++++++++++
 .../UserPropertyCategoryAccountAction.java    | 121 +++++++++++
 .../UserPropertyCategoryAction.java           |  65 ++++++
 .../UserPropertyCategoryAppearanceAction.java |  76 +++++++
 ...serPropertyCategoryExperimentalAction.java |  76 +++++++
 ...UserPropertyCategoryPreferencesAction.java |  76 +++++++
 .../UserPropertyCategorySecurityAction.java   |  77 +++++++
 .../hudson/search/UserSearchProperty.java     |   5 +
 .../security/HudsonPrivateSecurityRealm.java  |   7 +-
 .../UserExperimentalFlagsProperty.java        |  13 +-
 .../jenkins/security/ApiTokenProperty.java    |   6 +
 .../LastGrantedAuthoritiesProperty.java       |   6 +
 .../security/seed/UserSeedProperty.java       |   6 +
 .../hudson/model/Messages.properties          |   2 +
 .../hudson/model/User/configure.jelly         |  67 ------
 .../hudson/model/User/sidepanel.jelly         |   1 -
 .../model/userproperty/Messages.properties    |  48 +++++
 .../index.jelly                               |  72 +++++++
 .../index.properties}                         |   4 +-
 .../index_bg.properties                       |  28 +++
 .../index_ca.properties                       |   4 +
 .../index_cs.properties                       |  25 +++
 .../index_da.properties                       |  25 +++
 .../index_de.properties                       |  25 +++
 .../index_es.properties                       |  26 +++
 .../index_fi.properties                       |  24 +++
 .../index_fr.properties                       |  25 +++
 .../index_hu.properties                       |   4 +
 .../index_it.properties                       |  26 +++
 .../index_ja.properties                       |  25 +++
 .../index_ko.properties                       |   4 +
 .../index_lv.properties                       |  25 +++
 .../index_nb_NO.properties                    |  25 +++
 .../index_nl.properties                       |  25 +++
 .../index_pl.properties                       |  26 +++
 .../index_pt_BR.properties                    |  25 +++
 .../index_ru.properties                       |  25 +++
 .../index_sk.properties                       |   4 +
 .../index_sr.properties                       |   5 +
 .../index_sv_SE.properties                    |  25 +++
 .../index_tr.properties                       |  25 +++
 .../index_uk.properties                       |   4 +
 .../index_zh_TW.properties                    |  25 +++
 .../index.jelly                               |  74 +++++++
 .../index.properties                          |  24 +++
 .../index.jelly                               |  74 +++++++
 .../index.properties                          |  24 +++
 .../index.jelly                               |  74 +++++++
 .../index.properties}                         |   3 +-
 .../index.jelly                               |  75 +++++++
 .../index.properties                          |  24 +++
 .../HudsonPrivateSecurityRealm/index.jelly    |   2 +-
 .../experimentalflags/Messages.properties     |   2 +-
 .../config.jelly                              |   2 +-
 .../java/hudson/model/UserPropertyTest.java   |  10 +-
 test/src/test/java/hudson/model/UserTest.java |  23 +-
 .../HudsonPrivateSecurityRealmTest.java       |   6 +-
 .../security/ApiCrumbExclusionTest.java       |   2 +-
 .../security/ApiTokenPropertyTest.java        |   4 +-
 .../BasicHeaderApiTokenAuthenticatorTest.java |   4 +-
 .../LastGrantedAuthoritiesPropertyTest.java   |   2 +-
 .../apitoken/ApiTokenStatsRestartTest.java    |   8 +-
 .../security/apitoken/ApiTokenStatsTest.java  |   6 +-
 .../security/seed/UserSeedPropertyTest.java   |   4 +-
 .../main/resources/images/symbols/flask.svg   |   1 +
 71 files changed, 1873 insertions(+), 152 deletions(-)
 create mode 100644 core/src/main/java/hudson/model/userproperty/UserPropertyCategory.java
 create mode 100644 core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAccountAction.java
 create mode 100644 core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAction.java
 create mode 100644 core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAppearanceAction.java
 create mode 100644 core/src/main/java/hudson/model/userproperty/UserPropertyCategoryExperimentalAction.java
 create mode 100644 core/src/main/java/hudson/model/userproperty/UserPropertyCategoryPreferencesAction.java
 create mode 100644 core/src/main/java/hudson/model/userproperty/UserPropertyCategorySecurityAction.java
 delete mode 100644 core/src/main/resources/hudson/model/User/configure.jelly
 create mode 100644 core/src/main/resources/hudson/model/userproperty/Messages.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
 rename core/src/main/resources/{jenkins/model/experimentalflags/Messages_sv_SE.properties => hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties} (94%)
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_bg.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ca.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_cs.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_da.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_de.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_es.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_fi.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_fr.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_hu.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_it.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ja.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ko.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_lv.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_nb_NO.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_nl.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_pl.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_pt_BR.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ru.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sk.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sr.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sv_SE.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_tr.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_uk.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_zh_TW.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.properties
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
 rename core/src/main/resources/{jenkins/model/experimentalflags/Messages_fr.properties => hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.properties} (94%)
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
 create mode 100644 core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.properties
 create mode 100644 war/src/main/resources/images/symbols/flask.svg

diff --git a/core/src/main/java/hudson/model/MyViewsProperty.java b/core/src/main/java/hudson/model/MyViewsProperty.java
index 9d7b8b651d1c..71809d788eae 100644
--- a/core/src/main/java/hudson/model/MyViewsProperty.java
+++ b/core/src/main/java/hudson/model/MyViewsProperty.java
@@ -29,6 +29,7 @@
 import hudson.Extension;
 import hudson.Util;
 import hudson.model.Descriptor.FormException;
+import hudson.model.userproperty.UserPropertyCategory;
 import hudson.security.ACL;
 import hudson.util.FormValidation;
 import hudson.views.MyViewsTabBar;
@@ -246,6 +247,11 @@ public String getDisplayName() {
         public UserProperty newInstance(User user) {
             return new MyViewsProperty();
         }
+
+        @Override
+        public @NonNull UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Preferences.class);
+        }
     }
 
     @Override
diff --git a/core/src/main/java/hudson/model/PaneStatusProperties.java b/core/src/main/java/hudson/model/PaneStatusProperties.java
index 29a460349440..4807020ca714 100644
--- a/core/src/main/java/hudson/model/PaneStatusProperties.java
+++ b/core/src/main/java/hudson/model/PaneStatusProperties.java
@@ -2,7 +2,9 @@
 
 import static java.lang.String.format;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import hudson.model.userproperty.UserPropertyCategory;
 import hudson.util.PersistedList;
 import java.io.IOException;
 import javax.servlet.http.HttpSession;
@@ -56,6 +58,10 @@ public boolean isEnabled() {
             return false;
         }
 
+        @Override
+        public @NonNull UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Invisible.class);
+        }
     }
 
     private static class PaneStatusPropertiesSessionFallback extends PaneStatusProperties {
diff --git a/core/src/main/java/hudson/model/TimeZoneProperty.java b/core/src/main/java/hudson/model/TimeZoneProperty.java
index bdf39c58527e..2675448dad80 100644
--- a/core/src/main/java/hudson/model/TimeZoneProperty.java
+++ b/core/src/main/java/hudson/model/TimeZoneProperty.java
@@ -4,6 +4,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.Util;
+import hudson.model.userproperty.UserPropertyCategory;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import hudson.util.ListBoxModel.Option;
@@ -106,6 +107,10 @@ public FormValidation doCheckTimeZoneName(@QueryParameter String timeZoneName) {
             }
         }
 
+        @Override
+        public @NonNull UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Account.class);
+        }
     }
 
     @CheckForNull
diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index a242385cb11a..e588a79b347a 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -39,13 +39,11 @@
 import hudson.XmlFile;
 import hudson.init.InitMilestone;
 import hudson.init.Initializer;
-import hudson.model.Descriptor.FormException;
 import hudson.model.listeners.SaveableListener;
 import hudson.security.ACL;
 import hudson.security.AccessControlled;
 import hudson.security.SecurityRealm;
 import hudson.security.UserMayOrMayNotExistException2;
-import hudson.util.FormApply;
 import hudson.util.FormValidation;
 import hudson.util.RunList;
 import hudson.util.XStream2;
@@ -77,7 +75,6 @@
 import jenkins.security.LastGrantedAuthoritiesProperty;
 import jenkins.security.UserDetailsCache;
 import jenkins.util.SystemProperties;
-import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -87,7 +84,6 @@
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
-import org.kohsuke.stapler.verb.POST;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -342,6 +338,29 @@ public synchronized void addProperty(@NonNull UserProperty p) throws IOException
         save();
     }
 
+    /**
+     * Expand {@link #addProperty(UserProperty)} for multiple properties to be done at once.
+     * Expected to be used by the categorized configuration pages to update part of the properties.
+     * The properties not included in the list will be let untouched.
+     * It will call the {@link UserProperty#setUser(User)} method and at the end, {@link #save()} once.
+     *
+     * @since TODO
+     */
+    public synchronized void addProperties(@NonNull List<UserProperty> multipleProperties) throws IOException {
+        List<UserProperty> newProperties = new ArrayList<>(this.properties);
+        for (UserProperty property : multipleProperties) {
+            UserProperty oldProp = getProperty(property.getClass());
+            if (oldProp != null) {
+                newProperties.remove(oldProp);
+            }
+            newProperties.add(property);
+            property.setUser(this);
+        }
+
+        this.properties = newProperties;
+        this.save();
+    }
+
     /**
      * List of all {@link UserProperty}s exposed primarily for the remoting API.
      */
@@ -859,48 +878,6 @@ public Api getApi() {
         return new Api(this);
     }
 
-    /**
-     * Accepts submission from the configuration page.
-     */
-    @POST
-    public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
-        checkPermission(Jenkins.ADMINISTER);
-
-        JSONObject json = req.getSubmittedForm();
-        String oldFullName = this.fullName;
-        fullName = json.getString("fullName");
-        description = json.getString("description");
-
-        List<UserProperty> props = new ArrayList<>();
-        int i = 0;
-        for (UserPropertyDescriptor d : UserProperty.all()) {
-            UserProperty p = getProperty(d.clazz);
-
-            JSONObject o = json.optJSONObject("userProperty" + i++);
-            if (o != null) {
-                if (p != null) {
-                    p = p.reconfigure(req, o);
-                } else {
-                    p = d.newInstance(req, o);
-                }
-            }
-
-            if (p != null) {
-                p.setUser(this);
-                props.add(p);
-            }
-        }
-        this.properties = props;
-
-        save();
-
-        if (oldFullName != null && !oldFullName.equals(this.fullName)) {
-            UserDetailsCache.get().invalidate(oldFullName);
-        }
-
-        FormApply.success(".").generateResponse(req, rsp, this);
-    }
-
     /**
      * Deletes this user from Hudson.
      */
diff --git a/core/src/main/java/hudson/model/UserProperty.java b/core/src/main/java/hudson/model/UserProperty.java
index a9b9dbae7acd..6538a5fdf661 100644
--- a/core/src/main/java/hudson/model/UserProperty.java
+++ b/core/src/main/java/hudson/model/UserProperty.java
@@ -24,9 +24,13 @@
 
 package hudson.model;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Descriptor.FormException;
+import hudson.model.userproperty.UserPropertyCategory;
+import java.util.ArrayList;
+import java.util.List;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
@@ -58,6 +62,10 @@ public abstract class UserProperty implements ReconfigurableDescribable<UserProp
      */
     protected transient User user;
 
+    /**
+     * This method is used to inform the property about its owner.
+     * It could be called multiple times, even without change, thus it should be idempotent.
+     */
     protected void setUser(User u) {
         this.user = u;
     }
@@ -75,6 +83,24 @@ public static DescriptorExtensionList<UserProperty, UserPropertyDescriptor> all(
         return Jenkins.get().getDescriptorList(UserProperty.class);
     }
 
+    /**
+     * Returns all the registered {@link UserPropertyCategory} descriptors for a given category.
+     *
+     * @since TODO
+     */
+    public static List<UserPropertyDescriptor> allByCategoryClass(@NonNull Class<? extends UserPropertyCategory> categoryClass) {
+        DescriptorExtensionList<UserProperty, UserPropertyDescriptor> all = all();
+
+        List<UserPropertyDescriptor> onlyForTheCategory = new ArrayList<>(all.size());
+        for (UserPropertyDescriptor descriptor : all) {
+            if (descriptor.getUserPropertyCategory().getClass().equals(categoryClass)) {
+                onlyForTheCategory.add(descriptor);
+            }
+        }
+
+        return onlyForTheCategory;
+    }
+
     @Override
     public UserProperty reconfigure(StaplerRequest req, JSONObject form) throws FormException {
         return form == null ? null : getDescriptor().newInstance(req, form);
diff --git a/core/src/main/java/hudson/model/UserPropertyDescriptor.java b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
index 22e05ea59aff..ff3171c1fbf7 100644
--- a/core/src/main/java/hudson/model/UserPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
@@ -24,6 +24,12 @@
 
 package hudson.model;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.model.userproperty.UserPropertyCategory;
+import java.util.Optional;
+import org.jenkinsci.Symbol;
+
 /**
  * {@link Descriptor} for {@link UserProperty}.
  *
@@ -73,4 +79,51 @@ protected UserPropertyDescriptor() {
     public boolean isEnabled() {
         return true;
     }
+
+    /**
+     * Define the category for this user property descriptor.
+     *
+     * @return never null, always the same value for a given instance of {@link Descriptor}.
+     *
+     * @since TODO
+     */
+    public @NonNull UserPropertyCategory getUserPropertyCategory() {
+        // As this method is expected to be overloaded by subclasses
+        // the logic here is just done to support plugins with older core version
+        String categoryAsString = this.getUserPropertyCategoryAsString();
+        if (categoryAsString != null) {
+            Optional<UserPropertyCategory> firstIfFound = UserPropertyCategory.all().stream()
+                    .filter(cat -> {
+                        Symbol symbolAnnotation = cat.getClass().getAnnotation(Symbol.class);
+                        if (symbolAnnotation != null) {
+                            for (String symbolValue : symbolAnnotation.value()) {
+                                if (symbolValue.equalsIgnoreCase(categoryAsString)) {
+                                    return true;
+                                }
+                            }
+                        }
+                        return false;
+                    })
+                    .findFirst();
+            if (firstIfFound.isPresent()) {
+                return firstIfFound.get();
+            }
+        }
+        return UserPropertyCategory.get(UserPropertyCategory.Unclassified.class);
+    }
+
+    /**
+     * Method proposed to prevent plugins to rely on too recent core version
+     * while keeping the possibility to use the categories.
+     *
+     * @deprecated This should only be used when the core requirement is below the version this method was added
+     *
+     * @return String name corresponding to the symbol of {@link #getUserPropertyCategory()}
+     *
+     * @since TODO
+     */
+    @Deprecated
+    protected @CheckForNull String getUserPropertyCategoryAsString() {
+        return null;
+    }
 }
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategory.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategory.java
new file mode 100644
index 000000000000..803b7e2d3527
--- /dev/null
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategory.java
@@ -0,0 +1,204 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2022, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.model.userproperty;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
+import hudson.ExtensionList;
+import hudson.ExtensionPoint;
+import hudson.model.ModelObject;
+import hudson.model.UserProperty;
+import hudson.model.UserPropertyDescriptor;
+import org.jenkinsci.Symbol;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
+
+/**
+ * Grouping of related {@link UserProperty}s.
+ *
+ * <p>
+ * To facilitate the separation of the user properties into multiple pages, tabs, and so on,
+ * {@link UserProperty}s are classified into categories (such as "security", "preferences", as well
+ * as the catch-all "unclassified".) Categories themselves are extensible &mdash; plugins may introduce
+ * its own category as well, although that should only happen if you are creating a big enough subsystem.
+ *
+ * @since TODO
+ * @see UserProperty
+ */
+public abstract class UserPropertyCategory implements ExtensionPoint, ModelObject {
+    /**
+     * One-line plain text message that explains what this category is about.
+     * This can be used in the UI to help the user pick the right category.
+     *
+     * The text should be longer than {@link #getDisplayName()}
+     */
+    public abstract String getShortDescription();
+
+    /**
+     * Returns all the registered {@link UserPropertyCategory} descriptors.
+     */
+    public static ExtensionList<UserPropertyCategory> all() {
+        return ExtensionList.lookup(UserPropertyCategory.class);
+    }
+
+    public static @NonNull <T extends UserPropertyCategory> T get(Class<T> type) {
+        T category = all().get(type);
+        if (category == null) {
+            throw new AssertionError("Category not found. It seems the " + type + " is not annotated with @Extension and so not registered");
+        }
+        return category;
+    }
+
+    /**
+     * This category is used when the {@link hudson.model.UserPropertyDescriptor} has not implemented
+     * the {@link UserPropertyDescriptor#getUserPropertyCategory()} method
+     * (or the getUserPropertyCategoryAsString method for compatibility reason).
+     * <p>
+     * If you do not know what to use, choose the {@link Account} instead of this one.
+     */
+    @Extension
+    @Symbol("unclassified")
+    @Restricted(DoNotUse.class)
+    public static class Unclassified extends UserPropertyCategory {
+        @Override
+        public String getDisplayName() {
+            return Messages.UserPropertyCategory_Unclassified_DisplayName();
+        }
+
+        @Override
+        public String getShortDescription() {
+            return Messages.UserPropertyCategory_Unclassified_ShortDescription();
+        }
+    }
+
+    /**
+     * User property related to account settings (e.g. timezone, email, ...).
+     * <p>
+     * It could be seen as the default choice for {@link UserProperty} that are defining their category.
+     * Currently it has the same effect as {@link Unclassified} but the behavior could change in the future.
+     */
+    @Extension
+    @Symbol("account")
+    public static class Account extends UserPropertyCategory {
+        @Override
+        public String getDisplayName() {
+            return Messages.UserPropertyCategory_Account_DisplayName();
+        }
+
+        @Override
+        public String getShortDescription() {
+            return Messages.UserPropertyCategory_Account_ShortDescription();
+        }
+    }
+
+    /**
+     * Preferences related configurations (e.g. notification type, default view, ...).
+     */
+    @Extension
+    @Symbol("preferences")
+    public static class Preferences extends UserPropertyCategory {
+        @Override
+        public String getDisplayName() {
+            return Messages.UserPropertyCategory_Preferences_DisplayName();
+        }
+
+        @Override
+        public String getShortDescription() {
+            return Messages.UserPropertyCategory_Preferences_ShortDescription();
+        }
+    }
+
+    /**
+     * Per user feature flags (e.g. new design, ...).
+     */
+    @Extension
+    @Symbol("experimental")
+    public static class Experimental extends UserPropertyCategory {
+        @Override
+        public String getDisplayName() {
+            return Messages.UserPropertyCategory_Experimental_DisplayName();
+        }
+
+        @Override
+        public String getShortDescription() {
+            return Messages.UserPropertyCategory_Experimental_ShortDescription();
+        }
+    }
+
+    /**
+     * User interface related configurations (e.g. theme, language, ...).
+     * <p>
+     * See also {@link jenkins.appearance.AppearanceCategory}.
+     */
+    @Extension
+    @Symbol("appearance")
+    public static class Appearance extends UserPropertyCategory {
+        @Override
+        public String getDisplayName() {
+            return Messages.UserPropertyCategory_Appearance_DisplayName();
+        }
+
+        @Override
+        public String getShortDescription() {
+            return Messages.UserPropertyCategory_Appearance_ShortDescription();
+        }
+    }
+
+
+    /**
+     * Security related configurations (e.g. API Token, SSH keys, ...).
+     * With this separation, we can more easily add control on their modifications.
+     */
+    @Extension
+    @Symbol("security")
+    public static class Security extends UserPropertyCategory {
+        @Override
+        public String getDisplayName() {
+            return Messages.UserPropertyCategory_Security_DisplayName();
+        }
+
+        @Override
+        public String getShortDescription() {
+            return Messages.UserPropertyCategory_Security_ShortDescription();
+        }
+    }
+
+    /**
+     * For user properties that are not expected to be displayed,
+     * typically automatically configured by automated behavior, without direct user interaction.
+     */
+    @Extension
+    @Symbol("invisible")
+    public static class Invisible extends UserPropertyCategory {
+        @Override
+        public String getDisplayName() {
+            return Messages.UserPropertyCategory_Invisible_DisplayName();
+        }
+
+        @Override
+        public String getShortDescription() {
+            return Messages.UserPropertyCategory_Invisible_ShortDescription();
+        }
+    }
+}
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAccountAction.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAccountAction.java
new file mode 100644
index 000000000000..822cdc6f4c99
--- /dev/null
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAccountAction.java
@@ -0,0 +1,121 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2022, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.model.userproperty;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.DescriptorExtensionList;
+import hudson.Extension;
+import hudson.model.Action;
+import hudson.model.Descriptor;
+import hudson.model.TransientUserActionFactory;
+import hudson.model.User;
+import hudson.model.UserProperty;
+import hudson.model.UserPropertyDescriptor;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import javax.servlet.ServletException;
+import jenkins.model.Jenkins;
+import jenkins.security.UserDetailsCache;
+import net.sf.json.JSONObject;
+import org.jenkinsci.Symbol;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.verb.POST;
+
+@Restricted(NoExternalUse.class)
+public class UserPropertyCategoryAccountAction extends UserPropertyCategoryAction implements Action {
+    public UserPropertyCategoryAccountAction(@NonNull User user) {
+        super(user);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return Messages.UserPropertyCategoryAccountAction_DisplayName();
+    }
+
+    @Override
+    public String getIconFileName() {
+        return getTargetUser().hasPermission(Jenkins.ADMINISTER) ? "symbol-settings" : null;
+    }
+
+    @Override
+    public String getUrlName() {
+        return "account";
+    }
+
+    public @NonNull List<UserPropertyDescriptor> getMyCategoryDescriptors() {
+        return allByTwoCategoryClasses(UserPropertyCategory.Unclassified.class, UserPropertyCategory.Account.class);
+    }
+
+    private static List<UserPropertyDescriptor> allByTwoCategoryClasses(
+            @NonNull Class<? extends UserPropertyCategory> categoryClass1,
+            @NonNull Class<? extends UserPropertyCategory> categoryClass2
+    ) {
+        DescriptorExtensionList<UserProperty, UserPropertyDescriptor> all = UserProperty.all();
+
+        List<UserPropertyDescriptor> filteredList = new ArrayList<>(all.size());
+        for (UserPropertyDescriptor descriptor : all) {
+            Class<? extends UserPropertyCategory> currClass = descriptor.getUserPropertyCategory().getClass();
+            if (currClass.equals(categoryClass1) || currClass.equals(categoryClass2)) {
+                filteredList.add(descriptor);
+            }
+        }
+
+        return filteredList;
+    }
+
+    @POST
+    public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+        User targetUser = this.getTargetUser();
+        targetUser.checkPermission(Jenkins.ADMINISTER);
+
+        JSONObject json = req.getSubmittedForm();
+
+        String oldFullName = targetUser.getFullName();
+        targetUser.setFullName(json.getString("fullName"));
+        targetUser.setDescription(json.getString("description"));
+
+        super.doConfigSubmit(req, rsp);
+
+        if (!oldFullName.equals(targetUser.getFullName())) {
+            UserDetailsCache.get().invalidate(oldFullName);
+        }
+    }
+
+    /**
+     * Inject the outer class configuration page into the sidenav and the request routing of the user
+     */
+    @Extension(ordinal = 400)
+    @Symbol("account")
+    public static class AccountActionFactory extends TransientUserActionFactory {
+        public Collection<? extends Action> createFor(User target) {
+            return Collections.singleton(new UserPropertyCategoryAccountAction(target));
+        }
+    }
+}
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAction.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAction.java
new file mode 100644
index 000000000000..caec7c1bdf88
--- /dev/null
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAction.java
@@ -0,0 +1,65 @@
+package hudson.model.userproperty;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.model.Descriptor;
+import hudson.model.User;
+import hudson.model.UserProperty;
+import hudson.model.UserPropertyDescriptor;
+import hudson.util.FormApply;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.ServletException;
+import jenkins.model.Jenkins;
+import net.sf.json.JSONObject;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.verb.POST;
+
+public abstract class UserPropertyCategoryAction {
+
+    private final User targetUser;
+
+    public UserPropertyCategoryAction(User targetUser) {
+        this.targetUser = targetUser;
+    }
+
+    public @NonNull User getTargetUser() {
+        return targetUser;
+    }
+
+    public @NonNull abstract List<UserPropertyDescriptor> getMyCategoryDescriptors();
+
+    @POST
+    public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+        this.targetUser.checkPermission(Jenkins.ADMINISTER);
+
+        JSONObject json = req.getSubmittedForm();
+
+        List<UserProperty> props = new ArrayList<>();
+        List<UserPropertyDescriptor> myCategoryDescriptors = getMyCategoryDescriptors();
+        int i = 0;
+        for (UserPropertyDescriptor d : myCategoryDescriptors) {
+            UserProperty p = this.targetUser.getProperty(d.clazz);
+
+            JSONObject o = json.optJSONObject("userProperty" + i++);
+            if (o != null) {
+                if (p != null) {
+                    p = p.reconfigure(req, o);
+                } else {
+                    p = d.newInstance(req, o);
+                }
+            }
+
+            if (p != null) {
+                props.add(p);
+            }
+        }
+        this.targetUser.addProperties(props);
+
+        this.targetUser.save();
+
+        // we are in /user/<userLogin>/<category>/, going to /user/<userLogin>/
+        FormApply.success("..").generateResponse(req, rsp, this);
+    }
+}
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAppearanceAction.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAppearanceAction.java
new file mode 100644
index 000000000000..88d08a8add70
--- /dev/null
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAppearanceAction.java
@@ -0,0 +1,76 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2022, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.model.userproperty;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
+import hudson.model.Action;
+import hudson.model.TransientUserActionFactory;
+import hudson.model.User;
+import hudson.model.UserProperty;
+import hudson.model.UserPropertyDescriptor;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import jenkins.model.Jenkins;
+import org.jenkinsci.Symbol;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+@Restricted(NoExternalUse.class)
+public class UserPropertyCategoryAppearanceAction extends UserPropertyCategoryAction implements Action {
+    public UserPropertyCategoryAppearanceAction(@NonNull User user) {
+        super(user);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return Messages.UserPropertyCategoryAppearanceAction_DisplayName();
+    }
+
+    @Override
+    public String getIconFileName() {
+        return getTargetUser().hasPermission(Jenkins.ADMINISTER) ?  "symbol-brush-outline" : null;
+    }
+
+    @Override
+    public String getUrlName() {
+        return "appearance";
+    }
+
+    public @NonNull List<UserPropertyDescriptor> getMyCategoryDescriptors() {
+        return UserProperty.allByCategoryClass(UserPropertyCategory.Appearance.class);
+    }
+
+    /**
+     * Inject the outer class configuration page into the sidenav and the request routing of the user
+     */
+    @Extension(ordinal = 350)
+    @Symbol("appearance")
+    public static class AppearanceActionFactory extends TransientUserActionFactory {
+        public Collection<? extends Action> createFor(User target) {
+            return Collections.singleton(new UserPropertyCategoryAppearanceAction(target));
+        }
+    }
+}
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryExperimentalAction.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryExperimentalAction.java
new file mode 100644
index 000000000000..bb242bacad7a
--- /dev/null
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryExperimentalAction.java
@@ -0,0 +1,76 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2022, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.model.userproperty;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
+import hudson.model.Action;
+import hudson.model.TransientUserActionFactory;
+import hudson.model.User;
+import hudson.model.UserProperty;
+import hudson.model.UserPropertyDescriptor;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import jenkins.model.Jenkins;
+import org.jenkinsci.Symbol;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+@Restricted(NoExternalUse.class)
+public class UserPropertyCategoryExperimentalAction extends UserPropertyCategoryAction implements Action {
+    public UserPropertyCategoryExperimentalAction(@NonNull User user) {
+        super(user);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return Messages.UserPropertyCategoryExperimentalAction_DisplayName();
+    }
+
+    @Override
+    public String getIconFileName() {
+        return getTargetUser().hasPermission(Jenkins.ADMINISTER) ? "symbol-flask" : null;
+    }
+
+    @Override
+    public String getUrlName() {
+        return "experiments";
+    }
+
+    public @NonNull List<UserPropertyDescriptor> getMyCategoryDescriptors() {
+        return UserProperty.allByCategoryClass(UserPropertyCategory.Experimental.class);
+    }
+
+    /**
+     * Inject the outer class configuration page into the sidenav and the request routing of the user
+     */
+    @Extension(ordinal = 100)
+    @Symbol("experimental")
+    public static class ExperimentalActionFactory extends TransientUserActionFactory {
+        public Collection<? extends Action> createFor(User target) {
+            return Collections.singleton(new UserPropertyCategoryExperimentalAction(target));
+        }
+    }
+}
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryPreferencesAction.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryPreferencesAction.java
new file mode 100644
index 000000000000..7a74b702e6c0
--- /dev/null
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryPreferencesAction.java
@@ -0,0 +1,76 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2022, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.model.userproperty;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
+import hudson.model.Action;
+import hudson.model.TransientUserActionFactory;
+import hudson.model.User;
+import hudson.model.UserProperty;
+import hudson.model.UserPropertyDescriptor;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import jenkins.model.Jenkins;
+import org.jenkinsci.Symbol;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+@Restricted(NoExternalUse.class)
+public class UserPropertyCategoryPreferencesAction extends UserPropertyCategoryAction implements Action {
+    public UserPropertyCategoryPreferencesAction(@NonNull User user) {
+        super(user);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return Messages.UserPropertyCategoryPreferencesAction_DisplayName();
+    }
+
+    @Override
+    public String getIconFileName() {
+        return getTargetUser().hasPermission(Jenkins.ADMINISTER) ? "symbol-parameters" : null;
+    }
+
+    @Override
+    public String getUrlName() {
+        return "preferences";
+    }
+
+    public @NonNull List<UserPropertyDescriptor> getMyCategoryDescriptors() {
+        return UserProperty.allByCategoryClass(UserPropertyCategory.Preferences.class);
+    }
+
+    /**
+     * Inject the outer class configuration page into the sidenav and the request routing of the user
+     */
+    @Extension(ordinal = 300)
+    @Symbol("preferences")
+    public static class PreferencesActionFactory extends TransientUserActionFactory {
+        public Collection<? extends Action> createFor(User target) {
+            return Collections.singleton(new UserPropertyCategoryPreferencesAction(target));
+        }
+    }
+}
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategorySecurityAction.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategorySecurityAction.java
new file mode 100644
index 000000000000..a6cb3e6ed3c4
--- /dev/null
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategorySecurityAction.java
@@ -0,0 +1,77 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2022, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.model.userproperty;
+
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Extension;
+import hudson.model.Action;
+import hudson.model.TransientUserActionFactory;
+import hudson.model.User;
+import hudson.model.UserProperty;
+import hudson.model.UserPropertyDescriptor;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import jenkins.model.Jenkins;
+import org.jenkinsci.Symbol;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+@Restricted(NoExternalUse.class)
+public class UserPropertyCategorySecurityAction extends UserPropertyCategoryAction implements Action {
+    public UserPropertyCategorySecurityAction(@NonNull User user) {
+        super(user);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return Messages.UserPropertyCategorySecurityAction_DisplayName();
+    }
+
+    @Override
+    public String getIconFileName() {
+        return getTargetUser().hasPermission(Jenkins.ADMINISTER) ? "symbol-lock-closed" : null;
+    }
+
+    @Override
+    public String getUrlName() {
+        return "security";
+    }
+
+    public @NonNull List<UserPropertyDescriptor> getMyCategoryDescriptors() {
+        return UserProperty.allByCategoryClass(UserPropertyCategory.Security.class);
+    }
+
+    /**
+     * Inject the outer class configuration page into the sidenav and the request routing of the user
+     */
+    @Extension(ordinal = 200)
+    @Symbol("security")
+    public static class SecurityActionFactory extends TransientUserActionFactory {
+        public Collection<? extends Action> createFor(User target) {
+            return Collections.singleton(new UserPropertyCategorySecurityAction(target));
+        }
+    }
+}
diff --git a/core/src/main/java/hudson/search/UserSearchProperty.java b/core/src/main/java/hudson/search/UserSearchProperty.java
index 7e9836944c0b..a3515dd08874 100644
--- a/core/src/main/java/hudson/search/UserSearchProperty.java
+++ b/core/src/main/java/hudson/search/UserSearchProperty.java
@@ -5,6 +5,7 @@
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
+import hudson.model.userproperty.UserPropertyCategory;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.StaplerRequest;
@@ -54,6 +55,10 @@ public UserProperty newInstance(StaplerRequest req, JSONObject formData) throws
             return new UserSearchProperty(formData.optBoolean("insensitiveSearch"));
         }
 
+        @Override
+        public @NonNull UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Preferences.class);
+        }
     }
 
 }
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index 53b798d941db..bd122244c7e2 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -39,6 +39,7 @@
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
+import hudson.model.userproperty.UserPropertyCategory;
 import hudson.security.FederatedLoginService.FederatedIdentity;
 import hudson.security.captcha.CaptchaSupport;
 import hudson.util.FormValidation;
@@ -801,7 +802,6 @@ public boolean equals(Object o) {
             public int hashCode() {
                 return getUsername().hashCode();
             }
-
         }
 
         public static class ConverterImpl extends XStream2.PassthruConverter<Details> {
@@ -884,6 +884,11 @@ public boolean isEnabled() {
             public UserProperty newInstance(User user) {
                 return null;
             }
+
+            @Override
+            public @NonNull UserPropertyCategory getUserPropertyCategory() {
+                return UserPropertyCategory.get(UserPropertyCategory.Security.class);
+            }
         }
     }
 
diff --git a/core/src/main/java/jenkins/model/experimentalflags/UserExperimentalFlagsProperty.java b/core/src/main/java/jenkins/model/experimentalflags/UserExperimentalFlagsProperty.java
index 6732f2e5d696..85332d26973c 100644
--- a/core/src/main/java/jenkins/model/experimentalflags/UserExperimentalFlagsProperty.java
+++ b/core/src/main/java/jenkins/model/experimentalflags/UserExperimentalFlagsProperty.java
@@ -31,6 +31,7 @@
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
+import hudson.model.userproperty.UserPropertyCategory;
 import java.util.HashMap;
 import java.util.Map;
 import net.sf.json.JSONObject;
@@ -76,13 +77,19 @@ public static final class DescriptorImpl extends UserPropertyDescriptor {
         public UserProperty newInstance(@Nullable StaplerRequest req, @NonNull JSONObject formData) throws FormException {
             JSONObject flagsObj = formData.getJSONObject("flags");
             Map<String, String> flags = new HashMap<>();
-            for (Object key : flagsObj.keySet()) {
-                String value = (String) flagsObj.get((String) key);
+            for (String key : flagsObj.keySet()) {
+                String value = (String) flagsObj.get(key);
                 if (!value.isEmpty()) {
-                    flags.put((String) key, value);
+                    flags.put(key, value);
                 }
             }
             return new UserExperimentalFlagsProperty(flags);
         }
+
+        @NonNull
+        @Override
+        public UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Experimental.class);
+        }
     }
 }
diff --git a/core/src/main/java/jenkins/security/ApiTokenProperty.java b/core/src/main/java/jenkins/security/ApiTokenProperty.java
index 69904a0e4785..464fdcbdf16c 100644
--- a/core/src/main/java/jenkins/security/ApiTokenProperty.java
+++ b/core/src/main/java/jenkins/security/ApiTokenProperty.java
@@ -33,6 +33,7 @@
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
+import hudson.model.userproperty.UserPropertyCategory;
 import hudson.security.ACL;
 import hudson.util.HttpResponses;
 import hudson.util.Secret;
@@ -657,6 +658,11 @@ public HttpResponse doRevokeAllExcept(@AncestorInPath User u,
 
             return HttpResponses.ok();
         }
+
+        @Override
+        public @NonNull UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Security.class);
+        }
     }
 
     /**
diff --git a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
index 52f74d452ffa..cb8b8accf295 100644
--- a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
+++ b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
@@ -6,6 +6,7 @@
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
+import hudson.model.userproperty.UserPropertyCategory;
 import hudson.security.SecurityRealm;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -171,6 +172,11 @@ public boolean isEnabled() {
         public UserProperty newInstance(User user) {
             return null;
         }
+
+        @Override
+        public @NonNull UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Invisible.class);
+        }
     }
 
     private static final Logger LOGGER = Logger.getLogger(LastGrantedAuthoritiesProperty.class.getName());
diff --git a/core/src/main/java/jenkins/security/seed/UserSeedProperty.java b/core/src/main/java/jenkins/security/seed/UserSeedProperty.java
index d7420910cb64..968ee9320f58 100644
--- a/core/src/main/java/jenkins/security/seed/UserSeedProperty.java
+++ b/core/src/main/java/jenkins/security/seed/UserSeedProperty.java
@@ -31,6 +31,7 @@
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
+import hudson.model.userproperty.UserPropertyCategory;
 import hudson.util.HttpResponses;
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -153,5 +154,10 @@ public synchronized HttpResponse doRenewSessionSeed(@AncestorInPath @NonNull Use
         public boolean isEnabled() {
             return !DISABLE_USER_SEED && !HIDE_USER_SEED_SECTION;
         }
+
+        @Override
+        public @NonNull UserPropertyCategory getUserPropertyCategory() {
+            return UserPropertyCategory.get(UserPropertyCategory.Security.class);
+        }
     }
 }
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index 9cd382511856..d56c57ff5ee0 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -422,3 +422,5 @@ ManagementLink.Category.MISC=Other
 ManagementLink.Category.UNCATEGORIZED=Uncategorized
 
 FileParameterValue.IndexTitle=File Parameters
+
+UserPreferencesProperty.DisplayName=Preferences
diff --git a/core/src/main/resources/hudson/model/User/configure.jelly b/core/src/main/resources/hudson/model/User/configure.jelly
deleted file mode 100644
index 9b4100248559..000000000000
--- a/core/src/main/resources/hudson/model/User/configure.jelly
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Erik Ramfelt, id:cactusman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<!--
-  Config page
--->
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-  <l:layout permission="${app.ADMINISTER}" title="${%title(it.fullName)}">
-    <st:include page="sidepanel.jelly" />
-    <l:breadcrumb title="${%Configure}" />
-    <l:main-panel>
-      <f:form method="post" action="configSubmit" name="config">
-        <j:set var="instance" value="${it}"/>
-        <f:entry title="${%Full name}" help="/help/user/fullName.html">
-          <f:textbox field="fullName"/>
-        </f:entry>
-        <f:entry title="${%Description}" help="/help/user/description.html">
-          <f:textarea field="description" codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription"/>
-        </f:entry>
-
-        <!-- user property configurations -->
-        <j:invokeStatic var="descriptors" className="hudson.model.UserProperty" method="all" />
-        <j:set var="instances" value="${it.properties}" />
-        <j:forEach var="d" items="${descriptors}" varStatus="loop">
-          <j:if test="${d.enabled}">
-            <f:section title="${d.displayName}">
-              <j:set var="descriptor" value="${d}" />
-              <j:set var="instance" value="${instances[d]}" />
-
-              <f:rowSet name="userProperty${loop.index}">
-                <st:include from="${d}" page="${d.configPage}"/>
-              </f:rowSet>
-            </f:section>
-          </j:if>
-        </j:forEach>
-
-        <f:bottomButtonBar>
-          <f:submit value="${%Save}" />
-          <f:apply />
-        </f:bottomButtonBar>
-      </f:form>
-      <st:adjunct includes="lib.form.confirm" />
-    </l:main-panel>
-  </l:layout>
-</j:jelly>
diff --git a/core/src/main/resources/hudson/model/User/sidepanel.jelly b/core/src/main/resources/hudson/model/User/sidepanel.jelly
index 834061995daf..f8024b0c21b8 100644
--- a/core/src/main/resources/hudson/model/User/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/User/sidepanel.jelly
@@ -33,7 +33,6 @@ THE SOFTWARE.
     <l:tasks>
       <l:task contextMenu="false" href="${rootURL}/${it.url}/" icon="symbol-person" title="${%Status}"/>
       <l:task href="${rootURL}/${it.url}/builds" icon="symbol-build-history" title="${%Builds}"/>
-      <l:task href="${rootURL}/${it.url}/configure" icon="symbol-settings" permission="${app.ADMINISTER}" title="${%Configure}"/>
       <t:actions actions="${it.propertyActions}"/>
       <t:actions actions="${it.transientActions}"/>
       <j:if test="${it.canDelete()}">
diff --git a/core/src/main/resources/hudson/model/userproperty/Messages.properties b/core/src/main/resources/hudson/model/userproperty/Messages.properties
new file mode 100644
index 000000000000..5e52b8d2906c
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/Messages.properties
@@ -0,0 +1,48 @@
+# The MIT License
+#
+# Copyright (c) 2022, CloudBees, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+UserPropertyCategory.Unclassified.DisplayName=Unclassified
+UserPropertyCategory.Unclassified.ShortDescription=User properties without a category yet
+
+UserPropertyCategory.Account.DisplayName=Account
+UserPropertyCategory.Account.ShortDescription=User properties related to the user account configuration (e.g. timezone, email, ...)
+
+UserPropertyCategory.Preferences.DisplayName=Preferences
+UserPropertyCategory.Preferences.ShortDescription=User properties related to the user preferences (e.g. notification type, default view, ...)
+
+UserPropertyCategory.Experimental.DisplayName=Experiments
+UserPropertyCategory.Experimental.ShortDescription=Per user flags to enable/disable experimental features (e.g. new design, ...)
+
+UserPropertyCategory.Appearance.DisplayName=Appearance
+UserPropertyCategory.Appearance.ShortDescription=User properties related to the appearance of Jenkins
+
+UserPropertyCategory.Security.DisplayName=Security
+UserPropertyCategory.Security.ShortDescription=User properties related to the security of the user account (e.g. API token, SSH keys, ...)
+
+UserPropertyCategory.Invisible.DisplayName=Invisible
+UserPropertyCategory.Invisible.ShortDescription=User properties that do not require a configuration page
+
+UserPropertyCategoryAccountAction.DisplayName=Account
+UserPropertyCategoryAppearanceAction.DisplayName=Appearance
+UserPropertyCategoryExperimentalAction.DisplayName=Experiments
+UserPropertyCategoryPreferencesAction.DisplayName=Preferences
+UserPropertyCategorySecurityAction.DisplayName=Security
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
new file mode 100644
index 000000000000..8d2a8e9368e7
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
@@ -0,0 +1,72 @@
+<!--
+The MIT License
+
+Copyright (c) 2022, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+  Account "main" category for UserProperty
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+    <l:layout permission="${app.ADMINISTER}" title="${%title}">
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <l:main-panel>
+            <f:form method="post" action="configSubmit" name="config">
+                <h1>
+                    ${%title}
+                </h1>
+
+                <j:set var="thisAction" value="${it}" />
+                <j:set var="it" value="${thisAction.targetUser}" />
+                <j:set var="instance" value="${it}"/>
+
+                <f:entry title="${%Full name}" help="/help/user/fullName.html">
+                    <f:textbox field="fullName" />
+                </f:entry>
+                <f:entry title="${%Description}" help="/help/user/description.html">
+                    <f:textarea field="description" codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription" />
+                </f:entry>
+
+                <j:set var="descriptors" value="${thisAction.myCategoryDescriptors}" />
+                <j:set var="instances" value="${it.properties}" />
+                <j:forEach var="d" items="${descriptors}" varStatus="loop">
+                    <j:if test="${d.enabled}">
+                        <f:section title="${d.displayName}">
+                            <j:set var="descriptor" value="${d}" />
+                            <j:set var="instance" value="${instances[d]}" />
+
+                            <f:rowSet name="userProperty${loop.index}">
+                                <st:include from="${d}" page="${d.configPage}"/>
+                            </f:rowSet>
+                        </f:section>
+                    </j:if>
+                </j:forEach>
+                
+                <f:bottomButtonBar>
+                    <f:submit value="${%Save}" />
+                    <f:apply />
+                </f:bottomButtonBar>
+            </f:form>
+            <st:adjunct includes="lib.form.confirm" />
+        </l:main-panel>
+    </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/jenkins/model/experimentalflags/Messages_sv_SE.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
similarity index 94%
rename from core/src/main/resources/jenkins/model/experimentalflags/Messages_sv_SE.properties
rename to core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
index 4f1b584608af..41e4d5b9689f 100644
--- a/core/src/main/resources/jenkins/model/experimentalflags/Messages_sv_SE.properties
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
@@ -20,4 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-UserExperimentalFlagsProperty.DisplayName=Experiment
+title=Account
+Full\ name=Full Name
+Description=Description
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_bg.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_bg.properties
new file mode 100644
index 000000000000..8654e841998b
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_bg.properties
@@ -0,0 +1,28 @@
+# The MIT License
+#
+# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov <ash@kambanaria.org>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Description=\
+ Описание
+Full\ name=\
+ Пълно име
+Save=\
+ Запазване
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ca.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ca.properties
new file mode 100644
index 000000000000..aad7c2e559ef
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ca.properties
@@ -0,0 +1,4 @@
+# This file is under the MIT License by authors
+
+Description=Descripció
+Full\ name=Nom
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_cs.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_cs.properties
new file mode 100644
index 000000000000..541815f7d164
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_cs.properties
@@ -0,0 +1,25 @@
+# The MIT License
+#
+# Copyright (c) 2004-2010, Sun Microsystems, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Description=Popis
+Save=Uložit
+Full\ name=Jméno
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_da.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_da.properties
new file mode 100644
index 000000000000..a5abfe2acc7a
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_da.properties
@@ -0,0 +1,25 @@
+# The MIT License
+#
+# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=Dit navn
+Save=Gem
+Description=Beskrivelse
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_de.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_de.properties
new file mode 100644
index 000000000000..06240b1aa6ce
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_de.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=Ihr Name
+Description=Beschreibung
+Save=Speichern
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_es.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_es.properties
new file mode 100644
index 000000000000..f7839a14fe3d
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_es.properties
@@ -0,0 +1,26 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=Nombre
+Save=Guardar
+Description=Descripción
+
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_fi.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_fi.properties
new file mode 100644
index 000000000000..03769c1d17c4
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_fi.properties
@@ -0,0 +1,24 @@
+# The MIT License
+#
+# Copyright (c) 2004-2010, Sun Microsystems, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Description=Kuvaus
+Save=Tallenna
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_fr.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_fr.properties
new file mode 100644
index 000000000000..3b677fa5d67b
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_fr.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=Votre nom
+Description=Présentation
+Save=Sauvegarder
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_hu.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_hu.properties
new file mode 100644
index 000000000000..6e8cb34dc914
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_hu.properties
@@ -0,0 +1,4 @@
+# This file is under the MIT License by authors
+
+Description=Leírás
+Full\ name=Ön neve
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_it.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_it.properties
new file mode 100644
index 000000000000..d3523f2f3116
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_it.properties
@@ -0,0 +1,26 @@
+# The MIT License
+#
+# Italian localization plugin for Jenkins
+# Copyright © 2020 Alessandro Menti
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Description=Descrizione
+Full\ name=Nome completo
+Save=Salva
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ja.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ja.properties
new file mode 100644
index 000000000000..be1c04668bbf
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ja.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=あなたの名前
+Description=説明
+Save=保存
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ko.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ko.properties
new file mode 100644
index 000000000000..fd0ca539d7d9
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ko.properties
@@ -0,0 +1,4 @@
+# This file is under the MIT License by authors
+
+Description=소개
+Full\ name=이름
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_lv.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_lv.properties
new file mode 100644
index 000000000000..b16f28220290
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_lv.properties
@@ -0,0 +1,25 @@
+# The MIT License
+#
+# Copyright (c) 2004-2010, Sun Microsystems, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=Tavs vārds
+description.title=Apraksts
+Save=Saglabāt
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_nb_NO.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_nb_NO.properties
new file mode 100644
index 000000000000..58a3343fb3d8
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_nb_NO.properties
@@ -0,0 +1,25 @@
+# The MIT License
+#
+# Copyright (c) 2004-2010, Sun Microsystems, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Description=Beskrivelse
+Save=Lagre
+Full\ name=Ditt navn
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_nl.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_nl.properties
new file mode 100644
index 000000000000..7756763a1a74
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_nl.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=Uw naam
+Description=Omschrijving
+Save=Opslaan
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_pl.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_pl.properties
new file mode 100644
index 000000000000..f90e9574abde
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_pl.properties
@@ -0,0 +1,26 @@
+# The MIT License
+#
+# Copyright (c) 2004-2016, Sun Microsystems, Damian Szczepanik
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Description=Opis
+Full\ name=Twoje imię i nazwisko
+# User ‘{0}’ Configuration
+Save=Zapisz
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_pt_BR.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_pt_BR.properties
new file mode 100644
index 000000000000..c46179879578
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_pt_BR.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=Seu nome
+Description=Descrição
+Save=Salvar
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ru.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ru.properties
new file mode 100644
index 000000000000..b05ddbbb49a8
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_ru.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=Полное имя
+Description=Описание
+Save=Сохранить
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sk.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sk.properties
new file mode 100644
index 000000000000..8c8f98e91b07
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sk.properties
@@ -0,0 +1,4 @@
+# This file is under the MIT License by authors
+
+Description=Popis
+Full\ name=Meno
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sr.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sr.properties
new file mode 100644
index 000000000000..241621057f54
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sr.properties
@@ -0,0 +1,5 @@
+# This file is under the MIT License by authors
+
+Full\ name=Име и презиме
+Description=Опис
+Save=Сачувај
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sv_SE.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sv_SE.properties
new file mode 100644
index 000000000000..6e75a39365c2
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_sv_SE.properties
@@ -0,0 +1,25 @@
+# The MIT License
+#
+# Copyright (c) 2004-2010, Sun Microsystems, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Description=Beskrivning
+Save=Spara
+Full\ name=Ditt namn
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_tr.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_tr.properties
new file mode 100644
index 000000000000..ead6d67dee06
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_tr.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Full\ name=İsminiz
+Description=Açıklama
+Save=Kaydet
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_uk.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_uk.properties
new file mode 100644
index 000000000000..3dc2751ccdeb
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_uk.properties
@@ -0,0 +1,4 @@
+# This file is under the MIT License by authors
+
+Description=Опис
+Full\ name=Ваше ім''я
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_zh_TW.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_zh_TW.properties
new file mode 100644
index 000000000000..8a05a4258d59
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index_zh_TW.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2013, Sun Microsystems, Inc., Chunghwa Telecom Co., Ltd.,
+# and Pei-Tang Huang
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+Full\ name=全名
+Description=說明
+Save=儲存
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
new file mode 100644
index 000000000000..0d90ad4b2d76
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
@@ -0,0 +1,74 @@
+<!--
+The MIT License
+
+Copyright (c) 2022, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+  Experimental category for UserProperty
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+    <l:layout permission="${app.ADMINISTER}" title="${%title}">
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <l:main-panel>
+            <f:form method="post" action="configSubmit" name="config">
+                <h1>
+                    ${%title}
+                </h1>
+    
+                <j:set var="instance" value="${it}"/>
+                <j:set var="descriptors" value="${it.myCategoryDescriptors}" />
+                <j:set var="instances" value="${it.targetUser.properties}" />
+                <j:set var="thisAction" value="${it}" />
+                <j:set var="hasItems" value="${!descriptors.isEmpty()}" />
+                <j:choose>
+                    <j:when test="${hasItems}">
+                        <j:forEach var="d" items="${descriptors}" varStatus="loop">
+                            <j:if test="${d.enabled}">
+                                <f:section title="${d.displayName}">
+                                    <j:set var="it" value="${thisAction.targetUser}" />
+                                    <j:set var="descriptor" value="${d}" />
+                                    <j:set var="instance" value="${instances[d]}" />
+                        
+                                    <f:rowSet name="userProperty${loop.index}">
+                                        <st:include from="${d}" page="${d.configPage}"/>
+                                    </f:rowSet>
+                                </f:section>
+                            </j:if>
+                        </j:forEach>
+                    </j:when>
+                    <j:otherwise>
+                        <div class="jenkins-alert jenkins-alert-info jenkins-form-item">
+                            ${%warningNoItems}
+                        </div>
+                    </j:otherwise>
+                </j:choose>
+                
+                <f:bottomButtonBar>
+                    <f:submit value="${%Save}" />
+                    <f:apply />
+                </f:bottomButtonBar>
+            </f:form>
+            <st:adjunct includes="lib.form.confirm" />
+        </l:main-panel>
+    </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.properties
new file mode 100644
index 000000000000..f24a3f6e3851
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.properties
@@ -0,0 +1,24 @@
+# The MIT License
+# 
+# Copyright (c) 2022, CloudBees, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+title=Appearance
+warningNoItems=No appearance items are available for configuration.
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
new file mode 100644
index 000000000000..0d90ad4b2d76
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
@@ -0,0 +1,74 @@
+<!--
+The MIT License
+
+Copyright (c) 2022, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+  Experimental category for UserProperty
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+    <l:layout permission="${app.ADMINISTER}" title="${%title}">
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <l:main-panel>
+            <f:form method="post" action="configSubmit" name="config">
+                <h1>
+                    ${%title}
+                </h1>
+    
+                <j:set var="instance" value="${it}"/>
+                <j:set var="descriptors" value="${it.myCategoryDescriptors}" />
+                <j:set var="instances" value="${it.targetUser.properties}" />
+                <j:set var="thisAction" value="${it}" />
+                <j:set var="hasItems" value="${!descriptors.isEmpty()}" />
+                <j:choose>
+                    <j:when test="${hasItems}">
+                        <j:forEach var="d" items="${descriptors}" varStatus="loop">
+                            <j:if test="${d.enabled}">
+                                <f:section title="${d.displayName}">
+                                    <j:set var="it" value="${thisAction.targetUser}" />
+                                    <j:set var="descriptor" value="${d}" />
+                                    <j:set var="instance" value="${instances[d]}" />
+                        
+                                    <f:rowSet name="userProperty${loop.index}">
+                                        <st:include from="${d}" page="${d.configPage}"/>
+                                    </f:rowSet>
+                                </f:section>
+                            </j:if>
+                        </j:forEach>
+                    </j:when>
+                    <j:otherwise>
+                        <div class="jenkins-alert jenkins-alert-info jenkins-form-item">
+                            ${%warningNoItems}
+                        </div>
+                    </j:otherwise>
+                </j:choose>
+                
+                <f:bottomButtonBar>
+                    <f:submit value="${%Save}" />
+                    <f:apply />
+                </f:bottomButtonBar>
+            </f:form>
+            <st:adjunct includes="lib.form.confirm" />
+        </l:main-panel>
+    </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.properties
new file mode 100644
index 000000000000..4e5e6b02073d
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.properties
@@ -0,0 +1,24 @@
+# The MIT License
+# 
+# Copyright (c) 2022, CloudBees, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+title=Experiments
+warningNoItems=No experiments are currently available.
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
new file mode 100644
index 000000000000..6971e5abf8d0
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
@@ -0,0 +1,74 @@
+<!--
+The MIT License
+
+Copyright (c) 2022, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+  Security category for UserProperty
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+    <l:layout permission="${app.ADMINISTER}" title="${%title}">
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <l:main-panel>
+            <f:form method="post" action="configSubmit" name="config">
+                <h1>
+                    ${%title}
+                </h1>
+
+                <j:set var="instance" value="${it}"/>
+                <j:set var="descriptors" value="${it.myCategoryDescriptors}" />
+                <j:set var="instances" value="${it.targetUser.properties}" />
+                <j:set var="thisAction" value="${it}" />
+                <j:set var="hasItems" value="${!descriptors.isEmpty()}" />
+                <j:choose>
+                    <j:when test="${hasItems}">
+                        <j:forEach var="d" items="${descriptors}" varStatus="loop">
+                            <j:if test="${d.enabled}">
+                                <f:section title="${d.displayName}">
+                                    <j:set var="it" value="${thisAction.targetUser}" />
+                                    <j:set var="descriptor" value="${d}" />
+                                    <j:set var="instance" value="${instances[d]}" />
+                        
+                                    <f:rowSet name="userProperty${loop.index}">
+                                        <st:include from="${d}" page="${d.configPage}"/>
+                                    </f:rowSet>
+                                </f:section>
+                            </j:if>
+                        </j:forEach>
+                    </j:when>
+                    <j:otherwise>
+                        <div class="jenkins-alert jenkins-alert-info jenkins-form-item">
+                            ${%warningNoItems}
+                        </div>
+                    </j:otherwise>
+                </j:choose>
+                
+                <f:bottomButtonBar>
+                    <f:submit value="${%Save}" />
+                    <f:apply />
+                </f:bottomButtonBar>
+            </f:form>
+            <st:adjunct includes="lib.form.confirm" />
+        </l:main-panel>
+    </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/jenkins/model/experimentalflags/Messages_fr.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.properties
similarity index 94%
rename from core/src/main/resources/jenkins/model/experimentalflags/Messages_fr.properties
rename to core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.properties
index 8e48740af070..89bd19371237 100644
--- a/core/src/main/resources/jenkins/model/experimentalflags/Messages_fr.properties
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.properties
@@ -20,4 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-UserExperimentalFlagsProperty.DisplayName=Expérimentations
+title=Preferences
+warningNoItems=No preferences available.
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
new file mode 100644
index 000000000000..0d90501fbbb0
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
@@ -0,0 +1,75 @@
+<!--
+The MIT License
+
+Copyright (c) 2022, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+  Security category for UserProperty
+-->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+    <l:layout permission="${app.ADMINISTER}" title="${%title}">
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <l:main-panel>
+            <f:form method="post" action="configSubmit" name="config">
+                <h1>
+                    ${%title}
+                </h1>
+
+                <j:set var="instance" value="${it}"/>
+                <j:set var="descriptors" value="${it.myCategoryDescriptors}" />
+                <j:set var="instances" value="${it.targetUser.properties}" />
+                <j:set var="thisAction" value="${it}" />
+
+                <j:set var="hasItems" value="${!descriptors.isEmpty()}" />
+                <j:choose>
+                    <j:when test="${hasItems}">
+                        <j:forEach var="d" items="${descriptors}" varStatus="loop">
+                            <j:if test="${d.enabled}">
+                                <f:section title="${d.displayName}">
+                                    <j:set var="it" value="${thisAction.targetUser}" />
+                                    <j:set var="descriptor" value="${d}" />
+                                    <j:set var="instance" value="${instances[d]}" />
+                
+                                    <f:rowSet name="userProperty${loop.index}">
+                                        <st:include from="${d}" page="${d.configPage}"/>
+                                    </f:rowSet>
+                                </f:section>
+                            </j:if>
+                        </j:forEach>
+                    </j:when>
+                    <j:otherwise>
+                        <div class="jenkins-alert jenkins-alert-info jenkins-form-item">
+                            ${%warningNoItems}
+                        </div>
+                    </j:otherwise>
+                </j:choose>
+
+                <f:bottomButtonBar>
+                    <f:submit value="${%Save}" />
+                    <f:apply />
+                </f:bottomButtonBar>
+            </f:form>
+            <st:adjunct includes="lib.form.confirm" />
+        </l:main-panel>
+    </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.properties
new file mode 100644
index 000000000000..be9c8e93e5f2
--- /dev/null
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.properties
@@ -0,0 +1,24 @@
+# The MIT License
+# 
+# Copyright (c) 2022, CloudBees, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+title=Security
+warningNoItems=No security configuration available.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
index 88939feeaca3..559e2370a720 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -63,7 +63,7 @@ THE SOFTWARE.
               </td>
               <td>
                 <div class="jenkins-table__cell__button-wrapper">
-                  <a href="${user.url}/configure" class="jenkins-button jenkins-button--tertiary">
+                  <a href="${user.url}/" class="jenkins-button jenkins-button--tertiary">
                     <l:icon src="symbol-settings" />
                   </a>
                 </div>
diff --git a/core/src/main/resources/jenkins/model/experimentalflags/Messages.properties b/core/src/main/resources/jenkins/model/experimentalflags/Messages.properties
index ddf8f546e32b..13e00e615459 100644
--- a/core/src/main/resources/jenkins/model/experimentalflags/Messages.properties
+++ b/core/src/main/resources/jenkins/model/experimentalflags/Messages.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-UserExperimentalFlagsProperty.DisplayName=Experiments
+UserExperimentalFlagsProperty.DisplayName=Feature preview
diff --git a/core/src/main/resources/jenkins/model/experimentalflags/UserExperimentalFlagsProperty/config.jelly b/core/src/main/resources/jenkins/model/experimentalflags/UserExperimentalFlagsProperty/config.jelly
index 4fe6097089bb..a70fddf3403e 100644
--- a/core/src/main/resources/jenkins/model/experimentalflags/UserExperimentalFlagsProperty/config.jelly
+++ b/core/src/main/resources/jenkins/model/experimentalflags/UserExperimentalFlagsProperty/config.jelly
@@ -40,7 +40,7 @@ THE SOFTWARE.
                     <thead>
                         <tr>
                             <th>${%FlagDisplayName}</th>
-                            <th>${%FlagDescription}</th>
+                            <th width="45%">${%FlagDescription}</th>
                             <th>${%FlagConfig}</th>
                         </tr>
                     </thead>
diff --git a/test/src/test/java/hudson/model/UserPropertyTest.java b/test/src/test/java/hudson/model/UserPropertyTest.java
index 0d2b7d5b1374..91c977d4ec28 100644
--- a/test/src/test/java/hudson/model/UserPropertyTest.java
+++ b/test/src/test/java/hudson/model/UserPropertyTest.java
@@ -6,6 +6,7 @@
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
+import static org.htmlunit.html.HtmlFormUtil.submit;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
@@ -35,12 +36,17 @@ public class UserPropertyTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
+    public User configRoundtrip(User u) throws Exception {
+        submit(j.createWebClient().goTo(u.getUrl()+"/account/").getFormByName("config"));
+        return u;
+    }
+
     @Test
     @Issue("JENKINS-9062")
     public void test() throws Exception {
         User u = User.get("foo");
         u.addProperty(new UserProperty1());
-        j.configRoundtrip(u);
+        configRoundtrip(u);
         for (UserProperty p : u.getAllProperties())
             assertNotNull(p);
     }
@@ -82,7 +88,7 @@ public void nestedUserReference() throws Exception {
         List<String> fileLines = Files.readAllLines(testFile.toPath(), StandardCharsets.US_ASCII);
         assertThat(fileLines, hasSize(1));
 
-        j.configRoundtrip(user);
+        configRoundtrip(user);
 
         user = User.get("nestedUserReference", false, Collections.emptyMap());
         assertThat("nested reference should exist after user configuration change", user, nestedUserSet());
diff --git a/test/src/test/java/hudson/model/UserTest.java b/test/src/test/java/hudson/model/UserTest.java
index 4f5d6e8f4365..b27adbdc15e7 100644
--- a/test/src/test/java/hudson/model/UserTest.java
+++ b/test/src/test/java/hudson/model/UserTest.java
@@ -64,12 +64,14 @@
 import jenkins.model.IdStrategy;
 import jenkins.model.Jenkins;
 import jenkins.security.ApiTokenProperty;
+import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.WebAssert;
 import org.htmlunit.WebRequest;
 import org.htmlunit.WebResponse;
 import org.htmlunit.html.HtmlForm;
 import org.htmlunit.html.HtmlPage;
 import org.htmlunit.util.WebConnectionWrapper;
+import org.jenkinsci.plugins.matrixauth.PermissionEntry;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -403,20 +405,23 @@ public void testDoConfigSubmit() throws Exception {
         User user = realm.createAccount("John Smith", "password");
         User user2 = realm.createAccount("John Smith2", "password");
         user2.save();
-        auth.add(Jenkins.ADMINISTER, user.getId());
-        auth.add(Jenkins.READ, user2.getId());
+        auth.add(Jenkins.ADMINISTER, PermissionEntry.user(user.getId()));
+        auth.add(Jenkins.READ, PermissionEntry.user(user2.getId()));
         SecurityContextHolder.getContext().setAuthentication(user.impersonate2());
-        HtmlForm form = j.createWebClient().withBasicCredentials(user.getId(), "password").goTo(user2.getUrl() + "/configure").getFormByName("config");
+        HtmlForm form = j.createWebClient().withBasicCredentials(user.getId(), "password").goTo(user2.getUrl() + "/account/").getFormByName("config");
         form.getInputByName("_.fullName").setValue("Alice Smith");
         j.submit(form);
         assertEquals("User should have full name Alice Smith.", "Alice Smith", user2.getFullName());
         SecurityContextHolder.getContext().setAuthentication(user2.impersonate2());
-        assertThrows("User should not have permission to configure another user.", AccessDeniedException3.class, () -> user.doConfigSubmit(null, null));
-        form = j.createWebClient().withBasicCredentials(user2.getId(), "password").goTo(user2.getUrl() + "/configure").getFormByName("config");
+        try (JenkinsRule.WebClient webClient = j.createWebClient().withBasicCredentials(user2.getId(), "password")) {
+            FailingHttpStatusCodeException failingHttpStatusCodeException = assertThrows("User should not have permission to configure another user.", FailingHttpStatusCodeException.class, () -> webClient.goTo(user.getUrl() + "/account/"));
+            assertThat(failingHttpStatusCodeException.getStatusCode(), is(403));
+            form = webClient.goTo(user2.getUrl() + "/account/").getFormByName("config");
+            form.getInputByName("_.fullName").setValue("John");
+            j.submit(form);
+        }
 
-        form.getInputByName("_.fullName").setValue("John");
-        j.submit(form);
-        assertEquals("User should be albe to configure himself.", "John", user2.getFullName());
+        assertEquals("User should be able to configure himself.", "John", user2.getFullName());
 
     }
 
@@ -771,7 +776,7 @@ public WebResponse getResponse(WebRequest request) throws IOException {
                 return r;
             }
         };
-        wc.login("alice").goTo("me/configure");
+        wc.login("alice").goTo("me/account/");
         assertThat(failingResources, empty());
     }
 
diff --git a/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java b/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java
index d0f58f92d5ec..92745bf5f9b0 100644
--- a/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java
+++ b/test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java
@@ -651,7 +651,7 @@ public void changingPassword_mustInvalidateAllSessions() throws Exception {
         wc_anotherTab.login(alice.getId());
         assertUserConnected(wc_anotherTab, alice.getId());
 
-        HtmlPage configurePage = wc.goTo(alice.getUrl() + "/configure");
+        HtmlPage configurePage = wc.goTo(alice.getUrl() + "/security/");
         HtmlPasswordInput password1 = configurePage.getElementByName("user.password");
         HtmlPasswordInput password2 = configurePage.getElementByName("user.password2");
 
@@ -683,7 +683,7 @@ public void notChangingPassword_hasNoImpactOnSeed() throws Exception {
         wc_anotherTab.login(alice.getId());
         assertUserConnected(wc_anotherTab, alice.getId());
 
-        HtmlPage configurePage = wc.goTo(alice.getUrl() + "/configure");
+        HtmlPage configurePage = wc.goTo(alice.getUrl() + "/security/");
         // not changing password this time
         HtmlForm form = configurePage.getFormByName("config");
         j.submit(form);
@@ -713,7 +713,7 @@ public void changingPassword_withSeedDisable_hasNoImpact() throws Exception {
             wc_anotherTab.login(alice.getId());
             assertUserConnected(wc_anotherTab, alice.getId());
 
-            HtmlPage configurePage = wc.goTo(alice.getUrl() + "/configure");
+            HtmlPage configurePage = wc.goTo(alice.getUrl() + "/security/");
             HtmlPasswordInput password1 = configurePage.getElementByName("user.password");
             HtmlPasswordInput password2 = configurePage.getElementByName("user.password2");
 
diff --git a/test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java b/test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java
index 59f89e8f4977..c746fc7cc4d5 100644
--- a/test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java
+++ b/test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java
@@ -108,7 +108,7 @@ private void makeRequestAndFail(int expectedCode) {
     }
 
     private void checkWeCanChangeMyDescription(int expectedCode) throws IOException, SAXException {
-        HtmlPage page = wc.goTo("me/configure");
+        HtmlPage page = wc.goTo("me/account/");
         HtmlForm form = page.getFormByName("config");
         form.getTextAreaByName("_.description").setText("random description: " + Math.random());
 
diff --git a/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java b/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
index 30361ed8658c..162ac231b664 100644
--- a/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
+++ b/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
@@ -80,7 +80,7 @@ public void basics() throws Exception {
         assertEquals(u, wc.executeOnServer(User::current));
 
         // Make sure the UI shows the token to the user
-        HtmlPage config = wc.goTo(u.getUrl() + "/configure");
+        HtmlPage config = wc.goTo(u.getUrl() + "/security/");
         HtmlForm form = config.getFormByName("config");
         assertEquals(token, form.getInputByName("_.apiToken").getValue());
 
@@ -126,7 +126,7 @@ public void adminsShouldBeUnableToSeeTokensByDefault() throws Exception {
 
         // Make sure the UI does not show the token to another user
         WebClient wc = createClientForUser("bar");
-        HtmlPage config = wc.goTo(u.getUrl() + "/configure");
+        HtmlPage config = wc.goTo(u.getUrl() + "/security/");
         HtmlForm form = config.getFormByName("config");
         assertEquals(Messages.ApiTokenProperty_ChangeToken_TokenIsHidden(), form.getInputByName("_.apiToken").getValue());
     }
diff --git a/test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java b/test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java
index 873194dfb089..940715b0fe6a 100644
--- a/test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java
+++ b/test/src/test/java/jenkins/security/BasicHeaderApiTokenAuthenticatorTest.java
@@ -70,7 +70,7 @@ public void legacyToken_regularCase() throws Throwable {
                     // default SecurityListener will save the user when adding the LastGrantedAuthoritiesProperty
                     // and so the user is persisted
                     wc.login("user1");
-                    HtmlPage page = wc.goTo("user/user1/configure");
+                    HtmlPage page = wc.goTo("user/user1/security/");
                     String tokenValue = ((HtmlTextInput) page.getDocumentElement().querySelector("#apiToken")).getText();
                     token.set(tokenValue);
                 }
@@ -118,7 +118,7 @@ public void legacyToken_withoutLastGrantedAuthorities() throws Throwable {
                 {
                     JenkinsRule.WebClient wc = j.createWebClient();
                     wc.login("user1");
-                    HtmlPage page = wc.goTo("user/user1/configure");
+                    HtmlPage page = wc.goTo("user/user1/security/");
                     String tokenValue = ((HtmlTextInput) page.getDocumentElement().querySelector("#apiToken")).getText();
                     token.set(tokenValue);
                 }
diff --git a/test/src/test/java/jenkins/security/LastGrantedAuthoritiesPropertyTest.java b/test/src/test/java/jenkins/security/LastGrantedAuthoritiesPropertyTest.java
index 4d29e609860f..5c1c7318c3a9 100644
--- a/test/src/test/java/jenkins/security/LastGrantedAuthoritiesPropertyTest.java
+++ b/test/src/test/java/jenkins/security/LastGrantedAuthoritiesPropertyTest.java
@@ -43,7 +43,7 @@ public void basicFlow() throws Exception {
         assertAuthorities(u.impersonate2(), "alice:authenticated:development:us");
 
         // visiting the configuration page shouldn't change authorities
-        HtmlPage pg = wc.goTo("user/alice/configure");
+        HtmlPage pg = wc.goTo("user/alice/account/");
         j.submit(pg.getFormByName("config"));
 
         p = u.getProperty(LastGrantedAuthoritiesProperty.class);
diff --git a/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java b/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java
index ea1dec6081ae..d76d382e10c1 100644
--- a/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java
+++ b/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java
@@ -103,7 +103,7 @@ public void roundtripWithRestart() throws Throwable {
                    WebClient restWc = j.createWebClient().withBasicCredentials(u.getId(), tokenValue.get());
                    checkUserIsConnected(restWc, u.getId());
 
-                   HtmlPage config = wc.goTo(u.getUrl() + "/configure");
+                   HtmlPage config = wc.goTo(u.getUrl() + "/security/");
                    assertEquals(200, config.getWebResponse().getStatusCode());
                    assertThat(config.getWebResponse().getContentAsString(), containsString(tokenUuid.get()));
                    assertThat(config.getWebResponse().getContentAsString(), containsString(tokenName));
@@ -113,7 +113,7 @@ public void roundtripWithRestart() throws Throwable {
                        restWc.goToXml("whoAmI/api/xml");
                    }
 
-                   HtmlPage configWithStats = wc.goTo(u.getUrl() + "/configure");
+                   HtmlPage configWithStats = wc.goTo(u.getUrl() + "/security/");
                    assertEquals(200, configWithStats.getWebResponse().getStatusCode());
                    HtmlSpan useCounterSpan = configWithStats.getDocumentElement().getOneHtmlElementByAttribute("span", "class", "token-use-counter");
                    assertThat(useCounterSpan.getTextContent(), containsString("" + NUM_CALL_WITH_TOKEN));
@@ -131,7 +131,7 @@ public void roundtripWithRestart() throws Throwable {
                 WebClient wc = j.createWebClient().login(u.getId());
                 checkUserIsConnected(wc, u.getId());
 
-                HtmlPage config = wc.goTo(u.getUrl() + "/configure");
+                HtmlPage config = wc.goTo(u.getUrl() + "/security/");
                 assertEquals(200, config.getWebResponse().getStatusCode());
                 assertThat(config.getWebResponse().getContentAsString(), containsString(tokenUuid.get()));
                 assertThat(config.getWebResponse().getContentAsString(), containsString(TOKEN_NAME));
@@ -144,7 +144,7 @@ public void roundtripWithRestart() throws Throwable {
                 WebClient restWc = j.createWebClient().withBasicCredentials(u.getId(), tokenValue.get());
                 checkUserIsNotConnected(restWc);
 
-                HtmlPage configWithoutToken = wc.goTo(u.getUrl() + "/configure");
+                HtmlPage configWithoutToken = wc.goTo(u.getUrl() + "/security/");
                 assertEquals(200, configWithoutToken.getWebResponse().getStatusCode());
                 assertThat(configWithoutToken.getWebResponse().getContentAsString(), not(containsString(tokenUuid.get())));
                 assertThat(configWithoutToken.getWebResponse().getContentAsString(), not(containsString(TOKEN_NAME)));
diff --git a/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java b/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java
index 68185e6efac3..0eb010e77d77 100644
--- a/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java
+++ b/test/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java
@@ -91,7 +91,7 @@ public void roundtrip() throws Exception {
         WebClient restWc = j.createWebClient().withBasicCredentials(u.getId(), tokenValue);
         checkUserIsConnected(restWc, u.getId());
 
-        HtmlPage config = wc.goTo(u.getUrl() + "/configure");
+        HtmlPage config = wc.goTo(u.getUrl() + "/security/");
         assertEquals(200, config.getWebResponse().getStatusCode());
         assertThat(config.getWebResponse().getContentAsString(), containsString(tokenUuid));
         assertThat(config.getWebResponse().getContentAsString(), containsString(tokenName));
@@ -102,7 +102,7 @@ public void roundtrip() throws Exception {
             restWc.goToXml("whoAmI/api/xml");
         }
 
-        HtmlPage configWithStats = wc.goTo(u.getUrl() + "/configure");
+        HtmlPage configWithStats = wc.goTo(u.getUrl() + "/security/");
         assertEquals(200, configWithStats.getWebResponse().getStatusCode());
         HtmlSpan useCounterSpan = configWithStats.getDocumentElement().getOneHtmlElementByAttribute("span", "class", "token-use-counter");
         assertThat(useCounterSpan.getTextContent(), containsString("" + NUM_CALL_WITH_TOKEN));
@@ -112,7 +112,7 @@ public void roundtrip() throws Exception {
         // token is no more valid
         checkUserIsNotConnected(restWc);
 
-        HtmlPage configWithoutToken = wc.goTo(u.getUrl() + "/configure");
+        HtmlPage configWithoutToken = wc.goTo(u.getUrl() + "/security/");
         assertEquals(200, configWithoutToken.getWebResponse().getStatusCode());
         assertThat(configWithoutToken.getWebResponse().getContentAsString(), not(containsString(tokenUuid)));
         assertThat(configWithoutToken.getWebResponse().getContentAsString(), not(containsString(tokenName)));
diff --git a/test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java b/test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java
index d87761ad391c..a9a3c8830a53 100644
--- a/test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java
+++ b/test/src/test/java/jenkins/security/seed/UserSeedPropertyTest.java
@@ -256,7 +256,7 @@ public void userSeedSection_isCorrectlyDisplayed() throws Exception {
         User alice = User.getById(ALICE, false);
         assertNotNull(alice);
 
-        HtmlPage htmlPage = wc.goTo(alice.getUrl() + "/configure");
+        HtmlPage htmlPage = wc.goTo(alice.getUrl() + "/security/");
         htmlPage.getDocumentElement().getOneHtmlElementByAttribute("div", "class", "user-seed-panel");
     }
 
@@ -280,7 +280,7 @@ public void userSeedSection_isCorrectlyHidden_withSpecificSetting() throws Excep
             User alice = User.getById(ALICE, false);
             assertNotNull(alice);
 
-            HtmlPage htmlPage = wc.goTo(alice.getUrl() + "/configure");
+            HtmlPage htmlPage = wc.goTo(alice.getUrl() + "/security/");
             assertThrows("Seed section should not be displayed", ElementNotFoundException.class, () -> htmlPage.getDocumentElement().getOneHtmlElementByAttribute("div", "class", "user-seed-panel"));
         }
         finally {
diff --git a/war/src/main/resources/images/symbols/flask.svg b/war/src/main/resources/images/symbols/flask.svg
new file mode 100644
index 000000000000..9c4c478d820d
--- /dev/null
+++ b/war/src/main/resources/images/symbols/flask.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="ionicon" viewBox="0 0 512 512"><title>Flask</title><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M176 48h160M118 304h276M208 48v93.48a64.09 64.09 0 01-9.88 34.18L73.21 373.49C48.4 412.78 76.63 464 123.08 464h265.84c46.45 0 74.68-51.22 49.87-90.51L313.87 175.66a64.09 64.09 0 01-9.87-34.18V48"/></svg>
\ No newline at end of file

From 4f532a13020e46cff36968b0aa1297d0adf0af70 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Thu, 11 Jul 2024 10:00:48 +0200
Subject: [PATCH 197/449] Include redirected URL, but in FINE level to avoid
 adding noise to logs.

---
 .../src/main/java/hudson/model/UpdateCenter.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index e452a73123fe..f5219ac7edbc 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -1311,7 +1311,7 @@ public File download(DownloadJob job, URL src) throws IOException {
                 File dst = job.getDestination();
                 File tmp = new File(dst.getPath() + ".tmp");
 
-                LOGGER.info(() -> "Downloading " + job.getName() + " from " + src);
+                LOGGER.info("Downloading " + job.getName());
                 Thread t = Thread.currentThread();
                 String oldName = t.getName();
                 t.setName(oldName + ": " + src);
@@ -1322,6 +1322,10 @@ public File download(DownloadJob job, URL src) throws IOException {
                                              sha512 != null ? new DigestOutputStream(_out, sha512) : _out, sha256) : _out, sha1) : _out;
                      InputStream in = con.getInputStream();
                      CountingInputStream cin = new CountingInputStream(in)) {
+                    if (LOGGER.isLoggable(Level.FINE)) {
+                        var connectionUrl = con.getURL();
+                        LOGGER.fine(() -> "Downloading " + job.getName() + " from " + getSourceUrl(src, connectionUrl));
+                    }
                     while ((len = cin.read(buf)) >= 0) {
                         out.write(buf, 0, len);
                         final int count = cin.getCount();
@@ -1369,6 +1373,16 @@ public File download(DownloadJob job, URL src) throws IOException {
             }
         }
 
+        private static String getSourceUrl(@NonNull URL src, @NonNull URL connectionURL) {
+            var sourceUrlString = src.toExternalForm();
+            var finalUrlString = connectionURL.toExternalForm();
+            if (!sourceUrlString.equals(finalUrlString)) {
+                return sourceUrlString + " → " + finalUrlString;
+            } else {
+                return sourceUrlString;
+            }
+        }
+
         /**
          * Connects to the given URL for downloading the binary. Useful for tweaking
          * how the connection gets established.

From 8ca14f8c1dce4d03d21739d0246299de6685c71d Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Thu, 11 Jul 2024 13:18:25 +0200
Subject: [PATCH 198/449] Refactor to cover error case

---
 .../main/java/hudson/model/UpdateCenter.java  | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index f5219ac7edbc..218cbf6b96a4 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -1323,8 +1323,8 @@ public File download(DownloadJob job, URL src) throws IOException {
                      InputStream in = con.getInputStream();
                      CountingInputStream cin = new CountingInputStream(in)) {
                     if (LOGGER.isLoggable(Level.FINE)) {
-                        var connectionUrl = con.getURL();
-                        LOGGER.fine(() -> "Downloading " + job.getName() + " from " + getSourceUrl(src, connectionUrl));
+                        var sourceUrlString = getSourceUrl(src, con);
+                        LOGGER.fine(() -> "Downloading " + job.getName() + " from " + sourceUrlString);
                     }
                     while ((len = cin.read(buf)) >= 0) {
                         out.write(buf, 0, len);
@@ -1362,25 +1362,22 @@ public File download(DownloadJob job, URL src) throws IOException {
                 return tmp;
             } catch (IOException e) {
                 // assist troubleshooting in case of e.g. "too many redirects" by printing actual URL
-                String extraMessage = "";
-                if (con != null && con.getURL() != null && !src.toString().equals(con.getURL().toString())) {
-                    // Two URLs are considered equal if different hosts resolve to same IP. Prefer to log in case of string inequality,
-                    // because who knows how the server responds to different host name in the request header?
-                    // Also, since it involved name resolution, it'd be an expensive operation.
-                    extraMessage = " (redirected to: " + con.getURL() + ")";
-                }
-                throw new IOException("Failed to download from " + src + extraMessage, e);
+                throw new IOException("Failed to download from " + getSourceUrl(src, con), e);
             }
         }
 
-        private static String getSourceUrl(@NonNull URL src, @NonNull URL connectionURL) {
+        private static String getSourceUrl(@NonNull URL src, @CheckForNull URLConnection connection) {
             var sourceUrlString = src.toExternalForm();
-            var finalUrlString = connectionURL.toExternalForm();
-            if (!sourceUrlString.equals(finalUrlString)) {
-                return sourceUrlString + " → " + finalUrlString;
-            } else {
-                return sourceUrlString;
+            if (connection != null) {
+                var connectionURL = connection.getURL();
+                if (connectionURL != null) {
+                    var finalUrlString = connectionURL.toExternalForm();
+                    if (!sourceUrlString.equals(finalUrlString)) {
+                        return sourceUrlString + " → " + finalUrlString;
+                    }
+                }
             }
+            return sourceUrlString;
         }
 
         /**

From c36e1ae957d4230f3096f60022922ec03f13e31b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 06:45:02 +0100
Subject: [PATCH 199/449] Update dependency node to v20.15.1 (#9454)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 228c7c6b7351..636b3e265c69 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -47,7 +47,7 @@ THE SOFTWARE.
     <!-- HTTP listener port -->
     <port>8080</port>
     <mina-sshd-api.version>2.13.1-117.v2f1a_b_66ff91d</mina-sshd-api.version>
-    <node.version>20.15.0</node.version>
+    <node.version>20.15.1</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->

From 6f650a2b1a53b085d4aab9f2f4ec2cd1cd13e0ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 12:15:16 -0700
Subject: [PATCH 200/449] Bump org.jenkins-ci.plugins:credentials from
 1361.v56f5ca_35d21c to 1371.vfee6b_095f0a_3 (#9455)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 763287b95706..b00467dc3f31 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -222,7 +222,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1361.v56f5ca_35d21c</version>
+      <version>1371.vfee6b_095f0a_3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 5162cc40ff745a6d87420baa9d026fb8c699f86b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 13 Jul 2024 12:16:28 +0100
Subject: [PATCH 201/449] Update dependency sass to v1.77.7 (#9458)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 74cd8d6954a3..d1c1469928d8 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.6.0",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.2",
-    "sass": "1.77.6",
+    "sass": "1.77.7",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.6.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index 705806a75440..1df0556db44a 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4432,7 +4432,7 @@ __metadata:
     postcss-preset-env: "npm:9.6.0"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.2"
-    sass: "npm:1.77.6"
+    sass: "npm:1.77.7"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6390,16 +6390,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.6":
-  version: 1.77.6
-  resolution: "sass@npm:1.77.6"
+"sass@npm:1.77.7":
+  version: 1.77.7
+  resolution: "sass@npm:1.77.7"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/fe5a393c0aa29eda9f83c06be9b94788b61fe8bad0616ee6e3a25d21ab504f430d40c0064fdca89b02b8e426411ae6dcd906c91f2e48c263575c3d392b6daeb1
+  checksum: 10c0/6cacbf4b5165d30a9be0f09438aed85ff0617e5087442e65c23c8464750ff1b9988855a58f36b420b62f992d1e82403f99810aba7731519d3d026847e21a5635
   languageName: node
   linkType: hard
 

From c24633c303f1c2f339cdd6d29ab7c032acb79837 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Sat, 13 Jul 2024 07:41:33 -0400
Subject: [PATCH 202/449] Call out body of `main-panel` using HTML comments
 (#9457)

---
 core/src/main/resources/lib/layout/main-panel.jelly | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/layout/main-panel.jelly b/core/src/main/resources/lib/layout/main-panel.jelly
index 3c2206e1a47a..6b16dd6f557f 100644
--- a/core/src/main/resources/lib/layout/main-panel.jelly
+++ b/core/src/main/resources/lib/layout/main-panel.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
   <st:documentation>
     Generates the body as the main content part of a Jenkins page.
   </st:documentation>
@@ -58,6 +58,8 @@ THE SOFTWARE.
       </j:choose>
     </j:if>
     <a id="skip2content" />
+    <x:comment>&#10;start of main content ⇒&#10;</x:comment>
     <d:invokeBody />
+    <x:comment>&#10;⇐ end of main content&#10;</x:comment>
   </j:if>
 </j:jelly>

From 43bfcde087a818dd06cb573662f8a9d0173d0a3b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 13 Jul 2024 19:57:55 -0700
Subject: [PATCH 203/449] Update jenkins/ath Docker tag to v5895 (#9460)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 36af3cea0e85..4feb60dda029 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5883.vdea_99c1762a_d
+export ATH_VERSION=5895.v44475b_ca_0c78
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From ca47dd45f669ddb12b03266299df0473894fd203 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:36:02 -0700
Subject: [PATCH 204/449] Update dependency webpack to v5.93.0 (#9468)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index d1c1469928d8..c0120beeeca4 100644
--- a/war/package.json
+++ b/war/package.json
@@ -48,7 +48,7 @@
     "stylelint": "16.6.1",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
-    "webpack": "5.92.1",
+    "webpack": "5.93.0",
     "webpack-cli": "5.1.4",
     "webpack-remove-empty-scripts": "1.0.4"
   },
diff --git a/war/yarn.lock b/war/yarn.lock
index 1df0556db44a..02210da4fb91 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4440,7 +4440,7 @@ __metadata:
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.1"
     tippy.js: "npm:6.3.7"
-    webpack: "npm:5.92.1"
+    webpack: "npm:5.93.0"
     webpack-cli: "npm:5.1.4"
     webpack-remove-empty-scripts: "npm:1.0.4"
     window-handle: "npm:1.0.1"
@@ -7090,9 +7090,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5.92.1":
-  version: 5.92.1
-  resolution: "webpack@npm:5.92.1"
+"webpack@npm:5.93.0":
+  version: 5.93.0
+  resolution: "webpack@npm:5.93.0"
   dependencies:
     "@types/eslint-scope": "npm:^3.7.3"
     "@types/estree": "npm:^1.0.5"
@@ -7123,7 +7123,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 10c0/43ca7c76b9c1005bd85f05303d048f918bac10276a209e3ef5e359353fbfef4e5fcee876265e6bc305bf5ef326576e02df63bc7e5af878fb7f06d7e1795b811a
+  checksum: 10c0/f0c72f1325ff57a4cc461bb978e6e1296f2a7d45c9765965271aa686ccdd448512956f4d7fdcf8c164d073af046c5a0aba17ce85ea98e33e5e2bfbfe13aa5808
   languageName: node
   linkType: hard
 

From 18fc78120796c9b4937f3d56877b0fc4dec9f4d5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:36:28 -0700
Subject: [PATCH 205/449] Update dependency sass to v1.77.8 (#9467)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index c0120beeeca4..160bf0d3d554 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "9.6.0",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.2",
-    "sass": "1.77.7",
+    "sass": "1.77.8",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
     "stylelint": "16.6.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index 02210da4fb91..3442511ce2c9 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4432,7 +4432,7 @@ __metadata:
     postcss-preset-env: "npm:9.6.0"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.2"
-    sass: "npm:1.77.7"
+    sass: "npm:1.77.8"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
@@ -6390,16 +6390,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.7":
-  version: 1.77.7
-  resolution: "sass@npm:1.77.7"
+"sass@npm:1.77.8":
+  version: 1.77.8
+  resolution: "sass@npm:1.77.8"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/6cacbf4b5165d30a9be0f09438aed85ff0617e5087442e65c23c8464750ff1b9988855a58f36b420b62f992d1e82403f99810aba7731519d3d026847e21a5635
+  checksum: 10c0/2bfd62794070352c804f949e69bd8bb5b4ec846deeb924251b2c3f7b503170fb1ae186f513f0166907749eb34e0277dee747edcb78c886fb471aac01be1e864c
   languageName: node
   linkType: hard
 

From a4a31a18a131b88ce646607cc2b5203658fe6d5c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:36:46 -0700
Subject: [PATCH 206/449] Update babel monorepo to v7.24.8 (#9466)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   6 +-
 war/yarn.lock    | 234 +++++++++++++++++++++++------------------------
 2 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/war/package.json b/war/package.json
index 160bf0d3d554..3a2a40e8fd6c 100644
--- a/war/package.json
+++ b/war/package.json
@@ -23,9 +23,9 @@
     "lint": "yarn lint:js && yarn lint:css"
   },
   "devDependencies": {
-    "@babel/cli": "7.24.7",
-    "@babel/core": "7.24.7",
-    "@babel/preset-env": "7.24.7",
+    "@babel/cli": "7.24.8",
+    "@babel/core": "7.24.8",
+    "@babel/preset-env": "7.24.8",
     "@eslint/js": "9.6.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 3442511ce2c9..70efc55f2347 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -22,9 +22,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/cli@npm:7.24.7":
-  version: 7.24.7
-  resolution: "@babel/cli@npm:7.24.7"
+"@babel/cli@npm:7.24.8":
+  version: 7.24.8
+  resolution: "@babel/cli@npm:7.24.8"
   dependencies:
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     "@nicolo-ribaudo/chokidar-2": "npm:2.1.8-no-fsevents.3"
@@ -45,7 +45,7 @@ __metadata:
   bin:
     babel: ./bin/babel.js
     babel-external-helpers: ./bin/babel-external-helpers.js
-  checksum: 10c0/0d29ffa7c817c70cf39243567a17e9e60b1f9632632f2a0f3aef061e28c228146fd98d262e09173f34e963dc7e8c29fb3e535243ffed641980691a0e4386b189
+  checksum: 10c0/b7f464ccb00db60aed63d71e980df823900d20c740bc2d9eb36c3abd4b3e2402cc438818382344085ef6603aeea2e6ee19af8f0ecb934966eccf077b87af7c7c
   languageName: node
   linkType: hard
 
@@ -59,45 +59,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/compat-data@npm:7.24.7"
-  checksum: 10c0/dcd93a5632b04536498fbe2be5af1057f635fd7f7090483d8e797878559037e5130b26862ceb359acbae93ed27e076d395ddb4663db6b28a665756ffd02d324f
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/compat-data@npm:7.24.8"
+  checksum: 10c0/7f465e9d8e44c5b516eeb3001362a3cd9a6df51dd90d3ac9868e1e7fa631ac57fc781cec6700110d4f555ba37fe59c4a71927b445106fe0062e79e79ffe11091
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.24.7":
-  version: 7.24.7
-  resolution: "@babel/core@npm:7.24.7"
+"@babel/core@npm:7.24.8":
+  version: 7.24.8
+  resolution: "@babel/core@npm:7.24.8"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helpers": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.8"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-module-transforms": "npm:^7.24.8"
+    "@babel/helpers": "npm:^7.24.8"
+    "@babel/parser": "npm:^7.24.8"
     "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.8"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/4004ba454d3c20a46ea66264e06c15b82e9f6bdc35f88819907d24620da70dbf896abac1cb4cc4b6bb8642969e45f4d808497c9054a1388a386cf8c12e9b9e0d
+  checksum: 10c0/5e21b40cc69746deda3fe3d6540351d9cb0d1ad5aea055b7c319db26071ff5789fd9580d1aa47b114f07631e8e2109f4e71696ca11d7c7e60d157767022c1bd2
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/generator@npm:7.24.7"
+"@babel/generator@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/generator@npm:7.24.8"
   dependencies:
-    "@babel/types": "npm:^7.24.7"
+    "@babel/types": "npm:^7.24.8"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/06b1f3350baf527a3309e50ffd7065f7aee04dd06e1e7db794ddfde7fe9d81f28df64edd587173f8f9295496a7ddb74b9a185d4bf4de7bb619e6d4ec45c8fd35
+  checksum: 10c0/e8a278e75a895f13a7b17dd79abe1e894fe82a5ed3abb127c33c14c66773d69993762521c094c6c364723f8f7375683b0d4a96097781175a29407baedf67b769
   languageName: node
   linkType: hard
 
@@ -120,16 +120,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-compilation-targets@npm:7.24.7"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7, @babel/helper-compilation-targets@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-compilation-targets@npm:7.24.8"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.7"
-    "@babel/helper-validator-option": "npm:^7.24.7"
-    browserslist: "npm:^4.22.2"
+    "@babel/compat-data": "npm:^7.24.8"
+    "@babel/helper-validator-option": "npm:^7.24.8"
+    browserslist: "npm:^4.23.1"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/1d580a9bcacefe65e6bf02ba1dafd7ab278269fef45b5e281d8354d95c53031e019890464e7f9351898c01502dd2e633184eb0bcda49ed2ecd538675ce310f51
+  checksum: 10c0/2885c44ef6aaf82b7e4352b30089bb09fbe08ed5ec24eb452c2bdc3c021e2a65ab412f74b3d67ec1398da0356c730b33a2ceca1d67d34c85080d31ca6efa9aec
   languageName: node
   linkType: hard
 
@@ -228,9 +228,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-module-transforms@npm:7.24.7"
+"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-module-transforms@npm:7.24.8"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-module-imports": "npm:^7.24.7"
@@ -239,7 +239,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/4f311755fcc3b4cbdb689386309cdb349cf0575a938f0b9ab5d678e1a81bbb265aa34ad93174838245f2ac7ff6d5ddbd0104638a75e4e961958ed514355687b6
+  checksum: 10c0/b76496d5045af55be9de60e59e65e56a43033f01ccc746b26b7af911c358668c206b688ce70a23ab31ec04f9728f3a38e8d01073c85244115ab62f271a7fa3d1
   languageName: node
   linkType: hard
 
@@ -252,10 +252,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.7
-  resolution: "@babel/helper-plugin-utils@npm:7.24.7"
-  checksum: 10c0/c3d38cd9b3520757bb4a279255cc3f956fc0ac1c193964bd0816ebd5c86e30710be8e35252227e0c9d9e0f4f56d9b5f916537f2bc588084b0988b4787a967d31
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.24.8, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.8
+  resolution: "@babel/helper-plugin-utils@npm:7.24.8"
+  checksum: 10c0/0376037f94a3bfe6b820a39f81220ac04f243eaee7193774b983e956c1750883ff236b30785795abbcda43fac3ece74750566830c2daa4d6e3870bb0dff34c2d
   languageName: node
   linkType: hard
 
@@ -314,10 +314,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-string-parser@npm:7.24.7"
-  checksum: 10c0/47840c7004e735f3dc93939c77b099bb41a64bf3dda0cae62f60e6f74a5ff80b63e9b7cf77b5ec25a324516381fc994e1f62f922533236a8e3a6af57decb5e1e
+"@babel/helper-string-parser@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-string-parser@npm:7.24.8"
+  checksum: 10c0/6361f72076c17fabf305e252bf6d580106429014b3ab3c1f5c4eb3e6d465536ea6b670cc0e9a637a77a9ad40454d3e41361a2909e70e305116a23d68ce094c08
   languageName: node
   linkType: hard
 
@@ -328,10 +328,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-validator-option@npm:7.24.7"
-  checksum: 10c0/21aea2b7bc5cc8ddfb828741d5c8116a84cbc35b4a3184ec53124f08e09746f1f67a6f9217850188995ca86059a7942e36d8965a6730784901def777b7e8a436
+"@babel/helper-validator-option@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-validator-option@npm:7.24.8"
+  checksum: 10c0/73db93a34ae89201351288bee7623eed81a54000779462a986105b54ffe82069e764afd15171a428b82e7c7a9b5fec10b5d5603b216317a414062edf5c67a21f
   languageName: node
   linkType: hard
 
@@ -347,13 +347,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helpers@npm:7.24.7"
+"@babel/helpers@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helpers@npm:7.24.8"
   dependencies:
     "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/aa8e230f6668773e17e141dbcab63e935c514b4b0bf1fed04d2eaefda17df68e16b61a56573f7f1d4d1e605ce6cc162b5f7e9fdf159fde1fd9b77c920ae47d27
+    "@babel/types": "npm:^7.24.8"
+  checksum: 10c0/42b8939b0a0bf72d6df9721973eb0fd7cd48f42641c5c9c740916397faa586255c06d36c6e6a7e091860723096281c620f6ffaee0011a3bb254a6f5475d89a12
   languageName: node
   linkType: hard
 
@@ -369,12 +369,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/parser@npm:7.24.7"
+"@babel/parser@npm:^7.24.7, @babel/parser@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/parser@npm:7.24.8"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/8b244756872185a1c6f14b979b3535e682ff08cb5a2a5fd97cc36c017c7ef431ba76439e95e419d43000c5b07720495b00cf29a7f0d9a483643d08802b58819b
+  checksum: 10c0/ce69671de8fa6f649abf849be262707ac700b573b8b1ce1893c66cc6cd76aeb1294a19e8c290b0eadeb2f47d3f413a2e57a281804ffbe76bfb9fa50194cf3c52
   languageName: node
   linkType: hard
 
@@ -719,21 +719,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-classes@npm:7.24.7"
+"@babel/plugin-transform-classes@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-classes@npm:7.24.8"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
     "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-replace-supers": "npm:^7.24.7"
     "@babel/helper-split-export-declaration": "npm:^7.24.7"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e51dba7ce8b770d1eee929e098d5a3be3efc3e8b941e22dda7d0097dc4e7be5feabd2da7b707ac06fcac5661b31223c541941dec08ce76c1faa55544d87d06ec
+  checksum: 10c0/4423da0f747bdb6aab1995d98a74533fa679f637ec20706810dd57fb4ba2b1885ec8cae6a0b2c3f69f27165de6ff6aa2da9c4061c893848736a8267d0c653079
   languageName: node
   linkType: hard
 
@@ -749,14 +749,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.7"
+"@babel/plugin-transform-destructuring@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/929f07a807fb62230bfbf881cfcedf187ac5daf2f1b01da94a75c7a0f6f72400268cf4bcfee534479e43260af8193e42c31ee03c8b0278ba77d0036ed6709c27
+  checksum: 10c0/804968c1d5f5072c717505296c1e5d5ec33e90550423de66de82bbcb78157156e8470bbe77a04ab8c710a88a06360a30103cf223ac7eff4829adedd6150de5ce
   languageName: node
   linkType: hard
 
@@ -902,16 +902,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.7"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.8"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.24.8"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-simple-access": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9442292b3daf6a5076cdc3c4c32bf423bda824ccaeb0dd0dc8b3effaa1fecfcb0130ae6e647fef12a5d5ff25bcc99a0d6bfc6d24a7525345e1bcf46fcdf81752
+  checksum: 10c0/f1cf552307ebfced20d3907c1dd8be941b277f0364aa655e2b5fee828c84c54065745183104dae86f1f93ea0406db970a463ef7ceaaed897623748e99640e5a7
   languageName: node
   linkType: hard
 
@@ -1026,16 +1026,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.7"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.7, @babel/plugin-transform-optional-chaining@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
     "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b9e3649b299e103b0d1767bbdba56574d065ff776e5350403b7bfd4e3982743c0cdb373d33bdbf94fa3c322d155e45d0aad946acf0aa741b870aed22dfec8b8e
+  checksum: 10c0/4ffbe1aad7dec7c9aa2bf6ceb4b2f91f96815b2784f2879bde80e46934f59d64a12cb2c6262e40897c4754d77d2c35d8a5cfed63044fdebf94978b1ed3d14b17
   languageName: node
   linkType: hard
 
@@ -1155,14 +1155,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.7"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5649e7260a138681e68b296ab5931e2b1f132f287d6b4131d49b24f9dc20d62902b7e9d63c4d2decd5683b41df35ef4b9b03f58c7f9f65e4c25a6d8bbf04e9e9
+  checksum: 10c0/2f570a4fbbdc5fd85f48165a97452826560051e3b8efb48c3bb0a0a33ee8485633439e7b71bfe3ef705583a1df43f854f49125bd759abdedc195b2cf7e60012a
   languageName: node
   linkType: hard
 
@@ -1213,14 +1213,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.24.7":
-  version: 7.24.7
-  resolution: "@babel/preset-env@npm:7.24.7"
+"@babel/preset-env@npm:7.24.8":
+  version: 7.24.8
+  resolution: "@babel/preset-env@npm:7.24.8"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-validator-option": "npm:^7.24.7"
+    "@babel/compat-data": "npm:^7.24.8"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/helper-validator-option": "npm:^7.24.8"
     "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.7"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.7"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
@@ -1251,9 +1251,9 @@ __metadata:
     "@babel/plugin-transform-block-scoping": "npm:^7.24.7"
     "@babel/plugin-transform-class-properties": "npm:^7.24.7"
     "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
-    "@babel/plugin-transform-classes": "npm:^7.24.7"
+    "@babel/plugin-transform-classes": "npm:^7.24.8"
     "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
-    "@babel/plugin-transform-destructuring": "npm:^7.24.7"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.8"
     "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
     "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7"
     "@babel/plugin-transform-dynamic-import": "npm:^7.24.7"
@@ -1266,7 +1266,7 @@ __metadata:
     "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
     "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
     "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.8"
     "@babel/plugin-transform-modules-systemjs": "npm:^7.24.7"
     "@babel/plugin-transform-modules-umd": "npm:^7.24.7"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
@@ -1276,7 +1276,7 @@ __metadata:
     "@babel/plugin-transform-object-rest-spread": "npm:^7.24.7"
     "@babel/plugin-transform-object-super": "npm:^7.24.7"
     "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.24.7"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.8"
     "@babel/plugin-transform-parameters": "npm:^7.24.7"
     "@babel/plugin-transform-private-methods": "npm:^7.24.7"
     "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
@@ -1287,7 +1287,7 @@ __metadata:
     "@babel/plugin-transform-spread": "npm:^7.24.7"
     "@babel/plugin-transform-sticky-regex": "npm:^7.24.7"
     "@babel/plugin-transform-template-literals": "npm:^7.24.7"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.7"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.8"
     "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7"
     "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7"
     "@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
@@ -1296,11 +1296,11 @@ __metadata:
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.4"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
-    core-js-compat: "npm:^3.31.0"
+    core-js-compat: "npm:^3.37.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c6714346f3ccc1271eaa90051c75b8bb57b20ef57408ab68740e2f3552693ae0ee5a4bcce3a00211d40e4947af1f7b8ab422066b953f0095461937fb72d11274
+  checksum: 10c0/a6f29498ec58989845a61f9c10b1b4e80586f1810a33db461d597cdb0ad2cd847381a993038b09f727512a08b2c1a33a330a5d4e6d65463ee98a1b4302d52ec6
   languageName: node
   linkType: hard
 
@@ -1344,32 +1344,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/traverse@npm:7.24.7"
+"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/traverse@npm:7.24.8"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.7"
+    "@babel/generator": "npm:^7.24.8"
     "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-function-name": "npm:^7.24.7"
     "@babel/helper-hoist-variables": "npm:^7.24.7"
     "@babel/helper-split-export-declaration": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
+    "@babel/parser": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.8"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/a5135e589c3f1972b8877805f50a084a04865ccb1d68e5e1f3b94a8841b3485da4142e33413d8fd76bc0e6444531d3adf1f59f359c11ffac452b743d835068ab
+  checksum: 10c0/67a5cc35824455cdb54fb9e196a44b3186283e29018a9c2331f51763921e18e891b3c60c283615a27540ec8eb4c8b89f41c237b91f732a7aa518b2eb7a0d434d
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.24.7, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.7
-  resolution: "@babel/types@npm:7.24.7"
+"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.8
+  resolution: "@babel/types@npm:7.24.8"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.24.7"
+    "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/d9ecbfc3eb2b05fb1e6eeea546836ac30d990f395ef3fe3f75ced777a222c3cfc4489492f72e0ce3d9a5a28860a1ce5f81e66b88cf5088909068b3ff4fab72c1
+  checksum: 10c0/2d7bf561ae993e794cb052c5a81d3a6d1877da13e1e2eb2a59ae75a8fb1c965b618fb3e4abd42548f5f9a4587d3a149185a32d6c4c4ea82195da7dd86f2da0f1
   languageName: node
   linkType: hard
 
@@ -2784,7 +2784,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
   version: 4.23.1
   resolution: "browserslist@npm:4.23.1"
   dependencies:
@@ -3036,12 +3036,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1":
-  version: 3.36.1
-  resolution: "core-js-compat@npm:3.36.1"
+"core-js-compat@npm:^3.36.1, core-js-compat@npm:^3.37.1":
+  version: 3.37.1
+  resolution: "core-js-compat@npm:3.37.1"
   dependencies:
     browserslist: "npm:^4.23.0"
-  checksum: 10c0/70fba18a4095cd8ac04e5ba8cee251e328935859cf2851c1f67770068ea9f9fe71accb1b7de17cd3c9a28d304a4c41712bd9aa895110ebb6e3be71b666b029d1
+  checksum: 10c0/4e2da9c900f2951a57947af7aeef4d16f2c75d7f7e966c0d0b62953f65225003ade5e84d3ae98847f65b24c109c606821d9dc925db8ca418fb761e7c81963c2a
   languageName: node
   linkType: hard
 
@@ -4409,9 +4409,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "jenkins-ui@workspace:."
   dependencies:
-    "@babel/cli": "npm:7.24.7"
-    "@babel/core": "npm:7.24.7"
-    "@babel/preset-env": "npm:7.24.7"
+    "@babel/cli": "npm:7.24.8"
+    "@babel/core": "npm:7.24.8"
+    "@babel/preset-env": "npm:7.24.8"
     "@eslint/js": "npm:9.6.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"

From 4bf964ee69d0f5903ba8e7110a93215d7549ac6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Jul 2024 15:37:08 -0700
Subject: [PATCH 207/449] Bump org.jenkins-ci:jenkins from 1.118 to 1.119
 (#9469)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 858fffab01bb..aca537f6d625 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.118</version>
+    <version>1.119</version>
     <relativePath />
   </parent>
 

From 678f1abebe70670592393f9fa1b3b48041e0868c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 14:21:24 +0100
Subject: [PATCH 208/449] Update dependency stylelint to v16.7.0 (#9470)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/war/package.json b/war/package.json
index 3a2a40e8fd6c..03c7424e0d4f 100644
--- a/war/package.json
+++ b/war/package.json
@@ -45,7 +45,7 @@
     "sass": "1.77.8",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
-    "stylelint": "16.6.1",
+    "stylelint": "16.7.0",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
     "webpack": "5.93.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 70efc55f2347..0702d9aaf22e 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1413,7 +1413,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.6.3, @csstools/css-parser-algorithms@npm:^2.7.1":
+"@csstools/css-parser-algorithms@npm:^2.7.1":
   version: 2.7.1
   resolution: "@csstools/css-parser-algorithms@npm:2.7.1"
   peerDependencies:
@@ -1422,14 +1422,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.3.1, @csstools/css-tokenizer@npm:^2.4.1":
+"@csstools/css-tokenizer@npm:^2.4.1":
   version: 2.4.1
   resolution: "@csstools/css-tokenizer@npm:2.4.1"
   checksum: 10c0/fe71cee85ec7372da07083d088b6a704f43e5d3d2d8071c4b8a86fae60408b559a218a43f8625bf2f0be5c7f90c8f3ad20a1aae1921119a1c02b51c310cc2b6b
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.11, @csstools/media-query-list-parser@npm:^2.1.13":
+"@csstools/media-query-list-parser@npm:^2.1.13":
   version: 2.1.13
   resolution: "@csstools/media-query-list-parser@npm:2.1.13"
   peerDependencies:
@@ -3301,15 +3301,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
-  version: 4.3.4
-  resolution: "debug@npm:4.3.4"
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5":
+  version: 4.3.5
+  resolution: "debug@npm:4.3.5"
   dependencies:
     ms: "npm:2.1.2"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
+  checksum: 10c0/082c375a2bdc4f4469c99f325ff458adad62a3fc2c482d59923c260cb08152f34e2659f72b3767db8bb2f21ca81a60a42d1019605a412132d7b9f59363a005cc
   languageName: node
   linkType: hard
 
@@ -4436,7 +4436,7 @@ __metadata:
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
-    stylelint: "npm:16.6.1"
+    stylelint: "npm:16.7.0"
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.1"
     tippy.js: "npm:6.3.7"
@@ -4619,10 +4619,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"known-css-properties@npm:^0.31.0":
-  version: 0.31.0
-  resolution: "known-css-properties@npm:0.31.0"
-  checksum: 10c0/8e643cbed32d7733278ba215c43dfc38fc7e77d391f66b81f07228af97d69ce2cebba03a9bc1ac859479e162aea812e258b30f4c93cb7b7adfd0622a141d36da
+"known-css-properties@npm:^0.34.0":
+  version: 0.34.0
+  resolution: "known-css-properties@npm:0.34.0"
+  checksum: 10c0/8549969f02b1858554e89faf4548ece37625d0d21b42e8d54fa53184e68e1512ef2531bb15941575ad816361ab7447b598c1b18c1b96ce0a868333d1a68f2e2c
   languageName: node
   linkType: hard
 
@@ -6107,7 +6107,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.39, postcss@npm:^8.4.33, postcss@npm:^8.4.38":
+"postcss@npm:8.4.39, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.39":
   version: 8.4.39
   resolution: "postcss@npm:8.4.39"
   dependencies:
@@ -6696,13 +6696,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:16.6.1":
-  version: 16.6.1
-  resolution: "stylelint@npm:16.6.1"
+"stylelint@npm:16.7.0":
+  version: 16.7.0
+  resolution: "stylelint@npm:16.7.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.6.3"
-    "@csstools/css-tokenizer": "npm:^2.3.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.11"
+    "@csstools/css-parser-algorithms": "npm:^2.7.1"
+    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.13"
     "@csstools/selector-specificity": "npm:^3.1.1"
     "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
@@ -6710,7 +6710,7 @@ __metadata:
     cosmiconfig: "npm:^9.0.0"
     css-functions-list: "npm:^3.2.2"
     css-tree: "npm:^2.3.1"
-    debug: "npm:^4.3.4"
+    debug: "npm:^4.3.5"
     fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
     file-entry-cache: "npm:^9.0.0"
@@ -6721,13 +6721,13 @@ __metadata:
     ignore: "npm:^5.3.1"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.31.0"
+    known-css-properties: "npm:^0.34.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
     micromatch: "npm:^4.0.7"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
-    postcss: "npm:^8.4.38"
+    postcss: "npm:^8.4.39"
     postcss-resolve-nested-selector: "npm:^0.1.1"
     postcss-safe-parser: "npm:^7.0.0"
     postcss-selector-parser: "npm:^6.1.0"
@@ -6741,7 +6741,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/8dc9b0024d6fb109380a142171ab8a134c3863aa8b8736f0083310a0d05f173dcda5680f29267697dfa0aaeb2f08aef4ef113e4bb4f8582fcfdd97f35be51d71
+  checksum: 10c0/98cb36037684433d991a0c507bbf8155309e96470177487f493e66de098631e5303b235470fc5c8086cd98013385b669c4e3cb68ad01421b898e1da6848e5d78
   languageName: node
   linkType: hard
 

From 9526f917946a77c10e0a8b49810ddee9ad92cac4 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 15 Jul 2024 13:47:22 -0700
Subject: [PATCH 209/449] Fix lint on default branch (#9472)

---
 war/src/main/scss/form/_layout.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/src/main/scss/form/_layout.scss b/war/src/main/scss/form/_layout.scss
index e32b9db9e2c0..8983245875e2 100644
--- a/war/src/main/scss/form/_layout.scss
+++ b/war/src/main/scss/form/_layout.scss
@@ -45,7 +45,7 @@
   font-weight: var(--form-label-font-weight);
   margin-top: 0;
   margin-bottom: 0.5rem;
-  padding-inline: 0 0;
+  padding-inline: 0;
 }
 
 .jenkins-form-description {

From 53bb12cfa2f5d8e9936f94f76fe1f338417ea9a8 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 15 Jul 2024 18:48:23 -0700
Subject: [PATCH 210/449] Upgrade test harness from 2225.2227.vfc00092c557a_ to
 2225.2229.vc4c7fcb_6673c (#9473)

---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index b00467dc3f31..56f5a371c12a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,7 +147,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2225.2227.vfc00092c557a_</version>
+      <version>2225.2229.vc4c7fcb_6673c</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From ef376fe6f61731ae2acee82a2ea8a760003f7b21 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 19:48:46 -0600
Subject: [PATCH 211/449] Update eslint monorepo to v9.7.0 (#9471)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 42 +++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/war/package.json b/war/package.json
index 03c7424e0d4f..5362fa04963d 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "7.24.8",
     "@babel/preset-env": "7.24.8",
-    "@eslint/js": "9.6.0",
+    "@eslint/js": "9.7.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.6.0",
+    "eslint": "9.7.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.8.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 0702d9aaf22e..0d4cec409982 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1862,10 +1862,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.6.1":
-  version: 4.10.0
-  resolution: "@eslint-community/regexpp@npm:4.10.0"
-  checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
+"@eslint-community/regexpp@npm:^4.11.0":
+  version: 4.11.0
+  resolution: "@eslint-community/regexpp@npm:4.11.0"
+  checksum: 10c0/0f6328869b2741e2794da4ad80beac55cba7de2d3b44f796a60955b0586212ec75e6b0253291fd4aad2100ad471d1480d8895f2b54f1605439ba4c875e05e523
   languageName: node
   linkType: hard
 
@@ -1897,10 +1897,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.6.0":
-  version: 9.6.0
-  resolution: "@eslint/js@npm:9.6.0"
-  checksum: 10c0/83967a7e59f2e958c9bbb3acd0929cad00d59d927ad786ed8e0d30b07f983c6bea3af6f4ad32da32145db40b7a741a816ba339bdd8960fc7fc8231716d943b7f
+"@eslint/js@npm:9.7.0":
+  version: 9.7.0
+  resolution: "@eslint/js@npm:9.7.0"
+  checksum: 10c0/73fc10666f6f4aed6f58e407e09f42ceb0d42fa60c52701c64ea9f59a81a6a8ad5caecdfd423d03088481515fe7ec17eb461acb4ef1ad70b649b6eae465b3164
   languageName: node
   linkType: hard
 
@@ -3531,13 +3531,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "eslint-scope@npm:8.0.1"
+"eslint-scope@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "eslint-scope@npm:8.0.2"
   dependencies:
     esrecurse: "npm:^4.3.0"
     estraverse: "npm:^5.2.0"
-  checksum: 10c0/0ec40ab284e58ac7ef064ecd23c127e03d339fa57173c96852336c73afc70ce5631da21dc1c772415a37a421291845538dd69db83c68d611044c0fde1d1fa269
+  checksum: 10c0/477f820647c8755229da913025b4567347fd1f0bf7cbdf3a256efff26a7e2e130433df052bd9e3d014025423dc00489bea47eb341002b15553673379c1a7dc36
   languageName: node
   linkType: hard
 
@@ -3555,15 +3555,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.6.0":
-  version: 9.6.0
-  resolution: "eslint@npm:9.6.0"
+"eslint@npm:9.7.0":
+  version: 9.7.0
+  resolution: "eslint@npm:9.7.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
-    "@eslint-community/regexpp": "npm:^4.6.1"
+    "@eslint-community/regexpp": "npm:^4.11.0"
     "@eslint/config-array": "npm:^0.17.0"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.6.0"
+    "@eslint/js": "npm:9.7.0"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3572,7 +3572,7 @@ __metadata:
     cross-spawn: "npm:^7.0.2"
     debug: "npm:^4.3.2"
     escape-string-regexp: "npm:^4.0.0"
-    eslint-scope: "npm:^8.0.1"
+    eslint-scope: "npm:^8.0.2"
     eslint-visitor-keys: "npm:^4.0.0"
     espree: "npm:^10.1.0"
     esquery: "npm:^1.5.0"
@@ -3595,7 +3595,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/82ea5ad3f28aaef89e2a98f4e6df0eae9d4e16ccd6d667c69977042e0b103fa5df98bf16d3df72d1ae77edd8c1dccfdf4afa2a55309aa8081a1bc54af6229826
+  checksum: 10c0/e2369a9534404f62f37ee5560e56fb84e0776a9c8f084550170017992772e7034d73571bdf4060e2fe9b836f136d45b07d50407d4b9361de720ee77794259274
   languageName: node
   linkType: hard
 
@@ -4412,12 +4412,12 @@ __metadata:
     "@babel/cli": "npm:7.24.8"
     "@babel/core": "npm:7.24.8"
     "@babel/preset-env": "npm:7.24.8"
-    "@eslint/js": "npm:9.6.0"
+    "@eslint/js": "npm:9.7.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.6.0"
+    eslint: "npm:9.7.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.8.0"

From cd5dad10921aab5e26813dfc41170ca900d08d19 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 16 Jul 2024 13:36:31 +0000
Subject: [PATCH 212/449] [maven-release-plugin] prepare release jenkins-2.468

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 150deffe0389..032434750fe6 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.468</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..b183c600710c 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.468</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..b9b2c4d89d7b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.468</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..2c2e71da40a2 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.468</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index aca537f6d625..b048478ca91f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.468</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.468</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.468</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-09T17:52:36Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-16T10:33:53Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 56f5a371c12a..83fa1ce6fe56 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.468</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 636b3e265c69..970601001568 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.468</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..36c4d45e9653 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.468</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..d539aa7c75b4 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.468</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 6afa31f0b31e780772d0fd842ebef141fd1d06fb Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 16 Jul 2024 13:36:52 +0000
Subject: [PATCH 213/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 032434750fe6..150deffe0389 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.468</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index b183c600710c..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.468</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index b9b2c4d89d7b..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.468</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 2c2e71da40a2..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.468</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index b048478ca91f..a952ef72e8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.468</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.468</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.468</revision>
+    <revision>2.469</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-16T10:33:53Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-16T13:36:31Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 83fa1ce6fe56..56f5a371c12a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.468</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 970601001568..636b3e265c69 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.468</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 36c4d45e9653..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.468</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index d539aa7c75b4..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.468</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 4efe3e2beef3a5a1bb3390ab467d66f94383471a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 17:49:18 +0100
Subject: [PATCH 214/449] Update dependency prettier to v3.3.3 (#9474)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 5362fa04963d..7db10f3a120d 100644
--- a/war/package.json
+++ b/war/package.json
@@ -41,7 +41,7 @@
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "9.6.0",
     "postcss-scss": "4.0.9",
-    "prettier": "3.3.2",
+    "prettier": "3.3.3",
     "sass": "1.77.8",
     "sass-loader": "14.2.1",
     "style-loader": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 0d4cec409982..c398e460b0a5 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4431,7 +4431,7 @@ __metadata:
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:9.6.0"
     postcss-scss: "npm:4.0.9"
-    prettier: "npm:3.3.2"
+    prettier: "npm:3.3.3"
     sass: "npm:1.77.8"
     sass-loader: "npm:14.2.1"
     sortablejs: "npm:1.15.2"
@@ -6125,12 +6125,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:3.3.2":
-  version: 3.3.2
-  resolution: "prettier@npm:3.3.2"
+"prettier@npm:3.3.3":
+  version: 3.3.3
+  resolution: "prettier@npm:3.3.3"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/39ed27d17f0238da6dd6571d63026566bd790d3d0edac57c285fbab525982060c8f1e01955fe38134ab10f0951a6076da37f015db8173c02f14bc7f0803a384c
+  checksum: 10c0/b85828b08e7505716324e4245549b9205c0cacb25342a030ba8885aba2039a115dbcf75a0b7ca3b37bc9d101ee61fab8113fc69ca3359f2a226f1ecc07ad2e26
   languageName: node
   linkType: hard
 

From 2d0d5d8f0e935a793094246f4d50a28fdc5cca52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 20:37:52 -0700
Subject: [PATCH 215/449] Bump commons-codec:commons-codec from 1.17.0 to
 1.17.1 (#9475)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 150deffe0389..63d8b5cd65f7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -113,7 +113,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.17.0</version>
+        <version>1.17.1</version>
       </dependency>
       <dependency>
         <groupId>commons-collections</groupId>

From c47975525dbdd4b750ed02fcd450a99ebeafbe9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:29:09 -0700
Subject: [PATCH 216/449] Bump softprops/action-gh-release from 2.0.6 to 2.0.7
 (#9477)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/publish-release-artifact.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-release-artifact.yml b/.github/workflows/publish-release-artifact.yml
index 04e3d0aa993e..b435d88ad373 100644
--- a/.github/workflows/publish-release-artifact.yml
+++ b/.github/workflows/publish-release-artifact.yml
@@ -73,7 +73,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@a74c6b72af54cfa997e81df42d94703d6313a2d0
+        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -108,7 +108,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-deb
         if: always()
-        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
+        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -144,7 +144,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-rpm
         if: always()
-        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
+        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -180,7 +180,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-msi
         if: always()
-        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
+        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -216,7 +216,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-suse-rpm
         if: always()
-        uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
+        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

From 108770cd991455a8d07fc6111368bb3b42686a12 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:29:18 +0200
Subject: [PATCH 217/449] Update dependency @babel/core to v7.24.9 (#9479)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/war/package.json b/war/package.json
index 7db10f3a120d..a1fc1a8b5d0c 100644
--- a/war/package.json
+++ b/war/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@babel/cli": "7.24.8",
-    "@babel/core": "7.24.8",
+    "@babel/core": "7.24.9",
     "@babel/preset-env": "7.24.8",
     "@eslint/js": "9.7.0",
     "babel-loader": "9.1.3",
diff --git a/war/yarn.lock b/war/yarn.lock
index c398e460b0a5..f7fa1b3c1117 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -66,38 +66,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.24.8":
-  version: 7.24.8
-  resolution: "@babel/core@npm:7.24.8"
+"@babel/core@npm:7.24.9":
+  version: 7.24.9
+  resolution: "@babel/core@npm:7.24.9"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.8"
+    "@babel/generator": "npm:^7.24.9"
     "@babel/helper-compilation-targets": "npm:^7.24.8"
-    "@babel/helper-module-transforms": "npm:^7.24.8"
+    "@babel/helper-module-transforms": "npm:^7.24.9"
     "@babel/helpers": "npm:^7.24.8"
     "@babel/parser": "npm:^7.24.8"
     "@babel/template": "npm:^7.24.7"
     "@babel/traverse": "npm:^7.24.8"
-    "@babel/types": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.9"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/5e21b40cc69746deda3fe3d6540351d9cb0d1ad5aea055b7c319db26071ff5789fd9580d1aa47b114f07631e8e2109f4e71696ca11d7c7e60d157767022c1bd2
+  checksum: 10c0/e104ec6efbf099f55184933e9ab078eb5821c792ddfef3e9c6561986ec4ff103f5c11e3d7d6e5e8929e50e2c58db1cc80e5b6f14b530335b6622095ec4b4124c
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/generator@npm:7.24.8"
+"@babel/generator@npm:^7.24.8, @babel/generator@npm:^7.24.9":
+  version: 7.24.10
+  resolution: "@babel/generator@npm:7.24.10"
   dependencies:
-    "@babel/types": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.9"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/e8a278e75a895f13a7b17dd79abe1e894fe82a5ed3abb127c33c14c66773d69993762521c094c6c364723f8f7375683b0d4a96097781175a29407baedf67b769
+  checksum: 10c0/abcfd75f625aecc87ce6036ef788b12723fd3c46530df1130d1f00d18e48b462849ddaeef8b1a02bfdcb6e28956389a98c5729dad1c3c5448307dacb6c959f29
   languageName: node
   linkType: hard
 
@@ -228,9 +228,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helper-module-transforms@npm:7.24.8"
+"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.24.9":
+  version: 7.24.9
+  resolution: "@babel/helper-module-transforms@npm:7.24.9"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-module-imports": "npm:^7.24.7"
@@ -239,7 +239,7 @@ __metadata:
     "@babel/helper-validator-identifier": "npm:^7.24.7"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/b76496d5045af55be9de60e59e65e56a43033f01ccc746b26b7af911c358668c206b688ce70a23ab31ec04f9728f3a38e8d01073c85244115ab62f271a7fa3d1
+  checksum: 10c0/e27bca43bc113731ee4f2b33a4c5bf9c7eebf4d64487b814c305cbd5feb272c29fcd3d79634ba03131ade171e5972bc7ede8dbc83ba0deb02f1e62d318c87770
   languageName: node
   linkType: hard
 
@@ -1362,14 +1362,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.8
-  resolution: "@babel/types@npm:7.24.8"
+"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.9
+  resolution: "@babel/types@npm:7.24.9"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/2d7bf561ae993e794cb052c5a81d3a6d1877da13e1e2eb2a59ae75a8fb1c965b618fb3e4abd42548f5f9a4587d3a149185a32d6c4c4ea82195da7dd86f2da0f1
+  checksum: 10c0/4970b3481cab39c5c3fdb7c28c834df5c7049f3c7f43baeafe121bb05270ebf0da7c65b097abf314877f213baa591109c82204f30d66cdd46c22ece4a2f32415
   languageName: node
   linkType: hard
 
@@ -4410,7 +4410,7 @@ __metadata:
   resolution: "jenkins-ui@workspace:."
   dependencies:
     "@babel/cli": "npm:7.24.8"
-    "@babel/core": "npm:7.24.8"
+    "@babel/core": "npm:7.24.9"
     "@babel/preset-env": "npm:7.24.8"
     "@eslint/js": "npm:9.7.0"
     babel-loader: "npm:9.1.3"

From ee2181180ce1046f6e452419afacb42c502b0d88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 09:24:52 -0700
Subject: [PATCH 218/449] Bump org.jenkins-ci.plugins.workflow:workflow-api
 from 1316.v33eb_726c50b_a_ to 1322.v857eeeea_9902 (#9481)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 56f5a371c12a..ede4a5e74bff 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -121,7 +121,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-api</artifactId>
-        <version>1316.v33eb_726c50b_a_</version>
+        <version>1322.v857eeeea_9902</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 636b3e265c69..5da75ee1a520 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -305,7 +305,7 @@ THE SOFTWARE.
                   <!-- dependency of junit, plugin-util-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>1316.v33eb_726c50b_a_</version>
+                  <version>1322.v857eeeea_9902</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 02e37b3c83e2f709a4f7508d9c9ac8c73f1fe9f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 09:25:57 -0700
Subject: [PATCH 219/449] Bump softprops/action-gh-release from 2.0.7 to 2.0.8
 (#9484)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/publish-release-artifact.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-release-artifact.yml b/.github/workflows/publish-release-artifact.yml
index b435d88ad373..ae5e6bf92602 100644
--- a/.github/workflows/publish-release-artifact.yml
+++ b/.github/workflows/publish-release-artifact.yml
@@ -73,7 +73,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@fb2d03176f42a1f0dd433ca263f314051d3edd44
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -108,7 +108,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-deb
         if: always()
-        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -144,7 +144,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-rpm
         if: always()
-        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -180,7 +180,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-msi
         if: always()
-        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -216,7 +216,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-suse-rpm
         if: always()
-        uses: softprops/action-gh-release@fb2d03176f42a1f0dd433ca263f314051d3edd44
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

From 9e629f65175e9ba1b2620fe2ffcb9282669b5261 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 19 Jul 2024 16:58:35 -0400
Subject: [PATCH 220/449] Note the plugin responsible for loading a detached
 plugin (#9478)

---
 core/src/main/java/hudson/ClassicPluginStrategy.java | 2 +-
 core/src/main/java/hudson/PluginManager.java         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 8c39f14ef2d5..3d6edf832f9f 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -252,7 +252,7 @@ private void fix(Attributes atts, List<PluginWrapper.Dependency> optionalDepende
 
         for (Dependency d : DetachedPluginsUtil.getImpliedDependencies(pluginName, jenkinsVersion)) {
             LOGGER.fine(() -> "implied dep " + pluginName + " → " + d.shortName);
-            pluginManager.considerDetachedPlugin(d.shortName);
+            pluginManager.considerDetachedPlugin(d.shortName, pluginName);
             optionalDependencies.add(d);
         }
     }
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index eda266735173..75dd52c4d7b7 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -615,7 +615,7 @@ public void run(Reactor reactor) throws Exception {
         }});
     }
 
-    void considerDetachedPlugin(String shortName) {
+    void considerDetachedPlugin(String shortName, String source) {
         if (new File(rootDir, shortName + ".jpi").isFile() ||
             new File(rootDir, shortName + ".hpi").isFile() ||
             new File(rootDir, shortName + ".jpl").isFile() ||
@@ -627,7 +627,7 @@ void considerDetachedPlugin(String shortName) {
         for (String loadedFile : loadPluginsFromWar(getDetachedLocation(), (dir, name) -> normalisePluginName(name).equals(shortName))) {
             String loaded = normalisePluginName(loadedFile);
             File arc = new File(rootDir, loaded + ".jpi");
-            LOGGER.info(() -> "Loading a detached plugin as a dependency: " + arc);
+            LOGGER.info(() -> "Loading a detached plugin " + arc + " as a dependency of " + source);
             try {
                 plugins.add(strategy.createPluginWrapper(arc));
             } catch (IOException e) {

From baa0b2c25c1735b44764006db876406721271cc6 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Sat, 20 Jul 2024 18:44:14 -0400
Subject: [PATCH 221/449] Deprecating `SubTask.getLastBuiltOn` (#9442)

---
 core/src/main/java/hudson/model/AbstractProject.java           | 1 +
 core/src/main/java/hudson/model/queue/MappingWorksheet.java    | 3 +++
 core/src/main/java/hudson/model/queue/QueueTaskFilter.java     | 1 +
 core/src/main/java/hudson/model/queue/SubTask.java             | 2 ++
 .../model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java   | 1 +
 5 files changed, 8 insertions(+)

diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index c323f50bca0b..c568f8df8b31 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1011,6 +1011,7 @@ public List<Action> getActions() {
      *      null if no information is available (for example,
      *      if no build was done yet.)
      */
+    @SuppressWarnings("deprecation")
     @Override
     public Node getLastBuiltOn() {
         // where was it built on?
diff --git a/core/src/main/java/hudson/model/queue/MappingWorksheet.java b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
index 9dbeaa3816f4..8150dd1bc132 100644
--- a/core/src/main/java/hudson/model/queue/MappingWorksheet.java
+++ b/core/src/main/java/hudson/model/queue/MappingWorksheet.java
@@ -190,7 +190,9 @@ public class WorkChunk extends ReadOnlyList<SubTask> {
          * If the previous execution of this task run on a certain node
          * and this task prefers to run on the same node, return that.
          * Otherwise null.
+         * @deprecated Unused.
          */
+        @Deprecated
         public final ExecutorChunk lastBuiltOn;
 
 
@@ -200,6 +202,7 @@ private WorkChunk(List<SubTask> base, int index) {
             this.index = index;
             this.assignedLabel = getAssignedLabel(base.get(0));
 
+            @SuppressWarnings("deprecation")
             Node lbo = base.get(0).getLastBuiltOn();
             for (ExecutorChunk ec : executors) {
                 if (ec.node == lbo) {
diff --git a/core/src/main/java/hudson/model/queue/QueueTaskFilter.java b/core/src/main/java/hudson/model/queue/QueueTaskFilter.java
index e2a113dfaa59..a36c5ca7c753 100644
--- a/core/src/main/java/hudson/model/queue/QueueTaskFilter.java
+++ b/core/src/main/java/hudson/model/queue/QueueTaskFilter.java
@@ -52,6 +52,7 @@ public Label getAssignedLabel() {
         return base.getAssignedLabel();
     }
 
+    @Deprecated
     @Override
     public Node getLastBuiltOn() {
         return base.getLastBuiltOn();
diff --git a/core/src/main/java/hudson/model/queue/SubTask.java b/core/src/main/java/hudson/model/queue/SubTask.java
index f8b7dd435088..0690d074617c 100644
--- a/core/src/main/java/hudson/model/queue/SubTask.java
+++ b/core/src/main/java/hudson/model/queue/SubTask.java
@@ -62,7 +62,9 @@ default Label getAssignedLabel() {
      * and this task prefers to run on the same node, return that.
      * Otherwise null.
      * @return by default, null
+     * @deprecated Unused.
      */
+    @Deprecated
     default Node getLastBuiltOn() {
         return null;
     }
diff --git a/test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java b/test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java
index c296c2bd6871..7bb9b4d442c6 100644
--- a/test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java
+++ b/test/src/test/java/hudson/model/queue/BuildKeepsRunningWhenFaultySubTasksTest.java
@@ -107,6 +107,7 @@ public Label getAssignedLabel() {
                     return null;
                 }
 
+                @Deprecated
                 @Override
                 public Node getLastBuiltOn() {
                     return null;

From 62e4ac4778c78e2a4a963608870bc204da148db0 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Sat, 20 Jul 2024 18:44:34 -0400
Subject: [PATCH 222/449] [JENKINS-66105] Allow follow redirects to work after
 303 from `buildWithParameters` (#9446)

---
 .../hudson/model/BuildAuthorizationToken.java |  5 ---
 core/src/main/java/hudson/model/Queue.java    |  5 +++
 .../jenkins/model/ParameterizedJobMixIn.java  |  1 +
 .../ParametersDefinitionPropertyTest.java     | 31 +++++++++++++++++++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java
index f101eb3d6e74..a09ed113e1cf 100644
--- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java
+++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java
@@ -29,7 +29,6 @@
 import hudson.security.ACL;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
-import jenkins.security.ApiTokenProperty;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -82,10 +81,6 @@ public static void checkPermission(Job<?, ?> project, BuildAuthorizationToken to
             return;
         }
 
-        if (req.getAttribute(ApiTokenProperty.class.getName()) instanceof User) {
-            return;
-        }
-
         rsp.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
         rsp.addHeader("Allow", "POST");
         throw HttpResponses.forwardToView(project, "requirePOST.jelly");
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index d489f042100d..0d299fb9426d 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -130,6 +130,7 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
+import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -2414,6 +2415,10 @@ public Api getApi() throws AccessDeniedException {
             }
         }
 
+        public HttpResponse doIndex(StaplerRequest req) {
+            return HttpResponses.text("Queue item exists. For details check, for example, " + req.getRequestURI() + "api/json?tree=cancelled,executable[url]");
+        }
+
         protected Object readResolve() {
             this.future = new FutureImpl(task);
             return this;
diff --git a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
index 734534220901..662ffa9359e2 100644
--- a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
+++ b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
@@ -218,6 +218,7 @@ public final void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParamet
 
         Queue.Item item = Jenkins.get().getQueue().schedule2(asJob(), delay.getTimeInSeconds(), getBuildCause(asJob(), req)).getItem();
         if (item != null) {
+            // TODO JENKINS-66105 use SC_SEE_OTHER if !ScheduleResult.created
             rsp.sendRedirect(SC_CREATED, req.getContextPath() + '/' + item.getUrl());
         } else {
             rsp.sendRedirect(".");
diff --git a/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java b/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java
index 0f06cd43a7f6..54d3b3a0c847 100644
--- a/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java
+++ b/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java
@@ -24,11 +24,19 @@
 
 package hudson.model;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 
+import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
+import java.net.URL;
 import java.util.Locale;
 import java.util.logging.Level;
 import net.sf.json.JSONObject;
+import org.htmlunit.HttpMethod;
+import org.htmlunit.WebRequest;
+import org.htmlunit.WebResponse;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -92,4 +100,27 @@ public ParameterDefinition newInstance(StaplerRequest req, JSONObject formData)
 
     }
 
+    @Issue("JENKINS-66105")
+    @Test
+    public void statusCodes() throws Exception {
+        r.jenkins.setSecurityRealm(r.createDummySecurityRealm());
+        r.jenkins.setAuthorizationStrategy(new FullControlOnceLoggedInAuthorizationStrategy());
+        FreeStyleProject p = r.createFreeStyleProject("p");
+        ParametersDefinitionProperty pdp = new ParametersDefinitionProperty(new StringParameterDefinition("K"));
+        p.addProperty(pdp);
+        p.setConcurrentBuild(true);
+        p.setAssignedLabel(Label.get("nonexistent")); // force it to stay in queue
+        JenkinsRule.WebClient wc = r.createWebClient();
+        wc.withBasicApiToken("dev");
+        assertThat("initially 201 Created queue item", buildWithParameters(wc, "v1").getStatusCode(), is(201));
+        WebResponse rsp = buildWithParameters(wc, "v1");
+        assertThat("then 303 See Other → 200 OK", rsp.getStatusCode(), is(200));
+        assertThat("offers advice on API", rsp.getContentAsString(), containsString("api/json?tree="));
+        assertThat("201 Created queue item for different key", buildWithParameters(wc, "v2").getStatusCode(), is(201));
+    }
+
+    private WebResponse buildWithParameters(JenkinsRule.WebClient wc, String value) throws Exception {
+        return wc.getPage(new WebRequest(new URL(wc.getContextPath() + "job/p/buildWithParameters?K=" + value), HttpMethod.POST)).getWebResponse();
+    }
+
 }

From 7680da0cef93fa7edd5b4eb2faf6cf9c04374f68 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Sat, 20 Jul 2024 18:44:43 -0400
Subject: [PATCH 223/449] `Lifecycle.onBootFailure` (#9483)

---
 core/src/main/java/hudson/lifecycle/ExitLifecycle.java |  6 ++++++
 core/src/main/java/hudson/lifecycle/Lifecycle.java     | 10 ++++++++++
 core/src/main/java/hudson/util/BootFailure.java        |  2 ++
 3 files changed, 18 insertions(+)

diff --git a/core/src/main/java/hudson/lifecycle/ExitLifecycle.java b/core/src/main/java/hudson/lifecycle/ExitLifecycle.java
index f8fcc3abefbf..038dafc442a3 100644
--- a/core/src/main/java/hudson/lifecycle/ExitLifecycle.java
+++ b/core/src/main/java/hudson/lifecycle/ExitLifecycle.java
@@ -26,6 +26,7 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
+import hudson.util.BootFailure;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
@@ -72,4 +73,9 @@ public void restart() {
 
         System.exit(exitOnRestart);
     }
+
+    @Override
+    public void onBootFailure(BootFailure problem) {
+        restart();
+    }
 }
diff --git a/core/src/main/java/hudson/lifecycle/Lifecycle.java b/core/src/main/java/hudson/lifecycle/Lifecycle.java
index dbc53d2b5005..fcd7769aeff2 100644
--- a/core/src/main/java/hudson/lifecycle/Lifecycle.java
+++ b/core/src/main/java/hudson/lifecycle/Lifecycle.java
@@ -32,6 +32,8 @@
 import hudson.Util;
 import hudson.init.InitMilestone;
 import hudson.init.Initializer;
+import hudson.util.BootFailure;
+import hudson.util.JenkinsReloadFailed;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -324,6 +326,14 @@ public boolean supportsDynamicLoad() {
         return true;
     }
 
+    /**
+     * Called when Jenkins has failed to boot.
+     * @param problem a boot failure (could be {@link JenkinsReloadFailed})
+     * @since TODO
+     */
+    public void onBootFailure(BootFailure problem) {
+    }
+
     @Restricted(NoExternalUse.class)
     public static final class PlaceholderLifecycle extends ExitLifecycle {
 
diff --git a/core/src/main/java/hudson/util/BootFailure.java b/core/src/main/java/hudson/util/BootFailure.java
index a460ffea148e..f23cf7fa66b7 100644
--- a/core/src/main/java/hudson/util/BootFailure.java
+++ b/core/src/main/java/hudson/util/BootFailure.java
@@ -15,6 +15,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.servlet.ServletContext;
+import jenkins.model.Jenkins;
 import jenkins.util.groovy.GroovyHookScript;
 import org.kohsuke.stapler.WebApp;
 
@@ -51,6 +52,7 @@ public void publish(ServletContext context, @CheckForNull File home) {
                 .bind("servletContext", context)
                 .bind("attempts", loadAttempts(home))
                 .run();
+        Jenkins.get().getLifecycle().onBootFailure(this);
     }
 
     /**

From e4f3a0d2fed3b3a97b1970289316d2f0ac6ae89b Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 20 Jul 2024 15:44:58 -0700
Subject: [PATCH 224/449] [JENKINS-73467] No facility to try unsupported
 Remoting versions when using inbound agents (#9485)

---
 core/src/main/java/jenkins/agents/WebSocketAgents.java     | 5 ++++-
 .../resources/hudson/TcpSlaveAgentListener/index.jelly     | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/jenkins/agents/WebSocketAgents.java b/core/src/main/java/jenkins/agents/WebSocketAgents.java
index 005587c6365a..d9560f156ebd 100644
--- a/core/src/main/java/jenkins/agents/WebSocketAgents.java
+++ b/core/src/main/java/jenkins/agents/WebSocketAgents.java
@@ -36,6 +36,7 @@
 import hudson.remoting.ChannelBuilder;
 import hudson.remoting.ChunkHeader;
 import hudson.remoting.Engine;
+import hudson.slaves.SlaveComputer;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
@@ -107,7 +108,9 @@ public HttpResponse doIndex(StaplerRequest req, StaplerResponse rsp) throws IOEx
         Capability remoteCapability = Capability.fromASCII(remoteCapabilityStr);
         LOGGER.fine(() -> "received " + remoteCapability);
         rsp.setHeader(Capability.KEY, new Capability().toASCII());
-        rsp.setHeader(Engine.REMOTING_MINIMUM_VERSION_HEADER, RemotingVersionInfo.getMinimumSupportedVersion().toString());
+        if (!SlaveComputer.ALLOW_UNSUPPORTED_REMOTING_VERSIONS) {
+            rsp.setHeader(Engine.REMOTING_MINIMUM_VERSION_HEADER, RemotingVersionInfo.getMinimumSupportedVersion().toString());
+        }
         rsp.setHeader(Engine.WEBSOCKET_COOKIE_HEADER, cookie);
         return WebSockets.upgrade(new Session(state, agent, remoteCapability));
     }
diff --git a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
index 1b04d3c2c9ae..9e4b36af14a2 100644
--- a/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
+++ b/core/src/main/resources/hudson/TcpSlaveAgentListener/index.jelly
@@ -40,8 +40,11 @@ THE SOFTWARE.
   <!-- reduce the number of client connection attempts during protocol negotiation -->
   <st:header name="X-Jenkins-Agent-Protocols" value="${app.tcpSlaveAgentListener.agentProtocolNames}"/>
   <!-- publish minimum supported version of remoting agent -->
-  <j:getStatic var="rmvh" className="hudson.remoting.Engine" field="REMOTING_MINIMUM_VERSION_HEADER"/>
-  <st:header name="${rmvh}" value="${app.tcpSlaveAgentListener.remotingMinimumVersion}"/>
+  <j:getStatic var="allowUnsupportedRemotingVersions" className="hudson.slaves.SlaveComputer" field="ALLOW_UNSUPPORTED_REMOTING_VERSIONS"/>
+  <j:if test="${!allowUnsupportedRemotingVersions}">
+    <j:getStatic var="rmvh" className="hudson.remoting.Engine" field="REMOTING_MINIMUM_VERSION_HEADER"/>
+    <st:header name="${rmvh}" value="${app.tcpSlaveAgentListener.remotingMinimumVersion}"/>
+  </j:if>
 
   Jenkins
 </j:jelly>

From 77f620e3cc57be3b08a323407c613452929e7545 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 20 Jul 2024 16:45:12 -0600
Subject: [PATCH 225/449] Update version numbers of new APIs in Javadoc (#9486)

Update @since TODO javadoc comments
---
 core/src/main/java/hudson/model/AdministrativeMonitor.java    | 2 +-
 core/src/main/java/hudson/model/User.java                     | 2 +-
 core/src/main/java/hudson/model/UserProperty.java             | 2 +-
 core/src/main/java/hudson/model/UserPropertyDescriptor.java   | 4 ++--
 .../java/hudson/model/userproperty/UserPropertyCategory.java  | 2 +-
 .../GlobalComputerRetentionCheckIntervalConfiguration.java    | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java
index e2f69d654ca8..61208dea6467 100644
--- a/core/src/main/java/hudson/model/AdministrativeMonitor.java
+++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java
@@ -236,7 +236,7 @@ public boolean hasRequiredPermission() {
      *
      * @return true if the current user has the minimum required permission to view any administrative monitor.
      *
-     * @since TODO
+     * @since 2.468
      */
     public static boolean hasPermissionToDisplay() {
         return Jenkins.get().hasAnyPermission(Jenkins.SYSTEM_READ, Jenkins.MANAGE);
diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index e588a79b347a..792622eb3c54 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -344,7 +344,7 @@ public synchronized void addProperty(@NonNull UserProperty p) throws IOException
      * The properties not included in the list will be let untouched.
      * It will call the {@link UserProperty#setUser(User)} method and at the end, {@link #save()} once.
      *
-     * @since TODO
+     * @since 2.468
      */
     public synchronized void addProperties(@NonNull List<UserProperty> multipleProperties) throws IOException {
         List<UserProperty> newProperties = new ArrayList<>(this.properties);
diff --git a/core/src/main/java/hudson/model/UserProperty.java b/core/src/main/java/hudson/model/UserProperty.java
index 6538a5fdf661..a6ebeb738b23 100644
--- a/core/src/main/java/hudson/model/UserProperty.java
+++ b/core/src/main/java/hudson/model/UserProperty.java
@@ -86,7 +86,7 @@ public static DescriptorExtensionList<UserProperty, UserPropertyDescriptor> all(
     /**
      * Returns all the registered {@link UserPropertyCategory} descriptors for a given category.
      *
-     * @since TODO
+     * @since 2.468
      */
     public static List<UserPropertyDescriptor> allByCategoryClass(@NonNull Class<? extends UserPropertyCategory> categoryClass) {
         DescriptorExtensionList<UserProperty, UserPropertyDescriptor> all = all();
diff --git a/core/src/main/java/hudson/model/UserPropertyDescriptor.java b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
index ff3171c1fbf7..66762bf3c716 100644
--- a/core/src/main/java/hudson/model/UserPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
@@ -85,7 +85,7 @@ public boolean isEnabled() {
      *
      * @return never null, always the same value for a given instance of {@link Descriptor}.
      *
-     * @since TODO
+     * @since 2.468
      */
     public @NonNull UserPropertyCategory getUserPropertyCategory() {
         // As this method is expected to be overloaded by subclasses
@@ -120,7 +120,7 @@ public boolean isEnabled() {
      *
      * @return String name corresponding to the symbol of {@link #getUserPropertyCategory()}
      *
-     * @since TODO
+     * @since 2.468
      */
     @Deprecated
     protected @CheckForNull String getUserPropertyCategoryAsString() {
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategory.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategory.java
index 803b7e2d3527..5d5467b6eed4 100644
--- a/core/src/main/java/hudson/model/userproperty/UserPropertyCategory.java
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategory.java
@@ -43,7 +43,7 @@
  * as the catch-all "unclassified".) Categories themselves are extensible &mdash; plugins may introduce
  * its own category as well, although that should only happen if you are creating a big enough subsystem.
  *
- * @since TODO
+ * @since 2.468
  * @see UserProperty
  */
 public abstract class UserPropertyCategory implements ExtensionPoint, ModelObject {
diff --git a/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java b/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
index c73b862ef1e5..46d760fe8ee2 100644
--- a/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
@@ -23,7 +23,7 @@ public class GlobalComputerRetentionCheckIntervalConfiguration extends GlobalCon
     /**
      * Gets the check interval for computer retention.
      *
-     * @since TODO
+     * @since 2.463
      */
     public int getComputerRetentionCheckInterval() {
         if (computerRetentionCheckInterval <= 0) {
@@ -42,7 +42,7 @@ public int getComputerRetentionCheckInterval() {
      *
      * @param interval new check interval in seconds
      * @throws IllegalArgumentException interval must be greater than zero
-     * @since TODO
+     * @since 2.463
      */
     private void setComputerRetentionCheckInterval(int interval) throws IllegalArgumentException {
         if (interval <= 0) {

From 19d568c0e0bf9a49fef7216e04a9c5d3cf25f20f Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sun, 21 Jul 2024 14:46:00 +0200
Subject: [PATCH 226/449] [JENKINS-73453] make icons in table buttons resizable
 (#9482)

[JENKINS-73543] make icon in buttons in tables resizable

With #9131 the jenkins-table__button was replaced at certain places with
jenkins-button. But this change caused two regressions:
- The icon size for large table was almost the same as that for medium
  tables
- The icons wrapped in jenkins-button were not resizable
- with small table the buttons overflowed the table cell

This change restores the old icon size for large tables and adds
additional css rules for jenkins-button inside tables so they are
properly resized and the padding is correct
---
 war/src/main/scss/components/_table.scss | 27 ++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss
index 685b740de69a..f247407a8f3b 100644
--- a/war/src/main/scss/components/_table.scss
+++ b/war/src/main/scss/components/_table.scss
@@ -167,11 +167,12 @@
   .jenkins-button {
     margin: -10px 0;
     padding: 0.5rem 0.75rem;
+    min-height: 1.75rem;
 
     // Increase the size of symbols compared to regular buttons
     svg {
-      width: 1.375rem !important;
-      height: 1.375rem !important;
+      width: 1.5rem !important;
+      height: 1.5rem !important;
     }
   }
 
@@ -180,8 +181,8 @@
     svg,
     .build-status-icon__wrapper,
     img {
-      width: 1.375rem !important;
-      height: 1.375rem !important;
+      width: 1.5rem !important;
+      height: 1.5rem !important;
     }
   }
 
@@ -202,6 +203,15 @@
         height: 1.3rem !important;
       }
     }
+
+    .jenkins-button {
+      padding: 0.4rem 0.6rem;
+
+      svg {
+        width: 1.3rem !important;
+        height: 1.3rem !important;
+      }
+    }
   }
 
   &--auto-width {
@@ -225,6 +235,15 @@
         height: 1rem !important;
       }
     }
+
+    .jenkins-button {
+      padding: 0.3rem 0.5rem;
+
+      svg {
+        width: 1rem !important;
+        height: 1rem !important;
+      }
+    }
   }
 
   &__button,

From 81b90e4c118bcdc9b283037e819fb2d6217da18a Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Mon, 22 Jul 2024 00:41:04 +0100
Subject: [PATCH 227/449] [JENKINS-73404] SecretTextArea missing FormValidation
 support (#9450)

* [JENKINS-73404] unit test

* roundtrip as Secrets

* [JENKINS-73404] add validation for SecretTextArea

reworked the jelly and simplified the javascript.

the textarea is now always present in the DOM, so no need to remove
inputs to add a textarea.  Rather we just remove /hide the "hidden" attribute
from the elements we want to show/hide and give the textArea the
expected class and attributes for validation to occur

* remove unused data-prompt attribute

* Adapt getHiddenSecretValue to backend changes

* Adapt to Secrets being sent as "" rather than null

values for SecretTextArea are now always sent.  Whilst this is a change
in behavior the only way once set to unset is to set the value to the
mpty string "" which would still produce a Secret

Additionally this matches the behaviour of f:password and f:textarea

Given both of the above this change in behaviour should not break any
production use cases.

* Remove trailing spaces

---------

Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
---
 .../resources/lib/form/secretTextarea.jelly   |  28 +++-
 .../lib/form/secretTextarea/secret.css        |   6 +-
 .../lib/form/secretTextarea/secret.js         |  35 ++---
 .../hudson/util/FormFieldValidatorTest.java   | 125 +++++++++++++++++-
 .../java/lib/form/SecretTextareaTest.java     |  15 ++-
 .../ValidatingDescribable/config.jelly        |  20 +++
 6 files changed, 195 insertions(+), 34 deletions(-)
 create mode 100644 test/src/test/resources/hudson/util/FormFieldValidatorTest/ValidatingDescribable/config.jelly

diff --git a/core/src/main/resources/lib/form/secretTextarea.jelly b/core/src/main/resources/lib/form/secretTextarea.jelly
index ca95219fc3f3..323a8435d0f3 100644
--- a/core/src/main/resources/lib/form/secretTextarea.jelly
+++ b/core/src/main/resources/lib/form/secretTextarea.jelly
@@ -2,7 +2,7 @@
 <!--
   ~ The MIT License
   ~
-  ~ Copyright (c) 2019 CloudBees, Inc.
+  ~ Copyright (c) 2019-2024 CloudBees, Inc.
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal
@@ -56,9 +56,24 @@ Example usage:
         <st:attribute name="placeholder">
             Placeholder text for input field when displayed.
         </st:attribute>
+        <st:attribute name="checkUrl">
+            If specified, the value entered in this input field will be checked (via AJAX)
+            against this URL, and errors will be rendered under the text field.
+
+            If @field is specified, this will be inferred automatically,
+            which is the recommended approach.
+        </st:attribute>
+        <st:attribute name="checkMethod" use="optional" type="String">
+            Specify 'get' (must be lowercase) to change the HTTP method used for the AJAX requests to @checkUrl from a POST to a GET.
+            If any other value is specified then requests will use POST.
+            The historical default was GET and 'post' had to be specified to change that, but this was changed in Jenkins 2.285.
+        </st:attribute>
+
     </st:documentation>
 
     <f:prepareDatabinding/>
+    <j:set var="id" value="secretTextAreadId-${h.generateId()}" />
+
     <j:set var="name" value="${attrs.name ?: '_.'+attrs.field}"/>
     <j:set var="value" value="${h.getPasswordValue(attrs.value ?: instance[attrs.field])}"/>
     <j:set var="addText" value="${%Add}"/>
@@ -66,7 +81,7 @@ Example usage:
     <j:set var="buttonText" value="${value == null ? addText : replaceText}"/>
 
     <st:adjunct includes="lib.form.secretTextarea.secret"/>
-    <div class="secret" data-name="${name}" data-placeholder="${attrs.placeholder ?: ''}" data-prompt="${%EnterSecret}">
+    <div class="secret">
         <div class="secret-header">
             <div class="secret-legend">
                 <j:choose>
@@ -76,14 +91,21 @@ Example usage:
                     <j:otherwise>
                         <l:icon src="symbol-lock-closed" class="icon-md"/>
                         <span>${%Concealed}</span>
-                        <input type="hidden" name="${name}" value="${value}"/>
                     </j:otherwise>
                 </j:choose>
             </div>
             <div class="secret-update">
                 <button type="button" class="secret-update-btn jenkins-button jenkins-button--primary">${buttonText}</button>
+                <label hidden="hidden" for="${id}">${%EnterSecret}</label>
             </div>
         </div>
+        <div class="secret-input">
+            <textarea id="${id}" hidden="hidden" name="${name}" placeholder="${placeholder}"
+                      class="${attrs.checkUrl!=null?' jenkins-input validated':''}"
+                      checkUrl="${attrs.checkUrl}" checkDependsOn="${attrs.checkDependsOn}" checkMethod="${attrs.checkMethod}">
+                <st:out value="${value}" />
+            </textarea>
+        </div>
     </div>
 
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/secretTextarea/secret.css b/core/src/main/resources/lib/form/secretTextarea/secret.css
index 39d98e0bfcf7..eb74f5d004b0 100644
--- a/core/src/main/resources/lib/form/secretTextarea/secret.css
+++ b/core/src/main/resources/lib/form/secretTextarea/secret.css
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2019 CloudBees, Inc.
+ * Copyright (c) 2019-2024 CloudBees, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -65,3 +65,7 @@
   border: none;
   padding: 1em;
 }
+
+.secret * [hidden] {
+  display: none !important;
+}
diff --git a/core/src/main/resources/lib/form/secretTextarea/secret.js b/core/src/main/resources/lib/form/secretTextarea/secret.js
index 3bc32394f81e..298ee043af9d 100644
--- a/core/src/main/resources/lib/form/secretTextarea/secret.js
+++ b/core/src/main/resources/lib/form/secretTextarea/secret.js
@@ -28,36 +28,21 @@ Behaviour.specify(".secret", "secret-button", 0, function (e) {
     return;
   }
 
-  var id = "secret-" + iota++;
-  var name = e.getAttribute("data-name");
-  var placeholder = e.getAttribute("data-placeholder");
-  var prompt = e.getAttribute("data-prompt");
-
-  var appendSecretInput = function () {
-    var textarea = document.createElement("textarea");
-    textarea.setAttribute("id", id);
-    textarea.setAttribute("name", name);
-    if (placeholder !== null && placeholder !== "") {
-      textarea.setAttribute("placeholder", placeholder);
-    }
-    var secretInput = document.createElement("div");
-    secretInput.setAttribute("class", "secret-input");
-    secretInput.appendChild(textarea);
-    e.appendChild(secretInput);
+  var unhideSecretInput = function () {
+    var textArea = e.querySelector('textarea[hidden="hidden"]');
+    textArea.removeAttribute("hidden");
   };
 
   var clearSecretValue = function () {
-    var secretValue = e.querySelector('input[type="hidden"]');
-    if (secretValue !== null) {
-      secretValue.parentNode.removeChild(secretValue);
-    }
+    var secretValue = e.querySelector("textarea");
+    secretValue.value = "";
   };
 
   var replaceUpdateButton = function () {
-    var secretLabel = document.createElement("label");
-    secretLabel.setAttribute("for", id);
-    secretLabel.appendChild(document.createTextNode(prompt));
-    secretUpdateBtn.parentNode.replaceChild(secretLabel, secretUpdateBtn);
+    secretUpdateBtn.setAttribute("hidden", "hidden");
+    // unhide the span text
+    var prompt = e.querySelector('label[hidden="hidden"]');
+    prompt.removeAttribute("hidden");
   };
 
   var removeSecretLegendLabel = function () {
@@ -69,7 +54,7 @@ Behaviour.specify(".secret", "secret-button", 0, function (e) {
   };
 
   secretUpdateBtn.onclick = function () {
-    appendSecretInput();
+    unhideSecretInput();
     clearSecretValue();
     replaceUpdateButton();
     removeSecretLegendLabel();
diff --git a/test/src/test/java/hudson/util/FormFieldValidatorTest.java b/test/src/test/java/hudson/util/FormFieldValidatorTest.java
index bdbb76946288..6e1b52c45c58 100644
--- a/test/src/test/java/hudson/util/FormFieldValidatorTest.java
+++ b/test/src/test/java/hudson/util/FormFieldValidatorTest.java
@@ -25,13 +25,19 @@
 package hudson.util;
 
 
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import hudson.model.AbstractProject;
 import hudson.model.FreeStyleProject;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
+import hudson.tasks.Recorder;
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.htmlunit.ScriptResult;
 import org.htmlunit.WebResponseListener;
 import org.htmlunit.html.HtmlPage;
@@ -42,6 +48,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
 import org.xml.sax.SAXException;
 
@@ -134,7 +141,7 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
     @Issue("JENKINS-3382")
     public void negative() throws Exception {
         BrokenFormValidatorBuilder.DescriptorImpl d = new BrokenFormValidatorBuilder.DescriptorImpl();
-        Publisher.all().add(d);
+        Recorder.all().add(d);
         try {
             FreeStyleProject p = j.createFreeStyleProject();
             p.getPublishersList().add(new BrokenFormValidatorBuilder());
@@ -152,4 +159,120 @@ public void negative() throws Exception {
             Publisher.all().remove(d);
         }
     }
+
+    @Issue("JENKINS-73404")
+    @Test
+    public void testValidationforComponents() throws Exception {
+        FreeStyleProject p = j.createFreeStyleProject();
+        p.getBuildersList().add(new ValidatingDescribable());
+        try (JenkinsRule.WebClient wc = j.createWebClient()) {
+            HtmlPage page = wc.getPage(p, "configure");
+            assertThat(page.asNormalizedText(), allOf(
+                    containsString("FormValidation: Password (empty)"),
+                    containsString("FormValidation: Password (populated)"),
+                    containsString("FormValidation: Textarea"),
+                    containsString("FormValidation: SecretTextarea (empty)"),
+                    containsString("FormValidation: SecretTextarea (populated)")));
+
+        }
+
+    }
+
+    public static class ValidatingDescribable extends Builder {
+
+        private Secret emptyPassword;
+        // give the secret some data so that it is hidden and not a regular field!
+        private Secret populatedPassword = Secret.fromString("secret!");
+        private String textarea;
+        private Secret emptySecretTextarea;
+        private Secret populatedSecretTextarea = Secret.fromString("sensitive!");;
+
+        @DataBoundConstructor
+        public ValidatingDescribable() {
+        }
+
+        public Secret getEmptyPassword() {
+            return emptyPassword;
+        }
+
+        @DataBoundSetter
+        public void setEmptyPassword(Secret emptyPassword) {
+            this.emptyPassword = emptyPassword;
+        }
+
+        public Secret getPopulatedPassword() {
+            return populatedPassword;
+        }
+
+        @DataBoundSetter
+        public void setPopulatedPassword(Secret populatedPassword) {
+            this.populatedPassword = populatedPassword;
+        }
+
+        public String getTextarea() {
+            return textarea;
+        }
+
+        @DataBoundSetter
+        public void setTextarea(String textarea) {
+            this.textarea = textarea;
+        }
+
+        public Secret getEmptySecretTextarea() {
+            return emptySecretTextarea;
+        }
+
+        @DataBoundSetter
+        public void setEmptySecretTextarea(Secret emptySecretTextarea) {
+            this.emptySecretTextarea = emptySecretTextarea;
+        }
+
+        public Secret getPopulatedSecretTextarea() {
+            return populatedSecretTextarea;
+        }
+
+        @DataBoundSetter
+        public void setPopulatedSecretTextarea(Secret populatedSecretTextarea) {
+            this.populatedSecretTextarea = populatedSecretTextarea;
+        }
+
+        @TestExtension
+        public static class DescriptorImpl extends BuildStepDescriptor<Builder> {
+            // not used for the test class but useful for interactive debugging to check the validation has been called
+            AtomicInteger i = new AtomicInteger();
+
+            @Override
+            public String getDisplayName() {
+                return "Validation Testing";
+            }
+
+            public FormValidation doCheckEmptyPassword(@QueryParameter String value) {
+                return FormValidation.ok("FormValidation: Password (empty)" + i.getAndIncrement());
+            }
+
+            public FormValidation doCheckPopulatedPassword(@QueryParameter String value) {
+                return FormValidation.ok("FormValidation: Password (populated)" + i.getAndIncrement());
+            }
+
+            public FormValidation doCheckTextarea(@QueryParameter String value) {
+                return FormValidation.ok("FormValidation: Textarea" + i.getAndIncrement());
+            }
+
+            public FormValidation doCheckEmptySecretTextarea(@QueryParameter String value) {
+                return FormValidation.ok("FormValidation: SecretTextarea (empty)" + i.getAndIncrement());
+            }
+
+            public FormValidation doCheckPopulatedSecretTextarea(@QueryParameter String value) {
+                return FormValidation.ok("FormValidation: SecretTextarea (populated)" + i.getAndIncrement());
+            }
+
+            @Override
+            public boolean isApplicable(Class jobType) {
+                return true;
+            }
+
+        }
+
+    }
+
 }
diff --git a/test/src/test/java/lib/form/SecretTextareaTest.java b/test/src/test/java/lib/form/SecretTextareaTest.java
index a0d68fbe1132..5ecfeae1f8da 100644
--- a/test/src/test/java/lib/form/SecretTextareaTest.java
+++ b/test/src/test/java/lib/form/SecretTextareaTest.java
@@ -37,7 +37,7 @@
 import java.io.IOException;
 import org.htmlunit.html.HtmlElement;
 import org.htmlunit.html.HtmlForm;
-import org.htmlunit.html.HtmlHiddenInput;
+import org.htmlunit.html.HtmlTextArea;
 import org.htmlunit.html.HtmlTextInput;
 import org.junit.Before;
 import org.junit.Rule;
@@ -120,8 +120,8 @@ private static void clickSecretUpdateButton(HtmlForm configForm) throws IOExcept
     }
 
     private static String getHiddenSecretValue(HtmlForm configForm) {
-        HtmlHiddenInput hiddenSecret = configForm.getInputByName("_.secret");
-        return hiddenSecret == null ? null : hiddenSecret.getValue();
+        HtmlTextArea hiddenSecret = configForm.getTextAreaByName("_.secret");
+        return hiddenSecret == null ? null : hiddenSecret.getTextContent();
     }
 
     public static class TestBuilder extends Builder {
@@ -144,7 +144,7 @@ private static TestBuilder fromStringWithDescription(String secret, String descr
 
         @DataBoundConstructor
         public TestBuilder(Secret secret) {
-            this.secret = secret;
+            this.secret = fixEmptySecret(secret);
         }
 
         public Secret getSecret() {
@@ -160,6 +160,13 @@ public void setDescription(String description) {
             this.description = description;
         }
 
+        private static Secret fixEmptySecret(Secret possiblyEmpty) {
+            if (possiblyEmpty == null || possiblyEmpty.getPlainText().isEmpty()) {
+                return null;
+            }
+            return possiblyEmpty;
+        }
+
         @TestExtension
         public static class DescriptorImpl extends BuildStepDescriptor<Builder> {
             @NonNull
diff --git a/test/src/test/resources/hudson/util/FormFieldValidatorTest/ValidatingDescribable/config.jelly b/test/src/test/resources/hudson/util/FormFieldValidatorTest/ValidatingDescribable/config.jelly
new file mode 100644
index 000000000000..c560072d1ed4
--- /dev/null
+++ b/test/src/test/resources/hudson/util/FormFieldValidatorTest/ValidatingDescribable/config.jelly
@@ -0,0 +1,20 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+
+  <f:entry title="Password (empty)" field="emptyPassword">
+    <f:password/>
+  </f:entry>
+  <f:entry title="Password (populated)" field="populatedPassword">
+    <f:password/>
+  </f:entry>
+  <f:entry title="Textarea" field="textarea">
+    <f:textarea/>
+  </f:entry>
+  <f:entry title="Secret Textarea (empty)" field="emptySecretTextarea">
+    <f:secretTextarea/>
+  </f:entry>
+  <f:entry title="Secret Textarea (populated)" field="populatedSecretTextarea">
+    <f:secretTextarea/>
+  </f:entry>
+
+</j:jelly>

From cc97ad8f330aff43f412a95235a5386194803b14 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sun, 21 Jul 2024 17:41:14 -0600
Subject: [PATCH 228/449] Remove Jira issue from changelog summary in PR
 template (#9490)

When the Jira issue is included in the changelog summary, it is included
in the generated changelog as the initial text of the changelog entry.
The same issue link is then included by the changelog generator at the end
of the changelog description.  Remove the example that places the issue at
the start of the changelog text and explain that the issue link should be
elsewhere in the pull request so that the changelog generator can use it.

When the Jira issue is included in the changelog summary, the changelog
maintainers must remove it before the changelog is published.  It is
better to not include the Jira issue in the changelog summary so that
changelog maintainers do not need to remove it.

Remind submitters that they should not delete the upgrade guidelines
section because the presence of the upgrade guidelines section is used
by the changelog generator as the terminator for the proposed changelog
entries.
---
 .github/PULL_REQUEST_TEMPLATE.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 456f8fca6da7..a2ed88450df5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -28,16 +28,17 @@ For refactoring and code cleanup changes, exercise the code before and after the
 
 ### Proposed changelog entries
 
-- JENKINS-XXXXX, human-readable text
+- human-readable text
 
 <!-- Comment:
 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/
 
-Remove JENKINS-XXXXX if there is no issue for the pull request.
+Do not include the Jira issue in the changelog entry.
+Include the Jira issue in the description of the pull request so that the changelog generator can find it and include it in the generated changelog.
 
 You may add multiple changelog entries if applicable by adding a new entry to the list, e.g.
-- JENKINS-123456, First changelog entry
+- First changelog entry
 - Second changelog entry
 -->
 
@@ -45,6 +46,11 @@ You may add multiple changelog entries if applicable by adding a new entry to th
 
 N/A
 
+<!-- Comment:
+Leave the proposed upgrade guidelines in the pull request with the "N/A" value if no upgrade guidelines are needed.
+The changelog generator relies on the presence of the upgrade guidelines section as part of its data extraction process.
+-->
+
 ```[tasklist]
 ### Submitter checklist
 - [ ] The Jira issue, if it exists, is well-described.

From e9d210a86dd8efedad973d92c5ef78fd3f4514d2 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Mon, 22 Jul 2024 18:33:56 +0200
Subject: [PATCH 229/449] modernise build time trend page (#9465)

* modernise build time trend page

- use jenkins-table
- add time since column
- make the link to the console an explicit icon (like for the agent
  history)
- hide the agent column for pipeline jobs

* apply prettier

* missing let declaration

* fix tests

* change flex-direction with media

* apply prettier

* revert change to buildListTable
---
 .../java/jenkins/widgets/BuildTimeTrend.java  |  8 +++
 .../hudson/model/Job/buildTimeTrend.jelly     | 47 +++++++++-------
 .../model/Job/buildTimeTrend_resources.css    | 11 +++-
 .../model/Job/buildTimeTrend_resources.js     | 55 +++++++++++++------
 .../jenkins/widgets/BuildTimeTrendTest.java   | 12 ++--
 5 files changed, 87 insertions(+), 46 deletions(-)

diff --git a/core/src/main/java/jenkins/widgets/BuildTimeTrend.java b/core/src/main/java/jenkins/widgets/BuildTimeTrend.java
index 59ab879f05da..dd0f0434ecb3 100644
--- a/core/src/main/java/jenkins/widgets/BuildTimeTrend.java
+++ b/core/src/main/java/jenkins/widgets/BuildTimeTrend.java
@@ -25,7 +25,9 @@
 package jenkins.widgets;
 
 import hudson.model.AbstractBuild;
+import hudson.model.AbstractProject;
 import hudson.model.BallColor;
+import hudson.model.Job;
 import hudson.model.Node;
 import hudson.model.Run;
 import jenkins.console.ConsoleUrlProvider;
@@ -37,6 +39,10 @@
 @Restricted(DoNotUse.class) // only for buildTimeTrend.jelly
 public class BuildTimeTrend extends RunListProgressiveRendering {
 
+    public boolean isAbstractProject(Job<?, ?> job) {
+        return job instanceof AbstractProject;
+    }
+
     @Override protected void calculate(Run<?, ?> build, JSONObject element) {
         BallColor iconColor = build.getIconColor();
         element.put("iconName", iconColor.getIconName());
@@ -46,6 +52,8 @@ public class BuildTimeTrend extends RunListProgressiveRendering {
         element.put("displayName", build.getDisplayName());
         element.put("duration", build.getDuration());
         element.put("durationString", build.getDurationString());
+        element.put("timestampString", build.getTimestampString());
+        element.put("timestampString2", build.getTimestampString2());
         element.put("consoleUrl", ConsoleUrlProvider.getRedirectUrl(build));
         if (build instanceof AbstractBuild) {
             AbstractBuild<?, ?> b = (AbstractBuild) build;
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
index 18f874a6751f..7efb53f362a4 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 <!-- Displays the chart that show how long builds are taking -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
   <l:layout title="${%title(it.displayName)}">
     <st:include page="sidepanel.jelly" />
     <l:breadcrumb title="${%Build Time Trend}" />
@@ -45,29 +45,36 @@ THE SOFTWARE.
         <l:icon src="symbol-status-nobuilt-anime" id="nobuilt-anime" />
         <l:icon src="symbol-status-aborted-anime" id="aborted-anime" />
         <l:icon src="symbol-status-disabled-anime" id="disabled-anime" />
+        <l:icon src="symbol-terminal" id="console" />
       </template>
       <h1>${%Build Time Trend}</h1>
-          <div align="center">
+          <div id="buildTimeTrend">
+            <div>
+              <j:new var="handler" className="jenkins.widgets.BuildTimeTrend"/>
+              ${handler.setBuilds(it.builds)}
+              <j:set var="showAgent" value="${!empty(app.nodes) and handler.isAbstractProject(it)}"/>
+              <l:progressiveRendering handler="${handler}" callback="buildTimeTrend_displayBuilds"/>
+              <t:setIconSize/>
+              <table class="jenkins-table jenkins-table--auto-width ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''} sortable jenkins-hidden" id="trend"
+                     data-show-agent="${showAgent}" data-icon-size-class="${iconSizeClass}">
+                <thead>
+                  <tr>
+                    <th class="jenkins-table__cell--tight">${%S}</th>
+                    <th initialSortDir="up">${%Build}</th>
+                    <th>${%Time Since}</th>
+                    <th>${%Duration}</th>
+                    <j:if test="${showAgent}">
+                      <th>${%Agent}</th>
+                    </j:if>
+                    <th class="jenkins-table__cell--tight" data-sort-disable="true"></th>
+                  </tr>
+                </thead>
+                <tbody></tbody>
+              </table>
+              <t:iconSize/>
+            </div>
             <img class="build-time-graph" src="buildTimeGraph/png" width="500" height="400" lazymap="buildTimeGraph/map" alt="[${%Build time graph}]" />
           </div>
-
-          <j:set var="isDistributedBuildEnabled" value="${!empty(app.nodes)}"/>
-          <div align="center">
-            <j:new var="handler" className="jenkins.widgets.BuildTimeTrend"/>
-            ${handler.setBuilds(it.builds)}
-            <l:progressiveRendering handler="${handler}" callback="buildTimeTrend_displayBuilds"/>
-            <table class="sortable" id="trend"
-                   data-is-distributed-build-enabled="${isDistributedBuildEnabled}">
-              <tr>
-                <th><st:nbsp/></th>
-                <th initialSortDir="up">${%Build}</th>
-                <th>${%Duration}</th>
-                <j:if test="${isDistributedBuildEnabled}">
-                  <th>${%Agent}</th>
-                </j:if>
-              </tr>
-            </table>
-          </div>
     </l:main-panel>
   </l:layout>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.css b/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.css
index 13efe1c1e375..af8ba3705509 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.css
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.css
@@ -1,3 +1,10 @@
-img.build-time-graph {
-  float: right;
+#buildTimeTrend {
+  display: flex;
+  gap: 15px;
+}
+
+@media (max-width: 1300px) {
+  #buildTimeTrend {
+    flex-direction: column-reverse;
+  }
 }
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.js b/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.js
index 8a6cbfd49253..9ea25a3441de 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.js
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.js
@@ -2,30 +2,31 @@
  * Public method to be called by progressiveRendering's callback
  */
 window.buildTimeTrend_displayBuilds = function (data) {
-  var p = document.getElementById("trend");
-  var isDistributedBuildsEnabled =
-    "true" === p.getAttribute("data-is-distributed-build-enabled");
-  var rootURL = document.head.getAttribute("data-rooturl");
+  const p = document.getElementById("trend");
+  p.classList.remove("jenkins-hidden");
 
-  for (var x = 0; data.length > x; x++) {
-    var e = data[x];
-    var tr = document.createElement("tr");
+  const showAgent = "true" === p.dataset.showAgent;
+  const rootURL = document.head.getAttribute("data-rooturl");
+
+  for (let x = 0; data.length > x; x++) {
+    const e = data[x];
+    let tr = document.createElement("tr");
 
     let td = document.createElement("td");
     td.setAttribute("data", e.iconColorOrdinal);
-
-    let link = document.createElement("a");
-    link.classList.add("build-status-link");
-    link.href = e.consoleUrl;
-    td.appendChild(link);
+    td.classList.add("jenkins-table__cell--tight", "jenkins-table__icon");
+    let div = document.createElement("div");
+    div.classList.add("jenkins-table__cell__button-wrapper");
     let svg = generateSVGIcon(e.iconName);
-    link.appendChild(svg);
+    svg.setAttribute("tooltip", e.iconColorDescription);
+    div.appendChild(svg);
+    td.appendChild(div);
     tr.appendChild(td);
 
     td = document.createElement("td");
     td.setAttribute("data", e.number);
 
-    link = document.createElement("a");
+    let link = document.createElement("a");
     link.href = e.number + "/";
     link.classList.add("model-link", "inside");
     link.innerText = escapeHTML(e.displayName);
@@ -33,15 +34,20 @@ window.buildTimeTrend_displayBuilds = function (data) {
     td.appendChild(link);
     tr.appendChild(td);
 
+    td = document.createElement("td");
+    td.setAttribute("data", e.timestampString2);
+    td.textContent = e.timestampString;
+    tr.appendChild(td);
+
     td = document.createElement("td");
     td.setAttribute("data", e.duration);
 
     td.innerText = escapeHTML(e.durationString);
 
     tr.appendChild(td);
-    if (isDistributedBuildsEnabled) {
-      var buildInfo = null;
-      var buildInfoStr = escapeHTML(e.builtOnStr || "");
+    if (showAgent) {
+      let buildInfo = null;
+      let buildInfoStr = escapeHTML(e.builtOnStr || "");
       if (e.builtOn) {
         buildInfo = document.createElement("a");
         buildInfo.href = rootURL + "/computer/" + e.builtOn;
@@ -58,6 +64,19 @@ window.buildTimeTrend_displayBuilds = function (data) {
       }
       tr.appendChild(td);
     }
+
+    let tdConsole = document.createElement("td");
+    tdConsole.classList.add("jenkins-table__cell--tight");
+    let div2 = document.createElement("div");
+    div2.classList.add("jenkins-table__cell__button-wrapper");
+    link = document.createElement("a");
+    link.classList.add("jenkins-button", "jenkins-button--tertiary");
+    link.href = e.consoleUrl;
+    link.appendChild(generateSVGIcon("console"));
+    div2.appendChild(link);
+    tdConsole.appendChild(div2);
+    tr.appendChild(tdConsole);
+
     p.appendChild(tr);
     Behaviour.applySubtree(tr);
   }
@@ -132,7 +151,7 @@ window.displayBuilds = function (data) {
     var div2 = document.createElement("div");
     div2.classList.add("jenkins-table__cell__button-wrapper");
     var a3 = document.createElement("a");
-    a3.classList.add("jenkins-button");
+    a3.classList.add("jenkins-button", "jenkins-button--tertiary");
     a3.href = e.consoleUrl;
     a3.innerHTML = p.dataset.consoleOutputIcon;
     div2.appendChild(a3);
diff --git a/test/src/test/java/jenkins/widgets/BuildTimeTrendTest.java b/test/src/test/java/jenkins/widgets/BuildTimeTrendTest.java
index cd729ed55668..38823a27a99a 100644
--- a/test/src/test/java/jenkins/widgets/BuildTimeTrendTest.java
+++ b/test/src/test/java/jenkins/widgets/BuildTimeTrendTest.java
@@ -74,7 +74,7 @@ public void withAbstractJob_OnBuiltInNode() throws Exception {
         wc.withThrowExceptionOnFailingStatusCode(false);
         HtmlPage page = wc.getPage(p, "buildTimeTrend");
 
-        HtmlTable table = page.getDocumentElement().querySelector("table[data-is-distributed-build-enabled=false]");
+        HtmlTable table = page.getDocumentElement().querySelector("table[data-show-agent=false]");
         assertNotNull(table);
     }
 
@@ -91,7 +91,7 @@ public void withAbstractJob_OnAgentNode() throws Exception {
 
         wc.withThrowExceptionOnFailingStatusCode(false);
         HtmlPage page = wc.getPage(p, "buildTimeTrend");
-        DomNodeList<DomNode> anchors = page.getDocumentElement().querySelectorAll("table[data-is-distributed-build-enabled=true] td a");
+        DomNodeList<DomNode> anchors = page.getDocumentElement().querySelectorAll("table[data-show-agent=true] td a");
         Optional<DomNode> anchor = anchors.stream()
                 .filter(a -> a.getTextContent().equals(agent.getNodeName()))
                 .findFirst();
@@ -115,7 +115,7 @@ public void withAbstractJob_OnBoth() throws Exception {
         wc.withThrowExceptionOnFailingStatusCode(false);
         HtmlPage page = wc.getPage(p, "buildTimeTrend");
 
-        DomNodeList<DomNode> anchors = page.getDocumentElement().querySelectorAll("table[data-is-distributed-build-enabled=true] td a");
+        DomNodeList<DomNode> anchors = page.getDocumentElement().querySelectorAll("table[data-show-agent=true] td a");
         Optional<DomNode> anchor = anchors.stream()
                 .filter(a -> a.getTextContent().equals(agent.getNodeName()))
                 .findFirst();
@@ -123,7 +123,7 @@ public void withAbstractJob_OnBoth() throws Exception {
         assertTrue(anchor.isPresent());
 
         String builtInNode = hudson.model.Messages.Hudson_Computer_DisplayName();
-        DomNodeList<DomNode> tds = page.getDocumentElement().querySelectorAll("table[data-is-distributed-build-enabled=true] td");
+        DomNodeList<DomNode> tds = page.getDocumentElement().querySelectorAll("table[data-show-agent=true] td");
         Optional<DomNode> td = tds.stream()
                 .filter(t -> t.getTextContent().equals(builtInNode))
                 .findFirst();
@@ -142,7 +142,7 @@ public void withNonAbstractJob_withoutAgents() throws Exception {
         wc.withThrowExceptionOnFailingStatusCode(false);
         HtmlPage page = wc.getPage(p, "buildTimeTrend");
 
-        DomNodeList<DomNode> tds = page.getDocumentElement().querySelectorAll("table[data-is-distributed-build-enabled=false] td");
+        DomNodeList<DomNode> tds = page.getDocumentElement().querySelectorAll("table[data-show-agent=false] td");
         Optional<DomNode> td = tds.stream()
                 .filter(t -> t.getTextContent().equals("#1"))
                 .findFirst();
@@ -168,7 +168,7 @@ public void withNonAbstractJob_withAgents() throws Exception {
         wc.withThrowExceptionOnFailingStatusCode(false);
         HtmlPage page = wc.getPage(p, "buildTimeTrend");
 
-        DomNodeList<DomNode> tds = page.getDocumentElement().querySelectorAll("table[data-is-distributed-build-enabled=true] td");
+        DomNodeList<DomNode> tds = page.getDocumentElement().querySelectorAll("table[data-show-agent=false] td");
         Optional<DomNode> td = tds.stream()
                 .filter(t -> t.getTextContent().equals("#1"))
                 .findFirst();

From 0255a59b2364d2f838eaa64ee5e0fdb365e486b5 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Mon, 22 Jul 2024 18:34:15 +0200
Subject: [PATCH 230/449] experimental flag to run Jenkins without YUI (#9489)

* experimental flag to run Jenkins without YUI

The YUI library is old and no longer maintained.

Add a user experimental flag to disable YUI. It's disabled by default.
When enabling all the YUI related js libraries and css classes are not
loaded.

Following PR are required to get Jenkins to not show any errors

eventually #7569

Some plugins that use YUI (not complete):
credentials
ldap
global-build-stats
build-monitor
categorized-view

Plugins that make use of makeButton (not complete)
credentials (fixed with https://github.com/jenkinsci/credentials-plugin/pull/533)
openid

acceptance-test-harness

* fix typo

Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com>

* add license and restrict class

---------

Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
---
 .../RemoveYuiUserExperimentalFlag.java        | 49 +++++++++++++++++++
 .../main/resources/lib/layout/layout.jelly    | 47 ++++++++++--------
 2 files changed, 75 insertions(+), 21 deletions(-)
 create mode 100644 core/src/main/java/jenkins/model/experimentalflags/RemoveYuiUserExperimentalFlag.java

diff --git a/core/src/main/java/jenkins/model/experimentalflags/RemoveYuiUserExperimentalFlag.java b/core/src/main/java/jenkins/model/experimentalflags/RemoveYuiUserExperimentalFlag.java
new file mode 100644
index 000000000000..e8f8dcc31775
--- /dev/null
+++ b/core/src/main/java/jenkins/model/experimentalflags/RemoveYuiUserExperimentalFlag.java
@@ -0,0 +1,49 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2024, Markus Winter
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model.experimentalflags;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
+import hudson.Extension;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+@Extension
+@Restricted(NoExternalUse.class)
+public class RemoveYuiUserExperimentalFlag extends BooleanUserExperimentalFlag {
+    public RemoveYuiUserExperimentalFlag() {
+        super("remove-yui.flag");
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "Remove YUI";
+    }
+
+    @Nullable
+    @Override
+    public String getShortDescription() {
+        return "Remove YUI from all Jenkins UI pages. This will break anything that depends on YUI";
+    }
+}
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 21ac81ff18b6..210ca66f855a 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -128,31 +128,36 @@ THE SOFTWARE.
 
     <st:adjunct includes="org.kohsuke.stapler.bind"/>
 
-    <!-- To use the debug version of YUI, set the system property 'debug.YUI' to true -->
-    <j:set var="yuiSuffix" value="${h.yuiSuffix}" />
-    <l:yui module="yahoo" />
-    <l:yui module="dom" />
-    <l:yui module="event" />
-    <j:if test="${h.yuiSuffix=='debug'}">
-      <l:yui module="logger" />
+    <l:userExperimentalFlag var="removeYUI" flagClassName="jenkins.model.experimentalflags.RemoveYuiUserExperimentalFlag" />
+    <j:if test="${!removeYUI}">
+      <!-- To use the debug version of YUI, set the system property 'debug.YUI' to true -->
+      <j:set var="yuiSuffix" value="${h.yuiSuffix}" />
+      <l:yui module="yahoo" />
+      <l:yui module="dom" />
+      <l:yui module="event" />
+      <j:if test="${h.yuiSuffix=='debug'}">
+        <l:yui module="logger" />
+      </j:if>
+      <l:yui module="animation" />
+      <l:yui module="dragdrop" />
+      <l:yui module="container" />
+      <l:yui module="connection" />
+      <l:yui module="datasource" />
+      <l:yui module="autocomplete" />
+      <l:yui module="menu" />
+      <l:yui module="element" />
+      <l:yui module="button" />
+      <l:yui module="storage" />
     </j:if>
-    <l:yui module="animation" />
-    <l:yui module="dragdrop" />
-    <l:yui module="container" />
-    <l:yui module="connection" />
-    <l:yui module="datasource" />
-    <l:yui module="autocomplete" />
-    <l:yui module="menu" />
-    <l:yui module="element" />
-    <l:yui module="button" />
-    <l:yui module="storage" />
 
     <script src="${resURL}/scripts/hudson-behavior.js" type="text/javascript"></script>
     <script src="${resURL}/scripts/sortable.js" type="text/javascript"/>
 
-    <link rel="stylesheet" href="${resURL}/scripts/yui/container/assets/container.css" type="text/css"/>
-    <link rel="stylesheet" href="${resURL}/scripts/yui/container/assets/skins/sam/container.css" type="text/css"/>
-    <link rel="stylesheet" href="${resURL}/scripts/yui/menu/assets/skins/sam/menu.css" type="text/css" />
+    <j:if test="${!removeYUI}">
+      <link rel="stylesheet" href="${resURL}/scripts/yui/container/assets/container.css" type="text/css"/>
+      <link rel="stylesheet" href="${resURL}/scripts/yui/container/assets/skins/sam/container.css" type="text/css"/>
+      <link rel="stylesheet" href="${resURL}/scripts/yui/menu/assets/skins/sam/menu.css" type="text/css" />
+    </j:if>
 
     <l:hasPermission permission="${app.READ}">
       <link rel="search" type="application/opensearchdescription+xml" href="${rootURL}/opensearch.xml" title="Jenkins" />
@@ -173,7 +178,7 @@ THE SOFTWARE.
     <script src="${resURL}/jsbundles/sortable-drag-drop.js" type="text/javascript"/>
     <script src="${resURL}/jsbundles/app.js" type="text/javascript" defer="true" />
   </head>
-  <body id="jenkins" class="yui-skin-sam ${layoutType} jenkins-${h.version}" data-version="${h.version}" data-model-type="${it.class.name}">
+  <body id="jenkins" class="${removeYUI ? '' : 'yui-skin-sam'} ${layoutType} jenkins-${h.version}" data-version="${h.version}" data-model-type="${it.class.name}">
 
     <j:if test="${layoutType!='full-screen'}">
       <!-- for accessibility, skip the entire navigation bar and etc and go straight to the head of the content -->

From 979f47b15db7791fb14f6a2e787375ecfd84f11d Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 23 Jul 2024 13:33:48 +0000
Subject: [PATCH 231/449] [maven-release-plugin] prepare release jenkins-2.469

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 63d8b5cd65f7..ef87e06b0d0e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.469</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..aceaf8e93ac5 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.469</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..e943dcc89273 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.469</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..3dafc2950c1b 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.469</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index a952ef72e8d3..20218f941726 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.469</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.469</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.469</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-16T13:36:31Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-23T10:34:21Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index ede4a5e74bff..56d98c8ab3d5 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.469</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 5da75ee1a520..664137a35f66 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.469</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..a415630f09df 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.469</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..d87556dcb693 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.469</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 0d5232fca40a12b2d14f7ded577a90f0cb3c6f06 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 23 Jul 2024 13:34:10 +0000
Subject: [PATCH 232/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index ef87e06b0d0e..63d8b5cd65f7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.469</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index aceaf8e93ac5..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.469</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index e943dcc89273..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.469</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 3dafc2950c1b..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.469</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 20218f941726..dcf21e286330 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.469</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.469</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.469</revision>
+    <revision>2.470</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-23T10:34:21Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-23T13:33:48Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 56d98c8ab3d5..ede4a5e74bff 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.469</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 664137a35f66..5da75ee1a520 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.469</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index a415630f09df..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.469</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index d87556dcb693..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.469</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 220165fd27f776e0e3155fd077d6f212a4824a1b Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 23 Jul 2024 21:50:21 -0400
Subject: [PATCH 233/449] `ItemListener.onCheckDelete` &
 `ItemDeletion.cancelBuildsInProgress` (#9480)

* `ItemListener.onCheckDelete` & `ItemDeletion.cancelBuildsInProgress`

* Remove missing parameter from javadoc

---------

Co-authored-by: Vincent Latombe <vincent@latombe.net>
---
 .../main/java/hudson/model/AbstractItem.java  |  94 +--------------
 .../hudson/model/listeners/ItemListener.java  |  25 ++++
 .../jenkins/model/queue/ItemDeletion.java     | 109 +++++++++++++++++-
 3 files changed, 137 insertions(+), 91 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 614b1c13eb4d..adebec8f289f 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -25,7 +25,6 @@
 
 package hudson.model;
 
-import static hudson.model.queue.Executables.getParentOf;
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
@@ -39,9 +38,6 @@
 import hudson.cli.declarative.CLIResolver;
 import hudson.model.listeners.ItemListener;
 import hudson.model.listeners.SaveableListener;
-import hudson.model.queue.SubTask;
-import hudson.model.queue.Tasks;
-import hudson.model.queue.WorkUnit;
 import hudson.security.ACL;
 import hudson.security.ACLContext;
 import hudson.security.AccessControlled;
@@ -57,12 +53,8 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -705,11 +697,13 @@ public void delete(StaplerRequest req, StaplerResponse rsp) throws IOException,
      *
      * <p>
      * Any exception indicates the deletion has failed, but {@link AbortException} would prevent the caller
-     * from showing the stack trace. This
+     * from showing the stack trace.
+     * @see ItemDeletion
      */
     @Override
     public void delete() throws IOException, InterruptedException {
         checkPermission(DELETE);
+        ItemListener.checkBeforeDelete(this);
         boolean responsibleForAbortingBuilds = !ItemDeletion.contains(this);
         boolean ownsRegistration = ItemDeletion.register(this);
         if (!ownsRegistration && ItemDeletion.isRegistered(this)) {
@@ -719,87 +713,7 @@ public void delete() throws IOException, InterruptedException {
         try {
             // if a build is in progress. Cancel it.
             if (responsibleForAbortingBuilds || ownsRegistration) {
-                Queue queue = Queue.getInstance();
-                if (this instanceof Queue.Task) {
-                    // clear any items in the queue so they do not get picked up
-                    queue.cancel((Queue.Task) this);
-                }
-                // now cancel any child items - this happens after ItemDeletion registration, so we can use a snapshot
-                for (Queue.Item i : queue.getItems()) {
-                    Item item = Tasks.getItemOf(i.task);
-                    while (item != null) {
-                        if (item == this) {
-                            if (!queue.cancel(i)) {
-                                LOGGER.warning(() -> "failed to cancel " + i);
-                            }
-                            break;
-                        }
-                        if (item.getParent() instanceof Item) {
-                            item = (Item) item.getParent();
-                        } else {
-                            break;
-                        }
-                    }
-                }
-                // interrupt any builds in progress (and this should be a recursive test so that folders do not pay
-                // the 15 second delay for every child item). This happens after queue cancellation, so will be
-                // a complete set of builds in flight
-                Map<Executor, Queue.Executable> buildsInProgress = new LinkedHashMap<>();
-                for (Computer c : Jenkins.get().getComputers()) {
-                    for (Executor e : c.getAllExecutors()) {
-                        final WorkUnit workUnit = e.getCurrentWorkUnit();
-                        final Queue.Executable executable = workUnit != null ? workUnit.getExecutable() : null;
-                        final SubTask subtask = executable != null ? getParentOf(executable) : null;
-
-                        if (subtask != null) {
-                            Item item = Tasks.getItemOf(subtask);
-                            while (item != null) {
-                                if (item == this) {
-                                    buildsInProgress.put(e, e.getCurrentExecutable());
-                                    e.interrupt(Result.ABORTED);
-                                    break;
-                                }
-                                if (item.getParent() instanceof Item) {
-                                    item = (Item) item.getParent();
-                                } else {
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-                if (!buildsInProgress.isEmpty()) {
-                    // give them 15 seconds or so to respond to the interrupt
-                    long expiration = System.nanoTime() + TimeUnit.SECONDS.toNanos(15);
-                    // comparison with executor.getCurrentExecutable() == computation currently should always be true
-                    // as we no longer recycle Executors, but safer to future-proof in case we ever revisit recycling
-                    while (!buildsInProgress.isEmpty() && expiration - System.nanoTime() > 0L) {
-                        // we know that ItemDeletion will prevent any new builds in the queue
-                        // ItemDeletion happens-before Queue.cancel so we know that the Queue will stay clear
-                        // Queue.cancel happens-before collecting the buildsInProgress list
-                        // thus buildsInProgress contains the complete set we need to interrupt and wait for
-                        for (Iterator<Map.Entry<Executor, Queue.Executable>> iterator =
-                             buildsInProgress.entrySet().iterator();
-                             iterator.hasNext(); ) {
-                            Map.Entry<Executor, Queue.Executable> entry = iterator.next();
-                            // comparison with executor.getCurrentExecutable() == executable currently should always be
-                            // true as we no longer recycle Executors, but safer to future-proof in case we ever
-                            // revisit recycling.
-                            if (!entry.getKey().isAlive()
-                                    || entry.getValue() != entry.getKey().getCurrentExecutable()) {
-                                iterator.remove();
-                            }
-                            // I don't know why, but we have to keep interrupting
-                            entry.getKey().interrupt(Result.ABORTED);
-                        }
-                        Thread.sleep(50L);
-                    }
-                    if (!buildsInProgress.isEmpty()) {
-                        throw new Failure(Messages.AbstractItem_FailureToStopBuilds(
-                                buildsInProgress.size(), getFullDisplayName()
-                        ));
-                    }
-                }
+                ItemDeletion.cancelBuildsInProgress(this);
             }
             if (this instanceof ItemGroup) {
                 // delete individual items first
diff --git a/core/src/main/java/hudson/model/listeners/ItemListener.java b/core/src/main/java/hudson/model/listeners/ItemListener.java
index aef431c3207b..fe09a9c56373 100644
--- a/core/src/main/java/hudson/model/listeners/ItemListener.java
+++ b/core/src/main/java/hudson/model/listeners/ItemListener.java
@@ -35,6 +35,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.util.Listeners;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
  * Receives notifications about CRUD operations of {@link Item}.
@@ -94,6 +96,16 @@ public void onCopied(Item src, Item item) {
     public void onLoaded() {
     }
 
+    /**
+     * Called before an item is deleted, providing the ability to veto the deletion operation before it starts.
+     * @param item the item being deleted
+     * @throws Failure to veto the operation.
+     * @throws InterruptedException If a blocking condition was interrupted, also vetoing the operation.
+     * @since TODO
+     */
+    public void onCheckDelete(Item item) throws Failure, InterruptedException {
+    }
+
     /**
      * Called right before a job is going to be deleted.
      *
@@ -205,6 +217,19 @@ public static void fireOnUpdated(final Item item) {
         Listeners.notify(ItemListener.class, false, l -> l.onUpdated(item));
     }
 
+    @Restricted(NoExternalUse.class)
+    public static void checkBeforeDelete(Item item) throws Failure, InterruptedException {
+        for (ItemListener l : all()) {
+            try {
+                l.onCheckDelete(item);
+            } catch (Failure e) {
+                throw e;
+            } catch (RuntimeException x) {
+                LOGGER.log(Level.WARNING, "failed to send event to listener of " + l.getClass(), x);
+            }
+        }
+    }
+
     /** @since 1.548 */
     public static void fireOnDeleted(final Item item) {
         Listeners.notify(ItemListener.class, false, l -> l.onDeleted(item));
diff --git a/core/src/main/java/jenkins/model/queue/ItemDeletion.java b/core/src/main/java/jenkins/model/queue/ItemDeletion.java
index e5c9fc2ca87e..fd18edde04a5 100644
--- a/core/src/main/java/jenkins/model/queue/ItemDeletion.java
+++ b/core/src/main/java/jenkins/model/queue/ItemDeletion.java
@@ -28,25 +28,42 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.ExtensionList;
+import hudson.model.AbstractItem;
 import hudson.model.Action;
+import hudson.model.Computer;
+import hudson.model.Executor;
+import hudson.model.Failure;
 import hudson.model.Item;
+import hudson.model.Messages;
 import hudson.model.Queue;
+import hudson.model.Result;
+import hudson.model.queue.Executables;
+import hudson.model.queue.SubTask;
 import hudson.model.queue.Tasks;
+import hudson.model.queue.WorkUnit;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.logging.Logger;
+import jenkins.model.Jenkins;
 import net.jcip.annotations.GuardedBy;
 
 /**
  * A {@link Queue.QueueDecisionHandler} that blocks items being deleted from entering the queue.
- *
+ * @see AbstractItem#delete()
  * @since 2.55
  */
 @Extension
 public class ItemDeletion extends Queue.QueueDecisionHandler {
 
+    private static final Logger LOGGER = Logger.getLogger(ItemDeletion.class.getName());
+
     /**
      * Lock to guard the {@link #registrations} set.
      */
@@ -176,4 +193,94 @@ public boolean shouldSchedule(Queue.Task p, List<Action> actions) {
         }
         return true;
     }
+
+    /**
+     * Cancels any builds in progress of this item (if a job) or descendants (if a folder).
+     * Also cancels any associated queue items.
+     * @param initiatingItem an item being deleted
+     * @since TODO
+     */
+    public static void cancelBuildsInProgress(@NonNull Item initiatingItem) throws Failure, InterruptedException {
+        Queue queue = Queue.getInstance();
+        if (initiatingItem instanceof Queue.Task) {
+            // clear any items in the queue so they do not get picked up
+            queue.cancel((Queue.Task) initiatingItem);
+        }
+        // now cancel any child items - this happens after ItemDeletion registration, so we can use a snapshot
+        for (Queue.Item i : queue.getItems()) {
+            Item item = Tasks.getItemOf(i.task);
+            while (item != null) {
+                if (item == initiatingItem) {
+                    if (!queue.cancel(i)) {
+                        LOGGER.warning(() -> "failed to cancel " + i);
+                    }
+                    break;
+                }
+                if (item.getParent() instanceof Item) {
+                    item = (Item) item.getParent();
+                } else {
+                    break;
+                }
+            }
+        }
+        // interrupt any builds in progress (and this should be a recursive test so that folders do not pay
+        // the 15 second delay for every child item). This happens after queue cancellation, so will be
+        // a complete set of builds in flight
+        Map<Executor, Queue.Executable> buildsInProgress = new LinkedHashMap<>();
+        for (Computer c : Jenkins.get().getComputers()) {
+            for (Executor e : c.getAllExecutors()) {
+                final WorkUnit workUnit = e.getCurrentWorkUnit();
+                final Queue.Executable executable = workUnit != null ? workUnit.getExecutable() : null;
+                final SubTask subtask = executable != null ? Executables.getParentOf(executable) : null;
+                if (subtask != null) {
+                    Item item = Tasks.getItemOf(subtask);
+                    while (item != null) {
+                        if (item == initiatingItem) {
+                            buildsInProgress.put(e, e.getCurrentExecutable());
+                            e.interrupt(Result.ABORTED);
+                            break;
+                        }
+                        if (item.getParent() instanceof Item) {
+                            item = (Item) item.getParent();
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (!buildsInProgress.isEmpty()) {
+            // give them 15 seconds or so to respond to the interrupt
+            long expiration = System.nanoTime() + TimeUnit.SECONDS.toNanos(15);
+            // comparison with executor.getCurrentExecutable() == computation currently should always be true
+            // as we no longer recycle Executors, but safer to future-proof in case we ever revisit recycling
+            while (!buildsInProgress.isEmpty() && expiration - System.nanoTime() > 0L) {
+                // we know that ItemDeletion will prevent any new builds in the queue
+                // ItemDeletion happens-before Queue.cancel so we know that the Queue will stay clear
+                // Queue.cancel happens-before collecting the buildsInProgress list
+                // thus buildsInProgress contains the complete set we need to interrupt and wait for
+                for (Iterator<Map.Entry<Executor, Queue.Executable>> iterator =
+                     buildsInProgress.entrySet().iterator();
+                     iterator.hasNext(); ) {
+                    Map.Entry<Executor, Queue.Executable> entry = iterator.next();
+                    // comparison with executor.getCurrentExecutable() == executable currently should always be
+                    // true as we no longer recycle Executors, but safer to future-proof in case we ever
+                    // revisit recycling.
+                    if (!entry.getKey().isAlive()
+                            || entry.getValue() != entry.getKey().getCurrentExecutable()) {
+                        iterator.remove();
+                    }
+                    // I don't know why, but we have to keep interrupting
+                    entry.getKey().interrupt(Result.ABORTED);
+                }
+                Thread.sleep(50L);
+            }
+            if (!buildsInProgress.isEmpty()) {
+                throw new Failure(Messages.AbstractItem_FailureToStopBuilds(
+                        buildsInProgress.size(), initiatingItem.getFullDisplayName()
+                ));
+            }
+        }
+    }
+
 }

From 2d7bcec27bce8e3bbb620be8069afc00a2a75825 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 17:17:38 -0700
Subject: [PATCH 234/449] Bump org.jenkins-ci.plugins:junit from
 1265.v65b_14fa_f12f0 to 1279.v72cf99b_25c43 (#9492)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index ede4a5e74bff..2cd2359d1ba7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -228,7 +228,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1265.v65b_14fa_f12f0</version>
+      <version>1279.v72cf99b_25c43</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 5da75ee1a520..e8196566716a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -298,7 +298,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1265.v65b_14fa_f12f0</version>
+                  <version>1279.v72cf99b_25c43</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From cff28cdd3e832790eeda4fcf7e294cb0d0501527 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 18:03:47 -0700
Subject: [PATCH 235/449] Update jenkins/ath Docker tag to v5906 (#9496)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 4feb60dda029..d71a318fb0b7 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5895.v44475b_ca_0c78
+export ATH_VERSION=5906.v3b_8f6cb_90e60
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From 4daa0788740542086f421f862fe1f5f85a78914d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 19:17:25 -0700
Subject: [PATCH 236/449] Update jenkins/ath Docker tag to v5909 (#9497)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index d71a318fb0b7..81106967e54b 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5906.v3b_8f6cb_90e60
+export ATH_VERSION=5909.vc4fa_3e55b_f84
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From 6f7edd18681ab38d0e0db7f002c21b8bd7f8766e Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Sat, 27 Jul 2024 09:58:51 +0200
Subject: [PATCH 237/449] Add missing at-since in AdministrativeMonitor (#9493)

---
 core/src/main/java/hudson/model/AdministrativeMonitor.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java
index 61208dea6467..8ef938f1310e 100644
--- a/core/src/main/java/hudson/model/AdministrativeMonitor.java
+++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java
@@ -213,6 +213,7 @@ public Permission getRequiredPermission() {
      * </p>
      * @see #getRequiredPermission()
      * @see #hasRequiredPermission()
+     * @since 2.468
      */
     public void checkRequiredPermission() {
         Jenkins.get().checkPermission(getRequiredPermission());
@@ -226,6 +227,7 @@ public void checkRequiredPermission() {
      * </p>
      * @see #getRequiredPermission()
      * @see #checkRequiredPermission()
+     * @since 2.468
      */
     public boolean hasRequiredPermission() {
         return Jenkins.get().hasPermission(getRequiredPermission());

From 9967a76db9d4ade2510734fb35c522635c47a899 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 27 Jul 2024 11:46:10 -0700
Subject: [PATCH 238/449] Update dependency sass-loader to v15 (#9498)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index a1fc1a8b5d0c..5f42845e5b66 100644
--- a/war/package.json
+++ b/war/package.json
@@ -43,7 +43,7 @@
     "postcss-scss": "4.0.9",
     "prettier": "3.3.3",
     "sass": "1.77.8",
-    "sass-loader": "14.2.1",
+    "sass-loader": "15.0.0",
     "style-loader": "4.0.0",
     "stylelint": "16.7.0",
     "stylelint-checkstyle-reporter": "1.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index f7fa1b3c1117..97b3c957b34e 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4433,7 +4433,7 @@ __metadata:
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.3"
     sass: "npm:1.77.8"
-    sass-loader: "npm:14.2.1"
+    sass-loader: "npm:15.0.0"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
     stylelint: "npm:16.7.0"
@@ -6364,9 +6364,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass-loader@npm:14.2.1":
-  version: 14.2.1
-  resolution: "sass-loader@npm:14.2.1"
+"sass-loader@npm:15.0.0":
+  version: 15.0.0
+  resolution: "sass-loader@npm:15.0.0"
   dependencies:
     neo-async: "npm:^2.6.2"
   peerDependencies:
@@ -6386,7 +6386,7 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 10c0/9a48d454584d96d6c562eb323bb9e3c6808e930eeaaa916975b97d45831e0b87936a8655cdb3a4512a25abc9587dea65a9616e42396be0d7e7c507a4795a8146
+  checksum: 10c0/8e17d21194f5806a971e98c149ac5a2387fa3b4327a81f2194253b61181c6dac965970c30e1e1b294f977e1822ff7c03feb0e26864f1f43cdea34a82caaf40af
   languageName: node
   linkType: hard
 

From f9cc2a537ab43399233680f6f4f4abbabe6cb52c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 28 Jul 2024 09:31:18 +0200
Subject: [PATCH 239/449] Update dependency node to v20.16.0 (#9500)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index e8196566716a..02b0efeb0f3e 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -47,7 +47,7 @@ THE SOFTWARE.
     <!-- HTTP listener port -->
     <port>8080</port>
     <mina-sshd-api.version>2.13.1-117.v2f1a_b_66ff91d</mina-sshd-api.version>
-    <node.version>20.15.1</node.version>
+    <node.version>20.16.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->

From 90fb0d6e5e679296f3a20c2914bac5f6388fc1d0 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sun, 28 Jul 2024 16:12:33 +0200
Subject: [PATCH 240/449] scroll fields from added hetero-list entry into
 viewport (#9488)

* remove YUI from ensureVisible

replace usage of YUI with plain javascript in the ensureVisible method

The current logic seems to have no effect, so it is changed in the
following
When the element is bigger then the current viewport height, scroll so
that the element is at the top.
If the elements is smaller than the viewport height and the bottom is
outside scoll so that the bottom is at the lower end of the viewport.
Otherwise no scrolling is needed the element is already completely
inside the viewport.

* apply prettier

* remove body.scrollTop
---
 .../main/webapp/scripts/hudson-behavior.js    | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 8d1a0a9e8e8a..110a09fa199f 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -2242,14 +2242,13 @@ function getStyle(e, a) {
  */
 // eslint-disable-next-line no-unused-vars
 function ensureVisible(e) {
-  var viewport = YAHOO.util.Dom.getClientRegion();
-  var pos = YAHOO.util.Dom.getRegion(e);
-
-  var Y = viewport.top;
-  var H = viewport.height;
+  const scrollTop = document.documentElement.scrollTop;
+  let Y = scrollTop;
+  let H = window.innerHeight;
+  let c = 0;
 
   function handleStickers(name, f) {
-    var e = document.getElementById(name);
+    const e = document.getElementById(name);
     if (e) {
       f(e);
     }
@@ -2261,6 +2260,7 @@ function ensureVisible(e) {
     t = t.clientHeight;
     Y += t;
     H -= t;
+    c += t;
   });
 
   handleStickers("bottom-sticker", function (b) {
@@ -2268,17 +2268,15 @@ function ensureVisible(e) {
     H -= b;
   });
 
-  var y = pos.top;
-  var h = pos.height;
+  const box = e.getBoundingClientRect();
+  const y = Math.round(box.top + scrollTop);
+  const h = e.offsetHeight;
+  const d = y + h - (Y + H);
 
-  var d = y + h - (Y + H);
-  if (d > 0) {
-    document.body.scrollTop += d;
-  } else {
-    d = Y - y;
-    if (d > 0) {
-      document.body.scrollTop -= d;
-    }
+  if (h > H) {
+    document.documentElement.scrollTop = y - c;
+  } else if (d > 0) {
+    document.documentElement.scrollTop += d;
   }
 }
 

From 11f87f70adfc7c19609f6fd4644d06ca02d541d6 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Sun, 28 Jul 2024 16:12:48 +0200
Subject: [PATCH 241/449] Deprecate AdministrativeMonitor#getRequiredPermission
 (#9494)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
---
 core/src/main/java/hudson/model/AdministrativeMonitor.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java
index 8ef938f1310e..bdbfb48027d3 100644
--- a/core/src/main/java/hudson/model/AdministrativeMonitor.java
+++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java
@@ -200,7 +200,10 @@ public void doDisable(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
      *     Form UI elements that change system state, e.g. toggling a feature on or off, need to be hidden from users
      *     lacking Administer permission.
      * </p>
+     * @since 2.233
+     * @deprecated Callers should use {@link #checkRequiredPermission()} or {@link #hasRequiredPermission()}.
      */
+    @Deprecated
     public Permission getRequiredPermission() {
         return Jenkins.ADMINISTER;
     }

From cbfe2d4d00ade7db192e21ebfbc47d906d5f725b Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Sun, 28 Jul 2024 10:13:05 -0400
Subject: [PATCH 242/449] Tolerate `HttpResponse` thrown from
 `Descriptor.newInstance` (#9495)

* Tolerate `HttpResponse` thrown from `Descriptor.newInstance`

* Incremental version

* Pick up release of https://github.com/jenkinsci/stapler/pull/571
---
 bom/pom.xml                                     | 2 +-
 core/src/main/java/hudson/model/Descriptor.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 63d8b5cd65f7..8f8e6412f7b0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <slf4jVersion>2.0.13</slf4jVersion>
-    <stapler.version>1881.vd39f3ee5c629</stapler.version>
+    <stapler.version>1892.v73465f3d074d</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index 07789531e94d..b5eb07784d27 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -594,6 +594,9 @@ public T newInstance(@Nullable StaplerRequest req, @NonNull JSONObject formData)
                 return verifyNewInstance(bindJSON(req, clazz, formData, true));
             }
         } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException | RuntimeException e) {
+            if (e instanceof RuntimeException && e instanceof HttpResponse) {
+                throw (RuntimeException) e;
+            }
             throw new LinkageError("Failed to instantiate " + clazz + " from " + RedactSecretJsonInErrorMessageSanitizer.INSTANCE.sanitize(formData), e);
         }
     }
@@ -674,7 +677,7 @@ public Object instantiate(Class actualType, JSONObject json) {
                                 + actualType.getName() + " " + json);
                     }
                 } catch (Exception x) {
-                    LOGGER.log(Level.WARNING, "falling back to default instantiation " + actualType.getName() + " " + json, x);
+                    LOGGER.log(x instanceof HttpResponse ? Level.FINE : Level.WARNING, "falling back to default instantiation " + actualType.getName() + " " + json, x);
                     // If nested objects are not using newInstance, bindJSON will wind up throwing the same exception anyway,
                     // so logging above will result in a duplicated stack trace.
                     // However if they *are* then this is the only way to find errors in that newInstance.

From 0a2ef212a1d80c8d5e5620f24b5cfd269d849937 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 28 Jul 2024 13:18:50 -0700
Subject: [PATCH 243/449] Update dependency postcss to v8.4.40 (#9499)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 5f42845e5b66..a49b0196707e 100644
--- a/war/package.json
+++ b/war/package.json
@@ -37,7 +37,7 @@
     "globals": "15.8.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
-    "postcss": "8.4.39",
+    "postcss": "8.4.40",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "9.6.0",
     "postcss-scss": "4.0.9",
diff --git a/war/yarn.lock b/war/yarn.lock
index 97b3c957b34e..b08947fdb649 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4427,7 +4427,7 @@ __metadata:
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.0"
-    postcss: "npm:8.4.39"
+    postcss: "npm:8.4.40"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:9.6.0"
     postcss-scss: "npm:4.0.9"
@@ -6107,14 +6107,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.39, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.39":
-  version: 8.4.39
-  resolution: "postcss@npm:8.4.39"
+"postcss@npm:8.4.40, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.39":
+  version: 8.4.40
+  resolution: "postcss@npm:8.4.40"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/16f5ac3c4e32ee76d1582b3c0dcf1a1fdb91334a45ad755eeb881ccc50318fb8d64047de4f1601ac96e30061df203f0f2e2edbdc0bfc49b9c57bc9fb9bedaea3
+  checksum: 10c0/65ed67573e5443beaeb582282ff27a6be7c7fe3b4d9fa15761157616f2b97510cb1c335023c26220b005909f007337026d6e3ff092f25010b484ad484e80ea7f
   languageName: node
   linkType: hard
 

From 7dd7f2b36aab3db2d780f80bebba060ade18be2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 10:00:52 -0600
Subject: [PATCH 244/449] Bump org.jenkins-ci.plugins:scm-api from
 690.vfc8b_54395023 to 696.v778d637b_a_762 (#9503)

Bump org.jenkins-ci.plugins:scm-api

Bumps [org.jenkins-ci.plugins:scm-api](https://github.com/jenkinsci/scm-api-plugin) from 690.vfc8b_54395023 to 696.v778d637b_a_762.
- [Release notes](https://github.com/jenkinsci/scm-api-plugin/releases)
- [Changelog](https://github.com/jenkinsci/scm-api-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenkinsci/scm-api-plugin/commits)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:scm-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 2cd2359d1ba7..3ebf0d422e68 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -110,7 +110,7 @@ THE SOFTWARE.
         <!-- Required by workflow-support -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>scm-api</artifactId>
-        <version>690.vfc8b_54395023</version>
+        <version>696.v778d637b_a_762</version>
       </dependency>
       <dependency>
         <!-- requireUpperBoundDeps via matrix-project and junit -->
diff --git a/war/pom.xml b/war/pom.xml
index 02b0efeb0f3e..6694a91d6ce4 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -402,7 +402,7 @@ THE SOFTWARE.
                   <!-- dependency of workflow-api and workflow-support -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>scm-api</artifactId>
-                  <version>690.vfc8b_54395023</version>
+                  <version>696.v778d637b_a_762</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From c9ec32ba4ffafa949f209e365c1e6e18e06274e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 10:01:02 -0600
Subject: [PATCH 245/449] Bump org.jenkins-ci.plugins:junit from
 1279.v72cf99b_25c43 to 1280.v310a_78b_9a_1e0 (#9504)

Bump org.jenkins-ci.plugins:junit

Bumps [org.jenkins-ci.plugins:junit](https://github.com/jenkinsci/junit-plugin) from 1279.v72cf99b_25c43 to 1280.v310a_78b_9a_1e0.
- [Release notes](https://github.com/jenkinsci/junit-plugin/releases)
- [Commits](https://github.com/jenkinsci/junit-plugin/commits)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:junit
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 3ebf0d422e68..441d7ad76ecc 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -228,7 +228,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1279.v72cf99b_25c43</version>
+      <version>1280.v310a_78b_9a_1e0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 6694a91d6ce4..08c1aa61a3b9 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -298,7 +298,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1279.v72cf99b_25c43</version>
+                  <version>1280.v310a_78b_9a_1e0</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 7f3259afd61af24755aca4e0b4dd37324f92af86 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 29 Jul 2024 10:21:08 -0700
Subject: [PATCH 246/449] Update JTH from 2225.2229.vc4c7fcb_6673c to
 2225.2230.v6210cb_b_827f9 (#9506)

---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 441d7ad76ecc..32a93e3e4503 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,7 +147,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2225.2229.vc4c7fcb_6673c</version>
+      <version>2225.2230.v6210cb_b_827f9</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 4462ba67c70b5d2f6431e7e26445ada60971bf64 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 13:15:05 -0700
Subject: [PATCH 247/449] Update dependency @babel/preset-env to v7.25.0
 (#9507)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   2 +-
 war/yarn.lock    | 297 ++++++++++++++++++++++++-----------------------
 2 files changed, 154 insertions(+), 145 deletions(-)

diff --git a/war/package.json b/war/package.json
index a49b0196707e..c2241a46ab24 100644
--- a/war/package.json
+++ b/war/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@babel/cli": "7.24.8",
     "@babel/core": "7.24.9",
-    "@babel/preset-env": "7.24.8",
+    "@babel/preset-env": "7.25.0",
     "@eslint/js": "9.7.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index b08947fdb649..63cc30dac566 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -59,10 +59,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/compat-data@npm:7.24.8"
-  checksum: 10c0/7f465e9d8e44c5b516eeb3001362a3cd9a6df51dd90d3ac9868e1e7fa631ac57fc781cec6700110d4f555ba37fe59c4a71927b445106fe0062e79e79ffe11091
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.8, @babel/compat-data@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/compat-data@npm:7.25.0"
+  checksum: 10c0/2873df153aa0c60f9e63369320beb5fd9ca948552a06c77db1eb0687bd10a296c9fbf9996bd4b3c8137a78eba3a0f0edfc41b65f57fca8421e5c0c8bb13a813d
   languageName: node
   linkType: hard
 
@@ -89,15 +89,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.8, @babel/generator@npm:^7.24.9":
-  version: 7.24.10
-  resolution: "@babel/generator@npm:7.24.10"
+"@babel/generator@npm:^7.24.9, @babel/generator@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/generator@npm:7.25.0"
   dependencies:
-    "@babel/types": "npm:^7.24.9"
+    "@babel/types": "npm:^7.25.0"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/abcfd75f625aecc87ce6036ef788b12723fd3c46530df1130d1f00d18e48b462849ddaeef8b1a02bfdcb6e28956389a98c5729dad1c3c5448307dacb6c959f29
+  checksum: 10c0/d0e2dfcdc8bdbb5dded34b705ceebf2e0bc1b06795a1530e64fb6a3ccf313c189db7f60c1616effae48114e1a25adc75855bc4496f3779a396b3377bae718ce7
   languageName: node
   linkType: hard
 
@@ -152,16 +152,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.7"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.0"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
     regexpu-core: "npm:^5.3.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/ed611a7eb0c71843f9cdc471eeb38767972229f9225f7aaa90d124d7ee0062cf6908fd53ee9c34f731394c429594f06049a7738a71d342e0191d4047b2fc0ac2
+  checksum: 10c0/7d8b4d0338c1e76a60d8903745b5059fe0302e356a5b65607292f81e8333dc57583dbcb05e82f2b58d747864ad0044010a690b3bbb9278663b523f0ba919a37c
   languageName: node
   linkType: hard
 
@@ -199,22 +199,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/19ee37563bbd1219f9d98991ad0e9abef77803ee5945fd85aa7aa62a67c69efca9a801696a1b58dda27f211e878b3327789e6fd2a6f6c725ccefe36774b5ce95
-  languageName: node
-  linkType: hard
-
-"@babel/helper-member-expression-to-functions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.7"
+"@babel/helper-member-expression-to-functions@npm:^7.24.7, @babel/helper-member-expression-to-functions@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.8"
   dependencies:
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/9638c1d33cf6aba028461ccd3db6061c76ff863ca0d5013dd9a088bf841f2f77c46956493f9da18355c16759449d23b74cc1de4da357ade5c5c34c858f840f0a
+    "@babel/traverse": "npm:^7.24.8"
+    "@babel/types": "npm:^7.24.8"
+  checksum: 10c0/7e14a5acc91f6cd26305a4441b82eb6f616bd70b096a4d2099a968f16b26d50207eec0b9ebfc466fefd62bd91587ac3be878117cdfec819b7151911183cb0e5a
   languageName: node
   linkType: hard
 
@@ -228,18 +219,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.24.9":
-  version: 7.24.9
-  resolution: "@babel/helper-module-transforms@npm:7.24.9"
+"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.24.9, @babel/helper-module-transforms@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helper-module-transforms@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
     "@babel/helper-module-imports": "npm:^7.24.7"
     "@babel/helper-simple-access": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/e27bca43bc113731ee4f2b33a4c5bf9c7eebf4d64487b814c305cbd5feb272c29fcd3d79634ba03131ade171e5972bc7ede8dbc83ba0deb02f1e62d318c87770
+  checksum: 10c0/83c0ea9bbd10afbf3539c40ff2c255dd9af6a003dd4a51ed94faed110a52a0ab510fcdd7a675117e8b72d6b479643864674b9243997516c8d77a95dd688e0c9a
   languageName: node
   linkType: hard
 
@@ -259,29 +249,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.7"
+"@babel/helper-remap-async-to-generator@npm:^7.24.7, @babel/helper-remap-async-to-generator@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.25.0"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-wrap-function": "npm:^7.24.7"
+    "@babel/helper-wrap-function": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/4e7fa2cdcbc488e41c27066c16e562857ef3c5c2bfe70d2f1e32e9ee7546b17c3fc1c20d05bf2a7f1c291bd9e7a0a219f6a9fa387209013294be79a26fcfe64d
+  checksum: 10c0/0d17b5f7bb6a607edc9cc62fff8056dd9f341bf2f919884f97b99170d143022a5e7ae57922c4891e4fc360ad291e708d2f8cd8989f1d3cd7a17600159984f5a6
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-replace-supers@npm:7.24.7"
+"@babel/helper-replace-supers@npm:^7.24.7, @babel/helper-replace-supers@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helper-replace-supers@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.8"
     "@babel/helper-optimise-call-expression": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/0e133bb03371dee78e519c334a09c08e1493103a239d9628db0132dfaac3fc16380479ca3c590d278a9b71b624030a338c18ebbfe6d430ebb2e4653775c4b3e3
+  checksum: 10c0/b4b6650ab3d56c39a259367cd97f8df2f21c9cebb3716fea7bca40a150f8847bfb82f481e98927c7c6579b48a977b5a8f77318a1c6aeb497f41ecd6dbc3fdfef
   languageName: node
   linkType: hard
 
@@ -335,15 +325,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-wrap-function@npm:7.24.7"
+"@babel/helper-wrap-function@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helper-wrap-function@npm:7.25.0"
   dependencies:
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/d5689f031bf0eb38c0d7fad6b7e320ddef4bfbdf08d12d7d76ef41b7ca365a32721e74cb5ed5a9a9ec634bc20f9b7a27314fa6fb08f1576b8f6d8330fcea6f47
+    "@babel/template": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.0"
+  checksum: 10c0/d54601a98384c191cbc1ff07b03a19e288ef8d5c6bfafe270b2a303d96e7304eb296002921ed464cc1b105a547d1db146eb86b0be617924dee1ba1b379cdc216
   languageName: node
   linkType: hard
 
@@ -369,35 +358,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.24.7, @babel/parser@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/parser@npm:7.24.8"
+"@babel/parser@npm:^7.24.8, @babel/parser@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/parser@npm:7.25.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/ce69671de8fa6f649abf849be262707ac700b573b8b1ce1893c66cc6cd76aeb1294a19e8c290b0eadeb2f47d3f413a2e57a281804ffbe76bfb9fa50194cf3c52
+  checksum: 10c0/4aecf13829fa6f4a66835429bd235458544d9cd14374b17c19bc7726f472727ca33f500e51e1298ddc72db93bdd77fcaa9ddc095200b0b792173069e6cf9742e
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.7"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/394c30e2b708ad385fa1219528e039066a1f1cb40f47986f283878848fd354c745e6397f588b4e5a046ee8d64bfdf4c208e4c3dfbdcfb2fd34315ec67c64e7af
+  checksum: 10c0/08aecaa7c83fa78a44ea758863083261093374f38f783d3971d2c08de640d701bb464c9c7eaee7a84ce6551b573d703b1b07e59786752cc1f679827ae53d1e4a
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.7"
+"@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:7.25.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/a36307428ecc1a01b00cf90812335eed1575d13f211ab24fe4d0c55c28a2fcbd4135f142efabc3b277b2a8e09ee05df594a1272353f061b63829495b5dcfdb96
+  checksum: 10c0/9645a1f47b3750acadb1353c02e71cc712d072aafe5ce115ed3a886bc14c5d9200cfb0b5b5e60e813baa549b800cf798f8714019fd246c699053cf68c428e426
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.25.0"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/ed1ce1c90cac46c01825339fd0f2a96fa071b016fb819d8dfaf8e96300eae30e74870cb47e4dc80d4ce2fb287869f102878b4f3b35bc927fec8b1d0d76bcf612
   languageName: node
   linkType: hard
 
@@ -414,15 +414,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.7"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/2b52a73e444f6adc73f927b623e53a4cf64397170dd1071268536df1b3db1e02131418c8dc91351af48837a6298212118f4a72d5407f8005cf9a732370a315b0
+  checksum: 10c0/45988025537a9d4a27b610fd696a18fd9ba9336621a69b4fb40560eeb10c79657f85c92a37f30c7c8fb29c22970eea0b373315795a891f1a05549a6cfe5a6bfe
   languageName: node
   linkType: hard
 
@@ -645,17 +645,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.7"
+"@babel/plugin-transform-async-generator-functions@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
-    "@babel/helper-remap-async-to-generator": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/helper-remap-async-to-generator": "npm:^7.25.0"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6b5e33ae66dce0afce9b06d8dace6fa052528e60f7622aa6cfd3e71bd372ca5079d426e78336ca564bc0d5f37acbcda1b21f4fe656fcb642f1a93a697ab39742
+  checksum: 10c0/5348c3a33d16e0d62f13482c6fa432185ba096d58880b08d42450f7db662d6b03e6149d495c8620897dcd3da35061068cbd6c09da7d0ec95743e55a788809e4e
   languageName: node
   linkType: hard
 
@@ -683,14 +683,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.7"
+"@babel/plugin-transform-block-scoping@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.25.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/dcbc5e385c0ca5fb5736b1c720c90755cffe9f91d8c854f82e61e59217dd3f6c91b3633eeee4b55a89d3f59e5275d0f5b0b1b1363d4fa70c49c468b55aa87700
+  checksum: 10c0/382931c75a5d0ea560387e76cb57b03461300527e4784efcb2fb62f36c1eb0ab331327b6034def256baa0cad9050925a61f9c0d56261b6afd6a29c3065fb0bd4
   languageName: node
   linkType: hard
 
@@ -719,21 +719,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/plugin-transform-classes@npm:7.24.8"
+"@babel/plugin-transform-classes@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-classes@npm:7.25.0"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
     "@babel/helper-compilation-targets": "npm:^7.24.8"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
-    "@babel/helper-replace-supers": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.0"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4423da0f747bdb6aab1995d98a74533fa679f637ec20706810dd57fb4ba2b1885ec8cae6a0b2c3f69f27165de6ff6aa2da9c4061c893848736a8267d0c653079
+  checksum: 10c0/4451dccf8a7979427ae042afe381233f30764a8072faf0de1337a4fc297c6d7cb40df9e28931ac096e5b56392d0cd97d3ce10aee68288150a8701624d362a791
   languageName: node
   linkType: hard
 
@@ -783,6 +781,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:7.25.0"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/1c9b57ddd9b33696e88911d0e7975e1573ebc46219c4b30eb1dc746cbb71aedfac6f6dab7fdfdec54dd58f31468bf6ab56b157661ea4ffe58f906d71f89544c8
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-dynamic-import@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.7"
@@ -831,16 +841,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-function-name@npm:7.24.7"
+"@babel/plugin-transform-function-name@npm:^7.25.0":
+  version: 7.25.1
+  resolution: "@babel/plugin-transform-function-name@npm:7.25.1"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
+    "@babel/traverse": "npm:^7.25.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/3e9642428d6952851850d89ea9307d55946528d18973784d0e2f04a651b23bd9924dd8a2641c824b483bd4ab1223bab1d2f6a1106a939998f7ced512cb60ac5b
+  checksum: 10c0/e74912174d5e33d1418b840443c2e226a7b76cc017c1ed20ee30a566e4f1794d4a123be03180da046241576e8b692731807ba1f52608922acf1cb2cb6957593f
   languageName: node
   linkType: hard
 
@@ -915,17 +925,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.7"
+"@babel/plugin-transform-modules-systemjs@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.25.0"
   dependencies:
-    "@babel/helper-hoist-variables": "npm:^7.24.7"
-    "@babel/helper-module-transforms": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-module-transforms": "npm:^7.25.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.25.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e2a795e0a6baafe26f4a74010622212ddd873170742d673f450e0097f8d984f6e6a95eb8ce41b05071ee9790c4be088b33801aaab3f78ee202c567634e52a331
+  checksum: 10c0/fca6198da71237e4bb1274b3b67a0c81d56013c9535361242b6bfa87d70a9597854aadb45d4d8203369be4a655e158be2a5d20af0040b1f8d1bfc47db3ad7b68
   languageName: node
   linkType: hard
 
@@ -1213,18 +1223,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.24.8":
-  version: 7.24.8
-  resolution: "@babel/preset-env@npm:7.24.8"
+"@babel/preset-env@npm:7.25.0":
+  version: 7.25.0
+  resolution: "@babel/preset-env@npm:7.25.0"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.8"
+    "@babel/compat-data": "npm:^7.25.0"
     "@babel/helper-compilation-targets": "npm:^7.24.8"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-validator-option": "npm:^7.24.8"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.7"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.0"
+    "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.0"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.25.0"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.7"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.25.0"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
@@ -1245,29 +1256,30 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.7"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.25.0"
     "@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-block-scoping": "npm:^7.24.7"
+    "@babel/plugin-transform-block-scoping": "npm:^7.25.0"
     "@babel/plugin-transform-class-properties": "npm:^7.24.7"
     "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
-    "@babel/plugin-transform-classes": "npm:^7.24.8"
+    "@babel/plugin-transform-classes": "npm:^7.25.0"
     "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
     "@babel/plugin-transform-destructuring": "npm:^7.24.8"
     "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
     "@babel/plugin-transform-duplicate-keys": "npm:^7.24.7"
+    "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.0"
     "@babel/plugin-transform-dynamic-import": "npm:^7.24.7"
     "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.7"
     "@babel/plugin-transform-export-namespace-from": "npm:^7.24.7"
     "@babel/plugin-transform-for-of": "npm:^7.24.7"
-    "@babel/plugin-transform-function-name": "npm:^7.24.7"
+    "@babel/plugin-transform-function-name": "npm:^7.25.0"
     "@babel/plugin-transform-json-strings": "npm:^7.24.7"
     "@babel/plugin-transform-literals": "npm:^7.24.7"
     "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
     "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
     "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
     "@babel/plugin-transform-modules-commonjs": "npm:^7.24.8"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.7"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.25.0"
     "@babel/plugin-transform-modules-umd": "npm:^7.24.7"
     "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.24.7"
     "@babel/plugin-transform-new-target": "npm:^7.24.7"
@@ -1300,7 +1312,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a6f29498ec58989845a61f9c10b1b4e80586f1810a33db461d597cdb0ad2cd847381a993038b09f727512a08b2c1a33a330a5d4e6d65463ee98a1b4302d52ec6
+  checksum: 10c0/a688c337b8fe9bd113e7a4a34ce2d7c19f13298aef919709e6f9301f2a2bc3e5299033de5d82f298ba71660577b2055ea4a8d4ced8d273b7ff2061c3a8e3b698
   languageName: node
   linkType: hard
 
@@ -1333,43 +1345,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/template@npm:7.24.7"
+"@babel/template@npm:^7.24.7, @babel/template@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/template@npm:7.25.0"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/95b0b3ee80fcef685b7f4426f5713a855ea2cd5ac4da829b213f8fb5afe48a2a14683c2ea04d446dbc7f711c33c5cd4a965ef34dcbe5bc387c9e966b67877ae3
+    "@babel/parser": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.0"
+  checksum: 10c0/4e31afd873215744c016e02b04f43b9fa23205d6d0766fb2e93eb4091c60c1b88897936adb895fb04e3c23de98dfdcbe31bc98daaa1a4e0133f78bb948e1209b
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/traverse@npm:7.24.8"
+"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1":
+  version: 7.25.1
+  resolution: "@babel/traverse@npm:7.25.1"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.8"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-hoist-variables": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
-    "@babel/parser": "npm:^7.24.8"
-    "@babel/types": "npm:^7.24.8"
+    "@babel/generator": "npm:^7.25.0"
+    "@babel/parser": "npm:^7.25.0"
+    "@babel/template": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.0"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/67a5cc35824455cdb54fb9e196a44b3186283e29018a9c2331f51763921e18e891b3c60c283615a27540ec8eb4c8b89f41c237b91f732a7aa518b2eb7a0d434d
+  checksum: 10c0/d8ae766da109d026ea6e483b9732256410e0ac249929e366ff11cf64a40a53a64b6a7b6db502a77de81dcace1fcf530d7569ffd0ee6b727ef4eb343e5f68ef74
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.9
-  resolution: "@babel/types@npm:7.24.9"
+"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.25.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.25.0
+  resolution: "@babel/types@npm:7.25.0"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/4970b3481cab39c5c3fdb7c28c834df5c7049f3c7f43baeafe121bb05270ebf0da7c65b097abf314877f213baa591109c82204f30d66cdd46c22ece4a2f32415
+  checksum: 10c0/3b2087d72442d53944b5365c7082f120e5040b0333d4a82406187c19056261ae2a35e087f8408348baadf1dcd156dc74573ec151272191b4a22b564297473da1
   languageName: node
   linkType: hard
 
@@ -4411,7 +4420,7 @@ __metadata:
   dependencies:
     "@babel/cli": "npm:7.24.8"
     "@babel/core": "npm:7.24.9"
-    "@babel/preset-env": "npm:7.24.8"
+    "@babel/preset-env": "npm:7.25.0"
     "@eslint/js": "npm:9.7.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"

From 3d29eada65418a635b7e5effbbe24396ae4f987d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 13:15:24 -0700
Subject: [PATCH 248/449] Update dependency sass-loader to v16 (#9508)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index c2241a46ab24..b01cca7abafe 100644
--- a/war/package.json
+++ b/war/package.json
@@ -43,7 +43,7 @@
     "postcss-scss": "4.0.9",
     "prettier": "3.3.3",
     "sass": "1.77.8",
-    "sass-loader": "15.0.0",
+    "sass-loader": "16.0.0",
     "style-loader": "4.0.0",
     "stylelint": "16.7.0",
     "stylelint-checkstyle-reporter": "1.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 63cc30dac566..8ddc94f6c8fb 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4442,7 +4442,7 @@ __metadata:
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.3"
     sass: "npm:1.77.8"
-    sass-loader: "npm:15.0.0"
+    sass-loader: "npm:16.0.0"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
     stylelint: "npm:16.7.0"
@@ -6373,9 +6373,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass-loader@npm:15.0.0":
-  version: 15.0.0
-  resolution: "sass-loader@npm:15.0.0"
+"sass-loader@npm:16.0.0":
+  version: 16.0.0
+  resolution: "sass-loader@npm:16.0.0"
   dependencies:
     neo-async: "npm:^2.6.2"
   peerDependencies:
@@ -6395,7 +6395,7 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 10c0/8e17d21194f5806a971e98c149ac5a2387fa3b4327a81f2194253b61181c6dac965970c30e1e1b294f977e1822ff7c03feb0e26864f1f43cdea34a82caaf40af
+  checksum: 10c0/0d2c2ee89a380ae19f1d024008c241afb747c254cf8e2163b281533c803a1cb3933236f0cfbb59a296fce864e4274e32a80c30dadd5b98618a362f0be8bac20f
   languageName: node
   linkType: hard
 

From 6f23dea73484fab79af79f1595608a754ff70d16 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:43:32 -0700
Subject: [PATCH 249/449] Update eslint monorepo to v9.8.0 (#9509)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/war/package.json b/war/package.json
index b01cca7abafe..c1dba52a2464 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "7.24.9",
     "@babel/preset-env": "7.25.0",
-    "@eslint/js": "9.7.0",
+    "@eslint/js": "9.8.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.7.0",
+    "eslint": "9.8.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.8.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 8ddc94f6c8fb..17766167a12a 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1878,14 +1878,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-array@npm:^0.17.0":
-  version: 0.17.0
-  resolution: "@eslint/config-array@npm:0.17.0"
+"@eslint/config-array@npm:^0.17.1":
+  version: 0.17.1
+  resolution: "@eslint/config-array@npm:0.17.1"
   dependencies:
     "@eslint/object-schema": "npm:^2.1.4"
     debug: "npm:^4.3.1"
     minimatch: "npm:^3.1.2"
-  checksum: 10c0/97eb23ef0948dbc5f24884a3b75c537ca37ee2b1f27a864cd0d9189c089bc1a724dc6e1a4d9b7dd304d9f732ca02aa7916243a7715d6f1f17159d8a8c83f0c9e
+  checksum: 10c0/b986a0a96f2b42467578968ce3d4ae3b9284e587f8490f2dcdc44ff1b8d30580c62b221da6e58d07b09e156c3050e2dc38267f9370521d9cafc099c4e30154ef
   languageName: node
   linkType: hard
 
@@ -1906,10 +1906,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.7.0":
-  version: 9.7.0
-  resolution: "@eslint/js@npm:9.7.0"
-  checksum: 10c0/73fc10666f6f4aed6f58e407e09f42ceb0d42fa60c52701c64ea9f59a81a6a8ad5caecdfd423d03088481515fe7ec17eb461acb4ef1ad70b649b6eae465b3164
+"@eslint/js@npm:9.8.0":
+  version: 9.8.0
+  resolution: "@eslint/js@npm:9.8.0"
+  checksum: 10c0/42edaae6b020436410454579509dcb6a8cd5b260e9f18e037fd803ae28d35eb13663d4019f0ab8ba686a19d3c4a43b0e11394c148e23345377ab694da0e83262
   languageName: node
   linkType: hard
 
@@ -3564,15 +3564,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.7.0":
-  version: 9.7.0
-  resolution: "eslint@npm:9.7.0"
+"eslint@npm:9.8.0":
+  version: 9.8.0
+  resolution: "eslint@npm:9.8.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.11.0"
-    "@eslint/config-array": "npm:^0.17.0"
+    "@eslint/config-array": "npm:^0.17.1"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.7.0"
+    "@eslint/js": "npm:9.8.0"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3604,7 +3604,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/e2369a9534404f62f37ee5560e56fb84e0776a9c8f084550170017992772e7034d73571bdf4060e2fe9b836f136d45b07d50407d4b9361de720ee77794259274
+  checksum: 10c0/a2ee0cce1147565d011fe185733af482f34d5466f5df5f390d0ea2ecf78097883cf568ed6c771d687138609c63cd55cd1e3ff12de7393c03f54fcffcdd0f225d
   languageName: node
   linkType: hard
 
@@ -4421,12 +4421,12 @@ __metadata:
     "@babel/cli": "npm:7.24.8"
     "@babel/core": "npm:7.24.9"
     "@babel/preset-env": "npm:7.25.0"
-    "@eslint/js": "npm:9.7.0"
+    "@eslint/js": "npm:9.8.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.7.0"
+    eslint: "npm:9.8.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.8.0"

From ca241b4bf65d64527f2165935420d31bbd252a2d Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 29 Jul 2024 17:57:31 -0700
Subject: [PATCH 250/449] Use detached plugins as a cache for the Update Center
 (#9476)

---
 .../main/java/hudson/model/UpdateCenter.java  | 157 +++++++++++++++++-
 1 file changed, 156 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 218cbf6b96a4..4df95b7b3f45 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -58,14 +58,18 @@
 import hudson.util.PersistedList;
 import hudson.util.VersionNumber;
 import hudson.util.XStream2;
+import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UncheckedIOException;
 import java.lang.reflect.Constructor;
 import java.net.HttpRetryException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.UnknownHostException;
@@ -86,6 +90,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.UUID;
@@ -1809,6 +1814,83 @@ public void run() {
         String getComputedSHA512();
     }
 
+    @SuppressFBWarnings(value = "WEAK_MESSAGE_DIGEST_SHA1", justification = "SHA-1 is only used as a fallback if SHA-256/SHA-512 are not available")
+    private static class FileWithComputedChecksums implements WithComputedChecksums {
+
+        private final File file;
+
+        private String computedSHA1;
+        private String computedSHA256;
+        private String computedSHA512;
+
+        FileWithComputedChecksums(File file) {
+            this.file = Objects.requireNonNull(file);
+        }
+
+        @Override
+        public synchronized String getComputedSHA1() {
+            if (computedSHA1 != null) {
+                return computedSHA1;
+            }
+
+            MessageDigest messageDigest;
+            try {
+                messageDigest = MessageDigest.getInstance("SHA-1");
+            } catch (NoSuchAlgorithmException e) {
+                throw new UnsupportedOperationException(e);
+            }
+            computedSHA1 = computeDigest(messageDigest);
+            return computedSHA1;
+        }
+
+        @Override
+        public synchronized String getComputedSHA256() {
+            if (computedSHA256 != null) {
+                return computedSHA256;
+            }
+
+            MessageDigest messageDigest;
+            try {
+                messageDigest = MessageDigest.getInstance("SHA-256");
+            } catch (NoSuchAlgorithmException e) {
+                throw new UnsupportedOperationException(e);
+            }
+            computedSHA256 = computeDigest(messageDigest);
+            return computedSHA256;
+        }
+
+        @Override
+        public synchronized String getComputedSHA512() {
+            if (computedSHA512 != null) {
+                return computedSHA512;
+            }
+
+            MessageDigest messageDigest;
+            try {
+                messageDigest = MessageDigest.getInstance("SHA-512");
+            } catch (NoSuchAlgorithmException e) {
+                throw new UnsupportedOperationException(e);
+            }
+            computedSHA512 = computeDigest(messageDigest);
+            return computedSHA512;
+        }
+
+        private String computeDigest(MessageDigest digest) {
+            try (InputStream is = new FileInputStream(file);
+                 BufferedInputStream bis = new BufferedInputStream(is)) {
+                byte[] buffer = new byte[1024];
+                int read = bis.read(buffer, 0, buffer.length);
+                while (read > -1) {
+                    digest.update(buffer, 0, read);
+                    read = bis.read(buffer, 0, buffer.length);
+                }
+                return Base64.getEncoder().encodeToString(digest.digest());
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }
+    }
+
     /**
      * Base class for a job that downloads a file from the Jenkins project.
      */
@@ -2245,7 +2327,24 @@ public void _run() throws IOException, InstallationStatus {
                 return;
             }
             try {
-                super._run();
+                File cached = getCached(this);
+                if (cached != null) {
+                    File dst = getDestination();
+
+                    // A bit naive, but following the corresponding logic in UpdateCenterConfiguration#download...
+                    File tmp = new File(dst.getPath() + ".tmp");
+                    Files.copy(cached.toPath(), tmp.toPath(), StandardCopyOption.REPLACE_EXISTING);
+
+                    config.postValidate(this, tmp);
+
+                    /*
+                     * Will unfortunately validate the checksum a second time, but this should still be faster than
+                     * network I/O and at least allows us to reuse code...
+                     */
+                    config.install(this, tmp, dst);
+                } else {
+                    super._run();
+                }
 
                 // if this is a bundled plugin, make sure it won't get overwritten
                 PluginWrapper pw = plugin.getInstalled();
@@ -2278,6 +2377,62 @@ public void _run() throws IOException, InstallationStatus {
             }
         }
 
+        /**
+         * If we happen to have the file already in the {@coode WEB-INF/detached-plugins} directory and it happens to
+         * match the checksum we were expecting, then save ourselves a trip to the download site. This method is
+         * best-effort, and if anything goes wrong we simply fall back to the standard download path.
+         *
+         * @return The cached file, or null for a cache miss
+         */
+        @CheckForNull
+        private File getCached(DownloadJob job) {
+            URL src;
+            try {
+                /*
+                 * Could make PluginManager#getDetachedLocation public and consume it here, but this method is
+                 * best-effort anyway.
+                 */
+                src = Jenkins.get().servletContext.getResource(String.format("/WEB-INF/detached-plugins/%s.hpi", plugin.name));
+            } catch (MalformedURLException e) {
+                return null;
+            }
+
+            if (src == null || !"file".equals(src.getProtocol())) {
+                return null;
+            }
+
+            try {
+                config.preValidate(this, src);
+            } catch (IOException e) {
+                return null;
+            }
+
+            File cached;
+            try {
+                cached = new File(src.toURI());
+            } catch (URISyntaxException e) {
+                return null;
+            }
+
+            if (!cached.isFile()) {
+                return null;
+            }
+
+            WithComputedChecksums withComputedChecksums = new FileWithComputedChecksums(cached);
+            try {
+                verifyChecksums(withComputedChecksums, plugin, cached);
+            } catch (IOException | UncheckedIOException | UnsupportedOperationException e) {
+                return null;
+            }
+
+            // Allow us to reuse UpdateCenter.InstallationJob#replace.
+            job.computedSHA1 = withComputedChecksums.getComputedSHA1();
+            job.computedSHA256 = withComputedChecksums.getComputedSHA256();
+            job.computedSHA512 = withComputedChecksums.getComputedSHA512();
+
+            return cached;
+        }
+
         /**
          * Indicates there is another installation job for this plugin
          * @since 2.1

From 3d03bc55fff96337176853ce1f316ac851c8e4a3 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Mon, 29 Jul 2024 18:57:44 -0600
Subject: [PATCH 251/449] Add end of life dates for Alpine 3.20, Ubuntu 24.04,
 Fedora 40 (#9501)

Also update the end of life dates for other operating systems based on
https://endoflife.date/ data.

Removes the 'start' entries because we are past the end of life date
of the RHEL 7 derivatives and the one other start date is not needed
because the default start date will cover it correctly.

Confirmed with a CentOS 8 computer that the end of life message
is displayed with the correct date for the CentOS 8 end of life.
The corrected end of life date has already passed, so there may be
Jenkins users that are surprised when their next upgrade reports that
they are running an unsupported operating system.
---
 .../end-of-life-data.json                     | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/end-of-life-data.json b/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/end-of-life-data.json
index e3df71741554..7dfa00bc6772 100644
--- a/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/end-of-life-data.json
+++ b/core/src/main/resources/jenkins/monitor/OperatingSystemEndOfLifeAdminMonitor/end-of-life-data.json
@@ -1,7 +1,7 @@
 [
   {
     "pattern": "AlmaLinux.* 8.*",
-    "endOfLife": "2029-03-31"
+    "endOfLife": "2029-03-01"
   },
   {
     "pattern": "AlmaLinux.* 9.*",
@@ -17,38 +17,39 @@
   },
   {
     "pattern": "Alpine Linux v3.16",
-    "endOfLife": "2024-05-01"
+    "endOfLife": "2024-05-23"
   },
   {
     "pattern": "Alpine Linux v3.17",
-    "endOfLife": "2024-11-01"
+    "endOfLife": "2024-11-22"
   },
   {
     "pattern": "Alpine Linux v3.18",
-    "endOfLife": "2025-05-01"
+    "endOfLife": "2025-05-09"
   },
   {
     "pattern": "Alpine Linux v3.19",
     "endOfLife": "2025-11-01"
   },
+  {
+    "pattern": "Alpine Linux v3.20",
+    "endOfLife": "2026-04-01"
+  },
   {
     "pattern": "Amazon Linux 2",
-    "start": "2023-05-01",
     "endOfLife": "2023-11-16"
   },
   {
     "pattern": "Amazon Linux 2023",
-    "start": "2027-09-15",
     "endOfLife": "2028-03-15"
   },
   {
     "pattern": "CentOS Linux.* 7.*",
-    "start": "2023-05-01",
     "endOfLife": "2023-11-16"
   },
   {
     "pattern": "CentOS Linux.* 8.*",
-    "endOfLife": "2029-03-31"
+    "endOfLife": "2021-12-31"
   },
   {
     "pattern": "Debian.* 10.*",
@@ -60,45 +61,47 @@
   },
   {
     "pattern": "Debian.* 12.*",
-    "endOfLife": "2028-06-30"
+    "endOfLife": "2028-06-10"
   },
   {
     "pattern": "Fedora.* 36.*",
-    "endOfLife": "2023-05-18"
+    "endOfLife": "2023-05-16"
   },
   {
     "pattern": "Fedora.* 37.*",
-    "endOfLife": "2023-12-15"
+    "endOfLife": "2023-12-05"
   },
   {
     "pattern": "Fedora.* 38.*",
-    "endOfLife": "2024-05-18"
+    "endOfLife": "2024-05-21"
   },
   {
     "pattern": "Fedora.* 39.*",
-    "endOfLife": "2024-12-07"
+    "endOfLife": "2024-11-12"
+  },
+  {
+    "pattern": "Fedora.* 40.*",
+    "endOfLife": "2025-05-13"
   },
   {
     "pattern": "Oracle Linux.* 7.*",
-    "start": "2023-05-01",
     "endOfLife": "2023-11-16"
   },
   {
     "pattern": "Oracle Linux.* 8.*",
-    "endOfLife": "2029-03-31"
+    "endOfLife": "2029-07-31"
   },
   {
     "pattern": "Oracle Linux.* 9.*",
-    "endOfLife": "2034-06-30"
+    "endOfLife": "2032-06-30"
   },
   {
     "pattern": "Red Hat Enterprise Linux.* 7.*",
-    "start": "2023-05-01",
     "endOfLife": "2023-11-16"
   },
   {
     "pattern": "Red Hat Enterprise Linux.* 8.*",
-    "endOfLife": "2029-03-31"
+    "endOfLife": "2029-05-31"
   },
   {
     "pattern": "Red Hat Enterprise Linux.* 9.*",
@@ -106,7 +109,7 @@
   },
   {
     "pattern": "Rocky Linux.* 8.*",
-    "endOfLife": "2029-03-31"
+    "endOfLife": "2029-05-31"
   },
   {
     "pattern": "Rocky Linux.* 9.*",
@@ -114,7 +117,6 @@
   },
   {
     "pattern": "Scientific Linux.* 7.*",
-    "start": "2023-05-01",
     "endOfLife": "2023-11-16"
   },
   {
@@ -152,5 +154,9 @@
   {
     "pattern": "Ubuntu.* 23.04.*",
     "endOfLife": "2024-01-20"
+  },
+  {
+    "pattern": "Ubuntu.* 24.04.*",
+    "endOfLife": "2029-04-25"
   }
 ]

From e62e466d44f0f174b944ec9f8a84f49d4618a50e Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:24:44 +0000
Subject: [PATCH 252/449] [maven-release-plugin] prepare release jenkins-2.470

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 8f8e6412f7b0..846075a0616b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.470</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..f9da44fc4ba3 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.470</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..08285a64d76b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.470</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..7ae3131bc222 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.470</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index dcf21e286330..8ff0d201846a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.470</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.470</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.470</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-23T13:33:48Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-30T14:07:09Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 32a93e3e4503..d0dd2eb572c8 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.470</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 08c1aa61a3b9..966f44b5d711 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.470</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..6105dfe2c40f 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.470</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..09ccbfada789 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.470</version>
     <relativePath>../..</relativePath>
   </parent>
 

From a0844df906967b76855211d8b6d66a69b5384334 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 30 Jul 2024 17:25:09 +0000
Subject: [PATCH 253/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 846075a0616b..8f8e6412f7b0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.470</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index f9da44fc4ba3..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.470</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 08285a64d76b..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.470</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 7ae3131bc222..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.470</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 8ff0d201846a..c44d78efd74e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.470</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.470</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.470</revision>
+    <revision>2.471</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-30T14:07:09Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-07-30T17:24:44Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index d0dd2eb572c8..32a93e3e4503 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.470</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 966f44b5d711..08c1aa61a3b9 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.470</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 6105dfe2c40f..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.470</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 09ccbfada789..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.470</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 4137e4992d5ae0e4b87afd0883a62b6b4b8bbfd5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 10:36:52 -0700
Subject: [PATCH 254/449] Update jenkins/ath Docker tag to v5911 (#9510)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 81106967e54b..3cd7dfd86d75 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5909.vc4fa_3e55b_f84
+export ATH_VERSION=5911.v5f88b_6d0c450
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From 5d26b53ad3a5cd8c4a060eef4f56d75e65ca17a5 Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@users.noreply.github.com>
Date: Tue, 30 Jul 2024 18:37:01 +0000
Subject: [PATCH 255/449] [SECURITY-3430]

---
 core/src/main/java/hudson/PluginManager.java  |  16 +
 .../security/s2m/JarURLValidatorImpl.java     | 104 ++++++
 pom.xml                                       |   2 +-
 test/pom.xml                                  |   8 +
 .../jenkins/security/Security3430Test.java    | 296 ++++++++++++++++++
 5 files changed, 425 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/java/jenkins/security/s2m/JarURLValidatorImpl.java
 create mode 100644 test/src/test/java/jenkins/security/Security3430Test.java

diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 75dd52c4d7b7..16c22e9ca90c 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -2417,6 +2417,22 @@ public String toString() {
             // only for debugging purpose
             return "classLoader " +  getClass().getName();
         }
+
+        // TODO Remove this once we require post 2024-07 remoting minimum version and deleted ClassLoaderProxy#fetchJar(URL)
+        @SuppressFBWarnings(
+                value = "DMI_COLLECTION_OF_URLS",
+                justification = "All URLs point to local files, so no DNS lookup.")
+        @Restricted(NoExternalUse.class)
+        public boolean isPluginJar(URL jarUrl) {
+            for (PluginWrapper plugin : activePlugins) {
+                if (plugin.classLoader instanceof URLClassLoader) {
+                    if (Set.of(((URLClassLoader) plugin.classLoader).getURLs()).contains(jarUrl)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
     }
 
     @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
diff --git a/core/src/main/java/jenkins/security/s2m/JarURLValidatorImpl.java b/core/src/main/java/jenkins/security/s2m/JarURLValidatorImpl.java
new file mode 100644
index 000000000000..7fafcea946d5
--- /dev/null
+++ b/core/src/main/java/jenkins/security/s2m/JarURLValidatorImpl.java
@@ -0,0 +1,104 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2024 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.security.s2m;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.Extension;
+import hudson.PluginManager;
+import hudson.remoting.Channel;
+import hudson.remoting.ChannelBuilder;
+import hudson.remoting.JarURLValidator;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jenkins.model.Jenkins;
+import jenkins.security.ChannelConfigurator;
+import jenkins.util.SystemProperties;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+@Restricted(NoExternalUse.class)
+@Deprecated
+@Extension
+public class JarURLValidatorImpl extends ChannelConfigurator implements JarURLValidator {
+
+    public static final Logger LOGGER = Logger.getLogger(JarURLValidatorImpl.class.getName());
+
+    @Override
+    public void onChannelBuilding(ChannelBuilder builder, @Nullable Object context) {
+        LOGGER.log(Level.CONFIG, () -> "Setting up JarURLValidatorImpl for context: " + context);
+        builder.withProperty(JarURLValidator.class, this);
+    }
+
+    @Override
+    public void validate(URL url) throws IOException {
+        final String rejectAllProp = JarURLValidatorImpl.class.getName() + ".REJECT_ALL";
+        if (SystemProperties.getBoolean(rejectAllProp)) {
+            LOGGER.log(Level.FINE, () -> "Rejecting URL due to configuration: " + url);
+            throw new IOException("The system property '" + rejectAllProp + "' has been set, so all attempts by agents to load jars from the controller are rejected."
+                    + " Update the agent.jar of the affected agent to a version released in August 2024 or later to prevent this error."); // TODO better version spec
+        }
+        final String allowAllProp = Channel.class.getName() + ".DISABLE_JAR_URL_VALIDATOR";
+        if (SystemProperties.getBoolean(allowAllProp)) {
+            LOGGER.log(Level.FINE, () -> "Allowing URL due to configuration: " + url);
+            return;
+        }
+        if (!isAllowedJar(url)) {
+            LOGGER.log(Level.FINE, () -> "Rejecting URL: " + url);
+            throw new IOException("This URL does not point to a jar file allowed to be requested by agents: " + url + "."
+                    + " Update the agent.jar of the affected agent to a version released in August 2024 or later to prevent this error."
+            + " Alternatively, set the system property '" + allowAllProp + "' to 'true' if all the code built by Jenkins is as trusted as an administrator.");
+        } else {
+            LOGGER.log(Level.FINE, () -> "Allowing URL: " + url);
+        }
+    }
+    @SuppressFBWarnings(
+            value = "DMI_COLLECTION_OF_URLS",
+            justification = "All URLs point to local files, so no DNS lookup.")
+    private static boolean isAllowedJar(URL url) {
+        final ClassLoader classLoader = Jenkins.get().getPluginManager().uberClassLoader;
+        if (classLoader instanceof PluginManager.UberClassLoader uberClassLoader) {
+            if (uberClassLoader.isPluginJar(url)) {
+                LOGGER.log(Level.FINER, () -> "Determined to be plugin jar: " + url);
+                return true;
+            }
+        }
+
+        final ClassLoader coreClassLoader = Jenkins.class.getClassLoader();
+        if (coreClassLoader instanceof URLClassLoader urlClassLoader) {
+            if (Set.of(urlClassLoader.getURLs()).contains(url)) {
+                LOGGER.log(Level.FINER, () -> "Determined to be core jar: " + url);
+                return true;
+            }
+        }
+
+        LOGGER.log(Level.FINER, () -> "Neither core nor plugin jar: " + url);
+        return false;
+    }
+}
diff --git a/pom.xml b/pom.xml
index c44d78efd74e..d68d455f7af9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>3256.v88a_f6e922152</remoting.version>
+    <remoting.version>3256.3258.v858f3c9a_f69d</remoting.version>
     <!-- Minimum Remoting version, which is tested for API compatibility -->
     <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
 
diff --git a/test/pom.xml b/test/pom.xml
index 32a93e3e4503..ddb399099651 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -323,6 +323,14 @@ THE SOFTWARE.
                   <outputDirectory>${project.build.outputDirectory}/old-remoting</outputDirectory>
                   <destFileName>remoting-minimum-supported.jar</destFileName>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.jenkins-ci.main</groupId>
+                  <artifactId>remoting</artifactId>
+                  <version>3256.v88a_f6e922152</version>
+                  <type>jar</type>
+                  <outputDirectory>${project.build.outputDirectory}/old-remoting</outputDirectory>
+                  <destFileName>remoting-before-SECURITY-3430-fix.jar</destFileName>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.jenkins-ci.main</groupId>
                   <artifactId>remoting</artifactId>
diff --git a/test/src/test/java/jenkins/security/Security3430Test.java b/test/src/test/java/jenkins/security/Security3430Test.java
new file mode 100644
index 000000000000..a9e717c75f9f
--- /dev/null
+++ b/test/src/test/java/jenkins/security/Security3430Test.java
@@ -0,0 +1,296 @@
+package jenkins.security;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import hudson.ExtensionList;
+import hudson.model.Computer;
+import hudson.remoting.Channel;
+import hudson.remoting.Launcher;
+import hudson.slaves.SlaveComputer;
+import hudson.util.RingBufferLogHandler;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.Security;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import jenkins.bouncycastle.api.InstallBouncyCastleJCAProvider;
+import jenkins.security.s2m.JarURLValidatorImpl;
+import jenkins.slaves.RemotingVersionInfo;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.InboundAgentRule;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.RealJenkinsRule;
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.stapler.Stapler;
+
+public class Security3430Test {
+    @Rule
+    public RealJenkinsRule jj = new RealJenkinsRule().withLogger(JarURLValidatorImpl.class, Level.FINEST);
+
+    @Rule
+    public InboundAgentRule agents = new InboundAgentRule();
+
+    @Test
+    public void runWithOldestSupportedAgentJar() throws Throwable {
+        runWithRemoting(RemotingVersionInfo.getMinimumSupportedVersion().toString(), "/old-remoting/remoting-minimum-supported.jar", true);
+    }
+
+    @Test
+    public void runWithPreviousAgentJar() throws Throwable {
+        runWithRemoting("3256.v88a_f6e922152", "/old-remoting/remoting-before-SECURITY-3430-fix.jar", true);
+    }
+
+    @Test
+    public void runWithCurrentAgentJar() throws Throwable {
+        runWithRemoting(null, null, false);
+    }
+
+    private void runWithRemoting(String expectedRemotingVersion, String remotingResourcePath, boolean requestingJarFromAgent) throws Throwable {
+        if (expectedRemotingVersion != null) {
+            FileUtils.copyURLToFile(Security3430Test.class.getResource(remotingResourcePath), new File(jj.getHome(), "agent.jar"));
+        }
+
+        jj.startJenkins();
+        final String agentName = "agent1";
+        try {
+            agents.createAgent(jj, InboundAgentRule.Options.newBuilder().name(agentName).build());
+            jj.runRemotely(Security3430Test::_run, agentName, expectedRemotingVersion, requestingJarFromAgent, true);
+        } finally {
+            agents.stop(jj, agentName);
+        }
+        jj.runRemotely(Security3430Test::disableJarURLValidatorImpl);
+        final String agentName2 = "agent2";
+        try {
+            agents.createAgent(jj, InboundAgentRule.Options.newBuilder().name(agentName2).build());
+            jj.runRemotely(Security3430Test::_run, agentName2, expectedRemotingVersion, requestingJarFromAgent, false);
+        } finally {
+            agents.stop(jj, agentName2);
+        }
+    }
+
+    // This is quite artificial, but demonstrating that without JarURLValidatorImpl we do not allow any calls from the agent:
+    private static void disableJarURLValidatorImpl(JenkinsRule j) {
+        assertTrue(ExtensionList.lookup(ChannelConfigurator.class).remove(ExtensionList.lookupSingleton(JarURLValidatorImpl.class)));
+    }
+
+    /**
+     *
+     * @param agentName the name of the agent we're working with
+     * @param expectedRemotingVersion The version expected for remoting, or {@code null} if we're using whatever is bundled with this Jenkins.
+     * @param requestingJarFromAgent {@code true} if and only if we expect to go through {@code ClassLoaderProxy#fetchJar}
+     * @param hasJenkinsJarURLValidator {@code true} if and only we do not expect {@link jenkins.security.s2m.JarURLValidatorImpl} to be present. Only relevant when {@code requestingJarFromAgent} is {@code true}.
+     */
+    private static void _run(JenkinsRule j, String agentName, String expectedRemotingVersion, Boolean requestingJarFromAgent, Boolean hasJenkinsJarURLValidator) throws Throwable {
+        final RingBufferLogHandler logHandler = new RingBufferLogHandler(50);
+        Logger.getLogger(JarURLValidatorImpl.class.getName()).addHandler(logHandler);
+        final List<LogRecord> logRecords = logHandler.getView();
+
+        final Computer computer = j.jenkins.getComputer(agentName);
+        assertThat(computer, instanceOf(SlaveComputer.class));
+        SlaveComputer agent = (SlaveComputer) computer;
+        final Channel channel = agent.getChannel();
+        if (expectedRemotingVersion != null) {
+            final String result = channel.call(new AgentVersionCallable());
+            assertThat(result, is(expectedRemotingVersion));
+        }
+
+        logHandler.clear();
+
+        { // regular behavior
+            if (hasJenkinsJarURLValidator) {
+                // it works
+                assertTrue(channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, Stapler.class));
+                if (requestingJarFromAgent) {
+                    assertThat(logRecords, hasItem(logMessageContainsString("Allowing URL: file:/")));
+                } else {
+                    assertThat(logRecords, is(empty()));
+                }
+
+                logHandler.clear();
+                assertFalse(channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, Stapler.class));
+                assertThat(logRecords, not(hasItem(logMessageContainsString("Allowing URL"))));
+                assertThat(logRecords, not(hasItem(logMessageContainsString("Rejecting URL"))));
+            } else {
+                // outdated remoting.jar will fail, but up to date one passes
+                if (requestingJarFromAgent) {
+                    final IOException ex = assertThrows(IOException.class, () -> channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, Stapler.class));
+                    assertThat(ex.getMessage(), containsString("No hudson.remoting.JarURLValidator has been set for this channel, so all #fetchJar calls are rejected. This is likely a bug in Jenkins. As a workaround, try updating the agent.jar file."));
+                } else {
+                    assertTrue(channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, Stapler.class));
+                    assertThat(logRecords, is(empty()));
+                }
+            }
+        }
+
+        logHandler.clear();
+
+        if (hasJenkinsJarURLValidator) { // Start rejecting everything; only applies to JarURLValidatorImpl
+            System.setProperty(JarURLValidatorImpl.class.getName() + ".REJECT_ALL", "true");
+
+            // Identify that a jar was already loaded:
+            assertFalse(channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, Stapler.class));
+            assertThat(logRecords, not(hasItem(logMessageContainsString("Allowing URL"))));
+            assertThat(logRecords, not(hasItem(logMessageContainsString("Rejecting URL"))));
+
+            logHandler.clear();
+
+            // different jar file than before, old remoting will fail due to call through ClassLoaderProxy#fetchJar, new remoting passes
+            if (requestingJarFromAgent) {
+                final IOException ioException = assertThrows(IOException.class, () -> channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, Argument.class));
+                assertThat(ioException.getMessage(), containsString("all attempts by agents to load jars from the controller are rejected"));
+                assertThat(logRecords, not(hasItem(logMessageContainsString("Allowing URL"))));
+                assertThat(logRecords, hasItem(logMessageContainsString("Rejecting URL due to configuration: ")));
+            } else {
+                assertTrue(channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, org.kohsuke.args4j.Argument.class));
+                assertThat(logRecords, not(hasItem(logMessageContainsString("Allowing URL"))));
+                assertThat(logRecords, not(hasItem(logMessageContainsString("Rejecting URL"))));
+            }
+        }
+
+        logHandler.clear();
+
+        if (hasJenkinsJarURLValidator) { // Disable block, only applies to JarURLValidatorImpl
+            System.clearProperty(JarURLValidatorImpl.class.getName() + ".REJECT_ALL");
+            if (requestingJarFromAgent) {
+                // now it works again for old remoting:
+                assertTrue(channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, org.kohsuke.args4j.Argument.class));
+                assertThat(logRecords, hasItem(logMessageContainsString("Allowing URL: file:/")));
+            } else {
+                // new remoting already has it.
+                assertFalse(channel.preloadJar(j.jenkins.getPluginManager().uberClassLoader, org.kohsuke.args4j.Argument.class));
+                assertThat(logRecords, not(hasItem(logMessageContainsString("Allowing URL"))));
+                assertThat(logRecords, not(hasItem(logMessageContainsString("Rejecting URL"))));
+            }
+            assertThat(logRecords, not(hasItem(logMessageContainsString("Rejecting URL due to configuration: "))));
+        }
+
+        logHandler.clear();
+
+        if (hasJenkinsJarURLValidator || !requestingJarFromAgent) { // prepare bouncycastle-api
+            assertTrue(j.jenkins.getPluginManager().getPlugin("bouncycastle-api").isActive());
+            InstallBouncyCastleJCAProvider.on(channel);
+            channel.call(new ConfirmBouncyCastleLibrary());
+        }
+
+        logHandler.clear();
+
+        { // Exploitation tests
+            final URL secretKeyFile = new File(j.jenkins.getRootDir(), "secret.key").toURI().toURL();
+            final String expectedContent = IOUtils.toString(secretKeyFile, StandardCharsets.UTF_8);
+            { // Protection is effective when agents request non-jar files:
+                final InvocationTargetException itex = assertThrows(InvocationTargetException.class, () -> channel.call(new Exploit(secretKeyFile, expectedContent)));
+                assertThat(itex.getCause(), instanceOf(IOException.class));
+                if (hasJenkinsJarURLValidator) {
+                    assertThat(itex.getCause().getMessage(), containsString("This URL does not point to a jar file allowed to be requested by agents"));
+                    assertThat(logRecords, not(hasItem(logMessageContainsString("Allowing URL"))));
+                    assertThat(logRecords, hasItem(logMessageContainsString("Rejecting URL: ")));
+                } else {
+                    assertThat(itex.getCause().getMessage(), containsString("No hudson.remoting.JarURLValidator has been set for this channel, so all #fetchJar calls are rejected. This is likely a bug in Jenkins. As a workaround, try updating the agent.jar file."));
+                }
+            }
+
+            logHandler.clear();
+
+            { // Disable protection and non-jar files can be accessed:
+                System.setProperty(Channel.class.getName() + ".DISABLE_JAR_URL_VALIDATOR", "true");
+                channel.call(new Exploit(secretKeyFile, expectedContent));
+                if (hasJenkinsJarURLValidator) {
+                    assertThat(logRecords, hasItem(logMessageContainsString("Allowing URL due to configuration")));
+                    assertThat(logRecords, not(hasItem(logMessageContainsString("Rejecting URL"))));
+                }
+                System.clearProperty(Channel.class.getName() + ".DISABLE_JAR_URL_VALIDATOR");
+            }
+        }
+    }
+
+    private static class AgentVersionCallable extends MasterToSlaveCallable<String, Exception> {
+        @Override
+        public String call() throws Exception {
+            return Launcher.VERSION;
+        }
+    }
+
+    private static class ConfirmBouncyCastleLibrary extends MasterToSlaveCallable<Void, Exception> {
+        @Override
+        public Void call() throws Exception {
+            assertNotNull(Security.getProvider("BC"));
+            return null;
+        }
+    }
+
+    private static class Exploit extends MasterToSlaveCallable<Void, Exception> {
+        private final URL controllerFilePath;
+        private final String expectedContent;
+
+        public Exploit(URL controllerFilePath, String expectedContent) {
+            this.controllerFilePath = controllerFilePath;
+            this.expectedContent = expectedContent;
+        }
+        @Override
+        public Void call() throws Exception {
+            final ClassLoader ccl = Thread.currentThread().getContextClassLoader();
+            System.err.println(ccl.getClass().getName());
+            final Field classLoaderProxyField = ccl.getClass().getDeclaredField("proxy");
+            classLoaderProxyField.setAccessible(true);
+            final Object theProxy = classLoaderProxyField.get(ccl);
+            final Method fetchJarMethod = theProxy.getClass().getDeclaredMethod("fetchJar", URL.class);
+            fetchJarMethod.setAccessible(true);
+            final byte[] fetchJarResponse = (byte[]) fetchJarMethod.invoke(theProxy, controllerFilePath);
+            assertThat(new String(fetchJarResponse, StandardCharsets.UTF_8), is(expectedContent));
+            return null;
+        }
+    }
+
+    // Would be nice if LoggerRule#recorded equivalents existed for use without LoggerRule, meanwhile:
+    private static Matcher<LogRecord> logMessageContainsString(String needle) {
+        return new LogMessageContainsString(containsString(needle));
+    }
+
+    private static final class LogMessageContainsString extends TypeSafeMatcher<LogRecord> {
+        private final Matcher<String> stringMatcher;
+
+        public LogMessageContainsString(Matcher<String> stringMatcher) {
+            this.stringMatcher = stringMatcher;
+        }
+
+        @Override
+        protected boolean matchesSafely(LogRecord item) {
+            return stringMatcher.matches(item.getMessage());
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText("a LogRecord with a message matching ");
+            stringMatcher.describeTo(description);
+        }
+
+        @Override
+        protected void describeMismatchSafely(LogRecord item, Description mismatchDescription) {
+            mismatchDescription.appendText("a LogRecord with the message: ");
+            mismatchDescription.appendText(item.getMessage());
+        }
+    }
+}

From 3752f406bfef764e4954238acf44343169ae5799 Mon Sep 17 00:00:00 2001
From: Yaroslav Afenkin <yaroslavafenkin@users.noreply.github.com>
Date: Tue, 30 Jul 2024 18:37:07 +0000
Subject: [PATCH 256/449] [SECURITY-3349]

---
 .../java/hudson/model/MyViewsProperty.java    | 25 +++++-
 .../java/hudson/model/Security3349Test.java   | 80 +++++++++++++++++++
 2 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 test/src/test/java/hudson/model/Security3349Test.java

diff --git a/core/src/main/java/hudson/model/MyViewsProperty.java b/core/src/main/java/hudson/model/MyViewsProperty.java
index 71809d788eae..49fdfac48d2d 100644
--- a/core/src/main/java/hudson/model/MyViewsProperty.java
+++ b/core/src/main/java/hudson/model/MyViewsProperty.java
@@ -26,6 +26,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.Util;
 import hudson.model.Descriptor.FormException;
@@ -42,6 +43,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
+import jenkins.util.SystemProperties;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
@@ -51,6 +53,7 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerFallback;
+import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.verb.POST;
@@ -60,7 +63,14 @@
  *
  * @author Tom Huybrechts
  */
-public class MyViewsProperty extends UserProperty implements ModifiableViewGroup, Action, StaplerFallback {
+public class MyViewsProperty extends UserProperty implements ModifiableViewGroup, Action, StaplerFallback, StaplerProxy {
+
+    /**
+     * Escape hatch for StaplerProxy-based access control
+     */
+    @Restricted(NoExternalUse.class)
+    @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
+    public static /* non-final */ boolean SKIP_PERMISSION_CHECK = SystemProperties.getBoolean(MyViewsProperty.class.getName() + ".skipPermissionCheck");
 
     /**
      * Name of the primary view defined by the user.
@@ -226,7 +236,10 @@ public String getDisplayName() {
 
     @Override
     public String getIconFileName() {
-        return "symbol-browsers";
+        if (SKIP_PERMISSION_CHECK || getACL().hasPermission(Jenkins.ADMINISTER))
+            return "symbol-browsers";
+        else
+            return null;
     }
 
     @Override
@@ -234,6 +247,14 @@ public String getUrlName() {
         return "my-views";
     }
 
+    @Override
+    public Object getTarget() {
+        if (!SKIP_PERMISSION_CHECK) {
+            checkPermission(Jenkins.ADMINISTER);
+        }
+        return this;
+    }
+
     @Extension @Symbol("myView")
     public static class DescriptorImpl extends UserPropertyDescriptor {
 
diff --git a/test/src/test/java/hudson/model/Security3349Test.java b/test/src/test/java/hudson/model/Security3349Test.java
new file mode 100644
index 000000000000..6de55eb653dd
--- /dev/null
+++ b/test/src/test/java/hudson/model/Security3349Test.java
@@ -0,0 +1,80 @@
+package hudson.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import jenkins.model.Jenkins;
+import org.htmlunit.html.HtmlPage;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.FlagRule;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.MockAuthorizationStrategy;
+
+public class Security3349Test {
+
+    @Rule
+    public JenkinsRule rule = new JenkinsRule();
+
+    @Rule public FlagRule<Boolean> skipPermissionCheck = new FlagRule<>(() -> MyViewsProperty.SKIP_PERMISSION_CHECK, x -> MyViewsProperty.SKIP_PERMISSION_CHECK = x);
+
+    @Test
+    @Issue("SECURITY-3349")
+    public void usersCannotAccessOtherUsersViews() throws Exception {
+        User user = User.getOrCreateByIdOrFullName("user");
+        User admin = User.getOrCreateByIdOrFullName("admin");
+
+        rule.jenkins.setSecurityRealm(rule.createDummySecurityRealm());
+        MockAuthorizationStrategy mockAuthorizationStrategy = new MockAuthorizationStrategy();
+        mockAuthorizationStrategy.grant(Jenkins.READ, View.READ).everywhere().to("user");
+        mockAuthorizationStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin");
+        rule.jenkins.setAuthorizationStrategy(mockAuthorizationStrategy);
+
+        MyViewsProperty prop1 = new MyViewsProperty(null);
+        MyView usersView = new MyView("User's view", prop1);
+        user.addProperty(prop1);
+        prop1.setUser(user);
+        prop1.addView(usersView);
+
+        MyViewsProperty prop2 = new MyViewsProperty(null);
+        MyView adminsView = new MyView("Admin's view", prop2);
+        admin.addProperty(prop2);
+        prop2.setUser(admin);
+        prop2.addView(adminsView);
+
+        try (JenkinsRule.WebClient wc = rule.createWebClient()) {
+            wc.setThrowExceptionOnFailingStatusCode(false);
+            wc.login("user");
+
+            HtmlPage adminViews = wc.goTo("user/admin/my-views/view/all/");
+            assertEquals(403, adminViews.getWebResponse().getStatusCode());
+
+            HtmlPage adminUserPage = wc.goTo("user/admin/");
+            assertFalse(adminUserPage.getWebResponse().getContentAsString().contains("My Views"));
+
+            HtmlPage userViews = wc.goTo("user/user/my-views/view/all/");
+            assertEquals(200, userViews.getWebResponse().getStatusCode());
+
+            HtmlPage userUserPage = wc.goTo("user/user/");
+            assertTrue(userUserPage.getWebResponse().getContentAsString().contains("My Views"));
+
+            wc.login("admin");
+
+            adminViews = wc.goTo("user/admin/my-views/view/all/");
+            assertEquals(200, adminViews.getWebResponse().getStatusCode());
+            userViews = wc.goTo("user/user/my-views/view/all/");
+            assertEquals(200, userViews.getWebResponse().getStatusCode());
+
+            MyViewsProperty.SKIP_PERMISSION_CHECK = true;
+
+            wc.login("user");
+            adminViews = wc.goTo("user/admin/my-views/view/all/");
+            assertEquals(200, adminViews.getWebResponse().getStatusCode());
+            adminUserPage = wc.goTo("user/admin/");
+            assertTrue(adminUserPage.getWebResponse().getContentAsString().contains("My Views"));
+
+        }
+    }
+}

From d0df46d2e83e89bdd3eced69460842ab7aa03315 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 6 Aug 2024 10:30:26 +0000
Subject: [PATCH 257/449] [maven-release-plugin] prepare release jenkins-2.471

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 6 +++---
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 8f8e6412f7b0..8854e9e4a03e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.471</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..0877158129c1 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.471</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..8491e5f4358e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.471</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..43b151530dc4 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.471</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index d68d455f7af9..d35bbdcf8f9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.471</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.471</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.471</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-07-30T17:24:44Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-06T06:56:27Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index ddb399099651..1905b0eca3f5 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.471</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 08c1aa61a3b9..cd77cfa1c7fc 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.471</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..402e7953b2fa 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.471</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..a547c0c83931 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.471</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 00410a17f85710c60e5271f2ee9c8580e58179bf Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 6 Aug 2024 10:30:48 +0000
Subject: [PATCH 258/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml               | 2 +-
 cli/pom.xml               | 2 +-
 core/pom.xml              | 2 +-
 coverage/pom.xml          | 2 +-
 pom.xml                   | 8 ++++----
 test/pom.xml              | 2 +-
 war/pom.xml               | 2 +-
 websocket/jetty10/pom.xml | 2 +-
 websocket/spi/pom.xml     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 8854e9e4a03e..8f8e6412f7b0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.471</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 0877158129c1..c037ed4a0ee8 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.471</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 8491e5f4358e..95c289164930 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.471</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 43b151530dc4..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.471</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index d35bbdcf8f9d..98315222e42f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.471</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.471</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.471</revision>
+    <revision>2.472</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-06T06:56:27Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-06T10:30:26Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 1905b0eca3f5..ddb399099651 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.471</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index cd77cfa1c7fc..08c1aa61a3b9 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.471</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 402e7953b2fa..c91e1583c039 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.471</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a547c0c83931..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.471</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From ec7f2a3a2491e18dd2652105c243b4622e2199a8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 07:57:45 -0700
Subject: [PATCH 259/449] Update dependency stylelint to v16.8.1 (#9514)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 44 ++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/war/package.json b/war/package.json
index c1dba52a2464..8cac6c9f42af 100644
--- a/war/package.json
+++ b/war/package.json
@@ -45,7 +45,7 @@
     "sass": "1.77.8",
     "sass-loader": "16.0.0",
     "style-loader": "4.0.0",
-    "stylelint": "16.7.0",
+    "stylelint": "16.8.1",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
     "webpack": "5.93.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 17766167a12a..d0001cd533b9 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3310,15 +3310,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5":
-  version: 4.3.5
-  resolution: "debug@npm:4.3.5"
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6":
+  version: 4.3.6
+  resolution: "debug@npm:4.3.6"
   dependencies:
     ms: "npm:2.1.2"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/082c375a2bdc4f4469c99f325ff458adad62a3fc2c482d59923c260cb08152f34e2659f72b3767db8bb2f21ca81a60a42d1019605a412132d7b9f59363a005cc
+  checksum: 10c0/3293416bff072389c101697d4611c402a6bacd1900ac20c0492f61a9cdd6b3b29750fc7f5e299f8058469ef60ff8fb79b86395a30374fbd2490113c1c7112285
   languageName: node
   linkType: hard
 
@@ -4445,7 +4445,7 @@ __metadata:
     sass-loader: "npm:16.0.0"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
-    stylelint: "npm:16.7.0"
+    stylelint: "npm:16.8.1"
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.1"
     tippy.js: "npm:6.3.7"
@@ -6040,10 +6040,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-resolve-nested-selector@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "postcss-resolve-nested-selector@npm:0.1.1"
-  checksum: 10c0/e86412064c5d805fbee20f4e851395304102addd7d583b6a991adaa5616e8d5f45549864eb6292d4cf15075cd261c289f069acdf6a2556689fc44fe72bcb306e
+"postcss-resolve-nested-selector@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "postcss-resolve-nested-selector@npm:0.1.4"
+  checksum: 10c0/c265c35ddd474968bc4efbe4027e33f28910ef3931ffae9c448878d7c02735aeeea6d33aa6f89902e4c111e6fe87f2cc2aa72dcb3ac242d58809f1f932baa2b6
   languageName: node
   linkType: hard
 
@@ -6076,13 +6076,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "postcss-selector-parser@npm:6.1.0"
+"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "postcss-selector-parser@npm:6.1.1"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10c0/91e9c6434772506bc7f318699dd9d19d32178b52dfa05bed24cb0babbdab54f8fb765d9920f01ac548be0a642aab56bce493811406ceb00ae182bbb53754c473
+  checksum: 10c0/5608765e033fee35d448e1f607ffbaa750eb86901824a8bc4a911ea8bc137cb82f29239330787427c5d3695afd90d8721e190f211dbbf733e25033d8b3100763
   languageName: node
   linkType: hard
 
@@ -6116,7 +6116,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.40, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.39":
+"postcss@npm:8.4.40, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.40":
   version: 8.4.40
   resolution: "postcss@npm:8.4.40"
   dependencies:
@@ -6705,9 +6705,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:16.7.0":
-  version: 16.7.0
-  resolution: "stylelint@npm:16.7.0"
+"stylelint@npm:16.8.1":
+  version: 16.8.1
+  resolution: "stylelint@npm:16.8.1"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^2.7.1"
     "@csstools/css-tokenizer": "npm:^2.4.1"
@@ -6719,7 +6719,7 @@ __metadata:
     cosmiconfig: "npm:^9.0.0"
     css-functions-list: "npm:^3.2.2"
     css-tree: "npm:^2.3.1"
-    debug: "npm:^4.3.5"
+    debug: "npm:^4.3.6"
     fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
     file-entry-cache: "npm:^9.0.0"
@@ -6736,10 +6736,10 @@ __metadata:
     micromatch: "npm:^4.0.7"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
-    postcss: "npm:^8.4.39"
-    postcss-resolve-nested-selector: "npm:^0.1.1"
+    postcss: "npm:^8.4.40"
+    postcss-resolve-nested-selector: "npm:^0.1.4"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.1.0"
+    postcss-selector-parser: "npm:^6.1.1"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -6750,7 +6750,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/98cb36037684433d991a0c507bbf8155309e96470177487f493e66de098631e5303b235470fc5c8086cd98013385b669c4e3cb68ad01421b898e1da6848e5d78
+  checksum: 10c0/7bc6b0193f83420b2170026078b427d7fb22a07d3345fc99a16241625a572f2fc3e1fa1999e54c01cc2b15bd59d135715c2b140b089c17aa7f4e377ded1fc1b5
   languageName: node
   linkType: hard
 

From 8bd5674d27aafbc2607d2d9105b4863d8d8bec5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 07:58:22 -0700
Subject: [PATCH 260/449] Bump io.jenkins.plugins:commons-text-api from
 1.12.0-119.v73ef73f2345d to 1.12.0-129.v99a_50df237f7 (#9517)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index ddb399099651..e6611ad67099 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -67,7 +67,7 @@ THE SOFTWARE.
         <!-- RequireUpperBoundDeps between checks-api, plugin-util-api, and font-awesome-api -->
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>commons-text-api</artifactId>
-        <version>1.12.0-119.v73ef73f2345d</version>
+        <version>1.12.0-129.v99a_50df237f7</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps between bootstrap5-api and echarts-api -->
diff --git a/war/pom.xml b/war/pom.xml
index 08c1aa61a3b9..49ac1ba835c4 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -500,7 +500,7 @@ THE SOFTWARE.
                   <!-- dependency of bootstrap5-api, checks-api, echarts-api, font-awesome-api, jquery3-api, and plugin-util-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>commons-text-api</artifactId>
-                  <version>1.12.0-119.v73ef73f2345d</version>
+                  <version>1.12.0-129.v99a_50df237f7</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 42c65d37ae321a34fe49f576d0b0d055ca95282b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 07:58:52 -0700
Subject: [PATCH 261/449] Update dependency globals to v15.9.0 (#9523)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 8cac6c9f42af..e3eb84034b42 100644
--- a/war/package.json
+++ b/war/package.json
@@ -34,7 +34,7 @@
     "eslint": "9.8.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.8.0",
+    "globals": "15.9.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.40",
diff --git a/war/yarn.lock b/war/yarn.lock
index d0001cd533b9..13e4a57fe1a8 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4006,10 +4006,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.8.0":
-  version: 15.8.0
-  resolution: "globals@npm:15.8.0"
-  checksum: 10c0/b96ec86e1244806920a80a1a7c4d64b68c55336887cfa1b52886927e0f9035133e4acd354fcda63b49e53df2089c41a11dd2b02281a6439a58cbc0d63ae083cb
+"globals@npm:15.9.0":
+  version: 15.9.0
+  resolution: "globals@npm:15.9.0"
+  checksum: 10c0/de4b553e412e7e830998578d51b605c492256fb2a9273eaeec6ec9ee519f1c5aa50de57e3979911607fd7593a4066420e01d8c3d551e7a6a236e96c521aee36c
   languageName: node
   linkType: hard
 
@@ -4429,7 +4429,7 @@ __metadata:
     eslint: "npm:9.8.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.8.0"
+    globals: "npm:15.9.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"

From cb7d2f41e82b4d5ce0b08807255036501eadb669 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 07:59:21 -0700
Subject: [PATCH 262/449] Update jenkins/ath Docker tag to v5929 (#9526)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 3cd7dfd86d75..eaa4396152f0 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5911.v5f88b_6d0c450
+export ATH_VERSION=5929.v295db_5f04eb_1
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From fd13fe3713bce9d712a2a73bfd6b1dd0c015e582 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 08:04:01 -0700
Subject: [PATCH 263/449] Update babel monorepo (#9518)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   4 +-
 war/yarn.lock    | 140 ++++++++++++++++++++++++-----------------------
 2 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/war/package.json b/war/package.json
index e3eb84034b42..7a15bb41d980 100644
--- a/war/package.json
+++ b/war/package.json
@@ -24,8 +24,8 @@
   },
   "devDependencies": {
     "@babel/cli": "7.24.8",
-    "@babel/core": "7.24.9",
-    "@babel/preset-env": "7.25.0",
+    "@babel/core": "7.25.2",
+    "@babel/preset-env": "7.25.3",
     "@eslint/js": "9.8.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 13e4a57fe1a8..83ef4d3ebd46 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -59,37 +59,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.8, @babel/compat-data@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/compat-data@npm:7.25.0"
-  checksum: 10c0/2873df153aa0c60f9e63369320beb5fd9ca948552a06c77db1eb0687bd10a296c9fbf9996bd4b3c8137a78eba3a0f0edfc41b65f57fca8421e5c0c8bb13a813d
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/compat-data@npm:7.25.2"
+  checksum: 10c0/5bf1f14d6e5f0d37c19543e99209ff4a94bb97915e1ce01e5334a144aa08cd56b6e62ece8135dac77e126723d63d4d4b96fc603a12c43b88c28f4b5e070270c5
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.24.9":
-  version: 7.24.9
-  resolution: "@babel/core@npm:7.24.9"
+"@babel/core@npm:7.25.2":
+  version: 7.25.2
+  resolution: "@babel/core@npm:7.25.2"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.24.9"
-    "@babel/helper-compilation-targets": "npm:^7.24.8"
-    "@babel/helper-module-transforms": "npm:^7.24.9"
-    "@babel/helpers": "npm:^7.24.8"
-    "@babel/parser": "npm:^7.24.8"
-    "@babel/template": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.24.8"
-    "@babel/types": "npm:^7.24.9"
+    "@babel/generator": "npm:^7.25.0"
+    "@babel/helper-compilation-targets": "npm:^7.25.2"
+    "@babel/helper-module-transforms": "npm:^7.25.2"
+    "@babel/helpers": "npm:^7.25.0"
+    "@babel/parser": "npm:^7.25.0"
+    "@babel/template": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.2"
+    "@babel/types": "npm:^7.25.2"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/e104ec6efbf099f55184933e9ab078eb5821c792ddfef3e9c6561986ec4ff103f5c11e3d7d6e5e8929e50e2c58db1cc80e5b6f14b530335b6622095ec4b4124c
+  checksum: 10c0/a425fa40e73cb72b6464063a57c478bc2de9dbcc19c280f1b55a3d88b35d572e87e8594e7d7b4880331addb6faef641bbeb701b91b41b8806cd4deae5d74f401
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.24.9, @babel/generator@npm:^7.25.0":
+"@babel/generator@npm:^7.25.0":
   version: 7.25.0
   resolution: "@babel/generator@npm:7.25.0"
   dependencies:
@@ -120,16 +120,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7, @babel/helper-compilation-targets@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helper-compilation-targets@npm:7.24.8"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7, @babel/helper-compilation-targets@npm:^7.24.8, @babel/helper-compilation-targets@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/helper-compilation-targets@npm:7.25.2"
   dependencies:
-    "@babel/compat-data": "npm:^7.24.8"
+    "@babel/compat-data": "npm:^7.25.2"
     "@babel/helper-validator-option": "npm:^7.24.8"
     browserslist: "npm:^4.23.1"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 10c0/2885c44ef6aaf82b7e4352b30089bb09fbe08ed5ec24eb452c2bdc3c021e2a65ab412f74b3d67ec1398da0356c730b33a2ceca1d67d34c85080d31ca6efa9aec
+  checksum: 10c0/de10e986b5322c9f807350467dc845ec59df9e596a5926a3b5edbb4710d8e3b8009d4396690e70b88c3844fe8ec4042d61436dd4b92d1f5f75655cf43ab07e99
   languageName: node
   linkType: hard
 
@@ -219,17 +219,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.24.9, @babel/helper-module-transforms@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/helper-module-transforms@npm:7.25.0"
+"@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.25.0, @babel/helper-module-transforms@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/helper-module-transforms@npm:7.25.2"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.24.7"
     "@babel/helper-simple-access": "npm:^7.24.7"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
-    "@babel/traverse": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.2"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/83c0ea9bbd10afbf3539c40ff2c255dd9af6a003dd4a51ed94faed110a52a0ab510fcdd7a675117e8b72d6b479643864674b9243997516c8d77a95dd688e0c9a
+  checksum: 10c0/adaa15970ace0aee5934b5a633789b5795b6229c6a9cf3e09a7e80aa33e478675eee807006a862aa9aa517935d81f88a6db8a9f5936e3a2a40ec75f8062bc329
   languageName: node
   linkType: hard
 
@@ -336,13 +336,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.24.8":
-  version: 7.24.8
-  resolution: "@babel/helpers@npm:7.24.8"
+"@babel/helpers@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/helpers@npm:7.25.0"
   dependencies:
-    "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.8"
-  checksum: 10c0/42b8939b0a0bf72d6df9721973eb0fd7cd48f42641c5c9c740916397faa586255c06d36c6e6a7e091860723096281c620f6ffaee0011a3bb254a6f5475d89a12
+    "@babel/template": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.0"
+  checksum: 10c0/b7fe007fc4194268abf70aa3810365085e290e6528dcb9fbbf7a765d43c74b6369ce0f99c5ccd2d44c413853099daa449c9a0123f0b212ac8d18643f2e8174b8
   languageName: node
   linkType: hard
 
@@ -358,24 +358,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.24.8, @babel/parser@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/parser@npm:7.25.0"
+"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3":
+  version: 7.25.3
+  resolution: "@babel/parser@npm:7.25.3"
+  dependencies:
+    "@babel/types": "npm:^7.25.2"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/4aecf13829fa6f4a66835429bd235458544d9cd14374b17c19bc7726f472727ca33f500e51e1298ddc72db93bdd77fcaa9ddc095200b0b792173069e6cf9742e
+  checksum: 10c0/874b01349aedb805d6694f867a752fdc7469778fad76aca4548d2cc6ce96087c3ba5fb917a6f8d05d2d1a74aae309b5f50f1a4dba035f5a2c9fcfe6e106d2c4e
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.0"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.3":
+  version: 7.25.3
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.3"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.24.8"
-    "@babel/traverse": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.3"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/08aecaa7c83fa78a44ea758863083261093374f38f783d3971d2c08de640d701bb464c9c7eaee7a84ce6551b573d703b1b07e59786752cc1f679827ae53d1e4a
+  checksum: 10c0/814b4d3f102e7556a5053d1acf57ef601cfcff39a2c81b8cdc6a5c842e3cb9838f5925d1466a5f1e6416e74c9c83586a3c07fbd7fb8610a396c2becdf9ae5790
   languageName: node
   linkType: hard
 
@@ -841,7 +843,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.25.0":
+"@babel/plugin-transform-function-name@npm:^7.25.1":
   version: 7.25.1
   resolution: "@babel/plugin-transform-function-name@npm:7.25.1"
   dependencies:
@@ -866,14 +868,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-literals@npm:7.24.7"
+"@babel/plugin-transform-literals@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/plugin-transform-literals@npm:7.25.2"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9f3f6f3831929cd2a977748c07addf9944d5cccb50bd3a24a58beb54f91f00d6cacd3d7831d13ffe1ad6f8aba0aefd7bca5aec65d63b77f39c62ad1f2d484a3e
+  checksum: 10c0/0796883217b0885d37e7f6d350773be349e469a812b6bf11ccf862a6edf65103d3e7c849529d65381b441685c12e756751d8c2489a0fd3f8139bb5ef93185f58
   languageName: node
   linkType: hard
 
@@ -1223,15 +1225,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.25.0":
-  version: 7.25.0
-  resolution: "@babel/preset-env@npm:7.25.0"
+"@babel/preset-env@npm:7.25.3":
+  version: 7.25.3
+  resolution: "@babel/preset-env@npm:7.25.3"
   dependencies:
-    "@babel/compat-data": "npm:^7.25.0"
-    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/compat-data": "npm:^7.25.2"
+    "@babel/helper-compilation-targets": "npm:^7.25.2"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-validator-option": "npm:^7.24.8"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.0"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.3"
     "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.0"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.25.0"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.7"
@@ -1272,9 +1274,9 @@ __metadata:
     "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.7"
     "@babel/plugin-transform-export-namespace-from": "npm:^7.24.7"
     "@babel/plugin-transform-for-of": "npm:^7.24.7"
-    "@babel/plugin-transform-function-name": "npm:^7.25.0"
+    "@babel/plugin-transform-function-name": "npm:^7.25.1"
     "@babel/plugin-transform-json-strings": "npm:^7.24.7"
-    "@babel/plugin-transform-literals": "npm:^7.24.7"
+    "@babel/plugin-transform-literals": "npm:^7.25.2"
     "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.7"
     "@babel/plugin-transform-member-expression-literals": "npm:^7.24.7"
     "@babel/plugin-transform-modules-amd": "npm:^7.24.7"
@@ -1312,7 +1314,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/a688c337b8fe9bd113e7a4a34ce2d7c19f13298aef919709e6f9301f2a2bc3e5299033de5d82f298ba71660577b2055ea4a8d4ced8d273b7ff2061c3a8e3b698
+  checksum: 10c0/9287dc2e296fe2aa3367d84c2a799db17c9d1e48bba86525f47c6f51f5ba2e2cce454f45f4ae2ef928f9077c0640b04556b55b94835675ceeca94a0c5133205e
   languageName: node
   linkType: hard
 
@@ -1356,29 +1358,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1":
-  version: 7.25.1
-  resolution: "@babel/traverse@npm:7.25.1"
+"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3":
+  version: 7.25.3
+  resolution: "@babel/traverse@npm:7.25.3"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
     "@babel/generator": "npm:^7.25.0"
-    "@babel/parser": "npm:^7.25.0"
+    "@babel/parser": "npm:^7.25.3"
     "@babel/template": "npm:^7.25.0"
-    "@babel/types": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.2"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/d8ae766da109d026ea6e483b9732256410e0ac249929e366ff11cf64a40a53a64b6a7b6db502a77de81dcace1fcf530d7569ffd0ee6b727ef4eb343e5f68ef74
+  checksum: 10c0/4c8a1966fa90b53a783a4afd2fcdaa6ab1a912e6621dca9fcc6633e80ccb9491620e88caf73b537da4e16cefd537b548c87d7087868d5b0066414dea375c0e9b
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.25.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.25.0
-  resolution: "@babel/types@npm:7.25.0"
+"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.4.4":
+  version: 7.25.2
+  resolution: "@babel/types@npm:7.25.2"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/3b2087d72442d53944b5365c7082f120e5040b0333d4a82406187c19056261ae2a35e087f8408348baadf1dcd156dc74573ec151272191b4a22b564297473da1
+  checksum: 10c0/e489435856be239f8cc1120c90a197e4c2865385121908e5edb7223cfdff3768cba18f489adfe0c26955d9e7bbb1fb10625bc2517505908ceb0af848989bd864
   languageName: node
   linkType: hard
 
@@ -4419,8 +4421,8 @@ __metadata:
   resolution: "jenkins-ui@workspace:."
   dependencies:
     "@babel/cli": "npm:7.24.8"
-    "@babel/core": "npm:7.24.9"
-    "@babel/preset-env": "npm:7.25.0"
+    "@babel/core": "npm:7.25.2"
+    "@babel/preset-env": "npm:7.25.3"
     "@eslint/js": "npm:9.8.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"

From 8dd2a33b73499cea4cab7e74bcb602e00acecb1d Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:23:52 +0100
Subject: [PATCH 264/449] Remove an old m2e configuration (#9522)

---
 pom.xml | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98315222e42f..700c50ec85d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,36 +418,5 @@ THE SOFTWARE.
         <changelog.url>https://www.jenkins.io/changelog-stable</changelog.url>
       </properties>
     </profile>
-    <profile>
-      <id>m2e</id>
-      <activation>
-        <property>
-          <name>m2e.version</name>
-        </property>
-      </activation>
-      <properties>
-        <m2BuildDirectory>target</m2BuildDirectory>
-      </properties>
-      <build>
-        <directory>${m2BuildDirectory}</directory>
-        <plugins>
-          <plugin>
-            <groupId>org.maven.ide.eclipse</groupId>
-            <artifactId>lifecycle-mapping</artifactId>
-            <version>0.12.0</version>
-            <configuration>
-              <mappingId>customizable</mappingId>
-              <configurators>
-                <configurator id="org.maven.ide.eclipse.jdt.javaConfigurator" />
-                <configurator id="org.maven.ide.eclipse.plexus.annotations.plexusConfigurator" />
-              </configurators>
-              <mojoExecutions>
-                <mojoExecution>org.apache.maven.plugins:maven-resources-plugin::</mojoExecution>
-              </mojoExecutions>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>

From a0edba404d711fca0c48e54a7b63090564420d2b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 08:25:08 -0700
Subject: [PATCH 265/449] Update Yarn to v4.4.0 (#9525)

---
 war/package.json | 2 +-
 war/pom.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/war/package.json b/war/package.json
index 7a15bb41d980..0c988386a763 100644
--- a/war/package.json
+++ b/war/package.json
@@ -65,5 +65,5 @@
     "defaults",
     "not IE 11"
   ],
-  "packageManager": "yarn@4.3.1"
+  "packageManager": "yarn@4.4.0"
 }
diff --git a/war/pom.xml b/war/pom.xml
index 49ac1ba835c4..7848e05e243f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -51,8 +51,8 @@ THE SOFTWARE.
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->
-    <yarn-berry.version>4.2.2</yarn-berry.version>
-    <yarn-berry.sha256sum>1aa43a5304405be7a7cb9cb5de7b97de9c4e8ddd3273e4dad00d6ae3eb39f0ef</yarn-berry.sha256sum>
+    <yarn-berry.version>4.4.0</yarn-berry.version>
+    <yarn-berry.sha256sum>5f228cb28f2edb97d8c3b667fb7b2fdcf06c46798e25ea889dad9e0b4bc2e2c1</yarn-berry.sha256sum>
   </properties>
 
   <dependencyManagement>

From 9b1b1c60ab25cd8b8f63a925bc40c70333bbc949 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:26:42 +0100
Subject: [PATCH 266/449] Switch to Renovate from Dependabot for remaining
 dependencies (#9459)

---
 .github/dependabot.yml |  68 ---------------------------
 .github/renovate.json  | 103 ++++++++++++++++++++++++++++++++++++++---
 core/pom.xml           |   2 +
 pom.xml                |   2 -
 test/pom.xml           |   2 +
 war/pom.xml            |   2 +
 6 files changed, 103 insertions(+), 76 deletions(-)
 delete mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 8c2bd4291a6e..000000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "maven"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    ignore:
-      # Exclusions in this section have been triaged and determined to be
-      # permanent. We do not anticipate removing exclusions from this section.
-
-      # Provided by Jetty and should be aligned with the version provided by the
-      # version of Jetty we deliver. See:
-      # https://github.com/jenkinsci/jenkins/pull/5211
-      - dependency-name: "jakarta.servlet:jakarta.servlet-api"
-
-      # Jetty Maven Plugin and Winstone should be upgraded in lockstep in order
-      # to keep their corresponding Jetty versions aligned.
-      - dependency-name: "org.eclipse.jetty:jetty-maven-plugin"
-      - dependency-name: "org.jenkins-ci:winstone"
-
-      # 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.
-
-      # Contains incompatible API changes and needs compatibility work.
-      - dependency-name: "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
-
-      # Needs significant testing. See:
-      # https://github.com/jenkinsci/jenkins/pull/5112#issuecomment-744429487
-      # https://github.com/jenkinsci/jenkins/pull/5116#issuecomment-744526638
-      - dependency-name: "org.codehaus.groovy:groovy-all"
-        versions: [">=2.5.0"]
-
-      # Consumed by Groovy and should be updated in lockstep with Groovy. See:
-      # https://github.com/jenkinsci/jenkins/pull/5184
-      - dependency-name: "org.fusesource.jansi:jansi"
-
-      # Contains incompatible API changes and needs compatibility work. See:
-      # https://github.com/jenkinsci/jenkins/pull/4224
-      - dependency-name: "org.jfree:jfreechart"
-
-      # Starting with 6.x, Spring requires Java 17 at a minimum.
-      - dependency-name: "org.springframework:spring-framework-bom"
-        versions: [">=6.0.0"]
-
-      # Starting with 6.x, Spring Security requires Java 17 at a minimum.
-      - dependency-name: "org.springframework.security:spring-security-bom"
-        versions: [">=6.0.0"]
-
-      # Starting with 7.x, Guice switches from javax.* to jakarta.* bindings.
-      # See https://github.com/google/guice/wiki/Guice700
-      - dependency-name: "com.google.inject:guice-bom"
-        versions: [">=7.0.0"]
-  - package-ecosystem: "maven"
-    directory: "/"
-    target-branch: "stable-2.452"
-    labels:
-      - "into-lts"
-      - "needs-justification"
-    schedule:
-      interval: "daily"
-    # Include only security updates and exclude version updates.
-    open-pull-requests-limit: 0
diff --git a/.github/renovate.json b/.github/renovate.json
index 8c3c4ad17cea..9078329a2c7f 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,32 +1,110 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    "config:recommended",
     ":disableDependencyDashboard",
     ":semanticCommitsDisabled"
   ],
-  "enabledManagers": ["npm", "regex"],
+  "prHourlyLimit": 0,
+  "prConcurrentLimit": 0,
   "postUpdateOptions": ["yarnDedupeHighest"],
+  "baseBranches": ["master", "stable-2.462"],
   "packageRules": [
+    {
+      "matchBaseBranches": ["/stable-.+/"],
+      "matchManagers": ["maven"],
+      "labels": ["dependencies", "into-lts", "needs-justification"]
+    },
+    {
+      "matchBaseBranches": ["/stable-.+/"],
+      "matchManagers": ["custom.regex", "npm", "github-actions"],
+      "enabled": false
+    },
     {
       "matchDatasources": ["npm"],
       "addLabels": ["javascript"],
-      "stabilityDays": 3,
+      "minimumReleaseAge": "3 days",
       "reviewers": ["team:sig-ux"]
     },
     {
       "matchPackageNames": ["node"],
       "allowedVersions": "/20.[0-9]+.[0-9]+(.[0-9]+)?$/"
+    },
+    {
+      "description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned, could be grouped but releases are likely separated by a bit of time",
+      "matchManagers": ["maven"],
+      "enabled": false,
+      "matchPackageNames": [
+        "org.eclipse.jetty:jetty-maven-plugin", "org.jenkins-ci:winstone"
+      ]
+    },
+    {
+      "description": "Provided by Jetty and should be aligned with the version provided by the version of Jetty we deliver. See: https://github.com/jenkinsci/jenkins/pull/5211",
+      "matchManagers": ["maven"],
+      "enabled": false,
+      "matchPackageNames": ["jakarta.servlet:jakarta.servlet-api"]
+    },
+    {
+      "description": "Contains incompatible API changes and needs compatibility work",
+      "matchManagers": ["maven"],
+      "enabled": false,
+      "matchPackageNames": [
+        "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
+      ]
+    },
+    {
+      "description": "Needs significant testing. See: https://github.com/jenkinsci/jenkins/pull/5112#issuecomment-744429487 and https://github.com/jenkinsci/jenkins/pull/5116#issuecomment-744526638",
+      "matchManagers": ["maven"],
+      "allowedVersions": "<2.5.0",
+      "matchPackageNames": ["org.codehaus.groovy:groovy-all"]
+    },
+    {
+      "description": "Consumed by Groovy and should be updated in lockstep with Groovy. See: https://github.com/jenkinsci/jenkins/pull/5184",
+      "matchManagers": ["maven"],
+      "enabled": false,
+      "matchPackageNames": ["org.fusesource.jansi:jansi"]
+    },
+    {
+      "description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
+      "matchManagers": ["maven"],
+      "enabled": false,
+      "matchPackageNames": ["org.jfree:jfreechart"]
+    },
+    {
+      "description": "Starting with 6.x, Spring requires Java 17 at a minimum.",
+      "matchManagers": ["maven"],
+      "allowedVersions": "<6.0.0",
+      "matchPackageNames": ["org.springframework:spring-framework-bom", "org.springframework.security:spring-security-bom"]
+    },
+    {
+      "description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
+      "matchManagers": ["maven"],
+      "allowedVersions": "<7.0.0",
+      "matchPackageNames": ["com.google.inject:guice-bom"]
+    },
+    {
+      "matchFileNames": ["test/pom.xml", "core/pom.xml", "war/pom.xml"],
+      "matchPackageNames": ["org.jenkins-ci.main:remoting"],
+      "description": "Avoid updating the remoting.minimum.supported.version property but still update latest one by not placing this property in the parent pom.xml",
+      "enabled": false
+    },
+    {
+      "matchPackageNames": ["net.jcip:jcip-annotations"],
+      "matchDatasources": ["maven"],
+      "enabled": false,
+      "description": "maven-metadata.xml is missing for this really old package which is required by renovate"
     }
   ],
-  "regexManagers": [
+  "customManagers": [
     {
+      "customType": "regex",
       "fileMatch": ["war/pom.xml"],
       "matchStrings": ["<node.version>(?<currentValue>.*?)</node.version>"],
       "depNameTemplate": "node",
       "datasourceTemplate": "npm"
     },
     {
+      "customType": "regex",
       "fileMatch": ["ath.sh"],
       "matchStrings": ["export ATH_VERSION=(?<currentValue>.*?)\n"],
       "depNameTemplate": "jenkins/ath",
@@ -34,30 +112,43 @@
       "versioningTemplate": "loose"
     },
     {
+      "customType": "regex",
       "fileMatch": [".gitpod/Dockerfile"],
       "matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
       "depNameTemplate": "org.apache.maven:maven-core",
       "datasourceTemplate": "maven"
     },
     {
+      "customType": "regex",
       "fileMatch": ["core/src/site/site.xml"],
       "matchStrings": ["lit@(?<currentValue>.*?)/"],
       "depNameTemplate": "lit",
       "datasourceTemplate": "npm"
     },
     {
+      "customType": "regex",
       "fileMatch": ["core/src/site/site.xml"],
       "matchStrings": ["webcomponentsjs@(?<currentValue>.*?)/"],
       "depNameTemplate": "@webcomponents/webcomponentsjs",
       "datasourceTemplate": "npm"
     },
     {
+      "customType": "regex",
       "fileMatch": ["core/src/site/site.xml"],
-      "matchStrings": ["<version>(?<currentValue>.*?)<\/version>"],
+      "matchStrings": ["<version>(?<currentValue>.*?)</version>"],
       "depNameTemplate": "org.apache.maven.skins:maven-fluido-skin",
       "datasourceTemplate": "maven"
     }
   ],
   "labels": ["dependencies", "skip-changelog"],
-  "rebaseWhen": "conflicted"
+  "rebaseWhen": "conflicted",
+  "ignorePaths": [
+    "**/node_modules/**",
+    "**/bower_components/**",
+    "**/vendor/**",
+    "**/examples/**",
+    "**/__tests__/**",
+    "**/tests/**",
+    "**/__fixtures__/**"
+  ]
 }
diff --git a/core/pom.xml b/core/pom.xml
index 95c289164930..8e30ae211ed7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,6 +40,8 @@ THE SOFTWARE.
 
   <properties>
     <xmlunit.version>2.10.0</xmlunit.version>
+    <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
+    <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
     <!-- Filled in by jacoco-maven-plugin -->
     <jacocoSurefireArgs />
   </properties>
diff --git a/pom.xml b/pom.xml
index 700c50ec85d4..a0673a9c6cc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,8 +88,6 @@ THE SOFTWARE.
 
     <!-- Bundled Remoting version -->
     <remoting.version>3256.3258.v858f3c9a_f69d</remoting.version>
-    <!-- Minimum Remoting version, which is tested for API compatibility -->
-    <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
 
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Medium</spotbugs.threshold>
diff --git a/test/pom.xml b/test/pom.xml
index e6611ad67099..7b0a43d7c4a1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -38,6 +38,8 @@ THE SOFTWARE.
 
   <properties>
     <mavenDebug>false</mavenDebug>
+    <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
+    <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
     <!-- Filled in by jacoco-maven-plugin -->
     <jacocoSurefireArgs />
     <!--
diff --git a/war/pom.xml b/war/pom.xml
index 7848e05e243f..350911cda226 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -47,6 +47,8 @@ THE SOFTWARE.
     <!-- HTTP listener port -->
     <port>8080</port>
     <mina-sshd-api.version>2.13.1-117.v2f1a_b_66ff91d</mina-sshd-api.version>
+    <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
+    <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
     <node.version>20.16.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>

From 41c033616a5e801f1d113eb94efe62f0eb8a0289 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 10:12:54 -0700
Subject: [PATCH 267/449] Update dependency org.jenkins-ci.plugins:junit to
 v1284 (master) (#9541)

Update dependency org.jenkins-ci.plugins:junit to v1284

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 7b0a43d7c4a1..22e60a159cf2 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -230,7 +230,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1280.v310a_78b_9a_1e0</version>
+      <version>1284.vf75d778f98c5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 350911cda226..9d3892a51e6b 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -300,7 +300,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1280.v310a_78b_9a_1e0</version>
+                  <version>1284.vf75d778f98c5</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 9d18d4d6c04b11ba70e378366571c5e89568a7af Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 10:14:42 -0700
Subject: [PATCH 268/449] Update dependency io.jenkins.plugins:snakeyaml-api to
 v2.2-121.v5a_68b_9300b_d4 (master) (#9531)

Update dependency io.jenkins.plugins:snakeyaml-api to v2.2-121.v5a_68b_9300b_d4

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 9d3892a51e6b..13ac5d62af04 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -365,7 +365,7 @@ THE SOFTWARE.
                   <!-- dependency of jackson2-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>snakeyaml-api</artifactId>
-                  <version>2.2-111.vc6598e30cc65</version>
+                  <version>2.2-121.v5a_68b_9300b_d4</version>
                   <type>hpi</type>
                 </artifactItem>
 

From 6aaf29cd0401ca71a60ad600bd44c68d6df2a3ca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 10:24:15 -0700
Subject: [PATCH 269/449] Update dependency org.awaitility:awaitility to v4.2.2
 (#9533)

Update dependency org.awaitility:awaitility to v4.2.2

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 22e60a159cf2..5804cab5d591 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -190,7 +190,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>4.2.1</version>
+      <version>4.2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 2871574d390913ac98f04f0dbb777e12d133d6a7 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 7 Aug 2024 10:35:18 -0700
Subject: [PATCH 270/449] Remove Renovate LTS updates (#9572)

---
 .github/renovate.json | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 9078329a2c7f..d53af9912aba 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -8,18 +8,7 @@
   "prHourlyLimit": 0,
   "prConcurrentLimit": 0,
   "postUpdateOptions": ["yarnDedupeHighest"],
-  "baseBranches": ["master", "stable-2.462"],
   "packageRules": [
-    {
-      "matchBaseBranches": ["/stable-.+/"],
-      "matchManagers": ["maven"],
-      "labels": ["dependencies", "into-lts", "needs-justification"]
-    },
-    {
-      "matchBaseBranches": ["/stable-.+/"],
-      "matchManagers": ["custom.regex", "npm", "github-actions"],
-      "enabled": false
-    },
     {
       "matchDatasources": ["npm"],
       "addLabels": ["javascript"],

From 76763d6724b8ca4ae20fea70ca8186b54a9c9519 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 7 Aug 2024 10:38:48 -0700
Subject: [PATCH 271/449] Format Renovate JSON file (#9582)

---
 .github/renovate.json | 151 +++++++++++++++++++++++++++++++-----------
 1 file changed, 114 insertions(+), 37 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index d53af9912aba..e0db831c8b93 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -7,35 +7,54 @@
   ],
   "prHourlyLimit": 0,
   "prConcurrentLimit": 0,
-  "postUpdateOptions": ["yarnDedupeHighest"],
+  "postUpdateOptions": [
+    "yarnDedupeHighest"
+  ],
   "packageRules": [
     {
-      "matchDatasources": ["npm"],
-      "addLabels": ["javascript"],
+      "matchDatasources": [
+        "npm"
+      ],
+      "addLabels": [
+        "javascript"
+      ],
       "minimumReleaseAge": "3 days",
-      "reviewers": ["team:sig-ux"]
+      "reviewers": [
+        "team:sig-ux"
+      ]
     },
     {
-      "matchPackageNames": ["node"],
+      "matchPackageNames": [
+        "node"
+      ],
       "allowedVersions": "/20.[0-9]+.[0-9]+(.[0-9]+)?$/"
     },
     {
       "description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned, could be grouped but releases are likely separated by a bit of time",
-      "matchManagers": ["maven"],
+      "matchManagers": [
+        "maven"
+      ],
       "enabled": false,
       "matchPackageNames": [
-        "org.eclipse.jetty:jetty-maven-plugin", "org.jenkins-ci:winstone"
+        "org.eclipse.jetty:jetty-maven-plugin",
+        "org.jenkins-ci:winstone"
       ]
     },
     {
       "description": "Provided by Jetty and should be aligned with the version provided by the version of Jetty we deliver. See: https://github.com/jenkinsci/jenkins/pull/5211",
-      "matchManagers": ["maven"],
+      "matchManagers": [
+        "maven"
+      ],
       "enabled": false,
-      "matchPackageNames": ["jakarta.servlet:jakarta.servlet-api"]
+      "matchPackageNames": [
+        "jakarta.servlet:jakarta.servlet-api"
+      ]
     },
     {
       "description": "Contains incompatible API changes and needs compatibility work",
-      "matchManagers": ["maven"],
+      "matchManagers": [
+        "maven"
+      ],
       "enabled": false,
       "matchPackageNames": [
         "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
@@ -43,43 +62,74 @@
     },
     {
       "description": "Needs significant testing. See: https://github.com/jenkinsci/jenkins/pull/5112#issuecomment-744429487 and https://github.com/jenkinsci/jenkins/pull/5116#issuecomment-744526638",
-      "matchManagers": ["maven"],
+      "matchManagers": [
+        "maven"
+      ],
       "allowedVersions": "<2.5.0",
-      "matchPackageNames": ["org.codehaus.groovy:groovy-all"]
+      "matchPackageNames": [
+        "org.codehaus.groovy:groovy-all"
+      ]
     },
     {
       "description": "Consumed by Groovy and should be updated in lockstep with Groovy. See: https://github.com/jenkinsci/jenkins/pull/5184",
-      "matchManagers": ["maven"],
+      "matchManagers": [
+        "maven"
+      ],
       "enabled": false,
-      "matchPackageNames": ["org.fusesource.jansi:jansi"]
+      "matchPackageNames": [
+        "org.fusesource.jansi:jansi"
+      ]
     },
     {
       "description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
-      "matchManagers": ["maven"],
+      "matchManagers": [
+        "maven"
+      ],
       "enabled": false,
-      "matchPackageNames": ["org.jfree:jfreechart"]
+      "matchPackageNames": [
+        "org.jfree:jfreechart"
+      ]
     },
     {
       "description": "Starting with 6.x, Spring requires Java 17 at a minimum.",
-      "matchManagers": ["maven"],
+      "matchManagers": [
+        "maven"
+      ],
       "allowedVersions": "<6.0.0",
-      "matchPackageNames": ["org.springframework:spring-framework-bom", "org.springframework.security:spring-security-bom"]
+      "matchPackageNames": [
+        "org.springframework:spring-framework-bom",
+        "org.springframework.security:spring-security-bom"
+      ]
     },
     {
       "description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
-      "matchManagers": ["maven"],
+      "matchManagers": [
+        "maven"
+      ],
       "allowedVersions": "<7.0.0",
-      "matchPackageNames": ["com.google.inject:guice-bom"]
+      "matchPackageNames": [
+        "com.google.inject:guice-bom"
+      ]
     },
     {
-      "matchFileNames": ["test/pom.xml", "core/pom.xml", "war/pom.xml"],
-      "matchPackageNames": ["org.jenkins-ci.main:remoting"],
+      "matchFileNames": [
+        "core/pom.xml",
+        "test/pom.xml",
+        "war/pom.xml"
+      ],
+      "matchPackageNames": [
+        "org.jenkins-ci.main:remoting"
+      ],
       "description": "Avoid updating the remoting.minimum.supported.version property but still update latest one by not placing this property in the parent pom.xml",
       "enabled": false
     },
     {
-      "matchPackageNames": ["net.jcip:jcip-annotations"],
-      "matchDatasources": ["maven"],
+      "matchPackageNames": [
+        "net.jcip:jcip-annotations"
+      ],
+      "matchDatasources": [
+        "maven"
+      ],
       "enabled": false,
       "description": "maven-metadata.xml is missing for this really old package which is required by renovate"
     }
@@ -87,49 +137,76 @@
   "customManagers": [
     {
       "customType": "regex",
-      "fileMatch": ["war/pom.xml"],
-      "matchStrings": ["<node.version>(?<currentValue>.*?)</node.version>"],
+      "fileMatch": [
+        "war/pom.xml"
+      ],
+      "matchStrings": [
+        "<node.version>(?<currentValue>.*?)</node.version>"
+      ],
       "depNameTemplate": "node",
       "datasourceTemplate": "npm"
     },
     {
       "customType": "regex",
-      "fileMatch": ["ath.sh"],
-      "matchStrings": ["export ATH_VERSION=(?<currentValue>.*?)\n"],
+      "fileMatch": [
+        "ath.sh"
+      ],
+      "matchStrings": [
+        "export ATH_VERSION=(?<currentValue>.*?)\n"
+      ],
       "depNameTemplate": "jenkins/ath",
       "datasourceTemplate": "docker",
       "versioningTemplate": "loose"
     },
     {
       "customType": "regex",
-      "fileMatch": [".gitpod/Dockerfile"],
-      "matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
+      "fileMatch": [
+        ".gitpod/Dockerfile"
+      ],
+      "matchStrings": [
+        "ARG MAVEN_VERSION=(?<currentValue>.*?)\n"
+      ],
       "depNameTemplate": "org.apache.maven:maven-core",
       "datasourceTemplate": "maven"
     },
     {
       "customType": "regex",
-      "fileMatch": ["core/src/site/site.xml"],
-      "matchStrings": ["lit@(?<currentValue>.*?)/"],
+      "fileMatch": [
+        "core/src/site/site.xml"
+      ],
+      "matchStrings": [
+        "lit@(?<currentValue>.*?)/"
+      ],
       "depNameTemplate": "lit",
       "datasourceTemplate": "npm"
     },
     {
       "customType": "regex",
-      "fileMatch": ["core/src/site/site.xml"],
-      "matchStrings": ["webcomponentsjs@(?<currentValue>.*?)/"],
+      "fileMatch": [
+        "core/src/site/site.xml"
+      ],
+      "matchStrings": [
+        "webcomponentsjs@(?<currentValue>.*?)/"
+      ],
       "depNameTemplate": "@webcomponents/webcomponentsjs",
       "datasourceTemplate": "npm"
     },
     {
       "customType": "regex",
-      "fileMatch": ["core/src/site/site.xml"],
-      "matchStrings": ["<version>(?<currentValue>.*?)</version>"],
+      "fileMatch": [
+        "core/src/site/site.xml"
+      ],
+      "matchStrings": [
+        "<version>(?<currentValue>.*?)</version>"
+      ],
       "depNameTemplate": "org.apache.maven.skins:maven-fluido-skin",
       "datasourceTemplate": "maven"
     }
   ],
-  "labels": ["dependencies", "skip-changelog"],
+  "labels": [
+    "dependencies",
+    "skip-changelog"
+  ],
   "rebaseWhen": "conflicted",
   "ignorePaths": [
     "**/node_modules/**",

From d9b05bffef6d423cb67a701ee73947c416f77614 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:22:29 +0200
Subject: [PATCH 272/449] Remove accidental debug output from test (#9567)

---
 test/src/test/java/jenkins/security/Security3430Test.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/src/test/java/jenkins/security/Security3430Test.java b/test/src/test/java/jenkins/security/Security3430Test.java
index a9e717c75f9f..f39702fd4204 100644
--- a/test/src/test/java/jenkins/security/Security3430Test.java
+++ b/test/src/test/java/jenkins/security/Security3430Test.java
@@ -252,7 +252,6 @@ public Exploit(URL controllerFilePath, String expectedContent) {
         @Override
         public Void call() throws Exception {
             final ClassLoader ccl = Thread.currentThread().getContextClassLoader();
-            System.err.println(ccl.getClass().getName());
             final Field classLoaderProxyField = ccl.getClass().getDeclaredField("proxy");
             classLoaderProxyField.setAccessible(true);
             final Object theProxy = classLoaderProxyField.get(ccl);

From 8d649f349cd25a7b66f76bb51aa9ffe30465564e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:39:00 -0700
Subject: [PATCH 273/449] Update dependency org.jenkins-ci.plugins:ant to v511
 (#9581)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 5804cab5d591..9ff5c08f7d3e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -95,7 +95,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>ant</artifactId>
-        <version>497.v94e7d9fffa_b_9</version>
+        <version>511.v0a_a_1a_334f41b_</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>

From febca0278e0000791b2925f3317c092bfb1fab48 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:39:36 -0700
Subject: [PATCH 274/449] Update dependency
 org.jenkins-ci.plugins:command-launcher to v115 (#9583)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 13ac5d62af04..ef2e0b7c2f00 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -425,7 +425,7 @@ THE SOFTWARE.
                   <!-- detached after 2.86 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>command-launcher</artifactId>
-                  <version>107.v773860566e2e</version>
+                  <version>115.vd8b_301cc15d0</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 730f4aeaf11cda374ea6af09f2abafead51a6e13 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:39:57 -0700
Subject: [PATCH 275/449] Update dependency org.jenkins-ci.plugins:jdk-tool to
 v80 (#9584)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index ef2e0b7c2f00..3aa9ce339711 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -432,7 +432,7 @@ THE SOFTWARE.
                   <!-- detached after 2.112 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>jdk-tool</artifactId>
-                  <version>73.vddf737284550</version>
+                  <version>80.v8a_dee33ed6f0</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From c4d65161dc62c32a6d25ef54479065e2583dfde4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 13:07:20 -0700
Subject: [PATCH 276/449] Update dependency org.jvnet.winp:winp to v1.31
 (#9579)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 war/pom.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 8f8e6412f7b0..eef848b0ca9c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -304,7 +304,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jvnet.winp</groupId>
         <artifactId>winp</artifactId>
-        <version>1.30</version>
+        <version>1.31</version>
       </dependency>
       <dependency>
         <groupId>org.kohsuke</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 3aa9ce339711..a4a190a29440 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -158,6 +158,7 @@ THE SOFTWARE.
                     <exclude>org.jenkins-ci.main:jenkins-core</exclude>
                     <exclude>org.jenkins-ci.main:websocket-jetty10</exclude>
                     <exclude>org.jenkins-ci.main:websocket-spi</exclude>
+                    <exclude>org.jvnet.winp:winp</exclude>
                     <exclude>org.kohsuke.stapler:stapler</exclude>
                     <exclude>org.kohsuke.stapler:stapler-groovy</exclude>
                     <exclude>org.kohsuke.stapler:stapler-jelly</exclude>

From decfa380183784a6ac54c49673e2e7cad8a988a0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 13:08:00 -0700
Subject: [PATCH 277/449] Update antlr.version to v4.13.2 (#9574)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a0673a9c6cc1..e5ab26e483e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@ THE SOFTWARE.
     <spotbugs.threshold>Medium</spotbugs.threshold>
 
     <access-modifier.version>1.33</access-modifier.version>
-    <antlr.version>4.13.1</antlr.version>
+    <antlr.version>4.13.2</antlr.version>
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->

From 6ce299cb73912023ae69533660431b8f6ef0fd0f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 13:08:41 -0700
Subject: [PATCH 278/449] Update dependency
 org.glassfish.tyrus.bundles:tyrus-standalone-client-jdk to v2.2.0 (#9578)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 cli/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index c037ed4a0ee8..90747e280df4 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.glassfish.tyrus.bundles</groupId>
       <artifactId>tyrus-standalone-client-jdk</artifactId>
-      <version>2.1.5</version>
+      <version>2.2.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>

From 391895b05a7d88a7a26f73ceff2539c9ce29083c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 13:09:09 -0700
Subject: [PATCH 279/449] Update dependency org.jenkins-ci.main:remoting to
 v3261 (#9585)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e5ab26e483e7..152051851abc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>3256.3258.v858f3c9a_f69d</remoting.version>
+    <remoting.version>3261.v9c670a_4748a_9</remoting.version>
 
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Medium</spotbugs.threshold>

From dcd04e9820bae4fd8e68370fc400b93535059414 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 13:09:46 -0700
Subject: [PATCH 280/449] Update dependency postcss-preset-env to v10 (#9527)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   2 +-
 war/yarn.lock    | 851 ++++++++++++++++++++++++-----------------------
 2 files changed, 444 insertions(+), 409 deletions(-)

diff --git a/war/package.json b/war/package.json
index 0c988386a763..48ab2e839ad7 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.40",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "9.6.0",
+    "postcss-preset-env": "10.0.0",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.3",
     "sass": "1.77.8",
diff --git a/war/yarn.lock b/war/yarn.lock
index 83ef4d3ebd46..609ea58f7f1e 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1384,13 +1384,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^1.0.13":
-  version: 1.0.13
-  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.13"
+"@csstools/cascade-layer-name-parser@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/cascade-layer-name-parser@npm:2.0.0"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.1
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/a6412fc8601af1baadc8195934aa668d3476e799891c9d0883390f31ec8678e9b565ac14d919bec633bbc086657ac12aa4cd852c718851a2d34517ee6856ff8e
+    "@csstools/css-parser-algorithms": ^3.0.0
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/11de0c4abad1316a6b29a2c4f7966fc39af5cbcd0a542d92cbcca8a8173d472f3d577175fc097bebf793158936193a74829a035e1cb2abccbe056473a3076d89
   languageName: node
   linkType: hard
 
@@ -1401,26 +1401,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "@csstools/css-calc@npm:1.2.4"
+"@csstools/css-calc@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/css-calc@npm:2.0.0"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.1
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/6233746eb642797b7fbc2cf6e7651e95700b294e78e3c29e8730c3236bb92cf62903efb6e54639e8f877683c40646e137c95e615c4450809b21b61a6192888ca
+    "@csstools/css-parser-algorithms": ^3.0.0
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/441f8fafaa4f87302b85e2c46bc8a3efb388e0357f0db5c45438fe99c5660afeb524332a0a3339574fdd26392e65f8db9c7ab6db3361726f1702987e8522c531
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "@csstools/css-color-parser@npm:2.0.4"
+"@csstools/css-color-parser@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/css-color-parser@npm:3.0.0"
   dependencies:
     "@csstools/color-helpers": "npm:^4.2.1"
-    "@csstools/css-calc": "npm:^1.2.4"
+    "@csstools/css-calc": "npm:^2.0.0"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.1
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/e009a2f34b6c328daad54262deb86b71c6a7a9a1da1db8ad39cf719641e1a728ed8ddbd23613d519d26deee33b89ba12cb15a6928718c1b3cc5e24ac1ed02f47
+    "@csstools/css-parser-algorithms": ^3.0.0
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/9b56ba3b56691d2133f1d9b881131bfd9745024a79f825284109adac05578e15ae3eed0e99c98db162932d69770fc970b5b005996c32cdf7167af3418da263c3
   languageName: node
   linkType: hard
 
@@ -1433,6 +1433,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/css-parser-algorithms@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/css-parser-algorithms@npm:3.0.0"
+  peerDependencies:
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/ffa06c9d883e6bbb6198c98b5a395abe9847ff63ae41db54d75812e52764f550b36625fdb427c9a4ea6dfd71362aa98194ccd63afad0e521f6f3470c7515d241
+  languageName: node
+  linkType: hard
+
 "@csstools/css-tokenizer@npm:^2.4.1":
   version: 2.4.1
   resolution: "@csstools/css-tokenizer@npm:2.4.1"
@@ -1440,6 +1449,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/css-tokenizer@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/css-tokenizer@npm:3.0.0"
+  checksum: 10c0/6d0f3e44bfb4b309bc4e260e6399163653f5715b16ebf1f2907ec98a2b31e9b2de94c09012b6d291c6f4229cc2a521e4f66594cac1b6276a4eb205e8e23e446b
+  languageName: node
+  linkType: hard
+
 "@csstools/media-query-list-parser@npm:^2.1.13":
   version: 2.1.13
   resolution: "@csstools/media-query-list-parser@npm:2.1.13"
@@ -1450,383 +1466,393 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-cascade-layers@npm:^4.0.6":
-  version: 4.0.6
-  resolution: "@csstools/postcss-cascade-layers@npm:4.0.6"
+"@csstools/media-query-list-parser@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/media-query-list-parser@npm:3.0.0"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^3.0.0
+    "@csstools/css-tokenizer": ^3.0.0
+  checksum: 10c0/0a83ab7cba4fec5543c5abf3f7145ab5742c44e0ed3349d41787739a1bd897a8cf27f35f3bc714d1d02a44b2a34f28b3b82ce6d0cb6b9c4fbb679dc034f8a152
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-cascade-layers@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@csstools/postcss-cascade-layers@npm:5.0.0"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    "@csstools/selector-specificity": "npm:^4.0.0"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/134019e9b3f71de39034658e2a284f549883745a309f774d8d272871f9e65680e0981c893766537a8a56ed7f41dba2d0f9fc3cb4fa4057c227bc193976a2ec79
+  checksum: 10c0/b608c69c12671682676598e451dcd79bfc6f5030a4e17b4d1bf9659e531f1daf03526be023f9aafdc952ecc87c87b04f379a763309e3eadb2140572cd4aa5b60
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^3.0.19":
-  version: 3.0.19
-  resolution: "@csstools/postcss-color-function@npm:3.0.19"
+"@csstools/postcss-color-function@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-color-function@npm:4.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/067e33d7dfc32b56fe63d4f97464a3eaf27dde720961e44feab6076bd2c172dd4c1bad16aa37a922dcbba470756bd6a13e728d9e71eab6937d48d83873cd1879
+  checksum: 10c0/ff0c0c44f5d17bc5e7ea287eff9c10ca334a84d086998a6b243a209f1795d32ba872357935f4176e5206b88dc8d2a204f452c13bc940540b7122e9e807511ac6
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^2.0.19":
-  version: 2.0.19
-  resolution: "@csstools/postcss-color-mix-function@npm:2.0.19"
+"@csstools/postcss-color-mix-function@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-color-mix-function@npm:3.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e967d93672a065806dc78da0153f8b4f5087f7c3ddfe361eba4942780760d47b317124913c9b0dda7f9bfff1253f77d1b6debd8a6a2aa3a6c80e263101da5e8c
+  checksum: 10c0/120e96581834b2363df1fb653959dc243d93c01bcd70bf2e34418c20cd418a75f8b4e2e81da6955345619dcbb246e7d023f395521522bacb455583c15f61c677
   languageName: node
   linkType: hard
 
-"@csstools/postcss-content-alt-text@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/postcss-content-alt-text@npm:1.0.0"
+"@csstools/postcss-content-alt-text@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-content-alt-text@npm:2.0.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/0c2c64857ac652989d00c3d2ba49d0cd1cc245193cba6724d2f5841aa990ee6a07267cfebc6fabde6a6246616df60373006d17c5ea9b904129fbfd826dc10a8d
+  checksum: 10c0/978e99425f1b5420c55282f51de65646b910f9d60621f5ad7adb7a2dace26c68dc384cd4798604e2c5d8bcd1e635a20474a6ea044a7e9b449d068d6db77a2738
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "@csstools/postcss-exponential-functions@npm:1.0.9"
+"@csstools/postcss-exponential-functions@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-exponential-functions@npm:2.0.0"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/eaec29ef6ec201786c606176235dced4af1922d5ac56c6b0993ad2e7d87464a32702d9b28cae9a76e8527f741b50cbc31d4c646f45d02dc69d520f241b3e7878
+  checksum: 10c0/a5ccd4fb5b6f6f370bf07ef8f918658ef4d9865a92d9866f57edfe7479c6a486701520cbe0efb8f39af9b78eda0819d8663554e9797b8bdcadc2291733bf6b3f
   languageName: node
   linkType: hard
 
-"@csstools/postcss-font-format-keywords@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@csstools/postcss-font-format-keywords@npm:3.0.2"
+"@csstools/postcss-font-format-keywords@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-font-format-keywords@npm:4.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/1b9bf031ce1a00fef1fae0b1ad614eddc6bb4c036ecad47e065c99063ba3d2f6ab8e47f9db02a6fbe8b75b0e02a075a7a80480d4296918970ba9e8d36f07a523
+  checksum: 10c0/eb794fb95fefcac75e606d185255e601636af177866a317b0c6b6c375055e7240be53918229fd8d4bba00df01bedd2256bdac2b0ad4a4c2ec64f9d27cd6ff639
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.11"
+"@csstools/postcss-gamut-mapping@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/29e755013f1d1de34eb62a931ed410d2830ca3dfc81476cb3c72d9d3260b85a9adedc51aa548550c6e308f3f9640c489e6953db40e9cac9835d0421d5b14ef1f
+  checksum: 10c0/be1d7f4c96f3bbcb69ed4ccc2ff406a884ae7129e6542ab6800782fbfe4e077159352409961f2da8054ec9fabbf6ed211288f1004c96632a1f6b10bef332d880
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^4.0.20":
-  version: 4.0.20
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.20"
+"@csstools/postcss-gradients-interpolation-method@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6588825a72a1471e2d6036c8cf7dbad2bf05f369d96dbdd68ff5ce7ff91803b8ee1146f5f1bf6f3ab6299944549da872914664c3f9e8ae5a31847f76f0085c74
+  checksum: 10c0/04e29fd877a499b9570665aea5b23cd70635b538dd903b9f9706ddd85a2d9c93445aea4b6b7dbcf8986ab58b45bb502ec5060044d945096d0af2eb6cebadb88e
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^3.0.18":
-  version: 3.0.18
-  resolution: "@csstools/postcss-hwb-function@npm:3.0.18"
+"@csstools/postcss-hwb-function@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-hwb-function@npm:4.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e9d76b0b2f9c54920124ca1804b49e3f5b26e003729418b5ef4b340ff1baa4779da1c02be618888fdbcc2d0747182352efbbd3ffe128e2417928c35c25443789
+  checksum: 10c0/1aff69ca364417ac2b7ef1c737f88567f441bfd54d93d7b635e0ad605c61edcc2282bc0e2df73c83d1c6a24487e0acec34a4585d27d5f6027402aaea71696190
   languageName: node
   linkType: hard
 
-"@csstools/postcss-ic-unit@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "@csstools/postcss-ic-unit@npm:3.0.7"
+"@csstools/postcss-ic-unit@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-ic-unit@npm:4.0.0"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2add905b75860c64d7174886fecfc76d86e3818f42f003f4bbfc0604cc7f0f31c6dbd1651e6b9512fea876190d80033578ae49e813b64b17c8cf3b1f03d8e146
+  checksum: 10c0/6f94ec31002a245768a30d240c432b8712af4d9ea76a62403e16d4e0afb5be7636348a2d4619046ed29aa7726f88a0c191ca41c96d7ab0f3da940025c91b056e
   languageName: node
   linkType: hard
 
-"@csstools/postcss-initial@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-initial@npm:1.0.1"
+"@csstools/postcss-initial@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-initial@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5d21c7c611d90a4b6758ba5be5e38d8d9eea9499c62797c4f5e01fbc9ccc2c68daf1c201850efe70ffa4ff9e979e7dea80b854b8793768550879562881aa6f9f
+  checksum: 10c0/44c443cba84cc66367f2082bf20db06c8437338c02c244c38798c5bf5342932d89fed0dd13e4409f084ecf7fce47ae6394e9a7a006fd98a973decfa24ab1eb04
   languageName: node
   linkType: hard
 
-"@csstools/postcss-is-pseudo-class@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8"
+"@csstools/postcss-is-pseudo-class@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@csstools/postcss-is-pseudo-class@npm:5.0.0"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    "@csstools/selector-specificity": "npm:^4.0.0"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/82f191571c3e0973354a54ef15feeb17f9408b4abbefad19fc0f087683b1212fc854cdf09a47324267dd47be4c5cb47d63b8d083695a67c3f8f3e53df3d561f6
+  checksum: 10c0/738eb84728b24bfe19ca06ccf6ff773a423552df2f31c87704ce79da4abfd2ccf2a45d5d6d3e11e71e42cc3d92eb35a856209b9cd6116c879acf15ac75454683
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "@csstools/postcss-light-dark-function@npm:1.0.8"
+"@csstools/postcss-light-dark-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-light-dark-function@npm:2.0.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/78fa6d799d38f14af1b32b534eedbec9478033e1fbc5a4e820f2421e865673d010b69b391546686ceb408ead64d79bb4eba2a4fb1fc9f0de70ff21e3ff8477c6
+  checksum: 10c0/d0eb1e04854c4ae425c6aff51ce9d0db90e9457aea3307d3ed916f500d2b5a3314a25d3487ea893e7b006a34c0d155462566d6066c8c54baec33eb104891c6db
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-float-and-clear@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-logical-float-and-clear@npm:2.0.1"
+"@csstools/postcss-logical-float-and-clear@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-logical-float-and-clear@npm:3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/92d9184bf8a159753a5872463dcfde580abd9b935e2a59f7ebe601cd14d9871f2f9f4dc18d8bbe251e7d8a3e446e302d9d99bf408d9cabbd9a6323825f5e833d
+  checksum: 10c0/71a20e8c37877bf68ae615d7bb93fc11b4f8da8be8b1dc1a6e0fc69e27f189712ed71436b8ed51fa69fdb98b8e6718df2b5f42f246c4d39badaf0e43020fcfd4
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-overflow@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-logical-overflow@npm:1.0.1"
+"@csstools/postcss-logical-overflow@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-logical-overflow@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a8f5b1fdaf4ce7b1665407dac2f2e0c0ea11195e6873cfc714d9cd206489170fd91fc172b337330baf60191206f60579e235264f0dc7fee750ccd27ffe02c163
+  checksum: 10c0/0e103343d3ff8b34eef01b02355c5e010d272fd12d149a242026bb13ab1577b7f3a11fd4514be9342d96f73d61dac1f093a9bd36ece591753ed09a84eb7fca0a
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-overscroll-behavior@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-logical-overscroll-behavior@npm:1.0.1"
+"@csstools/postcss-logical-overscroll-behavior@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-logical-overscroll-behavior@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9485502bd9235276525351818d6cc11544ac1b270bb4f527f3fac32fe98ac66269366c34cdb8f61920b10ff9aac5824935004a5927490a5febca77eb41226604
+  checksum: 10c0/1649601bb26f04d760fb5ebc42cdf414fa2a380b8ec22fe1c117f664c286665a786bd7bbda01b7e7567eaf3cc018a4f36a5c9805f6751cc497da223e0ffe9524
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-resize@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-logical-resize@npm:2.0.1"
+"@csstools/postcss-logical-resize@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-logical-resize@npm:3.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/18f7e19ea465a15b334d8231b9ed98b630c74a6c2a6c52884437b852065f7b55bb1282cdbbdc1136aade479e996605b01799ab0ab771e2c47fd78d966ed33162
+  checksum: 10c0/4f12efcaf5468ff359bb3f32f0f66034b9acc9b3ac21fcd2f30a1c8998fc653ebac0091f35c8b7e8dbfe6ccf595aee67f9b06a67adf45a8844e49a82d98b4386
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^2.0.11":
-  version: 2.0.11
-  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.11"
+"@csstools/postcss-logical-viewport-units@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-logical-viewport-units@npm:3.0.0"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/20207e9b7fc3ab52df5fcd06fde71fca4fd22bd6bd451cfc2ec6ea69994708b7fc5381e203dc4367293a8de00b1eca7a3ebe89cfa9b933d2f2cb8e3ac4d5aa86
+  checksum: 10c0/d474f3b8b3949516ad431c8297eb26ad7ba8829dc323c1a99c25be79af0fa16eef43ddd4d980ea97a676599c5587b4b2afd44c9a1055cf3573bfb2090ecbbd5c
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^1.1.8":
-  version: 1.1.8
-  resolution: "@csstools/postcss-media-minmax@npm:1.1.8"
+"@csstools/postcss-media-minmax@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-media-minmax@npm:2.0.0"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.13"
+    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/media-query-list-parser": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/7d666905282c7a89387dbce84f3429bad04870e0de264c5b1ce3e6f042b8eb72d585a18b2d7ac5e1a8c7f6785892da3cc7f6ea0b48069b06e9d383bdbc149b4a
+  checksum: 10c0/30f8cde005ae5d3750f8d2d62a26570381e306a2a4c3fdeef2ad48febbefd389c65ea471914b69ae8772a4abbd11cd52a78ecdb5d8929ed553ca1d5731f212a2
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.11":
-  version: 2.0.11
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.11"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:3.0.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.13"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/media-query-list-parser": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b4023a1951b7661196332852ce714a4e2fb4f1a67164ec0944e28a009b389e59c67e9de790920fcd082b122276414dd39c12ae12a4566e59e1bbcc794560a870
+  checksum: 10c0/c7af426e44c4ca2c7cb48c2f54bd8b5e4531d4d7a568011c367038956789bf47bab996fa062f767e255229de3598fb89abdb85011872158c885a4d3ace142509
   languageName: node
   linkType: hard
 
-"@csstools/postcss-nested-calc@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@csstools/postcss-nested-calc@npm:3.0.2"
+"@csstools/postcss-nested-calc@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-nested-calc@npm:4.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3e24cf641170f9090f0dce088f6dae09ed9a0f38af1bdaa369ecc791a94cce54d7a02a0634f661a97fae24e04f1601c21d753593de018c80ad4236d36144b975
+  checksum: 10c0/fb61512fa4909bdf0ee32a23e771145086c445f2208a737b52093c8adfab7362c56d3aeaf2a6e33ffcec067e99a07219775465d2fbb1a3ac30cdcfb278b218b7
   languageName: node
   linkType: hard
 
-"@csstools/postcss-normalize-display-values@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@csstools/postcss-normalize-display-values@npm:3.0.2"
+"@csstools/postcss-normalize-display-values@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-normalize-display-values@npm:4.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a20e2f4c213a5ec6e004c2ba76b543d3288a39aae21b3198b06a57df0d2c7916111d2cd70dcb0e8c6ca1cf1b01751e88fd2fe9abbc070e1efab1a4e54dcdbbbe
+  checksum: 10c0/d3a3a362b532163bd791f97348ef28b7a43baf01987c7702b06285e751cdc5ea3e3a2553f088260515b4d28263d5c475923d4d4780ecb4078ec66dff50c9e638
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^3.0.19":
-  version: 3.0.19
-  resolution: "@csstools/postcss-oklab-function@npm:3.0.19"
+"@csstools/postcss-oklab-function@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-oklab-function@npm:4.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2909f76ba408c9f60b61c479994c96200b0e1d3dbf524d5ae6dc5ca1e21d38caf974595e0d071c3900dbe3568376928085dd811aa24ea3e715bcd9de26fb0fa9
+  checksum: 10c0/9e228049645e6a6baa77d6e7e35b3862f3e2e4836fbf2de43fa246d91f0efa36e7f18eae3f2b224c61e72628aaf14d4bff86c555fb06378d5e05e71dca92f9ec
   languageName: node
   linkType: hard
 
-"@csstools/postcss-progressive-custom-properties@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.3.0"
+"@csstools/postcss-progressive-custom-properties@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:4.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6c9987d65049a70b5090dcfe42fde9ab2b3cb88911a81bb6651ed81c8baf99502ff2cbec0cb3e022426fa994b558b4bf33fd791ccdcdf683dde75b4865d34f39
+  checksum: 10c0/517e5e0b1525667ea1c4469bb2af52995934b9ab3165bba33e3bfdfac63b20bb51c878da582d805957dc0291e396e5a540cac18d1220a08190d98d5463d26ce2
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^2.0.19":
-  version: 2.0.19
-  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.19"
+"@csstools/postcss-relative-color-syntax@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f0aff764f4889ff664b6fa94ddfa5a22daf39354aa2d2ac0eab893eb3ed841b7d2a72131393334d6a5379445fc80f92ab5bd63d4dc3b43746bc7c9055da46591
+  checksum: 10c0/d7ae180d746bd9778d8b9f74f8d644f4c6a98b29659423d4ee2b48f461e90a3e30b44dcf44a181ade083b6c6d1b0346b7b3e62fe67fdeaba59a13f050a19c7d1
   languageName: node
   linkType: hard
 
-"@csstools/postcss-scope-pseudo-class@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-scope-pseudo-class@npm:3.0.1"
+"@csstools/postcss-scope-pseudo-class@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-scope-pseudo-class@npm:4.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/489c5469951277b810754ba02e9f6c42196e03f2203b908181a81747bf1dcaa7b194c8c0f5c7dcb6b7276d08f2573a71bd7df4f2251c034ef1b92968c7070285
+  checksum: 10c0/a6f562df1417c6f257c0fec95babf4cea99a25622573a2dbcfb416e2fcb8e1e53561127f5e7277d19fcb2a4603bdbc64dd6a4c416429623503c604050c99229a
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^3.0.10":
-  version: 3.0.10
-  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.10"
+"@csstools/postcss-stepped-value-functions@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-stepped-value-functions@npm:4.0.0"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f9ebe50fb884d002aa40070196a827816f635b891fd2147ae5ddf1ad6df5bddbb50783d6786897bb3dffa33052565e38289392040cf4454aaa179ab00353117d
+  checksum: 10c0/02d9b99921a69838d5df7cc2703f381e8e18d14ac5a4bd8b8b24ff80bc9657ff70b1997cdbfd9c2f1985a5d07478a0e97d1617760519450c5475cc1d8159e788
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.7"
+"@csstools/postcss-text-decoration-shorthand@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:4.0.0"
   dependencies:
     "@csstools/color-helpers": "npm:^4.2.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/072b9893ca2409aa16e53e84747d7b7e13071ce19738a0800a139bf71b535e439958d9093df2b85f83eee2e0c44bc22a14bf3a39b5a7508bca9e747a12273d02
+  checksum: 10c0/dedc98134648d5306e795e4176b2c39a578a237669562e7d934d0b0ac7411d37bab4065c8b0adfc075b57250daba62f045b86c79286b5f9be55502acef0d88c6
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^3.0.10":
-  version: 3.0.10
-  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.10"
+"@csstools/postcss-trigonometric-functions@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-trigonometric-functions@npm:4.0.0"
   dependencies:
-    "@csstools/css-calc": "npm:^1.2.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/31adcc66510d9788ccb0669d2761517a6135b13692007d8e4334bc0e8d3515dfecfbdcd04e060d0c09a0f5fc2f12db92221b9d53e92b65b044c89cde9a3424cb
+  checksum: 10c0/3a53d6724f068511d02a2de3b39e76bf99d622614e1c79b3d2c2eace2f0d36d865288dc2c4a1368fee8db38be7973803504400b2752cd5a1200f825ddc27b253
   languageName: node
   linkType: hard
 
-"@csstools/postcss-unset-value@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-unset-value@npm:3.0.1"
+"@csstools/postcss-unset-value@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-unset-value@npm:4.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5032c3125eada0a3a77d0867644cf994e28b789aaa40e990e7eebcdf5a9ed9f36b30e0904827044cea39849c9a9a19c90e82d3ca655550d82a7530872b3b6ff8
+  checksum: 10c0/8424ac700ded5bf59d49310335896f10c069e2c3fc6a676b5d13ca5a6fb78689b948f50494df875da284c4c76651deb005eafba70d87e693274628c5a685abfa
   languageName: node
   linkType: hard
 
-"@csstools/selector-resolve-nested@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@csstools/selector-resolve-nested@npm:1.1.0"
+"@csstools/selector-resolve-nested@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/selector-resolve-nested@npm:2.0.0"
   peerDependencies:
-    postcss-selector-parser: ^6.0.13
-  checksum: 10c0/3a53b14e048d48b8900c1cf30442ab5eec1a1087c74ce41459c4dcd42ad7d363c9327890ba7aed25288d09c206d9565178bae126b25cdc3e1170a1d55e763c77
+    postcss-selector-parser: ^6.1.0
+  checksum: 10c0/10516fd1db5e0a3963063caa57d24eeb1d1f69fcb63f0b5aec5d7a44f8b36ff07b1eded3012e8a9b92fc1f484e1a5a9def0cf57d788aa7f944ee79877837cc77
   languageName: node
   linkType: hard
 
@@ -1839,12 +1865,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/utilities@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/utilities@npm:1.0.0"
+"@csstools/selector-specificity@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/selector-specificity@npm:4.0.0"
+  peerDependencies:
+    postcss-selector-parser: ^6.1.0
+  checksum: 10c0/6f4d4ecfdcd37f950100de8ffe0b4c1b1cc8c004aab2c2ebaa5c3e2bca2412d15b17d4628435f47a62d2c56db41bcbf985cb9c69e74b89964d48e421e93e75ba
+  languageName: node
+  linkType: hard
+
+"@csstools/utilities@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/utilities@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/2ac10895e0a1f9e1fc9c092197c8595a09f632552791af91219f38c55bb39083fb44b74a6a7de9112492cf24a2fe66d20c955a2b4aff041d5c017d87bbebc0f2
+  checksum: 10c0/be5c31437b726928f64cd4bb3e47f5b90bfd2e2a69a8eaabd8e89cc6c0977e4f0f7ee48de50c8ed8b07e04e3956a02293247e0da3236d521fb2e836f88f65822
   languageName: node
   linkType: hard
 
@@ -3084,14 +3119,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-blank-pseudo@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "css-blank-pseudo@npm:6.0.2"
+"css-blank-pseudo@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "css-blank-pseudo@npm:7.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/609303551c2a518ca23ed12fed43945ca4f7af04140da68a5536f5dc9d42f33412c13ac3fe5c616d7401a9e13a23d80b4cfa87149a45f94b244d8067bb11f3dd
+  checksum: 10c0/74c6c0af773a8d2c8c5a53bcfc2b2c06f9c3fd4a8bd756b7aafc102b91a1060b179a4f0aa21475b54685b62bfd9724fee90778dd992b42e0cd3ea3698132af92
   languageName: node
   linkType: hard
 
@@ -3111,16 +3146,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "css-has-pseudo@npm:6.0.5"
+"css-has-pseudo@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "css-has-pseudo@npm:7.0.0"
   dependencies:
-    "@csstools/selector-specificity": "npm:^3.1.1"
-    postcss-selector-parser: "npm:^6.0.13"
+    "@csstools/selector-specificity": "npm:^4.0.0"
+    postcss-selector-parser: "npm:^6.1.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/946930b7e699d6dbcb8426ebcd593228ee0e2143a148fb2399111ea4c9ed8d6eb3447e944251f1be44ae987d5ab16e450b0b006ca197f318c2a3760ba431fbb9
+  checksum: 10c0/2c72602ca9bcdb3afe2cce3b014e7dd17548658904c17560042ebf4bd6727b1ed8706961b1f44bff43bbdb8dc932c30a0b29f536c353df858e300e68e163b872
   languageName: node
   linkType: hard
 
@@ -3177,12 +3212,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-prefers-color-scheme@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "css-prefers-color-scheme@npm:9.0.1"
+"css-prefers-color-scheme@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "css-prefers-color-scheme@npm:10.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b94da00d84c4ebb56eb8fce96d4fdb20d2e622a7cd8cd6d7b87d1d2b718a55ce88bccc9d871771bfe77c5107de06132ba87190e3656f049e45f19f652d50136c
+  checksum: 10c0/a66c727bb2455328b18862f720819fc98ff5c1486b69f758bdb5c66f46cc6d484f9fc0bfa4f00f2693c5da6707ad136ca789496982f713ade693f08af624930e
   languageName: node
   linkType: hard
 
@@ -4440,7 +4475,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.0"
     postcss: "npm:8.4.40"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:9.6.0"
+    postcss-preset-env: "npm:10.0.0"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.3"
     sass: "npm:1.77.8"
@@ -5347,14 +5382,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-attribute-case-insensitive@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-attribute-case-insensitive@npm:6.0.3"
+"postcss-attribute-case-insensitive@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-attribute-case-insensitive@npm:7.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6161a625356db17ea23daa50797e23fa830a15629fa45e7438b5ac72a389f81ba51088503c5893a941d34d287857882867199584c5f03bf7762258c74570f456
+  checksum: 10c0/ce2a96bc29f59a6113953f1f72bfa2d4d34e54b194ff4d49aad0d548aa738835afaf479f22060a2605952b842f63aeae278b44e41f8f3a05731df28d08e2df97
   languageName: node
   linkType: hard
 
@@ -5381,42 +5416,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^6.0.14":
-  version: 6.0.14
-  resolution: "postcss-color-functional-notation@npm:6.0.14"
+"postcss-color-functional-notation@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-color-functional-notation@npm:7.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/fdc5188e19c3923da32fe08d50e55d0b3ca1cedf99f46331baa0a4bbd73a1fc6b4447b0346ab16049032b56ab84b98b4758a0ede7c237637e35a4cc60caac141
+  checksum: 10c0/6afe7b681a16783a27fa9600db348f995dfdbc9c945f6cdcec94ee2419e09cfd1c6e533264b830207f130e19ae18ff689ad9b48bced338f27f898eaecd61f844
   languageName: node
   linkType: hard
 
-"postcss-color-hex-alpha@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "postcss-color-hex-alpha@npm:9.0.4"
+"postcss-color-hex-alpha@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-color-hex-alpha@npm:10.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/57b5cfe17e0b659d5444f267c485462b8b25f6ab087b810c7dd44662af4828e1e8f9c4a9169b8635a4755509ca7c0f3463c2e96444764c4e6ff9f4036aad05e5
+  checksum: 10c0/8a6dcb27403d04b55d6de88bf3074622bcea537fc4436bbcb346e92289c4d17059444e2e6c3554c325e7a777bb4cdc711e764a83123b4000aec211052e957d5b
   languageName: node
   linkType: hard
 
-"postcss-color-rebeccapurple@npm:^9.0.3":
-  version: 9.0.3
-  resolution: "postcss-color-rebeccapurple@npm:9.0.3"
+"postcss-color-rebeccapurple@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-color-rebeccapurple@npm:10.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ab36d29df23dd475a2a540101427640ef9c7936bbf941816e8582caea05feced26c65f795a849e2ad17469cee6682d1bbccd2f8ab0da07fe91efcc0649568038
+  checksum: 10c0/308e33f76f2b48c1c2121d4502fc053e869f3415898de7d30314353df680e79b37497e7b628e3447edc1049091da3672f7d891e45604f238598e846e06b893ed
   languageName: node
   linkType: hard
 
@@ -5446,57 +5481,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^10.0.8":
-  version: 10.0.8
-  resolution: "postcss-custom-media@npm:10.0.8"
+"postcss-custom-media@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "postcss-custom-media@npm:11.0.0"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.13"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/media-query-list-parser": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/673ca0058a2f2357a83b33ce00bbeee7cda92621c08472fa55d7ac7ae56f5f8f979132528d537f2dedf715d35a8f9b14b2f0ab6b45423d49e2554c19aab3c827
+  checksum: 10c0/99e58454453581a1a4f5b7eae5cf6504c445e45d48035f09857603437fe80de06a216d0dad6036d32d14108b490e82a0845e1b4e0ec5114f752b325e388f0f1c
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.3.12":
-  version: 13.3.12
-  resolution: "postcss-custom-properties@npm:13.3.12"
+"postcss-custom-properties@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "postcss-custom-properties@npm:14.0.0"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6af9f6ac94a6ac887749cd38d4586349f6aca29269ebfdb837019a3ba0130032f0ff4899b431b5c348f4ac79a7b16fb7300a256514a6a68e32a63489c18a70e7
+  checksum: 10c0/f587e2f3026fa7ceb63dd111674848b97dc452f9e75a6480b4b87611a4705dd97e5ae5247e7d34888aecd95b4e50706170c93f57f14f05fb352135d2decdc00f
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^7.1.12":
-  version: 7.1.12
-  resolution: "postcss-custom-selectors@npm:7.1.12"
+"postcss-custom-selectors@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-custom-selectors@npm:8.0.0"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^1.0.13"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/78a7930e4f97c42b544f00c06272264432d47f9df777684b57673bb971b7ab49d5d6fb9289a5a869125e7e50dcd0cad65cf8846501253084b73a42ffab41b2c5
+  checksum: 10c0/efc9ce0e9c92f298b9196e1cf240ef0e15f88bb3f90f441beecd05756e31628b27a56dcb176f696d3d34c8d4d879c0eb70d1cb62b44c55e01ebd2a653b8a9e94
   languageName: node
   linkType: hard
 
-"postcss-dir-pseudo-class@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "postcss-dir-pseudo-class@npm:8.0.1"
+"postcss-dir-pseudo-class@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "postcss-dir-pseudo-class@npm:9.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8c096e096b09e4041818bd2edf5581b5172375621f5eeca013633166ea100ab98e71bf60fccd92fa20cfa7b55c57598605a1655c6bcbe54a80728a7d4e36859e
+  checksum: 10c0/debae71bf508c0e494ebb1892ce6b3c1c4eeb6b23231180151a93920a12fec771815510cdec54db54605e090ae56af9f07c68ef6a61260d0c837adc719f9e1e4
   languageName: node
   linkType: hard
 
@@ -5536,38 +5571,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^5.0.7":
-  version: 5.0.7
-  resolution: "postcss-double-position-gradients@npm:5.0.7"
+"postcss-double-position-gradients@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-double-position-gradients@npm:6.0.0"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/52d96a34aa3e2e251edeaa2d4c2dd106c687f7910ec18266693656c0edd003384b927c855cecac07f52b5c7bdccd140abdc7e27082ce4c3755e3a966206a2cb9
+  checksum: 10c0/7a0e119df1b4af59d169b1a9dfc563275ce29b4ae5e6a6c90be29a7a59272ebc55bf3b2ed05a962f73b03194f7a88f6fe738e65c1659d43351fbdc705cc951ad
   languageName: node
   linkType: hard
 
-"postcss-focus-visible@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "postcss-focus-visible@npm:9.0.1"
+"postcss-focus-visible@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-focus-visible@npm:10.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b8eb14ef51df62969559a7b2b4a4b6313a802fc2de225de293ad484ed6528833fc6bb7574aad5fabe7eeb27e8cd62663c2d547b25ff058d31c06d3d066abd904
+  checksum: 10c0/b86b825bac597092b300127c2686c0669ce0766165716ecda42f298f21ca69dda721e44917732cbcb2611a4ab650f1231bf8c5d4d07c9daefef815329251ae8a
   languageName: node
   linkType: hard
 
-"postcss-focus-within@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "postcss-focus-within@npm:8.0.1"
+"postcss-focus-within@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "postcss-focus-within@npm:9.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/cb0380d89f3b9313345dbea65c78c7ad16a6e6ab2ba9e90451d5b14f05ee691a0cdf458376368061327182e031644da21eee7e6e9ae508d195f083e0a20c0502
+  checksum: 10c0/1d6f1b4f4d12e23a2824f394652d520942f00fd582d3016c933a492fe0ba38aaf26bc1855576878aaeaeda1d6fc38da39bb51e8e6470c50ef03f3ea9a286b3d1
   languageName: node
   linkType: hard
 
@@ -5580,39 +5615,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-gap-properties@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-gap-properties@npm:5.0.1"
+"postcss-gap-properties@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-gap-properties@npm:6.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3b28c38819add37a2fc7decd7e3bdda1cab1de861af228abfb3e4310d87786eff4572a693bec6cea1c435bcd3dd0bb58bc9a58f1dde3a1c7def9feaf800762b8
+  checksum: 10c0/4e07e0d3927d0e65d67eaf047ac39e08d39cb1bf74e16e10c7df7f0d01b184a77ea59f63fd5691b5ed6df159970b972db28cb784d883e26e981137696460897d
   languageName: node
   linkType: hard
 
-"postcss-image-set-function@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "postcss-image-set-function@npm:6.0.3"
+"postcss-image-set-function@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-image-set-function@npm:7.0.0"
   dependencies:
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b35ce25aeca95f7abc5e5820f2398588150f5be02209054d714e870ae2fa01a8482fd10600fe1f847add898c39690275a60a5999f83f6bed6c66be9b0444b704
+  checksum: 10c0/913fd9492f00122aa0c2550fb0d72130428cbe1e6465bc65e8fe71e9deb10ac0c01d7caceb68b560da759139e8cbc6c90ed22dfe6cf34949af49bb86bcbf4d3a
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^6.0.19":
-  version: 6.0.19
-  resolution: "postcss-lab-function@npm:6.0.19"
+"postcss-lab-function@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-lab-function@npm:7.0.0"
   dependencies:
-    "@csstools/css-color-parser": "npm:^2.0.4"
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/utilities": "npm:^1.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d9a91fb57dcbe967260df86e22ca335a5444f1f34d128fa7b5dbf2522772f2138ad708f1f20f0a59035d66ed736e82972ca7f1b669a157534a17ee8898af1921
+  checksum: 10c0/f3647bcdd8d6140631b97276ecf51f40df2c7564610262a20c608c37c8ab79bf6e02888419dc657afc4720a7378e3ad19f4fdf811a69363424160d548ac68daf
   languageName: node
   linkType: hard
 
@@ -5636,14 +5671,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-logical@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-logical@npm:7.0.1"
+"postcss-logical@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-logical@npm:8.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/66a06b5d3cb31181dd76c80286addd219205066a4a8c216076869fc54769ee0011cdaa8063e1b2c19c114cdc5ad12a2e2e8b730f6971960dc77d55f25f290223
+  checksum: 10c0/2caa04e45227ab9dec728416ccde47514e1c347ee72aac58e13ecee3bc7fbc8b53e3fe4f1e2e4396432feb1d54e70a1f06ec5a74d60e84bafff05ab82f196475
   languageName: node
   linkType: hard
 
@@ -5765,16 +5800,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^12.1.5":
-  version: 12.1.5
-  resolution: "postcss-nesting@npm:12.1.5"
+"postcss-nesting@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "postcss-nesting@npm:13.0.0"
   dependencies:
-    "@csstools/selector-resolve-nested": "npm:^1.1.0"
-    "@csstools/selector-specificity": "npm:^3.1.1"
+    "@csstools/selector-resolve-nested": "npm:^2.0.0"
+    "@csstools/selector-specificity": "npm:^4.0.0"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8f049fe24dccb186707e065ffb697f9f0633a03b0e1139e9c24656f3d2158a738a51c7b1f405b48fdb8b4f19515ad4ad9d3cd4ec9d9fe1dd4e5f18729bf8e589
+  checksum: 10c0/b82a3c7010f7c6097bd3f3fe6c03f3f3af9a63a58e255f120dadd506a0ea9444aeeaba994f2a3fa34fb26e666dc72032edf5786c5fbdade790b02ad07d91ef95
   languageName: node
   linkType: hard
 
@@ -5897,14 +5932,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-overflow-shorthand@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "postcss-overflow-shorthand@npm:5.0.1"
+"postcss-overflow-shorthand@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-overflow-shorthand@npm:6.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/328407adffae084c096b3ea2c03037f0083a0000cae744872bb1168fdd317eef12bb049cdfef749343c3ed65b4275dc6eefe577d99cbc78e3617cb36d07e8717
+  checksum: 10c0/6598321b2ed0b68461135395bba9c7f76a4672617770df1e8487f459bc975f4ded6c3d37b6f72a44f4f77f7b6789e0c6f927e66dbbf1bcde1537167dbea39968
   languageName: node
   linkType: hard
 
@@ -5917,96 +5952,96 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-place@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "postcss-place@npm:9.0.1"
+"postcss-place@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-place@npm:10.0.0"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d0fb5b0416fd15d5ac7da5fcc1829b9b78c5a90caba5bd045052c6ac0467910cbbeb2fff6c5257190affa656be27168c94ff339f86c0b7df54f9bea04bcadba7
-  languageName: node
-  linkType: hard
-
-"postcss-preset-env@npm:9.6.0":
-  version: 9.6.0
-  resolution: "postcss-preset-env@npm:9.6.0"
-  dependencies:
-    "@csstools/postcss-cascade-layers": "npm:^4.0.6"
-    "@csstools/postcss-color-function": "npm:^3.0.19"
-    "@csstools/postcss-color-mix-function": "npm:^2.0.19"
-    "@csstools/postcss-content-alt-text": "npm:^1.0.0"
-    "@csstools/postcss-exponential-functions": "npm:^1.0.9"
-    "@csstools/postcss-font-format-keywords": "npm:^3.0.2"
-    "@csstools/postcss-gamut-mapping": "npm:^1.0.11"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^4.0.20"
-    "@csstools/postcss-hwb-function": "npm:^3.0.18"
-    "@csstools/postcss-ic-unit": "npm:^3.0.7"
-    "@csstools/postcss-initial": "npm:^1.0.1"
-    "@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
-    "@csstools/postcss-light-dark-function": "npm:^1.0.8"
-    "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
-    "@csstools/postcss-logical-overflow": "npm:^1.0.1"
-    "@csstools/postcss-logical-overscroll-behavior": "npm:^1.0.1"
-    "@csstools/postcss-logical-resize": "npm:^2.0.1"
-    "@csstools/postcss-logical-viewport-units": "npm:^2.0.11"
-    "@csstools/postcss-media-minmax": "npm:^1.1.8"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^2.0.11"
-    "@csstools/postcss-nested-calc": "npm:^3.0.2"
-    "@csstools/postcss-normalize-display-values": "npm:^3.0.2"
-    "@csstools/postcss-oklab-function": "npm:^3.0.19"
-    "@csstools/postcss-progressive-custom-properties": "npm:^3.3.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^2.0.19"
-    "@csstools/postcss-scope-pseudo-class": "npm:^3.0.1"
-    "@csstools/postcss-stepped-value-functions": "npm:^3.0.10"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^3.0.7"
-    "@csstools/postcss-trigonometric-functions": "npm:^3.0.10"
-    "@csstools/postcss-unset-value": "npm:^3.0.1"
+  checksum: 10c0/ebb13deaac7648ba6042622375a31f78fbcc5209b7d196e478debbdf94525963fe621c932f4737a5b6b3d487af3b5ed6d059ed6193fdcbff6d3d5b150886ccc1
+  languageName: node
+  linkType: hard
+
+"postcss-preset-env@npm:10.0.0":
+  version: 10.0.0
+  resolution: "postcss-preset-env@npm:10.0.0"
+  dependencies:
+    "@csstools/postcss-cascade-layers": "npm:^5.0.0"
+    "@csstools/postcss-color-function": "npm:^4.0.0"
+    "@csstools/postcss-color-mix-function": "npm:^3.0.0"
+    "@csstools/postcss-content-alt-text": "npm:^2.0.0"
+    "@csstools/postcss-exponential-functions": "npm:^2.0.0"
+    "@csstools/postcss-font-format-keywords": "npm:^4.0.0"
+    "@csstools/postcss-gamut-mapping": "npm:^2.0.0"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.0"
+    "@csstools/postcss-hwb-function": "npm:^4.0.0"
+    "@csstools/postcss-ic-unit": "npm:^4.0.0"
+    "@csstools/postcss-initial": "npm:^2.0.0"
+    "@csstools/postcss-is-pseudo-class": "npm:^5.0.0"
+    "@csstools/postcss-light-dark-function": "npm:^2.0.0"
+    "@csstools/postcss-logical-float-and-clear": "npm:^3.0.0"
+    "@csstools/postcss-logical-overflow": "npm:^2.0.0"
+    "@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0"
+    "@csstools/postcss-logical-resize": "npm:^3.0.0"
+    "@csstools/postcss-logical-viewport-units": "npm:^3.0.0"
+    "@csstools/postcss-media-minmax": "npm:^2.0.0"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.0"
+    "@csstools/postcss-nested-calc": "npm:^4.0.0"
+    "@csstools/postcss-normalize-display-values": "npm:^4.0.0"
+    "@csstools/postcss-oklab-function": "npm:^4.0.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
+    "@csstools/postcss-relative-color-syntax": "npm:^3.0.0"
+    "@csstools/postcss-scope-pseudo-class": "npm:^4.0.0"
+    "@csstools/postcss-stepped-value-functions": "npm:^4.0.0"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.0"
+    "@csstools/postcss-trigonometric-functions": "npm:^4.0.0"
+    "@csstools/postcss-unset-value": "npm:^4.0.0"
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.23.1"
-    css-blank-pseudo: "npm:^6.0.2"
-    css-has-pseudo: "npm:^6.0.5"
-    css-prefers-color-scheme: "npm:^9.0.1"
+    css-blank-pseudo: "npm:^7.0.0"
+    css-has-pseudo: "npm:^7.0.0"
+    css-prefers-color-scheme: "npm:^10.0.0"
     cssdb: "npm:^8.1.0"
-    postcss-attribute-case-insensitive: "npm:^6.0.3"
+    postcss-attribute-case-insensitive: "npm:^7.0.0"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^6.0.14"
-    postcss-color-hex-alpha: "npm:^9.0.4"
-    postcss-color-rebeccapurple: "npm:^9.0.3"
-    postcss-custom-media: "npm:^10.0.8"
-    postcss-custom-properties: "npm:^13.3.12"
-    postcss-custom-selectors: "npm:^7.1.12"
-    postcss-dir-pseudo-class: "npm:^8.0.1"
-    postcss-double-position-gradients: "npm:^5.0.7"
-    postcss-focus-visible: "npm:^9.0.1"
-    postcss-focus-within: "npm:^8.0.1"
+    postcss-color-functional-notation: "npm:^7.0.0"
+    postcss-color-hex-alpha: "npm:^10.0.0"
+    postcss-color-rebeccapurple: "npm:^10.0.0"
+    postcss-custom-media: "npm:^11.0.0"
+    postcss-custom-properties: "npm:^14.0.0"
+    postcss-custom-selectors: "npm:^8.0.0"
+    postcss-dir-pseudo-class: "npm:^9.0.0"
+    postcss-double-position-gradients: "npm:^6.0.0"
+    postcss-focus-visible: "npm:^10.0.0"
+    postcss-focus-within: "npm:^9.0.0"
     postcss-font-variant: "npm:^5.0.0"
-    postcss-gap-properties: "npm:^5.0.1"
-    postcss-image-set-function: "npm:^6.0.3"
-    postcss-lab-function: "npm:^6.0.19"
-    postcss-logical: "npm:^7.0.1"
-    postcss-nesting: "npm:^12.1.5"
+    postcss-gap-properties: "npm:^6.0.0"
+    postcss-image-set-function: "npm:^7.0.0"
+    postcss-lab-function: "npm:^7.0.0"
+    postcss-logical: "npm:^8.0.0"
+    postcss-nesting: "npm:^13.0.0"
     postcss-opacity-percentage: "npm:^2.0.0"
-    postcss-overflow-shorthand: "npm:^5.0.1"
+    postcss-overflow-shorthand: "npm:^6.0.0"
     postcss-page-break: "npm:^3.0.4"
-    postcss-place: "npm:^9.0.1"
-    postcss-pseudo-class-any-link: "npm:^9.0.2"
+    postcss-place: "npm:^10.0.0"
+    postcss-pseudo-class-any-link: "npm:^10.0.0"
     postcss-replace-overflow-wrap: "npm:^4.0.0"
-    postcss-selector-not: "npm:^7.0.2"
+    postcss-selector-not: "npm:^8.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/caa91ba4d3b897d43ab2669b3edf40b24ef32c88e23b113be8956412e64b28deed6ba229c331848fcbc0d143bfde155173fb1e1ada9ccae5037b2ee8f7e554b7
+  checksum: 10c0/0b61c44233ee7fd17e32912ce028edc19998f30183f1ff2186523c4f9eac4a2a36513af31670e13ceb05f2146c4549a0b870ba0de0e3a08e77a9d57d8de72654
   languageName: node
   linkType: hard
 
-"postcss-pseudo-class-any-link@npm:^9.0.2":
-  version: 9.0.2
-  resolution: "postcss-pseudo-class-any-link@npm:9.0.2"
+"postcss-pseudo-class-any-link@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "postcss-pseudo-class-any-link@npm:10.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/cc2cb455a793b1f5dc0ac290e02296eafb317d9ce987dc9f2102027e22f265299666dbd1e78f1d7836fce549dead73f41e24251c08a2dd0cf482f3cc43cf7909
+  checksum: 10c0/8357716e0ba0f01c70dba65a1efd268f610249ac2fbd41833e5e87dc19ffa7911c8d5e234d0d7c77d94ba6cdfa04fe7f0f98461c34f64cdbb59abd9737ab7d32
   languageName: node
   linkType: hard
 
@@ -6067,18 +6102,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-not@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-selector-not@npm:7.0.2"
+"postcss-selector-not@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-selector-not@npm:8.0.0"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/624b6e516d37d43406ff1414b3413fe7a5dc34eccadd6a6082fe7df13c5c2fab3e244af33ff0916f9be0a4f7db91d1c22102f5166d7a6e6595e7c00e11e20281
+  checksum: 10c0/677f2cd9d0cd481d276663b57001b2ba96db94ad5bba397f277e53d560ccb074b27c21792deff44720a9f2d96da85fa34f438bb1d33198305b5866b35f1a4708
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1":
+"postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1":
   version: 6.1.1
   resolution: "postcss-selector-parser@npm:6.1.1"
   dependencies:

From 783db988812a20dcf0b00af321ee86323d0117e2 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Wed, 7 Aug 2024 21:26:33 +0100
Subject: [PATCH 281/449] Add version comment for renovate (#9586)

---
 .github/workflows/publish-release-artifact.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-release-artifact.yml b/.github/workflows/publish-release-artifact.yml
index ae5e6bf92602..8b7242136ce9 100644
--- a/.github/workflows/publish-release-artifact.yml
+++ b/.github/workflows/publish-release-artifact.yml
@@ -73,7 +73,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@c062e08bd532815e2082a85e87e3ef29c3e6d191
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -108,7 +108,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-deb
         if: always()
-        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -144,7 +144,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-rpm
         if: always()
-        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -180,7 +180,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-msi
         if: always()
-        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -216,7 +216,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-suse-rpm
         if: always()
-        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
+        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

From 8c6a5d787eaf8ab3a992ad19c0e123112ece4d04 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Wed, 7 Aug 2024 21:35:34 +0100
Subject: [PATCH 282/449] Disable renovate updating
 org.apache.commons:commons-compress (#9587)

---
 .github/renovate.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/renovate.json b/.github/renovate.json
index e0db831c8b93..335bdae40ada 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -80,6 +80,16 @@
         "org.fusesource.jansi:jansi"
       ]
     },
+    {
+      "description": "Depends on commons-lang3 which is in progress for removal from core. See: https://issues.jenkins.io/browse/JENKINS-73355",
+      "matchManagers": [
+        "maven"
+      ],
+      "enabled": false,
+      "matchPackageNames": [
+        "org.apache.commons:commons-compress"
+      ]
+    },
     {
       "description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
       "matchManagers": [

From 8c951ce3f2349db86024bb684dd410605bf654fa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:27:37 -0700
Subject: [PATCH 283/449] Update mina-sshd.version to v2.13.2 (#9580)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 cli/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 90747e280df4..6309811a2e8b 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -15,7 +15,7 @@
   <url>https://github.com/jenkinsci/jenkins</url>
 
   <properties>
-    <mina-sshd.version>2.12.1</mina-sshd.version>
+    <mina-sshd.version>2.13.2</mina-sshd.version>
     <!-- Filled in by jacoco-maven-plugin -->
     <jacocoSurefireArgs />
   </properties>

From d517a5ee5f695a8a4f75e12aac0f0747ac895cdf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:28:06 -0700
Subject: [PATCH 284/449] Update dependency args4j:args4j to v2.37 (#9577)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index eef848b0ca9c..67ef9972cdb0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -72,7 +72,7 @@ THE SOFTWARE.
         <!-- JENKINS-21160: Remoting also depends on args4j; please update accordingly -->
         <groupId>args4j</groupId>
         <artifactId>args4j</artifactId>
-        <version>2.33</version>
+        <version>2.37</version>
       </dependency>
       <dependency>
         <groupId>com.github.spotbugs</groupId>

From c626519b89bcee0840a6d658b06cd79808d41294 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 20:28:26 -0700
Subject: [PATCH 285/449] Update slf4j monorepo to v2.0.14 (#9576)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 67ef9972cdb0..b74aeead436f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
-    <slf4jVersion>2.0.13</slf4jVersion>
+    <slf4jVersion>2.0.14</slf4jVersion>
     <stapler.version>1892.v73465f3d074d</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>

From 48f7a0c780fc38579bbfc8432dc6a2951883d80b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 8 Aug 2024 11:07:26 -0700
Subject: [PATCH 286/449] Update slf4j monorepo to v2.0.15 (#9589)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index b74aeead436f..b0f3457cbf0a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
-    <slf4jVersion>2.0.14</slf4jVersion>
+    <slf4jVersion>2.0.15</slf4jVersion>
     <stapler.version>1892.v73465f3d074d</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>

From e763a498c2d89d9b7953da2392a17fea5a26d4d5 Mon Sep 17 00:00:00 2001
From: Thorsten Scherler <scherler@gmail.com>
Date: Fri, 9 Aug 2024 19:26:00 +0200
Subject: [PATCH 287/449] [JENKINS-73586] Fix New Item page layout if no icon
 is defined for an item type (#9520)

* [new_item_page_fix] show problem

Signed-off-by: Thorsten Scherler <scherler@gmail.com>

* [new_item_page_fix] fix problem

Signed-off-by: Thorsten Scherler <scherler@gmail.com>

* [new_item_page_fix] revert freestyle hack

Signed-off-by: Thorsten Scherler <scherler@gmail.com>

---------

Signed-off-by: Thorsten Scherler <scherler@gmail.com>
---
 war/src/main/js/add-item.js              |  6 ++++--
 war/src/main/js/widgets/add/addform.scss | 11 ++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/war/src/main/js/add-item.js b/war/src/main/js/add-item.js
index 13ab6fb47b75..e648ecf8f3ff 100644
--- a/war/src/main/js/add-item.js
+++ b/war/src/main/js/add-item.js
@@ -145,8 +145,10 @@ $.when(getItems()).done(function (data) {
 
       var iconDiv = drawIcon(elem);
       item.appendChild(iconDiv);
+      var labelContainer = document.createElement("div");
+      item.appendChild(labelContainer);
 
-      var label = item.appendChild(document.createElement("label"));
+      var label = labelContainer.appendChild(document.createElement("label"));
 
       var radio = label.appendChild(document.createElement("input"));
       radio.type = "radio";
@@ -158,7 +160,7 @@ $.when(getItems()).done(function (data) {
 
       displayName.appendChild(document.createTextNode(elem.displayName));
 
-      var desc = item.appendChild(document.createElement("div"));
+      var desc = labelContainer.appendChild(document.createElement("div"));
       desc.className = "desc";
       desc.innerHTML = checkForLink(elem.description);
 
diff --git a/war/src/main/js/widgets/add/addform.scss b/war/src/main/js/widgets/add/addform.scss
index ecd284250b1a..2610a3cec02f 100644
--- a/war/src/main/js/widgets/add/addform.scss
+++ b/war/src/main/js/widgets/add/addform.scss
@@ -59,16 +59,13 @@
   }
 
   .default-icon {
-    position: absolute;
-    left: 10px;
-    top: 10px;
-    height: 48px;
-    width: 48px;
+    height: 40px;
+    width: 40px;
     border-radius: 50%;
     text-align: center;
-    line-height: 48px;
+    line-height: 36px;
     font-weight: bold;
-    font-size: 175%;
+    font-size: 125%;
     color: #ffffff;
     text-shadow: rgba(0, 0, 0, 0.25) 0 -1px 1px;
     opacity: 0.75;

From 5acf5350c60ab068dfe09cfc71e7954f30b2292e Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 9 Aug 2024 15:56:00 -0600
Subject: [PATCH 288/449] [JENKINS-73495] Clarify the plugin incompatibility
 message (#9502)

The issue submitter suggested that the plugin incompatibility message
would be clearer if it specifically referred to the installed version
of the plugin.  That seems like an easy change to make and if it helps
a few users, that is great.
---
 core/src/main/resources/hudson/Messages.properties              | 2 +-
 core/src/main/resources/hudson/PluginManager/updates.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/resources/hudson/Messages.properties b/core/src/main/resources/hudson/Messages.properties
index a0b5fd3edb0f..b7f96a97bb2c 100644
--- a/core/src/main/resources/hudson/Messages.properties
+++ b/core/src/main/resources/hudson/Messages.properties
@@ -67,7 +67,7 @@ PluginManager.UnexpectedException=Unexpected exception going through the retryin
 
 
 PluginManager.compatWarning=\
- Warning: The new version of this plugin is marked as incompatible with the installed version. \
+ Warning: The new version of this plugin is marked as incompatible with the installed version of the plugin. \
  This is usually the case because its behavior or APIs changed, or because it uses a different settings format than the installed version. \
  Other plugins with a dependency on this plugin may be incompatible with this update and no longer work as expected, jobs using this plugin may need to be reconfigured, and/or you may not be able to cleanly revert to the prior version without manually restoring old settings. \
  Consult the plugin release notes for details.
diff --git a/core/src/main/resources/hudson/PluginManager/updates.properties b/core/src/main/resources/hudson/PluginManager/updates.properties
index 089679ac7573..521f5a01585f 100644
--- a/core/src/main/resources/hudson/PluginManager/updates.properties
+++ b/core/src/main/resources/hudson/PluginManager/updates.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 compatWarning=\
- Warning: The new version of this plugin is marked as incompatible with the installed version. \
+ Warning: The new version of this plugin is marked as incompatible with the installed version of the plugin. \
  This is usually the case because its behavior changed, or because it uses a different settings format than the installed version. \
  Jobs using this plugin may need to be reconfigured, and/or you may not be able to cleanly revert to the prior version without manually restoring old settings. \
  Consult the plugin release notes for details.

From 44d9158d06d4fe53035ad4aa9ba073348188651a Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Fri, 9 Aug 2024 23:56:30 +0200
Subject: [PATCH 289/449] [JENKINS-73554] fix jelly exception (#9519)

ensure that we don't get an IndexOutOfBoundsException when the
controller has no executors on cloud pages
---
 core/src/main/resources/lib/hudson/executors.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index f7ed2b22b70a..6b1775ce34a3 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -143,7 +143,7 @@ THE SOFTWARE.
                                       and !builtInHasExecutors)}"/>
   <!-- Remove the built-in from the list when it is included but has no executors to show -->
   <j:choose>
-    <j:when test="${!builtInHasExecutors and computers.get(0).node == app and computers.size() gt 1}">
+    <j:when test="${!builtInHasExecutors and computers.size() gt 1 and computers.get(0).node == app}">
       <j:set var="computers" value="${computers.subList(1, computers.size())}"/>
     </j:when>
   </j:choose>

From 8a036aefe4e232fa8937a97ffb7cf99d542edbd6 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 9 Aug 2024 16:30:57 -0700
Subject: [PATCH 290/449] Rerun failing tests once during releases (#9588)

---
 test/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/pom.xml b/test/pom.xml
index 9ff5c08f7d3e..9e673178f104 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -485,5 +485,11 @@ THE SOFTWARE.
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>release</id>
+      <properties>
+        <surefire.rerunFailingTestsCount>1</surefire.rerunFailingTestsCount>
+      </properties>
+    </profile>
   </profiles>
 </project>

From da8ab95bf42b21345a1f86dbabfa2ad86385543f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 10 Aug 2024 11:19:51 -0700
Subject: [PATCH 291/449] Update dependency
 org.jenkins-ci.plugins.workflow:workflow-api to v1332 (#9595)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 9e673178f104..0901041d4d12 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -123,7 +123,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-api</artifactId>
-        <version>1322.v857eeeea_9902</version>
+        <version>1332.vc21122317a_8e</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index a4a190a29440..53b33cc32ad7 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -308,7 +308,7 @@ THE SOFTWARE.
                   <!-- dependency of junit, plugin-util-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>1322.v857eeeea_9902</version>
+                  <version>1332.vc21122317a_8e</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 5cd3147ee1c7f862eff1be09e6ab196b1351c609 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 10 Aug 2024 11:20:27 -0700
Subject: [PATCH 292/449] Update dependency lit to v3.2.0 (#9593)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 core/src/site/site.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/site/site.xml b/core/src/site/site.xml
index 9f5eb7448565..56902cecd2a1 100644
--- a/core/src/site/site.xml
+++ b/core/src/site/site.xml
@@ -6,7 +6,7 @@
         </breadcrumbs>
         <head>
             <![CDATA[
-                <script src="https://cdn.jsdelivr.net/npm/lit@3.1.4/polyfill-support.js"></script>
+                <script src="https://cdn.jsdelivr.net/npm/lit@3.2.0/polyfill-support.js"></script>
                 <script src="https://cdn.jsdelivr.net/npm/@webcomponents/webcomponentsjs@2.8.0/webcomponents-loader.js"></script>
                 <script data="jio" src="https://cdn.jsdelivr.net/npm/@jenkinsci/jenkins-io-components/+esm" type="module"></script>
                 <script data="jio" nomodule="" src="https://cdn.jsdelivr.net/npm/@jenkinsci/jenkins-io-components"></script>

From ec7578abf32655cf39eea1ae3dad265988287d5a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 10 Aug 2024 11:20:38 -0700
Subject: [PATCH 293/449] Update dependency postcss to v8.4.41 (#9592)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 48ab2e839ad7..9e0a75b39f46 100644
--- a/war/package.json
+++ b/war/package.json
@@ -37,7 +37,7 @@
     "globals": "15.9.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
-    "postcss": "8.4.40",
+    "postcss": "8.4.41",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "10.0.0",
     "postcss-scss": "4.0.9",
diff --git a/war/yarn.lock b/war/yarn.lock
index 609ea58f7f1e..5ece4c425d1e 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4473,7 +4473,7 @@ __metadata:
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.0"
-    postcss: "npm:8.4.40"
+    postcss: "npm:8.4.41"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:10.0.0"
     postcss-scss: "npm:4.0.9"
@@ -6153,14 +6153,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.40, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.40":
-  version: 8.4.40
-  resolution: "postcss@npm:8.4.40"
+"postcss@npm:8.4.41, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.40":
+  version: 8.4.41
+  resolution: "postcss@npm:8.4.41"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/65ed67573e5443beaeb582282ff27a6be7c7fe3b4d9fa15761157616f2b97510cb1c335023c26220b005909f007337026d6e3ff092f25010b484ad484e80ea7f
+  checksum: 10c0/c1828fc59e7ec1a3bf52b3a42f615dba53c67960ed82a81df6441b485fe43c20aba7f4e7c55425762fd99c594ecabbaaba8cf5b30fd79dfec5b52a9f63a2d690
   languageName: node
   linkType: hard
 

From aeeb5e70f95819e584e082ff8ca9be297ba4e250 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 10 Aug 2024 11:20:47 -0700
Subject: [PATCH 294/449] Update slf4j monorepo to v2.0.16 (#9596)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index b0f3457cbf0a..80dafa99ec43 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
-    <slf4jVersion>2.0.15</slf4jVersion>
+    <slf4jVersion>2.0.16</slf4jVersion>
     <stapler.version>1892.v73465f3d074d</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>

From b349b6be4237657003e0c91d2b68a1e08aaf3507 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sat, 10 Aug 2024 22:53:59 +0200
Subject: [PATCH 295/449] [JENKINS-73563] create a jenkins-button instead of a
 yui button in makeButton (#9511)

Co-authored-by: Kevin Guerroudj <91883215+Kevin-CB@users.noreply.github.com>
---
 .../main/webapp/scripts/hudson-behavior.js    | 86 ++++++++++++-------
 1 file changed, 54 insertions(+), 32 deletions(-)

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 110a09fa199f..60e6167cf6dd 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -903,57 +903,79 @@ function escapeHTML(html) {
 }
 
 /**
- * Wraps a <button> into YUI button.
+ * Replaces a <input> with a <button class="jenkins-button">
  *
  * @param e
  *      button element
  * @param onclick
  *      onclick handler
  * @return
- *      YUI Button widget.
+ *      wrapper with some functions (formerly a YUI widget).
+ * @deprecated use <button class="jenkins-button"> and attach event listeners with standard javascript
  */
 function makeButton(e, onclick) {
-  var h = e.onclick;
-  var clsName = e.className;
-  var n = e.name;
-
-  var attributes = {};
-  // YUI Button class interprets value attribute of <input> as HTML
-  // similar to how the child nodes of a <button> are treated as HTML.
-  // in standard HTML, we wouldn't expect the former case, yet here we are!
-  if (e.tagName === "INPUT") {
-    attributes.label = escapeHTML(e.value);
-  }
-  var btn = new YAHOO.widget.Button(e, attributes);
+  console.warn(
+    "Deprecated call to makeButton - use <button class='jenkins-button'> instead and standard javascript to attach listeners.",
+  );
+  const h = e.onclick;
+  const n = e.name;
+
+  const button = document.createElement("button");
+  if (e.id) {
+    button.id = e.id;
+  }
   if (onclick != null) {
-    btn.addListener("click", onclick);
+    button.addEventListener("click", onclick);
   }
   if (h != null) {
-    btn.addListener("click", h);
-  }
-  var be = btn.get("element");
-  var classesSeparatedByWhitespace = clsName.split(" ");
-  for (let i = 0; i < classesSeparatedByWhitespace.length; i++) {
-    var singleClass = classesSeparatedByWhitespace[i];
-    if (singleClass) {
-      be.classList.add(singleClass);
-    }
+    button.addEventListener("click", h);
   }
   if (n) {
     // copy the name
-    be.setAttribute("name", n);
+    button.setAttribute("name", n);
   }
-
-  // keep the data-* attributes from the source
-  var length = e.attributes.length;
+  if (e.type === "submit" || e.type === "button") {
+    button.type = e.type;
+  }
+  const length = e.attributes.length;
   for (let i = 0; i < length; i++) {
-    var attribute = e.attributes[i];
-    var attributeName = attribute.name;
+    const attribute = e.attributes[i];
+    const attributeName = attribute.name;
     if (attributeName.startsWith("data-")) {
-      btn._button.setAttribute(attributeName, attribute.value);
+      button.setAttribute(attributeName, attribute.value);
     }
   }
-  return btn;
+  button.innerText = e.value;
+  button.classList.add("jenkins-button");
+  const classNames = e.classList;
+  if (classNames.contains("primary") || classNames.contains("submit-button")) {
+    button.classList.add("jenkins-button--primary");
+  }
+  classNames.remove("primary");
+  classNames.remove("submit-button");
+  classNames.remove("yui-button");
+  classNames.forEach((cn) => {
+    button.classList.add(cn);
+  });
+
+  function Button(button) {
+    this.button = button;
+  }
+  Button.prototype.set = function (attributeName, value) {
+    if (attributeName === "disabled") {
+      if (value) {
+        this.button.disabled = "disabled";
+      } else {
+        this.button.removeAttribute("disabled");
+      }
+    }
+  };
+  Button.prototype.getForm = function () {
+    return this.button.closest("form");
+  };
+  e.parentNode.insertBefore(button, e);
+  e.remove();
+  return new Button(button);
 }
 
 /*

From 824c868dc790fd5a70cc7c1eba08e1fba41b7cee Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Sat, 10 Aug 2024 21:56:00 +0100
Subject: [PATCH 296/449] Modernise project relationship page (#9461)

Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
---
 core/src/main/java/jenkins/model/Jenkins.java |  6 ++
 .../model/Jenkins/projectRelationship.jelly   | 84 +++++++++----------
 .../Jenkins/projectRelationship.properties    | 27 ++++++
 .../Jenkins/projectRelationship_bg.properties |  6 ++
 .../Jenkins/projectRelationship_da.properties |  3 +
 .../Jenkins/projectRelationship_de.properties |  4 +
 .../Jenkins/projectRelationship_es.properties |  2 +-
 .../Jenkins/projectRelationship_et.properties |  1 +
 .../Jenkins/projectRelationship_fr.properties |  5 ++
 .../Jenkins/projectRelationship_it.properties |  5 ++
 .../Jenkins/projectRelationship_ja.properties |  4 +
 .../Jenkins/projectRelationship_lt.properties |  4 +
 .../Jenkins/projectRelationship_nl.properties |  5 ++
 .../projectRelationship_pt_BR.properties      |  3 +
 .../Jenkins/projectRelationship_ru.properties |  4 +
 .../Jenkins/projectRelationship_sr.properties |  1 +
 .../projectRelationship_sv_SE.properties      |  4 +
 .../Jenkins/projectRelationship_tr.properties |  4 +
 .../projectRelationship_zh_TW.properties      |  1 +
 19 files changed, 127 insertions(+), 46 deletions(-)
 create mode 100644 core/src/main/resources/jenkins/model/Jenkins/projectRelationship.properties

diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index a3376f99d75e..a648935527ae 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -183,6 +183,7 @@
 import hudson.triggers.TriggerDescriptor;
 import hudson.util.AdministrativeError;
 import hudson.util.ClockDifference;
+import hudson.util.ComboBoxModel;
 import hudson.util.CopyOnWriteList;
 import hudson.util.CopyOnWriteMap;
 import hudson.util.DaemonThreadFactory;
@@ -1908,6 +1909,11 @@ public Collection<String> getJobNames() {
         return names;
     }
 
+    @Restricted(NoExternalUse.class)
+    public ComboBoxModel doFillJobNameItems() {
+        return new ComboBoxModel(getJobNames());
+    }
+
     @Override
     public List<Action> getViewActions() {
         return getActions();
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
index 04927bbc2757..c058c951439e 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
@@ -26,73 +26,67 @@ THE SOFTWARE.
   Displays two projects side by side and show their relationship
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout title="${%Project Relationship}">
-    <st:include page="sidepanel.jelly" />
-    <l:breadcrumb title="${%Project Relationship}" />
+    <st:include page="sidepanel.jelly"/>
+    <l:breadcrumb title="${%Project Relationship}"/>
 
     <l:main-panel>
       <l:app-bar title="${%Project Relationship}">
-        <t:help href="projectRelationship-help" />
+        <t:help href="projectRelationship-help"/>
       </l:app-bar>
 
+      <p>
+        ${%body}
+      </p>
+
       <form action="projectRelationship" method="get">
-        <table width="100%">
-          <tr>
-            <j:set var="names" value="${app.jobNames}" />
-            <td style="text-align:right;">
-              ${%upstream project}:
-              <f:editableComboBox id="lhs" name="lhs" value="${request.getParameter('lhs')}" items="${names}" />
-            </td>
-            <td style="width:32px; text-align:center;"><l:icon class="icon-next icon-md"/></td>
-            <td>
-              ${%downstream project}:
-              <f:editableComboBox id="rhs" name="rhs" value="${request.getParameter('rhs')}" items="${names}" />
-            </td>
-          </tr>
-          <tr>
-            <td colspan="3" style="text-align:right">
-              <f:submit value="${%Compare}" />
-            </td>
-          </tr>
+        <div class="jenkins-form-item">
+          <label class="jenkins-form-label" for="lhs">${%upstream project}:</label>
+          <f:combobox id="lhs" fillUrl="fillJobNameItems" name="lhs" value="${request.getParameter('lhs')}"/>
+        </div>
+
+        <div class="jenkins-form-item">
+          <label class="jenkins-form-label" for="rhs">${%downstream project}:</label>
+          <f:combobox id="rhs" fillUrl="fillJobNameItems" name="rhs" value="${request.getParameter('rhs')}"/>
+        </div>
+        <f:submit value="${%Compare}"/>
 
-          <j:if test="${!empty(request.getParameter('lhs')) and !empty(request.getParameter('rhs'))}">
-            <j:set var="jl" value="${app.getItemByFullName(request.getParameter('lhs'))}" />
-            <j:set var="jr" value="${app.getItemByFullName(request.getParameter('rhs'))}" />
+        <j:if test="${!empty(request.getParameter('lhs')) and !empty(request.getParameter('rhs'))}">
+          <j:set var="jl" value="${app.getItemByFullName(request.getParameter('lhs'))}"/>
+          <j:set var="jr" value="${app.getItemByFullName(request.getParameter('rhs'))}"/>
 
-            <j:choose>
-              <j:when test="${jl==null}">
-                <tr><td colspan="3" class="error">
-                  No such project '${request.getParameter('lhs')}'
-                </td></tr>
-              </j:when>
-              <j:when test="${jr==null}">
-                <tr><td colspan="3" class="error">
-                  No such project '${request.getParameter('rhs')}'
-                </td></tr>
-              </j:when>
-              <j:otherwise>
+          <j:choose>
+            <j:when test="${jl==null}">
+              <p class="error">No such project '${request.getParameter('lhs')}'</p>
+            </j:when>
+            <j:when test="${jr==null}">
+              <p class="error">No such project '${request.getParameter('rhs')}'</p>
+            </j:when>
+            <j:otherwise>
+              <table width="100%">
                 <j:set var="relation" value="${jl.getRelationship(jr)}"/>
                 <j:if test="${empty(relation)}">
-                  <tr><td colspan="3" class="error">
-                    ${%There are no fingerprint records that connect these two projects.}
-                  </td></tr>
+                  <p class="error">${%There are no fingerprint records that connect these two projects.}</p>
                 </j:if>
                 <j:forEach var="e" items="${relation}">
                   <tr>
                     <td style="text-align:right">
                       <t:buildLink job="${jl}" number="${e.key}"/>
                     </td>
-                    <td><st:nbsp/></td>
+                    <td>
+                      <st:nbsp/>
+                    </td>
                     <td>
                       <t:buildRangeLink job="${jr}" range="${e.value}"/>
                     </td>
                   </tr>
                 </j:forEach>
-              </j:otherwise>
-            </j:choose>
-          </j:if>
-        </table>
+              </table>
+            </j:otherwise>
+          </j:choose>
+        </j:if>
       </form>
     </l:main-panel>
   </l:layout>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.properties
new file mode 100644
index 000000000000..abe7b7fdcb00
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.properties
@@ -0,0 +1,27 @@
+# The MIT License
+#
+# Copyright (c) 2024, Tim Jacomb
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+body=\
+    When you have projects that depend on each other, Jenkins can track which build of \
+    the upstream project is used by which build of the downstream project, by using \
+    the records created by \
+    <a href="https://www.jenkins.io/redirect/fingerprint">the fingerprint support</a>.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_bg.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_bg.properties
index 0f9e044632d5..b4ab15f888b8 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_bg.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_bg.properties
@@ -30,3 +30,9 @@ downstream\ project=\
  Последващ проект
 upstream\ project=\
  Предхождащ проект
+body=\
+ Когато проекти зависят един от друг, Jenkins може да следи коя версия на\
+ предшестващ проект се ползва от следващ проект и обратно като създава база от\
+ данни от\
+ <a href="https://www.jenkins.io/redirect/fingerprint">цифровите\
+ отпечатъци</a>.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_da.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_da.properties
index 11c9e45ff5e9..de46854c5245 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_da.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_da.properties
@@ -25,3 +25,6 @@ Project\ Relationship=Projektforhold
 Compare=Sammenlign
 downstream\ project=downstreamprojekt
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=Ingen opslag i filfingeraftryksdatabasen forbinder disse to projekter.
+body=\
+Har du projekter der er afhængige af hinanden kan Jenkins følge hvilket byg af upstreamprojektet \
+der bruges af hvilket byg af downstream projektet ved at bruge filfingeraftyrk
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_de.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_de.properties
index 06d92117599f..d23611e73c19 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_de.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_de.properties
@@ -26,3 +26,7 @@ downstream\ project=Nachgelagertes Projekt
 Compare=Vergleichen
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=\
   Es existieren keine Fingerabdrücke, welche diese beiden Projekte miteinander verbinden.
+body=\
+  Wenn Sie voneinander abhängige Projekte entwickeln, kann Jenkins für Sie herausfinden, welcher Build \
+  eines vorgelagerten Projektes für welchen Build eines nachgelagerten Projektes verwendet wurde. Dies geschieht über \
+  gespeicherte "Fingerabdrücke", die mit Hilfe der <a href="https://www.jenkins.io/redirect/fingerprint">Fingerabdruck-Funktion</a> erzeugt wurden.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_es.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_es.properties
index e1d6bf40ea34..d9564f86be60 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_es.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_es.properties
@@ -25,4 +25,4 @@ upstream\ project=Proyecto padre
 downstream\ project=Proyecto hijo
 Compare=Comparar
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=No hay marcas que relacionen estos dos proyectos
-
+body=Cuando hay proyectos que dependen unos de otros, Jenkins puede hacer un seguimiento de  qué proyectos padres están siendo utilizado por otros proyectos hijos usando un registro de firmas de los ficheros generados. Echa un vistazo a esta pagina:  <a href="https://www.jenkins.io/redirect/fingerprint">the fingerprint support</a>.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_et.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_et.properties
index b6e5aab3f6c0..0f97ea179c01 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_et.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_et.properties
@@ -4,3 +4,4 @@ Compare=Võrdle
 Project\ Relationship=Projektide seosed
 downstream\ project=allavoolu projekt
 upstream\ project=ülesvoolu projekt
+body=Kui teil on kaks projekti mis sõltuvad üksteisest, siis suudab Jenkins jälgida seda millist ülesvoolu projekti järku kasutatakse mingi allavoolu projekti järgu jaoks, kasutades <a href="https://www.jenkins.io/redirect/fingerprint">sõrmejälje toe</a> poolt loodud kirjeid.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_fr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_fr.properties
index 4bf5265db82e..0e59b408f513 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_fr.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_fr.properties
@@ -24,3 +24,8 @@ Project\ Relationship=Relations entre les projets
 upstream\ project=Projet en amont
 downstream\ project=Projet en aval
 Compare=Comparer
+body=\
+    Lorsque vous avez des projets qui dépendent les uns des autres, Jenkins peut tracer quel build \
+    de projet en amont est utilisé par quel build de projet en aval, en utilisant \
+    les enregistrements créés par \
+    <a href="https://www.jenkins.io/redirect/fingerprint">le support de l''empreinte numérique</a>.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_it.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_it.properties
index 72817d4b846f..059bb1d81d8a 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_it.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_it.properties
@@ -27,3 +27,8 @@ Project\ Relationship=Relazioni progetto
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=\
   Non ci sono record di impronte digitali che colleghino questi due progetti.
 upstream\ project=progetto upstream
+body=Quando si hanno dei progetti dipendenti fra loro, Jenkins può tener \
+  traccia della compilazione del progetto upstream che è stata utilizzata in \
+  una precisa compilazione del progetto downstream utilizzando i record \
+  creati dal <a href="https://www.jenkins.io/redirect/fingerprint">supporto per \
+  le impronte digitali</a>.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ja.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ja.properties
index ff5a73f5237b..ad6ec2424289 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ja.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ja.properties
@@ -26,3 +26,7 @@ downstream\ project=下流プロジェクト
 Compare=比較
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=\
   2つのプロジェクトを関連付けるファイル指紋の記録がありません。
+body=\
+  互いに依存するプロジェクトがある場合、 Jenkinsはどの上流プロジェクトがどの下流プロジェクトに使用されているかを、\
+  <a href="https://www.jenkins.io/redirect/fingerprint">指紋サポート</a>\
+  によって作成された記録を使用することで追跡することができます。
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_lt.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_lt.properties
index 7343b885121f..9393134612fa 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_lt.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_lt.properties
@@ -3,3 +3,7 @@ Project\ Relationship=Projektų ryšys
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=Nėra antspaudų, siejančių šiuos du projektus.
 downstream\ project=vėlesnis projektas
 upstream\ project=ankstesnis projektas
+body=\
+    Kai turite projektus, kurie priklauso vienas nuo kito, naudodamas įrašus, sukurtus \
+    <a href="https://www.jenkins.io/redirect/fingerprint">pirštų antspaudų palaikymo</a> Jenkinsas gali sekti, kuris ankstesnio projekto vykdymas \
+    naudojamas kuriame žemesnio projekto vykdyme.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_nl.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_nl.properties
index 5c6ed916c025..a3c300d6466b 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_nl.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_nl.properties
@@ -24,3 +24,8 @@ Project\ Relationship=Relaties tussen projecten
 upstream\ project=bovenliggende projecten
 downstream\ project=onderliggende projecten
 Compare=Vergelijk
+body=\
+  Wanneer je projecten ontwikkelt die van elkaar afhankelijk zijn, kan Jenkins voor jou uitzoeken welke \
+  bouwpoging van een bovenliggend project gebruikt wordt door een onderliggend project. Dit gebeurt aan \
+  de hand van de geregistreerd <a href="https://www.jenkins.io/redirect/fingerprint">elektronische vingerafdrukken</a> van \
+  de door een bouwpoging opgeleverde artefacten.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties
index e00d7e50887b..c8c0fef9ad00 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_pt_BR.properties
@@ -25,3 +25,6 @@ upstream\ project=Projeto pai
 downstream\ project=Projeto filho
 Compare=Comparar
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=Não existe identificador conectando esses dois projetos.
+body=Quando você tem projetos que dependem um do outro, o Jenkins pode rastrear qual construção é hierarquicamente \
+  superior, usando os registros criados pelo <a href="https://www.jenkins.io/redirect/fingerprint">suporte de \
+  impressão digital</a>.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ru.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ru.properties
index 0f8b1dc929db..b963beddd762 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ru.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ru.properties
@@ -25,3 +25,7 @@ upstream\ project=восходящий проект
 downstream\ project=нисходящий проект
 Compare=Сравнить
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=Нет отпечатков (fingerprints), соединяющих эти два проекта.
+body=\
+ Когда у вас есть проекты, один из которых зависит от другого, Jenkins может отслеживать, \
+ какая сборка восходящего проекта использована в какой сборке нисходящего, используя \
+ сохраненные записи <a href="https://www.jenkins.io/redirect/fingerprint"> отпечатков</a>.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sr.properties
index 1c8482f8276e..2a1cb820955b 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sr.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sr.properties
@@ -5,3 +5,4 @@ downstream\ project=downstream пројекат
 Compare=Упореди
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=
 Project\ Relationship=Однос пројеката
+body=Jenkins може пратити изградњу пројекте који зависе један од другог користећи <a href="https://www.jenkins.io/redirect/fingerprint">дигитални отисак</a>.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sv_SE.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sv_SE.properties
index f04eb1c1b402..72ff5db1ce2b 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sv_SE.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_sv_SE.properties
@@ -5,3 +5,7 @@ Project\ Relationship=Projektrelation
 downstream\ project=nedströmsprojekt
 upstream\ project=uppströmsprojekt
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=Det finns inga registrerade fingeravtryck som kopplar samman dessa två projekt.
+body=\
+    När du har projekt som är beroende av varandra kan Jenkins spåra vilket bygge \
+    av uppströmsprojektet som används av vilket bygge av nedströmsprojektet \
+    genom att använda de poster som skapats av <a href="https://www.jenkins.io/ redirect/fingerprint">fingeravtrycksstödet</a>.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_tr.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_tr.properties
index a16167154de0..8aaa86a2532d 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_tr.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_tr.properties
@@ -24,3 +24,7 @@ Project\ Relationship=Projelerin İlişkisi
 upstream\ project=upstream proje
 downstream\ project=downstream proje
 Compare=Karşılaştır
+body=\
+        Eğer birbirine bağlı projeleriniz varsa, Jenkins <a href="https://www.jenkins.io/redirect/fingerprint">parmakizi desteği</a>\
+    ile oluşturulan kayıtları kullanarak hangi upstream projenin hangi downstream proje tarafından\
+    kullanıldığını takip edebilir.
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_zh_TW.properties b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_zh_TW.properties
index f91119563d0d..889793249988 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_zh_TW.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship_zh_TW.properties
@@ -27,3 +27,4 @@ downstream\ project=下游專案
 Compare=比較
 There\ are\ no\ fingerprint\ records\ that\ connect\ these\ two\ projects.=\
   沒有連結這兩個專案的指紋記錄。
+body=如果您的專案間彼此有關聯，Jenkins 就能追蹤下游專案到底是使用到上游專案的哪一版進行建置。這個功能是利用<a href\="https\://www.jenkins.io/redirect/fingerprint">檔案指紋功能</a>所產生的記錄來達成。

From d176756f1746f1ed69849b497e31c0f033c1a446 Mon Sep 17 00:00:00 2001
From: Desprez Jean-Marc <jmdesprez@cloudbees.com>
Date: Sat, 10 Aug 2024 22:56:11 +0200
Subject: [PATCH 297/449] [JENKINS-73499] Add a warning if there is a risk of
 exposing credentials through a non-TLS proxy connection (#9491)

---
 .../main/java/hudson/ProxyConfiguration.java  | 28 +++++++++++++++++++
 .../main/resources/hudson/Messages.properties |  1 +
 .../resources/hudson/Messages_es.properties   |  1 +
 .../resources/hudson/Messages_fr.properties   |  1 +
 .../resources/hudson/Messages_it.properties   |  1 +
 5 files changed, 32 insertions(+)

diff --git a/core/src/main/java/hudson/ProxyConfiguration.java b/core/src/main/java/hudson/ProxyConfiguration.java
index fa4206521ee6..cc5b30d956dc 100644
--- a/core/src/main/java/hudson/ProxyConfiguration.java
+++ b/core/src/main/java/hudson/ProxyConfiguration.java
@@ -540,6 +540,34 @@ public FormValidation doCheckPort(@QueryParameter String value) {
             return FormValidation.ok();
         }
 
+        /**
+         * Do check if the provided value is empty or composed of whitespaces.
+         * If so, return a validation warning.
+         *
+         * @param value the value to test
+         * @return a validation warning iff the provided value is empty or composed of whitespaces.
+         */
+        private static FormValidation checkProxyCredentials(String value) {
+            value = Util.fixEmptyAndTrim(value);
+            if (value == null) {
+                return FormValidation.ok();
+            } else {
+                return FormValidation.warning(Messages.ProxyConfiguration_NonTLSWarning());
+            }
+        }
+
+        @RequirePOST
+        @Restricted(NoExternalUse.class)
+        public FormValidation doCheckUserName(@QueryParameter String value) {
+            return checkProxyCredentials(value);
+        }
+
+        @RequirePOST
+        @Restricted(NoExternalUse.class)
+        public FormValidation doCheckSecretPassword(@QueryParameter String value) {
+            return checkProxyCredentials(value);
+        }
+
         @RequirePOST
         @Restricted(NoExternalUse.class)
         public FormValidation doValidateProxy(
diff --git a/core/src/main/resources/hudson/Messages.properties b/core/src/main/resources/hudson/Messages.properties
index b7f96a97bb2c..99c77ebbed46 100644
--- a/core/src/main/resources/hudson/Messages.properties
+++ b/core/src/main/resources/hudson/Messages.properties
@@ -110,6 +110,7 @@ ProxyConfiguration.TestUrlRequired=Test URL is required.
 ProxyConfiguration.MalformedTestUrl=Malformed Test URL {0}.
 ProxyConfiguration.FailedToConnectViaProxy=Failed to connect to {0}.
 ProxyConfiguration.FailedToConnect=Failed to connect to {0} (code {1}).
+ProxyConfiguration.NonTLSWarning=Jenkins only supports using an http connection to the proxy. The credentials may be exposed to someone on the same network.
 ProxyConfiguration.Success=Success (code {0})
 
 Functions.NoExceptionDetails=No Exception details
diff --git a/core/src/main/resources/hudson/Messages_es.properties b/core/src/main/resources/hudson/Messages_es.properties
index d1ae229de9bc..298ef23821d8 100644
--- a/core/src/main/resources/hudson/Messages_es.properties
+++ b/core/src/main/resources/hudson/Messages_es.properties
@@ -99,6 +99,7 @@ ProxyConfiguration.TestUrlRequired=Se requiere un URL de prueba.
 ProxyConfiguration.MalformedTestUrl=La URL de prueba está mal formada.
 ProxyConfiguration.FailedToConnectViaProxy=No se puede conectar a {0}.
 ProxyConfiguration.FailedToConnect=No se puede conectar a {0} (código {1}).
+ProxyConfiguration.NonTLSWarning=Jenkins solo soporta conexiones http con el proxy. Las credenciales podrían quedar expuestas a cualquiera que se encuentre en la misma red.
 ProxyConfiguration.Success=Configurado (código {0})
 
 Functions.NoExceptionDetails=No hay detalles de la excepción
diff --git a/core/src/main/resources/hudson/Messages_fr.properties b/core/src/main/resources/hudson/Messages_fr.properties
index db45e76ab397..1e0286deddc5 100644
--- a/core/src/main/resources/hudson/Messages_fr.properties
+++ b/core/src/main/resources/hudson/Messages_fr.properties
@@ -109,6 +109,7 @@ ProxyConfiguration.TestUrlRequired=Une URL de test est requise.
 ProxyConfiguration.MalformedTestUrl=L''URL de test {0} n''est pas correctement formée.
 ProxyConfiguration.FailedToConnectViaProxy=Impossible de se connecter à {0}.
 ProxyConfiguration.FailedToConnect=Impossible de se connecter à {0} (code {1}).
+ProxyConfiguration.NonTLSWarning=Jenkins ne prend en charge que l''utilisation d''une connexion http vers le proxy. Les informations d''identification peuvent être exposées à une personne qui se trouve sur le même réseau.
 ProxyConfiguration.Success=Succès (code {0})
 
 Functions.NoExceptionDetails=Aucun détail concernant l''exception
diff --git a/core/src/main/resources/hudson/Messages_it.properties b/core/src/main/resources/hudson/Messages_it.properties
index b929e6447cf8..2747e2d39366 100644
--- a/core/src/main/resources/hudson/Messages_it.properties
+++ b/core/src/main/resources/hudson/Messages_it.properties
@@ -106,6 +106,7 @@ PluginWrapper.PluginWrapperAdministrativeMonitor.DisplayName=Errore \
 ProxyConfiguration.FailedToConnect=Impossibile connettersi a {0} (codice {1}).
 ProxyConfiguration.FailedToConnectViaProxy=Impossibile connettersi a {0}.
 ProxyConfiguration.MalformedTestUrl=URL di prova {0} malformato.
+ProxyConfiguration.NonTLSWarning=Jenkins supporta solo l''utilizzo di una connessione http al proxy. Le credenziali potrebbero essere esposte a qualcuno sulla stessa rete.
 ProxyConfiguration.Success=Connessione riuscita (codice {0})
 ProxyConfiguration.TestUrlRequired=È richiesto un URL di prova.
 TcpSlaveAgentListener.PingAgentProtocol.displayName=Protocollo ping

From 121c0aefd6c1b5b895f6c3f18708240a2c24077b Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 12 Aug 2024 07:42:01 -0700
Subject: [PATCH 298/449] [JENKINS-73130] Upgrade core from Jetty 10.x to 12.x
 (EE 8) (#9590)

Co-authored-by: Olivier Lamy <olamy@apache.org>
---
 .github/renovate.json                         |  11 +-
 .idea/encodings.xml                           |   3 +
 bom/pom.xml                                   |   2 +-
 pom.xml                                       |   3 +-
 test/pom.xml                                  |   2 +-
 test/src/test/java/hudson/PluginTest.java     |   2 +-
 .../model/DirectoryBrowserSupportTest.java    |  23 ++-
 .../java/hudson/model/UpdateSiteTest.java     |  23 ++-
 .../java/jenkins/install/SetupWizardTest.java |  29 +--
 .../jenkins/security/Security3030Test.java    |   8 +
 .../jenkins/util/SystemPropertiesTest.java    |   6 +-
 war/pom.xml                                   |  18 +-
 websocket/jetty10/pom.xml                     |   2 +-
 websocket/jetty12-ee8/pom.xml                 |  85 +++++++++
 .../jenkins/websocket/Jetty12EE8Provider.java | 178 ++++++++++++++++++
 15 files changed, 345 insertions(+), 50 deletions(-)
 create mode 100644 websocket/jetty12-ee8/pom.xml
 create mode 100644 websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java

diff --git a/.github/renovate.json b/.github/renovate.json
index 335bdae40ada..aab994ad8187 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -47,16 +47,7 @@
       ],
       "enabled": false,
       "matchPackageNames": [
-        "jakarta.servlet:jakarta.servlet-api"
-      ]
-    },
-    {
-      "description": "Contains incompatible API changes and needs compatibility work",
-      "matchManagers": [
-        "maven"
-      ],
-      "enabled": false,
-      "matchPackageNames": [
+        "jakarta.servlet:jakarta.servlet-api",
         "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
       ]
     },
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index de5572116383..ca018ebc3ab9 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -32,6 +32,9 @@
     <file url="file://$PROJECT_DIR$/websocket/jetty10/src/filter/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/websocket/jetty10/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/websocket/jetty10/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee8/src/filter/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee8/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee8/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/websocket/spi/src/filter/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/websocket/spi/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/websocket/spi/src/main/resources" charset="UTF-8" />
diff --git a/bom/pom.xml b/bom/pom.xml
index 80dafa99ec43..cf265f1dada9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <slf4jVersion>2.0.16</slf4jVersion>
-    <stapler.version>1892.v73465f3d074d</stapler.version>
+    <stapler.version>1894.v82b_2fb_35519d</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
diff --git a/pom.xml b/pom.xml
index 152051851abc..6783b6e2d09e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@ THE SOFTWARE.
     <module>bom</module>
     <module>websocket/spi</module>
     <module>websocket/jetty10</module>
+    <module>websocket/jetty12-ee8</module>
     <module>core</module>
     <module>war</module>
     <module>test</module>
@@ -97,7 +98,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
-    <winstone.version>6.21</winstone.version>
+    <winstone.version>7.0</winstone.version>
   </properties>
 
   <!--
diff --git a/test/pom.xml b/test/pom.xml
index 0901041d4d12..8df2dc62919b 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -149,7 +149,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2225.2230.v6210cb_b_827f9</version>
+      <version>2250.v03a_1295b_0a_30</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/test/src/test/java/hudson/PluginTest.java b/test/src/test/java/hudson/PluginTest.java
index 0e4192ae4bf8..79cf3703a39a 100644
--- a/test/src/test/java/hudson/PluginTest.java
+++ b/test/src/test/java/hudson/PluginTest.java
@@ -54,7 +54,7 @@ public class PluginTest {
         r.createWebClient().assertFails("plugin/matrix-auth/images/%2e%2e%2fWEB-INF/licenses.xml", HttpServletResponse.SC_BAD_REQUEST);
         r.createWebClient().assertFails("plugin/matrix-auth/images/%2e.%2fWEB-INF/licenses.xml", HttpServletResponse.SC_BAD_REQUEST);
         r.createWebClient().assertFails("plugin/matrix-auth/images/..%2f..%2f..%2f" + r.jenkins.getRootDir().getName() + "%2fsecrets%2fmaster.key", HttpServletResponse.SC_BAD_REQUEST);
-        r.createWebClient().assertFails("plugin/matrix-auth/" + r.jenkins.getRootDir() + "/secrets/master.key", /* ./ prepended anyway */ HttpServletResponse.SC_NOT_FOUND);
+        r.createWebClient().assertFails("plugin/matrix-auth/" + r.jenkins.getRootDir() + "/secrets/master.key", /* ./ prepended anyway */ Functions.isWindows() ? HttpServletResponse.SC_BAD_REQUEST : HttpServletResponse.SC_NOT_FOUND);
         // SECURITY-155:
         r.createWebClient().assertFails("plugin/matrix-auth/WEB-INF/licenses.xml", HttpServletResponse.SC_BAD_REQUEST);
         r.createWebClient().assertFails("plugin/matrix-auth/META-INF/MANIFEST.MF", HttpServletResponse.SC_BAD_REQUEST);
diff --git a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
index e73cbec70359..24c978e78f8d 100644
--- a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
+++ b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
@@ -149,8 +149,16 @@ public void doubleDots2() throws Exception {
         p.getBuildersList().add(new Shell("mkdir abc; touch abc/def.bin"));
         j.buildAndAssertSuccess(p);
 
-        // can we see it?
-        j.createWebClient().goTo("job/" + p.getName() + "/ws/abc%5Cdef.bin", "application/octet-stream");
+        try (JenkinsRule.WebClient wc = j.createWebClient()) {
+            // normal path provided by the UI succeeds
+            wc.goTo("job/" + p.getName() + "/ws/abc/def.bin", "application/octet-stream");
+
+            // suspicious path is rejected with 400
+            wc.setThrowExceptionOnFailingStatusCode(false);
+            HtmlPage page = wc.goTo("job/" + p.getName() + "/ws/abc%5Cdef.bin");
+            assertEquals(400, page.getWebResponse().getStatusCode());
+            assertEquals("Error 400 Suspicious Path Character", page.getTitleText());
+        }
     }
 
     @Test
@@ -1108,10 +1116,13 @@ public void windows_cannotViewAbsolutePath() throws Exception {
         String content = "random data provided as fixed value";
         Files.writeString(targetTmpPath, content, StandardCharsets.UTF_8);
 
-        JenkinsRule.WebClient wc = j.createWebClient().withThrowExceptionOnFailingStatusCode(false);
-        Page page = wc.goTo("userContent/" + targetTmpPath.toAbsolutePath() + "/*view*", null);
-
-        MatcherAssert.assertThat(page.getWebResponse().getStatusCode(), equalTo(404));
+        try (JenkinsRule.WebClient wc = j.createWebClient()) {
+            // suspicious path is rejected with 400
+            wc.setThrowExceptionOnFailingStatusCode(false);
+            HtmlPage page = wc.goTo("userContent/" + targetTmpPath.toAbsolutePath() + "/*view*");
+            assertEquals(400, page.getWebResponse().getStatusCode());
+            assertEquals("Error 400 Suspicious Path Character", page.getTitleText());
+        }
     }
 
     @Test
diff --git a/test/src/test/java/hudson/model/UpdateSiteTest.java b/test/src/test/java/hudson/model/UpdateSiteTest.java
index 5902387c2e83..629c7c7f46e8 100644
--- a/test/src/test/java/hudson/model/UpdateSiteTest.java
+++ b/test/src/test/java/hudson/model/UpdateSiteTest.java
@@ -55,16 +55,19 @@
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.security.UpdateSiteWarningsConfiguration;
 import jenkins.security.UpdateSiteWarningsMonitor;
 import org.apache.commons.io.FilenameUtils;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -115,19 +118,21 @@ public void setUpWebServer() throws Exception {
         server = new Server();
         ServerConnector connector = new ServerConnector(server);
         server.addConnector(connector);
-        server.setHandler(new AbstractHandler() {
+        server.setHandler(new Handler.Abstract() {
             @Override
-            public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
+            public boolean handle(Request request, Response response, Callback callback) throws IOException {
+                String target = request.getHttpURI().getPath();
                 if (target.startsWith(RELATIVE_BASE)) {
                     target = target.substring(RELATIVE_BASE.length());
                 }
                 String responseBody = getResource(target);
                 if (responseBody != null) {
-                    baseRequest.setHandled(true);
-                    response.setContentType("text/plain; charset=utf-8");
-                    response.setStatus(HttpServletResponse.SC_OK);
-                    response.getOutputStream().write(responseBody.getBytes(StandardCharsets.UTF_8));
+                    response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8");
+                    response.setStatus(HttpStatus.OK_200);
+                    Content.Sink.write(response, true, responseBody, callback);
+                    return true;
                 }
+                return false;
             }
         });
         server.start();
diff --git a/test/src/test/java/jenkins/install/SetupWizardTest.java b/test/src/test/java/jenkins/install/SetupWizardTest.java
index 7168f93d93af..299937df462e 100644
--- a/test/src/test/java/jenkins/install/SetupWizardTest.java
+++ b/test/src/test/java/jenkins/install/SetupWizardTest.java
@@ -50,15 +50,17 @@
 import java.security.cert.X509Certificate;
 import java.util.HashSet;
 import java.util.Set;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.util.JSONSignatureValidator;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.Callback;
 import org.htmlunit.Page;
 import org.junit.Before;
 import org.junit.Rule;
@@ -336,7 +338,7 @@ protected JSONSignatureValidator getJsonSignatureValidator(String name) {
         }
     }
 
-    private static class RemoteUpdateSiteHandler extends AbstractHandler {
+    private static class RemoteUpdateSiteHandler extends Handler.Abstract {
         private String serverContext;
         private boolean includeSignature;
 
@@ -347,15 +349,18 @@ private static class RemoteUpdateSiteHandler extends AbstractHandler {
         }
 
         @Override
-        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-            String responseBody = getWebServerResource(target, request.getParameter("version"));
+        public boolean handle(Request request, Response response, Callback callback) throws IOException {
+            String target = request.getHttpURI().getPath();
+            String version = Request.extractQueryParameters(request).get("version").getValue();
+            String responseBody = getWebServerResource(target, version);
             if (responseBody != null) {
-                baseRequest.setHandled(true);
-                response.setContentType("text/plain; charset=utf-8");
-                response.setStatus(HttpServletResponse.SC_OK);
-                response.getOutputStream().write(responseBody.getBytes(StandardCharsets.UTF_8));
+                response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8");
+                response.setStatus(HttpStatus.OK_200);
+                Content.Sink.write(response, true, responseBody, callback);
+                return true;
             } else {
-                response.sendError(404);
+                Response.writeError(request, response, callback, HttpStatus.NOT_FOUND_404);
+                return true;
             }
         }
 
diff --git a/test/src/test/java/jenkins/security/Security3030Test.java b/test/src/test/java/jenkins/security/Security3030Test.java
index 919faa5d7da2..5e712bdc4e31 100644
--- a/test/src/test/java/jenkins/security/Security3030Test.java
+++ b/test/src/test/java/jenkins/security/Security3030Test.java
@@ -272,6 +272,14 @@ public HttpResponse doSubmitMultipart(StaplerRequest req) throws FileUploadExcep
                 return processMultipartAndUnwrap(req);
             } else {
                 actualWrapped = Assert.assertThrows(expectedWrapped, () -> processMultipartAndUnwrap(req));
+
+                // The client might still be sending us more of the request, but we have had enough of it already and
+                // have decided to stop processing it. Drain the read end of the socket so that the client can finish
+                // sending its request in order to read the response we are about to provide.
+                try (OutputStream os = OutputStream.nullOutputStream()) {
+                    req.getInputStream().transferTo(os);
+                }
+
                 return HttpResponses.ok();
             }
         }
diff --git a/test/src/test/java/jenkins/util/SystemPropertiesTest.java b/test/src/test/java/jenkins/util/SystemPropertiesTest.java
index 4a0a2a78e981..d0b498f88e57 100644
--- a/test/src/test/java/jenkins/util/SystemPropertiesTest.java
+++ b/test/src/test/java/jenkins/util/SystemPropertiesTest.java
@@ -29,7 +29,7 @@
 import static org.hamcrest.Matchers.nullValue;
 
 import javax.servlet.ServletContextEvent;
-import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.ee8.webapp.WebAppContext;
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Assume;
@@ -103,7 +103,7 @@ public void shouldReturnWebAppPropertyIfSystemPropertyNotSetAndDefaultIsSet() th
      * @param value value of the property
      */
     protected void setWebAppInitParameter(String property, String value) {
-        Assume.assumeThat(j.jenkins.servletContext, Matchers.instanceOf(ContextHandler.Context.class));
-        ((ContextHandler.Context) j.jenkins.servletContext).getContextHandler().getInitParams().put(property, value);
+        Assume.assumeThat(j.jenkins.servletContext, Matchers.instanceOf(WebAppContext.Context.class));
+        ((WebAppContext.Context) j.jenkins.servletContext).getContextHandler().getInitParams().put(property, value);
     }
 }
diff --git a/war/pom.xml b/war/pom.xml
index 53b33cc32ad7..36298596fd28 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -90,6 +90,11 @@ THE SOFTWARE.
       <artifactId>websocket-jetty10</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>websocket-jetty12-ee8</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <!--
         We bundle slf4j binding since we got some components (sshd for example)
@@ -157,6 +162,7 @@ THE SOFTWARE.
                     <exclude>org.jenkins-ci.main:cli</exclude>
                     <exclude>org.jenkins-ci.main:jenkins-core</exclude>
                     <exclude>org.jenkins-ci.main:websocket-jetty10</exclude>
+                    <exclude>org.jenkins-ci.main:websocket-jetty12-ee8</exclude>
                     <exclude>org.jenkins-ci.main:websocket-spi</exclude>
                     <exclude>org.jvnet.winp:winp</exclude>
                     <exclude>org.kohsuke.stapler:stapler</exclude>
@@ -630,14 +636,14 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
-        <version>10.0.20</version>
+        <groupId>org.eclipse.jetty.ee8</groupId>
+        <artifactId>jetty-ee8-maven-plugin</artifactId>
+        <version>12.0.12</version>
         <configuration>
           <!--
             Reload webapp when you hit ENTER. (See JETTY-282 for more)
           -->
-          <reload>manual</reload>
+          <scan>0</scan>
           <httpConnector>
             <host>${host}</host>
             <port>${port}</port>
@@ -645,7 +651,9 @@ THE SOFTWARE.
           <loginServices>
             <loginService implementation="org.eclipse.jetty.security.HashLoginService">
               <name>default</name>
-              <config>${basedir}/src/realm.properties</config>
+              <config implementation="org.eclipse.jetty.maven.MavenResource">
+                <resourceAsString>${basedir}/src/realm.properties</resourceAsString>
+              </config>
             </loginService>
           </loginServices>
           <systemProperties>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index c91e1583c039..5147b02b81d6 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -52,7 +52,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
-      <version>${winstone.version}</version>
+      <version>6.21</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/websocket/jetty12-ee8/pom.xml b/websocket/jetty12-ee8/pom.xml
new file mode 100644
index 000000000000..9a7a9ca94545
--- /dev/null
+++ b/websocket/jetty12-ee8/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The MIT License
+
+Copyright (c) 2019, 2024 CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jenkins-ci.main</groupId>
+    <artifactId>jenkins-parent</artifactId>
+    <version>${revision}${changelist}</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <artifactId>websocket-jetty12-ee8</artifactId>
+  <name>Jetty 12 (EE 8) implementation for WebSocket</name>
+  <description>An implementation of the WebSocket handler that works with Jetty 12 (EE 8).</description>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.jenkins-ci.main</groupId>
+        <artifactId>jenkins-bom</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>winstone</artifactId>
+      <version>${winstone.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>websocket-spi</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.kohsuke</groupId>
+      <artifactId>access-modifier-annotation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.kohsuke.metainf-services</groupId>
+      <artifactId>metainf-services</artifactId>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java b/websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java
new file mode 100644
index 000000000000..cc006b180f26
--- /dev/null
+++ b/websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java
@@ -0,0 +1,178 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2022, 2024 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.websocket;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.ee8.websocket.api.Session;
+import org.eclipse.jetty.ee8.websocket.api.WebSocketListener;
+import org.eclipse.jetty.ee8.websocket.api.WriteCallback;
+import org.eclipse.jetty.ee8.websocket.server.JettyServerUpgradeRequest;
+import org.eclipse.jetty.ee8.websocket.server.JettyServerUpgradeResponse;
+import org.eclipse.jetty.ee8.websocket.server.JettyWebSocketServerContainer;
+import org.kohsuke.MetaInfServices;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+@Restricted(NoExternalUse.class)
+@MetaInfServices(Provider.class)
+public class Jetty12EE8Provider implements Provider {
+
+    /**
+     * Number of seconds a WebsocketConnection may stay idle until it expires.
+     * Zero to disable.
+     * This value must be higher than the <code>jenkins.websocket.pingInterval</code>.
+     * Per <a href=https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-websocket-session-ping>Jetty 12 documentation</a>
+     * a ping mechanism should keep the websocket active. Therefore, the idle timeout must be higher than the ping
+     * interval to avoid timeout issues.
+     */
+    private static long IDLE_TIMEOUT_SECONDS = Long.getLong("jenkins.websocket.idleTimeout", 60L);
+
+    private static final String ATTR_LISTENER = Jetty12EE8Provider.class.getName() + ".listener";
+
+    private boolean initialized = false;
+
+    public Jetty12EE8Provider() {
+        JettyWebSocketServerContainer.class.hashCode();
+    }
+
+    private void init(HttpServletRequest req) {
+        if (!initialized) {
+            JettyWebSocketServerContainer.getContainer(req.getServletContext()).setIdleTimeout(Duration.ofSeconds(IDLE_TIMEOUT_SECONDS));
+            initialized = true;
+        }
+    }
+
+    @Override
+    public Handler handle(HttpServletRequest req, HttpServletResponse rsp, Listener listener) throws Exception {
+        init(req);
+        req.setAttribute(ATTR_LISTENER, listener);
+        // TODO Jetty 10+ has no obvious equivalent to WebSocketServerFactory.isUpgradeRequest; RFC6455Negotiation?
+        if (!"websocket".equalsIgnoreCase(req.getHeader("Upgrade"))) {
+            rsp.sendError(HttpServletResponse.SC_BAD_REQUEST, "only WS connections accepted here");
+            return null;
+        }
+        if (!JettyWebSocketServerContainer.getContainer(req.getServletContext()).upgrade(Jetty12EE8Provider::createWebSocket, req, rsp)) {
+            rsp.sendError(HttpServletResponse.SC_BAD_REQUEST, "did not manage to upgrade");
+            return null;
+        }
+        return new Handler() {
+            @Override
+            public Future<Void> sendBinary(ByteBuffer data) throws IOException {
+                CompletableFuture<Void> f = new CompletableFuture<>();
+                session().getRemote().sendBytes(data, new WriteCallbackImpl(f));
+                return f;
+            }
+
+            @Override
+            public void sendBinary(ByteBuffer partialByte, boolean isLast) throws IOException {
+                session().getRemote().sendPartialBytes(partialByte, isLast);
+            }
+
+            @Override
+            public Future<Void> sendText(String text) throws IOException {
+                CompletableFuture<Void> f = new CompletableFuture<>();
+                session().getRemote().sendString(text, new WriteCallbackImpl(f));
+                return f;
+            }
+
+            @Override
+            public Future<Void> sendPing(ByteBuffer applicationData) throws IOException {
+                CompletableFuture<Void> f = new CompletableFuture<>();
+                session().getRemote().sendPing(applicationData, new WriteCallbackImpl(f));
+                return f;
+            }
+
+            @Override
+            public void close() throws IOException {
+                session().close();
+            }
+
+            private Session session() {
+                Session session = (Session) listener.getProviderSession();
+                if (session == null) {
+                    throw new IllegalStateException("missing session");
+                }
+                return session;
+            }
+        };
+    }
+
+    private static final class WriteCallbackImpl implements WriteCallback {
+        private final CompletableFuture<Void> f;
+
+        WriteCallbackImpl(CompletableFuture<Void> f) {
+            this.f = f;
+        }
+
+        @Override
+        public void writeSuccess() {
+            f.complete(null);
+        }
+
+        @Override
+        public void writeFailed(Throwable x) {
+            f.completeExceptionally(x);
+        }
+    }
+
+    private static Object createWebSocket(JettyServerUpgradeRequest req, JettyServerUpgradeResponse resp) {
+        Listener listener = (Listener) req.getHttpServletRequest().getAttribute(ATTR_LISTENER);
+        if (listener == null) {
+            throw new IllegalStateException("missing listener attribute");
+        }
+        return new WebSocketListener() {
+            @Override
+            public void onWebSocketBinary(byte[] payload, int offset, int length) {
+                listener.onWebSocketBinary(payload, offset, length);
+            }
+
+            @Override
+            public void onWebSocketText(String message) {
+                listener.onWebSocketText(message);
+            }
+
+            @Override
+            public void onWebSocketClose(int statusCode, String reason) {
+                listener.onWebSocketClose(statusCode, reason);
+            }
+
+            @Override
+            public void onWebSocketConnect(Session session) {
+                listener.onWebSocketConnect(session);
+            }
+
+            @Override
+            public void onWebSocketError(Throwable cause) {
+                listener.onWebSocketError(cause);
+            }
+        };
+    }
+}

From f773034fe2367d06d7334860480fed584d25211a Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 12 Aug 2024 10:06:05 -0700
Subject: [PATCH 299/449] Revert "[JENKINS-73563] create a jenkins-button
 instead of a yui button in makeButton" (#9602)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert "[JENKINS-73563] create a jenkins-button instead of a yui button in ma…"

This reverts commit b349b6be4237657003e0c91d2b68a1e08aaf3507.
---
 .../main/webapp/scripts/hudson-behavior.js    | 86 +++++++------------
 1 file changed, 32 insertions(+), 54 deletions(-)

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 60e6167cf6dd..110a09fa199f 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -903,79 +903,57 @@ function escapeHTML(html) {
 }
 
 /**
- * Replaces a <input> with a <button class="jenkins-button">
+ * Wraps a <button> into YUI button.
  *
  * @param e
  *      button element
  * @param onclick
  *      onclick handler
  * @return
- *      wrapper with some functions (formerly a YUI widget).
- * @deprecated use <button class="jenkins-button"> and attach event listeners with standard javascript
+ *      YUI Button widget.
  */
 function makeButton(e, onclick) {
-  console.warn(
-    "Deprecated call to makeButton - use <button class='jenkins-button'> instead and standard javascript to attach listeners.",
-  );
-  const h = e.onclick;
-  const n = e.name;
-
-  const button = document.createElement("button");
-  if (e.id) {
-    button.id = e.id;
-  }
+  var h = e.onclick;
+  var clsName = e.className;
+  var n = e.name;
+
+  var attributes = {};
+  // YUI Button class interprets value attribute of <input> as HTML
+  // similar to how the child nodes of a <button> are treated as HTML.
+  // in standard HTML, we wouldn't expect the former case, yet here we are!
+  if (e.tagName === "INPUT") {
+    attributes.label = escapeHTML(e.value);
+  }
+  var btn = new YAHOO.widget.Button(e, attributes);
   if (onclick != null) {
-    button.addEventListener("click", onclick);
+    btn.addListener("click", onclick);
   }
   if (h != null) {
-    button.addEventListener("click", h);
+    btn.addListener("click", h);
+  }
+  var be = btn.get("element");
+  var classesSeparatedByWhitespace = clsName.split(" ");
+  for (let i = 0; i < classesSeparatedByWhitespace.length; i++) {
+    var singleClass = classesSeparatedByWhitespace[i];
+    if (singleClass) {
+      be.classList.add(singleClass);
+    }
   }
   if (n) {
     // copy the name
-    button.setAttribute("name", n);
-  }
-  if (e.type === "submit" || e.type === "button") {
-    button.type = e.type;
+    be.setAttribute("name", n);
   }
-  const length = e.attributes.length;
+
+  // keep the data-* attributes from the source
+  var length = e.attributes.length;
   for (let i = 0; i < length; i++) {
-    const attribute = e.attributes[i];
-    const attributeName = attribute.name;
+    var attribute = e.attributes[i];
+    var attributeName = attribute.name;
     if (attributeName.startsWith("data-")) {
-      button.setAttribute(attributeName, attribute.value);
+      btn._button.setAttribute(attributeName, attribute.value);
     }
   }
-  button.innerText = e.value;
-  button.classList.add("jenkins-button");
-  const classNames = e.classList;
-  if (classNames.contains("primary") || classNames.contains("submit-button")) {
-    button.classList.add("jenkins-button--primary");
-  }
-  classNames.remove("primary");
-  classNames.remove("submit-button");
-  classNames.remove("yui-button");
-  classNames.forEach((cn) => {
-    button.classList.add(cn);
-  });
-
-  function Button(button) {
-    this.button = button;
-  }
-  Button.prototype.set = function (attributeName, value) {
-    if (attributeName === "disabled") {
-      if (value) {
-        this.button.disabled = "disabled";
-      } else {
-        this.button.removeAttribute("disabled");
-      }
-    }
-  };
-  Button.prototype.getForm = function () {
-    return this.button.closest("form");
-  };
-  e.parentNode.insertBefore(button, e);
-  e.remove();
-  return new Button(button);
+  return btn;
 }
 
 /*

From 203b6a6c851697e83aefc37d1812bfde06390bfe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2024 10:07:02 -0700
Subject: [PATCH 300/449] Update eslint monorepo to v9.9.0 (#9597)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 27 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/war/package.json b/war/package.json
index 9e0a75b39f46..94aed9e08088 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.3",
-    "@eslint/js": "9.8.0",
+    "@eslint/js": "9.9.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.8.0",
+    "eslint": "9.9.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.9.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 5ece4c425d1e..5b6c555820a2 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1943,10 +1943,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.8.0":
-  version: 9.8.0
-  resolution: "@eslint/js@npm:9.8.0"
-  checksum: 10c0/42edaae6b020436410454579509dcb6a8cd5b260e9f18e037fd803ae28d35eb13663d4019f0ab8ba686a19d3c4a43b0e11394c148e23345377ab694da0e83262
+"@eslint/js@npm:9.9.0":
+  version: 9.9.0
+  resolution: "@eslint/js@npm:9.9.0"
+  checksum: 10c0/6ec9f1f0d576132444d6a5c66a8a08b0be9444e3ebb563fa6a6bebcf5299df3da7e454dc04c0fa601bb811197f00764b3a04430d8458cdb8e3a4677993d23f30
   languageName: node
   linkType: hard
 
@@ -3601,15 +3601,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.8.0":
-  version: 9.8.0
-  resolution: "eslint@npm:9.8.0"
+"eslint@npm:9.9.0":
+  version: 9.9.0
+  resolution: "eslint@npm:9.9.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.11.0"
     "@eslint/config-array": "npm:^0.17.1"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.8.0"
+    "@eslint/js": "npm:9.9.0"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3639,9 +3639,14 @@ __metadata:
     optionator: "npm:^0.9.3"
     strip-ansi: "npm:^6.0.1"
     text-table: "npm:^0.2.0"
+  peerDependencies:
+    jiti: "*"
+  peerDependenciesMeta:
+    jiti:
+      optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/a2ee0cce1147565d011fe185733af482f34d5466f5df5f390d0ea2ecf78097883cf568ed6c771d687138609c63cd55cd1e3ff12de7393c03f54fcffcdd0f225d
+  checksum: 10c0/3a22f68c99d75dcbafe6e2fef18d2b5bbcc960c2437f48a414ccf9ca214254733a18e6b79d07bbd374a2369a648413e421aabd07b11be3de5a44d5a4b9997877
   languageName: node
   linkType: hard
 
@@ -4458,12 +4463,12 @@ __metadata:
     "@babel/cli": "npm:7.24.8"
     "@babel/core": "npm:7.25.2"
     "@babel/preset-env": "npm:7.25.3"
-    "@eslint/js": "npm:9.8.0"
+    "@eslint/js": "npm:9.9.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.8.0"
+    eslint: "npm:9.9.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.9.0"

From 2c3d25c527288631c6263f083c3f4bab14894dd5 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 12 Aug 2024 12:34:27 -0700
Subject: [PATCH 301/449] Fix `jetty:run` (#9603)

---
 war/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/war/pom.xml b/war/pom.xml
index 36298596fd28..3a1cc12b5408 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -674,6 +674,12 @@ THE SOFTWARE.
             <!-- stat collection pointless -->
             <hudson.model.UsageStatistics.disabled>true</hudson.model.UsageStatistics.disabled>
             <hudson.Main.development>true</hudson.Main.development>
+            <!--
+              Prevent org.apache.xalan.processor.TransformerFactoryImpl from being loaded from the Maven classpath,
+              instead preferring com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl as is used in
+              production contexts.
+            -->
+            <javax.xml.transform.TransformerFactory>com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl</javax.xml.transform.TransformerFactory>
           </systemProperties>
           <webApp>
             <!-- Allows resources to be reloaded, and enable nicer console logging. -->

From f615612a18505842b041997aed0736606113c0bc Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Tue, 13 Aug 2024 02:26:47 +0200
Subject: [PATCH 302/449] [JENKINS-73563] Create a `jenkins-button` instead of
 a YUI button in `makeButton` (#9604)

Co-authored-by: Kevin Guerroudj <91883215+Kevin-CB@users.noreply.github.com>
---
 .../main/webapp/scripts/hudson-behavior.js    | 86 ++++++++++++-------
 1 file changed, 54 insertions(+), 32 deletions(-)

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 110a09fa199f..442cf33269d3 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -903,57 +903,79 @@ function escapeHTML(html) {
 }
 
 /**
- * Wraps a <button> into YUI button.
+ * Replaces a <input> with a <button class="jenkins-button">
  *
  * @param e
  *      button element
  * @param onclick
  *      onclick handler
  * @return
- *      YUI Button widget.
+ *      wrapper with some functions (formerly a YUI widget).
+ * @deprecated use <button class="jenkins-button"> and attach event listeners with standard javascript
  */
 function makeButton(e, onclick) {
-  var h = e.onclick;
-  var clsName = e.className;
-  var n = e.name;
-
-  var attributes = {};
-  // YUI Button class interprets value attribute of <input> as HTML
-  // similar to how the child nodes of a <button> are treated as HTML.
-  // in standard HTML, we wouldn't expect the former case, yet here we are!
-  if (e.tagName === "INPUT") {
-    attributes.label = escapeHTML(e.value);
-  }
-  var btn = new YAHOO.widget.Button(e, attributes);
+  console.warn(
+    "Deprecated call to makeButton - use <button class='jenkins-button'> instead and standard javascript to attach listeners.",
+  );
+  const h = e.onclick;
+  const n = e.name;
+
+  const button = document.createElement("button");
+  if (e.id) {
+    button.id = e.id;
+  }
   if (onclick != null) {
-    btn.addListener("click", onclick);
+    button.addEventListener("click", onclick);
   }
   if (h != null) {
-    btn.addListener("click", h);
-  }
-  var be = btn.get("element");
-  var classesSeparatedByWhitespace = clsName.split(" ");
-  for (let i = 0; i < classesSeparatedByWhitespace.length; i++) {
-    var singleClass = classesSeparatedByWhitespace[i];
-    if (singleClass) {
-      be.classList.add(singleClass);
-    }
+    button.addEventListener("click", h);
   }
   if (n) {
     // copy the name
-    be.setAttribute("name", n);
+    button.setAttribute("name", n);
   }
-
-  // keep the data-* attributes from the source
-  var length = e.attributes.length;
+  if (e.type === "submit" || e.type === "button") {
+    button.type = e.type;
+  }
+  const length = e.attributes.length;
   for (let i = 0; i < length; i++) {
-    var attribute = e.attributes[i];
-    var attributeName = attribute.name;
+    const attribute = e.attributes[i];
+    const attributeName = attribute.name;
     if (attributeName.startsWith("data-")) {
-      btn._button.setAttribute(attributeName, attribute.value);
+      button.setAttribute(attributeName, attribute.value);
     }
   }
-  return btn;
+  button.innerText = e.value;
+  button.classList.add("jenkins-button");
+  const classNames = e.classList;
+  if (classNames.contains("primary") || classNames.contains("submit-button")) {
+    button.classList.add("jenkins-button--primary");
+  }
+  classNames.remove("primary");
+  classNames.remove("submit-button");
+  classNames.remove("yui-button");
+  for (let i = 0; i < classNames.length; i++) {
+    button.classList.add(classNames.item(i));
+  }
+
+  function Button(button) {
+    this.button = button;
+  }
+  Button.prototype.set = function (attributeName, value) {
+    if (attributeName === "disabled") {
+      if (value) {
+        this.button.disabled = "disabled";
+      } else {
+        this.button.removeAttribute("disabled");
+      }
+    }
+  };
+  Button.prototype.getForm = function () {
+    return this.button.closest("form");
+  };
+  e.parentNode.insertBefore(button, e);
+  e.remove();
+  return new Button(button);
 }
 
 /*

From 479c85d4da8de3fedc734b4c95d67b9da4144a4d Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 13 Aug 2024 13:50:51 +0000
Subject: [PATCH 303/449] [maven-release-plugin] prepare release jenkins-2.472

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 6 +++---
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty10/pom.xml     | 2 +-
 websocket/jetty12-ee8/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index cf265f1dada9..181f1a35a757 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6309811a2e8b..29f365156e03 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 8e30ae211ed7..2872ad73641a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..7bb19e94b206 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 6783b6e2d09e..f209a8846b2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.472</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -64,7 +64,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.472</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -76,7 +76,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.472</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-06T10:30:26Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-13T10:33:54Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 8df2dc62919b..3767c8a273e7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 3a1cc12b5408..8fa1e4abbac2 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 5147b02b81d6..cbc15022a1dc 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/jetty12-ee8/pom.xml b/websocket/jetty12-ee8/pom.xml
index 9a7a9ca94545..9ef4a3e1360d 100644
--- a/websocket/jetty12-ee8/pom.xml
+++ b/websocket/jetty12-ee8/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..928d373fc831 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.472</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 90dd48109e5240e096a1ca323a78c9b7f19335b0 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 13 Aug 2024 13:51:13 +0000
Subject: [PATCH 304/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 8 ++++----
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty10/pom.xml     | 2 +-
 websocket/jetty12-ee8/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 181f1a35a757..cf265f1dada9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 29f365156e03..6309811a2e8b 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 2872ad73641a..8e30ae211ed7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 7bb19e94b206..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index f209a8846b2a..15bf19ad373f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.472</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -64,7 +64,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.472</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -74,9 +74,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.472</revision>
+    <revision>2.473</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-13T10:33:54Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-13T13:50:51Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 3767c8a273e7..8df2dc62919b 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 8fa1e4abbac2..3a1cc12b5408 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index cbc15022a1dc..5147b02b81d6 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/jetty12-ee8/pom.xml b/websocket/jetty12-ee8/pom.xml
index 9ef4a3e1360d..9a7a9ca94545 100644
--- a/websocket/jetty12-ee8/pom.xml
+++ b/websocket/jetty12-ee8/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 928d373fc831..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.472</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From ef894ef5b3ee7da0f169f33a50d896bf056de917 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2024 10:22:15 -0700
Subject: [PATCH 305/449] Update dependency
 io.jenkins.plugins:commons-lang3-api to v3.16.0-82.ve2b_07d659d95 (#9606)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 8df2dc62919b..8ed814a74382 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -63,7 +63,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>commons-lang3-api</artifactId>
-        <version>3.14.0-76.vda_5591261cfe</version>
+        <version>3.16.0-82.ve2b_07d659d95</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps between checks-api, plugin-util-api, and font-awesome-api -->
diff --git a/war/pom.xml b/war/pom.xml
index 3a1cc12b5408..41b877f41a25 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -502,7 +502,7 @@ THE SOFTWARE.
                   <!-- dependency of bootstrap5-api, checks-api, commons-text-api, echarts-api, font-awesome-api, jquery3-api, and plugin-util-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>commons-lang3-api</artifactId>
-                  <version>3.14.0-76.vda_5591261cfe</version>
+                  <version>3.16.0-82.ve2b_07d659d95</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 4c42b599a6cadc5c2edaa1fbc6d80f151e0c9caa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:51:44 -0700
Subject: [PATCH 306/449] Update mina-sshd-api.version to
 v2.13.2-125.v200281b_61d59 (#9607)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 41b877f41a25..969d799350b9 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -46,7 +46,7 @@ THE SOFTWARE.
     <host>localhost</host>
     <!-- HTTP listener port -->
     <port>8080</port>
-    <mina-sshd-api.version>2.13.1-117.v2f1a_b_66ff91d</mina-sshd-api.version>
+    <mina-sshd-api.version>2.13.2-125.v200281b_61d59</mina-sshd-api.version>
     <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
     <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
     <node.version>20.16.0</node.version>

From 95707460d3f0b4291f33efe33397341fcad5844c Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Wed, 14 Aug 2024 08:27:24 +0200
Subject: [PATCH 307/449] Use standard dropdowns for autocomplete (#9453)

* Use standard dropdowns for autocomplete

* Debounce autocompletion, limit to 10 suggestions, allow tab

* Keyboard navigation improvements

Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>

* Autocomplete: use the same width as the parent field

* Prevent browser autocomplete, do not hide on field click

* Use !==

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>

---------

Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
 eslint.config.cjs                             |   1 +
 war/src/main/js/app.js                        |   2 +
 .../main/js/components/autocomplete/index.js  | 118 ++++++++++++++++++
 .../main/js/components/dropdowns/templates.js |   4 +-
 war/src/main/js/components/dropdowns/utils.js |  21 +++-
 war/src/main/js/util/keyboard.js              |   2 +-
 .../main/webapp/scripts/hudson-behavior.js    |  43 -------
 7 files changed, 142 insertions(+), 49 deletions(-)
 create mode 100644 war/src/main/js/components/autocomplete/index.js

diff --git a/eslint.config.cjs b/eslint.config.cjs
index ee24402591f9..c25e303ba5db 100644
--- a/eslint.config.cjs
+++ b/eslint.config.cjs
@@ -47,6 +47,7 @@ module.exports = [
         findFormParent: "readonly",
         fireEvent: "readonly",
         Form: "readonly",
+        FormChecker: "readonly",
         getElementOverflowParams: "readonly",
         hoverNotification: "readonly",
         iota: "writeable",
diff --git a/war/src/main/js/app.js b/war/src/main/js/app.js
index 63a35226d7d4..0ac9a97cce38 100644
--- a/war/src/main/js/app.js
+++ b/war/src/main/js/app.js
@@ -5,6 +5,7 @@ import Tooltips from "@/components/tooltips";
 import StopButtonLink from "@/components/stop-button-link";
 import ConfirmationLink from "@/components/confirmation-link";
 import Dialogs from "@/components/dialogs";
+import Autocomplete from "@/components/autocomplete";
 
 Dropdowns.init();
 Notifications.init();
@@ -13,3 +14,4 @@ Tooltips.init();
 StopButtonLink.init();
 ConfirmationLink.init();
 Dialogs.init();
+Autocomplete.init();
diff --git a/war/src/main/js/components/autocomplete/index.js b/war/src/main/js/components/autocomplete/index.js
new file mode 100644
index 000000000000..be4350b7aad9
--- /dev/null
+++ b/war/src/main/js/components/autocomplete/index.js
@@ -0,0 +1,118 @@
+import behaviorShim from "@/util/behavior-shim";
+import Utils from "@/components/dropdowns/utils";
+
+function init() {
+  function addValue(value, item, delimiter) {
+    const prev = value.includes(delimiter)
+      ? value.substring(0, value.lastIndexOf(delimiter) + 1) + " "
+      : "";
+    return prev + item + delimiter + " ";
+  }
+
+  function validate(e) {
+    if (e.targetUrl) {
+      var method = e.getAttribute("checkMethod") || "post";
+      try {
+        FormChecker.delayedCheck(e.targetUrl(), method, e.targetElement);
+      } catch (x) {
+        console.warn(x);
+        return;
+      }
+    }
+  }
+
+  function convertSuggestionToItem(suggestion, e) {
+    const delimiter = e.getAttribute("autoCompleteDelimChar");
+    const confirm = () => {
+      e.value = delimiter
+        ? addValue(e.value, suggestion.name, delimiter)
+        : suggestion.name;
+      validate(e);
+      e.focus();
+    };
+    return {
+      label: suggestion.name,
+      onClick: confirm,
+      onKeyPress: (evt) => {
+        if (evt.key == "Tab") {
+          confirm();
+          e.dropdown.hide();
+          evt.preventDefault();
+        }
+      },
+    };
+  }
+
+  function createAndShowDropdown(e, suggestions) {
+    const items = suggestions
+      .splice(0, 10)
+      .map((s) => convertSuggestionToItem(s, e));
+    if (!e.dropdown) {
+      Utils.generateDropdown(
+        e,
+        (instance) => {
+          e.dropdown = instance;
+          instance.popper.style.minWidth = e.offsetWidth + "px";
+        },
+        true,
+      );
+    }
+    e.dropdown.setContent(Utils.generateDropdownItems(items, true));
+    e.dropdown.show();
+  }
+
+  function updateSuggestions(e) {
+    const text = e.value.trim();
+    const delimiter = e.getAttribute("autoCompleteDelimChar");
+    const word = delimiter ? text.split(delimiter).reverse()[0].trim() : text;
+    if (!word) {
+      if (e.dropdown) {
+        e.dropdown.hide();
+      }
+      return;
+    }
+    const url =
+      e.getAttribute("autoCompleteUrl") + "?value=" + encodeURIComponent(word);
+    fetch(url)
+      .then((rsp) => (rsp.ok ? rsp.json() : {}))
+      .then((response) => createAndShowDropdown(e, response.suggestions || []));
+  }
+
+  function debounce(callback) {
+    callback.running = false;
+    return () => {
+      if (!callback.running) {
+        callback.running = true;
+        setTimeout(() => {
+          callback();
+          callback.running = false;
+        }, 300);
+      }
+    };
+  }
+
+  behaviorShim.specify(
+    "INPUT.auto-complete",
+    "input-auto-complete",
+    0,
+    function (e) {
+      e.setAttribute("autocomplete", "off");
+      e.dataset["hideOnClick"] = "false";
+      // form field with auto-completion support
+      e.style.position = "relative";
+      // otherwise menu won't hide on tab with nothing selected
+      // needs delay as without that it blocks click selection of an item
+      e.addEventListener("focusout", () =>
+        setTimeout(() => e.dropdown && e.dropdown.hide(), 200),
+      );
+      e.addEventListener(
+        "input",
+        debounce(() => {
+          updateSuggestions(e);
+        }),
+      );
+    },
+  );
+}
+
+export default { init };
diff --git a/war/src/main/js/components/dropdowns/templates.js b/war/src/main/js/components/dropdowns/templates.js
index 713bf8b6ce0f..eeef012ccf57 100644
--- a/war/src/main/js/components/dropdowns/templates.js
+++ b/war/src/main/js/components/dropdowns/templates.js
@@ -74,7 +74,9 @@ function menuItem(options) {
   if (options.onClick) {
     item.addEventListener("click", (event) => options.onClick(event));
   }
-
+  if (options.onKeyPress) {
+    item.onkeypress = options.onKeyPress;
+  }
   return item;
 }
 
diff --git a/war/src/main/js/components/dropdowns/utils.js b/war/src/main/js/components/dropdowns/utils.js
index 8a3677c939b1..a15c4d2c2ba5 100644
--- a/war/src/main/js/components/dropdowns/utils.js
+++ b/war/src/main/js/components/dropdowns/utils.js
@@ -11,12 +11,13 @@ const SELECTED_ITEM_CLASS = "jenkins-dropdown__item--selected";
  * @param element - the element to generate the dropdown for
  * @param callback - called to retrieve the list of dropdown items
  */
-function generateDropdown(element, callback) {
+function generateDropdown(element, callback, immediate) {
   tippy(
     element,
     Object.assign({}, Templates.dropdown(), {
+      hideOnClick: element.dataset["hideOnClick"] !== "false",
       onCreate(instance) {
-        instance.reference.addEventListener("mouseenter", () => {
+        const onload = () => {
           if (instance.loaded) {
             return;
           }
@@ -26,7 +27,12 @@ function generateDropdown(element, callback) {
           });
 
           callback(instance);
-        });
+        };
+        if (immediate) {
+          onload();
+        } else {
+          instance.reference.addEventListener("mouseenter", onload);
+        }
       },
     }),
   );
@@ -86,7 +92,10 @@ function generateDropdownItems(items, compact) {
     menuItems,
     () => menuItems.querySelectorAll(".jenkins-dropdown__item"),
     SELECTED_ITEM_CLASS,
-    (selectedItem, key) => {
+    (selectedItem, key, evt) => {
+      if (!selectedItem) {
+        return;
+      }
       switch (key) {
         case "ArrowLeft": {
           const root = selectedItem.closest("[data-tippy-root]");
@@ -110,6 +119,10 @@ function generateDropdownItems(items, compact) {
             .classList.add(SELECTED_ITEM_CLASS);
           break;
         }
+        default:
+          if (selectedItem.onkeypress) {
+            selectedItem.onkeypress(evt);
+          }
       }
     },
     (container) => {
diff --git a/war/src/main/js/util/keyboard.js b/war/src/main/js/util/keyboard.js
index 0196d8992f83..88d677530416 100644
--- a/war/src/main/js/util/keyboard.js
+++ b/war/src/main/js/util/keyboard.js
@@ -74,7 +74,7 @@ export default function makeKeyboardNavigable(
           selectedItem.click();
         }
       } else {
-        additionalBehaviours(selectedItem, e.key);
+        additionalBehaviours(selectedItem, e.key, e);
       }
     }
   });
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 442cf33269d3..6f877b5f8332 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1332,49 +1332,6 @@ function rowvgStartEachRow(recursive, f) {
     },
   );
 
-  Behaviour.specify(
-    "INPUT.auto-complete",
-    "input-auto-complete",
-    ++p,
-    function (e) {
-      // form field with auto-completion support
-      // insert the auto-completion container
-      var div = document.createElement("DIV");
-      e.parentNode.insertBefore(div, e.nextElementSibling);
-      e.style.position = "relative"; // or else by default it's absolutely positioned, making "width:100%" break
-
-      var ds = new YAHOO.util.XHRDataSource(e.getAttribute("autoCompleteUrl"));
-      ds.responseType = YAHOO.util.XHRDataSource.TYPE_JSON;
-      ds.responseSchema = {
-        resultsList: "suggestions",
-        fields: ["name"],
-      };
-
-      // Instantiate the AutoComplete
-      var ac = new YAHOO.widget.AutoComplete(e, div, ds);
-      ac.generateRequest = function (query) {
-        return "?value=" + query;
-      };
-      ac.autoHighlight = false;
-      ac.prehighlightClassName = "yui-ac-prehighlight";
-      ac.animSpeed = 0;
-      ac.formatResult = ac.formatEscapedResult;
-      ac.useShadow = true;
-      ac.autoSnapContainer = true;
-      ac.delimChar = e.getAttribute("autoCompleteDelimChar");
-      ac.doBeforeExpandContainer = function (textbox, container) {
-        // adjust the width every time we show it
-        container.style.width = textbox.clientWidth + "px";
-        var Dom = YAHOO.util.Dom;
-        Dom.setXY(container, [
-          Dom.getX(textbox),
-          Dom.getY(textbox) + textbox.offsetHeight,
-        ]);
-        return true;
-      };
-    },
-  );
-
   Behaviour.specify(
     "A.jenkins-help-button",
     "a-jenkins-help-button",

From b182867b29056c2afbcd88957473a63a18f0d1d0 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Wed, 14 Aug 2024 07:50:26 +0100
Subject: [PATCH 308/449] Tweak pom so that renovate is able to update test
 harness (#9610)

Remove property for group id for jenkins-test-harness
---
 test/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 8ed814a74382..21a21d59ac4a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -147,7 +147,7 @@ THE SOFTWARE.
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
       <version>2250.v03a_1295b_0a_30</version>
       <scope>test</scope>
@@ -163,13 +163,13 @@ THE SOFTWARE.
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness-tools</artifactId>
       <version>2.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
-          <groupId>${project.groupId}</groupId>
+          <groupId>org.jenkins-ci.main</groupId>
           <artifactId>jenkins-test-harness</artifactId>
         </exclusion>
       </exclusions>

From 5637aab4550f23c7f6466b4ff6c3b3ecc3a585f5 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 14 Aug 2024 05:11:29 -0700
Subject: [PATCH 309/449] Use SLF4J BOM (#9601)

---
 bom/pom.xml | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index cf265f1dada9..ee8c43325ab9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,6 @@ THE SOFTWARE.
 
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
-    <slf4jVersion>2.0.16</slf4jVersion>
     <stapler.version>1894.v82b_2fb_35519d</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
@@ -53,6 +52,13 @@ THE SOFTWARE.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-bom</artifactId>
+        <version>2.0.16</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
@@ -351,27 +357,6 @@ THE SOFTWARE.
         <artifactId>jcifs</artifactId>
         <version>1.3.18-kohsuke-1</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>log4j-over-slf4j</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
-      <dependency>
-        <!-- SLF4J used in maven-plugin and possibly others -->
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-jdk14</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
       <dependency>
         <!-- provided by jcl-over-slf4j -->
         <groupId>commons-logging</groupId>

From 5709f43a8ed97adb6fad54b7484fe0562c36e9e3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:35:53 -0700
Subject: [PATCH 310/449] Update dependency
 org.jenkins-ci.plugins:script-security to v1354 (#9608)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 21a21d59ac4a..2f3bfcdad5a8 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -118,7 +118,7 @@ THE SOFTWARE.
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
-        <version>1341.va_2819b_414686</version>
+        <version>1354.va_70a_fe478c7f</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 969d799350b9..67438c6041d5 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -300,7 +300,7 @@ THE SOFTWARE.
                   <!-- dependency of command-launcher, junit, matrix-project, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>script-security</artifactId>
-                  <version>1341.va_2819b_414686</version>
+                  <version>1354.va_70a_fe478c7f</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From ead777a4e6307f041ff3fab20c6dc00add546b5d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 10:36:15 -0700
Subject: [PATCH 311/449] Update dependency
 org.jenkins-ci.plugins.workflow:workflow-api to v1336 (#9609)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 2f3bfcdad5a8..56e8d258ef21 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -123,7 +123,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-api</artifactId>
-        <version>1332.vc21122317a_8e</version>
+        <version>1336.vee415d95c521</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 67438c6041d5..ee76eaf57a98 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -314,7 +314,7 @@ THE SOFTWARE.
                   <!-- dependency of junit, plugin-util-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>1332.vc21122317a_8e</version>
+                  <version>1336.vee415d95c521</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 9c91bcde1d1aed0c82de257e8f61b14a16b5a9ab Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 14 Aug 2024 11:59:11 -0700
Subject: [PATCH 312/449] Fix Spotless (#9613)

---
 test/pom.xml | 56 ++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 56e8d258ef21..7dd55b204422 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -146,34 +146,6 @@ THE SOFTWARE.
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.main</groupId>
-      <artifactId>jenkins-test-harness</artifactId>
-      <version>2250.v03a_1295b_0a_30</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>jenkins-war</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.main</groupId>
-      <artifactId>jenkins-test-harness-tools</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jenkins-ci.main</groupId>
-          <artifactId>jenkins-test-harness</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-war</artifactId>
@@ -203,6 +175,34 @@ THE SOFTWARE.
       <artifactId>test-annotations</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>jenkins-test-harness</artifactId>
+      <version>2250.v03a_1295b_0a_30</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>jenkins-war</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>jenkins-test-harness-tools</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jenkins-ci.main</groupId>
+          <artifactId>jenkins-test-harness</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>instance-identity</artifactId>

From 0fb78543a18972835c5dbf0ec3dfbf86929b2fd3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 19:33:07 -0700
Subject: [PATCH 313/449] Update dependency
 org.jenkins-ci.main:jenkins-test-harness to v2254 (#9611)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 7dd55b204422..e2aa6f2b68ca 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2250.v03a_1295b_0a_30</version>
+      <version>2254.vcff7a_d4969e5</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From c5c69abd2d346a694c29b3e5f5d3991d94c38556 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 19:33:33 -0700
Subject: [PATCH 314/449] Update dependency
 org.springframework:spring-framework-bom to v5.3.39 (#9612)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index ee8c43325ab9..268b42af105f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -62,7 +62,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.3.37</version>
+        <version>5.3.39</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From c8eddd3f651bc2a80f7dbc8dba2f44143503b55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pochat?= <jpochat@cloudbees.com>
Date: Thu, 15 Aug 2024 20:29:01 +0200
Subject: [PATCH 315/449] [JENKINS-73597] Remove `RekeySecretAdminMonitor` and
 related resources (#9594)

---
 .../main/java/hudson/util/SecretRewriter.java | 213 ------------------
 .../AsynchronousAdministrativeMonitor.java    |   4 -
 .../security/RekeySecretAdminMonitor.java     | 160 -------------
 .../jenkins/security/Messages.properties      |   1 -
 .../jenkins/security/Messages_bg.properties   |   2 -
 .../jenkins/security/Messages_de.properties   |   1 -
 .../jenkins/security/Messages_it.properties   |   1 -
 .../jenkins/security/Messages_ja.properties   |   1 -
 .../security/Messages_pt_BR.properties        |   1 -
 .../jenkins/security/Messages_ru.properties   |   1 -
 .../jenkins/security/Messages_sr.properties   |   1 -
 .../security/Messages_sv_SE.properties        |   1 -
 .../security/Messages_zh_TW.properties        |   1 -
 .../RekeySecretAdminMonitor/description.jelly |   4 -
 .../description.properties                    |   1 -
 .../description_fr.properties                 |   1 -
 .../description_pt_BR.properties              |  23 --
 .../description_ru.properties                 |   2 -
 .../description_sv_SE.properties              |  23 --
 .../RekeySecretAdminMonitor/message.groovy    |  60 -----
 .../message.properties                        |  17 --
 .../message_fr.properties                     |  17 --
 .../message_it.properties                     |  52 -----
 .../message_pt_BR.properties                  |  38 ----
 .../message_ru.properties                     |  25 --
 .../message_sr.properties                     |  19 --
 .../message_sv_SE.properties                  |  16 --
 .../message_zh_TW.properties                  |  42 ----
 .../java/hudson/util/SecretRewriterTest.java  | 112 ---------
 .../security/RekeySecretAdminMonitorTest.java | 189 ----------------
 30 files changed, 1029 deletions(-)
 delete mode 100644 core/src/main/java/hudson/util/SecretRewriter.java
 delete mode 100644 core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description.jelly
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_fr.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_pt_BR.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_ru.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_sv_SE.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_fr.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_it.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_pt_BR.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_ru.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_sr.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_sv_SE.properties
 delete mode 100644 core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_zh_TW.properties
 delete mode 100644 core/src/test/java/hudson/util/SecretRewriterTest.java
 delete mode 100644 test/src/test/java/jenkins/security/RekeySecretAdminMonitorTest.java

diff --git a/core/src/main/java/hudson/util/SecretRewriter.java b/core/src/main/java/hudson/util/SecretRewriter.java
deleted file mode 100644
index 4e5015852353..000000000000
--- a/core/src/main/java/hudson/util/SecretRewriter.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package hudson.util;
-
-import hudson.Functions;
-import hudson.Util;
-import hudson.model.TaskListener;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.util.Base64;
-import java.util.HashSet;
-import java.util.Set;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-
-/**
- * Rewrites XML files by looking for Secrets that are stored with the old key and replaces them
- * by the new encrypted values.
- *
- * @author Kohsuke Kawaguchi
- */
-public class SecretRewriter {
-    private final Cipher cipher;
-    private final SecretKey key;
-
-    /**
-     * How many files have been scanned?
-     */
-    private int count;
-
-    /**
-     * Canonical paths of the directories we are recursing to protect
-     * against symlink induced cycles.
-     */
-    private Set<String> callstack = new HashSet<>();
-
-    public SecretRewriter() throws GeneralSecurityException {
-        cipher = Secret.getCipher("AES");
-        key = HistoricalSecrets.getLegacyKey();
-    }
-
-    /** @deprecated SECURITY-376: {@code backupDirectory} is ignored */
-    @Deprecated
-    public SecretRewriter(File backupDirectory) throws GeneralSecurityException {
-        this();
-    }
-
-    private String tryRewrite(String s) throws InvalidKeyException {
-        if (s.length() < 24)
-            return s;   // Encrypting "" in Secret produces 24-letter characters, so this must be the minimum length
-        if (!isBase64(s))
-            return s;   // decode throws IOException if the input is not base64, and this is also a very quick way to filter
-
-        byte[] in;
-        try {
-            in = Base64.getDecoder().decode(s.getBytes(StandardCharsets.UTF_8));
-        } catch (IllegalArgumentException e) {
-            return s;   // not a valid base64
-        }
-        cipher.init(Cipher.DECRYPT_MODE, key);
-        Secret sec = HistoricalSecrets.tryDecrypt(cipher, in);
-        if (sec != null) // matched
-            return sec.getEncryptedValue(); // replace by the new encrypted value
-        else // not encrypted with the legacy key. leave it unmodified
-            return s;
-    }
-
-    /** @deprecated SECURITY-376: {@code backup} is ignored */
-    @Deprecated
-    public boolean rewrite(File f, File backup) throws InvalidKeyException, IOException {
-        return rewrite(f);
-    }
-
-    public boolean rewrite(File f) throws InvalidKeyException, IOException {
-
-        AtomicFileWriter w = new AtomicFileWriter(f.toPath(), StandardCharsets.UTF_8);
-        try {
-            boolean modified = false; // did we actually change anything?
-            try (PrintWriter out = new PrintWriter(new BufferedWriter(w));
-                 InputStream fin = Files.newInputStream(Util.fileToPath(f));
-                 BufferedReader r = new BufferedReader(new InputStreamReader(fin, StandardCharsets.UTF_8))) {
-                String line;
-                StringBuilder buf = new StringBuilder();
-
-                while ((line = r.readLine()) != null) {
-                    int copied = 0;
-                    buf.setLength(0);
-                    while (true) {
-                        int sidx = line.indexOf('>', copied);
-                        if (sidx < 0) break;
-                        int eidx = line.indexOf('<', sidx);
-                        if (eidx < 0) break;
-
-                        String elementText = line.substring(sidx + 1, eidx);
-                        String replacement = tryRewrite(elementText);
-                        if (!replacement.equals(elementText))
-                            modified = true;
-
-                        buf.append(line, copied, sidx + 1);
-                        buf.append(replacement);
-                        copied = eidx;
-                    }
-                    buf.append(line.substring(copied));
-                    out.println(buf);
-                }
-            }
-
-            if (modified) {
-                w.commit();
-            }
-            return modified;
-        } finally {
-            w.abort();
-        }
-    }
-
-
-    /**
-     * Recursively scans and rewrites a directory.
-     *
-     * This method shouldn't abort just because one file fails to rewrite.
-     *
-     * @return
-     *      Number of files that were actually rewritten.
-     */
-    // synchronized to prevent accidental concurrent use. this instance is not thread safe
-    public synchronized int rewriteRecursive(File dir, TaskListener listener) throws InvalidKeyException {
-        return rewriteRecursive(dir, "", listener);
-    }
-
-    private int rewriteRecursive(File dir, String relative, TaskListener listener) throws InvalidKeyException {
-        String canonical;
-        try {
-            canonical = dir.toPath().toRealPath().toString();
-        } catch (IOException | InvalidPathException e) {
-            canonical = dir.getAbsolutePath(); //
-        }
-        if (!callstack.add(canonical)) {
-            listener.getLogger().println("Cycle detected: " + dir);
-            return 0;
-        }
-
-        try {
-            File[] children = dir.listFiles();
-            if (children == null)     return 0;
-
-            int rewritten = 0;
-            for (File child : children) {
-                String cn = child.getName();
-                if (cn.endsWith(".xml")) {
-                    if (count++ % 100 == 0)
-                        listener.getLogger().println("Scanning " + child);
-                    try {
-                        if (rewrite(child)) {
-                            listener.getLogger().println("Rewritten " + child);
-                            rewritten++;
-                        }
-                    } catch (IOException e) {
-                        Functions.printStackTrace(e, listener.error("Failed to rewrite " + child));
-                    }
-                }
-                if (child.isDirectory()) {
-                    if (!isIgnoredDir(child))
-                        rewritten += rewriteRecursive(child,
-                                relative.isEmpty() ? cn : relative + '/' + cn,
-                                listener);
-                }
-            }
-            return rewritten;
-        } finally {
-            callstack.remove(canonical);
-        }
-    }
-
-    /**
-     * Decides if this directory is worth visiting or not.
-     */
-    protected boolean isIgnoredDir(File dir) {
-        // ignoring the workspace and the artifacts directories. Both of them
-        // are potentially large and they do not store any secrets.
-        String n = dir.getName();
-        return n.equals("workspace") || n.equals("artifacts")
-            || n.equals("plugins") // no mutable data here
-            || n.equals(".") || n.equals("..");
-    }
-
-    private static boolean isBase64(char ch) {
-        return ch < 128 && IS_BASE64[ch];
-    }
-
-    private static boolean isBase64(String s) {
-        for (int i = 0; i < s.length(); i++)
-            if (!isBase64(s.charAt(i)))
-                return false;
-        return true;
-    }
-
-    private static final boolean[] IS_BASE64 = new boolean[128];
-
-    static {
-        String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-        for (int i = 0; i < chars.length(); i++)
-            IS_BASE64[chars.charAt(i)] = true;
-    }
-}
diff --git a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
index 7ebc732518ae..2884439681c6 100644
--- a/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
+++ b/core/src/main/java/jenkins/management/AsynchronousAdministrativeMonitor.java
@@ -17,7 +17,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
-import jenkins.security.RekeySecretAdminMonitor;
 
 /**
  * Convenient partial implementation of {@link AdministrativeMonitor} that involves a background "fixing" action
@@ -27,9 +26,6 @@
  * A subclass defines what that background fixing actually does in {@link #fix(TaskListener)}. The logging output
  * from it gets persisted, and this class provides a "/log" view that allows the administrator to monitor its progress.
  *
- * <p>
- * See {@link RekeySecretAdminMonitor} for an example of how to subtype this class.
- *
  * @author Kohsuke Kawaguchi
  */
 public abstract class AsynchronousAdministrativeMonitor extends AdministrativeMonitor {
diff --git a/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java b/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java
deleted file mode 100644
index c3b548004515..000000000000
--- a/core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package jenkins.security;
-
-import hudson.Extension;
-import hudson.Functions;
-import hudson.Util;
-import hudson.init.InitMilestone;
-import hudson.init.Initializer;
-import hudson.model.TaskListener;
-import hudson.util.HttpResponses;
-import hudson.util.SecretRewriter;
-import hudson.util.VersionNumber;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.security.GeneralSecurityException;
-import java.util.Date;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import jenkins.management.AsynchronousAdministrativeMonitor;
-import jenkins.model.Jenkins;
-import jenkins.util.io.FileBoolean;
-import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.interceptor.RequirePOST;
-
-/**
- * Warns the administrator to run {@link SecretRewriter}
- *
- * @author Kohsuke Kawaguchi
- */
-@Extension @Symbol("rekeySecret")
-public class RekeySecretAdminMonitor extends AsynchronousAdministrativeMonitor {
-
-    /**
-     * Whether we detected a need to run the rewrite program.
-     * Once we set it to true, we'll never turn it off.
-     *
-     * If the admin decides to dismiss this warning, we use {@link #isEnabled()} for that.
-     *
-     * In this way we can correctly differentiate all the different states.
-     */
-    private final FileBoolean needed = state("needed");
-
-    /**
-     * If the scanning process has run to the completion, we set to this true.
-     */
-    private final FileBoolean done = state("done");
-
-    /**
-     * If the rewrite process is scheduled upon the next boot.
-     */
-    private final FileBoolean scanOnBoot = state("scanOnBoot");
-
-    @SuppressWarnings("OverridableMethodCallInConstructor") // should have been final
-    public RekeySecretAdminMonitor() throws IOException {
-        // if JENKINS_HOME existed <1.497, we need to offer rewrite
-        // this computation needs to be done and the value be captured,
-        // since $JENKINS_HOME/config.xml can be saved later before the user has
-        // actually rewritten XML files.
-        Jenkins j = Jenkins.get();
-        if (j.isUpgradedFromBefore(new VersionNumber("1.496.*"))
-        &&  new FileBoolean(new File(j.getRootDir(), "secret.key.not-so-secret")).isOff())
-            needed.on();
-        Util.deleteRecursive(new File(getBaseDir(), "backups")); // SECURITY-376: no longer used
-    }
-
-    @Override
-    public boolean isActivated() {
-        return needed.isOn();
-    }
-
-    /**
-     * Indicates that the re-keying has run to the completion.
-     */
-    public boolean isDone() {
-        return done.isOn();
-    }
-
-    public void setNeeded() {
-        needed.on();
-    }
-
-    public boolean isScanOnBoot() {
-        return scanOnBoot.isOn();
-    }
-
-    @Override
-    public boolean isSecurity() {
-        return true;
-    }
-
-    @RequirePOST
-    public HttpResponse doScan(StaplerRequest req) throws IOException, GeneralSecurityException {
-        if (req.hasParameter("background")) {
-            start(false);
-        } else
-        if (req.hasParameter("schedule")) {
-            scanOnBoot.on();
-        } else
-        if (req.hasParameter("dismiss")) {
-            disable(true);
-        } else
-            throw HttpResponses.error(400, "Invalid request submission: " + req.getParameterMap());
-
-        return HttpResponses.redirectViaContextPath("/manage");
-    }
-
-
-    private FileBoolean state(String name) {
-        return new FileBoolean(new File(getBaseDir(), name));
-    }
-
-    @Initializer(fatal = false, after = InitMilestone.PLUGINS_STARTED, before = InitMilestone.EXTENSIONS_AUGMENTED)
-    // as early as possible, but this needs to be late enough that the ConfidentialStore is available
-    public void scanOnReboot() throws InterruptedException, IOException, GeneralSecurityException {
-        FileBoolean flag = scanOnBoot;
-        if (flag.isOn()) {
-            flag.off();
-            start(false).join();
-            // block the boot until the rewrite process is complete
-            // don't let the failure in RekeyThread block Jenkins boot.
-        }
-    }
-
-    @Override
-    public String getDisplayName() {
-        return Messages.RekeySecretAdminMonitor_DisplayName();
-    }
-
-    /**
-     * Rewrite log file.
-     */
-    @Override
-    protected File getLogFile() {
-        return new File(getBaseDir(), "rekey.log");
-    }
-
-    @Override
-    protected void fix(TaskListener listener) throws Exception {
-        LOGGER.info("Initiating a re-keying of secrets. See " + getLogFile());
-
-        SecretRewriter rewriter = new SecretRewriter();
-
-        try {
-            PrintStream log = listener.getLogger();
-            log.println("Started re-keying " + new Date());
-            int count = rewriter.rewriteRecursive(Jenkins.get().getRootDir(), listener);
-            log.printf("Completed re-keying %d files on %s%n", count, new Date());
-            new RekeySecretAdminMonitor().done.on();
-            LOGGER.info("Secret re-keying completed");
-        } catch (Exception e) {
-            LOGGER.log(Level.SEVERE, "Fatal failure in re-keying secrets", e);
-            Functions.printStackTrace(e, listener.error("Fatal failure in rewriting secrets"));
-        }
-    }
-
-    private static final Logger LOGGER = Logger.getLogger(RekeySecretAdminMonitor.class.getName());
-
-}
diff --git a/core/src/main/resources/jenkins/security/Messages.properties b/core/src/main/resources/jenkins/security/Messages.properties
index 7227f7e83848..4fb04f7c9619 100644
--- a/core/src/main/resources/jenkins/security/Messages.properties
+++ b/core/src/main/resources/jenkins/security/Messages.properties
@@ -27,7 +27,6 @@ ApiTokenProperty.ChangeToken.SuccessHidden=<div>Updated. You need to login as th
 ApiTokenProperty.ChangeToken.CapabilityNotAllowed=<div>Capability to generate a legacy token without an existing one is currently disabled in the security configuration</div>
 ApiTokenProperty.LegacyTokenName=Legacy Token
 ApiTokenProperty.NoLegacyToken=This user currently does not have a legacy token
-RekeySecretAdminMonitor.DisplayName=Re-keying
 UpdateSiteWarningsMonitor.DisplayName=Update Site Warnings
 Token.Created.on=Token created on {0}
 
diff --git a/core/src/main/resources/jenkins/security/Messages_bg.properties b/core/src/main/resources/jenkins/security/Messages_bg.properties
index 97f31a122715..f5edaa47587a 100644
--- a/core/src/main/resources/jenkins/security/Messages_bg.properties
+++ b/core/src/main/resources/jenkins/security/Messages_bg.properties
@@ -29,8 +29,6 @@ ApiTokenProperty.ChangeToken.Success=\
 ApiTokenProperty.ChangeToken.SuccessHidden=\
  <div>Променен. Трябва да влезете като потребителя, за да видите низа за\
  идентификация</div>
-RekeySecretAdminMonitor.DisplayName=\
- Създаване на нов ключ
 # Update Site Warnings
 UpdateSiteWarningsMonitor.DisplayName=\
  Предупреждения от сайтовете за обновления
diff --git a/core/src/main/resources/jenkins/security/Messages_de.properties b/core/src/main/resources/jenkins/security/Messages_de.properties
index 8c4c52875098..a07807be9bd7 100644
--- a/core/src/main/resources/jenkins/security/Messages_de.properties
+++ b/core/src/main/resources/jenkins/security/Messages_de.properties
@@ -22,7 +22,6 @@
 
 UpdateSiteWarningsMonitor.DisplayName=Warnungen des Update-Centers
 ApiTokenProperty.DisplayName=API-Token
-RekeySecretAdminMonitor.DisplayName=Erneute Verschlüsselung
 ApiTokenProperty.ChangeToken.TokenIsHidden=Token wird nicht angezeigt
 ApiTokenProperty.ChangeToken.Success=<div>Aktualisiert. Der Token wird oben angezeigt.</div>
 ApiTokenProperty.ChangeToken.SuccessHidden=<div>Aktualisiert. Der Token wird nur dem Nutzer angezeigt.</div>
diff --git a/core/src/main/resources/jenkins/security/Messages_it.properties b/core/src/main/resources/jenkins/security/Messages_it.properties
index 5a6f6c985e22..442f8dfc64ff 100644
--- a/core/src/main/resources/jenkins/security/Messages_it.properties
+++ b/core/src/main/resources/jenkins/security/Messages_it.properties
@@ -35,7 +35,6 @@ ApiTokenProperty.LegacyTokenName=Token legacy
 ApiTokenProperty.NoLegacyToken=Quest''utente non dispone attualmente di un \
   token legacy.
 QueueItemAuthenticatorMonitor.DisplayName=Controllo accessi per le compilazioni
-RekeySecretAdminMonitor.DisplayName=Modifica chiave
 ResourceDomainConfiguration.DisplayName=Raccomandazione dominio risorse
 ResourceDomainConfiguration.Empty=Senza un URL radice risorse, le risorse \
   saranno servite dal dominio principale con l''intestazione \
diff --git a/core/src/main/resources/jenkins/security/Messages_ja.properties b/core/src/main/resources/jenkins/security/Messages_ja.properties
index f958d55bf9a0..4043218d7f6c 100644
--- a/core/src/main/resources/jenkins/security/Messages_ja.properties
+++ b/core/src/main/resources/jenkins/security/Messages_ja.properties
@@ -22,5 +22,4 @@
 
 ApiTokenProperty.DisplayName=APIトークン
 ApiTokenProperty.ChangeToken.Success=<div>更新しました</div>
-RekeySecretAdminMonitor.DisplayName=キーの再生成
 Token.Created.on={0}に作成されたトークン
diff --git a/core/src/main/resources/jenkins/security/Messages_pt_BR.properties b/core/src/main/resources/jenkins/security/Messages_pt_BR.properties
index beb5e0fc0106..9921e2517111 100644
--- a/core/src/main/resources/jenkins/security/Messages_pt_BR.properties
+++ b/core/src/main/resources/jenkins/security/Messages_pt_BR.properties
@@ -21,7 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-RekeySecretAdminMonitor.DisplayName=Rechaveamento
 ApiTokenProperty.ChangeToken.Success=<div>Atualizado</div>
 ApiTokenProperty.DisplayName=Passe de API
 ResourceDomainConfiguration.NeedsRootURL=Só é possível configurar a URL raiz do recurso se a URL do Jenkins estiver \
diff --git a/core/src/main/resources/jenkins/security/Messages_ru.properties b/core/src/main/resources/jenkins/security/Messages_ru.properties
index d69f82714568..e580044a236b 100644
--- a/core/src/main/resources/jenkins/security/Messages_ru.properties
+++ b/core/src/main/resources/jenkins/security/Messages_ru.properties
@@ -29,7 +29,6 @@ ApiTokenProperty.ChangeToken.CapabilityNotAllowed=<div>Возможность п
   уже существующего, отключена в настройках безопасности</div>
 ApiTokenProperty.LegacyTokenName=Токен предыдущей версии
 ApiTokenProperty.NoLegacyToken=У этого пользователя нет токена предыдущей версии
-RekeySecretAdminMonitor.DisplayName=Смена ключей
 UpdateSiteWarningsMonitor.DisplayName=Предупреждения от сайтов обновлений
 Token.Created.on=Токен создан {0}
 
diff --git a/core/src/main/resources/jenkins/security/Messages_sr.properties b/core/src/main/resources/jenkins/security/Messages_sr.properties
index 0f698a102773..9c80fcbfdd3a 100644
--- a/core/src/main/resources/jenkins/security/Messages_sr.properties
+++ b/core/src/main/resources/jenkins/security/Messages_sr.properties
@@ -4,4 +4,3 @@ ApiTokenProperty.DisplayName=Токен за АПИ
 ApiTokenProperty.ChangeToken.TokenIsHidden=Токен је сакривен
 ApiTokenProperty.ChangeToken.Success=<div>Ажурирано. Проверите нови токен приказан изнад.</div>
 ApiTokenProperty.ChangeToken.SuccessHidden=<div>Ажурирано. Морате се пријавити као корисник да би могли проверити токен.</div>
-RekeySecretAdminMonitor.DisplayName=Поново хеширање
diff --git a/core/src/main/resources/jenkins/security/Messages_sv_SE.properties b/core/src/main/resources/jenkins/security/Messages_sv_SE.properties
index 587e203dd532..c577663747b9 100644
--- a/core/src/main/resources/jenkins/security/Messages_sv_SE.properties
+++ b/core/src/main/resources/jenkins/security/Messages_sv_SE.properties
@@ -27,7 +27,6 @@ ApiTokenProperty.ChangeToken.SuccessHidden=<div>Uppdaterades. Du måste logga in
 ApiTokenProperty.ChangeToken.CapabilityNotAllowed=<div>Möjligheten att generera en äldre token utan en befintlig är för närvarande inaktiverad i säkerhetskonfigurationen</div>
 ApiTokenProperty.LegacyTokenName=Äldre token
 ApiTokenProperty.NoLegacyToken=Den här användaren har för närvarande ingen äldre token
-RekeySecretAdminMonitor.DisplayName=Ange nyckel igen
 UpdateSiteWarningsMonitor.DisplayName=Uppdatera webbplatsvarningar
 Token.Created.on=Token skapades {0}
 
diff --git a/core/src/main/resources/jenkins/security/Messages_zh_TW.properties b/core/src/main/resources/jenkins/security/Messages_zh_TW.properties
index 4a65b17bc563..7ce2b9ccb443 100644
--- a/core/src/main/resources/jenkins/security/Messages_zh_TW.properties
+++ b/core/src/main/resources/jenkins/security/Messages_zh_TW.properties
@@ -22,4 +22,3 @@
 
 ApiTokenProperty.DisplayName=API Token
 ApiTokenProperty.ChangeToken.Success=<div>已更新</div>
-RekeySecretAdminMonitor.DisplayName=金鑰重套
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description.jelly b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description.jelly
deleted file mode 100644
index bb405e931933..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description.jelly
+++ /dev/null
@@ -1,4 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:st="jelly:stapler">
-    ${%blurb}
-</j:jelly>
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description.properties
deleted file mode 100644
index e74250b62a07..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description.properties
+++ /dev/null
@@ -1 +0,0 @@
-blurb = Informs about the need to perform secret re-keying due to <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">a security vulnerability</a> that was fixed in 2013.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_fr.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_fr.properties
deleted file mode 100644
index d90c590de94d..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_fr.properties
+++ /dev/null
@@ -1 +0,0 @@
-blurb = Informe à propos de la nécessité de regénérer une clé de chiffrement à cause <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">d''une vulnérabilité de sécurité</a> corrigée en 2013.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_pt_BR.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_pt_BR.properties
deleted file mode 100644
index 9ff0f6b07610..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_pt_BR.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=Informa sobre a necessidade de recriar o chaveamento de segredo devido a <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">vulnerabilidade de segurança</a> corrigida em 2013.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_ru.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_ru.properties
deleted file mode 100644
index d53bc95fb4b4..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_ru.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-blurb = Информирует о надобности смены ключей секретов из-за <a href="https://www.jenkins.io/redirect/rekey" \
-  rel="noopener noreferrer" target="_blank">уязвимости</a>, исправленной в 2013.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_sv_SE.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_sv_SE.properties
deleted file mode 100644
index 7864657a7edb..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/description_sv_SE.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-blurb=Informerar när en hemlig nyckel behöver anges igen på grund av <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">en säkerhetsrisk</a> som fixades 2013.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
deleted file mode 100644
index e481b7009465..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-The MIT License
-
-Copyright (c) 2013, CloudBees, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-package jenkins.security.RekeySecretAdminMonitor
-
-def f = namespace(lib.FormTagLib)
-
-if (!my.isDone()) {
-    div(class:"jenkins-alert jenkins-alert-danger") {
-        raw _("pleaseRekeyAsap", app.rootDir, my.url)
-    }
-}
-
-if (my.isFixingActive()) {
-    div(class:"jenkins-alert jenkins-alert-info") {
-        raw _("rekeyInProgress", my.url)
-    }
-} else if (my.logFile.exists()) {
-    if (my.isDone()) {
-        div(class:"jenkins-alert jenkins-alert-info") {
-            raw _("rekeySuccessful", my.url)
-        }
-    } else {
-        div(class:"jenkins-alert jenkins-alert-warning") {
-            raw _("rekeyHadProblems", my.url)
-        }
-    }
-}
-
-form(method: "post", action: "${rootURL}/${my.url}/scan", name:"rekey") {
-    f.submit(name: "background", value:_("Re-key in background now"))
-    if (my.isScanOnBoot()) {
-        button(type: "button", class: "jenkins-button jenkins-button--primary", disabled: "true") {
-            raw _("Re-keying currently scheduled during the next startup")
-        }
-    } else {
-        f.submit(name: "schedule", value:_("Schedule a re-key during the next startup"))
-    }
-    f.submit(name: "dismiss", value:_("Dismiss"))
-}
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.properties
deleted file mode 100644
index d239da3b9e47..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-pleaseRekeyAsap=\
-    Because of <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">a security vulnerability</a> discovered earlier, we need to \
-    change the encryption key used to protect secrets in your configuration files on the disk. \
-    This process scans a large portion of your <code>$JENKINS_HOME</code> (<code>{0}</code>), \
-    find encrypted data, re-key them, which will take some time. \
-    See <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">this document</a> for more implications about different ways of doing this \
-    (or not doing this.) This operation can be safely run in background, but cautious users \
-    are recommended to take backups.
-
-rekeyInProgress=Re-keying is in progress. <a href="{0}/log">You can check the log</a>.
-
-rekeySuccessful=\
-  Secrets in your <code>$JENKINS_HOME</code> has been re-keyed successfully. \
-  <a href="{0}/log">Please check the log</a>, confirm the success, and then dismiss or re-run.
-
-rekeyHadProblems=\
-  Re-keying has completed, but there were problems. <a href="{0}">Please check the log</a>.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_fr.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_fr.properties
deleted file mode 100644
index 155f9ce200cb..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_fr.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-pleaseRekeyAsap=\
-    À cause de <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">la vulnérabilité de sécurité</a> découverte précédemment, nous devons \
-    changer la clé de chiffrement utilisée pour protéger vos fichiers de configuration stockés sur disque. \
-    Ce processus scanne une large portion de votre <code>$JENKINS_HOME</code> (<code>{0}</code>), \
-    trouve les données chiffrées et les rechiffre, ce qui prendre du temps. \
-    Consulter <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">ce document</a> pour plus d''informations sur les différentes façons de le faire \
-    (ou pas). Cette opération peut s''exécuter de manière sûre en tâche de fond, mais nous recommandons aux utilisateurs précautionneux \
-    d''effectuer des sauvegardes.
-
-rekeyInProgress=Rechiffrement en cours. <a href="{0}/log">Vous pouvez consulter les logs</a>.
-
-rekeySuccessful=\
-  Les secrets dans votre <code>$JENKINS_HOME</code> ont été rechiffrés avec succès. \
-  <a href="{0}/log">Veuillez consulter les logs</a>, confirmer le succès ou réexécuter le cas échéant.
-
-rekeyHadProblems=\
-  Le rechiffrement est terminé, mais il y a eu des problèmes. <a href="{0}">Veuillez consulter les logs</a>.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_it.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_it.properties
deleted file mode 100644
index bdf1de25cd69..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_it.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-# The MIT License
-#
-# Italian localization plugin for Jenkins
-# Copyright © 2020 Alessandro Menti
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Dismiss=Nascondi
-pleaseRekeyAsap=A causa di <a href="https://www.jenkins.io/redirect/rekey" \
-  rel="noopener noreferrer" target="_blank">una vulnerabilità di sicurezza</a> scoperta in precedenza, \
-  è necessario modificare la chiave crittografica utilizzata per proteggere i \
-  segreti salvati nei file di configurazione su disco. Questa procedura \
-  esegue la scansione della maggior parte della directory \
-  <code>$JENKINS_HOME</code> (<code>{0}</code>), trova i dati crittografati e \
-  li cripta nuovamente con la nuova chiave; tutte queste operazioni \
-  richiedono del tempo. Si veda <a href="https://www.jenkins.io/redirect/rekey" \
-  rel="noopener noreferrer" target="_blank">questo documento</a> per le implicazioni derivanti dallo \
-  scegliere una modalità anziché un''altra (o dal non eseguire \
-  quest''operazione). Quest''operazione può essere eseguita in secondo piano \
-  in modo sicuro, ma gli utenti più prudenti potrebbero voler eseguire delle \
-  copie di backup.
-Re-key\ in\ background\ now=Cripta ora tutti i dati con una nuova chiave in \
-  secondo piano
-Re-keying\ currently\ scheduled\ during\ the\ next\ startup=La modifica \
-  della chiave è attualmente pianificata al prossimo avvio
-rekeyHadProblems=La modifica della chiave è stata completata, ma si sono \
-  verificati dei problemi. <a href="{0}">Controllare il log</a>.
-rekeyInProgress=La modifica della chiave è in corso. <a href="{0}/log">È \
-  possibile controllare il log</a>.
-rekeySuccessful=I segreti salvati nella directory <code>$JENKINS_HOME</code> \
-  sono stati criptati con successo con la nuova chiave. <a href="{0}/log">\
-  Controllare il log</a>, verificare che l''operazione sia stata eseguita \
-  correttamente e quindi nascondere il messaggio oppure eseguire nuovamente \
-  l''operazione.
-Schedule\ a\ re-key\ during\ the\ next\ startup=Pianifica la modifica della \
-  chiave al prossimo avvio
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_pt_BR.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_pt_BR.properties
deleted file mode 100644
index 0085368d2d60..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_pt_BR.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number
-# of other of contributors.
-# Copyright (c) 2022- Jenkins contributors.
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-pleaseRekeyAsap=Por conta da \
-  <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">falha de segurança</a> \
-  descoberta anteriormente precisamos mudar a chave de criptografia utilizada para proteger os segredos nos seus \
-  arquivos de configuração disponíveis em disco. Este processo verifica uma larga porção do seu \
-  <code>$JENKINS_HOME</code> (<code>{0}</code>), busca por dados criptografados e os criptografa novamente, o que irá \
-  levar algum tempo. Veja \
-  <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">este documento</a> para \
-  maiores implicações sobre os modos diferentes de fazer (ou não) isto. Esta operação pode ser executada seguramente \
-  em plano de fundo, mas usuários mais cautelosos considerem-se avisados para criar cópias de segurança.
-rekeyInProgress=O processo de criptografar novamente está em progresso. <a href="{0}/log">Você pode verificar o \
-  registro de execução</a>.
-rekeySuccessful=Segredos no seu <code>$JENKINS_HOME</code> foram recriptogrados novamente. \
-  <a href="{0}/log">Por favor, verifique o registro de execução</a>, confirme se tudo ocorreu com sucesso ou execute \
-  novamente.
-rekeyHadProblems=A recriptografia está concluída, mas ocorreram problemas. <a href="{0}">Por favor revise os registros \
-  de execução</a>.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_ru.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_ru.properties
deleted file mode 100644
index cc48b8cb158a..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_ru.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-pleaseRekeyAsap=\
-  Из-за <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">уязвимости</a>, \
-  обнаруженной ранее, необходимо \
-  сменить ключ шифрования, используемый для защиты секретов в файлах конфигурации на диске. \
-  Этот процесс просканирует большую часть директории <code>$JENKINS_HOME</code> (<code>{0}</code>), \
-  найдёт шифрованные данные и сменит ключ. Это займёт некоторое время. \
-  Больше информации о последствиях разных способов выполнения этой операции (или бездействия) \
-  см. в <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">этом документе</a>. \
-  Эту операцию безопасно выполнять в фоновом режиме, но осторожным пользователям \
-  рекомендуется сделать резервную копию.
-
-rekeyInProgress=Выполняется смена ключа. <a href="{0}/log">Вы можете просмотреть лог</a>.
-
-rekeySuccessful=\
-  Ключ секретов в <code>$JENKINS_HOME</code> успешно сменён. \
-  <a href="{0}/log">Пожалуйста, просмотрите лог</a>, убедитесь, что операция успешна, затем скройте это уведомление \
-  или перезапустите операцию.
-
-rekeyHadProblems=\
-  Смена ключей завершена, но есть проблемы. <a href="{0}">Пожалуйста, просмотрите лог</a>.
-
-Re-key\ in\ background\ now=Сменить ключи в фоновом режиме сейчас
-Schedule\ a\ re-key\ during\ the\ next\ startup=Запланировать смену ключей при следующем запуске
-Re-keying\ currently\ scheduled\ during\ the\ next\ startup=Смена ключей запланирована при следующем запуске
-Dismiss=Скрыть
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_sr.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_sr.properties
deleted file mode 100644
index 0f3190504f6c..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_sr.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is under the MIT License by authors
-
-pleaseRekeyAsap=\
-    Због отривене <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">рањивости</a>, морамо \
-    променити кључ за шифровање тајни да диску. \
-    Тај процес претражи велики део вашег <code>$JENKINS_HOME</code> ({0}) директоријума, \
-    и поново изграчуна хеш за пронађене податке, што може прилично дуго трајати. \
-    Прочитајте <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">овај документ</a> где се пише о више импликација и другачије начине \
-    Ова операција се може безбедно извршити у позадини, међутим обазриви корисници \
-    би могли направити резервне копије подацима.
-
-rekeyInProgress=Поново хеширање је у току. <a href="{0}/log">Можете прегледајти журнал</a>.
-
-rekeySuccessful=\
-  Secrets in your <code>$JENKINS_HOME</code> је успешно изхеширано. \
-  <a href="{0}/log">Молимо прегледајте журнал</a>, потврдите, и наставите или поново извршите.
-
-rekeyHadProblems=\
-  Поново хеширање је готово, међутим било је грешака. <a href="{0}">Молимо прегледајте журнал</a>.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_sv_SE.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_sv_SE.properties
deleted file mode 100644
index db8387935c83..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_sv_SE.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-pleaseRekeyAsap=\
-    På grund av <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">en säkerhetsrisk</a> som upptäcktes tidigare måste vi \
-    ändra krypteringsnyckeln som används för att skydda hemligheter i dina konfigurationsfiler på disken. \
-    Denna process skannar en stor del av din <code>$JENKINS_HOME</code> (<code>{0}</code>) \
-    för att hitta krypterad data och tilldela nya nycklar, vilket kommer att ta en stund. \
-    Se <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">det här dokumentet</a> för fler implikationer om olika sätt att göra (eller inte göra) \
-    detta. Denna åtgärd är säker att köras i bakgrunden, men försiktiga användare rekommenderas att göra säkerhetskopior.
-
-rekeyInProgress=Nya nycklar tilldelas. <a href="{0}/log">Visa loggen</a>.
-
-rekeySuccessful=\
-  Hemligheter i din <code>$JENKINS_HOME</code> har fått nya nycklar. \
-  <a href="{0}/log">Visa loggen</a>, bekräfta resultatet och sedan avfärda eller kör igen.
-
-rekeyHadProblems=\
-  Nya nycklar har tilldelats, men problem uppstod. <a href="{0}">Visa loggen</a>.
diff --git a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_zh_TW.properties b/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_zh_TW.properties
deleted file mode 100644
index 0a5da78c915d..000000000000
--- a/core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message_zh_TW.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2013, Chunghwa Telecom Co., Ltd., Pei-Tang Huang
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-pleaseRekeyAsap=\
-    為了修正先前發現的<a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">安全性弱點</a>，\
-    用來保護磁碟上含機敏設定檔的加密金鑰一定要更改。\
-    整個程序會掃描您 <code>$JENKINS_HOME</code> ({0}) 中的大部分檔案，找出加密的資料重套金鑰，可能要花上不少時間。\
-    <a href="https://www.jenkins.io/redirect/rekey" rel="noopener noreferrer" target="_blank">這份文件</a>說明了實施 (或什麼事都不做) 這項措施的方法及影響。\
-    這項作業可以安全的在背景執行，不過如果您很謹慎，建議您先做好備份。
-
-rekeyInProgress=金鑰重套中。<a href="{0}/log">您可以查看記錄</a>。
-
-rekeySuccessful=\
-  您 <code>$JENKINS_HOME</code> 中的機敏檔案重套金鑰成功。\
-  <a href="{0}/log">請查看記錄</a>，確認是否真的成功，再決定要略過或是重跑一次。
-
-rekeyHadProblems=\
-  金鑰重套完成，但是遇到一些問題。<a href="{0}">請查看記錄</a>。
-
-Re-key\ in\ background\ now=馬上在背景重套金鑰
-Re-keying\ currently\ scheduled\ during\ the\ next\ startup=已經排定在下次啟動後重套金鑰
-Schedule\ a\ re-key\ during\ the\ next\ startup=排程在下次啟動後重套金鑰
-Dismiss\ this\ message=忽略這個訊息
diff --git a/core/src/test/java/hudson/util/SecretRewriterTest.java b/core/src/test/java/hudson/util/SecretRewriterTest.java
deleted file mode 100644
index 4c13761a4caf..000000000000
--- a/core/src/test/java/hudson/util/SecretRewriterTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package hudson.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
-
-import hudson.FilePath;
-import hudson.Functions;
-import hudson.model.TaskListener;
-import java.io.File;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Base64;
-import java.util.List;
-import java.util.regex.Pattern;
-import javax.crypto.Cipher;
-import jenkins.security.ConfidentialStoreRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-public class SecretRewriterTest {
-
-    @Rule
-    public ConfidentialStoreRule confidentialStoreRule = new ConfidentialStoreRule();
-
-    @Rule
-    public TemporaryFolder tmp = new TemporaryFolder();
-
-    private static final Pattern FOO_PATTERN = Pattern.compile("<foo>[{][A-Za-z0-9+/]+={0,2}[}]</foo>");
-    private static final Pattern MSG_PATTERN = Pattern.compile("<msg>[{][A-Za-z0-9+/]+={0,2}[}]</msg>");
-    private static final Pattern FOO_PATTERN2 = Pattern.compile("(<foo>[{][A-Za-z0-9+/]+={0,2}[}]</foo>){2}");
-    private static final Pattern ABC_FOO_PATTERN = Pattern.compile("<abc>\\s<foo>[{][A-Za-z0-9+/]+={0,2}[}]</foo>\\s</abc>");
-
-    @Test
-    public void singleFileRewrite() throws Exception {
-        String o = encryptOld("foobar"); // old
-        String n = encryptNew("foobar"); // new
-        assertTrue(FOO_PATTERN.matcher(roundtrip("<foo>" + o + "</foo>")).matches());
-        assertTrue(FOO_PATTERN2.matcher(roundtrip("<foo>" + o + "</foo><foo>" + o + "</foo>")).matches());
-        assertEquals("<foo>" + n + "</foo>", roundtrip("<foo>" + n + "</foo>"));
-        assertEquals("<foo>thisIsLegalBase64AndLongEnoughThatItCouldLookLikeSecret</foo>", roundtrip("  <foo>thisIsLegalBase64AndLongEnoughThatItCouldLookLikeSecret</foo>  "));
-        // to be rewritten, it needs to be between a tag
-        assertEquals("<foo>" + o, roundtrip("<foo>" + o));
-        assertEquals(o + "</foo>", roundtrip(o + "</foo>"));
-        assertTrue(ABC_FOO_PATTERN.matcher(roundtrip("<abc>\n<foo>" + o + "</foo>\n</abc>")).matches());
-    }
-
-    private String roundtrip(String before) throws Exception {
-        SecretRewriter sr = new SecretRewriter();
-        Path path = Files.createTempFile(tmp.getRoot().toPath(), "test", "xml");
-        Files.writeString(path, before, Charset.defaultCharset());
-        sr.rewrite(path.toFile());
-        //assert after.replaceAll(System.getProperty("line.separator"), "\n").trim()==f.text.replaceAll(System.getProperty("line.separator"), "\n").trim()
-        return Files.readString(path, Charset.defaultCharset()).replaceAll(System.lineSeparator(), "\n").trim();
-    }
-
-    @SuppressWarnings("deprecation")
-    private String encryptOld(String str) throws Exception {
-        Cipher cipher = Secret.getCipher("AES");
-        cipher.init(Cipher.ENCRYPT_MODE, HistoricalSecrets.getLegacyKey());
-        return Base64.getEncoder().encodeToString(cipher.doFinal((str + HistoricalSecrets.MAGIC).getBytes(StandardCharsets.UTF_8)));
-    }
-
-    private String encryptNew(String str) {
-        return Secret.fromString(str).getEncryptedValue();
-    }
-
-    /**
-     * Directory rewrite and recursion detection
-     */
-    @Test
-    public void recursionDetection() throws Exception {
-        assumeFalse("Symlinks don't work on Windows very well", Functions.isWindows());
-        SecretRewriter sw = new SecretRewriter();
-        TaskListener st = StreamTaskListener.fromStdout();
-
-        String o = encryptOld("Hello world");
-        String n = encryptNew("Hello world");
-        String payload = "<msg>" + o + "</msg>";
-
-        // set up some directories with stuff
-        File t = tmp.newFolder("t");
-        List<String> dirs = List.of("a", "b", "c", "c/d", "c/d/e");
-        for (String p : dirs) {
-            File d = new File(t, p);
-            d.mkdir();
-            Files.writeString(d.toPath().resolve("foo.xml"), payload, Charset.defaultCharset());
-        }
-
-        // stuff outside
-        File t2 = tmp.newFolder("t2");
-        Files.writeString(t2.toPath().resolve("foo.xml"), payload, Charset.defaultCharset());
-
-        // some recursions as well as valid symlinks
-        new FilePath(t).child("c/symlink").symlinkTo("..", st);
-        new FilePath(t).child("b/symlink").symlinkTo(".", st);
-        new FilePath(t).child("a/symlink").symlinkTo(t2.getAbsolutePath(), st);
-
-        assertEquals(6, sw.rewriteRecursive(t, st));
-
-        for (String p : dirs) {
-            assertTrue(MSG_PATTERN.matcher(Files.readString(new File(t, p + "/foo.xml").toPath(), Charset.defaultCharset()).trim()).matches());
-        }
-
-        // t2 is only reachable by following a symlink. this should be covered, too
-        assertTrue(MSG_PATTERN.matcher(Files.readString(new File(t2, "foo.xml").toPath(), Charset.defaultCharset()).trim()).matches());
-    }
-
-}
diff --git a/test/src/test/java/jenkins/security/RekeySecretAdminMonitorTest.java b/test/src/test/java/jenkins/security/RekeySecretAdminMonitorTest.java
deleted file mode 100644
index c04c2a1c893a..000000000000
--- a/test/src/test/java/jenkins/security/RekeySecretAdminMonitorTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package jenkins.security;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-
-import hudson.ExtensionList;
-import hudson.FilePath;
-import hudson.Util;
-import hudson.util.Secret;
-import hudson.util.SecretHelper;
-import java.io.File;
-import java.io.IOException;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Base64;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-import javax.crypto.Cipher;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
-import org.htmlunit.ElementNotFoundException;
-import org.htmlunit.html.DomNodeUtil;
-import org.htmlunit.html.HtmlButton;
-import org.htmlunit.html.HtmlForm;
-import org.htmlunit.html.HtmlPage;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRecipe;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.xml.sax.SAXException;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-public class RekeySecretAdminMonitorTest {
-
-    @Rule public JenkinsRule j = new JenkinsRule();
-
-    RekeySecretAdminMonitor monitor;
-
-    final String plain_regex_match = ".*\\{[A-Za-z0-9+/]+={0,2}}.*";
-
-    @Before
-    public void setUp() {
-        monitor = ExtensionList.lookupSingleton(RekeySecretAdminMonitor.class);
-    }
-
-    @JenkinsRecipe(RekeySecretAdminMonitorTest.WithTestSecret.RuleRunnerImpl.class)
-    @Target(METHOD)
-    @Retention(RUNTIME)
-    public @interface WithTestSecret {
-        class RuleRunnerImpl extends JenkinsRecipe.Runner<RekeySecretAdminMonitorTest.WithTestSecret> {
-            @Override
-            public void setup(JenkinsRule jenkinsRule, WithTestSecret recipe) {
-                SecretHelper.set(TEST_KEY);
-            }
-
-            @Override
-            public void tearDown(JenkinsRule jenkinsRule, WithTestSecret recipe) {
-                SecretHelper.set(null);
-            }
-        }
-    }
-
-    @JenkinsRecipe(RekeySecretAdminMonitorTest.WithScanOnBoot.RuleRunnerImpl.class)
-    @Target(METHOD)
-    @Retention(RUNTIME)
-    public @interface WithScanOnBoot {
-        class RuleRunnerImpl extends JenkinsRecipe.Runner<RekeySecretAdminMonitorTest.WithScanOnBoot> {
-            @Override
-            public void decorateHome(JenkinsRule jenkinsRule, File home) throws Exception {
-                // schedule a scan on boot
-                File f = new File(home, RekeySecretAdminMonitor.class.getName() + "/scanOnBoot");
-                f.getParentFile().mkdirs();
-                new FilePath(f).touch(0);
-
-                // and stage some data
-                putSomeOldData(home);
-            }
-        }
-    }
-
-    private static void putSomeOldData(File dir) throws Exception {
-        File xml = new File(dir, "foo.xml");
-        Files.writeString(xml.toPath(), "<foo>" + encryptOld(TEST_KEY) + "</foo>", StandardCharsets.UTF_8);
-    }
-
-    private void verifyRewrite(File dir) throws Exception {
-        Path xml = dir.toPath().resolve("foo.xml");
-        Pattern pattern = Pattern.compile("<foo>" + plain_regex_match + "</foo>");
-        MatcherAssert.assertThat(Files.readString(xml, StandardCharsets.UTF_8).trim(), Matchers.matchesRegex(pattern));
-    }
-
-    @WithTestSecret
-    @Test
-    public void testBasicWorkflow() throws Exception {
-        putSomeOldData(j.jenkins.getRootDir());
-        monitor.setNeeded();
-
-        JenkinsRule.WebClient wc = j.createWebClient();
-
-        // one should see the warning. try scheduling it
-        assertFalse(monitor.isScanOnBoot());
-        HtmlForm form = getRekeyForm(wc);
-        j.submit(form, "schedule");
-        assertTrue(monitor.isScanOnBoot());
-        form = getRekeyForm(wc);
-        assertTrue(getButton(form, 1).isDisabled());
-
-        // run it now
-        assertFalse(monitor.getLogFile().exists());
-        j.submit(form, "background");
-        assertTrue(monitor.getLogFile().exists());
-
-        // should be no warning/error now
-        HtmlPage manage = wc.goTo("manage");
-        assertEquals(0, DomNodeUtil.selectNodes(manage, "//*[class='error']").size());
-        assertEquals(0, DomNodeUtil.selectNodes(manage, "//*[class='warning']").size());
-
-        // and the data should be rewritten
-        verifyRewrite(j.jenkins.getRootDir());
-        assertTrue(monitor.isDone());
-
-        // dismiss and the message will be gone
-        assertTrue(monitor.isEnabled());
-        form = getRekeyForm(wc);
-        j.submit(form, "dismiss");
-        assertFalse(monitor.isEnabled());
-        assertThrows(ElementNotFoundException.class, () -> getRekeyForm(wc));
-    }
-
-    private HtmlForm getRekeyForm(JenkinsRule.WebClient wc) throws IOException, SAXException {
-        return wc.goTo("manage").getFormByName("rekey");
-    }
-
-    private HtmlButton getButton(HtmlForm form, int index) {
-        // due to the removal of method HtmlElement.getHtmlElementsByTagName
-        Stream<HtmlButton> buttonStream = form.getElementsByTagName("button").stream()
-                .filter(HtmlButton.class::isInstance)
-                .map(HtmlButton.class::cast);
-
-        if (index > 0) {
-            buttonStream = buttonStream.skip(index);
-        }
-
-        return buttonStream
-                .findFirst()
-                .orElse(null);
-    }
-
-    @WithTestSecret
-    @WithScanOnBoot
-    @Test
-    public void testScanOnBoot() throws Exception {
-        JenkinsRule.WebClient wc = j.createWebClient();
-
-        // scan on boot should have run the scan
-        assertTrue(monitor.getLogFile().exists());
-        assertFalse("scan on boot should have turned this off", monitor.isScanOnBoot());
-
-        // and data should be migrated
-        verifyRewrite(j.jenkins.getRootDir());
-
-        // should be no warning/error now
-        HtmlPage manage = wc.goTo("manage");
-        assertEquals(0, DomNodeUtil.selectNodes(manage, "//*[class='error']").size());
-        assertEquals(0, DomNodeUtil.selectNodes(manage, "//*[class='warning']").size());
-    }
-
-    private static String encryptOld(String str) throws Exception {
-        Cipher cipher = Secret.getCipher("AES");
-        cipher.init(Cipher.ENCRYPT_MODE, Util.toAes128Key(TEST_KEY));
-        return Base64.getEncoder().encodeToString(cipher.doFinal((str + "::::MAGIC::::").getBytes(StandardCharsets.UTF_8)));
-    }
-
-    private String encryptNew(String str) {
-        return Secret.fromString(str).getEncryptedValue();
-    }
-
-    private static final String TEST_KEY = "superDuperSecretWasNotSoSecretAfterAll";
-}

From dc62589a40663dd44665f45df57bfc5c57e280ae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2024 19:21:16 -0700
Subject: [PATCH 316/449] Update jenkins/ath Docker tag to v5941 (#9617)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index eaa4396152f0..415a9c6bd72d 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5929.v295db_5f04eb_1
+export ATH_VERSION=5941.v95f3439136c7
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From 7e46c4832448d3ecdddbb0226476566019f4b567 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 16 Aug 2024 16:04:52 -0700
Subject: [PATCH 317/449] Updates to `CONTRIBUTING.md` (#9615)

---
 CONTRIBUTING.md | 59 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 58af2c65852e..5933560a951b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,8 +14,6 @@ This page provides information about contributing code to the Jenkins core codeb
    - Apache Maven 3.8.1 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.
-   - Install [Node.js 20.x](https://nodejs.org/en/). **Note:** only needed to work on the frontend assets found in the `war` module.
-     - Frontend tasks are run using [yarn](https://yarnpkg.com/). Run `npm install -g yarn` to install it.
 4. Set up your development environment as described in [Preparing for Plugin Development](https://www.jenkins.io/doc/developer/tutorial/prepare/)
 
 If you want to contribute to Jenkins, or just learn about the project,
@@ -28,6 +26,8 @@ You can find them by using this query (check the link) for [newbie friendly issu
 The Jenkins core build flow is built around Maven.
 You can read a description of the [building and debugging process here](https://www.jenkins.io/doc/developer/building/).
 
+### Building the WAR file
+
 If you want simply to build the `jenkins.war` file as fast as possible without tests, run:
 
 ```sh
@@ -40,14 +40,31 @@ If you want to debug the WAR file without using Maven plugins,
 You can run the executable with [Remote Debug Flags](https://stackoverflow.com/questions/975271/remote-debugging-a-java-application)
 and then attach IDE Debugger to it.
 
-To launch a development instance, after the above command, run:
+### Launching a development instance
+
+To launch a development instance, after [building the WAR file](#building-the-war-file), run:
 
 ```sh
-mvn -pl war jetty:run
+MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED' mvn -pl war jetty:run
 ```
 
 (Beware that `maven-plugin` builds will not work in this mode, due to class loading conflicts.)
 
+### Running the Yarn frontend build
+
+To run the Yarn frontend build, after [building the WAR file](#building-the-war-file), add the downloaded versions of Node and Yarn to your path:
+
+```sh
+export PATH=$PWD/war/node:$PWD/war/node/yarn/dist/bin:$PATH
+```
+
+Then you can run Yarn with e.g.
+
+```sh
+cd war
+yarn
+```
+
 ### Building frontend assets
 
 To work on the `war` module frontend assets, two processes are needed at the same time:
@@ -55,13 +72,14 @@ To work on the `war` module frontend assets, two processes are needed at the sam
 On one terminal, start a development server that will not process frontend assets:
 
 ```sh
-mvn -pl war jetty:run -Dskip.yarn
+MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED' mvn -pl war jetty:run -Dskip.yarn
 ```
 
-On another terminal, move to the war folder and start a [webpack](https://webpack.js.org/) dev server:
+On another terminal, move to the `war` folder and start a [webpack](https://webpack.js.org/) dev server, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build):
 
 ```sh
-cd war; yarn start
+cd war
+yarn start
 ```
 
 ### Gitpod
@@ -86,11 +104,24 @@ For linting we use a number of tools:
 
 These are all configured to run as part of the Maven build, although they will be skipped if you are building with the `quick-build` profile.
 
-To automatically fix most issues run:
+To automatically fix backend issues, run:
 
-```bash
+```sh
 mvn spotless:apply
-mvn -pl war frontend:yarn -Dfrontend.yarn.arguments=lint:fix
+```
+
+To view frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:
+
+```sh
+cd war
+yarn lint
+```
+
+To fix frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:
+
+```sh
+cd war
+yarn lint:fix
 ```
 
 ## Testing changes
@@ -111,14 +142,6 @@ In addition to the included tests, you can also find extra integration and UI
 tests in the [Acceptance Test Harness (ATH)](https://github.com/jenkinsci/acceptance-test-harness) repository.
 If you propose complex UI changes, you should create new ATH tests for them.
 
-### JavaScript unit tests
-
-In case there's only need to run the JS tests:
-
-```sh
-cd war; yarn test
-```
-
 ## Proposing Changes
 
 The Jenkins project source code repositories are hosted at GitHub.

From ed4fef1f39ee7db175c948d28707bc3ac8f14b0a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 17:50:59 -0700
Subject: [PATCH 318/449] Update dependency io.jenkins.plugins:font-awesome-api
 to v6.6.0-1 (#9621)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index e2aa6f2b68ca..e7d034a5c910 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -75,7 +75,7 @@ THE SOFTWARE.
         <!-- RequireUpperBoundDeps between bootstrap5-api and echarts-api -->
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>font-awesome-api</artifactId>
-        <version>6.5.2-1</version>
+        <version>6.6.0-1</version>
       </dependency>
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index ee76eaf57a98..d3c82418d6ef 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -396,7 +396,7 @@ THE SOFTWARE.
                   <!-- dependency of bootstrap5-api and echarts-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>font-awesome-api</artifactId>
-                  <version>6.5.2-1</version>
+                  <version>6.6.0-1</version>
                   <type>hpi</type>
                 </artifactItem>
 

From 9a02a2107604d9dd3ea9eada537325151a49ac35 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 17:52:04 -0700
Subject: [PATCH 319/449] Update dependency io.jenkins.plugins:echarts-api to
 v5.5.1-1 (#9620)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index d3c82418d6ef..9995e2a0d926 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -358,7 +358,7 @@ THE SOFTWARE.
                   <!-- dependency of junit -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>echarts-api</artifactId>
-                  <version>5.5.0-1</version>
+                  <version>5.5.1-1</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 543004767b4c7a326b50272e424f6fcf22062351 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 11:57:30 -0700
Subject: [PATCH 320/449] Update dependency com.google.guava:guava to
 v33.3.0-jre (#9626)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 268b42af105f..c3269009627e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -88,7 +88,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>33.2.1-jre</version>
+        <version>33.3.0-jre</version>
       </dependency>
       <dependency>
         <!-- Overriding Stapler’s 1.1.3 version to diagnose JENKINS-20618: -->

From 7981996fee2af30e42d0d5b0db43a016f17e17aa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:17:26 +0100
Subject: [PATCH 321/449] Update dependency postcss-preset-env to v10.0.1
 (#9627)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   2 +-
 war/yarn.lock    | 158 +++++++++++++++++++++++------------------------
 2 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/war/package.json b/war/package.json
index 94aed9e08088..919d67c57c09 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.41",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "10.0.0",
+    "postcss-preset-env": "10.0.1",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.3",
     "sass": "1.77.8",
diff --git a/war/yarn.lock b/war/yarn.lock
index 5b6c555820a2..61cc779f98ad 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1394,10 +1394,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@csstools/color-helpers@npm:4.2.1"
-  checksum: 10c0/72e11b186ad0f6019a9b4b3752e620fa798c2a40cf47e8cad565dff46e572c9342eb8cf804542d7886344a1e540555d77f20119ace6b2d8a45b6e5ef8a41685c
+"@csstools/color-helpers@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@csstools/color-helpers@npm:5.0.1"
+  checksum: 10c0/77fa3b7236eaa3f36dea24708ac0d5e53168903624ac5aed54615752a0730cd20773fda50e742ce868012eca8c000cc39688e05869e79f34714230ab6968d1e6
   languageName: node
   linkType: hard
 
@@ -1411,16 +1411,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/css-color-parser@npm:3.0.0"
+"@csstools/css-color-parser@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/css-color-parser@npm:3.0.1"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.2.1"
+    "@csstools/color-helpers": "npm:^5.0.1"
     "@csstools/css-calc": "npm:^2.0.0"
   peerDependencies:
     "@csstools/css-parser-algorithms": ^3.0.0
     "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/9b56ba3b56691d2133f1d9b881131bfd9745024a79f825284109adac05578e15ae3eed0e99c98db162932d69770fc970b5b005996c32cdf7167af3418da263c3
+  checksum: 10c0/8890a621f916cbbf49e749d4e85e934ce55c9f9c339abcc5f4a64bc165605a6e8dd3cad9d3bbc994d2419a3b38981dca84b93ae50aa91d492fb5f0f4c9d95969
   languageName: node
   linkType: hard
 
@@ -1488,33 +1488,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-color-function@npm:4.0.0"
+"@csstools/postcss-color-function@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-color-function@npm:4.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ff0c0c44f5d17bc5e7ea287eff9c10ca334a84d086998a6b243a209f1795d32ba872357935f4176e5206b88dc8d2a204f452c13bc940540b7122e9e807511ac6
+  checksum: 10c0/f0d3dd0677d381df54987d13ea63a59e911816d98a22eda7a5e55ca2908f52afc42fbffb73a8d25a18632b936dc38f6ada9f3e2dd7911cf775ce3718657420f4
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/postcss-color-mix-function@npm:3.0.0"
+"@csstools/postcss-color-mix-function@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-color-mix-function@npm:3.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/120e96581834b2363df1fb653959dc243d93c01bcd70bf2e34418c20cd418a75f8b4e2e81da6955345619dcbb246e7d023f395521522bacb455583c15f61c677
+  checksum: 10c0/ff76400d132c42d70f58b0908ab602b550b43720320288eb4ca1f185e7340c6f232b2a789ac94be255fc7bedc3c6125314d564297d23606fb2c91a1e2d79c40b
   languageName: node
   linkType: hard
 
@@ -1557,46 +1557,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.0"
+"@csstools/postcss-gamut-mapping@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/be1d7f4c96f3bbcb69ed4ccc2ff406a884ae7129e6542ab6800782fbfe4e077159352409961f2da8054ec9fabbf6ed211288f1004c96632a1f6b10bef332d880
+  checksum: 10c0/3415c420463dd481a3ddf5b104f15661492d9aa3613c109f9b7354b2664965a92036045e157945348cf2c06e075b89a0c0c4f49c8a00d41c827c5b61de297cd0
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.0"
+"@csstools/postcss-gradients-interpolation-method@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/04e29fd877a499b9570665aea5b23cd70635b538dd903b9f9706ddd85a2d9c93445aea4b6b7dbcf8986ab58b45bb502ec5060044d945096d0af2eb6cebadb88e
+  checksum: 10c0/a1c5d6bf308ff9e1972cb39030859cd135246f8f697e5d1278ddd8ed27ce53eb76b3e628acc64145290006f45140d0a4a65e5df71f131d3e6447f0e5d3301088
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-hwb-function@npm:4.0.0"
+"@csstools/postcss-hwb-function@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-hwb-function@npm:4.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/1aff69ca364417ac2b7ef1c737f88567f441bfd54d93d7b635e0ad605c61edcc2282bc0e2df73c83d1c6a24487e0acec34a4585d27d5f6027402aaea71696190
+  checksum: 10c0/3247c3ab75d3cdb0ca80f7bb63d944ce933694ee9d7ee68aea11e727e883e0d35936b4a29e28700bda5eea2be26917a6c95c22a6b244e945cc558669f88b8a6e
   languageName: node
   linkType: hard
 
@@ -1634,9 +1634,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-light-dark-function@npm:2.0.0"
+"@csstools/postcss-light-dark-function@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-light-dark-function@npm:2.0.1"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
@@ -1644,7 +1644,7 @@ __metadata:
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d0eb1e04854c4ae425c6aff51ce9d0db90e9457aea3307d3ed916f500d2b5a3314a25d3487ea893e7b006a34c0d155462566d6066c8c54baec33eb104891c6db
+  checksum: 10c0/4caf23781daa72f036a830b7fc2c07cde1122afd7bc7c6a291992b5264ea92c1fb22ec2ed684c5ce50e6e848f6d0ea39ef34a5679ea37a546b8db6eb555e3f80
   languageName: node
   linkType: hard
 
@@ -1748,18 +1748,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-oklab-function@npm:4.0.0"
+"@csstools/postcss-oklab-function@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-oklab-function@npm:4.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9e228049645e6a6baa77d6e7e35b3862f3e2e4836fbf2de43fa246d91f0efa36e7f18eae3f2b224c61e72628aaf14d4bff86c555fb06378d5e05e71dca92f9ec
+  checksum: 10c0/b4450fb792c505936e1f9290e8df5420e98ccba78fa1badc9261ff99bebff8cc3b1f050e518728de791acadba08b5e8c213d97b479f551b72b4f8a5793625998
   languageName: node
   linkType: hard
 
@@ -1774,18 +1774,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.0"
+"@csstools/postcss-relative-color-syntax@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d7ae180d746bd9778d8b9f74f8d644f4c6a98b29659423d4ee2b48f461e90a3e30b44dcf44a181ade083b6c6d1b0346b7b3e62fe67fdeaba59a13f050a19c7d1
+  checksum: 10c0/95a0001549b0fcae6add7db6264d16183734a9dd94e54e9b606b0dcefbd96540d8917707eef2525a5024e4078ef039acfa05c2c1b309fe444a7fc1f1c05d6594
   languageName: node
   linkType: hard
 
@@ -1813,15 +1813,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:4.0.0"
+"@csstools/postcss-text-decoration-shorthand@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:4.0.1"
   dependencies:
-    "@csstools/color-helpers": "npm:^4.2.1"
+    "@csstools/color-helpers": "npm:^5.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/dedc98134648d5306e795e4176b2c39a578a237669562e7d934d0b0ac7411d37bab4065c8b0adfc075b57250daba62f045b86c79286b5f9be55502acef0d88c6
+  checksum: 10c0/81950e248d6019c0066353895e0fa2a5c684b754c9af349218cb919534f5ebf79e5e9c7a10b3af1e9c56de2f246968de3b87a00d8c4102e5f88e0f05c04f9889
   languageName: node
   linkType: hard
 
@@ -4480,7 +4480,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.0"
     postcss: "npm:8.4.41"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:10.0.0"
+    postcss-preset-env: "npm:10.0.1"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.3"
     sass: "npm:1.77.8"
@@ -5421,18 +5421,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-color-functional-notation@npm:7.0.0"
+"postcss-color-functional-notation@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-color-functional-notation@npm:7.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/6afe7b681a16783a27fa9600db348f995dfdbc9c945f6cdcec94ee2419e09cfd1c6e533264b830207f130e19ae18ff689ad9b48bced338f27f898eaecd61f844
+  checksum: 10c0/0cdfae4d85cb34425c8363b699b5da6f0c8cc43e7ce3b7fdd1fd39429ee81a4af75f973cd5c8293b1072688064da17a0a633827f23667e8cc0ff16217f0004eb
   languageName: node
   linkType: hard
 
@@ -5641,18 +5641,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-lab-function@npm:7.0.0"
+"postcss-lab-function@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-lab-function@npm:7.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.1"
     "@csstools/css-parser-algorithms": "npm:^3.0.0"
     "@csstools/css-tokenizer": "npm:^3.0.0"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f3647bcdd8d6140631b97276ecf51f40df2c7564610262a20c608c37c8ab79bf6e02888419dc657afc4720a7378e3ad19f4fdf811a69363424160d548ac68daf
+  checksum: 10c0/8a6f3f465911c5c608650e3ebec01097d274109eea0fceb925f1ca52213c67a6496570ff2ba9af0a6c2153e208ef1d10cc43ad81f38405f5d39639680f7150a9
   languageName: node
   linkType: hard
 
@@ -5968,23 +5968,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-preset-env@npm:10.0.0":
-  version: 10.0.0
-  resolution: "postcss-preset-env@npm:10.0.0"
+"postcss-preset-env@npm:10.0.1":
+  version: 10.0.1
+  resolution: "postcss-preset-env@npm:10.0.1"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^5.0.0"
-    "@csstools/postcss-color-function": "npm:^4.0.0"
-    "@csstools/postcss-color-mix-function": "npm:^3.0.0"
+    "@csstools/postcss-color-function": "npm:^4.0.1"
+    "@csstools/postcss-color-mix-function": "npm:^3.0.1"
     "@csstools/postcss-content-alt-text": "npm:^2.0.0"
     "@csstools/postcss-exponential-functions": "npm:^2.0.0"
     "@csstools/postcss-font-format-keywords": "npm:^4.0.0"
-    "@csstools/postcss-gamut-mapping": "npm:^2.0.0"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.0"
-    "@csstools/postcss-hwb-function": "npm:^4.0.0"
+    "@csstools/postcss-gamut-mapping": "npm:^2.0.1"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.1"
+    "@csstools/postcss-hwb-function": "npm:^4.0.1"
     "@csstools/postcss-ic-unit": "npm:^4.0.0"
     "@csstools/postcss-initial": "npm:^2.0.0"
     "@csstools/postcss-is-pseudo-class": "npm:^5.0.0"
-    "@csstools/postcss-light-dark-function": "npm:^2.0.0"
+    "@csstools/postcss-light-dark-function": "npm:^2.0.1"
     "@csstools/postcss-logical-float-and-clear": "npm:^3.0.0"
     "@csstools/postcss-logical-overflow": "npm:^2.0.0"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0"
@@ -5994,12 +5994,12 @@ __metadata:
     "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.0"
     "@csstools/postcss-nested-calc": "npm:^4.0.0"
     "@csstools/postcss-normalize-display-values": "npm:^4.0.0"
-    "@csstools/postcss-oklab-function": "npm:^4.0.0"
+    "@csstools/postcss-oklab-function": "npm:^4.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^3.0.0"
+    "@csstools/postcss-relative-color-syntax": "npm:^3.0.1"
     "@csstools/postcss-scope-pseudo-class": "npm:^4.0.0"
     "@csstools/postcss-stepped-value-functions": "npm:^4.0.0"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.0"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.1"
     "@csstools/postcss-trigonometric-functions": "npm:^4.0.0"
     "@csstools/postcss-unset-value": "npm:^4.0.0"
     autoprefixer: "npm:^10.4.19"
@@ -6010,7 +6010,7 @@ __metadata:
     cssdb: "npm:^8.1.0"
     postcss-attribute-case-insensitive: "npm:^7.0.0"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^7.0.0"
+    postcss-color-functional-notation: "npm:^7.0.1"
     postcss-color-hex-alpha: "npm:^10.0.0"
     postcss-color-rebeccapurple: "npm:^10.0.0"
     postcss-custom-media: "npm:^11.0.0"
@@ -6023,7 +6023,7 @@ __metadata:
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^6.0.0"
     postcss-image-set-function: "npm:^7.0.0"
-    postcss-lab-function: "npm:^7.0.0"
+    postcss-lab-function: "npm:^7.0.1"
     postcss-logical: "npm:^8.0.0"
     postcss-nesting: "npm:^13.0.0"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -6035,7 +6035,7 @@ __metadata:
     postcss-selector-not: "npm:^8.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/0b61c44233ee7fd17e32912ce028edc19998f30183f1ff2186523c4f9eac4a2a36513af31670e13ceb05f2146c4549a0b870ba0de0e3a08e77a9d57d8de72654
+  checksum: 10c0/5849915d040413f68ab71b3489daaa5b6687b4d4710da47a0d1420df0890858f0b53c9ec6755d872dbe38a2695ab12584be654456e3d6ce311b88927209c02b2
   languageName: node
   linkType: hard
 

From a248879cb2fa62c4badfa7fd42b9b4c5656d1484 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 09:59:02 -0700
Subject: [PATCH 322/449] Update dependency org.apache.maven:maven-core to
 v3.9.9 (#9628)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .gitpod/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitpod/Dockerfile b/.gitpod/Dockerfile
index 63c4aff7d91a..58d3fa8a87f4 100644
--- a/.gitpod/Dockerfile
+++ b/.gitpod/Dockerfile
@@ -1,6 +1,6 @@
 FROM gitpod/workspace-full
 
-ARG MAVEN_VERSION=3.9.8
+ARG MAVEN_VERSION=3.9.9
 
 RUN brew install gh && \
     bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && sdk install maven ${MAVEN_VERSION} && sdk default maven ${MAVEN_VERSION}"

From 9ec7e584c933434272ae91f88e85a403cf95cb5d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 10:42:29 -0700
Subject: [PATCH 323/449] Update dependency stylelint to v16.8.2 (#9630)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 87 +++++++++++++++---------------------------------
 2 files changed, 27 insertions(+), 62 deletions(-)

diff --git a/war/package.json b/war/package.json
index 919d67c57c09..6c239e2385ee 100644
--- a/war/package.json
+++ b/war/package.json
@@ -45,7 +45,7 @@
     "sass": "1.77.8",
     "sass-loader": "16.0.0",
     "style-loader": "4.0.0",
-    "stylelint": "16.8.1",
+    "stylelint": "16.8.2",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
     "webpack": "5.93.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 61cc779f98ad..06d860444b13 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1424,15 +1424,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.7.1":
-  version: 2.7.1
-  resolution: "@csstools/css-parser-algorithms@npm:2.7.1"
-  peerDependencies:
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/7d29bef6f5790ddb67d922ad232253bf910e4fa5293f5e4a5ed8b920ae9bd4e8171942df7d8943af23b42fd4e9fb460181394d20c97da9562e6ce98a875e8c47
-  languageName: node
-  linkType: hard
-
 "@csstools/css-parser-algorithms@npm:^3.0.0":
   version: 3.0.0
   resolution: "@csstools/css-parser-algorithms@npm:3.0.0"
@@ -1442,13 +1433,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.4.1":
-  version: 2.4.1
-  resolution: "@csstools/css-tokenizer@npm:2.4.1"
-  checksum: 10c0/fe71cee85ec7372da07083d088b6a704f43e5d3d2d8071c4b8a86fae60408b559a218a43f8625bf2f0be5c7f90c8f3ad20a1aae1921119a1c02b51c310cc2b6b
-  languageName: node
-  linkType: hard
-
 "@csstools/css-tokenizer@npm:^3.0.0":
   version: 3.0.0
   resolution: "@csstools/css-tokenizer@npm:3.0.0"
@@ -1456,16 +1440,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.13":
-  version: 2.1.13
-  resolution: "@csstools/media-query-list-parser@npm:2.1.13"
-  peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.7.1
-    "@csstools/css-tokenizer": ^2.4.1
-  checksum: 10c0/8bf72342c15581b8f658633436d83c26a214056f6b960ff121b940271f4b1b5b07e9cc3990a73e684fb72319592f0c392408b4f0e08bbe242b2065aa456e2733
-  languageName: node
-  linkType: hard
-
 "@csstools/media-query-list-parser@npm:^3.0.0":
   version: 3.0.0
   resolution: "@csstools/media-query-list-parser@npm:3.0.0"
@@ -1856,15 +1830,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@csstools/selector-specificity@npm:3.1.1"
-  peerDependencies:
-    postcss-selector-parser: ^6.0.13
-  checksum: 10c0/1d4a3f8015904d6aeb3203afe0e1f6db09b191d9c1557520e3e960c9204ad852df9db4cbde848643f78a26f6ea09101b4e528dbb9193052db28258dbcc8a6e1d
-  languageName: node
-  linkType: hard
-
 "@csstools/selector-specificity@npm:^4.0.0":
   version: 4.0.0
   resolution: "@csstools/selector-specificity@npm:4.0.0"
@@ -4224,10 +4189,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0, ignore@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "ignore@npm:5.3.1"
-  checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
+"ignore@npm:^5.2.0, ignore@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "ignore@npm:5.3.2"
+  checksum: 10c0/f9f652c957983634ded1e7f02da3b559a0d4cc210fca3792cb67f1b153623c9c42efdc1c4121af171e295444459fc4a9201101fb041b1104a3c000bccb188337
   languageName: node
   linkType: hard
 
@@ -4487,7 +4452,7 @@ __metadata:
     sass-loader: "npm:16.0.0"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
-    stylelint: "npm:16.8.1"
+    stylelint: "npm:16.8.2"
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.1"
     tippy.js: "npm:6.3.7"
@@ -6082,10 +6047,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-resolve-nested-selector@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "postcss-resolve-nested-selector@npm:0.1.4"
-  checksum: 10c0/c265c35ddd474968bc4efbe4027e33f28910ef3931ffae9c448878d7c02735aeeea6d33aa6f89902e4c111e6fe87f2cc2aa72dcb3ac242d58809f1f932baa2b6
+"postcss-resolve-nested-selector@npm:^0.1.6":
+  version: 0.1.6
+  resolution: "postcss-resolve-nested-selector@npm:0.1.6"
+  checksum: 10c0/84213a2bccce481b1569c595a3c547b25c6ef1cca839fbd6c82c12ab407559966e968613c7454b573aa54f38cfd7e900c1fd603f0efc9f51939ab9f93f115455
   languageName: node
   linkType: hard
 
@@ -6118,13 +6083,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "postcss-selector-parser@npm:6.1.1"
+"postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.2":
+  version: 6.1.2
+  resolution: "postcss-selector-parser@npm:6.1.2"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10c0/5608765e033fee35d448e1f607ffbaa750eb86901824a8bc4a911ea8bc137cb82f29239330787427c5d3695afd90d8721e190f211dbbf733e25033d8b3100763
+  checksum: 10c0/523196a6bd8cf660bdf537ad95abd79e546d54180f9afb165a4ab3e651ac705d0f8b8ce6b3164fb9e3279ce482c5f751a69eb2d3a1e8eb0fd5e82294fb3ef13e
   languageName: node
   linkType: hard
 
@@ -6158,7 +6123,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.41, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.40":
+"postcss@npm:8.4.41, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
   version: 8.4.41
   resolution: "postcss@npm:8.4.41"
   dependencies:
@@ -6747,14 +6712,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:16.8.1":
-  version: 16.8.1
-  resolution: "stylelint@npm:16.8.1"
+"stylelint@npm:16.8.2":
+  version: 16.8.2
+  resolution: "stylelint@npm:16.8.2"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.7.1"
-    "@csstools/css-tokenizer": "npm:^2.4.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.13"
-    "@csstools/selector-specificity": "npm:^3.1.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/selector-specificity": "npm:^4.0.0"
     "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
@@ -6769,7 +6734,7 @@ __metadata:
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
     html-tags: "npm:^3.3.1"
-    ignore: "npm:^5.3.1"
+    ignore: "npm:^5.3.2"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
     known-css-properties: "npm:^0.34.0"
@@ -6778,10 +6743,10 @@ __metadata:
     micromatch: "npm:^4.0.7"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
-    postcss: "npm:^8.4.40"
-    postcss-resolve-nested-selector: "npm:^0.1.4"
+    postcss: "npm:^8.4.41"
+    postcss-resolve-nested-selector: "npm:^0.1.6"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.1.1"
+    postcss-selector-parser: "npm:^6.1.2"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -6792,7 +6757,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/7bc6b0193f83420b2170026078b427d7fb22a07d3345fc99a16241625a572f2fc3e1fa1999e54c01cc2b15bd59d135715c2b140b089c17aa7f4e377ded1fc1b5
+  checksum: 10c0/898cde9b5d981f249133df709458eebf2af0a525e72410ddfafd76a7308f7da493578b6a909c593cc70061556b9eda1fed4f477385ee615435f0996d9e18d8df
   languageName: node
   linkType: hard
 

From 1bf0e5c279df838660ff62a3fc3e1c2f53774139 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sun, 18 Aug 2024 20:31:42 -0600
Subject: [PATCH 324/449] Remove trailing backslash from 'Keep this build
 forever' hover text (#9625)

Remove trailing '\' from 'Keep this build forever' hover text

See the before and after pictures in the pull request.
---
 .../resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
index 0703936eced5..4c60feb56650 100644
--- a/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
+++ b/core/src/main/resources/hudson/model/Run/KeepLogBuildBadge/badge.jelly
@@ -23,4 +23,4 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<l:icon src="symbol-lock-closed" class="icon-sm" tooltip="${%Keep this build forever}:\\n${build.whyKeepLog}" xmlns:l="/lib/layout"/>
+<l:icon src="symbol-lock-closed" class="icon-sm" tooltip="${%Keep this build forever}:\n${build.whyKeepLog}" xmlns:l="/lib/layout"/>

From 1a9f6684c731d17242249ca5e5a60dda942dae6b Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sun, 18 Aug 2024 20:32:00 -0600
Subject: [PATCH 325/449] Update @since javadoc comments for recent API
 additions (#9629)

---
 core/src/main/java/hudson/lifecycle/Lifecycle.java          | 2 +-
 core/src/main/java/hudson/model/listeners/ItemListener.java | 2 +-
 core/src/main/java/jenkins/model/queue/ItemDeletion.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/lifecycle/Lifecycle.java b/core/src/main/java/hudson/lifecycle/Lifecycle.java
index fcd7769aeff2..028c3d1826b7 100644
--- a/core/src/main/java/hudson/lifecycle/Lifecycle.java
+++ b/core/src/main/java/hudson/lifecycle/Lifecycle.java
@@ -329,7 +329,7 @@ public boolean supportsDynamicLoad() {
     /**
      * Called when Jenkins has failed to boot.
      * @param problem a boot failure (could be {@link JenkinsReloadFailed})
-     * @since TODO
+     * @since 2.469
      */
     public void onBootFailure(BootFailure problem) {
     }
diff --git a/core/src/main/java/hudson/model/listeners/ItemListener.java b/core/src/main/java/hudson/model/listeners/ItemListener.java
index fe09a9c56373..3f20e2704b68 100644
--- a/core/src/main/java/hudson/model/listeners/ItemListener.java
+++ b/core/src/main/java/hudson/model/listeners/ItemListener.java
@@ -101,7 +101,7 @@ public void onLoaded() {
      * @param item the item being deleted
      * @throws Failure to veto the operation.
      * @throws InterruptedException If a blocking condition was interrupted, also vetoing the operation.
-     * @since TODO
+     * @since 2.470
      */
     public void onCheckDelete(Item item) throws Failure, InterruptedException {
     }
diff --git a/core/src/main/java/jenkins/model/queue/ItemDeletion.java b/core/src/main/java/jenkins/model/queue/ItemDeletion.java
index fd18edde04a5..a2d954fbc459 100644
--- a/core/src/main/java/jenkins/model/queue/ItemDeletion.java
+++ b/core/src/main/java/jenkins/model/queue/ItemDeletion.java
@@ -198,7 +198,7 @@ public boolean shouldSchedule(Queue.Task p, List<Action> actions) {
      * Cancels any builds in progress of this item (if a job) or descendants (if a folder).
      * Also cancels any associated queue items.
      * @param initiatingItem an item being deleted
-     * @since TODO
+     * @since 2.470
      */
     public static void cancelBuildsInProgress(@NonNull Item initiatingItem) throws Failure, InterruptedException {
         Queue queue = Queue.getInstance();

From 7ead3b9293a70f026d6debab7b09d4bf05de4c45 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:31:13 -0700
Subject: [PATCH 326/449] Update dependency io.jenkins.plugins:prism-api to
 v1.29.0-16 (#9633)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index e7d034a5c910..0766f76a36e0 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -352,7 +352,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>prism-api</artifactId>
-                  <version>1.29.0-15</version>
+                  <version>1.29.0-16</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>prism-api.jpi</destFileName>

From 4bab9de612877745c58e0e90085bc41e17ca72f7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:57:22 -0700
Subject: [PATCH 327/449] Update dependency commons-logging:commons-logging to
 v1.3.4 (#9632)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index c3269009627e..7e614deaef15 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -361,7 +361,7 @@ THE SOFTWARE.
         <!-- provided by jcl-over-slf4j -->
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.3.3</version>
+        <version>1.3.4</version>
         <scope>provided</scope>
       </dependency>
     </dependencies>

From d808f3c37978a9c076f49a0973faac1171039289 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:57:41 -0700
Subject: [PATCH 328/449] Update dependency
 org.springframework.security:spring-security-bom to v5.8.14 (#9634)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 7e614deaef15..72c188da0a4e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -70,7 +70,7 @@ THE SOFTWARE.
         <!-- https://docs.spring.io/spring-security/site/docs/5.5.4/reference/html5/#getting-maven-no-boot -->
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-bom</artifactId>
-        <version>5.8.13</version>
+        <version>5.8.14</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From aa348fc9d03ee2ed9cfcec70836a6e66379da5fa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 17:20:38 -0700
Subject: [PATCH 329/449] Update dependency org.jenkins-ci.plugins:junit to
 v1291 (#9635)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 0766f76a36e0..6863266e9c49 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -230,7 +230,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1284.vf75d778f98c5</version>
+      <version>1291.v60776881903c</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 9995e2a0d926..99e62492b673 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -307,7 +307,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1284.vf75d778f98c5</version>
+                  <version>1291.v60776881903c</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 5a783a7a34e4554afa7cb63b9e30a3d40173b7aa Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 20 Aug 2024 13:40:21 +0000
Subject: [PATCH 330/449] [maven-release-plugin] prepare release jenkins-2.473

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 6 +++---
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty10/pom.xml     | 2 +-
 websocket/jetty12-ee8/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 72c188da0a4e..cb4b936f06fb 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6309811a2e8b..f2b89e7f59bc 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 8e30ae211ed7..7691a125b91a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..8ea8a6a5543f 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 15bf19ad373f..fca37c04d964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.473</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -64,7 +64,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.473</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -76,7 +76,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.473</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-13T13:50:51Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-20T10:34:17Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 6863266e9c49..d4d65df38189 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 99e62492b673..c94e54372203 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 5147b02b81d6..8ef27641365d 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/jetty12-ee8/pom.xml b/websocket/jetty12-ee8/pom.xml
index 9a7a9ca94545..e07d15a40061 100644
--- a/websocket/jetty12-ee8/pom.xml
+++ b/websocket/jetty12-ee8/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..5ec76a3d7793 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.473</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 1272ab7f85e1729b3c41829f76684676d9ba0e70 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 20 Aug 2024 13:40:44 +0000
Subject: [PATCH 331/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 8 ++++----
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty10/pom.xml     | 2 +-
 websocket/jetty12-ee8/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index cb4b936f06fb..72c188da0a4e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index f2b89e7f59bc..6309811a2e8b 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 7691a125b91a..8e30ae211ed7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 8ea8a6a5543f..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index fca37c04d964..76fe0de99616 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.473</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -64,7 +64,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.473</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -74,9 +74,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.473</revision>
+    <revision>2.474</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-20T10:34:17Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-20T13:40:21Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index d4d65df38189..6863266e9c49 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index c94e54372203..99e62492b673 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 8ef27641365d..5147b02b81d6 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/jetty12-ee8/pom.xml b/websocket/jetty12-ee8/pom.xml
index e07d15a40061..9a7a9ca94545 100644
--- a/websocket/jetty12-ee8/pom.xml
+++ b/websocket/jetty12-ee8/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 5ec76a3d7793..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.473</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From b064be0de8ce473a0b148c02d16a920e6bff6b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madis=20P=C3=A4rn?= <madisparn@users.noreply.github.com>
Date: Wed, 21 Aug 2024 08:46:42 +0300
Subject: [PATCH 332/449] JENKINS-68822 added support for removing all builds
 with LogRotator (#9405)

* JENKINS-68822 added support for removing all builds with LogRotator

* Update core/src/main/java/hudson/tasks/LogRotator.java

---------

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
 .../java/hudson/tasks/ArtifactArchiver.java   |  4 +-
 .../main/java/hudson/tasks/LogRotator.java    | 22 +++++++++--
 .../hudson/tasks/LogRotator/config.jelly      |  4 ++
 .../java/hudson/tasks/LogRotatorTest.java     | 37 +++++++++++++++++--
 4 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
index 02137ad36946..4300cd1538ab 100644
--- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java
+++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -389,7 +389,9 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
                             if (bd instanceof LogRotator) {
                                 LogRotator lr = (LogRotator) bd;
                                 if (lr.getArtifactNumToKeep() == -1) {
-                                    p.setBuildDiscarder(new LogRotator(lr.getDaysToKeep(), lr.getNumToKeep(), lr.getArtifactDaysToKeep(), 1));
+                                    LogRotator newLr = new LogRotator(lr.getDaysToKeep(), lr.getNumToKeep(), lr.getArtifactDaysToKeep(), 1);
+                                    newLr.setRemoveLastBuild(lr.isRemoveLastBuild());
+                                    p.setBuildDiscarder(newLr);
                                 } else {
                                     LOG.log(Level.WARNING, "will not clobber artifactNumToKeep={0} in {1}", new Object[] {lr.getArtifactNumToKeep(), p});
                                 }
diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java
index 3d5f3975808a..c22d5af2e3d2 100644
--- a/core/src/main/java/hudson/tasks/LogRotator.java
+++ b/core/src/main/java/hudson/tasks/LogRotator.java
@@ -50,6 +50,7 @@
 import jenkins.util.io.CompositeIOException;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
 
 /**
  * Default implementation of {@link BuildDiscarder}.
@@ -108,6 +109,12 @@ public CollatedLogRotatorException(String msg, Collection<Exception> values) {
      */
     private final Integer artifactNumToKeep;
 
+    /**
+     * If enabled also remove last successful build.
+     * @since TODO
+     */
+    private boolean removeLastBuild;
+
     @DataBoundConstructor
     public LogRotator(String daysToKeepStr, String numToKeepStr, String artifactDaysToKeepStr, String artifactNumToKeepStr) {
         this (parse(daysToKeepStr), parse(numToKeepStr),
@@ -140,6 +147,11 @@ public LogRotator(int daysToKeep, int numToKeep, int artifactDaysToKeep, int art
 
     }
 
+    @DataBoundSetter
+    public void setRemoveLastBuild(boolean removeLastBuild) {
+        this.removeLastBuild = removeLastBuild;
+    }
+
     @Override
     @SuppressWarnings("rawtypes")
     public void perform(Job<?, ?> job) throws IOException, InterruptedException {
@@ -148,9 +160,9 @@ public void perform(Job<?, ?> job) throws IOException, InterruptedException {
 
         LOGGER.log(FINE, "Running the log rotation for {0} with numToKeep={1} daysToKeep={2} artifactNumToKeep={3} artifactDaysToKeep={4}", new Object[] {job, numToKeep, daysToKeep, artifactNumToKeep, artifactDaysToKeep});
 
-        // always keep the last successful and the last stable builds
-        Run lsb = job.getLastSuccessfulBuild();
-        Run lstb = job.getLastStableBuild();
+        // if configured keep the last successful and the last stable builds
+        Run lsb = removeLastBuild ? null : job.getLastSuccessfulBuild();
+        Run lstb = removeLastBuild ? null : job.getLastStableBuild();
 
         if (numToKeep != -1) {
             // Note that RunList.size is deprecated, and indeed here we are loading all the builds of the job.
@@ -270,6 +282,10 @@ public int getArtifactNumToKeep() {
         return unbox(artifactNumToKeep);
     }
 
+    public boolean isRemoveLastBuild() {
+        return removeLastBuild;
+    }
+
     public String getDaysToKeepStr() {
         return toString(daysToKeep);
     }
diff --git a/core/src/main/resources/hudson/tasks/LogRotator/config.jelly b/core/src/main/resources/hudson/tasks/LogRotator/config.jelly
index b071ec3b9108..546c76c3ab06 100644
--- a/core/src/main/resources/hudson/tasks/LogRotator/config.jelly
+++ b/core/src/main/resources/hudson/tasks/LogRotator/config.jelly
@@ -41,5 +41,9 @@ THE SOFTWARE.
              description="${%if not empty, only up to this number of builds have their artifacts retained}" field="artifactNumToKeepStr">
       <f:number clazz="positive-number" min="1" step="1" />
     </f:entry>
+    <f:entry title="${%Remove last build}"
+             field="removeLastBuild">
+      <f:booleanRadio />
+    </f:entry>
   </f:advanced>
 </j:jelly>
diff --git a/test/src/test/java/hudson/tasks/LogRotatorTest.java b/test/src/test/java/hudson/tasks/LogRotatorTest.java
index 8a408b758b01..b72e837dbd86 100644
--- a/test/src/test/java/hudson/tasks/LogRotatorTest.java
+++ b/test/src/test/java/hudson/tasks/LogRotatorTest.java
@@ -68,7 +68,7 @@ public class LogRotatorTest {
     @Test
     public void successVsFailure() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject();
-        project.setLogRotator(new LogRotator(-1, 2, -1, -1));
+        project.setBuildDiscarder(new LogRotator(-1, 2, -1, -1));
         j.buildAndAssertSuccess(project); // #1
         project.getBuildersList().replaceBy(Set.of(new FailureBuilder()));
         j.buildAndAssertStatus(Result.FAILURE, project); // #2
@@ -82,11 +82,25 @@ public void successVsFailure() throws Exception {
         assertEquals(3, numberOf(project.getLastFailedBuild()));
     }
 
+    @Test
+    public void successVsFailureWithRemoveLastBuild() throws Exception {
+        FreeStyleProject project = j.createFreeStyleProject();
+        LogRotator logRotator = new LogRotator(-1, 1, -1, -1);
+        logRotator.setRemoveLastBuild(true);
+        project.setBuildDiscarder(logRotator);
+        project.getPublishersList().replaceBy(Set.of(new TestsFail()));
+        j.buildAndAssertStatus(Result.UNSTABLE, project); // #1
+        project.getBuildersList().replaceBy(Set.of(new FailureBuilder()));
+        j.buildAndAssertStatus(Result.FAILURE, project); // #2
+        assertNull(project.getBuildByNumber(1));
+        assertEquals(2, numberOf(project.getLastFailedBuild()));
+    }
+
     @Test
     @Issue("JENKINS-2417")
     public void stableVsUnstable() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject();
-        project.setLogRotator(new LogRotator(-1, 2, -1, -1));
+        project.setBuildDiscarder(new LogRotator(-1, 2, -1, -1));
         j.buildAndAssertSuccess(project); // #1
         project.getPublishersList().replaceBy(Set.of(new TestsFail()));
         j.buildAndAssertStatus(Result.UNSTABLE, project); // #2
@@ -98,11 +112,28 @@ public void stableVsUnstable() throws Exception {
         assertNull(project.getBuildByNumber(2));
     }
 
+    @Test
+    public void stableVsUnstableWithRemoveLastBuild() throws Exception {
+        FreeStyleProject project = j.createFreeStyleProject();
+        LogRotator logRotator = new LogRotator(-1, 1, -1, -1);
+        logRotator.setRemoveLastBuild(true);
+        project.setBuildDiscarder(logRotator);
+        j.buildAndAssertSuccess(project); // #1
+        project.getPublishersList().replaceBy(Set.of(new TestsFail()));
+        j.buildAndAssertStatus(Result.UNSTABLE, project); // #2
+        project.getBuildersList().replaceBy(Set.of(new FailureBuilder()));
+        j.buildAndAssertStatus(Result.FAILURE, project); // #3
+        assertNull(project.getBuildByNumber(1));
+        assertNull(project.getBuildByNumber(2));
+        assertEquals(-1, numberOf(project.getLastSuccessfulBuild()));
+        assertEquals(3, numberOf(project.getLastBuild()));
+    }
+
     @Test
     @Issue("JENKINS-834")
     public void artifactDelete() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject();
-        project.setLogRotator(new LogRotator(-1, 6, -1, 2));
+        project.setBuildDiscarder(new LogRotator(-1, 6, -1, 2));
         project.getPublishersList().replaceBy(Set.of(new ArtifactArchiver("f", "", true, false)));
         j.buildAndAssertStatus(Result.FAILURE, project); // #1
         assertFalse(project.getBuildByNumber(1).getHasArtifacts());

From 94aadfcce8b23598b9e872bf92a7200590502d1d Mon Sep 17 00:00:00 2001
From: Zbynek Konecny <zbynek1729@gmail.com>
Date: Wed, 21 Aug 2024 07:46:51 +0200
Subject: [PATCH 333/449] Allow plugins to customize number of suggestions in
 autocomplete (#9616)

---
 war/src/main/js/components/autocomplete/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/war/src/main/js/components/autocomplete/index.js b/war/src/main/js/components/autocomplete/index.js
index be4350b7aad9..9caefc6e242e 100644
--- a/war/src/main/js/components/autocomplete/index.js
+++ b/war/src/main/js/components/autocomplete/index.js
@@ -43,9 +43,13 @@ function init() {
     };
   }
 
+  function getMaxSuggestionCount(e) {
+    return parseInt(e.dataset["maxsuggestions"]) || 10;
+  }
+
   function createAndShowDropdown(e, suggestions) {
     const items = suggestions
-      .splice(0, 10)
+      .splice(0, getMaxSuggestionCount(e))
       .map((s) => convertSuggestionToItem(s, e));
     if (!e.dropdown) {
       Utils.generateDropdown(

From 8827ec91e51f08b22146178760408a05cb9326b8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:11:44 -0700
Subject: [PATCH 334/449] Update dependency postcss-preset-env to v10.0.2
 (#9639)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   2 +-
 war/yarn.lock    | 394 +++++++++++++++++++++++------------------------
 2 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/war/package.json b/war/package.json
index 6c239e2385ee..188a283fefaa 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.41",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "10.0.1",
+    "postcss-preset-env": "10.0.2",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.3",
     "sass": "1.77.8",
diff --git a/war/yarn.lock b/war/yarn.lock
index 06d860444b13..85d04fe07c75 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1384,13 +1384,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/cascade-layer-name-parser@npm:2.0.0"
+"@csstools/cascade-layer-name-parser@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/cascade-layer-name-parser@npm:2.0.1"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.0
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/11de0c4abad1316a6b29a2c4f7966fc39af5cbcd0a542d92cbcca8a8173d472f3d577175fc097bebf793158936193a74829a035e1cb2abccbe056473a3076d89
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/e1f9030285d1a16ca0424018289e5288e58dee2d6f6cc392e27d9e8eca0deeea4ced9b749eef09a8322746cb15b6304bc7e2d04bb9dc7405c29b3717ec80e736
   languageName: node
   linkType: hard
 
@@ -1401,52 +1401,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/css-calc@npm:2.0.0"
+"@csstools/css-calc@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/css-calc@npm:2.0.1"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.0
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/441f8fafaa4f87302b85e2c46bc8a3efb388e0357f0db5c45438fe99c5660afeb524332a0a3339574fdd26392e65f8db9c7ab6db3361726f1702987e8522c531
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/84c0ba3dac51466c9ac22c3540360f6058cf351a3676d71d4412584b165a91abc7c69a4ddf5a5dacc6e6082806d2317cf50ddbc0a0562275b2aedaee41cb87a9
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/css-color-parser@npm:3.0.1"
+"@csstools/css-color-parser@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/css-color-parser@npm:3.0.2"
   dependencies:
     "@csstools/color-helpers": "npm:^5.0.1"
-    "@csstools/css-calc": "npm:^2.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.0
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/8890a621f916cbbf49e749d4e85e934ce55c9f9c339abcc5f4a64bc165605a6e8dd3cad9d3bbc994d2419a3b38981dca84b93ae50aa91d492fb5f0f4c9d95969
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/31f42cc22426c937f5c6999889f72b40aec8504189a6badf3319552f27a5af73dd5f46be9ebc54eb87e526468eb2546ffbd60a6879fe599efa6c98e51d6cfa3d
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/css-parser-algorithms@npm:3.0.0"
+"@csstools/css-parser-algorithms@npm:^3.0.0, @csstools/css-parser-algorithms@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/css-parser-algorithms@npm:3.0.1"
   peerDependencies:
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/ffa06c9d883e6bbb6198c98b5a395abe9847ff63ae41db54d75812e52764f550b36625fdb427c9a4ea6dfd71362aa98194ccd63afad0e521f6f3470c7515d241
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/064c6d519197b5af43bbf5efe8f4cdbd361b006113aa82160d637e925b50c643a52d33d512ca01c63042d952d723a2a10798231a714668356b76668fb11294e3
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/css-tokenizer@npm:3.0.0"
-  checksum: 10c0/6d0f3e44bfb4b309bc4e260e6399163653f5715b16ebf1f2907ec98a2b31e9b2de94c09012b6d291c6f4229cc2a521e4f66594cac1b6276a4eb205e8e23e446b
+"@csstools/css-tokenizer@npm:^3.0.0, @csstools/css-tokenizer@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/css-tokenizer@npm:3.0.1"
+  checksum: 10c0/c9ed4373e5731b5375ea9791590081019c04e95f08b46b272977e5e7b8c3d560affc62e82263cb8def1df1e57f0673140e7e16a14a5e7be04e6a234be088d1d3
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/media-query-list-parser@npm:3.0.0"
+"@csstools/media-query-list-parser@npm:^3.0.0, @csstools/media-query-list-parser@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/media-query-list-parser@npm:3.0.1"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^3.0.0
-    "@csstools/css-tokenizer": ^3.0.0
-  checksum: 10c0/0a83ab7cba4fec5543c5abf3f7145ab5742c44e0ed3349d41787739a1bd897a8cf27f35f3bc714d1d02a44b2a34f28b3b82ce6d0cb6b9c4fbb679dc034f8a152
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10c0/fca1935cabf9fb94128da87f72c34aa2cfce8eb0beba4c78d685c7b42aaba3521067710afc6905b7347fc41fe53947536ce15a7ef3387b48763d8f7d71778d5e
   languageName: node
   linkType: hard
 
@@ -1462,60 +1462,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@csstools/postcss-color-function@npm:4.0.1"
+"@csstools/postcss-color-function@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@csstools/postcss-color-function@npm:4.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f0d3dd0677d381df54987d13ea63a59e911816d98a22eda7a5e55ca2908f52afc42fbffb73a8d25a18632b936dc38f6ada9f3e2dd7911cf775ce3718657420f4
+  checksum: 10c0/c987ccc7ab326668895396d3fe69c05087cf6e245be6f70e8c33da0cdeb56f8ac3d117cfad984191ec57be9691ab56d427aaa28c61c4a7446521972993dd5039
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-color-mix-function@npm:3.0.1"
+"@csstools/postcss-color-mix-function@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-color-mix-function@npm:3.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ff76400d132c42d70f58b0908ab602b550b43720320288eb4ca1f185e7340c6f232b2a789ac94be255fc7bedc3c6125314d564297d23606fb2c91a1e2d79c40b
+  checksum: 10c0/cfdc641f504f9d02b9a7b53d6bd933d4e767ecaee5f3d2df45d897f69b8a38b5b79b538d307b16fb56dcb7c19dc7e107518c356772e89771e28e04fd846d9035
   languageName: node
   linkType: hard
 
-"@csstools/postcss-content-alt-text@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-content-alt-text@npm:2.0.0"
+"@csstools/postcss-content-alt-text@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-content-alt-text@npm:2.0.1"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/978e99425f1b5420c55282f51de65646b910f9d60621f5ad7adb7a2dace26c68dc384cd4798604e2c5d8bcd1e635a20474a6ea044a7e9b449d068d6db77a2738
+  checksum: 10c0/693e4cfa9a30a9c384120bd24846a7cd5ba1e1ebf975eb81b0e0131a21ac28a0301c7dcfa13706bc7d8b5343536fb43a46de636c3257d0fd05041c7255366e87
   languageName: node
   linkType: hard
 
-"@csstools/postcss-exponential-functions@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-exponential-functions@npm:2.0.0"
+"@csstools/postcss-exponential-functions@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-exponential-functions@npm:2.0.1"
   dependencies:
-    "@csstools/css-calc": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a5ccd4fb5b6f6f370bf07ef8f918658ef4d9865a92d9866f57edfe7479c6a486701520cbe0efb8f39af9b78eda0819d8663554e9797b8bdcadc2291733bf6b3f
+  checksum: 10c0/ddcaedfa48cc0cf93611c8d2ed5a75d56c1d196a97015db644b45881adabb47f3255242acaef6ea869a1e5ba66328725d254bf6d29eb5e988cde8b040bc5f55d
   languageName: node
   linkType: hard
 
@@ -1531,46 +1531,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.1"
+"@csstools/postcss-gamut-mapping@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3415c420463dd481a3ddf5b104f15661492d9aa3613c109f9b7354b2664965a92036045e157945348cf2c06e075b89a0c0c4f49c8a00d41c827c5b61de297cd0
+  checksum: 10c0/8b6504f81c5036e3c2a9f9516c371f48a283112469b746546c8c7f6f0da2467c915d4dac6dfe8bb05d7dab3a7503911391eb9e666cb7632e09a032e801c029f5
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.1"
+"@csstools/postcss-gradients-interpolation-method@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a1c5d6bf308ff9e1972cb39030859cd135246f8f697e5d1278ddd8ed27ce53eb76b3e628acc64145290006f45140d0a4a65e5df71f131d3e6447f0e5d3301088
+  checksum: 10c0/4fa27437ad9861b1457c28228f2503c17bcc2f77dcb38da1314a4a5d38fd010e7e5d11b5f9d69e0a2cb2999bbfeca1e99ce2f59422bda5b382658dcb03f7326e
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@csstools/postcss-hwb-function@npm:4.0.1"
+"@csstools/postcss-hwb-function@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@csstools/postcss-hwb-function@npm:4.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3247c3ab75d3cdb0ca80f7bb63d944ce933694ee9d7ee68aea11e727e883e0d35936b4a29e28700bda5eea2be26917a6c95c22a6b244e945cc558669f88b8a6e
+  checksum: 10c0/46dc9596e37830de4c38f70764d6da9f2fc7bc339217b4291eced75daa8998c4e05fb743c271701e44818df4ac111c285019b7bb3a728e8b61d86899bbeb74eb
   languageName: node
   linkType: hard
 
@@ -1608,17 +1608,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-light-dark-function@npm:2.0.1"
+"@csstools/postcss-light-dark-function@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@csstools/postcss-light-dark-function@npm:2.0.2"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/4caf23781daa72f036a830b7fc2c07cde1122afd7bc7c6a291992b5264ea92c1fb22ec2ed684c5ce50e6e848f6d0ea39ef34a5679ea37a546b8db6eb555e3f80
+  checksum: 10c0/f8973c435868998e5d6af1fc0c35b27bbf65fa9d0c35f5055c689b8ee2807a16802044e296f7def39a7253ae544fb49559e8273ee22eb4e21845aa980a1bc82b
   languageName: node
   linkType: hard
 
@@ -1660,42 +1660,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/postcss-logical-viewport-units@npm:3.0.0"
+"@csstools/postcss-logical-viewport-units@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-logical-viewport-units@npm:3.0.1"
   dependencies:
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d474f3b8b3949516ad431c8297eb26ad7ba8829dc323c1a99c25be79af0fa16eef43ddd4d980ea97a676599c5587b4b2afd44c9a1055cf3573bfb2090ecbbd5c
+  checksum: 10c0/f54f91ec4d308562371576e82131c3cc1ff461a951c9a38f0b42b783c26f37a93cc846fcd025d3c4a8437b55a4fff1192ebfac8ccf84abb6478b2c515d232552
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@csstools/postcss-media-minmax@npm:2.0.0"
+"@csstools/postcss-media-minmax@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@csstools/postcss-media-minmax@npm:2.0.1"
   dependencies:
-    "@csstools/css-calc": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
-    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/30f8cde005ae5d3750f8d2d62a26570381e306a2a4c3fdeef2ad48febbefd389c65ea471914b69ae8772a4abbd11cd52a78ecdb5d8929ed553ca1d5731f212a2
+  checksum: 10c0/23c1fb0c3ed8bf82f3223f161d0d65ba62045b917bc19624581f64aaa5d678485d22c23af2591a3f634ba02030ccb419c2b30209aa22f9fd2baa1a6474af810a
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:3.0.0"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:3.0.1"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
-    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/c7af426e44c4ca2c7cb48c2f54bd8b5e4531d4d7a568011c367038956789bf47bab996fa062f767e255229de3598fb89abdb85011872158c885a4d3ace142509
+  checksum: 10c0/e491cb149fb4fff85b2f03191511e43654ae00716e3c1ea9f1dc22ec4e7042c35f034d372082a69d3621c86cafbe46e8f419872fa36f4a534f145f584d655768
   languageName: node
   linkType: hard
 
@@ -1722,18 +1722,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@csstools/postcss-oklab-function@npm:4.0.1"
+"@csstools/postcss-oklab-function@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@csstools/postcss-oklab-function@npm:4.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/b4450fb792c505936e1f9290e8df5420e98ccba78fa1badc9261ff99bebff8cc3b1f050e518728de791acadba08b5e8c213d97b479f551b72b4f8a5793625998
+  checksum: 10c0/3209a7cec6d3577544a7ef41f2d5cca25f77891d4ec0d7f39d32f9a79a6c9a9b0ee6b54b2937a2d995548ad11c39966b07d4b9f58e907ffbe1a4b454f2d277f3
   languageName: node
   linkType: hard
 
@@ -1748,18 +1748,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.1"
+"@csstools/postcss-relative-color-syntax@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/95a0001549b0fcae6add7db6264d16183734a9dd94e54e9b606b0dcefbd96540d8917707eef2525a5024e4078ef039acfa05c2c1b309fe444a7fc1f1c05d6594
+  checksum: 10c0/34a8c999e08c6e7833484ee2fb91e7fcc25235d6c361712fed581e44a5a29f1ceb95415b6f4260de53809ac13f5da5415d1905c2971477cf5d45e5196081c663
   languageName: node
   linkType: hard
 
@@ -1774,16 +1774,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-stepped-value-functions@npm:4.0.0"
+"@csstools/postcss-stepped-value-functions@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-stepped-value-functions@npm:4.0.1"
   dependencies:
-    "@csstools/css-calc": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/02d9b99921a69838d5df7cc2703f381e8e18d14ac5a4bd8b8b24ff80bc9657ff70b1997cdbfd9c2f1985a5d07478a0e97d1617760519450c5475cc1d8159e788
+  checksum: 10c0/7e65969b124fce603675ca17c2ffa2bb456677866e54bc9fbdc4da0945be1593fde2abb0730d3d03190776ad2022b394a1f9d4834c5b1f4c7ec497929fd35f8f
   languageName: node
   linkType: hard
 
@@ -1799,16 +1799,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@csstools/postcss-trigonometric-functions@npm:4.0.0"
+"@csstools/postcss-trigonometric-functions@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/postcss-trigonometric-functions@npm:4.0.1"
   dependencies:
-    "@csstools/css-calc": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-calc": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3a53d6724f068511d02a2de3b39e76bf99d622614e1c79b3d2c2eace2f0d36d865288dc2c4a1368fee8db38be7973803504400b2752cd5a1200f825ddc27b253
+  checksum: 10c0/59e017ebb9f4f8f027e134024e3322b5e202cc96073e0bb0d45733a829c8eadc7f4f7ce57ce8360a748a677595af9ea95da1779684699b48b911b73b4017ac8b
   languageName: node
   linkType: hard
 
@@ -4445,7 +4445,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.0"
     postcss: "npm:8.4.41"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:10.0.1"
+    postcss-preset-env: "npm:10.0.2"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.3"
     sass: "npm:1.77.8"
@@ -5386,18 +5386,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-color-functional-notation@npm:7.0.1"
+"postcss-color-functional-notation@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-color-functional-notation@npm:7.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/0cdfae4d85cb34425c8363b699b5da6f0c8cc43e7ce3b7fdd1fd39429ee81a4af75f973cd5c8293b1072688064da17a0a633827f23667e8cc0ff16217f0004eb
+  checksum: 10c0/e89c0bff94558b0c978ac36f7e02f7f516291f90fd43169d39c63ad2bb0415e3b1c4b3c2469280d578727e850fdf15a557230cb28275f3f0676f0f73187f2867
   languageName: node
   linkType: hard
 
@@ -5451,46 +5451,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "postcss-custom-media@npm:11.0.0"
+"postcss-custom-media@npm:^11.0.1":
+  version: 11.0.1
+  resolution: "postcss-custom-media@npm:11.0.1"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
-    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/99e58454453581a1a4f5b7eae5cf6504c445e45d48035f09857603437fe80de06a216d0dad6036d32d14108b490e82a0845e1b4e0ec5114f752b325e388f0f1c
+  checksum: 10c0/771b281a28f105370ede7c4a86f9e3dd8d9ec3bf2d2883d4f2cfe9c42b5ec1bf88f713458b356870315d0ba3a285fbeb7bb514a1203d1c4fb113bd9044369bf2
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^14.0.0":
-  version: 14.0.0
-  resolution: "postcss-custom-properties@npm:14.0.0"
+"postcss-custom-properties@npm:^14.0.1":
+  version: 14.0.1
+  resolution: "postcss-custom-properties@npm:14.0.1"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/f587e2f3026fa7ceb63dd111674848b97dc452f9e75a6480b4b87611a4705dd97e5ae5247e7d34888aecd95b4e50706170c93f57f14f05fb352135d2decdc00f
+  checksum: 10c0/12180a7f4a4fe2d528387346a1810b82ed870081756dcf6be226c839716ab3f6f4d6ca4c7208a07d7d84bf2c986beef6473e29964e7c2572066fca5d3b000ed5
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "postcss-custom-selectors@npm:8.0.0"
+"postcss-custom-selectors@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "postcss-custom-selectors@npm:8.0.1"
   dependencies:
-    "@csstools/cascade-layer-name-parser": "npm:^2.0.0"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     postcss-selector-parser: "npm:^6.1.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/efc9ce0e9c92f298b9196e1cf240ef0e15f88bb3f90f441beecd05756e31628b27a56dcb176f696d3d34c8d4d879c0eb70d1cb62b44c55e01ebd2a653b8a9e94
+  checksum: 10c0/b867233b3d68fbab90afca8a776eb74196ebc3fac8988175d95118a47993c793138fec6cc580272bb35d9bd31086acbdd33ff86da0cab83ef2f08bfc1c23ecd6
   languageName: node
   linkType: hard
 
@@ -5606,18 +5606,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-lab-function@npm:7.0.1"
+"postcss-lab-function@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-lab-function@npm:7.0.2"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.1"
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^3.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/8a6f3f465911c5c608650e3ebec01097d274109eea0fceb925f1ca52213c67a6496570ff2ba9af0a6c2153e208ef1d10cc43ad81f38405f5d39639680f7150a9
+  checksum: 10c0/6b2be7e762b4ccb58ea9051723d390f6732ad78bb30bfef9499139cf5e2ac160c3de31b2b005fcc30e9fced4abe1685df6cb76c99d548896bae6746105ac8520
   languageName: node
   linkType: hard
 
@@ -5933,39 +5933,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-preset-env@npm:10.0.1":
-  version: 10.0.1
-  resolution: "postcss-preset-env@npm:10.0.1"
+"postcss-preset-env@npm:10.0.2":
+  version: 10.0.2
+  resolution: "postcss-preset-env@npm:10.0.2"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^5.0.0"
-    "@csstools/postcss-color-function": "npm:^4.0.1"
-    "@csstools/postcss-color-mix-function": "npm:^3.0.1"
-    "@csstools/postcss-content-alt-text": "npm:^2.0.0"
-    "@csstools/postcss-exponential-functions": "npm:^2.0.0"
+    "@csstools/postcss-color-function": "npm:^4.0.2"
+    "@csstools/postcss-color-mix-function": "npm:^3.0.2"
+    "@csstools/postcss-content-alt-text": "npm:^2.0.1"
+    "@csstools/postcss-exponential-functions": "npm:^2.0.1"
     "@csstools/postcss-font-format-keywords": "npm:^4.0.0"
-    "@csstools/postcss-gamut-mapping": "npm:^2.0.1"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.1"
-    "@csstools/postcss-hwb-function": "npm:^4.0.1"
+    "@csstools/postcss-gamut-mapping": "npm:^2.0.2"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.2"
+    "@csstools/postcss-hwb-function": "npm:^4.0.2"
     "@csstools/postcss-ic-unit": "npm:^4.0.0"
     "@csstools/postcss-initial": "npm:^2.0.0"
     "@csstools/postcss-is-pseudo-class": "npm:^5.0.0"
-    "@csstools/postcss-light-dark-function": "npm:^2.0.1"
+    "@csstools/postcss-light-dark-function": "npm:^2.0.2"
     "@csstools/postcss-logical-float-and-clear": "npm:^3.0.0"
     "@csstools/postcss-logical-overflow": "npm:^2.0.0"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0"
     "@csstools/postcss-logical-resize": "npm:^3.0.0"
-    "@csstools/postcss-logical-viewport-units": "npm:^3.0.0"
-    "@csstools/postcss-media-minmax": "npm:^2.0.0"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.0"
+    "@csstools/postcss-logical-viewport-units": "npm:^3.0.1"
+    "@csstools/postcss-media-minmax": "npm:^2.0.1"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.1"
     "@csstools/postcss-nested-calc": "npm:^4.0.0"
     "@csstools/postcss-normalize-display-values": "npm:^4.0.0"
-    "@csstools/postcss-oklab-function": "npm:^4.0.1"
+    "@csstools/postcss-oklab-function": "npm:^4.0.2"
     "@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
-    "@csstools/postcss-relative-color-syntax": "npm:^3.0.1"
+    "@csstools/postcss-relative-color-syntax": "npm:^3.0.2"
     "@csstools/postcss-scope-pseudo-class": "npm:^4.0.0"
-    "@csstools/postcss-stepped-value-functions": "npm:^4.0.0"
+    "@csstools/postcss-stepped-value-functions": "npm:^4.0.1"
     "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.1"
-    "@csstools/postcss-trigonometric-functions": "npm:^4.0.0"
+    "@csstools/postcss-trigonometric-functions": "npm:^4.0.1"
     "@csstools/postcss-unset-value": "npm:^4.0.0"
     autoprefixer: "npm:^10.4.19"
     browserslist: "npm:^4.23.1"
@@ -5975,12 +5975,12 @@ __metadata:
     cssdb: "npm:^8.1.0"
     postcss-attribute-case-insensitive: "npm:^7.0.0"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^7.0.1"
+    postcss-color-functional-notation: "npm:^7.0.2"
     postcss-color-hex-alpha: "npm:^10.0.0"
     postcss-color-rebeccapurple: "npm:^10.0.0"
-    postcss-custom-media: "npm:^11.0.0"
-    postcss-custom-properties: "npm:^14.0.0"
-    postcss-custom-selectors: "npm:^8.0.0"
+    postcss-custom-media: "npm:^11.0.1"
+    postcss-custom-properties: "npm:^14.0.1"
+    postcss-custom-selectors: "npm:^8.0.1"
     postcss-dir-pseudo-class: "npm:^9.0.0"
     postcss-double-position-gradients: "npm:^6.0.0"
     postcss-focus-visible: "npm:^10.0.0"
@@ -5988,7 +5988,7 @@ __metadata:
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^6.0.0"
     postcss-image-set-function: "npm:^7.0.0"
-    postcss-lab-function: "npm:^7.0.1"
+    postcss-lab-function: "npm:^7.0.2"
     postcss-logical: "npm:^8.0.0"
     postcss-nesting: "npm:^13.0.0"
     postcss-opacity-percentage: "npm:^2.0.0"
@@ -6000,7 +6000,7 @@ __metadata:
     postcss-selector-not: "npm:^8.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/5849915d040413f68ab71b3489daaa5b6687b4d4710da47a0d1420df0890858f0b53c9ec6755d872dbe38a2695ab12584be654456e3d6ce311b88927209c02b2
+  checksum: 10c0/51eb19994dfdbb041e87082833bedf8976053c182ae8dafab6b3ee1bf2cfd309ab9c186644ed032518011e44fbcc9f0552083bc431535779a80a919bbe78d10d
   languageName: node
   linkType: hard
 

From 80cf2aa54e5b16a7a8a914eb905138037fc2d943 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:12:03 -0700
Subject: [PATCH 335/449] Update dependency org.jenkins-ci.plugins:junit to
 v1295 (#9640)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 6863266e9c49..d91341c6700f 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -230,7 +230,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1291.v60776881903c</version>
+      <version>1295.vf2321cf6c27e</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 99e62492b673..78c14f4153e8 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -307,7 +307,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1291.v60776881903c</version>
+                  <version>1295.vf2321cf6c27e</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 0c31a3ac9686799bbfc18f64be94000705f43d82 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2024 18:14:10 -0700
Subject: [PATCH 336/449] Update dependency io.jenkins.plugins:prism-api to
 v1.29.0-17 (#9642)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index d91341c6700f..11aa78c459fe 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -352,7 +352,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>prism-api</artifactId>
-                  <version>1.29.0-16</version>
+                  <version>1.29.0-17</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>prism-api.jpi</destFileName>

From 39d30c8828e5017cc684feca81ae5026532d015b Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Tue, 13 Aug 2024 15:04:12 +0200
Subject: [PATCH 337/449] Add WithConsoleUrl interface

This simplifies the logic of `Functions#getConsoleUrl` and makes it pluggable.
---
 core/src/main/java/hudson/Functions.java      | 14 +++---
 core/src/main/java/hudson/model/Queue.java    | 13 +++++-
 core/src/main/java/hudson/model/Run.java      | 12 +++++-
 .../jenkins/console/ConsoleUrlProvider.java   | 18 +++++---
 .../java/jenkins/console/WithConsoleUrl.java  | 43 +++++++++++++++++++
 5 files changed, 84 insertions(+), 16 deletions(-)
 create mode 100644 core/src/main/java/jenkins/console/WithConsoleUrl.java

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index cd25f9bc9871..669d13ca85f3 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -54,7 +54,6 @@
 import hudson.model.ParameterDefinition;
 import hudson.model.ParameterDefinition.ParameterDescriptor;
 import hudson.model.PasswordParameterDefinition;
-import hudson.model.Queue;
 import hudson.model.Run;
 import hudson.model.Slave;
 import hudson.model.TimeZoneProperty;
@@ -153,6 +152,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import jenkins.console.ConsoleUrlProvider;
+import jenkins.console.WithConsoleUrl;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
@@ -1912,14 +1912,12 @@ public static String joinPath(String... components) {
      * @return the absolute URL for accessing the build console for the executable, or null if there is no build associated with the executable
      * @since 2.433
      */
-    public static @CheckForNull String getConsoleUrl(Queue.Executable executable) {
-        if (executable == null) {
-            return null;
-        } else if (executable instanceof Run) {
-            return ConsoleUrlProvider.getRedirectUrl((Run<?, ?>) executable);
+    public static @CheckForNull String getConsoleUrl(Object executable) {
+        if (executable instanceof WithConsoleUrl) {
+            String consoleUrl = ((WithConsoleUrl) executable).getConsoleUrl();
+            return consoleUrl != null ? Stapler.getCurrentRequest().getContextPath() + '/' + consoleUrl : null;
         } else {
-            // Handles cases such as PlaceholderExecutable for Pipeline node steps.
-            return getConsoleUrl(executable.getParentExecutable());
+            return null;
         }
     }
 
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 0d299fb9426d..541762a309b8 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -109,6 +109,7 @@
 import java.util.stream.Collectors;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
+import jenkins.console.WithConsoleUrl;
 import jenkins.model.Jenkins;
 import jenkins.model.queue.AsynchronousExecution;
 import jenkins.model.queue.CompositeCauseOfBlockage;
@@ -2088,7 +2089,7 @@ default Collection<? extends SubTask> getSubTasks() {
      * used to render the HTML that indicates this executable is executing.
      */
     @StaplerAccessibleType
-    public interface Executable extends Runnable {
+    public interface Executable extends Runnable, WithConsoleUrl {
         /**
          * Task from which this executable was created.
          *
@@ -2131,6 +2132,16 @@ default long getEstimatedDuration() {
             return Executables.getParentOf(this).getEstimatedDuration();
         }
 
+        /**
+         * Handles cases such as {@code PlaceholderExecutable} for Pipeline node steps.
+         * @return by default, that of {@link #getParentExecutable} if defined
+         */
+        @Override
+        default String getConsoleUrl() {
+            Executable parent = getParentExecutable();
+            return parent != null ? parent.getConsoleUrl() : null;
+        }
+
         /**
          * Used to render the HTML. Should be a human readable text of what this executable is.
          */
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 33658252b922..f50136df5aa2 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -108,6 +108,8 @@
 import java.util.zip.GZIPInputStream;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
+import jenkins.console.ConsoleUrlProvider;
+import jenkins.console.WithConsoleUrl;
 import jenkins.model.ArtifactManager;
 import jenkins.model.ArtifactManagerConfiguration;
 import jenkins.model.ArtifactManagerFactory;
@@ -153,7 +155,7 @@
  */
 @ExportedBean
 public abstract class Run<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, RunT>>
-        extends Actionable implements ExtensionPoint, Comparable<RunT>, AccessControlled, PersistenceRoot, DescriptorByNameOwner, OnMaster, StaplerProxy {
+        extends Actionable implements ExtensionPoint, Comparable<RunT>, AccessControlled, PersistenceRoot, DescriptorByNameOwner, OnMaster, StaplerProxy, WithConsoleUrl {
 
     /**
      * The original {@link Queue.Item#getId()} has not yet been mapped onto the {@link Run} instance.
@@ -1055,6 +1057,14 @@ protected void dropLinks() {
         return project.getUrl() + getNumber() + '/';
     }
 
+    /**
+     * @see ConsoleUrlProvider#consoleUrlOf
+     */
+    @Override
+    public String getConsoleUrl() {
+        return ConsoleUrlProvider.consoleUrlOf(this);
+    }
+
     /**
      * Obtains the absolute URL to this build.
      *
diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
index 0b9e70c3db53..53f0e54ff03e 100644
--- a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
+++ b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
@@ -62,7 +62,7 @@ public interface ConsoleUrlProvider extends Describable<ConsoleUrlProvider> {
      * Get a URL relative to the context path of Jenkins which should be used to link to the console for the specified build.
      * <p>Should only be used in the context of serving an HTTP request.
      * @param run the build
-     * @return the URL for the console for the specified build, relative to the context of Jenkins, or {@code null}
+     * @return the URL for the console for the specified build, relative to the context of Jenkins (should not start with {@code /}), or {@code null}
      * if this implementation does not want to server a special console view for this build.
      */
     @CheckForNull String getConsoleUrl(Run<?, ?> run);
@@ -80,6 +80,14 @@ default Descriptor<ConsoleUrlProvider> getDescriptor() {
      * @return the URL for the console for the specified build, relative to the web server root
      */
     static @NonNull String getRedirectUrl(Run<?, ?> run) {
+        return Stapler.getCurrentRequest().getContextPath() + '/' + run.getConsoleUrl();
+    }
+
+    /**
+     * Looks up the {@link #getConsoleUrl} value from the first provider to offer one.
+     * @since TODO
+     */
+    static @NonNull String consoleUrlOf(Run<?, ?> run) {
         final List<ConsoleUrlProvider> providers = new ArrayList<>();
         User currentUser = User.current();
         if (currentUser != null) {
@@ -104,6 +112,8 @@ default Descriptor<ConsoleUrlProvider> getDescriptor() {
                 if (tempUrl != null) {
                     if (new URI(tempUrl).isAbsolute()) {
                         LOGGER.warning(() -> "Ignoring absolute console URL " + tempUrl + " for " + run + " from " + provider.getClass());
+                    } else if (tempUrl.startsWith("/")) {
+                        LOGGER.warning(() -> "Ignoring URL " + tempUrl + " starting with / for " + run + " from " + provider.getClass());
                     } else {
                         // Found a valid non-null URL.
                         url = tempUrl;
@@ -118,11 +128,7 @@ default Descriptor<ConsoleUrlProvider> getDescriptor() {
             // Reachable if DefaultConsoleUrlProvider is not one of the configured providers, including if no providers are configured at all.
             url = run.getUrl() + "console";
         }
-        if (url.startsWith("/")) {
-            return Stapler.getCurrentRequest().getContextPath() + url;
-        } else {
-            return Stapler.getCurrentRequest().getContextPath() + '/' + url;
-        }
+        return url;
     }
 
     /**
diff --git a/core/src/main/java/jenkins/console/WithConsoleUrl.java b/core/src/main/java/jenkins/console/WithConsoleUrl.java
new file mode 100644
index 000000000000..d667b40fae66
--- /dev/null
+++ b/core/src/main/java/jenkins/console/WithConsoleUrl.java
@@ -0,0 +1,43 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2024 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.console;
+
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.Beta;
+
+/**
+ * A model object that may have a console URL.
+ */
+@Restricted(Beta.class)
+public interface WithConsoleUrl {
+
+    /**
+     * @return a URL relative to the context root without leading slash, such as {@code job/xxx/123/console};
+     *         or null if unknown or not applicable
+     */
+    @CheckForNull
+    String getConsoleUrl();
+}

From 44602bbf9cc868502a924f9cf69a1799bc080058 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Thu, 22 Aug 2024 17:12:59 +0200
Subject: [PATCH 338/449] Typo spotted by @dwnusbaum

Co-authored-by: Devin Nusbaum <dwnusbaum@users.noreply.github.com>
---
 core/src/main/java/jenkins/console/ConsoleUrlProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
index 53f0e54ff03e..dcd3883ba07c 100644
--- a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
+++ b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
@@ -63,7 +63,7 @@ public interface ConsoleUrlProvider extends Describable<ConsoleUrlProvider> {
      * <p>Should only be used in the context of serving an HTTP request.
      * @param run the build
      * @return the URL for the console for the specified build, relative to the context of Jenkins (should not start with {@code /}), or {@code null}
-     * if this implementation does not want to server a special console view for this build.
+     * if this implementation does not want to serve a special console view for this build.
      */
     @CheckForNull String getConsoleUrl(Run<?, ?> run);
 

From 2d30cfcf986ea70525ad4bfa91710a99eaa08f8a Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Thu, 22 Aug 2024 17:20:38 +0200
Subject: [PATCH 339/449] Fix review

---
 core/src/main/java/hudson/Functions.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 669d13ca85f3..313e0b81c061 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -1907,18 +1907,14 @@ public static String joinPath(String... components) {
     }
 
     /**
-     * Computes the link to the console for the run for the specified executable, taking {@link ConsoleUrlProvider} into account.
-     * @param executable the executable (normally a {@link Run})
-     * @return the absolute URL for accessing the build console for the executable, or null if there is no build associated with the executable
+     * Computes the link to the console for the run for the specified object, taking {@link ConsoleUrlProvider} into account.
+     * @param withConsoleUrl the object to compute a console url for (can be {@link Run}, a {@code PlaceholderExecutable}...)
+     * @return the absolute URL for accessing the build console for the given object, or null if there is no console URL defined for the object.
      * @since 2.433
      */
-    public static @CheckForNull String getConsoleUrl(Object executable) {
-        if (executable instanceof WithConsoleUrl) {
-            String consoleUrl = ((WithConsoleUrl) executable).getConsoleUrl();
-            return consoleUrl != null ? Stapler.getCurrentRequest().getContextPath() + '/' + consoleUrl : null;
-        } else {
-            return null;
-        }
+    public static @CheckForNull String getConsoleUrl(WithConsoleUrl withConsoleUrl) {
+        String consoleUrl = withConsoleUrl.getConsoleUrl();
+        return consoleUrl != null ? Stapler.getCurrentRequest().getContextPath() + '/' + consoleUrl : null;
     }
 
     /**

From c72a895582df91fe8433156ddf9d30e6098d4181 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 11:18:55 -0700
Subject: [PATCH 340/449] Update dependency sass-loader to v16.0.1 (#9647)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 188a283fefaa..3f172ed7310c 100644
--- a/war/package.json
+++ b/war/package.json
@@ -43,7 +43,7 @@
     "postcss-scss": "4.0.9",
     "prettier": "3.3.3",
     "sass": "1.77.8",
-    "sass-loader": "16.0.0",
+    "sass-loader": "16.0.1",
     "style-loader": "4.0.0",
     "stylelint": "16.8.2",
     "stylelint-checkstyle-reporter": "1.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 85d04fe07c75..c0200cd7652d 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4449,7 +4449,7 @@ __metadata:
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.3"
     sass: "npm:1.77.8"
-    sass-loader: "npm:16.0.0"
+    sass-loader: "npm:16.0.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
     stylelint: "npm:16.8.2"
@@ -6380,9 +6380,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass-loader@npm:16.0.0":
-  version: 16.0.0
-  resolution: "sass-loader@npm:16.0.0"
+"sass-loader@npm:16.0.1":
+  version: 16.0.1
+  resolution: "sass-loader@npm:16.0.1"
   dependencies:
     neo-async: "npm:^2.6.2"
   peerDependencies:
@@ -6402,7 +6402,7 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 10c0/0d2c2ee89a380ae19f1d024008c241afb747c254cf8e2163b281533c803a1cb3933236f0cfbb59a296fce864e4274e32a80c30dadd5b98618a362f0be8bac20f
+  checksum: 10c0/ac841ea8881354e4bf286c2c5f331b60c2edf73c6e4abbc85b954024ec16dfda01accf59ea6fcb4b29ec7dd5a81a9950fc9138dcb262b9130865367201b7699a
   languageName: node
   linkType: hard
 

From 856bd0fc58441eb7d82f3c15e56cb95c31307d16 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Thu, 22 Aug 2024 11:50:03 -0700
Subject: [PATCH 341/449] Turn down log level of
 `StaplerFilteredActionListener` (#9643)

---
 .../security/stapler/StaplerFilteredActionListener.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java b/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java
index 46b7cab9028b..cc658c275fcf 100644
--- a/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java
+++ b/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java
@@ -50,7 +50,7 @@ public class StaplerFilteredActionListener implements FilteredDoActionTriggerLis
 
     @Override
     public boolean onDoActionTrigger(Function f, StaplerRequest req, StaplerResponse rsp, Object node) {
-        LOGGER.log(Level.WARNING, LOG_MESSAGE, new Object[]{
+        LOGGER.log(Level.FINER, LOG_MESSAGE, new Object[]{
                 req.getPathInfo(),
                 f.getSignature(),
         });
@@ -59,7 +59,7 @@ public boolean onDoActionTrigger(Function f, StaplerRequest req, StaplerResponse
 
     @Override
     public boolean onGetterTrigger(Function f, StaplerRequest req, StaplerResponse rsp, Object node, String expression) {
-        LOGGER.log(Level.WARNING, LOG_MESSAGE, new Object[]{
+        LOGGER.log(Level.FINER, LOG_MESSAGE, new Object[]{
                 req.getPathInfo(),
                 f.getSignature(),
         });
@@ -68,7 +68,7 @@ public boolean onGetterTrigger(Function f, StaplerRequest req, StaplerResponse r
 
     @Override
     public boolean onFieldTrigger(FieldRef f, StaplerRequest req, StaplerResponse staplerResponse, Object node, String expression) {
-        LOGGER.log(Level.WARNING, LOG_MESSAGE, new Object[]{
+        LOGGER.log(Level.FINER, LOG_MESSAGE, new Object[]{
                 req.getPathInfo(),
                 f.getSignature(),
         });
@@ -77,7 +77,7 @@ public boolean onFieldTrigger(FieldRef f, StaplerRequest req, StaplerResponse st
 
     @Override
     public boolean onDispatchTrigger(StaplerRequest req, StaplerResponse rsp, Object node, String viewName) {
-        LOGGER.warning(() -> "New Stapler dispatch rules result in the URL \"" + req.getPathInfo() + "\" no longer being allowed. " +
+        LOGGER.finer(() -> "New Stapler dispatch rules result in the URL \"" + req.getPathInfo() + "\" no longer being allowed. " +
                 "If you consider it safe to use, add the following to the whitelist: \"" + node.getClass().getName() + " " + viewName + "\". " +
                 "Learn more: https://www.jenkins.io/redirect/stapler-facet-restrictions");
         return false;

From e6c9f30192f8098421c8f0187c334baac2a338e1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 13:46:34 -0700
Subject: [PATCH 342/449] Update dependency mini-css-extract-plugin to v2.9.1
 (#9646)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 3f172ed7310c..8e20aa87f044 100644
--- a/war/package.json
+++ b/war/package.json
@@ -36,7 +36,7 @@
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.9.0",
     "handlebars-loader": "1.7.3",
-    "mini-css-extract-plugin": "2.9.0",
+    "mini-css-extract-plugin": "2.9.1",
     "postcss": "8.4.41",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "10.0.2",
diff --git a/war/yarn.lock b/war/yarn.lock
index c0200cd7652d..4154ae0ba2de 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4442,7 +4442,7 @@ __metadata:
     hotkeys-js: "npm:3.12.2"
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
-    mini-css-extract-plugin: "npm:2.9.0"
+    mini-css-extract-plugin: "npm:2.9.1"
     postcss: "npm:8.4.41"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:10.0.2"
@@ -4875,15 +4875,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mini-css-extract-plugin@npm:2.9.0":
-  version: 2.9.0
-  resolution: "mini-css-extract-plugin@npm:2.9.0"
+"mini-css-extract-plugin@npm:2.9.1":
+  version: 2.9.1
+  resolution: "mini-css-extract-plugin@npm:2.9.1"
   dependencies:
     schema-utils: "npm:^4.0.0"
     tapable: "npm:^2.2.1"
   peerDependencies:
     webpack: ^5.0.0
-  checksum: 10c0/46e20747ea250420db8a82801b9779299ce3cd5ec4d6dd75e00904c39cc80f0f01decaa534b8cb9658d7d3b656b919cb2cc84b1ba7e2394d2d6548578a5c2901
+  checksum: 10c0/19361902ef028b9875aafa3931d99643c2d95824ba343a501c83ff61d069a430fcfc523ca796765798b564570da2199f5a28cd51b9528ddbcfdc9271c61400d0
   languageName: node
   linkType: hard
 

From 8d10674a5bb4e37434d4014e32f2f200150be5ed Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:47:01 -0700
Subject: [PATCH 343/449] Update dependency org.jenkins-ci.plugins:junit to
 v1296 (#9650)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 11aa78c459fe..21089219623c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -230,7 +230,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1295.vf2321cf6c27e</version>
+      <version>1296.vb_f538b_c88630</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 78c14f4153e8..d035fc0db858 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -307,7 +307,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1295.vf2321cf6c27e</version>
+                  <version>1296.vb_f538b_c88630</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 49618a00cedd29640b6bb08da118226ff6aadc4e Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Fri, 23 Aug 2024 08:14:22 +0200
Subject: [PATCH 344/449] Updating the test to note the behavioural change

---
 .../src/test/java/jenkins/console/ConsoleUrlProviderTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/src/test/java/jenkins/console/ConsoleUrlProviderTest.java b/test/src/test/java/jenkins/console/ConsoleUrlProviderTest.java
index b9881fbeddac..9a97ff0748df 100644
--- a/test/src/test/java/jenkins/console/ConsoleUrlProviderTest.java
+++ b/test/src/test/java/jenkins/console/ConsoleUrlProviderTest.java
@@ -58,9 +58,9 @@ public void getRedirectUrl() throws Exception {
         // Custom URL without leading slash
         b.setDescription("custom my/build/console");
         assertCustomConsoleUrl(r.contextPath + "/my/build/console", b);
-        // Custom URL with leading slash
+        // Custom URL with leading slash -> not supported, falls back to default
         b.setDescription("custom /my/build/console");
-        assertCustomConsoleUrl(r.contextPath + "/my/build/console", b);
+        assertCustomConsoleUrl(r.contextPath + '/' + b.getUrl() + "console", b);
         // Default URL is used when extensions throw exceptions.
         b.setDescription("NullPointerException");
         assertCustomConsoleUrl(r.contextPath + '/' + b.getUrl() + "console", b);

From fb09eafb02ead56b93620b9f47cbb22a43b8eb70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 07:59:21 -0700
Subject: [PATCH 345/449] Update stapler.version to v1896 (major) (#9651)

Update dependency org.kohsuke.stapler:stapler-groovy to v1896

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 72c188da0a4e..ad23ed312b5e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
-    <stapler.version>1894.v82b_2fb_35519d</stapler.version>
+    <stapler.version>1896.v8170998149d0</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 

From de5cd41b55ec4466dd82bdd41691f7834b00ef49 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sat, 24 Aug 2024 11:57:51 +0200
Subject: [PATCH 346/449] [JENKINS-73668] fix styling of rowSelectionController
 dropdown (#9641)

* [JENKINS-73668] fix stlying of rowSelectionController dropdown

ensure there is enough gap between entries

* style it as before with smaller dropdown button

* apply prettier
---
 .../scss/components/_row-selection-controller.scss  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/war/src/main/scss/components/_row-selection-controller.scss b/war/src/main/scss/components/_row-selection-controller.scss
index df5cf1553175..e373cd4bf721 100644
--- a/war/src/main/scss/components/_row-selection-controller.scss
+++ b/war/src/main/scss/components/_row-selection-controller.scss
@@ -93,14 +93,14 @@
 
 .jenkins-table__checkbox-options {
   height: 1.375rem;
-  min-height: unset;
-  padding: 0 0.2rem;
-  margin-left: 0.2rem;
+  min-height: unset !important;
+  padding: 0 0.2rem !important;
+  margin: 0 0 0 0.2rem !important;
   border-radius: 6px;
 
   svg {
-    width: 0.9rem;
-    height: 0.9rem;
+    max-width: 0.9rem;
+    max-height: 0.9rem;
     pointer-events: none;
     color: var(--input-border);
     transition: var(--standard-transition);
@@ -185,6 +185,9 @@
     justify-content: flex-start;
     gap: 0.75rem;
     border-radius: 10px;
+    margin: 0 !important;
+    padding: 0.5rem 0.9rem !important;
+    min-height: 2.25rem !important;
   }
 
   &--visible {

From 83541cfb0e5116ee93bd9d778e1464e78389f58f Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Sat, 24 Aug 2024 11:58:09 +0200
Subject: [PATCH 347/449] [JENKINS-73613] refresh buildhistory widget in all
 cases (#9624)

* [JENKINS-73592] refresh buildhistory widget when page gets focus

* [JENKINS-73613] refresh buildhistory in all cases

refresh the buildHistory widget instantly when the window gets focus,
e.g. after switching browser tabs but also when one was in another
application and clicks in the browser window.
When the window is visible it will update even when it has no focus,
when the window is hidden no calls to the controller will be done.

Additionally the buildHistory will be updated when it is not on the
first page. So e.g. when someone deletes a build, changes the display
name or the description or when a build is still running the page gets
updated.
---
 .../hudson/widgets/HistoryWidget/index.jelly  |  2 +-
 war/src/main/js/pages/project/builds-card.js  | 30 +++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
index 8d4663bb00dd..6b158ddc4ea6 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly
@@ -56,7 +56,7 @@ THE SOFTWARE.
         <div id="jenkins-build-history" class="app-builds-container__items">
         </div>
 
-        <div class="app-builds-container__controls" id="controls">
+        <div class="app-builds-container__controls jenkins-hidden" id="controls">
           <button class="jenkins-button jenkins-button--tertiary jenkins-card__unveil" id="up">
             <l:icon src="symbol-arrow-left" />
             <span class="jenkins-visually-hidden">${%Newer builds}</span>
diff --git a/war/src/main/js/pages/project/builds-card.js b/war/src/main/js/pages/project/builds-card.js
index bea375d337d8..44c57c05b57e 100644
--- a/war/src/main/js/pages/project/builds-card.js
+++ b/war/src/main/js/pages/project/builds-card.js
@@ -26,13 +26,28 @@ const updateBuildsRefreshInterval = 5000;
  */
 function load(options = {}) {
   /** @type {QueryParameters} */
+  cancelRefreshTimeout();
   const params = Object.assign({}, options, { search: pageSearchInput.value });
+  const paginationOrFirst =
+    buildHistoryPage.dataset.pageHasUp === "false" ||
+    "older-than" in params ||
+    "newer-than" in params;
 
-  // Avoid fetching if the page isn't active
+  // Avoid fetching if the page isn't visible
   if (document.hidden) {
     return;
   }
 
+  createRefreshTimeout();
+
+  // When we're not on the first page and this is not a load due to pagination
+  // we need to set the correct value for older-than so we fetch the same set of runs
+  if (!paginationOrFirst) {
+    params["older-than"] = (
+      BigInt(buildHistoryPage.dataset.pageEntryNewest) + 1n
+    ).toString();
+  }
+
   fetch(ajaxUrl + toQueryString(params)).then((rsp) => {
     if (rsp.ok) {
       rsp.text().then((responseText) => {
@@ -92,15 +107,9 @@ function updateCardControls(parameters) {
     !parameters.pageHasDown,
   );
 
-  // We only want the list to refresh if the user is on the first page of results
-  if (!parameters.pageHasUp) {
-    createRefreshTimeout();
-  } else {
-    cancelRefreshTimeout();
-  }
-
   buildHistoryPage.dataset.pageEntryNewest = parameters.pageEntryNewest;
   buildHistoryPage.dataset.pageEntryOldest = parameters.pageEntryOldest;
+  buildHistoryPage.dataset.pageHasUp = parameters.pageHasUp;
 }
 
 paginationPrevious.addEventListener("click", () => {
@@ -108,7 +117,6 @@ paginationPrevious.addEventListener("click", () => {
 });
 
 paginationNext.addEventListener("click", () => {
-  cancelRefreshTimeout();
   load({ "older-than": buildHistoryPage.dataset.pageEntryOldest });
 });
 
@@ -139,4 +147,8 @@ document.addEventListener("DOMContentLoaded", function () {
   });
 
   load();
+
+  window.addEventListener("focus", function () {
+    load();
+  });
 });

From 52a597e61fab81c977fee14ff6188df86a6d896f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 10:50:00 +0200
Subject: [PATCH 348/449] Update dependency node to v20.17.0 (#9655)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index d035fc0db858..27f19bf0be10 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -49,7 +49,7 @@ THE SOFTWARE.
     <mina-sshd-api.version>2.13.2-125.v200281b_61d59</mina-sshd-api.version>
     <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
     <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
-    <node.version>20.16.0</node.version>
+    <node.version>20.17.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->

From ba6db23a51c507df3f4dd99598b2eb116f36d288 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 19:10:58 +0100
Subject: [PATCH 349/449] Update dependency @babel/preset-env to v7.25.4
 (#9657)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |   2 +-
 war/yarn.lock    | 258 +++++++++++++++++++++--------------------------
 2 files changed, 115 insertions(+), 145 deletions(-)

diff --git a/war/package.json b/war/package.json
index 8e20aa87f044..39c569e28649 100644
--- a/war/package.json
+++ b/war/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@babel/cli": "7.24.8",
     "@babel/core": "7.25.2",
-    "@babel/preset-env": "7.25.3",
+    "@babel/preset-env": "7.25.4",
     "@eslint/js": "9.9.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 4154ae0ba2de..96386d003b58 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -59,10 +59,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2":
-  version: 7.25.2
-  resolution: "@babel/compat-data@npm:7.25.2"
-  checksum: 10c0/5bf1f14d6e5f0d37c19543e99209ff4a94bb97915e1ce01e5334a144aa08cd56b6e62ece8135dac77e126723d63d4d4b96fc603a12c43b88c28f4b5e070270c5
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2, @babel/compat-data@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/compat-data@npm:7.25.4"
+  checksum: 10c0/50d79734d584a28c69d6f5b99adfaa064d0f41609a378aef04eb06accc5b44f8520e68549eba3a082478180957b7d5783f1bfb1672e4ae8574e797ce8bae79fa
   languageName: node
   linkType: hard
 
@@ -89,15 +89,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/generator@npm:7.25.0"
+"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.4":
+  version: 7.25.5
+  resolution: "@babel/generator@npm:7.25.5"
   dependencies:
-    "@babel/types": "npm:^7.25.0"
+    "@babel/types": "npm:^7.25.4"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/d0e2dfcdc8bdbb5dded34b705ceebf2e0bc1b06795a1530e64fb6a3ccf313c189db7f60c1616effae48114e1a25adc75855bc4496f3779a396b3377bae718ce7
+  checksum: 10c0/eb8af30c39476e4f4d6b953f355fcf092258291f78d65fb759b7d5e5e6fd521b5bfee64a4e2e4290279f0dcd25ccf8c49a61807828b99b5830d2b734506da1fd
   languageName: node
   linkType: hard
 
@@ -133,41 +133,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.7"
+"@babel/helper-create-class-features-plugin@npm:^7.24.7, @babel/helper-create-class-features-plugin@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.25.4"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-environment-visitor": "npm:^7.24.7"
-    "@babel/helper-function-name": "npm:^7.24.7"
-    "@babel/helper-member-expression-to-functions": "npm:^7.24.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.8"
     "@babel/helper-optimise-call-expression": "npm:^7.24.7"
-    "@babel/helper-replace-supers": "npm:^7.24.7"
+    "@babel/helper-replace-supers": "npm:^7.25.0"
     "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.24.7"
-    "@babel/helper-split-export-declaration": "npm:^7.24.7"
+    "@babel/traverse": "npm:^7.25.4"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/6b7b47d70b41c00f39f86790cff67acf2bce0289d52a7c182b28e797f4e0e6d69027e3d06eccf1d54dddc2e5dde1df663bb1932437e5f447aeb8635d8d64a6ab
+  checksum: 10c0/a765d9e0482e13cf96642fa8aa28e6f7d4d7d39f37840d6246e5e10a7c47f47c52d52522edd3073f229449d17ec0db6f9b7b5e398bff6bb0b4994d65957a164c
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.0"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7, @babel/helper-create-regexp-features-plugin@npm:^7.25.0, @babel/helper-create-regexp-features-plugin@npm:^7.25.2":
+  version: 7.25.2
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.2"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
     regexpu-core: "npm:^5.3.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/7d8b4d0338c1e76a60d8903745b5059fe0302e356a5b65607292f81e8333dc57583dbcb05e82f2b58d747864ad0044010a690b3bbb9278663b523f0ba919a37c
+  checksum: 10c0/85a7e3639c118856fb1113f54fb7e3bf7698171ddfd0cd6fccccd5426b3727bc1434fe7f69090441dcde327feef9de917e00d35e47ab820047057518dd675317
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.1"
+"@babel/helper-define-polyfill-provider@npm:^0.6.1, @babel/helper-define-polyfill-provider@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.22.6"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -176,30 +174,11 @@ __metadata:
     resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/210e1c8ac118f7c5a0ef5b42c4267c3db2f59b1ebc666a275d442b86896de4a66ef93539d702870f172f9749cd44c89f53056a5b17e619c3142b12ed4e4e6aae
+  checksum: 10c0/f777fe0ee1e467fdaaac059c39ed203bdc94ef2465fb873316e9e1acfc511a276263724b061e3b0af2f6d7ad3ff174f2bb368fde236a860e0f650fda43d7e022
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/36ece78882b5960e2d26abf13cf15ff5689bf7c325b10a2895a74a499e712de0d305f8d78bb382dd3c05cfba7e47ec98fe28aab5674243e0625cd38438dd0b2d
-  languageName: node
-  linkType: hard
-
-"@babel/helper-function-name@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-function-name@npm:7.24.7"
-  dependencies:
-    "@babel/template": "npm:^7.24.7"
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/e5e41e6cf86bd0f8bf272cbb6e7c5ee0f3e9660414174435a46653efba4f2479ce03ce04abff2aa2ef9359cf057c79c06cb7b134a565ad9c0e8a50dcdc3b43c4
-  languageName: node
-  linkType: hard
-
-"@babel/helper-member-expression-to-functions@npm:^7.24.7, @babel/helper-member-expression-to-functions@npm:^7.24.8":
+"@babel/helper-member-expression-to-functions@npm:^7.24.8":
   version: 7.24.8
   resolution: "@babel/helper-member-expression-to-functions@npm:7.24.8"
   dependencies:
@@ -295,15 +274,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
-  dependencies:
-    "@babel/types": "npm:^7.24.7"
-  checksum: 10c0/0254577d7086bf09b01bbde98f731d4fcf4b7c3fa9634fdb87929801307c1f6202a1352e3faa5492450fa8da4420542d44de604daf540704ff349594a78184f6
-  languageName: node
-  linkType: hard
-
 "@babel/helper-string-parser@npm:^7.24.8":
   version: 7.24.8
   resolution: "@babel/helper-string-parser@npm:7.24.8"
@@ -358,14 +328,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3":
-  version: 7.25.3
-  resolution: "@babel/parser@npm:7.25.3"
+"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/parser@npm:7.25.4"
   dependencies:
-    "@babel/types": "npm:^7.25.2"
+    "@babel/types": "npm:^7.25.4"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/874b01349aedb805d6694f867a752fdc7469778fad76aca4548d2cc6ce96087c3ba5fb917a6f8d05d2d1a74aae309b5f50f1a4dba035f5a2c9fcfe6e106d2c4e
+  checksum: 10c0/bdada5662f15d1df11a7266ec3bc9bb769bf3637ecf3d051eafcfc8f576dcf5a3ac1007c5e059db4a1e1387db9ae9caad239fc4f79e4c2200930ed610e779993
   languageName: node
   linkType: hard
 
@@ -647,17 +617,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.0"
+"@babel/plugin-transform-async-generator-functions@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.4"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-remap-async-to-generator": "npm:^7.25.0"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
-    "@babel/traverse": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5348c3a33d16e0d62f13482c6fa432185ba096d58880b08d42450f7db662d6b03e6149d495c8620897dcd3da35061068cbd6c09da7d0ec95743e55a788809e4e
+  checksum: 10c0/efed6f6be90b25ad77c15a622a0dc0b22dbf5d45599c207ab8fbc4e959aef21f574fa467d9cf872e45de664a46c32334e78dee2332d82f5f27e26249a34a0920
   languageName: node
   linkType: hard
 
@@ -696,15 +666,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-class-properties@npm:7.24.7"
+"@babel/plugin-transform-class-properties@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-class-properties@npm:7.25.4"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.4"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/75018a466c7ede3d2397e158891c224ba7fca72864506ce067ddbc02fc65191d44da4d6379c996d0c7f09019e26b5c3f5f1d3a639cd98366519723886f0689d0
+  checksum: 10c0/0b41bc8a5920d3d17c7c06220b601cf43e0a32ac34f05f05cd0cdf08915e4521b1b707cb1e60942b4fc68a5dfac09f0444a8720e0c72ce76fb039e8ec5263115
   languageName: node
   linkType: hard
 
@@ -721,19 +691,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/plugin-transform-classes@npm:7.25.0"
+"@babel/plugin-transform-classes@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-classes@npm:7.25.4"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.24.7"
-    "@babel/helper-compilation-targets": "npm:^7.24.8"
+    "@babel/helper-compilation-targets": "npm:^7.25.2"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-replace-supers": "npm:^7.25.0"
-    "@babel/traverse": "npm:^7.25.0"
+    "@babel/traverse": "npm:^7.25.4"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/4451dccf8a7979427ae042afe381233f30764a8072faf0de1337a4fc297c6d7cb40df9e28931ac096e5b56392d0cd97d3ce10aee68288150a8701624d362a791
+  checksum: 10c0/c68424d9dd64860825111aa4a4ed5caf29494b7a02ddb9c36351d768c41e8e05127d89274795cdfcade032d9d299e6c677418259df58c71e68f1741583dcf467
   languageName: node
   linkType: hard
 
@@ -1062,15 +1032,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-private-methods@npm:7.24.7"
+"@babel/plugin-transform-private-methods@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-private-methods@npm:7.25.4"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.4"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5b7bf923b738fbe3ad6c33b260e0a7451be288edfe4ef516303fa787a1870cd87533bfbf61abb779c22ed003c2fc484dec2436fe75a48756f686c0241173d364
+  checksum: 10c0/7abdb427c3984a2c8a2e9d806297d8509b02f78a3501b7760e544be532446e9df328b876daa8fc38718f3dce7ccc45083016ee7aeaab169b81c142bc18700794
   languageName: node
   linkType: hard
 
@@ -1213,23 +1183,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.25.4"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.24.7"
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.2"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/7457c0ee8e80a80cb6fdc1fe54ab115b52815627616ce9151be8ef292fc99d04a910ec24f11382b4f124b89374264396892b086886bd2a9c2317904d87c9b21b
+  checksum: 10c0/f65749835a98d8d6242e961f9276bdcdb09020e791d151ccc145acaca9a66f025b2c7cb761104f139180d35eb066a429596ee6edece81f5fd9244e0edb97d7ec
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.25.3":
-  version: 7.25.3
-  resolution: "@babel/preset-env@npm:7.25.3"
+"@babel/preset-env@npm:7.25.4":
+  version: 7.25.4
+  resolution: "@babel/preset-env@npm:7.25.4"
   dependencies:
-    "@babel/compat-data": "npm:^7.25.2"
+    "@babel/compat-data": "npm:^7.25.4"
     "@babel/helper-compilation-targets": "npm:^7.25.2"
     "@babel/helper-plugin-utils": "npm:^7.24.8"
     "@babel/helper-validator-option": "npm:^7.24.8"
@@ -1258,13 +1228,13 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.24.7"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.25.0"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.25.4"
     "@babel/plugin-transform-async-to-generator": "npm:^7.24.7"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.7"
     "@babel/plugin-transform-block-scoping": "npm:^7.25.0"
-    "@babel/plugin-transform-class-properties": "npm:^7.24.7"
+    "@babel/plugin-transform-class-properties": "npm:^7.25.4"
     "@babel/plugin-transform-class-static-block": "npm:^7.24.7"
-    "@babel/plugin-transform-classes": "npm:^7.25.0"
+    "@babel/plugin-transform-classes": "npm:^7.25.4"
     "@babel/plugin-transform-computed-properties": "npm:^7.24.7"
     "@babel/plugin-transform-destructuring": "npm:^7.24.8"
     "@babel/plugin-transform-dotall-regex": "npm:^7.24.7"
@@ -1292,7 +1262,7 @@ __metadata:
     "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.7"
     "@babel/plugin-transform-optional-chaining": "npm:^7.24.8"
     "@babel/plugin-transform-parameters": "npm:^7.24.7"
-    "@babel/plugin-transform-private-methods": "npm:^7.24.7"
+    "@babel/plugin-transform-private-methods": "npm:^7.25.4"
     "@babel/plugin-transform-private-property-in-object": "npm:^7.24.7"
     "@babel/plugin-transform-property-literals": "npm:^7.24.7"
     "@babel/plugin-transform-regenerator": "npm:^7.24.7"
@@ -1305,16 +1275,16 @@ __metadata:
     "@babel/plugin-transform-unicode-escapes": "npm:^7.24.7"
     "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.7"
     "@babel/plugin-transform-unicode-regex": "npm:^7.24.7"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.7"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.25.4"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
-    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.6"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     core-js-compat: "npm:^3.37.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/9287dc2e296fe2aa3367d84c2a799db17c9d1e48bba86525f47c6f51f5ba2e2cce454f45f4ae2ef928f9077c0640b04556b55b94835675ceeca94a0c5133205e
+  checksum: 10c0/ed210a1974b5a1e7f80a933c87253907ec869457cea900bc97892642fa9a690c47627a9bac08a7c9495deb992a2b15f308ffca2741e1876ba47172c96fa27e14
   languageName: node
   linkType: hard
 
@@ -1358,29 +1328,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3":
-  version: 7.25.3
-  resolution: "@babel/traverse@npm:7.25.3"
+"@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3, @babel/traverse@npm:^7.25.4":
+  version: 7.25.4
+  resolution: "@babel/traverse@npm:7.25.4"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.25.0"
-    "@babel/parser": "npm:^7.25.3"
+    "@babel/generator": "npm:^7.25.4"
+    "@babel/parser": "npm:^7.25.4"
     "@babel/template": "npm:^7.25.0"
-    "@babel/types": "npm:^7.25.2"
+    "@babel/types": "npm:^7.25.4"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/4c8a1966fa90b53a783a4afd2fcdaa6ab1a912e6621dca9fcc6633e80ccb9491620e88caf73b537da4e16cefd537b548c87d7087868d5b0066414dea375c0e9b
+  checksum: 10c0/37c9b49b277e051fe499ef5f6f217370c4f648d6370564d70b5e6beb2da75bfda6d7dab1d39504d89e9245448f8959bc1a5880d2238840cdc3979b35338ed0f5
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.4.4":
-  version: 7.25.2
-  resolution: "@babel/types@npm:7.25.2"
+"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.4, @babel/types@npm:^7.4.4":
+  version: 7.25.4
+  resolution: "@babel/types@npm:7.25.4"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/e489435856be239f8cc1120c90a197e4c2865385121908e5edb7223cfdff3768cba18f489adfe0c26955d9e7bbb1fb10625bc2517505908ceb0af848989bd864
+  checksum: 10c0/9aa25dfcd89cc4e4dde3188091c34398a005a49e2c2b069d0367b41e1122c91e80fd92998c52a90f2fb500f7e897b6090ec8be263d9cb53d0d75c756f44419f2
   languageName: node
   linkType: hard
 
@@ -2709,15 +2679,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.10.4":
-  version: 0.10.4
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4"
+"babel-plugin-polyfill-corejs3@npm:^0.10.6":
+  version: 0.10.6
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.6"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
-    core-js-compat: "npm:^3.36.1"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.2"
+    core-js-compat: "npm:^3.38.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/31b92cd3dfb5b417da8dfcf0deaa4b8b032b476d7bb31ca51c66127cf25d41e89260e89d17bc004b2520faa38aa9515fafabf81d89f9d4976e9dc1163e4a7c41
+  checksum: 10c0/3a69220471b07722c2ae6537310bf26b772514e12b601398082965459c838be70a0ca70b0662f0737070654ff6207673391221d48599abb4a2b27765206d9f79
   languageName: node
   linkType: hard
 
@@ -2795,17 +2765,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
-  version: 4.23.1
-  resolution: "browserslist@npm:4.23.1"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1, browserslist@npm:^4.23.3":
+  version: 4.23.3
+  resolution: "browserslist@npm:4.23.3"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001629"
-    electron-to-chromium: "npm:^1.4.796"
-    node-releases: "npm:^2.0.14"
-    update-browserslist-db: "npm:^1.0.16"
+    caniuse-lite: "npm:^1.0.30001646"
+    electron-to-chromium: "npm:^1.5.4"
+    node-releases: "npm:^2.0.18"
+    update-browserslist-db: "npm:^1.1.0"
   bin:
     browserslist: cli.js
-  checksum: 10c0/eb47c7ab9d60db25ce2faca70efeb278faa7282a2f62b7f2fa2f92e5f5251cf65144244566c86559419ff4f6d78f59ea50e39911321ad91f3b27788901f1f5e9
+  checksum: 10c0/3063bfdf812815346447f4796c8f04601bf5d62003374305fd323c2a463e42776475bcc5309264e39bcf9a8605851e53560695991a623be988138b3ff8c66642
   languageName: node
   linkType: hard
 
@@ -2855,10 +2825,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629":
-  version: 1.0.30001639
-  resolution: "caniuse-lite@npm:1.0.30001639"
-  checksum: 10c0/3f56ce3d516a4fba959ad10ed6ecb15c6329233fc01f9f2714234a2ca91f408296d708a366ece510ca6566f71cb80d20d4c019441a1451ac1456e0128c8de78a
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001646":
+  version: 1.0.30001653
+  resolution: "caniuse-lite@npm:1.0.30001653"
+  checksum: 10c0/7aedf037541c93744148f599daea93d46d1f93ab4347997189efa2d1f003af8eadd7e1e05347ef09261ac1dc635ce375b8c6c00796245fffb4120a124824a14f
   languageName: node
   linkType: hard
 
@@ -3047,12 +3017,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.36.1, core-js-compat@npm:^3.37.1":
-  version: 3.37.1
-  resolution: "core-js-compat@npm:3.37.1"
+"core-js-compat@npm:^3.37.1, core-js-compat@npm:^3.38.0":
+  version: 3.38.1
+  resolution: "core-js-compat@npm:3.38.1"
   dependencies:
-    browserslist: "npm:^4.23.0"
-  checksum: 10c0/4e2da9c900f2951a57947af7aeef4d16f2c75d7f7e966c0d0b62953f65225003ade5e84d3ae98847f65b24c109c606821d9dc925db8ca418fb761e7c81963c2a
+    browserslist: "npm:^4.23.3"
+  checksum: 10c0/d8bc8a35591fc5fbf3e376d793f298ec41eb452619c7ef9de4ea59b74be06e9fda799e0dcbf9ba59880dae87e3b41fb191d744ffc988315642a1272bb9442b31
   languageName: node
   linkType: hard
 
@@ -3400,10 +3370,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.796":
-  version: 1.4.816
-  resolution: "electron-to-chromium@npm:1.4.816"
-  checksum: 10c0/1a84bc42234484cbc5e8b521de57fd3ab9984a2111d8605eab26b3525f382c0c7b83b45bf8b34e5fa4a730cd183fef5dffa4a0627754c7f4fb0aae9cb3c16b37
+"electron-to-chromium@npm:^1.5.4":
+  version: 1.5.13
+  resolution: "electron-to-chromium@npm:1.5.13"
+  checksum: 10c0/1d88ac39447e1d718c4296f92fe89836df4688daf2d362d6c49108136795f05a56dd9c950f1c6715e0395fa037c3b5f5ea686c543fdc90e6d74a005877c45022
   languageName: node
   linkType: hard
 
@@ -4427,7 +4397,7 @@ __metadata:
   dependencies:
     "@babel/cli": "npm:7.24.8"
     "@babel/core": "npm:7.25.2"
-    "@babel/preset-env": "npm:7.25.3"
+    "@babel/preset-env": "npm:7.25.4"
     "@eslint/js": "npm:9.9.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
@@ -5062,10 +5032,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.14":
-  version: 2.0.14
-  resolution: "node-releases@npm:2.0.14"
-  checksum: 10c0/199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
+"node-releases@npm:^2.0.18":
+  version: 2.0.18
+  resolution: "node-releases@npm:2.0.18"
+  checksum: 10c0/786ac9db9d7226339e1dc84bbb42007cb054a346bd9257e6aa154d294f01bc6a6cddb1348fa099f079be6580acbb470e3c048effd5f719325abd0179e566fd27
   languageName: node
   linkType: hard
 
@@ -7005,7 +6975,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.16":
+"update-browserslist-db@npm:^1.1.0":
   version: 1.1.0
   resolution: "update-browserslist-db@npm:1.1.0"
   dependencies:

From 6a57966209343f1e5b46d3d5a6864f9d2c8234d2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 19:14:09 +0100
Subject: [PATCH 350/449] Update dependency webpack to v5.94.0 (#9659)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 45 ++++++++++++---------------------------------
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/war/package.json b/war/package.json
index 39c569e28649..8bdaaa7d5669 100644
--- a/war/package.json
+++ b/war/package.json
@@ -48,7 +48,7 @@
     "stylelint": "16.8.2",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
-    "webpack": "5.93.0",
+    "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
     "webpack-remove-empty-scripts": "1.0.4"
   },
diff --git a/war/yarn.lock b/war/yarn.lock
index 96386d003b58..8c4c32c0adc3 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -2116,27 +2116,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint-scope@npm:^3.7.3":
-  version: 3.7.7
-  resolution: "@types/eslint-scope@npm:3.7.7"
-  dependencies:
-    "@types/eslint": "npm:*"
-    "@types/estree": "npm:*"
-  checksum: 10c0/a0ecbdf2f03912679440550817ff77ef39a30fa8bfdacaf6372b88b1f931828aec392f52283240f0d648cf3055c5ddc564544a626bcf245f3d09fcb099ebe3cc
-  languageName: node
-  linkType: hard
-
-"@types/eslint@npm:*":
-  version: 8.56.2
-  resolution: "@types/eslint@npm:8.56.2"
-  dependencies:
-    "@types/estree": "npm:*"
-    "@types/json-schema": "npm:*"
-  checksum: 10c0/e33ca87a30a9454ba9943e1270ac759996f5fe598a1c1afbaec1d1e7346a339e20bf2a9d81f177067116bbaa6cfa4f748993cb338f57978ae862ad38ffae56fe
-  languageName: node
-  linkType: hard
-
-"@types/estree@npm:*, @types/estree@npm:^1.0.5":
+"@types/estree@npm:^1.0.5":
   version: 1.0.5
   resolution: "@types/estree@npm:1.0.5"
   checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
@@ -2178,7 +2158,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+"@types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
   version: 7.0.15
   resolution: "@types/json-schema@npm:7.0.15"
   checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
@@ -3407,13 +3387,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^5.17.0":
-  version: 5.17.0
-  resolution: "enhanced-resolve@npm:5.17.0"
+"enhanced-resolve@npm:^5.17.1":
+  version: 5.17.1
+  resolution: "enhanced-resolve@npm:5.17.1"
   dependencies:
     graceful-fs: "npm:^4.2.4"
     tapable: "npm:^2.2.0"
-  checksum: 10c0/90065e58e4fd08e77ba47f827eaa17d60c335e01e4859f6e644bb3b8d0e32b203d33894aee92adfa5121fa262f912b48bdf0d0475e98b4a0a1132eea1169ad37
+  checksum: 10c0/81a0515675eca17efdba2cf5bad87abc91a528fc1191aad50e275e74f045b41506167d420099022da7181c8d787170ea41e4a11a0b10b7a16f6237daecb15370
   languageName: node
   linkType: hard
 
@@ -4426,7 +4406,7 @@ __metadata:
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.1"
     tippy.js: "npm:6.3.7"
-    webpack: "npm:5.93.0"
+    webpack: "npm:5.94.0"
     webpack-cli: "npm:5.1.4"
     webpack-remove-empty-scripts: "npm:1.0.4"
     window-handle: "npm:1.0.1"
@@ -7076,11 +7056,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5.93.0":
-  version: 5.93.0
-  resolution: "webpack@npm:5.93.0"
+"webpack@npm:5.94.0":
+  version: 5.94.0
+  resolution: "webpack@npm:5.94.0"
   dependencies:
-    "@types/eslint-scope": "npm:^3.7.3"
     "@types/estree": "npm:^1.0.5"
     "@webassemblyjs/ast": "npm:^1.12.1"
     "@webassemblyjs/wasm-edit": "npm:^1.12.1"
@@ -7089,7 +7068,7 @@ __metadata:
     acorn-import-attributes: "npm:^1.9.5"
     browserslist: "npm:^4.21.10"
     chrome-trace-event: "npm:^1.0.2"
-    enhanced-resolve: "npm:^5.17.0"
+    enhanced-resolve: "npm:^5.17.1"
     es-module-lexer: "npm:^1.2.1"
     eslint-scope: "npm:5.1.1"
     events: "npm:^3.2.0"
@@ -7109,7 +7088,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 10c0/f0c72f1325ff57a4cc461bb978e6e1296f2a7d45c9765965271aa686ccdd448512956f4d7fdcf8c164d073af046c5a0aba17ce85ea98e33e5e2bfbfe13aa5808
+  checksum: 10c0/b4d1b751f634079bd177a89eef84d80fa5bb8d6fc15d72ab40fc2b9ca5167a79b56585e1a849e9e27e259803ee5c4365cb719e54af70a43c06358ec268ff4ebf
   languageName: node
   linkType: hard
 

From 8282e8e719836e3dfa55697f7edd1168773df137 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:21:07 -0600
Subject: [PATCH 351/449] Bump micromatch from 4.0.7 to 4.0.8 in /war (#9656)

Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.7 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/4.0.8/CHANGELOG.md)
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.7...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 war/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/war/yarn.lock b/war/yarn.lock
index 8c4c32c0adc3..8419d34b8582 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4800,12 +4800,12 @@ __metadata:
   linkType: hard
 
 "micromatch@npm:^4.0.4, micromatch@npm:^4.0.7":
-  version: 4.0.7
-  resolution: "micromatch@npm:4.0.7"
+  version: 4.0.8
+  resolution: "micromatch@npm:4.0.8"
   dependencies:
     braces: "npm:^3.0.3"
     picomatch: "npm:^2.3.1"
-  checksum: 10c0/58fa99bc5265edec206e9163a1d2cec5fabc46a5b473c45f4a700adce88c2520456ae35f2b301e4410fb3afb27e9521fb2813f6fc96be0a48a89430e0916a772
+  checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8
   languageName: node
   linkType: hard
 

From ee42e4f2f7162835ee2408091f015cb0e88d0cf8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:21:17 -0600
Subject: [PATCH 352/449] Update dependency com.puppycrawl.tools:checkstyle to
 v10.18.0 (#9660)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 76fe0de99616..5e2406abbc53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,7 +282,7 @@ THE SOFTWARE.
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>10.17.0</version>
+              <version>10.18.0</version>
             </dependency>
           </dependencies>
           <executions>

From 9045a3db167a8f7294b2422ef39070aa71a3503c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=20=E9=9B=A8=E8=90=BD?=
 <53731501+qyl27@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:26:54 +0800
Subject: [PATCH 353/449] Fix PathRemoverTest timeout in RISC-V devices.
 (#9661)

---
 core/src/test/java/jenkins/util/io/PathRemoverTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/test/java/jenkins/util/io/PathRemoverTest.java b/core/src/test/java/jenkins/util/io/PathRemoverTest.java
index 0702221d3981..91bab631efe9 100644
--- a/core/src/test/java/jenkins/util/io/PathRemoverTest.java
+++ b/core/src/test/java/jenkins/util/io/PathRemoverTest.java
@@ -69,7 +69,7 @@
 public class PathRemoverTest {
 
     @Rule public TemporaryFolder tmp = new TemporaryFolder();
-    @Rule public Timeout timeout = new Timeout(10, TimeUnit.SECONDS);
+    @Rule public Timeout timeout = new Timeout(30, TimeUnit.SECONDS);
     @Rule public FileLockerRule locker = new FileLockerRule();
 
     @Test

From a3049771e6720172248a0df4d304c29055d71b75 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 26 Aug 2024 10:27:25 +0100
Subject: [PATCH 354/449] [JENKINS-73330] Fix dropdowns and tooltips on HDR
 displays (#9654)

---
 war/src/main/scss/abstracts/_theme.scss      | 6 ++----
 war/src/main/scss/components/_dropdowns.scss | 1 +
 war/src/main/scss/components/_tooltips.scss  | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss
index cc21f1e8ab90..29543cbfcb32 100644
--- a/war/src/main/scss/abstracts/_theme.scss
+++ b/war/src/main/scss/abstracts/_theme.scss
@@ -200,15 +200,13 @@ $semantics: (
   --link-font-weight: 450;
 
   // Tooltips
-  --tooltip-backdrop-filter: contrast(0.6) brightness(2.4) saturate(2)
-    blur(15px);
+  --tooltip-backdrop-filter: saturate(2) blur(20px);
   --tooltip-color: var(--text-color);
   --tooltip-box-shadow: 0 0 8px 2px rgba(0, 0, 30, 0.05),
     0 0 1px 1px rgba(0, 0, 20, 0.025), 0 10px 20px rgba(0, 0, 20, 0.15);
 
   // Dropdowns
-  --dropdown-backdrop-filter: contrast(0.6) brightness(2.5) saturate(1.5)
-    blur(20px);
+  --dropdown-backdrop-filter: saturate(1.5) blur(20px);
   --dropdown-box-shadow: 0 10px 30px rgba(0, 0, 20, 0.2),
     0 2px 10px rgba(0, 0, 20, 0.05), inset 0 -1px 2px rgba(255, 255, 255, 0.025);
 
diff --git a/war/src/main/scss/components/_dropdowns.scss b/war/src/main/scss/components/_dropdowns.scss
index 7268773f8fab..390867ccaf23 100644
--- a/war/src/main/scss/components/_dropdowns.scss
+++ b/war/src/main/scss/components/_dropdowns.scss
@@ -6,6 +6,7 @@ $dropdown-padding: 0.4rem;
   border-radius: 15px;
   box-shadow: var(--dropdown-box-shadow);
   outline: none !important;
+  background: color-mix(in sRGB, var(--background) 85%, transparent);
   backdrop-filter: var(--dropdown-backdrop-filter);
   max-width: unset !important;
   max-height: 75vh;
diff --git a/war/src/main/scss/components/_tooltips.scss b/war/src/main/scss/components/_tooltips.scss
index d864f98bd941..5f79ec42e97d 100644
--- a/war/src/main/scss/components/_tooltips.scss
+++ b/war/src/main/scss/components/_tooltips.scss
@@ -9,6 +9,7 @@
   max-width: min(50vw, 1000px) !important;
   white-space: pre-line;
   z-index: 0;
+  background: color-mix(in sRGB, var(--background) 85%, transparent);
   backdrop-filter: var(--tooltip-backdrop-filter);
 
   .tippy-content {

From 9b3d940c9bdb3824bebbf7658a2f120b2f8d8921 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Mon, 26 Aug 2024 11:27:32 +0200
Subject: [PATCH 355/449] don't use backdrop for dialogs (#9649)

---
 war/src/main/scss/abstracts/_theme.scss    | 1 -
 war/src/main/scss/components/_dialogs.scss | 2 --
 2 files changed, 3 deletions(-)

diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss
index 29543cbfcb32..9004709c76a1 100644
--- a/war/src/main/scss/abstracts/_theme.scss
+++ b/war/src/main/scss/abstracts/_theme.scss
@@ -215,7 +215,6 @@ $semantics: (
     --dialog-backdrop-background: hsla(240, 10%, 20%, 0.8);
   }
 
-  --dialog-backdrop-filter: brightness(3) blur(50px);
   --dialog-box-shadow: 0 10px 40px rgba(0, 0, 20, 0.15),
     0 2px 15px rgba(0, 0, 20, 0.05),
     inset 0 0 2px 2px rgba(255, 255, 255, 0.025);
diff --git a/war/src/main/scss/components/_dialogs.scss b/war/src/main/scss/components/_dialogs.scss
index 3de2d0c883a0..7040c70af0e2 100644
--- a/war/src/main/scss/components/_dialogs.scss
+++ b/war/src/main/scss/components/_dialogs.scss
@@ -3,9 +3,7 @@ $jenkins-dialog-padding: 1.3rem;
 .jenkins-dialog {
   border-radius: 0.6rem;
   border: none;
-  background: transparent;
   box-shadow: var(--dialog-box-shadow);
-  backdrop-filter: var(--dialog-backdrop-filter);
   animation: jenkins-dialog-animate-in 0.25s cubic-bezier(0, 0.68, 0.5, 1.5);
   overflow: hidden;
   padding: $jenkins-dialog-padding 0 0 0;

From a6d093d18d4853249582f4d8f05b9245d45afd24 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Mon, 26 Aug 2024 03:27:51 -0600
Subject: [PATCH 356/449] [JENKINS-73302] Restore margins around setup wizard
 alert messages (#9658)

---
 .../resources/jenkins/install/pluginSetupWizard.properties    | 4 ++--
 .../resources/jenkins/install/pluginSetupWizard_fr.properties | 4 ++--
 .../resources/jenkins/install/pluginSetupWizard_it.properties | 4 ++--
 .../resources/jenkins/install/pluginSetupWizard_lt.properties | 2 +-
 .../resources/jenkins/install/pluginSetupWizard_pl.properties | 4 ++--
 .../jenkins/install/pluginSetupWizard_pt_BR.properties        | 4 ++--
 .../resources/jenkins/install/pluginSetupWizard_sr.properties | 2 +-
 .../jenkins/install/pluginSetupWizard_sv_SE.properties        | 4 ++--
 .../jenkins/install/pluginSetupWizard_zh_CN.properties        | 4 ++--
 .../jenkins/install/pluginSetupWizard_zh_TW.properties        | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
index 6c74f8b2ab40..ccc308a36301 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
@@ -66,7 +66,7 @@ installWizard_installIncomplete_message=Jenkins was restarted during installatio
 installWizard_installIncomplete_resumeInstallationButtonLabel=Resume
 installWizard_saveFirstUser=Save and Continue
 installWizard_skipFirstUser=Skip and continue as admin
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 You have skipped the <strong>setup of an admin user</strong>. <br /><br />\
 To log in, use the username: "admin" and the administrator password you used to access the setup wizard.\
 </div>
@@ -76,7 +76,7 @@ installWizard_addFirstUser_title=Getting Started
 installWizard_configureInstance_title=Instance Configuration
 installWizard_saveConfigureInstance=Save and Finish
 installWizard_skipConfigureInstance=Not now
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 You have skipped the configuration of the Jenkins URL. <br/><br/>\
 To configure the Jenkins URL, go to "Manage Jenkins" page.\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties
index a20036a079bf..69ae67a56176 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties
@@ -41,7 +41,7 @@ certains plugins n\'ont pas l\'air d\'avoir été installés.
 installWizard_installIncomplete_resumeInstallationButtonLabel=Reprendre
 installWizard_saveFirstUser=Sauver et continuer
 installWizard_skipFirstUser=Continuer en tant qu\'Administrateur
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Vous avez passé la <strong>création d\'un utilisateur administrateur</strong>. <br /><br />\
 Pour vous connecter, utilisez le login : "admin" et le mot de passe administrateur que vous avez utilisé pour accéder au \
 wizard d\'installation.</div>
@@ -49,7 +49,7 @@ installWizard_addFirstUser_title=Démarrage
 
 # instance configuration page
 installWizard_configureInstance_title=Démarrage
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Vous avez passé la <strong>configuration de l\'instance</strong>. <br /><br /> \
 Vous pouvez toujours vous rendre sur les pages de configuration pour remplir les informations qui pourraient manquer.\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties
index dcf21537815f..0ba5fe95d756 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties
@@ -23,7 +23,7 @@
 
 installWizard_addFirstUser_title=Attività iniziali
 installWizard_configureInstanceSkippedMessage=\
-  <div class="jenkins-alert jenkins-alert-warning fade in">La configurazione dell''URL di \
+  <div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">La configurazione dell''URL di \
   Jenkins è stata omessa.<br/><br/>Per configurare l''URL di Jenkins, aprire \
   la pagina "Gestisci Jenkins".</div>
 installWizard_configureInstance_title=Configurazione istanza
@@ -37,7 +37,7 @@ installWizard_error_restartNotSupported=Il riavvio non è supportato, \
   riavviare quest''istanza manualmente
 installWizard_error_title=Errore
 installWizard_firstUserSkippedMessage=\
-  <div class="jenkins-alert jenkins-alert-warning fade in">La <strong>configurazione di un \
+  <div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">La <strong>configurazione di un \
   utente amministratore</strong> è stata omessa.<br /><br />Per accedere, \
   utilizzare il nome utente "admin" e la password di amministrazione che si \
   è utilizzata per accedere alla configurazione guidata.</div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties
index 91d7f50475a4..454248e832d8 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties
@@ -39,7 +39,7 @@ installWizard_installIncomplete_message=Jenkinsas buvo iš naujo paleistas diegi
 installWizard_installIncomplete_resumeInstallationButtonLabel=Tęsti
 installWizard_saveFirstUser=Įrašyti ir baigti
 installWizard_skipFirstUser=Tęsti kaip administratoriumi
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Jūs praleidote administratoriaus naudotojo kūrimą. Norėdami prisijungti, naudokite vardą: „admin“ ir \
 administratoriaus slaptažodį, kurį naudojote prisijungimui prie nustatymo vedlio.\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties
index 5a144b8233e4..69273733e5bc 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties
@@ -31,7 +31,7 @@ installWizard_jenkinsVersionTitle=Jenkins
 installWizard_installComplete_banner=Jenkins jest gotowy!
 installWizard_installComplete_finishButtonLabel=Zacznij korzystać z Jenkinsa
 installWizard_installComplete_message=Konfiguracja Jenkinsa została zakończona.
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Pominięto utworzenie konta administratora. Aby się zalogować, użyj loginu 'admin' i hasła użytego podczas konfigurowania Jenkinsa.\
 </div>
 installWizard_addFirstUser_title=Dodawanie pierwszego użytkownika
@@ -79,7 +79,7 @@ installWizard_installComplete_installComplete_restartRequiredNotSupportedMessage
 installWizard_gettingStarted_title=Zaczynamy
 installWizard_saveSecurity=Zapisz i kontynuuj
 installWizard_installIncomplete_dependenciesLabel=Zależności
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Pominięto konfiguracje bazowego adresu URL Jenkinsa. <br/><br/>\
 Aby go skonfigurować, przejdź do strony "Zarządzaj Jenkinsem".\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties
index f633aa0e1ab0..219f618bab95 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties
@@ -38,7 +38,7 @@ installWizard_error_connection=Incapaz de conectar ao Jenkins
 installWizard_installing_detailsLink=Detalhes...
 installWizard_gettingStarted_title=Começando
 installWizard_installIncomplete_title=Prosseguir com a instalação
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">Você pulou a configuração da \
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">Você pulou a configuração da \
   URL do Jenkins. <br/><br/>Para configurá-la, vá para a página "Gerenciar o Jenkins".</div>
 installWizard_installIncomplete_banner=Prosseguir com a instalação
 installWizard_welcomePanel_recommendedActionTitle=Instalar as extensões sugeridas
@@ -82,7 +82,7 @@ installWizard_installComplete_finishButtonLabel=Começar a usar o Jenkins
 installWizard_goInstall=Instalar
 installWizard_installCustom_selectNone=Nenhum
 installWizard_installComplete_title=Começar
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">Você pulou a <strong>configuração do \
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">Você pulou a <strong>configuração do \
   usuário admin</strong>. <br /><br />Para entrar, use o nome de usuário "admin" e a senha de administrador que você \
   usou para acessar o assistente de configuração.</div>
 installWizard_configureProxy_save=Salvar e continuar
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties
index 16c3931e91aa..6c0e45580a4f 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties
@@ -40,7 +40,7 @@ installWizard_installIncomplete_banner=Настави са инсталациј
 installWizard_installIncomplete_message=
 installWizard_saveFirstUser=Сачувај и настави
 installWizard_skipFirstUser=Настави са администраторским налогом
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Прескочили сте креирањем административог корисника. Пријавите се како што ће те користити име: 'admin' и лозинку коју сте користили инсталацијом.\
 </div>
 installWizard_addFirstUser_title=Почетак
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties
index 8fc30a7b98c0..2c14024895ff 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties
@@ -66,7 +66,7 @@ installWizard_installIncomplete_message=Jenkins startades om under installatione
 installWizard_installIncomplete_resumeInstallationButtonLabel=Återuppta
 installWizard_saveFirstUser=Spara och fortsätt
 installWizard_skipFirstUser=Hoppa över och fortsätt som administratör
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Du har hoppat över <strong>installationen av en administratörsanvändare</strong>. <br /><br />\
 Använd användarnamnet "admin" och administratörslösenordet du använde för att komma åt installationsguiden för att logga in.\
 </div>
@@ -76,7 +76,7 @@ installWizard_addFirstUser_title=Kom igång
 installWizard_configureInstance_title=Konfigurera instans
 installWizard_saveConfigureInstance=Spara och avsluta
 installWizard_skipConfigureInstance=Inte nu
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Du har hoppat över konfigurationen av Jenkins-webbadressen. <br/><br/>\
 Gå till sidan "Hantera Jenkins" för att konfigurera Jenkins-webbadressen.\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties
index 3446a6b21cc4..e705d6cdcfde 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties
@@ -64,7 +64,7 @@ installWizard_installIncomplete_message=Jenkins在安装过程已重启，部分
 installWizard_installIncomplete_resumeInstallationButtonLabel=恢复
 installWizard_saveFirstUser=保存并完成
 installWizard_skipFirstUser=使用admin账户继续
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 你已跳过创建admin用户的步骤。要登录请使用用户名：'admin' \
 及用于访问安装向导的管理员密码。\
 </div> 
@@ -74,7 +74,7 @@ installWizard_addFirstUser_title=新手入门
 installWizard_configureInstance_title=实例配置
 installWizard_saveConfigureInstance=保存并完成
 installWizard_skipConfigureInstance=现在不要
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 您已经跳过了 Jenkins URL的配置。 <br/><br/>\
 要配置 Jenkins URL的话，到“Jenkins管理”页面。\
 </div>
diff --git a/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties b/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties
index 341d0ae88e70..1204771adac8 100644
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties
@@ -61,14 +61,14 @@ installWizard_installIncomplete_message=Jenkins 在安裝期間重新啟動，
 installWizard_installIncomplete_resumeInstallationButtonLabel=繼續
 installWizard_saveFirstUser=儲存並繼續
 installWizard_skipFirstUser=跳過並以 admin 繼續
-installWizard_firstUserSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning fade in">您已略過<strong>設定管理員使用者</strong>。<br /><br />請使用帳號：「admin」和您進入安裝精靈的管理員密碼登入。</div>
+installWizard_firstUserSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">您已略過<strong>設定管理員使用者</strong>。<br /><br />請使用帳號：「admin」和您進入安裝精靈的管理員密碼登入。</div>
 installWizard_addFirstUser_title=開始使用
 
 # instance configuration page
 installWizard_configureInstance_title=執行個體組態
 installWizard_saveConfigureInstance=儲存並完成
 installWizard_skipConfigureInstance=暫時不要
-installWizard_configureInstanceSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning fade in">您已略過設定 Jenkins URL。<br/><br/>您之後可以到「管理 Jenkins」頁面設定 Jenkins URL。</div>
+installWizard_configureInstanceSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">您已略過設定 Jenkins URL。<br/><br/>您之後可以到「管理 Jenkins」頁面設定 Jenkins URL。</div>
 
 installWizard_configureProxy_label=設定代理伺服器
 installWizard_configureProxy_save=儲存並繼續

From d9f333767e75b2ffb5b32fcf9e8d7fe1f72f8716 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 17:40:31 -0600
Subject: [PATCH 357/449] Update eslint monorepo to v9.9.1 (#9664)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/war/package.json b/war/package.json
index 8bdaaa7d5669..d3f908bb91e9 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.24.8",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
-    "@eslint/js": "9.9.0",
+    "@eslint/js": "9.9.1",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.9.0",
+    "eslint": "9.9.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.9.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index 8419d34b8582..b9d57852342d 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1850,14 +1850,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-array@npm:^0.17.1":
-  version: 0.17.1
-  resolution: "@eslint/config-array@npm:0.17.1"
+"@eslint/config-array@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "@eslint/config-array@npm:0.18.0"
   dependencies:
     "@eslint/object-schema": "npm:^2.1.4"
     debug: "npm:^4.3.1"
     minimatch: "npm:^3.1.2"
-  checksum: 10c0/b986a0a96f2b42467578968ce3d4ae3b9284e587f8490f2dcdc44ff1b8d30580c62b221da6e58d07b09e156c3050e2dc38267f9370521d9cafc099c4e30154ef
+  checksum: 10c0/0234aeb3e6b052ad2402a647d0b4f8a6aa71524bafe1adad0b8db1dfe94d7f5f26d67c80f79bb37ac61361a1d4b14bb8fb475efe501de37263cf55eabb79868f
   languageName: node
   linkType: hard
 
@@ -1878,10 +1878,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.9.0":
-  version: 9.9.0
-  resolution: "@eslint/js@npm:9.9.0"
-  checksum: 10c0/6ec9f1f0d576132444d6a5c66a8a08b0be9444e3ebb563fa6a6bebcf5299df3da7e454dc04c0fa601bb811197f00764b3a04430d8458cdb8e3a4677993d23f30
+"@eslint/js@npm:9.9.1":
+  version: 9.9.1
+  resolution: "@eslint/js@npm:9.9.1"
+  checksum: 10c0/a3a91de2ce78469f7c4eee78c1eba77360706e1d0fa0ace2e19102079bcf237b851217c85ea501dc92c4c3719d60d9df966977abc8554d4c38e3638c1f53dcb2
   languageName: node
   linkType: hard
 
@@ -3516,15 +3516,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.9.0":
-  version: 9.9.0
-  resolution: "eslint@npm:9.9.0"
+"eslint@npm:9.9.1":
+  version: 9.9.1
+  resolution: "eslint@npm:9.9.1"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.11.0"
-    "@eslint/config-array": "npm:^0.17.1"
+    "@eslint/config-array": "npm:^0.18.0"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.9.0"
+    "@eslint/js": "npm:9.9.1"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3561,7 +3561,7 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/3a22f68c99d75dcbafe6e2fef18d2b5bbcc960c2437f48a414ccf9ca214254733a18e6b79d07bbd374a2369a648413e421aabd07b11be3de5a44d5a4b9997877
+  checksum: 10c0/5e71efda7c0a14ee95436d5cdfed04ee61dfb1d89d7a32b50a424de2e680af82849628ea6581950c2e0726491f786a3cfd0032ce013c1c5093786e475cfdfb33
   languageName: node
   linkType: hard
 
@@ -4378,12 +4378,12 @@ __metadata:
     "@babel/cli": "npm:7.24.8"
     "@babel/core": "npm:7.25.2"
     "@babel/preset-env": "npm:7.25.4"
-    "@eslint/js": "npm:9.9.0"
+    "@eslint/js": "npm:9.9.1"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.9.0"
+    eslint: "npm:9.9.1"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.9.0"

From ffdd5be9a3e63192baa93e0e89bdbec2e0c7bb00 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Tue, 27 Aug 2024 01:43:31 +0200
Subject: [PATCH 358/449] Fix error message when creation of item by type is
 prohibited (#9662)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
---
 core/src/main/java/hudson/security/ACL.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/hudson/security/ACL.java b/core/src/main/java/hudson/security/ACL.java
index 039820ef22f3..03d2a21beba0 100644
--- a/core/src/main/java/hudson/security/ACL.java
+++ b/core/src/main/java/hudson/security/ACL.java
@@ -237,7 +237,7 @@ public final void checkCreatePermission(@NonNull ItemGroup c,
         }
         if (!hasCreatePermission2(a, c, d)) {
             throw new AccessDeniedException(Messages.AccessDeniedException2_MissingPermission(a.getName(),
-                    Item.CREATE.group.title + "/" + Item.CREATE.name + Item.CREATE + "/" + d.getDisplayName()));
+                    Item.CREATE.group.title + "/" + Item.CREATE.name + "/" + d.getDisplayName()));
         }
     }
     /**
@@ -290,7 +290,7 @@ public final void checkCreatePermission(@NonNull ViewGroup c,
         }
         if (!hasCreatePermission2(a, c, d)) {
             throw new AccessDeniedException(Messages.AccessDeniedException2_MissingPermission(a.getName(),
-                    View.CREATE.group.title + "/" + View.CREATE.name + View.CREATE + "/" + d.getDisplayName()));
+                    View.CREATE.group.title + "/" + View.CREATE.name + "/" + d.getDisplayName()));
         }
     }
 

From 622193c8f0f03ff1b937cd55f7058daf8b4d7247 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 27 Aug 2024 13:51:01 +0000
Subject: [PATCH 359/449] [maven-release-plugin] prepare release jenkins-2.474

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 6 +++---
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty10/pom.xml     | 2 +-
 websocket/jetty12-ee8/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index ad23ed312b5e..78f060b1e6ff 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6309811a2e8b..c5be8703c372 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 8e30ae211ed7..efecc2e054ca 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..8b8f252d172a 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 5e2406abbc53..2b7b6b113753 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.474</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -64,7 +64,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.474</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -76,7 +76,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.474</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-20T13:40:21Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-27T10:34:00Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 21089219623c..e6e8c3110b91 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 27f19bf0be10..befcdfb0e486 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 5147b02b81d6..1e7c8bd3d434 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/jetty12-ee8/pom.xml b/websocket/jetty12-ee8/pom.xml
index 9a7a9ca94545..0322c6db4037 100644
--- a/websocket/jetty12-ee8/pom.xml
+++ b/websocket/jetty12-ee8/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..f7b94449412f 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.474</version>
     <relativePath>../..</relativePath>
   </parent>
 

From d4663daad3dff88a1ec33d5833542f0d3c8c36fb Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 27 Aug 2024 13:51:24 +0000
Subject: [PATCH 360/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 8 ++++----
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty10/pom.xml     | 2 +-
 websocket/jetty12-ee8/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 78f060b1e6ff..ad23ed312b5e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c5be8703c372..6309811a2e8b 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index efecc2e054ca..8e30ae211ed7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 8b8f252d172a..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 2b7b6b113753..e64596137f2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.474</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -64,7 +64,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.474</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -74,9 +74,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.474</revision>
+    <revision>2.475</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-27T10:34:00Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-27T13:51:01Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index e6e8c3110b91..21089219623c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index befcdfb0e486..27f19bf0be10 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
index 1e7c8bd3d434..5147b02b81d6 100644
--- a/websocket/jetty10/pom.xml
+++ b/websocket/jetty10/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/jetty12-ee8/pom.xml b/websocket/jetty12-ee8/pom.xml
index 0322c6db4037..9a7a9ca94545 100644
--- a/websocket/jetty12-ee8/pom.xml
+++ b/websocket/jetty12-ee8/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index f7b94449412f..a99aada6a446 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.474</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From d986c426942e42d07a4bd1f72e462409ca8d1bbe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:11:40 -0700
Subject: [PATCH 361/449] Update dependency org.jenkins-ci:jenkins to v1.120
 (#9668)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e64596137f2e..e486f706d0c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.119</version>
+    <version>1.120</version>
     <relativePath />
   </parent>
 

From 4a35cc13de79200c11cbe6a075ab33a98c1d462a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:48:25 -0700
Subject: [PATCH 362/449] Update jenkins/ath Docker tag to v5957 (#9669)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 415a9c6bd72d..6890d5908ab6 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5941.v95f3439136c7
+export ATH_VERSION=5957.v7c0e2f7ca_63e
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From e698b1801d9849b80ddd00acea12a4322909e20f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:51:30 -0700
Subject: [PATCH 363/449] Update Yarn to v4.4.1 (#9666)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json | 2 +-
 war/pom.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/war/package.json b/war/package.json
index d3f908bb91e9..0fa3f50d288c 100644
--- a/war/package.json
+++ b/war/package.json
@@ -65,5 +65,5 @@
     "defaults",
     "not IE 11"
   ],
-  "packageManager": "yarn@4.4.0"
+  "packageManager": "yarn@4.4.1"
 }
diff --git a/war/pom.xml b/war/pom.xml
index 27f19bf0be10..e6b4bf8251b7 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -53,8 +53,8 @@ THE SOFTWARE.
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->
-    <yarn-berry.version>4.4.0</yarn-berry.version>
-    <yarn-berry.sha256sum>5f228cb28f2edb97d8c3b667fb7b2fdcf06c46798e25ea889dad9e0b4bc2e2c1</yarn-berry.sha256sum>
+    <yarn-berry.version>4.4.1</yarn-berry.version>
+    <yarn-berry.sha256sum>920b4530755296dc2ce8b4351f057d4a26429524fcb2789d277560d94837c27e</yarn-berry.sha256sum>
   </properties>
 
   <dependencyManagement>

From 1194313ef6c62fd43feaf71cd18f468c6a70ff41 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 12:36:22 -0700
Subject: [PATCH 364/449] Update dependency org.jenkins-ci:jenkins to v1.121
 (#9670)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e486f706d0c7..bf5d1172fa37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.120</version>
+    <version>1.121</version>
     <relativePath />
   </parent>
 

From 62691528b2fd6702e52ab16061d25ae718cb6ab1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 13:13:35 -0700
Subject: [PATCH 365/449] Update dependency org.jenkins-ci:jenkins to v1.122
 (#9671)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bf5d1172fa37..921d6a9f7009 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.121</version>
+    <version>1.122</version>
     <relativePath />
   </parent>
 

From f84ab6aae198fb4c434783d91522815c2c852cf8 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 27 Aug 2024 21:22:12 -0400
Subject: [PATCH 366/449] [JENKINS-73692] Turn off logging from
 `BackgroundGlobalBuildDiscarder` (#9663)

Turn off logging from `BackgroundGlobalBuildDiscarder`
---
 .../java/jenkins/model/BackgroundGlobalBuildDiscarder.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/src/main/java/jenkins/model/BackgroundGlobalBuildDiscarder.java b/core/src/main/java/jenkins/model/BackgroundGlobalBuildDiscarder.java
index 943a7fd04ba6..1a42c0577a47 100644
--- a/core/src/main/java/jenkins/model/BackgroundGlobalBuildDiscarder.java
+++ b/core/src/main/java/jenkins/model/BackgroundGlobalBuildDiscarder.java
@@ -57,12 +57,9 @@ protected void execute(TaskListener listener) throws IOException, InterruptedExc
     }
 
     public static void processJob(TaskListener listener, Job job) {
-        listener.getLogger().println("Processing " + job.getFullName());
         GlobalBuildDiscarderConfiguration.get().getConfiguredBuildDiscarders().forEach(strategy -> {
             String displayName = strategy.getDescriptor().getDisplayName();
-            listener.getLogger().println("Offering " + job.getFullName() + " to " + displayName);
             if (strategy.isApplicable(job)) {
-                listener.getLogger().println(job.getFullName() + " accepted by " + displayName);
                 try {
                     strategy.apply(job);
                 } catch (Exception ex) {

From 5df30de4358ca93db17eb1d80a6b3a6f1c92ffad Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 28 Aug 2024 03:22:38 +0200
Subject: [PATCH 367/449] Add -webSocket option by default when creating an
 inbound agent (#9665)

* Add -webSocket option by default when creating an inbound agent

* Update core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties

Co-authored-by: Jesse Glick <jglick@cloudbees.com>

---------

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
---
 core/src/main/java/hudson/slaves/JNLPLauncher.java            | 4 +---
 .../main/resources/hudson/slaves/JNLPLauncher/main.properties | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/hudson/slaves/JNLPLauncher.java b/core/src/main/java/hudson/slaves/JNLPLauncher.java
index 4f0cbc1e6153..09d2b52a15fe 100644
--- a/core/src/main/java/hudson/slaves/JNLPLauncher.java
+++ b/core/src/main/java/hudson/slaves/JNLPLauncher.java
@@ -213,9 +213,7 @@ private String getRemotingOptions(String computerName) {
         sb.append("-name ");
         sb.append(computerName);
         sb.append(' ');
-        if (isWebSocket()) {
-            sb.append("-webSocket ");
-        }
+        sb.append("-webSocket ");
         if (tunnel != null) {
             sb.append(" -tunnel ");
             sb.append(tunnel);
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
index dbb8ec9fed72..1eb84e1006bf 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.properties
@@ -26,7 +26,7 @@ slaveAgent.cli.run=Run from agent command line:
 slaveAgent.cli.run.secret=Or run from agent command line, with the secret stored in a file:
 powerShell.cli.curl=Note: PowerShell users must use curl.exe instead of curl because curl is a default PowerShell cmdlet alias for Invoke-WebRequest.
 commonOptions=\
-  The most commonly used option is <code>-webSocket</code>. \
+  If you prefer to use TCP instead of WebSockets, remove the <code>-webSocket</code> option. \
   Run <code>java -jar agent.jar -help</code> for more.
 tcp-port-disabled=\
   The TCP port is disabled so TCP agents may not be connected. \

From 64667af499e878f67b09e60bdf6ed0c2a549d545 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 28 Aug 2024 09:54:25 +0200
Subject: [PATCH 368/449] Implement ComputerListener#onIdle

Introduces a new computer listener fired whenever a Computer becomes idle.
---
 core/src/main/java/hudson/model/Computer.java          | 2 ++
 core/src/main/java/hudson/slaves/ComputerListener.java | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 14a311381a37..903751b90c13 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -1102,6 +1102,8 @@ protected void removeExecutor(final Executor e) {
                     if (ciBase != null) { // TODO confirm safe to assume non-null and use getInstance()
                         ciBase.removeComputer(Computer.this);
                     }
+                } else if (isIdle()) {
+                    Listeners.notify(ComputerListener.class, false, l -> l.onIdle(this));
                 }
             }
         };
diff --git a/core/src/main/java/hudson/slaves/ComputerListener.java b/core/src/main/java/hudson/slaves/ComputerListener.java
index bd794c456c50..f5d220c1104e 100644
--- a/core/src/main/java/hudson/slaves/ComputerListener.java
+++ b/core/src/main/java/hudson/slaves/ComputerListener.java
@@ -211,6 +211,13 @@ public void onTemporarilyOffline(Computer c, OfflineCause cause) {}
      */
     public void onConfigurationChange() {}
 
+    /**
+     * Indicates that the computer has become idle.
+     *
+     * @since TODO
+     */
+    public void onIdle(Computer c) {}
+
     /**
      * Registers this {@link ComputerListener} so that it will start receiving events.
      *

From 9823b8ed7e3d6d5d5602860956a8fd10dad3c939 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 28 Aug 2024 15:40:43 +0200
Subject: [PATCH 369/449] Execute ComputerListener#onIdle in another thread.

---
 core/src/main/java/hudson/model/Computer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 903751b90c13..3cb7618ed3a9 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -100,6 +100,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
@@ -114,6 +115,7 @@
 import jenkins.util.ErrorLoggingExecutorService;
 import jenkins.util.Listeners;
 import jenkins.util.SystemProperties;
+import jenkins.util.Timer;
 import jenkins.widgets.HasWidgets;
 import net.jcip.annotations.GuardedBy;
 import org.jenkins.ui.icon.Icon;
@@ -1103,7 +1105,7 @@ protected void removeExecutor(final Executor e) {
                         ciBase.removeComputer(Computer.this);
                     }
                 } else if (isIdle()) {
-                    Listeners.notify(ComputerListener.class, false, l -> l.onIdle(this));
+                    threadPoolForRemoting.submit(() -> Listeners.notify(ComputerListener.class, false, l -> l.onIdle(this)));
                 }
             }
         };

From 75242cf03010509e968f9de1a00ca6bb19d8b5fa Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 28 Aug 2024 15:47:51 +0200
Subject: [PATCH 370/449] Call listener synchronously, but outside synchronized

---
 core/src/main/java/hudson/model/Computer.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 3cb7618ed3a9..9400a70d3f53 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -1095,6 +1095,7 @@ public final long getDemandStartMilliseconds() {
      */
     protected void removeExecutor(final Executor e) {
         final Runnable task = () -> {
+            var idle = false;
             synchronized (Computer.this) {
                 executors.remove(e);
                 oneOffExecutors.remove(e);
@@ -1104,10 +1105,13 @@ protected void removeExecutor(final Executor e) {
                     if (ciBase != null) { // TODO confirm safe to assume non-null and use getInstance()
                         ciBase.removeComputer(Computer.this);
                     }
-                } else if (isIdle()) {
-                    threadPoolForRemoting.submit(() -> Listeners.notify(ComputerListener.class, false, l -> l.onIdle(this)));
+                } else {
+                    idle = isIdle();
                 }
             }
+            if (idle) {
+                Listeners.notify(ComputerListener.class, false, l -> l.onIdle(this));
+            }
         };
         if (!Queue.tryWithLock(task)) {
             // JENKINS-28840 if we couldn't get the lock push the operation to a separate thread to avoid deadlocks

From ed93ad020ae2e092242a89c6b714dca67c472559 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 28 Aug 2024 16:12:09 +0200
Subject: [PATCH 371/449] Revert "Call listener synchronously, but outside
 synchronized"

This reverts commit 75242cf03010509e968f9de1a00ca6bb19d8b5fa.
---
 core/src/main/java/hudson/model/Computer.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 9400a70d3f53..3cb7618ed3a9 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -1095,7 +1095,6 @@ public final long getDemandStartMilliseconds() {
      */
     protected void removeExecutor(final Executor e) {
         final Runnable task = () -> {
-            var idle = false;
             synchronized (Computer.this) {
                 executors.remove(e);
                 oneOffExecutors.remove(e);
@@ -1105,13 +1104,10 @@ protected void removeExecutor(final Executor e) {
                     if (ciBase != null) { // TODO confirm safe to assume non-null and use getInstance()
                         ciBase.removeComputer(Computer.this);
                     }
-                } else {
-                    idle = isIdle();
+                } else if (isIdle()) {
+                    threadPoolForRemoting.submit(() -> Listeners.notify(ComputerListener.class, false, l -> l.onIdle(this)));
                 }
             }
-            if (idle) {
-                Listeners.notify(ComputerListener.class, false, l -> l.onIdle(this));
-            }
         };
         if (!Queue.tryWithLock(task)) {
             // JENKINS-28840 if we couldn't get the lock push the operation to a separate thread to avoid deadlocks

From 6b88bfcbd5a1011983073cc2d283776b9ab68e5f Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 28 Aug 2024 16:22:14 +0200
Subject: [PATCH 372/449] Spotless

---
 core/src/main/java/hudson/model/Computer.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 3cb7618ed3a9..c66759f94ab9 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -100,7 +100,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
@@ -115,7 +114,6 @@
 import jenkins.util.ErrorLoggingExecutorService;
 import jenkins.util.Listeners;
 import jenkins.util.SystemProperties;
-import jenkins.util.Timer;
 import jenkins.widgets.HasWidgets;
 import net.jcip.annotations.GuardedBy;
 import org.jenkins.ui.icon.Icon;

From 7a88dc378e7431d31a2a187ccc72e236975cf9c3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 12:28:23 -0700
Subject: [PATCH 373/449] Update dependency org.apache.ant:ant to v1.10.15
 (#9675)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index ad23ed312b5e..adf65f6cf439 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -189,7 +189,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.apache.ant</groupId>
         <artifactId>ant</artifactId>
-        <version>1.10.14</version>
+        <version>1.10.15</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>

From a075ffb5832a2c7687470a2151e1242ef4a79c8d Mon Sep 17 00:00:00 2001
From: Kris Stern <krisstern@outlook.com>
Date: Fri, 30 Aug 2024 21:25:58 +0800
Subject: [PATCH 374/449] Add doCheckDisplayNameOrNull to jenkins core (#9150)

Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
---
 core/src/main/java/hudson/model/AbstractProject.java     | 5 -----
 .../main/java/hudson/model/TopLevelItemDescriptor.java   | 9 +++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index c568f8df8b31..917ff1f7b81f 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1934,11 +1934,6 @@ public boolean isApplicable(Descriptor descriptor) {
             return true;
         }
 
-        @Restricted(DoNotUse.class)
-        public FormValidation doCheckDisplayNameOrNull(@AncestorInPath AbstractProject project, @QueryParameter String value) {
-            return Jenkins.get().doCheckDisplayName(value, project.getName());
-        }
-
         @Restricted(DoNotUse.class)
         public FormValidation doCheckAssignedLabelString(@AncestorInPath AbstractProject<?, ?> project,
                                                          @QueryParameter String value) {
diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
index d2ebe3065349..d84e4a684f22 100644
--- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
+++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
@@ -27,6 +27,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.ExtensionList;
+import hudson.util.FormValidation;
 import java.io.StringWriter;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -37,7 +38,11 @@
 import org.jenkins.ui.icon.Icon;
 import org.jenkins.ui.icon.IconSet;
 import org.jenkins.ui.icon.IconSpec;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.MetaClass;
+import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.WebApp;
@@ -286,4 +291,8 @@ public static ExtensionList<TopLevelItemDescriptor> all() {
         return Items.all();
     }
 
+    @Restricted(NoExternalUse.class)
+    public FormValidation doCheckDisplayNameOrNull(@AncestorInPath TopLevelItem item, @QueryParameter String value) {
+        return Jenkins.get().doCheckDisplayName(value, item.getName());
+    }
 }

From fc73c2622ab6a72ea0b1612a22db22f36d5eca0f Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Fri, 30 Aug 2024 15:26:10 +0200
Subject: [PATCH 375/449] =?UTF-8?q?[JENKINS-73669]=20don't=20change=20unre?=
 =?UTF-8?q?lated=20checkboxes=20in=20rowSelectionCont=E2=80=A6=20(#9648)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/src/main/resources/hudson/PluginManager/updates.jelly  | 4 ++--
 .../main/resources/lib/layout/rowSelectionController.jelly  | 6 +++++-
 .../main/js/components/row-selection-controller/index.js    | 5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/src/main/resources/hudson/PluginManager/updates.jelly b/core/src/main/resources/hudson/PluginManager/updates.jelly
index 2dd759d883cd..da79d1958cf9 100644
--- a/core/src/main/resources/hudson/PluginManager/updates.jelly
+++ b/core/src/main/resources/hudson/PluginManager/updates.jelly
@@ -69,7 +69,7 @@ THE SOFTWARE.
                 <tr>
                   <l:isAdmin>
                     <th data-sort-disable="true">
-                      <l:rowSelectionController>
+                      <l:rowSelectionController class="app-checkbox-install-plugin">
                         <j:if test="${app.updateCenter.hasIncompatibleUpdates(cache)}">
                           <button tooltip="${%CompatibleTooltip}" type="button" data-select="compatible" class="jenkins-button jenkins-button--tertiary">
                             <div class="jenkins-table__checkbox-dropdown__icon">
@@ -101,7 +101,7 @@ THE SOFTWARE.
                                    id="plugin.${p.name}.${p.sourceId}"
                                    checked="${installedOk ? 'checked' : null}"
                                    disabled="${installedOk ? 'disabled' : null}"
-                                   data-compat-warning="${!p.isCompatible(cache)}"/>
+                                   data-compat-warning="${!p.isCompatible(cache)}" class="app-checkbox-install-plugin"/>
                             <label for="plugin.${p.name}.${p.sourceId}" />
                           </span>
                         </td>
diff --git a/core/src/main/resources/lib/layout/rowSelectionController.jelly b/core/src/main/resources/lib/layout/rowSelectionController.jelly
index ddacd2e1b1c7..bbb043c62bf9 100644
--- a/core/src/main/resources/lib/layout/rowSelectionController.jelly
+++ b/core/src/main/resources/lib/layout/rowSelectionController.jelly
@@ -26,10 +26,14 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
   <st:documentation>
     Controls checkbox selections in tables
+    <st:attribute name="class" use="required">
+      Used for the queryselector to find the checkboxes that should change state when clicking
+      one of the available buttons.
+    </st:attribute>
   </st:documentation>
 
   <div class="jenkins-table__checkbox-container">
-    <button type="button" class="jenkins-table__checkbox">
+    <button type="button" class="jenkins-table__checkbox" data-checkbox-class="${attrs.class}">
       <l:icon src="symbol-check" class="jenkins-table__checkbox__all-symbol" />
       <l:icon src="symbol-indeterminate" class="jenkins-table__checkbox__indeterminate-symbol" />
     </button>
diff --git a/war/src/main/js/components/row-selection-controller/index.js b/war/src/main/js/components/row-selection-controller/index.js
index d4de91b89de4..31fa374ee2c3 100644
--- a/war/src/main/js/components/row-selection-controller/index.js
+++ b/war/src/main/js/components/row-selection-controller/index.js
@@ -4,7 +4,10 @@ const rowSelectionControllers = document.querySelectorAll(
 
 rowSelectionControllers.forEach((headerCheckbox) => {
   const table = headerCheckbox.closest(".jenkins-table");
-  const tableCheckboxes = table.querySelectorAll("input[type='checkbox']");
+  const checkboxClass = headerCheckbox.dataset.checkboxClass;
+  const tableCheckboxes = table.querySelectorAll(
+    `input[type='checkbox'].${checkboxClass}`,
+  );
   const moreOptionsButton = table.querySelector(
     ".jenkins-table__checkbox-options",
   );

From 15e045f03d652a7e76dc3d68e071119c86fdba6a Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 30 Aug 2024 09:26:19 -0400
Subject: [PATCH 376/449] Friendlier handling of `DeploymentHandshakeException`
 from CLI in `-webSocket` mode (#9591)

---
 cli/src/main/java/hudson/cli/CLI.java         | 24 ++++++++++++++++++-
 .../test/java/hudson/cli/CLIActionTest.java   | 17 +++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java
index 684b01f54981..910331b3ee9a 100644
--- a/cli/src/main/java/hudson/cli/CLI.java
+++ b/cli/src/main/java/hudson/cli/CLI.java
@@ -32,6 +32,7 @@
 import jakarta.websocket.ClientEndpointConfig;
 import jakarta.websocket.Endpoint;
 import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.HandshakeResponse;
 import jakarta.websocket.Session;
 import java.io.DataInputStream;
 import java.io.File;
@@ -64,6 +65,7 @@
 import org.glassfish.tyrus.client.ClientManager;
 import org.glassfish.tyrus.client.ClientProperties;
 import org.glassfish.tyrus.client.SslEngineConfigurator;
+import org.glassfish.tyrus.client.exception.DeploymentHandshakeException;
 import org.glassfish.tyrus.container.jdk.client.JdkClientContainer;
 
 /**
@@ -340,13 +342,19 @@ public void onOpen(Session session, EndpointConfig config) {}
         }
 
         class Authenticator extends ClientEndpointConfig.Configurator {
+            HandshakeResponse hr;
             @Override
             public void beforeRequest(Map<String, List<String>> headers) {
                 if (factory.authorization != null) {
                     headers.put("Authorization", List.of(factory.authorization));
                 }
             }
+            @Override
+            public void afterResponse(HandshakeResponse hr) {
+                this.hr = hr;
+            }
         }
+        var authenticator = new Authenticator();
 
         ClientManager client = ClientManager.createClient(JdkClientContainer.class.getName()); // ~ ContainerProvider.getWebSocketContainer()
         client.getProperties().put(ClientProperties.REDIRECT_ENABLED, true); // https://tyrus-project.github.io/documentation/1.13.1/index/tyrus-proprietary-config.html#d0e1775
@@ -357,7 +365,21 @@ public void beforeRequest(Map<String, List<String>> headers) {
             sslEngineConfigurator.setHostnameVerifier((s, sslSession) -> true);
             client.getProperties().put(ClientProperties.SSL_ENGINE_CONFIGURATOR, sslEngineConfigurator);
         }
-        Session session = client.connectToServer(new CLIEndpoint(), ClientEndpointConfig.Builder.create().configurator(new Authenticator()).build(), URI.create(url.replaceFirst("^http", "ws") + "cli/ws"));
+        Session session;
+        try {
+            session = client.connectToServer(new CLIEndpoint(), ClientEndpointConfig.Builder.create().configurator(authenticator).build(), URI.create(url.replaceFirst("^http", "ws") + "cli/ws"));
+        } catch (DeploymentHandshakeException x) {
+            System.err.println("CLI handshake failed with status code " + x.getHttpStatusCode());
+            if (authenticator.hr != null) {
+                for (var entry : authenticator.hr.getHeaders().entrySet()) {
+                    // org.glassfish.tyrus.core.Utils.parseHeaderValue improperly splits values like Date at commas, so undo that:
+                    System.err.println(entry.getKey() + ": " + String.join(", ", entry.getValue()));
+                }
+                // UpgradeResponse.getReasonPhrase is useless since Jetty generates it from the code,
+                // and the body is not accessible at all.
+            }
+            return 15; // compare CLICommand.main
+        }
         PlainCLIProtocol.Output out = new PlainCLIProtocol.Output() {
             @Override
             public void send(byte[] data) throws IOException {
diff --git a/test/src/test/java/hudson/cli/CLIActionTest.java b/test/src/test/java/hudson/cli/CLIActionTest.java
index 57086142bfb9..dab7ec8a88ad 100644
--- a/test/src/test/java/hudson/cli/CLIActionTest.java
+++ b/test/src/test/java/hudson/cli/CLIActionTest.java
@@ -1,5 +1,9 @@
 package hudson.cli;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 
 import hudson.Functions;
@@ -131,6 +135,19 @@ private void assertExitCode(int code, boolean useApiToken, File jar, String... a
         assertEquals(code, proc.join());
     }
 
+    @Test public void authenticationFailed() throws Exception {
+        j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
+        j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy().grant(Jenkins.ADMINISTER).everywhere().toAuthenticated());
+        var jar = tmp.newFile("jenkins-cli.jar");
+        FileUtils.copyURLToFile(j.jenkins.getJnlpJars("jenkins-cli.jar").getURL(), jar);
+        var baos = new ByteArrayOutputStream();
+        var exitStatus = new Launcher.LocalLauncher(StreamTaskListener.fromStderr()).launch().cmds(
+            "java", "-jar", jar.getAbsolutePath(), "-s", j.getURL().toString(), "-auth", "user:bogustoken", "who-am-i"
+        ).stdout(baos).start().join();
+        assertThat(baos.toString(), allOf(containsString("status code 401"), containsString("Server: Jetty")));
+        assertThat(exitStatus, is(15));
+    }
+
     @Issue("JENKINS-41745")
     @Test
     public void encodingAndLocale() throws Exception {

From 5fe9a448059c5aafd2fa354cdabb12e05b3978e2 Mon Sep 17 00:00:00 2001
From: Allan Burdajewicz <aburdajewicz@cloudbees.com>
Date: Fri, 30 Aug 2024 23:26:27 +1000
Subject: [PATCH 377/449] [JENKINS-73422] Add escape hatch for Authenticated
 user access to Resource URL (#9644)

Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
---
 .../jenkins/security/ResourceDomainRootAction.java     |  6 +++++-
 .../test/java/jenkins/security/ResourceDomainTest.java | 10 +++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/jenkins/security/ResourceDomainRootAction.java b/core/src/main/java/jenkins/security/ResourceDomainRootAction.java
index 7955103d6be5..fc18071fade7 100644
--- a/core/src/main/java/jenkins/security/ResourceDomainRootAction.java
+++ b/core/src/main/java/jenkins/security/ResourceDomainRootAction.java
@@ -117,7 +117,7 @@ public Object getDynamic(String id, StaplerRequest req, StaplerResponse rsp) thr
             return null;
         }
 
-        if (!ACL.isAnonymous2(Jenkins.getAuthentication2())) {
+        if (!ALLOW_AUTHENTICATED_USER && !ACL.isAnonymous2(Jenkins.getAuthentication2())) {
             rsp.sendError(400);
             return null;
         }
@@ -327,4 +327,8 @@ private static Token decode(String value) {
     // Not @Restricted because the entire class is
     @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
     public static /* not final for Groovy */ int VALID_FOR_MINUTES = SystemProperties.getInteger(ResourceDomainRootAction.class.getName() + ".validForMinutes", 30);
+
+    /* Escape hatch for a security hardening preventing one of the known ways to elevate arbitrary file read to RCE */
+    @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
+    public static /* not final for Groovy */ boolean ALLOW_AUTHENTICATED_USER = SystemProperties.getBoolean(ResourceDomainRootAction.class.getName() + ".allowAuthenticatedUser", false);
 }
diff --git a/test/src/test/java/jenkins/security/ResourceDomainTest.java b/test/src/test/java/jenkins/security/ResourceDomainTest.java
index 42f2a1dbbf78..b8f2d551b094 100644
--- a/test/src/test/java/jenkins/security/ResourceDomainTest.java
+++ b/test/src/test/java/jenkins/security/ResourceDomainTest.java
@@ -399,7 +399,7 @@ public HttpResponse doDynamic() throws Exception {
     }
 
     @Test
-    public void authenticatedCannotAccessResourceDomain() throws Exception {
+    public void authenticatedCannotAccessResourceDomainUnlessAllowedBySystemProperty() throws Exception {
         j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
         final MockAuthorizationStrategy authorizationStrategy = new MockAuthorizationStrategy();
         authorizationStrategy.grant(Jenkins.ADMINISTER).everywhere().to("admin").grant(Jenkins.READ).everywhere().toEveryone();
@@ -416,5 +416,13 @@ public void authenticatedCannotAccessResourceDomain() throws Exception {
         try (JenkinsRule.WebClient wc = j.createWebClient().withBasicCredentials("admin")) {
             assertThat(assertThrows(FailingHttpStatusCodeException.class, () -> wc.getPage(new URL(resourceUrl))).getStatusCode(), is(400));
         }
+
+        ResourceDomainRootAction.ALLOW_AUTHENTICATED_USER = true;
+        try (JenkinsRule.WebClient wc = j.createWebClient().withBasicApiToken("admin")) {
+            assertThat(wc.getPage(new URL(resourceUrl)).getWebResponse().getStatusCode(), is(200));
+        }
+        try (JenkinsRule.WebClient wc = j.createWebClient().withBasicCredentials("admin")) {
+            assertThat(wc.getPage(new URL(resourceUrl)).getWebResponse().getStatusCode(), is(200));
+        }
     }
 }

From 9ac4bf149091afbec0187767153815d6051996c9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 15:44:17 -0700
Subject: [PATCH 378/449] Update dependency com.puppycrawl.tools:checkstyle to
 v10.18.1 (#9676)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 921d6a9f7009..c3052864caba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,7 +282,7 @@ THE SOFTWARE.
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>10.18.0</version>
+              <version>10.18.1</version>
             </dependency>
           </dependencies>
           <executions>

From 3ccaa256b89c7e3a6c13cc385bda6f5fc74e682b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 15:44:33 -0700
Subject: [PATCH 379/449] Update dependency
 org.jenkins-ci.main:jenkins-test-harness to v2265 (#9677)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 21089219623c..2038fd503716 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2254.vcff7a_d4969e5</version>
+      <version>2265.v3da_49c8134d6</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From c67e2a9ec369d29da332ed578aed4f05450081c5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 31 Aug 2024 10:04:17 +0200
Subject: [PATCH 380/449] Update dependency stylelint to v16.9.0 (#9678)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/war/package.json b/war/package.json
index 0fa3f50d288c..5c62e8cf14f3 100644
--- a/war/package.json
+++ b/war/package.json
@@ -45,7 +45,7 @@
     "sass": "1.77.8",
     "sass-loader": "16.0.1",
     "style-loader": "4.0.0",
-    "stylelint": "16.8.2",
+    "stylelint": "16.9.0",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
     "webpack": "5.94.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index b9d57852342d..62914daa4472 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1394,7 +1394,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^3.0.0, @csstools/css-parser-algorithms@npm:^3.0.1":
+"@csstools/css-parser-algorithms@npm:^3.0.1":
   version: 3.0.1
   resolution: "@csstools/css-parser-algorithms@npm:3.0.1"
   peerDependencies:
@@ -1403,14 +1403,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^3.0.0, @csstools/css-tokenizer@npm:^3.0.1":
+"@csstools/css-tokenizer@npm:^3.0.1":
   version: 3.0.1
   resolution: "@csstools/css-tokenizer@npm:3.0.1"
   checksum: 10c0/c9ed4373e5731b5375ea9791590081019c04e95f08b46b272977e5e7b8c3d560affc62e82263cb8def1df1e57f0673140e7e16a14a5e7be04e6a234be088d1d3
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^3.0.0, @csstools/media-query-list-parser@npm:^3.0.1":
+"@csstools/media-query-list-parser@npm:^3.0.1":
   version: 3.0.1
   resolution: "@csstools/media-query-list-parser@npm:3.0.1"
   peerDependencies:
@@ -4402,7 +4402,7 @@ __metadata:
     sass-loader: "npm:16.0.1"
     sortablejs: "npm:1.15.2"
     style-loader: "npm:4.0.0"
-    stylelint: "npm:16.8.2"
+    stylelint: "npm:16.9.0"
     stylelint-checkstyle-reporter: "npm:1.0.0"
     stylelint-config-standard: "npm:36.0.1"
     tippy.js: "npm:6.3.7"
@@ -4799,7 +4799,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.7":
+"micromatch@npm:^4.0.4, micromatch@npm:^4.0.8":
   version: 4.0.8
   resolution: "micromatch@npm:4.0.8"
   dependencies:
@@ -6662,13 +6662,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:16.8.2":
-  version: 16.8.2
-  resolution: "stylelint@npm:16.8.2"
+"stylelint@npm:16.9.0":
+  version: 16.9.0
+  resolution: "stylelint@npm:16.9.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.0"
-    "@csstools/css-tokenizer": "npm:^3.0.0"
-    "@csstools/media-query-list-parser": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
     "@csstools/selector-specificity": "npm:^4.0.0"
     "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
@@ -6690,7 +6690,7 @@ __metadata:
     known-css-properties: "npm:^0.34.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
-    micromatch: "npm:^4.0.7"
+    micromatch: "npm:^4.0.8"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.1"
     postcss: "npm:^8.4.41"
@@ -6701,13 +6701,13 @@ __metadata:
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
     strip-ansi: "npm:^7.1.0"
-    supports-hyperlinks: "npm:^3.0.0"
+    supports-hyperlinks: "npm:^3.1.0"
     svg-tags: "npm:^1.0.0"
     table: "npm:^6.8.2"
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/898cde9b5d981f249133df709458eebf2af0a525e72410ddfafd76a7308f7da493578b6a909c593cc70061556b9eda1fed4f477385ee615435f0996d9e18d8df
+  checksum: 10c0/d3ff9c8945c56b04a2fa16ec33d163325496d5db94b6fcb5adf74c76f7f794ac992888273f9a3317652ba8b6195168b2ffff382ca2a667a241e2ace8c9505ae2
   languageName: node
   linkType: hard
 
@@ -6738,13 +6738,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-hyperlinks@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "supports-hyperlinks@npm:3.0.0"
+"supports-hyperlinks@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "supports-hyperlinks@npm:3.1.0"
   dependencies:
     has-flag: "npm:^4.0.0"
     supports-color: "npm:^7.0.0"
-  checksum: 10c0/36aaa55e67645dded8e0f846fd81d7dd05ce82ea81e62347f58d86213577eb627b2b45298656ce7a70e7155e39f071d0d3f83be91e112aed801ebaa8db1ef1d0
+  checksum: 10c0/78cc3e17eb27e6846fa355a8ebf343befe36272899cd409e45317a06c1997e95c23ff99d91080a517bd8c96508d4fa456e6ceb338c02ba5d7544277dbec0f10f
   languageName: node
   linkType: hard
 

From 9fc6a55698c6b92e7711fc0dde5a863c5db90834 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2024 15:45:31 +0100
Subject: [PATCH 381/449] Update dependency @babel/cli to v7.25.6 (#9679)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/war/package.json b/war/package.json
index 5c62e8cf14f3..71015ede4105 100644
--- a/war/package.json
+++ b/war/package.json
@@ -23,7 +23,7 @@
     "lint": "yarn lint:js && yarn lint:css"
   },
   "devDependencies": {
-    "@babel/cli": "7.24.8",
+    "@babel/cli": "7.25.6",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@eslint/js": "9.9.1",
diff --git a/war/yarn.lock b/war/yarn.lock
index 62914daa4472..62ea2de5f6b4 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -22,13 +22,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/cli@npm:7.24.8":
-  version: 7.24.8
-  resolution: "@babel/cli@npm:7.24.8"
+"@babel/cli@npm:7.25.6":
+  version: 7.25.6
+  resolution: "@babel/cli@npm:7.25.6"
   dependencies:
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     "@nicolo-ribaudo/chokidar-2": "npm:2.1.8-no-fsevents.3"
-    chokidar: "npm:^3.4.0"
+    chokidar: "npm:^3.6.0"
     commander: "npm:^6.2.0"
     convert-source-map: "npm:^2.0.0"
     fs-readdir-recursive: "npm:^1.1.0"
@@ -45,7 +45,7 @@ __metadata:
   bin:
     babel: ./bin/babel.js
     babel-external-helpers: ./bin/babel-external-helpers.js
-  checksum: 10c0/b7f464ccb00db60aed63d71e980df823900d20c740bc2d9eb36c3abd4b3e2402cc438818382344085ef6603aeea2e6ee19af8f0ecb934966eccf077b87af7c7c
+  checksum: 10c0/861d3c2ed6c47b25a322c2f6127f56783d8d333fc2d02d3815f86301fe1102eca5f61b8a5c8610a6a2872d1ccfce24fd6d4a91f4f73536e43b8e2f28f9dcf5ed
   languageName: node
   linkType: hard
 
@@ -2833,9 +2833,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.0":
-  version: 3.5.3
-  resolution: "chokidar@npm:3.5.3"
+"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "chokidar@npm:3.6.0"
   dependencies:
     anymatch: "npm:~3.1.2"
     braces: "npm:~3.0.2"
@@ -2848,7 +2848,7 @@ __metadata:
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 10c0/1076953093e0707c882a92c66c0f56ba6187831aa51bb4de878c1fec59ae611a3bf02898f190efec8e77a086b8df61c2b2a3ea324642a0558bdf8ee6c5dc9ca1
+  checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462
   languageName: node
   linkType: hard
 
@@ -4375,7 +4375,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "jenkins-ui@workspace:."
   dependencies:
-    "@babel/cli": "npm:7.24.8"
+    "@babel/cli": "npm:7.25.6"
     "@babel/core": "npm:7.25.2"
     "@babel/preset-env": "npm:7.25.4"
     "@eslint/js": "npm:9.9.1"

From 1008dcb1dfe1ce00499ccc4e0b0a5bcd918882da Mon Sep 17 00:00:00 2001
From: Thorsten Scherler <scherler@gmail.com>
Date: Sun, 1 Sep 2024 16:50:49 +0200
Subject: [PATCH 382/449] [JENKINS-73695] BUG: Dashboard shows white space on
 certain width space >900px (#9667)

---
 .../resources/lib/hudson/projectView.jelly    | 34 ++++++++++---------
 war/src/main/scss/abstracts/_theme.scss       |  1 +
 war/src/main/scss/base/_layout-commons.scss   | 13 +++++--
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
index de8d4a9316b1..75842abc1e9f 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -67,23 +67,25 @@ THE SOFTWARE.
       </div>
 
       <div class="jenkins-mobile-hide">
-        <table id="projectstatus" class="jenkins-table ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''} sortable">
-          <thead>
-          <tr>
-            <j:forEach var="col" items="${columnExtensions}">
-              <j:if test="${col.class.simpleName.equals('BuildButtonColumn')}">
-                <j:set var="buildButtonColumn" value="${col}" />
-              </j:if>
-              <st:include page="columnHeader.jelly" it="${col}" />
-            </j:forEach>
-          </tr>
-          </thead>
+        <div class="app-project-status-table">
+          <table id="projectstatus" class="jenkins-table ${iconSize == '16x16' ? 'jenkins-table--small' : iconSize == '24x24' ? 'jenkins-table--medium' : ''} sortable">
+            <thead>
+              <tr>
+                <j:forEach var="col" items="${columnExtensions}">
+                  <j:if test="${col.class.simpleName.equals('BuildButtonColumn')}">
+                    <j:set var="buildButtonColumn" value="${col}" />
+                  </j:if>
+                  <st:include page="columnHeader.jelly" it="${col}" />
+                </j:forEach>
+              </tr>
+            </thead>
 
-          <j:forEach var="job" items="${jobs}">
-            <j:set var="relativeLinkToJob" value="${h.getRelativeLinkTo(job)}"/>
-            <t:projectViewRow jobBaseUrl="${relativeLinkToJob.substring(0, relativeLinkToJob.length() - job.shortUrl.length())}"/>
-          </j:forEach>
-        </table>
+            <j:forEach var="job" items="${jobs}">
+              <j:set var="relativeLinkToJob" value="${h.getRelativeLinkTo(job)}"/>
+              <t:projectViewRow jobBaseUrl="${relativeLinkToJob.substring(0, relativeLinkToJob.length() - job.shortUrl.length())}"/>
+            </j:forEach>
+          </table>
+        </div>
         <t:iconSize><t:rssBar/></t:iconSize>
       </div>
 
diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss
index 9004709c76a1..c108634f7c85 100644
--- a/war/src/main/scss/abstracts/_theme.scss
+++ b/war/src/main/scss/abstracts/_theme.scss
@@ -267,6 +267,7 @@ $semantics: (
   --tab-baseline-default-display: none;
 
   // Side panel
+  --side-panel-width: 340px;
   --panel-header-bg-color: var(--light-grey);
   --panel-border-color: var(--light-grey);
   --side-panel-hover-color: var(--panel-border-color);
diff --git a/war/src/main/scss/base/_layout-commons.scss b/war/src/main/scss/base/_layout-commons.scss
index c42e6dcafe67..ce45451b0add 100644
--- a/war/src/main/scss/base/_layout-commons.scss
+++ b/war/src/main/scss/base/_layout-commons.scss
@@ -84,7 +84,7 @@
 }
 
 body.two-column #main-panel {
-  width: calc(100% - 320px);
+  width: calc(100% - var(--side-panel-width));
   flex: 1;
   display: block;
 }
@@ -98,7 +98,7 @@ body.full-screen #main-panel {
 }
 
 body.two-column #side-panel {
-  width: 340px;
+  width: var(--side-panel-width);
 }
 
 /* stylelint-disable-next-line media-query-no-invalid */
@@ -118,9 +118,16 @@ body.two-column #side-panel {
   }
 }
 
+.app-project-status-table {
+  width: 100%;
+  overflow-x: auto;
+}
+
 @media (width >= 1170px) {
   body.two-column #main-panel {
-    width: calc(100% - 370px);
+    width: calc(
+      100% - calc(var(--side-panel-width) + calc(var(--section-padding) * 2))
+    );
   }
 }
 

From 3069dded3adabd0d43f3b309dfc51a1205d7ce7e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:33:14 -0700
Subject: [PATCH 383/449] Update dependency io.jenkins.plugins:snakeyaml-api to
 v2.3-123.v13484c65210a_ (#9682)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index e6b4bf8251b7..621208036302 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -372,7 +372,7 @@ THE SOFTWARE.
                   <!-- dependency of jackson2-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>snakeyaml-api</artifactId>
-                  <version>2.2-121.v5a_68b_9300b_d4</version>
+                  <version>2.3-123.v13484c65210a_</version>
                   <type>hpi</type>
                 </artifactItem>
 

From 4187ee4d2d7ea54a1c2f5b40470a46182817fe81 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:33:32 -0700
Subject: [PATCH 384/449] Update dependency
 io.jenkins.plugins:commons-lang3-api to v3.17.0-84.vb_b_938040b_078 (#9680)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 2038fd503716..28d74acd4513 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -63,7 +63,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>commons-lang3-api</artifactId>
-        <version>3.16.0-82.ve2b_07d659d95</version>
+        <version>3.17.0-84.vb_b_938040b_078</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps between checks-api, plugin-util-api, and font-awesome-api -->
diff --git a/war/pom.xml b/war/pom.xml
index 621208036302..9045cdc38056 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -502,7 +502,7 @@ THE SOFTWARE.
                   <!-- dependency of bootstrap5-api, checks-api, commons-text-api, echarts-api, font-awesome-api, jquery3-api, and plugin-util-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>commons-lang3-api</artifactId>
-                  <version>3.16.0-82.ve2b_07d659d95</version>
+                  <version>3.17.0-84.vb_b_938040b_078</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 4e9b6d8a3dd93aa57c7d0e9464006e2eadc125fc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:34:16 -0700
Subject: [PATCH 385/449] Update dependency
 org.jenkins-ci.plugins:script-security to v1358 (#9685)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 28d74acd4513..229c19fe390e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -118,7 +118,7 @@ THE SOFTWARE.
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
-        <version>1354.va_70a_fe478c7f</version>
+        <version>1358.vb_26663c13537</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 9045cdc38056..3772fa834be2 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -300,7 +300,7 @@ THE SOFTWARE.
                   <!-- dependency of command-launcher, junit, matrix-project, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>script-security</artifactId>
-                  <version>1354.va_70a_fe478c7f</version>
+                  <version>1358.vb_26663c13537</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 7006cded64f63f788ae91dd7b7587a4a39e70273 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 3 Sep 2024 14:59:04 -0700
Subject: [PATCH 386/449] [JENKINS-73278] Migrate core from EE 8 to EE 9
 (#9672)

Co-authored-by: Kevin Guerroudj <91883215+Kevin-CB@users.noreply.github.com>
Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
---
 .github/renovate.json                         |  11 -
 .idea/encodings.xml                           |   9 +-
 bom/pom.xml                                   |  14 +-
 core/pom.xml                                  |  20 +-
 .../java/hudson/DescriptorExtensionList.java  |   2 +-
 .../main/java/hudson/ExpressionFactory2.java  |   4 +-
 core/src/main/java/hudson/FilePath.java       |   2 +-
 core/src/main/java/hudson/Functions.java      | 166 ++++++++++---
 .../main/java/hudson/LocalPluginManager.java  |  15 +-
 core/src/main/java/hudson/Plugin.java         |  66 +++++-
 core/src/main/java/hudson/PluginManager.java  |  91 ++++++--
 core/src/main/java/hudson/PluginWrapper.java  |   6 +-
 .../hudson/ProxyConfigurationManager.java     |   4 +-
 .../java/hudson/ResponseHeaderFilter.java     |  16 +-
 core/src/main/java/hudson/Util.java           |  14 +-
 core/src/main/java/hudson/WebAppMain.java     |  22 +-
 core/src/main/java/hudson/cli/CLIAction.java  |  16 +-
 .../java/hudson/cli/CliCrumbExclusion.java    |   8 +-
 .../cli/ReloadConfigurationCommand.java       |   2 +-
 .../java/hudson/cli/UpdateNodeCommand.java    |   2 +-
 .../hudson/console/AnnotatedLargeText.java    |  61 ++++-
 .../console/ConsoleAnnotationDescriptor.java  |  10 +-
 .../console/ConsoleAnnotatorFactory.java      |  10 +-
 .../java/hudson/console/HyperlinkNote.java    |   4 +-
 .../java/hudson/diagnosis/OldDataMonitor.java |  12 +-
 .../diagnosis/ReverseProxySetupMonitor.java   |   4 +-
 .../diagnosis/TooManyJobsButNoView.java       |   6 +-
 .../hudson/init/impl/GroovyInitScript.java    |   2 +-
 .../impl/InstallUncaughtExceptionHandler.java |  18 +-
 .../lifecycle/WindowsInstallerLink.java       |  16 +-
 .../main/java/hudson/logging/LogRecorder.java |  12 +-
 .../hudson/logging/LogRecorderManager.java    |  12 +-
 .../java/hudson/markup/MarkupFormatter.java   |  25 +-
 .../main/java/hudson/model/AbstractBuild.java |  13 +-
 .../main/java/hudson/model/AbstractItem.java  | 107 ++++++++-
 .../hudson/model/AbstractModelObject.java     |  53 ++++-
 .../java/hudson/model/AbstractProject.java    |  80 +++++--
 .../main/java/hudson/model/Actionable.java    |  46 +++-
 .../hudson/model/AdministrativeMonitor.java   |   8 +-
 core/src/main/java/hudson/model/AllView.java  |  28 ++-
 core/src/main/java/hudson/model/Api.java      |  71 +++++-
 .../model/AutoCompletionCandidates.java       |   8 +-
 .../src/main/java/hudson/model/BallColor.java |   2 +-
 .../model/BooleanParameterDefinition.java     |   4 +-
 .../hudson/model/BuildAuthorizationToken.java |  32 ++-
 .../hudson/model/BuildTimelineWidget.java     |  20 +-
 .../model/ChoiceParameterDefinition.java      |   6 +-
 core/src/main/java/hudson/model/Computer.java |  34 +--
 .../main/java/hudson/model/ComputerSet.java   |  20 +-
 .../main/java/hudson/model/Descriptor.java    | 157 ++++++++++---
 .../hudson/model/DirectlyModifiableView.java  |   2 +-
 .../hudson/model/DirectoryBrowserSupport.java |  23 +-
 core/src/main/java/hudson/model/Executor.java |   3 +-
 core/src/main/java/hudson/model/Failure.java  |  10 +-
 .../hudson/model/FileParameterDefinition.java |   8 +-
 .../java/hudson/model/FileParameterValue.java |   8 +-
 core/src/main/java/hudson/model/Hudson.java   |  42 +++-
 core/src/main/java/hudson/model/Item.java     |   4 +-
 .../java/hudson/model/ItemGroupMixIn.java     |  25 +-
 core/src/main/java/hudson/model/Job.java      | 102 ++++++--
 .../main/java/hudson/model/JobProperty.java   |  22 ++
 .../hudson/model/JobPropertyDescriptor.java   |  19 ++
 core/src/main/java/hudson/model/Label.java    |   6 +-
 core/src/main/java/hudson/model/ListView.java |  39 +++-
 .../hudson/model/ManageJenkinsAction.java     |   8 +-
 .../hudson/model/ModifiableItemGroup.java     |  49 +++-
 .../hudson/model/MultiStageTimeSeries.java    |   8 +-
 core/src/main/java/hudson/model/MyView.java   |  28 ++-
 .../java/hudson/model/MyViewsProperty.java    |  10 +-
 core/src/main/java/hudson/model/Node.java     |  18 ++
 .../hudson/model/PaneStatusProperties.java    |   6 +-
 .../hudson/model/ParameterDefinition.java     |  58 ++++-
 .../java/hudson/model/ParameterValue.java     |   6 +-
 .../model/ParametersDefinitionProperty.java   |  37 +--
 .../model/PasswordParameterDefinition.java    |   4 +-
 core/src/main/java/hudson/model/Project.java  |  36 ++-
 .../src/main/java/hudson/model/ProxyView.java |  37 ++-
 core/src/main/java/hudson/model/Queue.java    |   8 +-
 core/src/main/java/hudson/model/RSS.java      |  57 ++++-
 .../model/ReconfigurableDescribable.java      |  31 ++-
 core/src/main/java/hudson/model/Run.java      |  93 +++++++-
 .../hudson/model/RunParameterDefinition.java  |   6 +-
 .../model/SimpleParameterDefinition.java      |   4 +-
 core/src/main/java/hudson/model/Slave.java    |  14 +-
 .../java/hudson/model/StockStatusIcon.java    |   4 +-
 .../model/StringParameterDefinition.java      |   4 +-
 .../main/java/hudson/model/TaskAction.java    |  14 +-
 .../hudson/model/TextParameterDefinition.java |   4 +-
 .../hudson/model/TopLevelItemDescriptor.java  |   2 +-
 .../main/java/hudson/model/UpdateCenter.java  |  40 +++-
 .../java/hudson/model/UsageStatistics.java    |   6 +-
 core/src/main/java/hudson/model/User.java     |  20 +-
 .../main/java/hudson/model/UserProperty.java  |  16 ++
 core/src/main/java/hudson/model/View.java     | 147 ++++++++++--
 .../java/hudson/model/ViewDescriptor.java     |   6 +-
 core/src/main/java/hudson/model/ViewJob.java  |  30 ++-
 .../main/java/hudson/model/ViewProperty.java  |  16 ++
 .../java/hudson/model/labels/LabelAtom.java   |  10 +-
 .../UserPropertyCategoryAccountAction.java    |   8 +-
 .../UserPropertyCategoryAction.java           |   8 +-
 .../java/hudson/scm/AbstractScmTagAction.java |  34 ++-
 .../java/hudson/scm/RepositoryBrowsers.java   |  17 +-
 core/src/main/java/hudson/scm/SCMS.java       |  22 +-
 core/src/main/java/hudson/search/Search.java  |  59 ++++-
 .../hudson/search/UserSearchProperty.java     |   4 +-
 .../security/AccessDeniedException2.java      |   3 +-
 .../security/AccessDeniedException3.java      |  15 +-
 .../security/AccessDeniedHandlerImpl.java     |   8 +-
 .../AuthenticationProcessingFilter2.java      |  10 +-
 .../security/AuthorizationStrategy.java       |   4 +-
 .../security/BasicAuthenticationFilter.java   |  28 +--
 .../hudson/security/ChainedServletFilter.java |  19 +-
 .../security/ContainerAuthentication.java     |   4 +-
 .../security/FederatedLoginService.java       |   8 +-
 .../security/GlobalSecurityConfiguration.java |  12 +-
 .../HttpSessionContextIntegrationFilter2.java |  12 +-
 .../HudsonAuthenticationEntryPoint.java       |   8 +-
 .../java/hudson/security/HudsonFilter.java    |  19 +-
 .../security/HudsonPrivateSecurityRealm.java  |  63 ++---
 .../hudson/security/LegacySecurityRealm.java  |   4 +-
 .../main/java/hudson/security/NoopFilter.java |  15 +-
 .../security/RememberMeServicesProxy.java     |   4 +-
 .../java/hudson/security/SecurityRealm.java   | 106 +++++++--
 .../TokenBasedRememberMeServices2.java        |   4 +-
 .../UnwrapSecurityExceptionFilter.java        |  14 +-
 .../hudson/security/csrf/CrumbExclusion.java  |  65 +++++-
 .../hudson/security/csrf/CrumbFilter.java     |  20 +-
 .../hudson/security/csrf/CrumbIssuer.java     | 109 ++++++++-
 .../security/csrf/DefaultCrumbIssuer.java     |   9 +-
 .../csrf/GlobalCrumbIssuerConfiguration.java  |   4 +-
 core/src/main/java/hudson/slaves/Cloud.java   |  26 ++-
 .../EnvironmentVariablesNodeProperty.java     |   2 +-
 .../java/hudson/slaves/NodeDescriptor.java    |   8 +-
 .../main/java/hudson/slaves/NodeProperty.java |  19 ++
 .../java/hudson/slaves/SlaveComputer.java     |  16 +-
 .../java/hudson/tasks/ArtifactArchiver.java   |   4 +-
 .../main/java/hudson/tasks/BuildTrigger.java  |   4 +-
 .../main/java/hudson/tasks/Fingerprinter.java |   4 +-
 core/src/main/java/hudson/tasks/Maven.java    |   4 +-
 core/src/main/java/hudson/tasks/Shell.java    |   4 +-
 .../java/hudson/tools/ToolDescriptor.java     |  21 +-
 .../main/java/hudson/triggers/SCMTrigger.java |   8 +-
 .../main/java/hudson/util/BootFailure.java    |   2 +-
 .../hudson/util/CharacterEncodingFilter.java  |  16 +-
 .../main/java/hudson/util/ComboBoxModel.java  |   8 +-
 .../java/hudson/util/DescribableList.java     |  23 +-
 .../main/java/hudson/util/DescriptorList.java |   2 +-
 .../main/java/hudson/util/ErrorObject.java    |  10 +-
 core/src/main/java/hudson/util/FormApply.java |  21 +-
 .../java/hudson/util/FormFillFailure.java     |  12 +-
 .../main/java/hudson/util/FormValidation.java |  18 +-
 core/src/main/java/hudson/util/Graph.java     |  46 +++-
 .../main/java/hudson/util/HttpResponses.java  |   8 +-
 .../java/hudson/util/HudsonIsLoading.java     |  12 +-
 .../java/hudson/util/HudsonIsRestarting.java  |  12 +-
 .../main/java/hudson/util/ListBoxModel.java   |  37 ++-
 .../hudson/util/MultipartFormDataParser.java  |  50 +++-
 .../java/hudson/util/PluginServletFilter.java |  69 ++++--
 .../java/hudson/util/QueryParameterMap.java   |  10 +-
 .../java/hudson/util/RemotingDiagnostics.java |   6 +-
 .../views/GlobalDefaultViewConfiguration.java |   4 +-
 .../java/hudson/views/ListViewColumn.java     |   3 +-
 .../main/java/hudson/views/MyViewsTabBar.java |   4 +-
 .../main/java/hudson/views/ViewsTabBar.java   |   4 +-
 .../java/hudson/widgets/HistoryWidget.java    |  12 +-
 .../hudson/widgets/RenderOnDemandClosure.java |  12 +-
 .../java/jenkins/ErrorAttributeFilter.java    |  16 +-
 core/src/main/java/jenkins/I18n.java          |   4 +-
 .../jenkins/JenkinsHttpSessionListener.java   |   4 +-
 .../main/java/jenkins/agents/CloudSet.java    |  29 ++-
 .../java/jenkins/agents/WebSocketAgents.java  |   6 +-
 .../AppearanceGlobalConfiguration.java        |  12 +-
 .../jenkins/console/ConsoleUrlProvider.java   |   4 +-
 ...ConsoleUrlProviderGlobalConfiguration.java |   4 +-
 .../ControllerExecutorsAgents.java            |   6 +-
 .../ControllerExecutorsNoAgents.java          |   6 +-
 .../diagnostics/SecurityIsOffMonitor.java     |   6 +-
 .../diagnostics/URICheckEncodingMonitor.java  |   4 +-
 .../GlobalFingerprintConfiguration.java       |   4 +-
 .../java/jenkins/install/SetupWizard.java     |  31 +--
 .../management/AdministrativeMonitorsApi.java |  10 +-
 .../AdministrativeMonitorsConfiguration.java  |   4 +-
 .../AdministrativeMonitorsDecorator.java      |   4 +-
 .../java/jenkins/management/ShutdownLink.java |  10 +-
 .../model/ArtifactManagerConfiguration.java   |   4 +-
 .../main/java/jenkins/model/AssetManager.java |  10 +-
 .../jenkins/model/BuiltInNodeMigration.java   |   8 +-
 .../GlobalBuildDiscarderConfiguration.java    |   4 +-
 .../jenkins/model/GlobalConfiguration.java    |  23 +-
 .../GlobalNodePropertiesConfiguration.java    |   4 +-
 .../model/GlobalPluginConfiguration.java      |   6 +-
 ...balProjectNamingStrategyConfiguration.java |   4 +-
 .../model/GlobalQuietPeriodConfiguration.java |   4 +-
 .../GlobalSCMRetryCountConfiguration.java     |   4 +-
 core/src/main/java/jenkins/model/Jenkins.java | 220 ++++++++++++------
 .../model/JenkinsLocationConfiguration.java   |   6 +-
 .../model/MasterBuildConfiguration.java       |   4 +-
 .../model/ModelObjectWithChildren.java        |  27 ++-
 .../model/ModelObjectWithContextMenu.java     |  53 +++--
 .../jenkins/model/OptionalJobProperty.java    |  16 +-
 .../jenkins/model/ParameterizedJobMixIn.java  |  76 ++++--
 .../jenkins/model/ProjectNamingStrategy.java  |   2 +-
 .../UserExperimentalFlagsProperty.java        |   4 +-
 .../model/item_category/Categories.java       |   8 +-
 .../jenkins/mvn/GlobalSettingsProvider.java   |  21 +-
 .../java/jenkins/mvn/SettingsProvider.java    |  18 +-
 .../AcegiSecurityExceptionFilter.java         |  14 +-
 .../jenkins/security/ApiCrumbExclusion.java   |   8 +-
 .../java/jenkins/security/ApiTokenFilter.java |   2 +-
 .../jenkins/security/ApiTokenProperty.java    |   4 +-
 .../AuthenticationSuccessHandler.java         |   4 +-
 .../BasicHeaderApiTokenAuthenticator.java     |   6 +-
 .../security/BasicHeaderAuthenticator.java    |  46 +++-
 .../security/BasicHeaderProcessor.java        |  19 +-
 .../BasicHeaderRealPasswordAuthenticator.java |   6 +-
 .../LastGrantedAuthoritiesProperty.java       |   4 +-
 .../NonSerializableSecurityContext.java       |   2 +-
 .../QueueItemAuthenticatorConfiguration.java  |   4 +-
 .../security/ResourceDomainConfiguration.java |   6 +-
 .../security/ResourceDomainFilter.java        |   6 +-
 .../security/ResourceDomainRootAction.java    |  16 +-
 .../jenkins/security/SecureRequester.java     |  33 ++-
 .../security/SuspiciousRequestFilter.java     |  18 +-
 .../UpdateSiteWarningsConfiguration.java      |   4 +-
 .../seed/UserSeedSecurityListener.java        |   6 +-
 .../stapler/StaplerDispatchValidator.java     |  18 +-
 .../StaplerFilteredActionListener.java        |  12 +-
 .../StaticRoutingDecisionProvider.java        |   2 +-
 .../security/stapler/WebMethodConstants.java  |  12 +-
 .../slaves/EncryptedSlaveAgentJnlpFile.java   |  18 +-
 .../EnvVarsFilterGlobalConfiguration.java     |   4 +-
 .../telemetry/impl/StaplerDispatches.java     |   4 +-
 .../jenkins/telemetry/impl/UserLanguages.java |   6 +-
 .../tools/GlobalToolConfiguration.java        |  12 +-
 .../jenkins/util/FullDuplexHttpService.java   |  16 +-
 .../java/jenkins/util/HttpServletFilter.java  |  19 +-
 .../jenkins/util/HttpSessionListener.java     |  38 ++-
 .../jenkins/util/JSONSignatureValidator.java  |   4 +-
 .../main/java/jenkins/util/JenkinsJVM.java    |   2 +-
 .../jenkins/util/ProgressiveRendering.java    |   8 +-
 .../java/jenkins/util/ScriptListener.java     |   4 +-
 .../java/jenkins/util/SystemProperties.java   |   6 +-
 .../jenkins/util/groovy/GroovyHookScript.java |  13 +-
 .../java/jenkins/websocket/WebSockets.java    |  18 +-
 .../ui/rememberme/RememberMeServices.java     |   4 +-
 .../RememberMeServicesSpringImpl.java         |   4 +-
 .../jenkins/model/Jenkins/_404.jelly          |   6 +-
 .../jenkins/model/Jenkins/_404_simple.jelly   |   4 +-
 .../jenkins/model/Jenkins/oops.jelly          |   2 +-
 core/src/test/java/hudson/FunctionsTest.java  |  36 +--
 .../hudson/GetLocaleStaticHelpUrlTest.java    |  24 +-
 .../src/test/java/hudson/model/QueueTest.java |   8 +-
 core/src/test/java/hudson/model/ViewTest.java |   8 +-
 .../java/hudson/util/FormValidationTest.java  |   5 +-
 .../jenkins/model/JenkinsGetRootUrlTest.java  |  28 +--
 .../stapler/StaplerSignaturesTest.java        |  10 +-
 pom.xml                                       |   5 +-
 .../java/hudson/CustomPluginManagerTest.java  |   2 +-
 .../PluginManagerCheckUpdateCenterTest.java   |  12 +-
 .../test/java/hudson/PluginManagerTest.java   |  12 +-
 test/src/test/java/hudson/PluginTest.java     |   2 +-
 .../java/hudson/cli/BuildCommandTest.java     |   4 +-
 test/src/test/java/hudson/cli/CLITest.java    |  22 +-
 .../hudson/diagnosis/OldDataMonitorTest.java  |   4 +-
 test/src/test/java/hudson/model/ApiTest.java  |   2 +-
 .../model/ComputerConfigDotXmlTest.java       |  16 +-
 .../java/hudson/model/DescriptorTest.java     |   8 +-
 .../model/DirectoryBrowserSupportTest.java    |   6 +-
 .../java/hudson/model/JobPropertyTest.java    |   6 +-
 .../test/java/hudson/model/ListViewTest.java  |  12 +-
 .../ParametersDefinitionPropertyTest.java     |   8 +-
 .../test/java/hudson/model/ProjectTest.java   |   3 +-
 .../src/test/java/hudson/model/QueueTest.java |   2 +-
 .../hudson/model/UpdateCenterCustomTest.java  |   6 +-
 .../hudson/model/UsageStatisticsTest.java     |   2 +-
 .../java/hudson/model/ViewDescriptorTest.java |   4 +-
 .../java/hudson/model/ViewPropertyTest.java   |   4 +-
 test/src/test/java/hudson/model/ViewTest.java |  10 +-
 .../pages/SystemConfigurationTestCase.java    |   4 +-
 .../test/java/hudson/security/LoginTest.java  |   2 +-
 .../hudson/security/SecurityRealmTest.java    |   4 +-
 .../TokenBasedRememberMeServices2Test.java    |   2 +-
 .../test/java/hudson/security/WhoAmITest.java |   6 +-
 .../security/csrf/CrumbExclusionTest.java     |   8 +-
 .../security/csrf/DefaultCrumbIssuerTest.java |   2 +-
 .../test/java/hudson/slaves/CloudTest.java    |   4 +-
 .../java/hudson/slaves/NodePropertyTest.java  |   4 +-
 .../java/hudson/util/BootFailureTest.java     |  12 +-
 .../java/hudson/util/HudsonIsLoadingTest.java |   4 +-
 .../hudson/util/HudsonIsRestartingTest.java   |   4 +-
 .../util/RobustReflectionConverterTest.java   |   6 +-
 .../hudson/util/XStream2Security383Test.java  |  12 +-
 .../GlobalDefaultViewConfigurationTest.java   |   4 +-
 .../URICheckEncodingMonitorTest.java          |   2 +-
 .../java/jenkins/install/InstallUtilTest.java |   2 +-
 .../java/jenkins/model/ContextMenuTest.java   |   2 +-
 .../GlobalSCMRetryCountConfigurationTest.java |   6 +-
 .../model/ParameterizedJobMixInTest.java      |   3 +-
 .../security/ApiTokenPropertyTest.java        |   2 +-
 ...etJsonInErrorMessageSanitizerHtmlTest.java |  10 +-
 .../jenkins/security/Security3030Test.java    |  54 ++---
 .../jenkins/security/Security3135Test.java    |   6 +-
 .../security/SuspiciousRequestFilterTest.java |   2 +-
 .../seed/UserSeedSecurityListenerTest.java    |   4 +-
 .../CustomRoutingDecisionProviderTest.java    |   4 +-
 .../security/stapler/DoActionFilterTest.java  |  36 +--
 .../jenkins/security/stapler/DynamicTest.java |   4 +-
 .../security/stapler/PreventRoutingTest.java  |   4 +-
 .../security/stapler/Security400Test.java     |   2 +-
 .../security/stapler/StaplerAbstractTest.java |   6 +-
 .../stapler/StaplerDispatchValidatorTest.java |   2 +-
 .../stapler/StaplerRoutableActionTest.java    |   4 +-
 .../StaticRoutingDecisionProviderTest.java    |  18 +-
 .../security/stapler/TypedFilterTest.java     |  10 +-
 .../java/jenkins/telemetry/TelemetryTest.java |  14 +-
 .../util/FullDuplexHttpServiceTest.java       |  12 +-
 .../jenkins/util/SystemPropertiesTest.java    |  10 +-
 .../java/lib/form/AdvancedButtonTest.java     |   4 +-
 .../test/java/lib/form/BooleanRadioTest.java  |   4 +-
 .../test/java/lib/form/DropdownListTest.java  |   4 +-
 test/src/test/java/lib/form/EnumSetTest.java  |   4 +-
 test/src/test/java/lib/form/EnumTest.java     |   4 +-
 .../java/lib/form/ExpandableTextboxTest.java  |   4 +-
 test/src/test/java/lib/form/NameRefTest.java  |   4 +-
 test/src/test/java/lib/form/PasswordTest.java |   4 +-
 .../test/java/lib/form/RepeatableTest.java    |   4 +-
 test/src/test/java/lib/form/RowSetTest.java   |   4 +-
 .../java/lib/form/RowVisibilityGroupTest.java |   4 +-
 .../java/lib/form/ValidateButtonTest.java     |   6 +-
 .../java/lib/layout/ConfirmationLinkTest.java |   4 +-
 .../test/java/lib/layout/StopButtonTest.java  |   4 +-
 test/src/test/java/lib/layout/TaskTest.java   |   8 +-
 .../stapler/MockStaplerRequestBuilder.java    |   6 +-
 .../org/kohsuke/stapler/Security1097Test.java |   4 +-
 war/pom.xml                                   |  24 +-
 websocket/jetty10/pom.xml                     |  85 -------
 .../jenkins/websocket/Jetty10Provider.java    | 179 --------------
 .../{jetty12-ee8 => jetty12-ee9}/pom.xml      |   6 +-
 .../websocket/Jetty12EE9Provider.java}        |  24 +-
 websocket/spi/pom.xml                         |   2 +-
 .../main/java/jenkins/websocket/Provider.java |   4 +-
 341 files changed, 3991 insertions(+), 1872 deletions(-)
 delete mode 100644 websocket/jetty10/pom.xml
 delete mode 100644 websocket/jetty10/src/main/java/jenkins/websocket/Jetty10Provider.java
 rename websocket/{jetty12-ee8 => jetty12-ee9}/pom.xml (95%)
 rename websocket/{jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java => jetty12-ee9/src/main/java/jenkins/websocket/Jetty12EE9Provider.java} (90%)

diff --git a/.github/renovate.json b/.github/renovate.json
index aab994ad8187..1f023c99f4f5 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -91,17 +91,6 @@
         "org.jfree:jfreechart"
       ]
     },
-    {
-      "description": "Starting with 6.x, Spring requires Java 17 at a minimum.",
-      "matchManagers": [
-        "maven"
-      ],
-      "allowedVersions": "<6.0.0",
-      "matchPackageNames": [
-        "org.springframework:spring-framework-bom",
-        "org.springframework.security:spring-security-bom"
-      ]
-    },
     {
       "description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
       "matchManagers": [
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index ca018ebc3ab9..68f564fff79d 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -29,12 +29,9 @@
     <file url="file://$PROJECT_DIR$/war/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/war/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/war/src/test/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/websocket/jetty10/src/filter/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/websocket/jetty10/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/websocket/jetty10/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee8/src/filter/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee8/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee8/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee9/src/filter/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee9/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/websocket/jetty12-ee9/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/websocket/spi/src/filter/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/websocket/spi/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/websocket/spi/src/main/resources" charset="UTF-8" />
diff --git a/bom/pom.xml b/bom/pom.xml
index adf65f6cf439..cd55b58d52c9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
-    <stapler.version>1896.v8170998149d0</stapler.version>
+    <stapler.version>1903.v994a_db_314d58</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
@@ -62,15 +62,15 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.3.39</version>
+        <version>6.1.12</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
-        <!-- https://docs.spring.io/spring-security/site/docs/5.5.4/reference/html5/#getting-maven-no-boot -->
+        <!-- https://docs.spring.io/spring-security/reference/6.3/getting-spring-security.html#getting-maven-no-boot -->
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-bom</artifactId>
-        <version>5.8.14</version>
+        <version>6.3.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -154,12 +154,12 @@ THE SOFTWARE.
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>
-        <version>4.0.4</version>
+        <version>5.0.0</version>
       </dependency>
       <dependency>
         <groupId>jakarta.servlet.jsp.jstl</groupId>
         <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-        <version>1.2.7</version>
+        <version>2.0.0</version>
       </dependency>
       <dependency>
         <groupId>jaxen</groupId>
@@ -295,7 +295,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jvnet.hudson</groupId>
         <artifactId>commons-jelly-tags-define</artifactId>
-        <version>1.1-jenkins-20240510</version>
+        <version>1.1-jenkins-20240903</version>
       </dependency>
       <dependency>
         <groupId>org.jvnet.localizer</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 8e30ae211ed7..9bff5e5ad0b2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -217,6 +217,20 @@ THE SOFTWARE.
       <!-- needed by Jelly -->
       <groupId>jakarta.servlet.jsp.jstl</groupId>
       <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jakarta.el</groupId>
+          <artifactId>jakarta.el-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>jaxen</groupId>
@@ -288,7 +302,7 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-fileupload2-javax</artifactId>
+      <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
@@ -427,6 +441,10 @@ THE SOFTWARE.
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
       <exclusions>
+        <exclusion>
+          <groupId>io.micrometer</groupId>
+          <artifactId>micrometer-observation</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.springframework</groupId>
           <artifactId>spring-jcl</artifactId>
diff --git a/core/src/main/java/hudson/DescriptorExtensionList.java b/core/src/main/java/hudson/DescriptorExtensionList.java
index c92b6ae206c0..c658c83fe1fc 100644
--- a/core/src/main/java/hudson/DescriptorExtensionList.java
+++ b/core/src/main/java/hudson/DescriptorExtensionList.java
@@ -145,7 +145,7 @@ public T newInstanceFromRadioList(JSONObject config) throws FormException {
         if (config.isNullObject())
             return null;    // none was selected
         int idx = config.getInt("value");
-        return get(idx).newInstance(Stapler.getCurrentRequest(), config);
+        return get(idx).newInstance(Stapler.getCurrentRequest2(), config);
     }
 
     /**
diff --git a/core/src/main/java/hudson/ExpressionFactory2.java b/core/src/main/java/hudson/ExpressionFactory2.java
index 7fcec22e7604..1bc99160439b 100644
--- a/core/src/main/java/hudson/ExpressionFactory2.java
+++ b/core/src/main/java/hudson/ExpressionFactory2.java
@@ -12,7 +12,7 @@
 import org.apache.commons.jelly.expression.ExpressionSupport;
 import org.apache.commons.jexl.JexlContext;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.springframework.security.access.AccessDeniedException;
 
 /**
@@ -78,7 +78,7 @@ public Object evaluate(JellyContext context) {
                 // let the security exception pass through
                 throw e;
             } catch (Exception e) {
-                StaplerRequest currentRequest = Stapler.getCurrentRequest();
+                StaplerRequest2 currentRequest = Stapler.getCurrentRequest2();
                 LOGGER.log(Level.WARNING, "Caught exception evaluating: " + expression + " in " + (currentRequest != null ? currentRequest.getOriginalRequestURI() : "?") + ". Reason: " + e, e);
                 return null;
             } finally {
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 06773dd9a9ee..f5288b26d9d1 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -3510,7 +3510,7 @@ public FormValidation validateRelativePath(String value, boolean errorIfNotExist
     }
 
     private static void checkPermissionForValidate() {
-        AccessControlled subject = Stapler.getCurrentRequest().findAncestorObject(AbstractProject.class);
+        AccessControlled subject = Stapler.getCurrentRequest2().findAncestorObject(AbstractProject.class);
         if (subject == null)
             Jenkins.get().checkPermission(Jenkins.MANAGE);
         else
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index cd25f9bc9871..d2b62e99a2f2 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -95,6 +95,14 @@
 import hudson.views.MyViewsTabBar;
 import hudson.views.ViewsTabBar;
 import hudson.widgets.RenderOnDemandClosure;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import io.jenkins.servlet.http.CookieWrapper;
+import io.jenkins.servlet.http.HttpServletRequestWrapper;
+import io.jenkins.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -148,10 +156,6 @@
 import java.util.logging.SimpleFormatter;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.console.ConsoleUrlProvider;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.GlobalConfigurationCategory;
@@ -176,7 +180,9 @@
 import org.kohsuke.stapler.RawHtmlArgument;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.access.AccessDeniedException;
 
 /**
@@ -276,8 +282,8 @@ public static boolean isExtensionsAvailable() {
     }
 
     public static void initPageVariables(JellyContext context) {
-        StaplerRequest currentRequest = Stapler.getCurrentRequest();
-        currentRequest.getWebApp().getDispatchValidator().allowDispatch(currentRequest, Stapler.getCurrentResponse());
+        StaplerRequest2 currentRequest = Stapler.getCurrentRequest2();
+        currentRequest.getWebApp().getDispatchValidator().allowDispatch(currentRequest, Stapler.getCurrentResponse2());
         String rootURL = currentRequest.getContextPath();
 
         Functions h = new Functions();
@@ -372,7 +378,10 @@ public static String addSuffix(int n, String singular, String plural) {
         return buf.toString();
     }
 
-    public static RunUrl decompose(StaplerRequest req) {
+    /**
+     * @since TODO
+     */
+    public static RunUrl decompose(StaplerRequest2 req) {
         List<Ancestor> ancestors = req.getAncestors();
 
         // find the first and last Run instances
@@ -405,12 +414,20 @@ public static RunUrl decompose(StaplerRequest req) {
         return new RunUrl((Run) f.getObject(), head, base, rest);
     }
 
+    /**
+     * @deprecated use {@link #decompose(StaplerRequest2)}
+     */
+    @Deprecated
+    public static RunUrl decompose(StaplerRequest req) {
+        return decompose(StaplerRequest.toStaplerRequest2(req));
+    }
+
     /**
      * If we know the user's screen resolution, return it. Otherwise null.
      * @since 1.213
      */
     public static Area getScreenResolution() {
-        Cookie res = Functions.getCookie(Stapler.getCurrentRequest(), "screenResolution");
+        Cookie res = Functions.getCookie(Stapler.getCurrentRequest2(), "screenResolution");
         if (res != null)
             return Area.parse(res.getValue());
         return null;
@@ -592,6 +609,9 @@ public static <T> Iterable<T> reverse(Collection<T> collection) {
         return list;
     }
 
+    /**
+     * @since TODO
+     */
     public static Cookie getCookie(HttpServletRequest req, String name) {
         Cookie[] cookies = req.getCookies();
         if (cookies != null) {
@@ -604,12 +624,31 @@ public static Cookie getCookie(HttpServletRequest req, String name) {
         return null;
     }
 
+    /**
+     * @deprecated use {@link #getCookie(HttpServletRequest, String)}
+     */
+    @Deprecated
+    public static javax.servlet.http.Cookie getCookie(javax.servlet.http.HttpServletRequest req, String name) {
+        return CookieWrapper.fromJakartaServletHttpCookie(getCookie(HttpServletRequestWrapper.toJakartaHttpServletRequest(req), name));
+    }
+
+    /**
+     * @since TODO
+     */
     public static String getCookie(HttpServletRequest req, String name, String defaultValue) {
         Cookie c = getCookie(req, name);
         if (c == null || c.getValue() == null) return defaultValue;
         return c.getValue();
     }
 
+    /**
+     * @deprecated use {@link #getCookie(HttpServletRequest, String, String)}
+     */
+    @Deprecated
+    public static String getCookie(javax.servlet.http.HttpServletRequest req, String name, String defaultValue) {
+        return getCookie(HttpServletRequestWrapper.toJakartaHttpServletRequest(req), name, defaultValue);
+    }
+
     private static final Pattern ICON_SIZE = Pattern.compile("\\d+x\\d+");
 
     @Restricted(NoExternalUse.class)
@@ -713,8 +752,10 @@ public static long getHourLocalTimezone() {
      * Finds the given object in the ancestor list and returns its URL.
      * This is used to determine the "current" URL assigned to the given object,
      * so that one can compute relative URLs from it.
+     *
+     * @since TODO
      */
-    public static String getNearestAncestorUrl(StaplerRequest req, Object it) {
+    public static String getNearestAncestorUrl(StaplerRequest2 req, Object it) {
         List list = req.getAncestors();
         for (int i = list.size() - 1; i >= 0; i--) {
             Ancestor anc = (Ancestor) list.get(i);
@@ -724,11 +765,19 @@ public static String getNearestAncestorUrl(StaplerRequest req, Object it) {
         return null;
     }
 
+    /**
+     * @deprecated use {@link #getNearestAncestorUrl(StaplerRequest2, Object)}
+     */
+    @Deprecated
+    public static String getNearestAncestorUrl(StaplerRequest req, Object it) {
+        return getNearestAncestorUrl(StaplerRequest.toStaplerRequest2(req), it);
+    }
+
     /**
      * Finds the inner-most {@link SearchableModelObject} in scope.
      */
     public static String getSearchURL() {
-        List list = Stapler.getCurrentRequest().getAncestors();
+        List list = Stapler.getCurrentRequest2().getAncestors();
         for (int i = list.size() - 1; i >= 0; i--) {
             Ancestor anc = (Ancestor) list.get(i);
             if (anc.getObject() instanceof SearchableModelObject)
@@ -888,7 +937,7 @@ public static void checkPermission(Object object, Permission permission) throws
         if (object instanceof AccessControlled)
             checkPermission((AccessControlled) object, permission);
         else {
-            List<Ancestor> ancs = Stapler.getCurrentRequest().getAncestors();
+            List<Ancestor> ancs = Stapler.getCurrentRequest2().getAncestors();
             for (Ancestor anc : Iterators.reverse(ancs)) {
                 Object o = anc.getObject();
                 if (o instanceof AccessControlled) {
@@ -920,7 +969,7 @@ public static boolean hasPermission(Object object, Permission permission) throws
         if (object instanceof AccessControlled)
             return ((AccessControlled) object).hasPermission(permission);
         else {
-            List<Ancestor> ancs = Stapler.getCurrentRequest().getAncestors();
+            List<Ancestor> ancs = Stapler.getCurrentRequest2().getAncestors();
             for (Ancestor anc : Iterators.reverse(ancs)) {
                 Object o = anc.getObject();
                 if (o instanceof AccessControlled) {
@@ -931,10 +980,13 @@ public static boolean hasPermission(Object object, Permission permission) throws
         }
     }
 
-    public static void adminCheck(StaplerRequest req, StaplerResponse rsp, Object required, Permission permission) throws IOException, ServletException {
+    /**
+     * @since TODO
+     */
+    public static void adminCheck(StaplerRequest2 req, StaplerResponse2 rsp, Object required, Permission permission) throws IOException, ServletException {
         // this is legacy --- all views should be eventually converted to
         // the permission based model.
-        if (required != null && !Hudson.adminCheck(req, rsp)) {
+        if (required != null && !Hudson.adminCheck(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp))) {
             // check failed. commit the FORBIDDEN response, then abort.
             rsp.setStatus(HttpServletResponse.SC_FORBIDDEN);
             rsp.getOutputStream().close();
@@ -946,10 +998,24 @@ public static void adminCheck(StaplerRequest req, StaplerResponse rsp, Object re
             checkPermission(permission);
     }
 
+   /**
+     * @deprecated use {@link #adminCheck(StaplerRequest2, StaplerResponse2, Object, Permission)}
+     */
+    @Deprecated
+    public static void adminCheck(StaplerRequest req, StaplerResponse rsp, Object required, Permission permission) throws IOException, javax.servlet.ServletException {
+        try {
+            adminCheck(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), required, permission);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Infers the hudson installation URL from the given request.
+     *
+     * @since TODO
      */
-    public static String inferHudsonURL(StaplerRequest req) {
+    public static String inferHudsonURL(StaplerRequest2 req) {
         String rootUrl = Jenkins.get().getRootUrl();
         if (rootUrl != null)
             // prefer the one explicitly configured, to work with load-balancer, frontend, etc.
@@ -963,6 +1029,14 @@ public static String inferHudsonURL(StaplerRequest req) {
         return buf.toString();
     }
 
+    /**
+     * @deprecated use {@link #inferHudsonURL(StaplerRequest2)}
+     */
+    @Deprecated
+    public static String inferHudsonURL(StaplerRequest req) {
+        return inferHudsonURL(StaplerRequest.toStaplerRequest2(req));
+    }
+
     /**
      * Returns the link to be displayed in the footer of the UI.
      */
@@ -1226,7 +1300,7 @@ public static boolean hasAnyPermission(Object object, Permission[] permissions)
         if (object instanceof AccessControlled)
             return hasAnyPermission((AccessControlled) object, permissions);
         else {
-            AccessControlled ac = Stapler.getCurrentRequest().findAncestorObject(AccessControlled.class);
+            AccessControlled ac = Stapler.getCurrentRequest2().findAncestorObject(AccessControlled.class);
             if (ac != null) {
                 return hasAnyPermission(ac, permissions);
             }
@@ -1264,7 +1338,7 @@ public static void checkAnyPermission(Object object, Permission[] permissions) t
         if (object instanceof AccessControlled)
             checkAnyPermission((AccessControlled) object, permissions);
         else {
-            List<Ancestor> ancs = Stapler.getCurrentRequest().getAncestors();
+            List<Ancestor> ancs = Stapler.getCurrentRequest2().getAncestors();
             for (Ancestor anc : Iterators.reverse(ancs)) {
                 Object o = anc.getObject();
                 if (o instanceof AccessControlled) {
@@ -1335,7 +1409,7 @@ public static String getRelativeLinkTo(Item p) {
         Map<Object, String> ancestors = new HashMap<>();
         View view = null;
 
-        StaplerRequest request = Stapler.getCurrentRequest();
+        StaplerRequest2 request = Stapler.getCurrentRequest2();
         for (Ancestor a : request.getAncestors()) {
             ancestors.put(a.getObject(), a.getRelativePath());
             if (a.getObject() instanceof View)
@@ -1681,7 +1755,7 @@ public static String getViewResource(Object it, String path) {
         if (it instanceof Descriptor)
             clazz = ((Descriptor) it).clazz;
 
-        String buf = Stapler.getCurrentRequest().getContextPath() + Jenkins.VIEW_RESOURCE_PATH + '/' +
+        String buf = Stapler.getCurrentRequest2().getContextPath() + Jenkins.VIEW_RESOURCE_PATH + '/' +
                 clazz.getName().replace('.', '/').replace('$', '/') +
                 '/' + path;
         return buf;
@@ -1689,7 +1763,7 @@ public static String getViewResource(Object it, String path) {
 
     public static boolean hasView(Object it, String path) throws IOException {
         if (it == null)    return false;
-        return Stapler.getCurrentRequest().getView(it, path) != null;
+        return Stapler.getCurrentRequest2().getView(it, path) != null;
     }
 
     /**
@@ -1900,10 +1974,10 @@ public static String joinPath(String... components) {
             return null;
         }
         if (urlName.startsWith("/"))
-            return joinPath(Stapler.getCurrentRequest().getContextPath(), urlName);
+            return joinPath(Stapler.getCurrentRequest2().getContextPath(), urlName);
         else
             // relative URL name
-            return joinPath(Stapler.getCurrentRequest().getContextPath() + '/' + itUrl, urlName);
+            return joinPath(Stapler.getCurrentRequest2().getContextPath() + '/' + itUrl, urlName);
     }
 
     /**
@@ -1966,7 +2040,7 @@ public String getServerName() {
         } catch (MalformedURLException e) {
             // fall back to HTTP request
         }
-        return Stapler.getCurrentRequest().getServerName();
+        return Stapler.getCurrentRequest2().getServerName();
     }
 
     /**
@@ -2004,7 +2078,7 @@ public void calcCheckUrl(Map attributes, String userDefined, Object descriptor,
      * Used in {@code task.jelly} to decide if the page should be highlighted.
      */
     public boolean hyperlinkMatchesCurrentPage(String href) {
-        String url = Stapler.getCurrentRequest().getRequestURL().toString();
+        String url = Stapler.getCurrentRequest2().getRequestURL().toString();
         if (href == null || href.length() <= 1) return ".".equals(href) && url.endsWith("/");
         url = URLDecoder.decode(url, StandardCharsets.UTF_8);
         href = URLDecoder.decode(href, StandardCharsets.UTF_8);
@@ -2063,12 +2137,23 @@ public static List<Descriptor<CrumbIssuer>> getCrumbIssuerDescriptors() {
         return CrumbIssuer.all();
     }
 
-    public static String getCrumb(StaplerRequest req) {
+    /**
+     * @since TODO
+     */
+    public static String getCrumb(StaplerRequest2 req) {
         Jenkins h = Jenkins.getInstanceOrNull();
         CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
         return issuer != null ? issuer.getCrumb(req) : "";
     }
 
+    /**
+     * @deprecated use {@link #getCrumb(StaplerRequest2)}
+     */
+    @Deprecated
+    public static String getCrumb(StaplerRequest req) {
+        return getCrumb(req != null ? StaplerRequest.toStaplerRequest2(req) : null);
+    }
+
     public static String getCrumbRequestField() {
         Jenkins h = Jenkins.getInstanceOrNull();
         CrumbIssuer issuer = h != null ? h.getCrumbIssuer() : null;
@@ -2081,7 +2166,7 @@ public static Date getCurrentTime() {
 
     public static Locale getCurrentLocale() {
         Locale locale = null;
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req != null)
             locale = req.getLocale();
         if (locale == null)
@@ -2094,7 +2179,7 @@ public static Locale getCurrentLocale() {
      * from {@link ConsoleAnnotatorFactory}s and {@link ConsoleAnnotationDescriptor}s.
      */
     public static String generateConsoleAnnotationScriptAndStylesheet() {
-        String cp = Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH;
+        String cp = Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH;
         StringBuilder buf = new StringBuilder();
         for (ConsoleAnnotatorFactory f : ConsoleAnnotatorFactory.all()) {
             String path = cp + "/extensionList/" + ConsoleAnnotatorFactory.class.getName() + "/" + f.getClass().getName();
@@ -2147,7 +2232,7 @@ public String getPasswordValue(Object o) {
         }
 
         /* Mask from Extended Read */
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (o instanceof Secret || Secret.BLANK_NONSECRET_PASSWORD_FIELDS_WITHOUT_ITEM_CONFIGURE) {
             if (req != null) {
                 Item item = req.findAncestorObject(Item.class);
@@ -2243,15 +2328,17 @@ public static boolean isWipeOutPermissionEnabled() {
 
     @Deprecated
     public static String createRenderOnDemandProxy(JellyContext context, String attributesToCapture) {
-        return Stapler.getCurrentRequest().createJavaScriptProxy(new RenderOnDemandClosure(context, attributesToCapture));
+        return Stapler.getCurrentRequest2().createJavaScriptProxy(new RenderOnDemandClosure(context, attributesToCapture));
     }
 
     /**
      * Called from renderOnDemand.jelly to generate the parameters for the proxy object generation.
+     *
+     * @since TODO
      */
     @Restricted(NoExternalUse.class)
-    public static StaplerRequest.RenderOnDemandParameters createRenderOnDemandProxyParameters(JellyContext context, String attributesToCapture) {
-        return Stapler.getCurrentRequest().createJavaScriptProxyParameters(new RenderOnDemandClosure(context, attributesToCapture));
+    public static StaplerRequest2.RenderOnDemandParameters createRenderOnDemandProxyParameters(JellyContext context, String attributesToCapture) {
+        return Stapler.getCurrentRequest2().createJavaScriptProxyParameters(new RenderOnDemandClosure(context, attributesToCapture));
     }
 
     public static String getCurrentDescriptorByNameUrl() {
@@ -2260,18 +2347,18 @@ public static String getCurrentDescriptorByNameUrl() {
 
     public static String setCurrentDescriptorByNameUrl(String value) {
         String o = getCurrentDescriptorByNameUrl();
-        Stapler.getCurrentRequest().setAttribute("currentDescriptorByNameUrl", value);
+        Stapler.getCurrentRequest2().setAttribute("currentDescriptorByNameUrl", value);
 
         return o;
     }
 
     public static void restoreCurrentDescriptorByNameUrl(String old) {
-        Stapler.getCurrentRequest().setAttribute("currentDescriptorByNameUrl", old);
+        Stapler.getCurrentRequest2().setAttribute("currentDescriptorByNameUrl", old);
     }
 
     public static List<String> getRequestHeaders(String name) {
         List<String> r = new ArrayList<>();
-        Enumeration e = Stapler.getCurrentRequest().getHeaders(name);
+        Enumeration e = Stapler.getCurrentRequest2().getHeaders(name);
         while (e.hasMoreElements()) {
             r.add(e.nextElement().toString());
         }
@@ -2366,6 +2453,7 @@ public static String breakableString(final String plain) {
      * Advertises the minimum set of HTTP headers that assist programmatic
      * discovery of Jenkins.
      */
+    @SuppressFBWarnings(value = "UC_USELESS_VOID_METHOD", justification = "TODO needs triage")
     public static void advertiseHeaders(HttpServletResponse rsp) {
         Jenkins j = Jenkins.getInstanceOrNull();
         if (j != null) {
@@ -2375,6 +2463,14 @@ public static void advertiseHeaders(HttpServletResponse rsp) {
         }
     }
 
+    /**
+     * @deprecated use {@link #advertiseHeaders(HttpServletResponse)}
+     */
+    @Deprecated
+    public static void advertiseHeaders(javax.servlet.http.HttpServletResponse rsp) {
+        advertiseHeaders(HttpServletResponseWrapper.toJakartaHttpServletResponse(rsp));
+    }
+
     @Restricted(NoExternalUse.class) // for actions.jelly and ContextMenu.add
     public static boolean isContextMenuVisible(Action a) {
         if (a instanceof ModelObjectWithContextMenu.ContextMenuVisibility) {
@@ -2449,7 +2545,7 @@ public static String tryGetIconPath(String iconGuess, JellyContext context) {
             return iconGuess;
         }
 
-        StaplerRequest currentRequest = Stapler.getCurrentRequest();
+        StaplerRequest2 currentRequest = Stapler.getCurrentRequest2();
         String rootURL = currentRequest.getContextPath();
         Icon iconMetadata = tryGetIcon(iconGuess);
 
diff --git a/core/src/main/java/hudson/LocalPluginManager.java b/core/src/main/java/hudson/LocalPluginManager.java
index d1fcfd678e3a..7ee8c68b40d3 100644
--- a/core/src/main/java/hudson/LocalPluginManager.java
+++ b/core/src/main/java/hudson/LocalPluginManager.java
@@ -26,11 +26,12 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jenkins.servlet.ServletContextWrapper;
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 
@@ -49,12 +50,20 @@ public LocalPluginManager(@CheckForNull ServletContext context, @NonNull File ro
         super(context, new File(rootDir, "plugins"));
     }
 
+    /**
+     * @deprecated use {@link #LocalPluginManager(ServletContext, File)}
+     */
+    @Deprecated
+    public LocalPluginManager(@CheckForNull javax.servlet.ServletContext context, @NonNull File rootDir) {
+        this(context != null ? ServletContextWrapper.toJakartaServletContext(context) : null, rootDir);
+    }
+
     /**
      * Creates a new LocalPluginManager
      * @param jenkins Jenkins instance that will use the plugin manager.
      */
     public LocalPluginManager(@NonNull Jenkins jenkins) {
-        this(jenkins.servletContext, jenkins.getRootDir());
+        this(jenkins.getServletContext(), jenkins.getRootDir());
     }
 
     /**
@@ -62,7 +71,7 @@ public LocalPluginManager(@NonNull Jenkins jenkins) {
      * @param rootDir Jenkins home directory.
      */
     public LocalPluginManager(@NonNull File rootDir) {
-        this(null, rootDir);
+        this((ServletContext) null, rootDir);
     }
 
     @Override
diff --git a/core/src/main/java/hudson/Plugin.java b/core/src/main/java/hudson/Plugin.java
index c87a2cbe9b3c..1427da9fda8a 100644
--- a/core/src/main/java/hudson/Plugin.java
+++ b/core/src/main/java/hudson/Plugin.java
@@ -33,25 +33,29 @@
 import hudson.model.Saveable;
 import hudson.model.listeners.ItemListener;
 import hudson.model.listeners.SaveableListener;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.Jenkins;
 import jenkins.model.Loadable;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.SystemProperties;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Base class of Hudson plugin.
@@ -92,11 +96,11 @@ public abstract class Plugin implements Loadable, Saveable, StaplerProxy {
     /**
      * You do not need to create custom subtypes:
      * <ul>
-     * <li>{@code config.jelly}, {@link #configure(StaplerRequest, JSONObject)}, {@link #load}, and {@link #save}
+     * <li>{@code config.jelly}, {@link #configure(StaplerRequest2, JSONObject)}, {@link #load}, and {@link #save}
      *      can be replaced by {@link GlobalConfiguration}
      * <li>{@link #start} and {@link #postInitialize} can be replaced by {@link Initializer} (or {@link ItemListener#onLoaded})
      * <li>{@link #stop} can be replaced by {@link Terminator}
-     * <li>{@link #setServletContext} can be replaced by {@link Jenkins#servletContext}
+     * <li>{@link #setServletContext} can be replaced by {@link Jenkins#getServletContext}
      * </ul>
      * Note that every plugin gets a {@link DummyImpl} by default,
      * which will still route the URL space, serve {@link #getWrapper}, and so on.
@@ -189,10 +193,10 @@ public void stop() throws Exception {
 
     /**
      * @since 1.233
-     * @deprecated as of 1.305 override {@link #configure(StaplerRequest,JSONObject)} instead
+     * @deprecated as of 1.305 override {@link #configure(StaplerRequest2,JSONObject)} instead
      */
     @Deprecated
-    public void configure(JSONObject formData) throws IOException, ServletException, FormException {
+    public void configure(JSONObject formData) throws IOException, javax.servlet.ServletException, FormException {
     }
 
     /**
@@ -220,16 +224,60 @@ public void configure(JSONObject formData) throws IOException, ServletException,
      * <p>
      * If you are using this method, you'll likely be interested in
      * using {@link #save()} and {@link #load()}.
+     * @since TODO
+     */
+    public void configure(StaplerRequest2 req, JSONObject formData) throws IOException, ServletException, FormException {
+        try {
+            if (Util.isOverridden(Plugin.class, getClass(), "configure", StaplerRequest.class, JSONObject.class)) {
+                configure(StaplerRequest.fromStaplerRequest2(req), formData);
+            } else {
+                configure(formData);
+            }
+        } catch (javax.servlet.ServletException e) {
+            throw ServletExceptionWrapper.toJakartaServletException(e);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #configure(StaplerRequest2, JSONObject)}
      * @since 1.305
      */
-    public void configure(StaplerRequest req, JSONObject formData) throws IOException, ServletException, FormException {
+    @Deprecated
+    public void configure(StaplerRequest req, JSONObject formData) throws IOException, javax.servlet.ServletException, FormException {
         configure(formData);
     }
 
     /**
      * This method serves static resources in the plugin under {@code hudson/plugin/SHORTNAME}.
+     *
+     * @since TODO
+     */
+    public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(Plugin.class, getClass(), "doDynamic", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doDynamic(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doDynamicImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doDynamic(StaplerRequest2, StaplerResponse2)}
      */
-    public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doDynamicImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void doDynamicImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         String path = req.getRestOfPath();
 
         String pathUC = path.toUpperCase(Locale.ENGLISH);
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 16c22e9ca90c..e1f5d4cc1184 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -66,6 +66,10 @@
 import hudson.util.Service;
 import hudson.util.VersionNumber;
 import hudson.util.XStream2;
+import io.jenkins.servlet.ServletContextWrapper;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -118,8 +122,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
@@ -134,6 +136,7 @@
 import jenkins.model.Jenkins;
 import jenkins.plugins.DetachedPluginsUtil;
 import jenkins.security.CustomClassFilter;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.SystemProperties;
 import jenkins.util.io.OnMaster;
 import jenkins.util.xml.RestrictiveEntityResolver;
@@ -143,8 +146,8 @@
 import org.apache.commons.fileupload2.core.DiskFileItemFactory;
 import org.apache.commons.fileupload2.core.FileItem;
 import org.apache.commons.fileupload2.core.FileUploadException;
-import org.apache.commons.fileupload2.javax.JavaxServletDiskFileUpload;
-import org.apache.commons.fileupload2.javax.JavaxServletFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
@@ -165,7 +168,8 @@
 import org.kohsuke.stapler.StaplerOverridable;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -237,11 +241,22 @@ PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
                 return klass.getConstructor(Jenkins.class).newInstance(jenkins);
             }
         },
+        SC_FILE2 {
+            @Override
+            @NonNull PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
+                                            @NonNull Jenkins jenkins) throws ReflectiveOperationException {
+                return klass.getConstructor(ServletContext.class, File.class).newInstance(jenkins.getServletContext(), jenkins.getRootDir());
+            }
+        },
+        /**
+         * @deprecated use {@link #SC_FILE2}
+         */
+        @Deprecated
         SC_FILE {
             @Override
             @NonNull PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
                                             @NonNull Jenkins jenkins) throws ReflectiveOperationException {
-                return klass.getConstructor(ServletContext.class, File.class).newInstance(jenkins.servletContext, jenkins.getRootDir());
+                return klass.getConstructor(javax.servlet.ServletContext.class, File.class).newInstance(jenkins.servletContext, jenkins.getRootDir());
             }
         },
         FILE {
@@ -363,6 +378,9 @@ PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
      */
     private final PluginStrategy strategy;
 
+    /**
+     * @since TODO
+     */
     protected PluginManager(ServletContext context, File rootDir) {
         this.context = context;
 
@@ -378,6 +396,14 @@ protected PluginManager(ServletContext context, File rootDir) {
         strategy = createPluginStrategy();
     }
 
+    /**
+     * @deprecated use {@link #PluginManager(ServletContext, File)}
+     */
+    @Deprecated
+    protected PluginManager(javax.servlet.ServletContext context, File rootDir) {
+        this(context != null ? ServletContextWrapper.toJakartaServletContext(context) : null, rootDir);
+    }
+
     public Api getApi() {
         Jenkins.get().checkPermission(Jenkins.SYSTEM_READ);
         return new Api(this);
@@ -655,7 +681,7 @@ void considerDetachedPlugin(String shortName, String source) {
     protected @NonNull Set<String> loadPluginsFromWar(@NonNull String fromPath, @CheckForNull FilenameFilter filter) {
         Set<String> names = new HashSet<>();
 
-        ServletContext context = Jenkins.get().servletContext;
+        ServletContext context = Jenkins.get().getServletContext();
         Set<String> plugins = Util.fixNull(context.getResourcePaths(fromPath));
         Set<URL> copiedPlugins = new HashSet<>();
         Set<URL> dependencies = new HashSet<>();
@@ -723,7 +749,7 @@ protected static void addDependencies(URL hpiResUrl, String fromPath, Set<URL> d
         String dependencySpec = manifest.getMainAttributes().getValue("Plugin-Dependencies");
         if (dependencySpec != null) {
             String[] dependencyTokens = dependencySpec.split(",");
-            ServletContext context = Jenkins.get().servletContext;
+            ServletContext context = Jenkins.get().getServletContext();
 
             for (String dependencyToken : dependencyTokens) {
                 if (dependencyToken.endsWith(";resolution:=optional")) {
@@ -1597,7 +1623,7 @@ public HttpResponse doPlugins() {
     }
 
     @RequirePOST
-    public HttpResponse doUpdateSources(StaplerRequest req) throws IOException {
+    public HttpResponse doUpdateSources(StaplerRequest2 req) throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         if (req.hasParameter("remove")) {
@@ -1632,7 +1658,7 @@ public void doInstallPluginsDone() {
      * Performs the installation of the plugins.
      */
     @RequirePOST
-    public void doInstall(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doInstall(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         Set<String> plugins = new LinkedHashSet<>();
 
@@ -1656,12 +1682,12 @@ public void doInstall(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
      * @param req The request object.
      * @return A JSON response that includes a "correlationId" in the "data" element.
      * That "correlationId" can then be used in calls to
-     * {@link UpdateCenter#doInstallStatus(org.kohsuke.stapler.StaplerRequest)}.
+     * {@link UpdateCenter#doInstallStatus(org.kohsuke.stapler.StaplerRequest2)}.
      * @throws IOException Error reading JSON payload fro request.
      */
     @RequirePOST
     @Restricted(DoNotUse.class) // WebOnly
-    public HttpResponse doInstallPlugins(StaplerRequest req) throws IOException {
+    public HttpResponse doInstallPlugins(StaplerRequest2 req) throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         String payload = IOUtils.toString(req.getInputStream(), req.getCharacterEncoding());
         JSONObject request = JSONObject.fromObject(payload);
@@ -1815,7 +1841,7 @@ public HttpResponse doSiteConfigure(@QueryParameter String site) throws IOExcept
     }
 
     @POST
-    public HttpResponse doProxyConfigure(StaplerRequest req) throws IOException, ServletException {
+    public HttpResponse doProxyConfigure(StaplerRequest2 req) throws IOException, ServletException {
         Jenkins jenkins = Jenkins.get();
         jenkins.checkPermission(Jenkins.ADMINISTER);
 
@@ -1880,14 +1906,39 @@ public void cleanup() {
      * Uploads a plugin.
      */
     @RequirePOST
-    public HttpResponse doUploadPlugin(StaplerRequest req) throws IOException, ServletException {
+    public HttpResponse doUploadPlugin(StaplerRequest2 req) throws IOException, ServletException {
+        if (Util.isOverridden(PluginManager.class, getClass(), "doUploadPlugin", StaplerRequest.class)) {
+            try {
+                return doUploadPlugin(StaplerRequest.fromStaplerRequest2(req));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            return doUploadPluginImpl(req);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doUploadPlugin(StaplerRequest2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public HttpResponse doUploadPlugin(StaplerRequest req) throws IOException, javax.servlet.ServletException {
+        try {
+            return doUploadPluginImpl(StaplerRequest.toStaplerRequest2(req));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private HttpResponse doUploadPluginImpl(StaplerRequest2 req) throws IOException, ServletException {
         try {
             Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
             String fileName = "";
             PluginCopier copier;
             File tmpDir = Files.createTempDirectory("uploadDir").toFile();
-            JavaxServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JavaxServletDiskFileUpload(DiskFileItemFactory.builder().setFile(tmpDir).get());
+            JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JakartaServletDiskFileUpload(DiskFileItemFactory.builder().setFile(tmpDir).get());
             List<DiskFileItem> items = upload.parseRequest(req);
             String string = items.get(1).getString();
             if (string != null && !string.isBlank()) {
@@ -1965,7 +2016,7 @@ public HttpResponse doUploadPlugin(StaplerRequest req) throws IOException, Servl
     }
 
     @Restricted(NoExternalUse.class)
-    @RequirePOST public FormValidation doCheckPluginUrl(StaplerRequest request, @QueryParameter String value) throws IOException {
+    @RequirePOST public FormValidation doCheckPluginUrl(StaplerRequest2 request, @QueryParameter String value) throws IOException {
         if (value != null && !value.isBlank()) {
             try {
                 URL url = new URL(value);
@@ -1984,7 +2035,7 @@ public HttpResponse doUploadPlugin(StaplerRequest req) throws IOException, Servl
     }
 
     @Restricted(NoExternalUse.class)
-    @RequirePOST public FormValidation doCheckUpdateSiteUrl(StaplerRequest request, @QueryParameter String value) throws InterruptedException {
+    @RequirePOST public FormValidation doCheckUpdateSiteUrl(StaplerRequest2 request, @QueryParameter String value) throws InterruptedException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         return checkUpdateSiteURL(value);
     }
@@ -2217,7 +2268,7 @@ private void logPluginWarnings(Map.Entry<String, VersionNumber> requestedPlugin,
     }
 
     /**
-     * Like {@link #doInstallNecessaryPlugins(StaplerRequest)} but only checks if everything is installed
+     * Like {@link #doInstallNecessaryPlugins(StaplerRequest2)} but only checks if everything is installed
      * or if some plugins need updates or installation.
      *
      * This method runs without side-effect. I'm still requiring the ADMINISTER permission since
@@ -2227,7 +2278,7 @@ private void logPluginWarnings(Map.Entry<String, VersionNumber> requestedPlugin,
      * @since 1.483
      */
     @RequirePOST
-    public JSONArray doPrevalidateConfig(StaplerRequest req) throws IOException {
+    public JSONArray doPrevalidateConfig(StaplerRequest2 req) throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         JSONArray response = new JSONArray();
@@ -2252,7 +2303,7 @@ public JSONArray doPrevalidateConfig(StaplerRequest req) throws IOException {
      * @since 1.483
      */
     @RequirePOST
-    public HttpResponse doInstallNecessaryPlugins(StaplerRequest req) throws IOException {
+    public HttpResponse doInstallNecessaryPlugins(StaplerRequest2 req) throws IOException {
         prevalidateConfig(req.getInputStream());
         return HttpResponses.redirectViaContextPath("pluginManager/updates/");
     }
diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
index 47cfcb02d955..c8cd9f5240a0 100644
--- a/core/src/main/java/hudson/PluginWrapper.java
+++ b/core/src/main/java/hudson/PluginWrapper.java
@@ -80,8 +80,8 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -1212,7 +1212,7 @@ public PluginWrapper getPlugin(String shortName) {
         /**
          * Depending on whether the user said "dismiss" or "correct", send him to the right place.
          */
-        public void doAct(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        public void doAct(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
             if (req.hasParameter("correct")) {
                 rsp.sendRedirect(req.getContextPath() + "/pluginManager");
 
diff --git a/core/src/main/java/hudson/ProxyConfigurationManager.java b/core/src/main/java/hudson/ProxyConfigurationManager.java
index 52f15f84c87e..d3ae0d79ee0e 100644
--- a/core/src/main/java/hudson/ProxyConfigurationManager.java
+++ b/core/src/main/java/hudson/ProxyConfigurationManager.java
@@ -32,7 +32,7 @@
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension @Restricted(NoExternalUse.class)
 public class ProxyConfigurationManager extends GlobalConfiguration {
@@ -48,7 +48,7 @@ public Descriptor<ProxyConfiguration> getProxyDescriptor() {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         ProxyConfiguration pc = req.bindJSON(ProxyConfiguration.class, json);
         try {
             saveProxyConfiguration(pc);
diff --git a/core/src/main/java/hudson/ResponseHeaderFilter.java b/core/src/main/java/hudson/ResponseHeaderFilter.java
index 90fb0be87d37..416e5c4c6919 100644
--- a/core/src/main/java/hudson/ResponseHeaderFilter.java
+++ b/core/src/main/java/hudson/ResponseHeaderFilter.java
@@ -24,15 +24,15 @@
 
 package hudson;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Enumeration;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import org.kohsuke.stapler.CompatibleFilter;
 
 /**
  * This filter allows you to modify headers set by the container or other servlets
@@ -77,7 +77,7 @@
  *
  * @author Mike Wille
  */
-public class ResponseHeaderFilter implements Filter {
+public class ResponseHeaderFilter implements CompatibleFilter {
     private FilterConfig config;
 
     @Override
diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index abe9f97d6551..5ca66e9c4424 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -125,6 +125,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Various utility methods that don't have more proper home.
@@ -1850,9 +1851,11 @@ public static long daysElapsedSince(@NonNull Date date) {
     /**
      * Find the specific ancestor, or throw an exception.
      * Useful for an ancestor we know is inside the URL to ease readability
+     *
+     * @since TODO
      */
     @Restricted(NoExternalUse.class)
-    public static @NonNull <T> T getNearestAncestorOfTypeOrThrow(@NonNull StaplerRequest request, @NonNull Class<T> clazz) {
+    public static @NonNull <T> T getNearestAncestorOfTypeOrThrow(@NonNull StaplerRequest2 request, @NonNull Class<T> clazz) {
         T t = request.findAncestorObject(clazz);
         if (t == null) {
             throw new IllegalArgumentException("No ancestor of type " + clazz.getName() + " in the request");
@@ -1860,6 +1863,15 @@ public static long daysElapsedSince(@NonNull Date date) {
         return t;
     }
 
+    /**
+     * @deprecated use {@link #getNearestAncestorOfTypeOrThrow(StaplerRequest2, Class)}
+     */
+    @Deprecated
+    @Restricted(NoExternalUse.class)
+    public static @NonNull <T> T getNearestAncestorOfTypeOrThrow(@NonNull StaplerRequest request, @NonNull Class<T> clazz) {
+        return getNearestAncestorOfTypeOrThrow(StaplerRequest.toStaplerRequest2(request), clazz);
+    }
+
     @Restricted(NoExternalUse.class)
     public static void printRedirect(String contextPath, String redirectUrl, String message, PrintWriter out) {
         out.printf(
diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java
index 9f328328c710..986452797f90 100644
--- a/core/src/main/java/hudson/WebAppMain.java
+++ b/core/src/main/java/hudson/WebAppMain.java
@@ -45,6 +45,12 @@
 import hudson.util.NoHomeDir;
 import hudson.util.NoTempDir;
 import hudson.util.RingBufferLogHandler;
+import io.jenkins.servlet.ServletContextEventWrapper;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.SessionTrackingMode;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -65,11 +71,6 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletResponse;
-import javax.servlet.SessionTrackingMode;
 import jenkins.model.Jenkins;
 import jenkins.util.JenkinsJVM;
 import jenkins.util.SystemProperties;
@@ -320,10 +321,21 @@ private void recordBootAttempt(File home) {
         }
     }
 
+    /**
+     * @since TODO
+     */
     public static void installExpressionFactory(ServletContextEvent event) {
         JellyFacet.setExpressionFactory(event, new ExpressionFactory2());
     }
 
+    /**
+     * @deprecated use {@link #installExpressionFactory(ServletContextEvent)}
+     */
+    @Deprecated
+    public static void installExpressionFactory(javax.servlet.ServletContextEvent event) {
+        installExpressionFactory(ServletContextEventWrapper.toJakartaServletContextEvent(event));
+    }
+
     /**
      * Installs log handler to monitor all Hudson logs.
      */
diff --git a/core/src/main/java/hudson/cli/CLIAction.java b/core/src/main/java/hudson/cli/CLIAction.java
index 9e29b141560c..a2fc5f590197 100644
--- a/core/src/main/java/hudson/cli/CLIAction.java
+++ b/core/src/main/java/hudson/cli/CLIAction.java
@@ -26,6 +26,8 @@
 
 import hudson.Extension;
 import hudson.model.UnprotectedRootAction;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -45,8 +47,6 @@
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.util.FullDuplexHttpService;
 import jenkins.util.SystemProperties;
@@ -59,8 +59,8 @@
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.core.Authentication;
 
 /**
@@ -97,7 +97,7 @@ public String getUrlName() {
         return "cli";
     }
 
-    public void doCommand(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
+    public void doCommand(StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
         final Jenkins jenkins = Jenkins.get();
         jenkins.checkPermission(Jenkins.READ);
 
@@ -121,7 +121,7 @@ public boolean isWebSocketSupported() {
     /**
      * WebSocket endpoint.
      */
-    public HttpResponse doWs(StaplerRequest req) {
+    public HttpResponse doWs(StaplerRequest2 req) {
         if (!WebSockets.isSupported()) {
             return HttpResponses.notFound();
         }
@@ -216,7 +216,7 @@ protected void closed(int statusCode, String reason) {
 
     @Override
     public Object getTarget() {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req.getRestOfPath().isEmpty() && "POST".equals(req.getMethod())) {
             // CLI connection request
             if ("false".equals(req.getParameter("remoting"))) {
@@ -349,7 +349,7 @@ private class PlainCliEndpointResponse extends FullDuplexHttpService.Response {
         }
 
         @Override
-        protected FullDuplexHttpService createService(StaplerRequest req, UUID uuid) throws IOException {
+        protected FullDuplexHttpService createService(StaplerRequest2 req, UUID uuid) throws IOException {
             return new FullDuplexHttpService(uuid) {
                 @Override
                 protected void run(InputStream upload, OutputStream download) throws IOException, InterruptedException {
diff --git a/core/src/main/java/hudson/cli/CliCrumbExclusion.java b/core/src/main/java/hudson/cli/CliCrumbExclusion.java
index 4e3064f43178..08c204eb55b1 100644
--- a/core/src/main/java/hudson/cli/CliCrumbExclusion.java
+++ b/core/src/main/java/hudson/cli/CliCrumbExclusion.java
@@ -26,11 +26,11 @@
 
 import hudson.Extension;
 import hudson.security.csrf.CrumbExclusion;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 
diff --git a/core/src/main/java/hudson/cli/ReloadConfigurationCommand.java b/core/src/main/java/hudson/cli/ReloadConfigurationCommand.java
index 6b29dcf52904..aab260747f65 100644
--- a/core/src/main/java/hudson/cli/ReloadConfigurationCommand.java
+++ b/core/src/main/java/hudson/cli/ReloadConfigurationCommand.java
@@ -50,7 +50,7 @@ protected int run() throws Exception {
         // Or perhaps simpler to inline the thread body of doReload?
         j.doReload();
         Object app;
-        while ((app = WebApp.get(j.servletContext).getApp()) instanceof HudsonIsLoading) {
+        while ((app = WebApp.get(j.getServletContext()).getApp()) instanceof HudsonIsLoading) {
             Thread.sleep(100);
         }
         if (app instanceof Jenkins) {
diff --git a/core/src/main/java/hudson/cli/UpdateNodeCommand.java b/core/src/main/java/hudson/cli/UpdateNodeCommand.java
index c9210f89cc68..5909a2f0fcf2 100644
--- a/core/src/main/java/hudson/cli/UpdateNodeCommand.java
+++ b/core/src/main/java/hudson/cli/UpdateNodeCommand.java
@@ -26,8 +26,8 @@
 
 import hudson.Extension;
 import hudson.model.Node;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import org.kohsuke.args4j.Argument;
 
 /**
diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java
index 4e0d3b9908af..1798512f3e03 100644
--- a/core/src/main/java/hudson/console/AnnotatedLargeText.java
+++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java
@@ -30,6 +30,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.Util;
 import hudson.remoting.ObjectInputStreamEx;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -50,10 +51,13 @@
 import javax.crypto.CipherOutputStream;
 import jenkins.model.Jenkins;
 import jenkins.security.CryptoConfidentialKey;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import org.jenkinsci.remoting.util.AnonymousClassWarnings;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.framework.io.ByteBuffer;
 import org.kohsuke.stapler.framework.io.LargeText;
 
@@ -90,14 +94,44 @@ public AnnotatedLargeText(ByteBuffer memory, Charset charset, boolean completed,
         this.context = context;
     }
 
+    /**
+     * @since TODO
+     */
+    public void doProgressiveHtml(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
+        if (Util.isOverridden(AnnotatedLargeText.class, getClass(), "doProgressiveHtml", StaplerRequest.class, StaplerResponse.class)) {
+            doProgressiveHtml(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+        } else {
+            doProgressiveHtmlImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doProgressiveHtml(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
     public void doProgressiveHtml(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        doProgressiveHtmlImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private void doProgressiveHtmlImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         req.setAttribute("html", true);
         doProgressText(req, rsp);
     }
 
     /**
      * Aliasing what I think was a wrong name in {@link LargeText}
+     *
+     * @since TODO
      */
+    public void doProgressiveText(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
+        doProgressText(req, rsp);
+    }
+
+    /**
+     * @deprecated use {@link #doProgressiveText(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
     public void doProgressiveText(StaplerRequest req, StaplerResponse rsp) throws IOException {
         doProgressText(req, rsp);
     }
@@ -107,16 +141,35 @@ public void doProgressiveText(StaplerRequest req, StaplerResponse rsp) throws IO
      * and use this request attribute to differentiate.
      */
     private boolean isHtml() {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         return req != null && req.getAttribute("html") != null;
     }
 
+    /**
+     * @since TODO
+     */
     @Override
+    protected void setContentType(StaplerResponse2 rsp) {
+        if (Util.isOverridden(AnnotatedLargeText.class, getClass(), "setContentType", StaplerResponse.class)) {
+            setContentType(StaplerResponse.fromStaplerResponse2(rsp));
+        } else {
+            setContentTypeImpl(rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #setContentType(StaplerResponse2)}
+     */
+    @Deprecated
     protected void setContentType(StaplerResponse rsp) {
+        setContentTypeImpl(StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private void setContentTypeImpl(StaplerResponse2 rsp) {
         rsp.setContentType(isHtml() ? "text/html;charset=UTF-8" : "text/plain;charset=UTF-8");
     }
 
-    private ConsoleAnnotator<T> createAnnotator(StaplerRequest req) throws IOException {
+    private ConsoleAnnotator<T> createAnnotator(StaplerRequest2 req) throws IOException {
         try {
             String base64 = req != null ? req.getHeader("X-ConsoleAnnotator") : null;
             if (base64 != null) {
@@ -176,7 +229,7 @@ public long writeRawLogTo(long start, OutputStream out) throws IOException {
     @CheckReturnValue
     public long writeHtmlTo(long start, Writer w) throws IOException {
         ConsoleAnnotationOutputStream<T> caw = new ConsoleAnnotationOutputStream<>(
-                w, createAnnotator(Stapler.getCurrentRequest()), context, charset);
+                w, createAnnotator(Stapler.getCurrentRequest2()), context, charset);
         long r = super.writeLogTo(start, caw);
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -185,7 +238,7 @@ public long writeHtmlTo(long start, Writer w) throws IOException {
         oos.writeLong(System.currentTimeMillis()); // send timestamp to prevent a replay attack
         oos.writeObject(caw.getConsoleAnnotator());
         oos.close();
-        StaplerResponse rsp = Stapler.getCurrentResponse();
+        StaplerResponse2 rsp = Stapler.getCurrentResponse2();
         if (rsp != null)
             rsp.setHeader("X-ConsoleAnnotator", Base64.getEncoder().encodeToString(baos.toByteArray()));
         return r;
diff --git a/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java b/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java
index bb68ccc66194..e63e2dab5cae 100644
--- a/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java
+++ b/core/src/main/java/hudson/console/ConsoleAnnotationDescriptor.java
@@ -28,13 +28,13 @@
 import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Descriptor;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 
 /**
@@ -81,12 +81,12 @@ private URL hasResource(String name) {
     }
 
     @WebMethod(name = "script.js")
-    public void doScriptJs(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doScriptJs(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         rsp.serveFile(req, hasResource("/script.js"), TimeUnit.DAYS.toMillis(1));
     }
 
     @WebMethod(name = "style.css")
-    public void doStyleCss(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doStyleCss(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         rsp.serveFile(req, hasResource("/style.css"), TimeUnit.DAYS.toMillis(1));
     }
 
diff --git a/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java b/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java
index b2f6948fd155..3e56f80ed5d0 100644
--- a/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java
+++ b/core/src/main/java/hudson/console/ConsoleAnnotatorFactory.java
@@ -28,15 +28,15 @@
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.Run;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.ServletException;
 import org.jvnet.tiger_types.Types;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 
 /**
@@ -113,12 +113,12 @@ private URL getResource(String fileName) {
      * Serves the JavaScript file associated with this console annotator factory.
      */
     @WebMethod(name = "script.js")
-    public void doScriptJs(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doScriptJs(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         rsp.serveFile(req, getResource("/script.js"), TimeUnit.DAYS.toMillis(1));
     }
 
     @WebMethod(name = "style.css")
-    public void doStyleCss(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doStyleCss(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         rsp.serveFile(req, getResource("/style.css"), TimeUnit.DAYS.toMillis(1));
     }
 
diff --git a/core/src/main/java/hudson/console/HyperlinkNote.java b/core/src/main/java/hudson/console/HyperlinkNote.java
index 1e582dab2b4a..8aa011660592 100644
--- a/core/src/main/java/hudson/console/HyperlinkNote.java
+++ b/core/src/main/java/hudson/console/HyperlinkNote.java
@@ -37,7 +37,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Turns a text into a hyperlink by specifying the URL separately.
@@ -62,7 +62,7 @@ public HyperlinkNote(String url, int length) {
     public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
         String url = this.url;
         if (url.startsWith("/")) {
-            StaplerRequest req = Stapler.getCurrentRequest();
+            StaplerRequest2 req = Stapler.getCurrentRequest2();
             if (req != null) {
                 // if we are serving HTTP request, we want to use app relative URL
                 url = req.getContextPath() + url;
diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
index e2bfa4678fc9..425c52150949 100644
--- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -65,8 +65,8 @@
 import org.kohsuke.stapler.HttpRedirect;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -310,7 +310,7 @@ public Iterator<VersionNumber> getVersionList() {
      * Depending on whether the user said "yes" or "no", send him to the right place.
      */
     @RequirePOST
-    public HttpResponse doAct(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public HttpResponse doAct(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (req.hasParameter("no")) {
             disable(true);
             return HttpResponses.redirectViaContextPath("/manage");
@@ -324,7 +324,7 @@ public HttpResponse doAct(StaplerRequest req, StaplerResponse rsp) throws IOExce
      * Remove those items from the data map.
      */
     @RequirePOST
-    public HttpResponse doUpgrade(StaplerRequest req, StaplerResponse rsp) {
+    public HttpResponse doUpgrade(StaplerRequest2 req, StaplerResponse2 rsp) {
         final String thruVerParam = req.getParameter("thruVer");
         final VersionNumber thruVer = thruVerParam.equals("all") ? null : new VersionNumber(thruVerParam);
 
@@ -341,7 +341,7 @@ public HttpResponse doUpgrade(StaplerRequest req, StaplerResponse rsp) {
      * Remove those items from the data map.
      */
     @RequirePOST
-    public HttpResponse doDiscard(StaplerRequest req, StaplerResponse rsp) {
+    public HttpResponse doDiscard(StaplerRequest2 req, StaplerResponse2 rsp) {
         saveAndRemoveEntries(entry -> entry.getValue().max == null);
 
         return HttpResponses.forwardToPreviousPage();
@@ -377,7 +377,7 @@ private void saveAndRemoveEntries(Predicate<Map.Entry<SaveableReference, Version
         data.keySet().removeAll(removed);
     }
 
-    public HttpResponse doIndex(StaplerResponse rsp) throws IOException {
+    public HttpResponse doIndex(StaplerResponse2 rsp) throws IOException {
         return new HttpRedirect("manage");
     }
 
diff --git a/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java b/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java
index af7b2579db74..374df6da783e 100644
--- a/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java
@@ -41,7 +41,7 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -68,7 +68,7 @@ public boolean isActivated() {
 
     @Restricted(DoNotUse.class) // WebOnly
     @RestrictedSince("2.235")
-    public HttpResponse doTest(StaplerRequest request, @QueryParameter boolean testWithContext) {
+    public HttpResponse doTest(StaplerRequest2 request, @QueryParameter boolean testWithContext) {
         String referer = request.getReferer();
         Jenkins j = Jenkins.get();
         String redirect;
diff --git a/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java b/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java
index 6412ac63bcb2..1ea6c6336a02 100644
--- a/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java
+++ b/core/src/main/java/hudson/diagnosis/TooManyJobsButNoView.java
@@ -30,8 +30,8 @@
 import java.io.IOException;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -64,7 +64,7 @@ public boolean isActivated() {
      * Depending on whether the user said "yes" or "no", send him to the right place.
      */
     @RequirePOST
-    public void doAct(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doAct(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         if (req.hasParameter("no")) {
             disable(true);
diff --git a/core/src/main/java/hudson/init/impl/GroovyInitScript.java b/core/src/main/java/hudson/init/impl/GroovyInitScript.java
index 17f6a4702c94..ffe8c77513c8 100644
--- a/core/src/main/java/hudson/init/impl/GroovyInitScript.java
+++ b/core/src/main/java/hudson/init/impl/GroovyInitScript.java
@@ -39,6 +39,6 @@
 public class GroovyInitScript {
     @Initializer(after = JOB_CONFIG_ADAPTED)
     public static void init(Jenkins j) {
-        new GroovyHookScript("init", j.servletContext, j.getRootDir(), j.getPluginManager().uberClassLoader).run();
+        new GroovyHookScript("init", j.getServletContext(), j.getRootDir(), j.getPluginManager().uberClassLoader).run();
     }
 }
diff --git a/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java b/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java
index c305e9a6febc..4a8d6ce51900 100644
--- a/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java
+++ b/core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java
@@ -2,22 +2,22 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.init.Initializer;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.kohsuke.MetaInfServices;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.UncaughtExceptionFilter;
 import org.kohsuke.stapler.WebApp;
 
@@ -30,7 +30,7 @@ public class InstallUncaughtExceptionHandler {
 
     @Initializer
     public static void init(final Jenkins j) throws IOException {
-        UncaughtExceptionFilter.setUncaughtExceptionHandler(j.servletContext, (e, context, req, rsp) -> handleException(j, e, req, rsp, 500));
+        UncaughtExceptionFilter.setUncaughtExceptionHandler(j.getServletContext(), (e, context, req, rsp) -> handleException(j, e, req, rsp, 500));
         try {
             Thread.setDefaultUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler());
             LOGGER.log(Level.FINE, "Successfully installed a global UncaughtExceptionHandler.");
@@ -53,10 +53,10 @@ private static void handleException(Jenkins j, Throwable e, HttpServletRequest r
         String id = UUID.randomUUID().toString();
         LOGGER.log(isEOFException(e) ? Level.FINE : Level.WARNING, "Caught unhandled exception with ID " + id, e);
         req.setAttribute("jenkins.exception.id", id);
-        req.setAttribute("javax.servlet.error.exception", e);
+        req.setAttribute("jakarta.servlet.error.exception", e);
         rsp.setStatus(code);
         try {
-            WebApp.get(j.servletContext).getSomeStapler().invoke(req, rsp, j, "/oops");
+            WebApp.get(j.getServletContext()).getSomeStapler().invoke(req, rsp, j, "/oops");
         } catch (ServletException | IOException x) {
             if (!Stapler.isSocketException(x)) {
                 throw x;
@@ -75,7 +75,7 @@ public HttpResponses.HttpResponseException handleError(int code, Throwable cause
             }
             return new HttpResponses.HttpResponseException(cause) {
                 @Override
-                public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+                public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
                     handleException(Jenkins.get(), cause, req, rsp, code);
                 }
             };
diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
index 875a3e4ef7e0..c54a90d1c576 100644
--- a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
+++ b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
@@ -35,6 +35,7 @@
 import hudson.model.TaskListener;
 import hudson.util.StreamTaskListener;
 import hudson.util.jna.DotNet;
+import jakarta.servlet.ServletException;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -43,7 +44,6 @@
 import java.nio.file.Files;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 import org.apache.commons.io.FileUtils;
@@ -52,8 +52,8 @@
 import org.apache.tools.ant.taskdefs.Move;
 import org.apache.tools.ant.types.FileSet;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -116,7 +116,7 @@ public boolean isInstalled() {
      * Performs installation.
      */
     @RequirePOST
-    public void doDoInstall(StaplerRequest req, StaplerResponse rsp, @QueryParameter("dir") String _dir) throws IOException, ServletException {
+    public void doDoInstall(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter("dir") String _dir) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         if (installationDir != null) {
@@ -168,7 +168,7 @@ public void doDoInstall(StaplerRequest req, StaplerResponse rsp, @QueryParameter
     /**
      * Copies a single resource into the target folder, by the given name, and handle errors gracefully.
      */
-    private void copy(StaplerRequest req, StaplerResponse rsp, File dir, URL src, String name) throws ServletException, IOException {
+    private void copy(StaplerRequest2 req, StaplerResponse2 rsp, File dir, URL src, String name) throws ServletException, IOException {
         try {
             FileUtils.copyURLToFile(src, new File(dir, name));
         } catch (IOException e) {
@@ -179,7 +179,7 @@ private void copy(StaplerRequest req, StaplerResponse rsp, File dir, URL src, St
     }
 
     @RequirePOST
-    public void doRestart(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRestart(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         if (installationDir == null) {
@@ -250,11 +250,11 @@ private DefaultLogger createLogger() {
     /**
      * Displays the error in a page.
      */
-    protected final void sendError(Exception e, StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
+    protected final void sendError(Exception e, StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
         sendError(e.getMessage(), req, rsp);
     }
 
-    protected final void sendError(String message, StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
+    protected final void sendError(String message, StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
         req.setAttribute("message", message);
         req.setAttribute("pre", true);
         rsp.forward(Jenkins.get(), "error", req);
diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java
index 86aea6575048..ad4c40028547 100644
--- a/core/src/main/java/hudson/logging/LogRecorder.java
+++ b/core/src/main/java/hudson/logging/LogRecorder.java
@@ -48,6 +48,7 @@
 import hudson.util.HttpResponses;
 import hudson.util.RingBufferLogHandler;
 import hudson.util.XStream2;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
@@ -71,7 +72,6 @@
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.model.Loadable;
 import jenkins.security.MasterToSlaveCallable;
@@ -82,8 +82,8 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
 
@@ -439,7 +439,7 @@ public LogRecorderManager getParent() {
      * Accepts submission from the configuration page.
      */
     @POST
-    public synchronized void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         JSONObject src = req.getSubmittedForm();
@@ -536,7 +536,7 @@ public int hashCode() {
      * Deletes this recorder, then go back to the parent.
      */
     @RequirePOST
-    public synchronized void doDoDelete(StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doDoDelete(StaplerResponse2 rsp) throws IOException, ServletException {
         delete();
         rsp.sendRedirect2("..");
     }
@@ -562,7 +562,7 @@ public void delete() throws IOException {
     /**
      * RSS feed for log entries.
      */
-    public void doRss(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRss(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         LogRecorderManager.doRss(req, rsp, getLogRecords());
     }
 
diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java
index 70856024df12..2c589adaa612 100644
--- a/core/src/main/java/hudson/logging/LogRecorderManager.java
+++ b/core/src/main/java/hudson/logging/LogRecorderManager.java
@@ -38,6 +38,7 @@
 import hudson.model.RSS;
 import hudson.util.CopyOnWriteMap;
 import hudson.util.FormValidation;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
@@ -53,7 +54,6 @@
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.model.JenkinsLocationConfiguration;
 import jenkins.model.ModelObjectWithChildren;
@@ -68,8 +68,8 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -188,7 +188,7 @@ public FormValidation doCheckNewName(@QueryParameter String name) {
     }
 
     @Override
-    public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    public ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         ContextMenu menu = new ContextMenu();
         menu.add("all", "All Jenkins Logs");
         for (LogRecorder lr : recorders) {
@@ -225,14 +225,14 @@ public HttpResponse doConfigLogger(@QueryParameter String name, @QueryParameter
     /**
      * RSS feed for log entries.
      */
-    public void doRss(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRss(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         doRss(req, rsp, Jenkins.logRecords);
     }
 
     /**
      * Renders the given log recorders as RSS.
      */
-    /*package*/ static void doRss(StaplerRequest req, StaplerResponse rsp, List<LogRecord> logs) throws IOException, ServletException {
+    /*package*/ static void doRss(StaplerRequest2 req, StaplerResponse2 rsp, List<LogRecord> logs) throws IOException, ServletException {
         // filter log records based on the log level
         String entryType = "all";
         String level = req.getParameter("level");
diff --git a/core/src/main/java/hudson/markup/MarkupFormatter.java b/core/src/main/java/hudson/markup/MarkupFormatter.java
index e588e0cfcc8e..a3bf53a739a1 100644
--- a/core/src/main/java/hudson/markup/MarkupFormatter.java
+++ b/core/src/main/java/hudson/markup/MarkupFormatter.java
@@ -28,6 +28,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.ExtensionPoint;
 import hudson.model.AbstractDescribableImpl;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -44,7 +45,8 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.verb.GET;
 import org.kohsuke.stapler.verb.POST;
@@ -138,7 +140,7 @@ public HttpResponse doPreviewDescription(@QueryParameter String text) throws IOE
     @GET
     @WebMethod(name = "previewDescription")
     @Restricted(NoExternalUse.class)
-    public HttpResponse previewsNowNeedPostForSecurity2153(@QueryParameter String text, StaplerRequest req) throws IOException {
+    public HttpResponse previewsNowNeedPostForSecurity2153(@QueryParameter String text, StaplerRequest2 req) throws IOException {
         LOGGER.log(Level.FINE, "Received a GET request at " + req.getRequestURL());
         if (PREVIEWS_ALLOW_GET) {
             return doPreviewDescription(text);
@@ -155,15 +157,18 @@ public HttpResponse previewsNowNeedPostForSecurity2153(@QueryParameter String te
      */
     private static HttpResponse html(int status, @NonNull String html, @NonNull Map<String, String> headers) {
         // TODO Move to Stapler's HttpResponses, (also add a corresponding 'text' method)
-        return (req, rsp, node) -> {
-            rsp.setContentType("text/html;charset=UTF-8");
-            rsp.setStatus(status);
-            for (Map.Entry<String, String> header : headers.entrySet()) {
-                rsp.setHeader(header.getKey(), header.getValue());
+        return new HttpResponse() {
+            @Override
+            public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
+                rsp.setContentType("text/html;charset=UTF-8");
+                rsp.setStatus(status);
+                for (Map.Entry<String, String> header : headers.entrySet()) {
+                    rsp.setHeader(header.getKey(), header.getValue());
+                }
+                PrintWriter pw = rsp.getWriter();
+                pw.print(html);
+                pw.flush();
             }
-            PrintWriter pw = rsp.getWriter();
-            pw.print(html);
-            pw.flush();
         };
     }
 }
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 85d62df78896..d993d722eacb 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -62,6 +62,8 @@
 import hudson.util.HttpResponses;
 import hudson.util.Iterators;
 import hudson.util.VariableResolver;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -81,7 +83,6 @@
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.model.lazy.BuildReference;
 import jenkins.model.lazy.LazyBuildMixIn;
@@ -275,7 +276,7 @@ public Queue.Executable getParentExecutable() {
      */
     @Deprecated(since = "2.364")
     public String getUpUrl() {
-        return Functions.getNearestAncestorUrl(Stapler.getCurrentRequest(), getParent()) + '/';
+        return Functions.getNearestAncestorUrl(Stapler.getCurrentRequest2(), getParent()) + '/';
     }
 
     /**
@@ -1391,8 +1392,12 @@ public List<AbstractBuild> getBuilds() {
      */
     @Deprecated
     @RequirePOST // #doStop() should be preferred, but better to be safe
-    public void doStop(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
-        doStop().generateResponse(req, rsp, this);
+    public void doStop(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doStop().generateResponse(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), this);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index adebec8f289f..af64ff19df34 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -25,7 +25,7 @@
 
 package hudson.model;
 
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -47,6 +47,8 @@
 import hudson.util.FormValidation;
 import hudson.util.IOUtils;
 import hudson.util.Secret;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -59,7 +61,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.ServletException;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.sax.SAXSource;
@@ -70,6 +71,7 @@
 import jenkins.model.Loadable;
 import jenkins.model.queue.ItemDeletion;
 import jenkins.security.NotReallyRoleSensitiveCallable;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.SystemProperties;
 import jenkins.util.xml.XMLUtils;
 import org.apache.tools.ant.Project;
@@ -87,7 +89,9 @@
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -530,7 +534,7 @@ public void onCopiedFrom(Item src) {
     @Override
     public final String getUrl() {
         // try to stick to the current view if possible
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         String shortUrl = getShortUrl();
         String uri = req == null ? null : req.getRequestURI();
         if (req != null) {
@@ -644,9 +648,36 @@ private Object readResolve() {
 
     /**
      * Accepts the new description.
+     *
+     * @since TODO
      */
     @RequirePOST
-    public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(AbstractItem.class, getClass(), "doSubmitDescription", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doSubmitDescription(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doSubmitDescriptionImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doSubmitDescription(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doSubmitDescriptionImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void doSubmitDescriptionImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         checkPermission(CONFIGURE);
 
         setDescription(req.getParameter("description"));
@@ -658,9 +689,32 @@ public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse
      * Note on the funny name: for reasons of historical compatibility, this URL is {@code /doDelete}
      * since it predates {@code <l:confirmationLink>}. {@code /delete} goes to a Jelly page
      * which should now be unused by core but is left in case plugins are still using it.
+     *
+     * @since TODO
      */
     @RequirePOST
-    public void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
+    public void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException {
+        if (Util.isOverridden(AbstractItem.class, getClass(), "doDoDelete", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doDoDelete(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doDoDeleteImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doDoDelete(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException, InterruptedException {
+        doDoDeleteImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private void doDoDeleteImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, InterruptedException {
         delete();
         if (req == null || rsp == null) { // CLI
             return;
@@ -681,8 +735,28 @@ public void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOExcepti
         rsp.sendRedirect2(req.getContextPath() + '/' + url);
     }
 
+    /**
+     * @since TODO
+     */
     @Override
-    public void delete(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void delete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        deleteImpl(rsp);
+    }
+
+    /**
+     * @deprecated use {@link #delete(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @Override
+    public void delete(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            deleteImpl(StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void deleteImpl(StaplerResponse2 rsp) throws IOException, ServletException {
         try {
             delete();
             rsp.setStatus(204);
@@ -755,10 +829,31 @@ protected void performDelete() throws IOException, InterruptedException {
 
     /**
      * Accepts {@code config.xml} submission, as well as serve it.
+     *
+     * @since TODO
      */
     @WebMethod(name = "config.xml")
+    public void doConfigDotXml(StaplerRequest2 req, StaplerResponse2 rsp)
+            throws IOException {
+        if (Util.isOverridden(AbstractItem.class, getClass(), "doConfigDotXml", StaplerRequest.class, StaplerResponse.class)) {
+            doConfigDotXml(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+        } else {
+            doConfigDotXmlImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doConfigDotXml(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
     public void doConfigDotXml(StaplerRequest req, StaplerResponse rsp)
             throws IOException {
+        doConfigDotXmlImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private void doConfigDotXmlImpl(StaplerRequest2 req, StaplerResponse2 rsp)
+            throws IOException {
         if (req.getMethod().equals("GET")) {
             // read
             rsp.setContentType("application/xml");
diff --git a/core/src/main/java/hudson/model/AbstractModelObject.java b/core/src/main/java/hudson/model/AbstractModelObject.java
index f6c7104f8e42..87b42527a86e 100644
--- a/core/src/main/java/hudson/model/AbstractModelObject.java
+++ b/core/src/main/java/hudson/model/AbstractModelObject.java
@@ -29,11 +29,14 @@
 import hudson.search.SearchIndex;
 import hudson.search.SearchIndexBuilder;
 import hudson.search.SearchableModelObject;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -45,33 +48,69 @@ public abstract class AbstractModelObject implements SearchableModelObject {
     /**
      * Displays the error in a page.
      */
-    protected final void sendError(Exception e, StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
+    protected final void sendError(Exception e, StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
         req.setAttribute("exception", e);
         sendError(e.getMessage(), req, rsp);
     }
 
+    /**
+     * @deprecated use {@link #sendError(Exception, StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    protected final void sendError(Exception e, StaplerRequest req, StaplerResponse rsp) throws javax.servlet.ServletException, IOException {
+        try {
+            sendError(e, StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException ex) {
+            throw ServletExceptionWrapper.fromJakartaServletException(ex);
+        }
+    }
+
     protected final void sendError(Exception e) throws ServletException, IOException {
-        sendError(e, Stapler.getCurrentRequest(), Stapler.getCurrentResponse());
+        sendError(e, Stapler.getCurrentRequest2(), Stapler.getCurrentResponse2());
     }
 
-    protected final void sendError(String message, StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
+    protected final void sendError(String message, StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
         req.setAttribute("message", message);
         rsp.forward(this, "error", req);
     }
 
+    /**
+     * @deprecated use {@link #sendError(String, StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    protected final void sendError(String message, StaplerRequest req, StaplerResponse rsp) throws javax.servlet.ServletException, IOException {
+        try {
+            sendError(message, StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * @param pre
      *      If true, the message is put in a PRE tag.
      */
-    protected final void sendError(String message, StaplerRequest req, StaplerResponse rsp, boolean pre) throws ServletException, IOException {
+    protected final void sendError(String message, StaplerRequest2 req, StaplerResponse2 rsp, boolean pre) throws ServletException, IOException {
         req.setAttribute("message", message);
         if (pre)
             req.setAttribute("pre", true);
         rsp.forward(this, "error", req);
     }
 
+    /**
+     * @deprecated use {@link #sendError(String, StaplerRequest2, StaplerResponse2, boolean)}
+     */
+    @Deprecated
+    protected final void sendError(String message, StaplerRequest req, StaplerResponse rsp, boolean pre) throws javax.servlet.ServletException, IOException {
+        try {
+            sendError(message, StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), pre);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     protected final void sendError(String message) throws ServletException, IOException {
-        sendError(message, Stapler.getCurrentRequest(), Stapler.getCurrentResponse());
+        sendError(message, Stapler.getCurrentRequest2(), Stapler.getCurrentResponse2());
     }
 
     /**
@@ -82,7 +121,7 @@ protected final void sendError(String message) throws ServletException, IOExcept
      */
     @Deprecated
     protected final void requirePOST() throws ServletException {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req == null)  return; // invoked outside the context of servlet
         String method = req.getMethod();
         if (!method.equalsIgnoreCase("POST"))
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index 917ff1f7b81f..a380943687f7 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -77,6 +77,8 @@
 import hudson.util.AlternativeUiTextProvider.Message;
 import hudson.util.DescribableList;
 import hudson.util.FormValidation;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -96,7 +98,6 @@
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.BlockedBecauseOfBuildInProgress;
 import jenkins.model.Jenkins;
 import jenkins.model.ParameterizedJobMixIn;
@@ -120,7 +121,9 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
@@ -769,7 +772,7 @@ public List<ProminentProjectAction> getProminentActions() {
 
     @Override
     @POST
-    public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         super.doConfigSubmit(req, rsp);
 
         updateTransientActions();
@@ -1726,10 +1729,14 @@ protected SearchIndexBuilder makeSearchIndex() {
 //
 //
 
-    /** @deprecated use {@link #doBuild(StaplerRequest, StaplerResponse, TimeDuration)} */
+    /** @deprecated use {@link #doBuild(StaplerRequest2, StaplerResponse2, TimeDuration)} */
     @Deprecated
-    public void doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
-        doBuild(req, rsp, TimeDuration.fromString(req.getParameter("delay")));
+    public void doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doBuild(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), TimeDuration.fromString(req.getParameter("delay")));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
     }
 
     /**
@@ -1739,7 +1746,7 @@ public void doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException,
      *      Inject {@link TimeDuration}.
      */
     @Deprecated
-    public int getDelay(StaplerRequest req) throws ServletException {
+    public int getDelay(StaplerRequest req) throws javax.servlet.ServletException {
         String delay = req.getParameter("delay");
         if (delay == null)    return getQuietPeriod();
 
@@ -1749,26 +1756,59 @@ public int getDelay(StaplerRequest req) throws ServletException {
             if (delay.endsWith("secs"))  delay = delay.substring(0, delay.length() - 4);
             return Integer.parseInt(delay);
         } catch (NumberFormatException e) {
-            throw new ServletException("Invalid delay parameter value: " + delay, e);
+            throw new javax.servlet.ServletException("Invalid delay parameter value: " + delay, e);
         }
     }
 
-    /** @deprecated use {@link #doBuildWithParameters(StaplerRequest, StaplerResponse, TimeDuration)} */
+    /** @deprecated use {@link #doBuildWithParameters(StaplerRequest2, StaplerResponse2, TimeDuration)} */
     @Deprecated
-    public void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
-        doBuildWithParameters(req, rsp, TimeDuration.fromString(req.getParameter("delay")));
+    public void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doBuildWithParameters(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), TimeDuration.fromString(req.getParameter("delay")));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
     }
 
     @Override // in case schedulePolling was overridden
-    public void doPolling(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doPolling(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         BuildAuthorizationToken.checkPermission((Job) this, authToken, req, rsp);
         schedulePolling();
         rsp.sendRedirect(".");
     }
 
+    /**
+     * @since TODO
+     */
+    @Override
+    protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
+        if (Util.isOverridden(AbstractProject.class, getClass(), "submit", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            super.submit(req, rsp);
+            submitImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
     @Override
-    protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException, FormException {
         super.submit(req, rsp);
+        try {
+            submitImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void submitImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         JSONObject json = req.getSubmittedForm();
 
         makeDisabled(!json.optBoolean("enable"));
@@ -1835,14 +1875,18 @@ protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
 
     /**
      * @deprecated
-     *      As of 1.261. Use {@link #buildDescribable(StaplerRequest, List)} instead.
+     *      As of 1.261. Use {@link #buildDescribable(StaplerRequest2, List)} instead.
      */
     @Deprecated
-    protected final <T extends Describable<T>> List<T> buildDescribable(StaplerRequest req, List<? extends Descriptor<T>> descriptors, String prefix) throws FormException, ServletException {
-        return buildDescribable(req, descriptors);
+    protected final <T extends Describable<T>> List<T> buildDescribable(StaplerRequest req, List<? extends Descriptor<T>> descriptors, String prefix) throws FormException, javax.servlet.ServletException {
+        try {
+            return buildDescribable(StaplerRequest.toStaplerRequest2(req), descriptors);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
     }
 
-    protected final <T extends Describable<T>> List<T> buildDescribable(StaplerRequest req, List<? extends Descriptor<T>> descriptors)
+    protected final <T extends Describable<T>> List<T> buildDescribable(StaplerRequest2 req, List<? extends Descriptor<T>> descriptors)
         throws FormException, ServletException {
 
         JSONObject data = req.getSubmittedForm();
@@ -1860,7 +1904,7 @@ protected final <T extends Describable<T>> List<T> buildDescribable(StaplerReque
     /**
      * Serves the workspace files.
      */
-    public DirectoryBrowserSupport doWs(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
+    public DirectoryBrowserSupport doWs(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException {
         checkPermission(Item.WORKSPACE);
         FilePath ws = getSomeWorkspace();
         if (ws == null || !ws.exists()) {
@@ -1887,7 +1931,7 @@ public DirectoryBrowserSupport doWs(StaplerRequest req, StaplerResponse rsp) thr
      * Wipes out the workspace.
      */
     @RequirePOST
-    public HttpResponse doDoWipeOutWorkspace() throws IOException, ServletException, InterruptedException {
+    public HttpResponse doDoWipeOutWorkspace() throws IOException, InterruptedException {
         checkPermission(Functions.isWipeOutPermissionEnabled() ? WIPEOUT : BUILD);
         R b = getSomeBuildWithWorkspace();
         FilePath ws = b != null ? b.getWorkspace() : null;
diff --git a/core/src/main/java/hudson/model/Actionable.java b/core/src/main/java/hudson/model/Actionable.java
index 7e3e695d9c4f..d8088319021b 100644
--- a/core/src/main/java/hudson/model/Actionable.java
+++ b/core/src/main/java/hudson/model/Actionable.java
@@ -37,8 +37,11 @@
 import java.util.logging.Logger;
 import jenkins.model.ModelObjectWithContextMenu;
 import jenkins.model.TransientActionFactory;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
@@ -338,7 +341,26 @@ public <T extends Action> T getAction(Class<T> type) {
         return null;
     }
 
+    /**
+     * @since TODO
+     */
+    public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
+        if (Util.isOverridden(Actionable.class, getClass(), "getDynamic", String.class, StaplerRequest.class, StaplerResponse.class)) {
+            return getDynamic(token, StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+        } else {
+            return getDynamicImpl(token, req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #getDynamic(String, StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
     public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
+        return getDynamicImpl(token, StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private Object getDynamicImpl(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
         for (Action a : getAllActions()) {
             if (a == null)
                 continue;   // be defensive
@@ -351,7 +373,29 @@ public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp)
         return null;
     }
 
-    @Override public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    /**
+     * @since TODO
+     */
+    @Override
+    public ContextMenu doContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
+        if (Util.isOverridden(Actionable.class, getClass(), "doContextMenu", StaplerRequest.class, StaplerResponse.class)) {
+            return doContextMenu(StaplerRequest.fromStaplerRequest2(request), StaplerResponse.fromStaplerResponse2(response));
+        } else {
+            return doContextMenuImpl(request, response);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doContextMenu(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    @Override
+    public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+        return doContextMenuImpl(StaplerRequest.toStaplerRequest2(request), StaplerResponse.toStaplerResponse2(response));
+    }
+
+    private ContextMenu doContextMenuImpl(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         return new ContextMenu().from(this, request, response);
     }
 
diff --git a/core/src/main/java/hudson/model/AdministrativeMonitor.java b/core/src/main/java/hudson/model/AdministrativeMonitor.java
index bdbfb48027d3..59518ba79e57 100644
--- a/core/src/main/java/hudson/model/AdministrativeMonitor.java
+++ b/core/src/main/java/hudson/model/AdministrativeMonitor.java
@@ -37,8 +37,8 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -175,7 +175,7 @@ public boolean isSecurity() {
      * URL binding to disable this monitor.
      */
     @RequirePOST
-    public void doDisable(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doDisable(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         disable(true);
         rsp.sendRedirect2(req.getContextPath() + "/manage");
@@ -188,7 +188,7 @@ public void doDisable(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
      *     Changing this permission check to return {@link Jenkins#SYSTEM_READ} will make the active
      *     administrative monitor appear on {@code manage.jelly} and on the globally visible
      *     {@link jenkins.management.AdministrativeMonitorsDecorator} to users without Administer permission.
-     *     {@link #doDisable(StaplerRequest, StaplerResponse)} will still always require Administer permission.
+     *     {@link #doDisable(StaplerRequest2, StaplerResponse2)} will still always require Administer permission.
      * </p>
      * <p>
      *     This method only allows for a single permission to be returned. If more complex permission checks are required,
diff --git a/core/src/main/java/hudson/model/AllView.java b/core/src/main/java/hudson/model/AllView.java
index ca1ef0d5cc0d..3972625ea7ab 100644
--- a/core/src/main/java/hudson/model/AllView.java
+++ b/core/src/main/java/hudson/model/AllView.java
@@ -26,7 +26,10 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import hudson.Util;
 import hudson.model.Descriptor.FormException;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
@@ -34,12 +37,12 @@
 import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.util.SystemProperties;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -91,7 +94,7 @@ public String getDisplayName() {
 
     @RequirePOST
     @Override
-    public Item doCreateItem(StaplerRequest req, StaplerResponse rsp)
+    public Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException, ServletException {
         ItemGroup<? extends TopLevelItem> ig = getOwner().getItemGroup();
         if (ig instanceof ModifiableItemGroup)
@@ -110,7 +113,24 @@ public String getPostConstructLandingPage() {
     }
 
     @Override
-    protected void submit(StaplerRequest req) throws IOException, ServletException, FormException {
+    protected void submit(StaplerRequest2 req) throws IOException, ServletException, FormException {
+        if (Util.isOverridden(AllView.class, getClass(), "submit", StaplerRequest.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            // noop
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2)}
+     */
+    @Deprecated
+    @Override
+    protected void submit(StaplerRequest req) throws IOException, javax.servlet.ServletException, FormException {
         // noop
     }
 
diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java
index 23e72072112f..4b16e1b0b540 100644
--- a/core/src/main/java/hudson/model/Api.java
+++ b/core/src/main/java/hudson/model/Api.java
@@ -25,6 +25,10 @@
 package hudson.model;
 
 import hudson.ExtensionList;
+import hudson.Util;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
@@ -34,11 +38,10 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.stream.StreamResult;
 import jenkins.model.Jenkins;
 import jenkins.security.SecureRequester;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.xml.FilteredFunctionContext;
 import org.dom4j.CharacterData;
 import org.dom4j.Document;
@@ -52,7 +55,9 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.Flavor;
 import org.kohsuke.stapler.export.Model;
@@ -96,7 +101,7 @@ public String getSearchUrl() {
     /**
      * Exposes the bean as XML.
      */
-    public void doXml(StaplerRequest req, StaplerResponse rsp,
+    public void doXml(StaplerRequest2 req, StaplerResponse2 rsp,
                       @QueryParameter String xpath,
                       @QueryParameter String wrapper,
                       @QueryParameter String tree,
@@ -212,7 +217,7 @@ private boolean isSimpleOutput(Object result) {
     /**
      * Generate schema.
      */
-    public void doSchema(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doSchema(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         setHeaders(rsp);
         rsp.setContentType("application/xml");
         StreamResult r = new StreamResult(rsp.getOutputStream());
@@ -223,7 +228,32 @@ public void doSchema(StaplerRequest req, StaplerResponse rsp) throws IOException
     /**
      * Exposes the bean as JSON.
      */
-    public void doJson(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doJson(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(Api.class, getClass(), "doJson", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doJson(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doJsonImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doJson(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doJson(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doJsonImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void doJsonImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         if (req.getParameter("jsonp") == null || permit(req)) {
             setHeaders(rsp);
             rsp.serveExposedBean(req, bean, req.getParameter("jsonp") == null ? Flavor.JSON : Flavor.JSONP);
@@ -235,12 +265,37 @@ public void doJson(StaplerRequest req, StaplerResponse rsp) throws IOException,
     /**
      * Exposes the bean as Python literal.
      */
-    public void doPython(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doPython(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(Api.class, getClass(), "doPython", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doPython(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doPythonImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doPython(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doPython(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doPythonImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void doPythonImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         setHeaders(rsp);
         rsp.serveExposedBean(req, bean, Flavor.PYTHON);
     }
 
-    private boolean permit(StaplerRequest req) {
+    private boolean permit(StaplerRequest2 req) {
         for (SecureRequester r : ExtensionList.lookup(SecureRequester.class)) {
             if (r.permit(req, bean)) {
                 return true;
@@ -250,7 +305,7 @@ private boolean permit(StaplerRequest req) {
     }
 
     @Restricted(NoExternalUse.class)
-    protected void setHeaders(StaplerResponse rsp) {
+    protected void setHeaders(StaplerResponse2 rsp) {
         rsp.setHeader("X-Jenkins", Jenkins.VERSION);
         rsp.setHeader("X-Jenkins-Session", Jenkins.SESSION_HASH);
         // to be really defensive against dumb browsers not taking into consideration the content-type being set
diff --git a/core/src/main/java/hudson/model/AutoCompletionCandidates.java b/core/src/main/java/hudson/model/AutoCompletionCandidates.java
index d2f5f17c255f..366f626e3144 100644
--- a/core/src/main/java/hudson/model/AutoCompletionCandidates.java
+++ b/core/src/main/java/hudson/model/AutoCompletionCandidates.java
@@ -28,16 +28,16 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.search.Search;
 import hudson.search.UserSearchProperty;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Flavor;
 
 /**
@@ -69,7 +69,7 @@ public List<String> getValues() {
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object o) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object o) throws IOException, ServletException {
         Search.Result r = new Search.Result();
         for (String value : values) {
             r.suggestions.add(new hudson.search.Search.Item(value));
diff --git a/core/src/main/java/hudson/model/BallColor.java b/core/src/main/java/hudson/model/BallColor.java
index 5913f59466f9..3e8dc2f28802 100644
--- a/core/src/main/java/hudson/model/BallColor.java
+++ b/core/src/main/java/hudson/model/BallColor.java
@@ -113,7 +113,7 @@ public String getImage() {
 
     @Override
     public String getImageOf(String size) {
-        return Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH + "/images/" + size + '/' + image;
+        return Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH + "/images/" + size + '/' + image;
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/BooleanParameterDefinition.java b/core/src/main/java/hudson/model/BooleanParameterDefinition.java
index 6e9db32216fd..6bf1a50096e3 100644
--- a/core/src/main/java/hudson/model/BooleanParameterDefinition.java
+++ b/core/src/main/java/hudson/model/BooleanParameterDefinition.java
@@ -33,7 +33,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * {@link ParameterDefinition} that is either 'true' or 'false'.
@@ -79,7 +79,7 @@ public void setDefaultValue(boolean defaultValue) {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         BooleanParameterValue value = req.bindJSON(BooleanParameterValue.class, jo);
         value.setDescription(getDescription());
         return value;
diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java
index a09ed113e1cf..3611824fb54d 100644
--- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java
+++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java
@@ -27,11 +27,13 @@
 import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter;
 import hudson.Util;
 import hudson.security.ACL;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.access.AccessDeniedException;
 
 /**
@@ -51,7 +53,10 @@ public BuildAuthorizationToken(String token) {
         this.token = token;
     }
 
-    public static BuildAuthorizationToken create(StaplerRequest req) {
+    /**
+     * @since TODO
+     */
+    public static BuildAuthorizationToken create(StaplerRequest2 req) {
         if (req.getParameter("pseudoRemoteTrigger") != null) {
             String token = Util.fixEmpty(req.getParameter("authToken"));
             if (token != null)
@@ -61,11 +66,22 @@ public static BuildAuthorizationToken create(StaplerRequest req) {
         return null;
     }
 
+    /**
+     * @deprecated use {@link #create(StaplerRequest2)}
+     */
+    @Deprecated
+    public static BuildAuthorizationToken create(StaplerRequest req) {
+        return create(StaplerRequest.toStaplerRequest2(req));
+    }
+
     @Deprecated public static void checkPermission(AbstractProject<?, ?> project, BuildAuthorizationToken token, StaplerRequest req, StaplerResponse rsp) throws IOException {
-        checkPermission((Job<?, ?>) project, token, req, rsp);
+        checkPermission((Job<?, ?>) project, token, StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
     }
 
-    public static void checkPermission(Job<?, ?> project, BuildAuthorizationToken token, StaplerRequest req, StaplerResponse rsp) throws IOException {
+    /**
+     * @since TODO
+     */
+    public static void checkPermission(Job<?, ?> project, BuildAuthorizationToken token, StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (token != null && token.token != null) {
             //check the provided token
             String providedToken = req.getParameter("token");
@@ -86,6 +102,14 @@ public static void checkPermission(Job<?, ?> project, BuildAuthorizationToken to
         throw HttpResponses.forwardToView(project, "requirePOST.jelly");
     }
 
+    /**
+     * @deprecated use {@link #checkPermission(Job, BuildAuthorizationToken, StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    public static void checkPermission(Job<?, ?> project, BuildAuthorizationToken token, StaplerRequest req, StaplerResponse rsp) throws IOException {
+        checkPermission(project, token, StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
     public String getToken() {
         return token;
     }
diff --git a/core/src/main/java/hudson/model/BuildTimelineWidget.java b/core/src/main/java/hudson/model/BuildTimelineWidget.java
index 9691969162d4..4f5ccbf1c67a 100644
--- a/core/src/main/java/hudson/model/BuildTimelineWidget.java
+++ b/core/src/main/java/hudson/model/BuildTimelineWidget.java
@@ -25,12 +25,15 @@
 package hudson.model;
 
 import hudson.util.RunList;
+import jakarta.servlet.ServletException;
+import java.io.IOException;
 import java.util.ArrayList;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * UI widget for showing the SIMILE timeline control.
@@ -60,12 +63,15 @@ public BuildTimelineWidget(RunList<?> builds) {
         return builds.getLastBuild();
     }
 
-    public HttpResponse doData(StaplerRequest req, @QueryParameter long min, @QueryParameter long max) {
-        return (req1, rsp, node) -> {
-            JSONObject o = new JSONObject();
-            o.put("events", JSONArray.fromObject(new ArrayList<>()));
-            rsp.setContentType("text/javascript;charset=UTF-8");
-            o.write(rsp.getWriter());
+    public HttpResponse doData(StaplerRequest2 req, @QueryParameter long min, @QueryParameter long max) {
+        return new HttpResponse() {
+            @Override
+            public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
+                JSONObject o = new JSONObject();
+                o.put("events", JSONArray.fromObject(new ArrayList<>()));
+                rsp.setContentType("text/javascript;charset=UTF-8");
+                o.write(rsp.getWriter());
+            }
         };
     }
 
diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
index 7b12a9b2cee3..98bdcf2e8072 100644
--- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
@@ -20,7 +20,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 
 /**
@@ -152,7 +152,7 @@ public boolean isValid(ParameterValue value) {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         StringParameterValue value = req.bindJSON(StringParameterValue.class, jo);
         value.setDescription(getDescription());
         checkValue(value, value.getValue());
@@ -218,7 +218,7 @@ public String getHelpFile() {
         /*
          * We need this for JENKINS-26143 -- reflective creation cannot handle setChoices(Object). See that method for context.
          */
-        public ParameterDefinition newInstance(@Nullable StaplerRequest req, @NonNull JSONObject formData) throws FormException {
+        public ParameterDefinition newInstance(@Nullable StaplerRequest2 req, @NonNull JSONObject formData) throws FormException {
             String name = formData.getString("name");
             String desc = formData.getString("description");
             String choiceText = formData.getString("choices");
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 14a311381a37..a4878a2c8f91 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -26,7 +26,7 @@
 
 package hudson.model;
 
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -73,6 +73,7 @@
 import hudson.util.RemotingDiagnostics;
 import hudson.util.RemotingDiagnostics.HeapDump;
 import hudson.util.RunList;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -105,7 +106,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.security.ImpersonatingExecutorService;
 import jenkins.security.MasterToSlaveCallable;
@@ -129,8 +129,8 @@
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -227,7 +227,7 @@
      * @since 1.607
      */
     public void recordTermination() {
-        StaplerRequest request = Stapler.getCurrentRequest();
+        StaplerRequest2 request = Stapler.getCurrentRequest2();
         if (request != null) {
             terminatedBy.add(new TerminationRequest(
                     String.format("Termination requested at %s by %s [id=%d] from HTTP request for %s",
@@ -416,7 +416,7 @@ public String getOfflineCauseReason() {
     /**
      * If {@link #getChannel()}==null, attempts to relaunch the agent.
      */
-    public abstract void doLaunchSlaveAgent(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException;
+    public abstract void doLaunchSlaveAgent(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException;
 
     /**
      * @deprecated since 2009-01-06.  Use {@link #connect(boolean)}
@@ -427,7 +427,7 @@ public final void launch() {
     }
 
     /**
-     * Do the same as {@link #doLaunchSlaveAgent(StaplerRequest, StaplerResponse)}
+     * Do the same as {@link #doLaunchSlaveAgent(StaplerRequest2, StaplerResponse2)}
      * but outside the context of serving a request.
      *
      * <p>
@@ -1391,12 +1391,12 @@ public String call() throws IOException {
 //
 //
     @Restricted(DoNotUse.class)
-    public void doRssAll(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssAll(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (all builds)", getUrl(), getBuilds());
     }
 
     @Restricted(DoNotUse.class)
-    public void doRssFailed(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssFailed(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (failed builds)", getUrl(), getBuilds().failureOnly());
     }
 
@@ -1407,7 +1407,7 @@ public void doRssFailed(StaplerRequest req, StaplerResponse rsp) throws IOExcept
      * @since 2.215
      */
     @Restricted(DoNotUse.class)
-    public void doRssLatest(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssLatest(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         final List<Run> lastBuilds = new ArrayList<>();
         for (AbstractProject<?, ?> p : Jenkins.get().allItems(AbstractProject.class)) {
             if (p.getLastBuild() != null) {
@@ -1452,7 +1452,7 @@ public Api getApi() {
     /**
      * Dumps the contents of the export table.
      */
-    public void doDumpExportTable(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
+    public void doDumpExportTable(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException {
         // this is a debug probe and may expose sensitive information
         checkPermission(Jenkins.ADMINISTER);
 
@@ -1488,18 +1488,18 @@ public String call() throws IOException {
      * For system diagnostics.
      * Run arbitrary Groovy script.
      */
-    public void doScript(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doScript(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         _doScript(req, rsp, "_script.jelly");
     }
 
     /**
      * Run arbitrary Groovy script and return result as plain text.
      */
-    public void doScriptText(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doScriptText(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         _doScript(req, rsp, "_scriptText.jelly");
     }
 
-    protected void _doScript(StaplerRequest req, StaplerResponse rsp, String view) throws IOException, ServletException {
+    protected void _doScript(StaplerRequest2 req, StaplerResponse2 rsp, String view) throws IOException, ServletException {
         Jenkins._doScript(req, rsp, req.getView(this, view), getChannel(), getACL());
     }
 
@@ -1507,7 +1507,7 @@ protected void _doScript(StaplerRequest req, StaplerResponse rsp, String view) t
      * Accepts the update to the node configuration.
      */
     @POST
-    public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         checkPermission(CONFIGURE);
 
         String proposedName = Util.fixEmptyAndTrim(req.getSubmittedForm().getString("name"));
@@ -1547,7 +1547,7 @@ public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOExc
      * Accepts {@code config.xml} submission, as well as serve it.
      */
     @WebMethod(name = "config.xml")
-    public void doConfigDotXml(StaplerRequest req, StaplerResponse rsp)
+    public void doConfigDotXml(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException, ServletException {
 
         if (req.getMethod().equals("GET")) {
@@ -1626,7 +1626,7 @@ public void waitUntilOffline() throws InterruptedException {
     /**
      * Handles incremental log.
      */
-    public void doProgressiveLog(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doProgressiveLog(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         getLogText().doProgressText(req, rsp);
     }
 
diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java
index 5cb798978dea..f25d25a19a50 100644
--- a/core/src/main/java/hudson/model/ComputerSet.java
+++ b/core/src/main/java/hudson/model/ComputerSet.java
@@ -41,6 +41,7 @@
 import hudson.util.DescribableList;
 import hudson.util.FormApply;
 import hudson.util.FormValidation;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -52,7 +53,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithChildren;
 import jenkins.model.ModelObjectWithContextMenu.ContextMenu;
@@ -61,8 +61,8 @@
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -112,7 +112,7 @@ public Computer[] get_all() {
     }
 
     @Override
-    public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    public ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         ContextMenu m = new ContextMenu();
         for (Computer c : get_all()) {
             m.add(c);
@@ -206,12 +206,12 @@ public String getSearchUrl() {
         return "/computers/";
     }
 
-    public Computer getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
+    public Computer getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
         return Jenkins.get().getComputer(token);
     }
 
     @RequirePOST
-    public void do_launchAll(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void do_launchAll(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         for (Computer c : get_all()) {
@@ -227,7 +227,7 @@ public void do_launchAll(StaplerRequest req, StaplerResponse rsp) throws IOExcep
      * TODO: ajax on the client side to wait until the update completion might be nice.
      */
     @RequirePOST
-    public void doUpdateNow(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doUpdateNow(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.MANAGE);
 
         for (NodeMonitor nodeMonitor : NodeMonitor.getAll()) {
@@ -244,7 +244,7 @@ public void doUpdateNow(StaplerRequest req, StaplerResponse rsp) throws IOExcept
      * First check point in creating a new agent.
      */
     @RequirePOST
-    public synchronized void doCreateItem(StaplerRequest req, StaplerResponse rsp,
+    public synchronized void doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp,
                                            @QueryParameter String name, @QueryParameter String mode,
                                            @QueryParameter String from) throws IOException, ServletException {
         final Jenkins app = Jenkins.get();
@@ -290,7 +290,7 @@ public synchronized void doCreateItem(StaplerRequest req, StaplerResponse rsp,
      * Really creates a new agent.
      */
     @POST
-    public synchronized void doDoCreateItem(StaplerRequest req, StaplerResponse rsp,
+    public synchronized void doDoCreateItem(StaplerRequest2 req, StaplerResponse2 rsp,
                                            @QueryParameter String name,
                                            @QueryParameter String type) throws IOException, ServletException, FormException {
         final Jenkins app = Jenkins.get();
@@ -348,7 +348,7 @@ public FormValidation doCheckName(@QueryParameter String value) throws IOExcepti
      * Accepts submission from the configuration page.
      */
     @POST
-    public synchronized HttpResponse doConfigSubmit(StaplerRequest req) throws IOException, ServletException, FormException {
+    public synchronized HttpResponse doConfigSubmit(StaplerRequest2 req) throws IOException, ServletException, FormException {
         BulkChange bc = new BulkChange(MONITORS_OWNER);
         try {
             Jenkins.get().checkPermission(Jenkins.MANAGE);
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index b5eb07784d27..e2067bfc6944 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -25,7 +25,7 @@
 package hudson.model;
 
 import static hudson.util.QuotedStringTokenizer.quote;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -45,6 +45,9 @@
 import hudson.util.ReflectionUtils;
 import hudson.util.ReflectionUtils.Parameter;
 import hudson.views.ListViewColumn;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
 import java.beans.Introspector;
 import java.io.File;
 import java.io.IOException;
@@ -71,13 +74,12 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
 import jenkins.model.Loadable;
 import jenkins.security.RedactSecretJsonInErrorMessageSanitizer;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.io.OnMaster;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -92,7 +94,9 @@
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.jelly.JellyCompatibleFacet;
 import org.kohsuke.stapler.lang.Klass;
@@ -382,7 +386,7 @@ public final String getDescriptorFullUrl() {
      * @since 1.402
      */
     public static String getCurrentDescriptorByNameUrl() {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
 
         // this override allows RenderOnDemandClosure to preserve the proper value
         Object url = req.getAttribute("currentDescriptorByNameUrl");
@@ -576,16 +580,33 @@ public T newInstance(StaplerRequest req) throws FormException {
      *
      * @throws FormException
      *      Signals a problem in the submitted form.
+     * @since TODO
+     */
+    public T newInstance(@Nullable StaplerRequest2 req, @NonNull JSONObject formData) throws FormException {
+        if (Util.isOverridden(Descriptor.class, getClass(), "newInstance", StaplerRequest.class, JSONObject.class)) {
+            return newInstance(req != null ? StaplerRequest.fromStaplerRequest2(req) : null, formData);
+        } else {
+            return newInstanceImpl(req, formData);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #newInstance(StaplerRequest2, JSONObject)}
      * @since 1.145
      */
+    @Deprecated
     public T newInstance(@Nullable StaplerRequest req, @NonNull JSONObject formData) throws FormException {
+        return newInstanceImpl(req != null ? StaplerRequest.toStaplerRequest2(req) : null, formData);
+    }
+
+    private T newInstanceImpl(@Nullable StaplerRequest2 req, @NonNull JSONObject formData) throws FormException {
         try {
             Method m = getClass().getMethod("newInstance", StaplerRequest.class);
 
             if (!Modifier.isAbstract(m.getDeclaringClass().getModifiers())) {
                 // this class overrides newInstance(StaplerRequest).
                 // maintain the backward compatible behavior
-                return verifyNewInstance(newInstance(req));
+                return verifyNewInstance(newInstance(StaplerRequest.fromStaplerRequest2(req)));
             } else {
                 if (req == null) {
                     // yes, req is supposed to be always non-null, but see the note above
@@ -602,16 +623,25 @@ public T newInstance(@Nullable StaplerRequest req, @NonNull JSONObject formData)
     }
 
     /**
-     * Replacement for {@link StaplerRequest#bindJSON(Class, JSONObject)} which honors {@link #newInstance(StaplerRequest, JSONObject)}.
-     * This is automatically used inside {@link #newInstance(StaplerRequest, JSONObject)} so a direct call would only be necessary
-     * in case the top level binding might use a {@link Descriptor} which overrides {@link #newInstance(StaplerRequest, JSONObject)}.
+     * Replacement for {@link StaplerRequest2#bindJSON(Class, JSONObject)} which honors {@link #newInstance(StaplerRequest2, JSONObject)}.
+     * This is automatically used inside {@link #newInstance(StaplerRequest2, JSONObject)} so a direct call would only be necessary
+     * in case the top level binding might use a {@link Descriptor} which overrides {@link #newInstance(StaplerRequest2, JSONObject)}.
+     * @since TODO
+     */
+    public static <T> T bindJSON(StaplerRequest2 req, Class<T> type, JSONObject src) {
+        return bindJSON(req, type, src, false);
+    }
+
+    /**
+     * @deprecated use {@link #bindJSON(StaplerRequest2, Class, JSONObject)}
      * @since 2.342
      */
+    @Deprecated
     public static <T> T bindJSON(StaplerRequest req, Class<T> type, JSONObject src) {
-        return bindJSON(req, type, src, false);
+        return bindJSON(StaplerRequest.toStaplerRequest2(req), type, src);
     }
 
-    private static <T> T bindJSON(StaplerRequest req, Class<T> type, JSONObject src, boolean fromNewInstance) {
+    private static <T> T bindJSON(StaplerRequest2 req, Class<T> type, JSONObject src, boolean fromNewInstance) {
         BindInterceptor oldInterceptor = req.getBindInterceptor();
         try {
             NewInstanceBindInterceptor interceptor;
@@ -631,9 +661,9 @@ private static <T> T bindJSON(StaplerRequest req, Class<T> type, JSONObject src,
     }
 
     /**
-     * Ensures that calls to {@link StaplerRequest#bindJSON(Class, JSONObject)} from {@link #newInstance(StaplerRequest, JSONObject)} recurse properly.
+     * Ensures that calls to {@link StaplerRequest2#bindJSON(Class, JSONObject)} from {@link #newInstance(StaplerRequest2, JSONObject)} recurse properly.
      * {@code doConfigSubmit}-like methods will wind up calling {@code newInstance} directly
-     * or via {@link #newInstancesFromHeteroList(StaplerRequest, Object, Collection)},
+     * or via {@link #newInstancesFromHeteroList(StaplerRequest2, Object, Collection)},
      * which consult any custom {@code newInstance} overrides for top-level {@link Describable} objects.
      * But for nested describable objects Stapler would know nothing about {@code newInstance} without this trick.
      */
@@ -671,7 +701,7 @@ public Object instantiate(Class actualType, JSONObject json) {
                 try {
                     final Descriptor descriptor = Jenkins.get().getDescriptor(actualType);
                     if (descriptor != null) {
-                        return descriptor.newInstance(Stapler.getCurrentRequest(), json);
+                        return descriptor.newInstance(Stapler.getCurrentRequest2(), json);
                     } else {
                         LOGGER.log(Level.WARNING, "Descriptor not found. Falling back to default instantiation "
                                 + actualType.getName() + " " + json);
@@ -694,7 +724,7 @@ public Object onConvert(Type targetType, Class targetTypeErasure, Object jsonSou
                 if (isApplicable(targetTypeErasure, json)) {
                     LOGGER.log(Level.FINE, "switching to newInstance {0} {1}", new Object[] {targetTypeErasure.getName(), json});
                     try {
-                        return Jenkins.get().getDescriptor(targetTypeErasure).newInstance(Stapler.getCurrentRequest(), json);
+                        return Jenkins.get().getDescriptor(targetTypeErasure).newInstance(Stapler.getCurrentRequest2(), json);
                     } catch (Exception x) {
                         LOGGER.log(Level.WARNING, "falling back to default instantiation " + targetTypeErasure.getName() + " " + json, x);
                     }
@@ -776,13 +806,13 @@ public String getHelpFile(Klass<?> clazz, String fieldName) {
             }
 
             try {
-                if (Stapler.getCurrentRequest().getView(c, "help" + suffix) != null)
+                if (Stapler.getCurrentRequest2().getView(c, "help" + suffix) != null)
                     return page;
             } catch (IOException e) {
                 throw new Error(e);
             }
 
-            if (getStaticHelpUrl(Stapler.getCurrentRequest(), c, suffix) != null)    return page;
+            if (getStaticHelpUrl(Stapler.getCurrentRequest2(), c, suffix) != null)    return page;
         }
         return null;
     }
@@ -812,7 +842,7 @@ public final boolean isSubTypeOf(Class type) {
 
     /**
      * @deprecated
-     *      As of 1.239, use {@link #configure(StaplerRequest, JSONObject)}.
+     *      As of 1.239, use {@link #configure(StaplerRequest2, JSONObject)}.
      */
     @Deprecated
     public boolean configure(StaplerRequest req) throws FormException {
@@ -829,7 +859,21 @@ public boolean configure(StaplerRequest req) throws FormException {
      *      See <a href="https://www.jenkins.io/doc/developer/forms/structured-form-submission/">the developer documentation</a>.
      * @return false
      *      to keep the client in the same config page.
+     * @since TODO
      */
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
+        if (Util.isOverridden(Descriptor.class, getClass(), "configure", StaplerRequest.class, JSONObject.class)) {
+            return configure(StaplerRequest.fromStaplerRequest2(req), json);
+        } else {
+            // compatibility
+            return configure(StaplerRequest.fromStaplerRequest2(req));
+        }
+    }
+
+    /**
+     * @deprecated use {@link #configure(StaplerRequest2, JSONObject)}
+     */
+    @Deprecated
     public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
         // compatibility
         return configure(req);
@@ -895,7 +939,7 @@ protected final String getViewPage(Class<?> clazz, String pageName) {
 
     protected List<String> getPossibleViewNames(String baseName) {
         List<String> names = new ArrayList<>();
-        for (Facet f : WebApp.get(Jenkins.get().servletContext).facets) {
+        for (Facet f : WebApp.get(Jenkins.get().getServletContext()).facets) {
             if (f instanceof JellyCompatibleFacet jcf) {
                 for (String ext : jcf.getScriptExtensions())
                     names.add(baseName + ext);
@@ -957,7 +1001,32 @@ protected PluginWrapper getPlugin() {
     /**
      * Serves {@code help.html} from the resource of {@link #clazz}.
      */
-    public void doHelp(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doHelp(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(Descriptor.class, getClass(), "doHelp", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doHelp(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doHelpImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doHelp(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doHelp(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doHelpImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void doHelpImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         String path = req.getRestOfPath();
         if (path.contains("..")) throw new ServletException("Illegal path: " + path);
 
@@ -972,13 +1041,13 @@ public void doHelp(StaplerRequest req, StaplerResponse rsp) throws IOException,
         }
 
         for (Klass<?> c = getKlass(); c != null; c = c.getSuperClass()) {
-            RequestDispatcher rd = Stapler.getCurrentRequest().getView(c, "help" + path);
+            RequestDispatcher rd = Stapler.getCurrentRequest2().getView(c, "help" + path);
             if (rd != null) { // template based help page
                 rd.forward(req, rsp);
                 return;
             }
 
-            URL url = getStaticHelpUrl(Stapler.getCurrentRequest(), c, path);
+            URL url = getStaticHelpUrl(Stapler.getCurrentRequest2(), c, path);
             if (url != null) {
                 // TODO: generalize macro expansion and perhaps even support JEXL
                 rsp.setContentType("text/html;charset=UTF-8");
@@ -992,8 +1061,11 @@ public void doHelp(StaplerRequest req, StaplerResponse rsp) throws IOException,
         rsp.sendError(SC_NOT_FOUND);
     }
 
+    /**
+     * @since TODO
+     */
     @Restricted(NoExternalUse.class)
-    public static URL getStaticHelpUrl(StaplerRequest req, Klass<?> c, String suffix) {
+    public static URL getStaticHelpUrl(StaplerRequest2 req, Klass<?> c, String suffix) {
 
         String base = "help" + suffix;
         URL url;
@@ -1017,6 +1089,15 @@ public static URL getStaticHelpUrl(StaplerRequest req, Klass<?> c, String suffix
         return c.getResource(base + ".html");
     }
 
+    /**
+     * @deprecated use {@link #getStaticHelpUrl(StaplerRequest2, Klass, String)}
+     */
+    @Deprecated
+    @Restricted(NoExternalUse.class)
+    public static URL getStaticHelpUrl(StaplerRequest req, Klass<?> c, String suffix) {
+        return getStaticHelpUrl(StaplerRequest.toStaplerRequest2(req), c, suffix);
+    }
+
 
 //
 // static methods
@@ -1061,16 +1142,30 @@ Map<Descriptor<T>, T> toMap(Iterable<T> describables) {
      *      List of descriptors to create instances from.
      * @return
      *      Can be empty but never null.
+     * @since TODO
      */
     public static <T extends Describable<T>>
-    List<T> newInstancesFromHeteroList(StaplerRequest req, JSONObject formData, String key,
+    List<T> newInstancesFromHeteroList(StaplerRequest2 req, JSONObject formData, String key,
                 Collection<? extends Descriptor<T>> descriptors) throws FormException {
 
         return newInstancesFromHeteroList(req, formData.get(key), descriptors);
     }
 
+    /**
+     * @deprecated use {@link #newInstancesFromHeteroList(StaplerRequest2, JSONObject, String, Collection)}
+     */
+    @Deprecated
+    public static <T extends Describable<T>>
+    List<T> newInstancesFromHeteroList(StaplerRequest req, JSONObject formData, String key,
+                                       Collection<? extends Descriptor<T>> descriptors) throws FormException {
+        return newInstancesFromHeteroList(StaplerRequest.toStaplerRequest2(req), formData, key, descriptors);
+    }
+
+    /**
+     * @since TODO
+     */
     public static <T extends Describable<T>>
-    List<T> newInstancesFromHeteroList(StaplerRequest req, Object formData,
+    List<T> newInstancesFromHeteroList(StaplerRequest2 req, Object formData,
                 Collection<? extends Descriptor<T>> descriptors) throws FormException {
 
         List<T> items = new ArrayList<>();
@@ -1086,7 +1181,7 @@ List<T> newInstancesFromHeteroList(StaplerRequest req, Object formData,
                 if (kind != null) {
                     // Only applies when Descriptor.getId is overridden.
                     // Note that kind is only supported here,
-                    // *not* inside the StaplerRequest.bindJSON which is normally called by newInstance
+                    // *not* inside the StaplerRequest2.bindJSON which is normally called by newInstance
                     // (since Descriptor.newInstance is not itself available to Stapler).
                     // If you merely override getId for some reason, but use @DataBoundConstructor on your Describable,
                     // there is no problem; but you can only rely on newInstance being called at top level.
@@ -1114,6 +1209,16 @@ List<T> newInstancesFromHeteroList(StaplerRequest req, Object formData,
         return items;
     }
 
+    /**
+     * @deprecated use {@link #newInstancesFromHeteroList(StaplerRequest2, JSONObject, String, Collection)}
+     */
+    @Deprecated
+    public static <T extends Describable<T>>
+    List<T> newInstancesFromHeteroList(StaplerRequest req, Object formData,
+                                       Collection<? extends Descriptor<T>> descriptors) throws FormException {
+        return newInstancesFromHeteroList(StaplerRequest.toStaplerRequest2(req), formData, descriptors);
+    }
+
     /**
      * Finds a descriptor from a collection by its ID.
      * @param id should match {@link #getId}
@@ -1199,7 +1304,7 @@ public String getFormField() {
         }
 
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
             if (FormApply.isApply(req)) {
                 FormApply.applyResponse("notificationBar.show(" + quote(getMessage()) + ",notificationBar.ERROR)")
                         .generateResponse(req, rsp, node);
diff --git a/core/src/main/java/hudson/model/DirectlyModifiableView.java b/core/src/main/java/hudson/model/DirectlyModifiableView.java
index 61362272c248..138f33a6a32c 100644
--- a/core/src/main/java/hudson/model/DirectlyModifiableView.java
+++ b/core/src/main/java/hudson/model/DirectlyModifiableView.java
@@ -26,8 +26,8 @@
 
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.interceptor.RequirePOST;
diff --git a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
index 9d455f4c1bd3..72da0c7514c1 100644
--- a/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
+++ b/core/src/main/java/hudson/model/DirectoryBrowserSupport.java
@@ -27,6 +27,9 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.FilePath;
 import hudson.Util;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,8 +58,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.security.MasterToSlaveCallable;
 import jenkins.security.ResourceDomainConfiguration;
@@ -70,7 +71,9 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Has convenience methods to serve file system.
@@ -157,7 +160,7 @@ public DirectoryBrowserSupport(ModelObject owner, VirtualFile base, String title
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
         if (!ResourceDomainConfiguration.isResourceRequest(req) && ResourceDomainConfiguration.isResourceDomainConfigured()) {
             resourceToken = ResourceDomainRootAction.get().getToken(this, req);
         }
@@ -191,11 +194,15 @@ public void setIndexFileName(String fileName) {
      *      from the {@code doXYZ} method and let Stapler generate a response for you.
      */
     @Deprecated
-    public void serveFile(StaplerRequest req, StaplerResponse rsp, FilePath root, String icon, boolean serveDirIndex) throws IOException, ServletException, InterruptedException {
-        serveFile(req, rsp, root.toVirtualFile(), icon, serveDirIndex);
+    public void serveFile(StaplerRequest req, StaplerResponse rsp, FilePath root, String icon, boolean serveDirIndex) throws IOException, javax.servlet.ServletException, InterruptedException {
+        try {
+            serveFile(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), root.toVirtualFile(), icon, serveDirIndex);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
     }
 
-    private void serveFile(StaplerRequest req, StaplerResponse rsp, VirtualFile root, String icon, boolean serveDirIndex) throws IOException, ServletException, InterruptedException {
+    private void serveFile(StaplerRequest2 req, StaplerResponse2 rsp, VirtualFile root, String icon, boolean serveDirIndex) throws IOException, ServletException, InterruptedException {
         // handle form submission
         String pattern = req.getParameter("pattern");
         if (pattern == null)
@@ -492,7 +499,7 @@ private boolean isDescendant(VirtualFile root, String relativePath) {
         }
     }
 
-    private String getPath(StaplerRequest req) {
+    private String getPath(StaplerRequest2 req) {
         String path = req.getRestOfPath();
         if (path.isEmpty())
             path = "/";
@@ -521,7 +528,7 @@ private static String createBackRef(int times) {
         return "../".repeat(times);
     }
 
-    private static void zip(StaplerResponse rsp, VirtualFile root, VirtualFile dir, String glob) throws IOException, InterruptedException {
+    private static void zip(StaplerResponse2 rsp, VirtualFile root, VirtualFile dir, String glob) throws IOException, InterruptedException {
         OutputStream outputStream = rsp.getOutputStream();
         try (ZipOutputStream zos = new ZipOutputStream(outputStream)) {
             zos.setEncoding(Charset.defaultCharset().displayName()); // TODO JENKINS-20663 make this overridable via query parameter
diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
index 020399bdd5b8..94aa1c770d21 100644
--- a/core/src/main/java/hudson/model/Executor.java
+++ b/core/src/main/java/hudson/model/Executor.java
@@ -59,7 +59,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.servlet.ServletException;
 import jenkins.model.CauseOfInterruption;
 import jenkins.model.CauseOfInterruption.UserInterruption;
 import jenkins.model.InterruptedBuildAction;
@@ -852,7 +851,7 @@ public void start() {
      */
     @RequirePOST
     @Deprecated
-    public void doStop(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doStop(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
         doStop().generateResponse(req, rsp, this);
     }
 
diff --git a/core/src/main/java/hudson/model/Failure.java b/core/src/main/java/hudson/model/Failure.java
index 71318dd0464b..0546f0a7e090 100644
--- a/core/src/main/java/hudson/model/Failure.java
+++ b/core/src/main/java/hudson/model/Failure.java
@@ -25,12 +25,12 @@
 package hudson.model;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Represents an error induced by user, encountered during HTTP request processing.
@@ -55,7 +55,7 @@ public Failure(String message, boolean pre) {
         this.pre = pre;
     }
 
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node, @CheckForNull Throwable throwable) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node, @CheckForNull Throwable throwable) throws IOException, ServletException {
         if (throwable != null) {
             req.setAttribute("exception", throwable);
         }
@@ -63,7 +63,7 @@ public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object nod
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
         req.setAttribute("message", getMessage());
         if (pre)
             req.setAttribute("pre", true);
diff --git a/core/src/main/java/hudson/model/FileParameterDefinition.java b/core/src/main/java/hudson/model/FileParameterDefinition.java
index 25cb08336da3..b8332f5911c5 100644
--- a/core/src/main/java/hudson/model/FileParameterDefinition.java
+++ b/core/src/main/java/hudson/model/FileParameterDefinition.java
@@ -29,17 +29,17 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.cli.CLICommand;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Objects;
-import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.apache.commons.fileupload2.core.FileItem;
 import org.apache.commons.io.FileUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * {@link ParameterDefinition} for doing file upload.
@@ -65,7 +65,7 @@ public FileParameterDefinition(@NonNull String name, @CheckForNull String descri
     }
 
     @Override
-    public FileParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public FileParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         FileParameterValue p = req.bindJSON(FileParameterValue.class, jo);
         p.setLocation(getName());
         p.setDescription(getDescription());
@@ -87,7 +87,7 @@ public String getHelpFile() {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req) {
+    public ParameterValue createValue(StaplerRequest2 req) {
         FileItem src;
         try {
             src = req.getFileItem2(getName());
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
index 343e30bb64f4..abeb1f41816a 100644
--- a/core/src/main/java/hudson/model/FileParameterValue.java
+++ b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -50,8 +50,8 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * {@link ParameterValue} for {@link FileParameterDefinition}.
@@ -235,9 +235,9 @@ public String toString() {
     }
 
     /**
-     * Serve this file parameter in response to a {@link StaplerRequest}.
+     * Serve this file parameter in response to a {@link StaplerRequest2}.
      */
-    public DirectoryBrowserSupport doDynamic(StaplerRequest request, StaplerResponse response) {
+    public DirectoryBrowserSupport doDynamic(StaplerRequest2 request, StaplerResponse2 response) {
         AbstractBuild build = (AbstractBuild) request.findAncestor(AbstractBuild.class).getObject();
         File fileParameter = getFileParameterFolderUnderBuild(build);
         return new DirectoryBrowserSupport(build, new FilePath(fileParameter), Messages.FileParameterValue_IndexTitle(), "folder.png", false);
diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index 784fa47da20e..7d45fd63d749 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -38,14 +38,16 @@
 import hudson.slaves.ComputerListener;
 import hudson.util.CopyOnWriteList;
 import hudson.util.FormValidation;
+import io.jenkins.servlet.ServletContextWrapper;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.List;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.jvnet.hudson.reactor.ReactorException;
 import org.kohsuke.stapler.QueryParameter;
@@ -78,14 +80,36 @@ public static Hudson getInstance() {
         return (Hudson) Jenkins.get();
     }
 
+    /**
+     * @since TODO
+     */
     public Hudson(File root, ServletContext context) throws IOException, InterruptedException, ReactorException {
         this(root, context, null);
     }
 
+    /**
+     * @deprecated use {@link #Hudson(File, ServletContext)}
+     */
+    @Deprecated
+    public Hudson(File root, javax.servlet.ServletContext context) throws IOException, InterruptedException, ReactorException {
+        this(root, ServletContextWrapper.toJakartaServletContext(context));
+    }
+
+    /**
+     * @since TODO
+     */
     public Hudson(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
         super(root, context, pluginManager);
     }
 
+    /**
+     * @deprecated use {@link #Hudson(File, ServletContext, PluginManager)}
+     */
+    @Deprecated
+    public Hudson(File root, javax.servlet.ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
+        this(root, ServletContextWrapper.toJakartaServletContext(context), pluginManager);
+    }
+
     /**
      * Gets all the installed {@link ItemListener}s.
      *
@@ -173,8 +197,12 @@ public TopLevelItem getJobCaseInsensitive(String name) {
      */
     @Deprecated
     @RequirePOST
-    public synchronized void doQuietDown(StaplerResponse rsp) throws IOException, ServletException {
-        doQuietDown().generateResponse(null, rsp, this);
+    public synchronized void doQuietDown(StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doQuietDown().generateResponse(null, StaplerResponse.toStaplerResponse2(rsp), this);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
     }
 
     /**
@@ -184,7 +212,7 @@ public synchronized void doQuietDown(StaplerResponse rsp) throws IOException, Se
      *   As on 1.267, moved to "/log/rss..."
      */
     @Deprecated
-    public void doLogRss(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doLogRss(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
         String qs = req.getQueryString();
         rsp.sendRedirect2("./log/rss" + (qs == null ? "" : '?' + qs));
     }
@@ -194,7 +222,7 @@ public void doLogRss(StaplerRequest req, StaplerResponse rsp) throws IOException
      *      Define your own check method, instead of relying on this generic one.
      */
     @Deprecated
-    public void doFieldCheck(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doFieldCheck(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
         doFieldCheck(
                 fixEmpty(req.getParameter("value")),
                 fixEmpty(req.getParameter("type")),
diff --git a/core/src/main/java/hudson/model/Item.java b/core/src/main/java/hudson/model/Item.java
index a57011579b15..838f4e6f75a7 100644
--- a/core/src/main/java/hudson/model/Item.java
+++ b/core/src/main/java/hudson/model/Item.java
@@ -41,7 +41,7 @@
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 import jenkins.util.io.OnMaster;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Basic configuration unit in Hudson.
@@ -183,7 +183,7 @@ default String getRelativeNameFrom(@NonNull Item item)  {
 
     /**
      * Returns the absolute URL of this item. This relies on the current
-     * {@link StaplerRequest} to figure out what the host name is,
+     * {@link StaplerRequest2} to figure out what the host name is,
      * so can be used only during processing client requests.
      *
      * @return
diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index faa214dee621..62a46f395247 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -32,6 +32,9 @@
 import hudson.util.CopyOnWriteMap;
 import hudson.util.Function1;
 import hudson.util.Secret;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,8 +45,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
@@ -51,7 +52,9 @@
 import jenkins.security.NotReallyRoleSensitiveCallable;
 import jenkins.util.xml.XMLUtils;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.access.AccessDeniedException;
 import org.xml.sax.SAXException;
 
@@ -140,8 +143,10 @@ public static <K, V extends Item> Map<K, V> loadChildren(ItemGroup parent, File
     /**
      * Creates a {@link TopLevelItem} for example from the submission of the {@code /lib/hudson/newFromList/form} tag
      * or throws an exception if it fails.
+     *
+     * @since TODO
      */
-    public synchronized TopLevelItem createTopLevelItem(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized TopLevelItem createTopLevelItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         acl.checkPermission(Item.CREATE);
 
         TopLevelItem result;
@@ -206,10 +211,22 @@ public synchronized TopLevelItem createTopLevelItem(StaplerRequest req, StaplerR
         return result;
     }
 
+    /**
+     * @deprecated use {@link #createTopLevelItem(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    public synchronized TopLevelItem createTopLevelItem(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            return createTopLevelItem(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Computes the redirection target URL for the newly created {@link TopLevelItem}.
      */
-    protected String redirectAfterCreateItem(StaplerRequest req, TopLevelItem result) throws IOException {
+    protected String redirectAfterCreateItem(StaplerRequest2 req, TopLevelItem result) throws IOException {
         return req.getContextPath() + '/' + result.getUrl() + "configure";
     }
 
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 4bd28ff2e325..10637d666d68 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -24,8 +24,8 @@
 
 package hudson.model;
 
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
 
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
@@ -69,6 +69,8 @@
 import hudson.widgets.HistoryWidget;
 import hudson.widgets.HistoryWidget.Adapter;
 import hudson.widgets.Widget;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.awt.Color;
 import java.awt.Paint;
 import java.io.File;
@@ -85,7 +87,6 @@
 import java.util.SortedMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.BuildDiscarder;
 import jenkins.model.BuildDiscarderProperty;
 import jenkins.model.DirectlyModifiableTopLevelItemGroup;
@@ -98,6 +99,7 @@
 import jenkins.model.lazy.LazyBuildMixIn;
 import jenkins.scm.RunWithSCM;
 import jenkins.security.HexStringConfidentialKey;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.triggers.SCMTriggerItem;
 import jenkins.widgets.HasWidgets;
 import net.sf.json.JSONException;
@@ -122,7 +124,9 @@
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.stapler.StaplerOverridable;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
@@ -854,9 +858,43 @@ public RunT getNearestOldBuild(int n) {
         return m.get(m.firstKey());
     }
 
+    /**
+     * @since TODO
+     */
+    @Override
+    public Object getDynamic(String token, StaplerRequest2 req,
+                             StaplerResponse2 rsp) {
+        if (Util.isOverridden(Job.class, getClass(), "getDynamic", String.class, StaplerRequest.class, StaplerResponse.class)) {
+            return getDynamic(token, StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+        }
+        try {
+            // try to interpret the token as build number
+            return getBuildByNumber(Integer.parseInt(token));
+        } catch (NumberFormatException e) {
+            // try to map that to widgets
+            for (Widget w : getWidgets()) {
+                if (w.getUrlName().equals(token))
+                    return w;
+            }
+
+            // is this a permalink?
+            for (Permalink p : getPermalinks()) {
+                if (p.getId().equals(token))
+                    return p.resolve(this);
+            }
+
+            return super.getDynamic(token, req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #getDynamic(String, StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
     @Override
     public Object getDynamic(String token, StaplerRequest req,
             StaplerResponse rsp) {
+        // Intentionally not factoring this out into a common implementation method because it contains a call to super.
         try {
             // try to interpret the token as build number
             return getBuildByNumber(Integer.parseInt(token));
@@ -1092,7 +1130,7 @@ public PermalinkList getPermalinks() {
      *
      * @since 2.60
      */
-    public void doRssChangelog(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssChangelog(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         class FeedItem {
             ChangeLogSet.Entry e;
             int idx;
@@ -1168,8 +1206,29 @@ public String getEntryAuthor(FeedItem entry) {
     }
 
 
+    /**
+     * @since TODO
+     */
+    @Override
+    public ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
+        if (Util.isOverridden(Job.class, getClass(), "doChildrenContextMenu", StaplerRequest.class, StaplerResponse.class)) {
+            return doChildrenContextMenu(StaplerRequest.fromStaplerRequest2(request), StaplerResponse.fromStaplerResponse2(response));
+        } else {
+            return doChildrenContextMenuImpl(request, response);
+        }
+    }
 
-    @Override public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    /**
+     * @deprecated use {@link #doChildrenContextMenu(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    @Override
+    public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+        return doChildrenContextMenuImpl(StaplerRequest.toStaplerRequest2(request), StaplerResponse.toStaplerResponse2(response));
+    }
+
+    private ContextMenu doChildrenContextMenuImpl(StaplerRequest2 request, StaplerResponse2 response) {
         // not sure what would be really useful here. This needs more thoughts.
         // for the time being, I'm starting with permalinks
         ContextMenu menu = new ContextMenu();
@@ -1327,8 +1386,8 @@ private HealthReport getBuildStabilityHealthReport() {
      * Accepts submission from the configuration page.
      */
     @POST
-    public synchronized void doConfigSubmit(StaplerRequest req,
-            StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public synchronized void doConfigSubmit(StaplerRequest2 req,
+            StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         checkPermission(CONFIGURE);
 
         description = req.getParameter("description");
@@ -1373,15 +1432,32 @@ public synchronized void doConfigSubmit(StaplerRequest req,
     /**
      * Derived class can override this to perform additional config submission
      * work.
+     *
+     * @since TODO
      */
-    protected void submit(StaplerRequest req, StaplerResponse rsp)
+    protected void submit(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException, ServletException, FormException {
+        if (Util.isOverridden(Job.class, getClass(), "submit", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    protected void submit(StaplerRequest req, StaplerResponse rsp)
+            throws IOException, javax.servlet.ServletException, FormException {
     }
 
     /**
      * Accepts and serves the job description
      */
-    public void doDescription(StaplerRequest req, StaplerResponse rsp)
+    public void doDescription(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException {
         if (req.getMethod().equals("GET")) {
             //read
@@ -1407,7 +1483,7 @@ public void doDescription(StaplerRequest req, StaplerResponse rsp)
     /**
      * Returns the image that shows the current buildCommand status.
      */
-    public void doBuildStatus(StaplerRequest req, StaplerResponse rsp)
+    public void doBuildStatus(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException {
         rsp.sendRedirect2(req.getContextPath() + "/images/48x48/" + getBuildStatusUrl());
     }
@@ -1577,7 +1653,7 @@ private Calendar getLastBuildTime() {
     @RequirePOST
     public/* not synchronized. see renameTo() */void doDoRename(
             StaplerRequest req, StaplerResponse rsp) throws IOException,
-            ServletException {
+            javax.servlet.ServletException {
         String newName = req.getParameter("newName");
         doConfirmRename(newName).generateResponse(req, rsp, null);
     }
@@ -1589,12 +1665,12 @@ protected void checkRename(String newName) throws Failure {
         }
     }
 
-    public void doRssAll(StaplerRequest req, StaplerResponse rsp)
+    public void doRssAll(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException, ServletException {
         RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (all builds)", getUrl(), getBuilds().newBuilds());
     }
 
-    public void doRssFailed(StaplerRequest req, StaplerResponse rsp)
+    public void doRssFailed(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException, ServletException {
         RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (failed builds)", getUrl(), getBuilds().failureOnly().newBuilds());
     }
diff --git a/core/src/main/java/hudson/model/JobProperty.java b/core/src/main/java/hudson/model/JobProperty.java
index 14ff87591fe9..70ef159547c0 100644
--- a/core/src/main/java/hudson/model/JobProperty.java
+++ b/core/src/main/java/hudson/model/JobProperty.java
@@ -27,6 +27,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.ExtensionPoint;
 import hudson.Launcher;
+import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.model.queue.SubTask;
 import hudson.tasks.BuildStep;
@@ -41,6 +42,7 @@
 import jenkins.model.OptionalJobProperty;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.ExportedBean;
 
 /**
@@ -183,8 +185,28 @@ public Collection<?> getJobOverrides() {
         return Collections.emptyList();
     }
 
+    /**
+     * @since TODO
+     */
+    @Override
+    public JobProperty<?> reconfigure(StaplerRequest2 req, JSONObject form) throws FormException {
+        if (Util.isOverridden(JobProperty.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) {
+            return reconfigure(StaplerRequest.fromStaplerRequest2(req), form);
+        } else {
+            return reconfigureImpl(req, form);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #reconfigure(StaplerRequest2, JSONObject)}
+     */
+    @Deprecated
     @Override
     public JobProperty<?> reconfigure(StaplerRequest req, JSONObject form) throws FormException {
+        return reconfigureImpl(StaplerRequest.toStaplerRequest2(req), form);
+    }
+
+    private JobProperty<?> reconfigureImpl(StaplerRequest2 req, JSONObject form) throws FormException {
         return form == null ? null : getDescriptor().newInstance(req, form);
     }
 
diff --git a/core/src/main/java/hudson/model/JobPropertyDescriptor.java b/core/src/main/java/hudson/model/JobPropertyDescriptor.java
index 1f1c3aa7e6f0..eb9b990b7056 100644
--- a/core/src/main/java/hudson/model/JobPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/JobPropertyDescriptor.java
@@ -24,6 +24,7 @@
 
 package hudson.model;
 
+import hudson.Util;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@
 import net.sf.json.JSONObject;
 import org.jvnet.tiger_types.Types;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * {@link Descriptor} for {@link JobProperty}.
@@ -61,6 +63,23 @@ protected JobPropertyDescriptor() {
      *      null to avoid setting an instance of {@link JobProperty} to the target project (or just use {@link OptionalJobProperty})
      */
     @Override
+    public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
+        if (Util.isOverridden(JobPropertyDescriptor.class, getClass(), "newInstance", StaplerRequest.class, JSONObject.class)) {
+            return newInstance(req != null ? StaplerRequest.fromStaplerRequest2(req) : null, formData);
+        } else {
+            // JobPropertyDescriptors are bit different in that we allow them even without any user-visible configuration parameter,
+            // so replace the lack of form data by an empty one.
+            if (formData.isNullObject()) formData = new JSONObject();
+
+            return super.newInstance(req, formData);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #newInstance(StaplerRequest2, JSONObject)}
+     */
+    @Deprecated
+    @Override
     public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
         // JobPropertyDescriptors are bit different in that we allow them even without any user-visible configuration parameter,
         // so replace the lack of form data by an empty one.
diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java
index 88661c6df690..53c51db9cc4b 100644
--- a/core/src/main/java/hudson/model/Label.java
+++ b/core/src/main/java/hudson/model/Label.java
@@ -71,8 +71,8 @@
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
@@ -548,7 +548,7 @@ public String toString() {
     }
 
     @Override
-    public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    public ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         ContextMenu menu = new ContextMenu();
         for (Node node : getNodes()) {
             menu.add(node);
diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java
index d8f6a8d48bcb..a2e25f1f1d1b 100644
--- a/core/src/main/java/hudson/model/ListView.java
+++ b/core/src/main/java/hudson/model/ListView.java
@@ -41,6 +41,8 @@
 import hudson.views.ListViewColumn;
 import hudson.views.StatusFilter;
 import hudson.views.ViewJobFilter;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -55,7 +57,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.jcip.annotations.GuardedBy;
 import net.sf.json.JSONObject;
@@ -67,7 +68,8 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
 import org.springframework.security.access.AccessDeniedException;
@@ -97,7 +99,7 @@ public class ListView extends View implements DirectlyModifiableView {
     /**
      * Whether to recurse in ItemGroups
      */
-    private boolean recurse;
+    private volatile boolean recurse;
 
     /**
      * Compiled include pattern from the includeRegex string.
@@ -357,7 +359,7 @@ public boolean isAddToCurrentView() {
         }
     }
 
-    private boolean needToAddToCurrentView(StaplerRequest req) throws ServletException {
+    private boolean needToAddToCurrentView(StaplerRequest2 req) throws ServletException {
         String json = req.getParameter("json");
         if (json != null && !json.isEmpty()) {
             // Submitted via UI
@@ -371,7 +373,7 @@ private boolean needToAddToCurrentView(StaplerRequest req) throws ServletExcepti
 
     @Override
     @POST
-    public Item doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         ItemGroup<? extends TopLevelItem> ig = getOwner().getItemGroup();
         if (ig instanceof ModifiableItemGroup) {
             TopLevelItem item = ((ModifiableItemGroup<? extends TopLevelItem>) ig).doCreateItem(req, rsp);
@@ -439,7 +441,32 @@ public HttpResponse doRemoveJobFromView(@QueryParameter String name) throws IOEx
      * Load view-specific properties here.
      */
     @Override
-    protected void submit(StaplerRequest req) throws ServletException, FormException, IOException {
+    protected void submit(StaplerRequest2 req) throws ServletException, FormException, IOException {
+        if (Util.isOverridden(View.class, getClass(), "submit", StaplerRequest.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            submitImpl(req);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2)}
+     */
+    @Deprecated
+    @Override
+    protected void submit(StaplerRequest req) throws javax.servlet.ServletException, FormException, IOException {
+        try {
+            submitImpl(StaplerRequest.toStaplerRequest2(req));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void submitImpl(StaplerRequest2 req) throws ServletException, FormException, IOException {
         JSONObject json = req.getSubmittedForm();
         synchronized (this) {
             recurse = json.optBoolean("recurse", true);
diff --git a/core/src/main/java/hudson/model/ManageJenkinsAction.java b/core/src/main/java/hudson/model/ManageJenkinsAction.java
index c6c37a57662a..776b37c4f265 100644
--- a/core/src/main/java/hudson/model/ManageJenkinsAction.java
+++ b/core/src/main/java/hudson/model/ManageJenkinsAction.java
@@ -36,8 +36,8 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerFallback;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Adds the "Manage Jenkins" link to the top page.
@@ -70,7 +70,7 @@ public Object getStaplerFallback() {
     }
 
     @Override
-    public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws JellyException, IOException {
+    public ContextMenu doContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws JellyException, IOException {
         return new ContextMenu().from(this, request, response, "index");
     }
 
@@ -80,7 +80,7 @@ public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse respons
      */
     @Restricted(NoExternalUse.class)
     public void addContextMenuItem(ContextMenu menu, String url, String icon, String iconXml, String text, boolean post, boolean requiresConfirmation, Badge badge, String message) {
-        if (Stapler.getCurrentRequest().findAncestorObject(this.getClass()) != null || !Util.isSafeToRedirectTo(url)) {
+        if (Stapler.getCurrentRequest2().findAncestorObject(this.getClass()) != null || !Util.isSafeToRedirectTo(url)) {
             // Default behavior if the URL is absolute or scheme-relative, or the current object is an ancestor (i.e. would resolve correctly)
             menu.add(url, icon, iconXml, text, post, requiresConfirmation, badge, message);
             return;
diff --git a/core/src/main/java/hudson/model/ModifiableItemGroup.java b/core/src/main/java/hudson/model/ModifiableItemGroup.java
index 726a0455dc74..35e41305afb5 100644
--- a/core/src/main/java/hudson/model/ModifiableItemGroup.java
+++ b/core/src/main/java/hudson/model/ModifiableItemGroup.java
@@ -24,10 +24,15 @@
 
 package hudson.model;
 
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
+import jenkins.security.stapler.StaplerNotDispatchable;
+import org.kohsuke.stapler.ReflectionUtils;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * {@link ItemGroup} that is a general purpose container, which allows users and the rest of the program
@@ -45,5 +50,45 @@ public interface ModifiableItemGroup<T extends Item> extends ItemGroup<T> {
      * The request format follows that of {@code &lt;n:form xmlns:n="/lib/form">}.
      *
      */
-    T doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException;
+    @StaplerNotDispatchable
+    default T doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (ReflectionUtils.isOverridden(
+                ModifiableItemGroup.class,
+                getClass(),
+                "doCreateItem",
+                StaplerRequest.class,
+                StaplerResponse.class)) {
+            try {
+                return doCreateItem(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + ModifiableItemGroup.class.getSimpleName() + ".doCreateItem methods");
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doCreateItem(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    default T doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        if (ReflectionUtils.isOverridden(
+                ModifiableItemGroup.class,
+                getClass(),
+                "doCreateItem",
+                StaplerRequest2.class,
+                StaplerResponse2.class)) {
+            try {
+                return doCreateItem(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+            } catch (ServletException e) {
+                throw ServletExceptionWrapper.fromJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + ModifiableItemGroup.class.getSimpleName() + ".doCreateItem methods");
+        }
+    }
 }
diff --git a/core/src/main/java/hudson/model/MultiStageTimeSeries.java b/core/src/main/java/hudson/model/MultiStageTimeSeries.java
index ea9d25a043c0..84963cde928f 100644
--- a/core/src/main/java/hudson/model/MultiStageTimeSeries.java
+++ b/core/src/main/java/hudson/model/MultiStageTimeSeries.java
@@ -26,6 +26,7 @@
 
 import hudson.util.ChartUtil;
 import hudson.util.NoOverlapCategoryAxis;
+import jakarta.servlet.ServletException;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
@@ -39,7 +40,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.ServletException;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.CategoryAxis;
@@ -53,7 +53,9 @@
 import org.jvnet.localizer.Localizable;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
@@ -298,8 +300,8 @@ protected void configurePlot(CategoryPlot plot) {
          * Renders this object as an image.
          */
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
-            ChartUtil.generateGraph(req, rsp, createChart(), 500, 400);
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
+            ChartUtil.generateGraph(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp), createChart(), 500, 400);
         }
     }
 
diff --git a/core/src/main/java/hudson/model/MyView.java b/core/src/main/java/hudson/model/MyView.java
index bc98d9a55f7f..93c9967e0e86 100644
--- a/core/src/main/java/hudson/model/MyView.java
+++ b/core/src/main/java/hudson/model/MyView.java
@@ -26,18 +26,21 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import hudson.Util;
 import hudson.model.Descriptor.FormException;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -64,7 +67,7 @@ public boolean contains(TopLevelItem item) {
 
     @RequirePOST
     @Override
-    public TopLevelItem doCreateItem(StaplerRequest req, StaplerResponse rsp)
+    public TopLevelItem doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException, ServletException {
         ItemGroup<? extends TopLevelItem> ig = getOwner().getItemGroup();
         if (ig instanceof ModifiableItemGroup) {
@@ -85,7 +88,24 @@ public String getPostConstructLandingPage() {
     }
 
     @Override
-    protected void submit(StaplerRequest req) throws IOException, ServletException, FormException {
+    protected void submit(StaplerRequest2 req) throws IOException, ServletException, FormException {
+        if (Util.isOverridden(MyView.class, getClass(), "submit", StaplerRequest.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            // noop
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2)}
+     */
+    @Deprecated
+    @Override
+    protected void submit(StaplerRequest req) throws IOException, javax.servlet.ServletException, FormException {
         // noop
     }
 
diff --git a/core/src/main/java/hudson/model/MyViewsProperty.java b/core/src/main/java/hudson/model/MyViewsProperty.java
index 49fdfac48d2d..32ef03f73ecd 100644
--- a/core/src/main/java/hudson/model/MyViewsProperty.java
+++ b/core/src/main/java/hudson/model/MyViewsProperty.java
@@ -35,13 +35,13 @@
 import hudson.util.FormValidation;
 import hudson.views.MyViewsTabBar;
 import hudson.views.ViewsTabBar;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 import net.sf.json.JSONObject;
@@ -54,8 +54,8 @@
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerFallback;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.POST;
 
 /**
@@ -196,7 +196,7 @@ public HttpResponse doIndex() {
     }
 
     @POST
-    public synchronized void doCreateView(StaplerRequest req, StaplerResponse rsp)
+    public synchronized void doCreateView(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException, ServletException, ParseException, FormException {
         checkPermission(View.CREATE);
         addView(View.create(req, rsp, this));
@@ -276,7 +276,7 @@ public UserProperty newInstance(User user) {
     }
 
     @Override
-    public UserProperty reconfigure(StaplerRequest req, JSONObject form) throws FormException {
+    public UserProperty reconfigure(StaplerRequest2 req, JSONObject form) throws FormException {
         req.bindJSON(this, form);
         return this;
     }
diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java
index 8ba16e77d4d3..55cacd269133 100644
--- a/core/src/main/java/hudson/model/Node.java
+++ b/core/src/main/java/hudson/model/Node.java
@@ -79,6 +79,7 @@
 import org.kohsuke.stapler.BindInterceptor;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.springframework.security.core.Authentication;
@@ -560,8 +561,25 @@ public ACL getACL() {
         return Jenkins.get().getAuthorizationStrategy().getACL(this);
     }
 
+    @Override
+    public Node reconfigure(@NonNull final StaplerRequest2 req, JSONObject form) throws FormException {
+        if (Util.isOverridden(Node.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) {
+            return reconfigure(StaplerRequest.fromStaplerRequest2(req), form);
+        } else {
+            return reconfigureImpl(req, form);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #reconfigure(StaplerRequest2, JSONObject)}
+     */
+    @Deprecated
     @Override
     public Node reconfigure(@NonNull final StaplerRequest req, JSONObject form) throws FormException {
+        return reconfigureImpl(StaplerRequest.toStaplerRequest2(req), form);
+    }
+
+    private Node reconfigureImpl(@NonNull final StaplerRequest2 req, JSONObject form) throws FormException {
         if (form == null)     return null;
 
         final JSONObject jsonForProperties = form.optJSONObject("nodeProperties");
diff --git a/core/src/main/java/hudson/model/PaneStatusProperties.java b/core/src/main/java/hudson/model/PaneStatusProperties.java
index 4807020ca714..12cb0003d671 100644
--- a/core/src/main/java/hudson/model/PaneStatusProperties.java
+++ b/core/src/main/java/hudson/model/PaneStatusProperties.java
@@ -6,8 +6,8 @@
 import hudson.Extension;
 import hudson.model.userproperty.UserPropertyCategory;
 import hudson.util.PersistedList;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
-import javax.servlet.http.HttpSession;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.Stapler;
 
@@ -70,13 +70,13 @@ private static class PaneStatusPropertiesSessionFallback extends PaneStatusPrope
 
         @Override
         public boolean isCollapsed(String paneId) {
-            final HttpSession session = Stapler.getCurrentRequest().getSession();
+            final HttpSession session = Stapler.getCurrentRequest2().getSession();
             return session.getAttribute(format(attribute, paneId)) != null;
         }
 
         @Override
         public boolean toggleCollapsed(String paneId) {
-            final HttpSession session = Stapler.getCurrentRequest().getSession();
+            final HttpSession session = Stapler.getCurrentRequest2().getSession();
             final String property = format(attribute, paneId);
             final Object collapsed = session.getAttribute(property);
             if (collapsed == null) {
diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java
index 262b632ab5a2..29653c0250f4 100644
--- a/core/src/main/java/hudson/model/ParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ParameterDefinition.java
@@ -41,6 +41,7 @@
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
@@ -59,7 +60,7 @@
  * <p>
  * Three classes are used to model build parameters. First is the
  * {@link ParameterDescriptor}, which tells Hudson what kind of implementations are
- * available. From {@link ParameterDescriptor#newInstance(StaplerRequest, JSONObject)},
+ * available. From {@link ParameterDescriptor#newInstance(StaplerRequest2, JSONObject)},
  * Hudson creates {@link ParameterDefinition}s based on the job configuration.
  * For example, if the user defines two string parameters "database-type" and
  * "appserver-type", we'll get two {@link StringParameterDefinition} instances
@@ -69,7 +70,7 @@
  * When a job is configured with {@link ParameterDefinition} (or more precisely,
  * {@link ParametersDefinitionProperty}, which in turns retains {@link ParameterDefinition}s),
  * user would have to enter the values for the defined build parameters.
- * The {@link #createValue(StaplerRequest, JSONObject)} method is used to convert this
+ * The {@link #createValue(StaplerRequest2, JSONObject)} method is used to convert this
  * form submission into {@link ParameterValue} objects, which are then accessible
  * during a build.
  *
@@ -85,12 +86,12 @@
  * <h3>config.jelly</h3>
  * {@link ParameterDefinition} class uses {@code config.jelly} to contribute a form
  * fragment in the job configuration screen. Values entered there are fed back to
- * {@link ParameterDescriptor#newInstance(StaplerRequest, JSONObject)} to create {@link ParameterDefinition}s.
+ * {@link ParameterDescriptor#newInstance(StaplerRequest2, JSONObject)} to create {@link ParameterDefinition}s.
  *
  * <h3>index.jelly</h3>
  * The {@code index.jelly} view contributes a form fragment in the page where the user
  * enters actual values of parameters for a build. The result of this form submission
- * is then fed to {@link ParameterDefinition#createValue(StaplerRequest, JSONObject)} to
+ * is then fed to {@link ParameterDefinition#createValue(StaplerRequest2, JSONObject)} to
  * create {@link ParameterValue}s.
  *
  * @see StringParameterDefinition
@@ -183,14 +184,37 @@ public ParameterDescriptor getDescriptor() {
      * and submits it to the server.
      */
     @CheckForNull
-    public abstract ParameterValue createValue(StaplerRequest req, JSONObject jo);
+    public /* abstract */ ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
+        return Util.ifOverridden(
+                () -> createValue(StaplerRequest.fromStaplerRequest2(req), jo),
+                ParameterDefinition.class,
+                getClass(),
+                "createValue",
+                StaplerRequest.class,
+                JSONObject.class);
+    }
+
+    /**
+     * @deprecated use {@link #createValue(StaplerRequest2, JSONObject)}
+     */
+    @CheckForNull
+    @Deprecated
+    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+        return Util.ifOverridden(
+                () -> createValue(StaplerRequest.toStaplerRequest2(req), jo),
+                ParameterDefinition.class,
+                getClass(),
+                "createValue",
+                StaplerRequest2.class,
+                JSONObject.class);
+    }
 
     /**
      * Create a parameter value from a GET with query string.
      * If no value is available in the request, it returns a default value if possible, or null.
      *
      * <p>
-     * Unlike {@link #createValue(StaplerRequest, JSONObject)}, this method is intended to support
+     * Unlike {@link #createValue(StaplerRequest2, JSONObject)}, this method is intended to support
      * the programmatic POST-ing of the build URL. This form is less expressive (as it doesn't support
      * the tree form), but it's more scriptable.
      *
@@ -202,8 +226,28 @@ public ParameterDescriptor getDescriptor() {
      *      If the parameter is deemed required but was missing in the submission.
      */
     @CheckForNull
-    public abstract ParameterValue createValue(StaplerRequest req);
+    public /* abstract */ ParameterValue createValue(StaplerRequest2 req) {
+        return Util.ifOverridden(
+                () -> createValue(StaplerRequest.fromStaplerRequest2(req)),
+                ParameterDefinition.class,
+                getClass(),
+                "createValue",
+                StaplerRequest.class);
+    }
 
+    /**
+     * @deprecated use {@link #createValue(StaplerRequest2)}
+     */
+    @CheckForNull
+    @Deprecated
+    public ParameterValue createValue(StaplerRequest req) {
+        return Util.ifOverridden(
+                () -> createValue(StaplerRequest.toStaplerRequest2(req)),
+                ParameterDefinition.class,
+                getClass(),
+                "createValue",
+                StaplerRequest2.class);
+    }
 
     /**
      * Create a parameter value from the string given in the CLI.
diff --git a/core/src/main/java/hudson/model/ParameterValue.java b/core/src/main/java/hudson/model/ParameterValue.java
index 5da680b3bb76..2fd481446f4b 100644
--- a/core/src/main/java/hudson/model/ParameterValue.java
+++ b/core/src/main/java/hudson/model/ParameterValue.java
@@ -43,14 +43,14 @@
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
 /**
  * A value for a parameter in a build.
  *
- * Created by {@link ParameterDefinition#createValue(StaplerRequest, JSONObject)} for
+ * Created by {@link ParameterDefinition#createValue(StaplerRequest2, JSONObject)} for
  * a particular build (although this 'owner' build object is passed in for every method
  * call as a parameter so that the parameter won't have to persist it.)
  *
@@ -240,7 +240,7 @@ public VariableResolver<String> createVariableResolver(AbstractBuild<?, ?> build
      * @deprecated since 2008-09-20.
      *    parameter definition may change any time. So if you find yourself
      *    in need of accessing the information from {@link ParameterDefinition},
-     *    instead copy them in {@link ParameterDefinition#createValue(StaplerRequest, JSONObject)}
+     *    instead copy them in {@link ParameterDefinition#createValue(StaplerRequest2, JSONObject)}
      *    into {@link ParameterValue}.
      */
     @Deprecated
diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
index 66a70047e89d..a9019e5a8f1f 100644
--- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
+++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
@@ -25,8 +25,8 @@
 
 package hudson.model;
 
-import static javax.servlet.http.HttpServletResponse.SC_CREATED;
-import static javax.servlet.http.HttpServletResponse.SC_SEE_OTHER;
+import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;
+import static jakarta.servlet.http.HttpServletResponse.SC_SEE_OTHER;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -35,6 +35,8 @@
 import hudson.model.Queue.WaitingItem;
 import hudson.model.queue.ScheduleResult;
 import hudson.util.AlternativeUiTextProvider;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.AbstractList;
 import java.util.ArrayList;
@@ -43,7 +45,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.model.OptionalJobProperty;
 import jenkins.model.ParameterizedJobMixIn;
@@ -56,7 +57,9 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
@@ -133,19 +136,23 @@ public Collection<Action> getJobActions(AbstractProject<?, ?> job) {
         return (AbstractProject<?, ?>) owner;
     }
 
-    /** @deprecated use {@link #_doBuild(StaplerRequest, StaplerResponse, TimeDuration)} */
+    /** @deprecated use {@link #_doBuild(StaplerRequest2, StaplerResponse2, TimeDuration)} */
     @Deprecated
-    public void _doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
-        _doBuild(req, rsp, TimeDuration.fromString(req.getParameter("delay")));
+    public void _doBuild(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            _doBuild(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), TimeDuration.fromString(req.getParameter("delay")));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
     }
 
     /**
      * Interprets the form submission and schedules a build for a parameterized job.
      *
      * <p>
-     * This method is supposed to be invoked from {@link ParameterizedJobMixIn#doBuild(StaplerRequest, StaplerResponse, TimeDuration)}.
+     * This method is supposed to be invoked from {@link ParameterizedJobMixIn#doBuild(StaplerRequest2, StaplerResponse2, TimeDuration)}.
      */
-    public void _doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
+    public void _doBuild(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
         if (delay == null)
             delay = new TimeDuration(TimeUnit.MILLISECONDS.convert(getJob().getQuietPeriod(), TimeUnit.SECONDS));
 
@@ -185,13 +192,17 @@ public void _doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter Ti
             rsp.sendRedirect(".");
     }
 
-    /** @deprecated use {@link #buildWithParameters(StaplerRequest, StaplerResponse, TimeDuration)} */
+    /** @deprecated use {@link #buildWithParameters(StaplerRequest2, StaplerResponse2, TimeDuration)} */
     @Deprecated
-    public void buildWithParameters(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
-        buildWithParameters(req, rsp, TimeDuration.fromString(req.getParameter("delay")));
+    public void buildWithParameters(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            buildWithParameters(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), TimeDuration.fromString(req.getParameter("delay")));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
     }
 
-    public void buildWithParameters(StaplerRequest req, StaplerResponse rsp, @CheckForNull TimeDuration delay) throws IOException, ServletException {
+    public void buildWithParameters(StaplerRequest2 req, StaplerResponse2 rsp, @CheckForNull TimeDuration delay) throws IOException, ServletException {
         List<ParameterValue> values = new ArrayList<>();
         for (ParameterDefinition d : parameterDefinitions) {
             ParameterValue value = d.createValue(req);
@@ -232,7 +243,7 @@ public ParameterDefinition getParameterDefinition(String name) {
     @Symbol("parameters")
     public static class DescriptorImpl extends OptionalJobPropertyDescriptor {
         @Override
-        public ParametersDefinitionProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public ParametersDefinitionProperty newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             ParametersDefinitionProperty prop = (ParametersDefinitionProperty) super.newInstance(req, formData);
             if (prop != null && prop.parameterDefinitions.isEmpty()) {
                 return null;
diff --git a/core/src/main/java/hudson/model/PasswordParameterDefinition.java b/core/src/main/java/hudson/model/PasswordParameterDefinition.java
index 8074740088f0..901f1ee66712 100644
--- a/core/src/main/java/hudson/model/PasswordParameterDefinition.java
+++ b/core/src/main/java/hudson/model/PasswordParameterDefinition.java
@@ -36,7 +36,7 @@
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Parameter whose value is a {@link Secret} and is hidden from the UI.
@@ -80,7 +80,7 @@ public ParameterValue createValue(String value) {
     }
 
     @Override
-    public PasswordParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public PasswordParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         PasswordParameterValue value = req.bindJSON(PasswordParameterValue.class, jo);
         if (value.getValue().getPlainText().equals(DEFAULT_VALUE)) {
             value = new PasswordParameterValue(getName(), getDefaultValue());
diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java
index 7dc8b692d940..eb31add23938 100644
--- a/core/src/main/java/hudson/model/Project.java
+++ b/core/src/main/java/hudson/model/Project.java
@@ -40,6 +40,8 @@
 import hudson.triggers.SCMTrigger;
 import hudson.triggers.Trigger;
 import hudson.util.DescribableList;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
@@ -49,11 +51,12 @@
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.triggers.SCMTriggerItem;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Buildable software project.
@@ -223,10 +226,39 @@ public MavenInstallation inferMavenInstallation() {
 // actions
 //
 //
+
+    /**
+     * @since TODO
+     */
+    @Override
+    protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
+        if (Util.isOverridden(Project.class, getClass(), "submit", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+       } else {
+            super.submit(req, rsp);
+            submitImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
     @Override
-    protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException, FormException {
         super.submit(req, rsp);
+        try {
+            submitImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw new javax.servlet.ServletException(e);
+        }
+    }
 
+    private void submitImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         JSONObject json = req.getSubmittedForm();
 
         getBuildWrappersList().rebuild(req, json, BuildWrappers.getFor(this));
diff --git a/core/src/main/java/hudson/model/ProxyView.java b/core/src/main/java/hudson/model/ProxyView.java
index b3d19282752c..41aa51df389e 100644
--- a/core/src/main/java/hudson/model/ProxyView.java
+++ b/core/src/main/java/hudson/model/ProxyView.java
@@ -29,9 +29,10 @@
 import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.util.FormValidation;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collection;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -39,7 +40,8 @@
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerFallback;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -98,7 +100,32 @@ public TopLevelItem getItem(String name) {
     }
 
     @Override
-    protected void submit(StaplerRequest req) throws IOException, ServletException, FormException {
+    protected void submit(StaplerRequest2 req) throws IOException, ServletException, FormException {
+        if (Util.isOverridden(ProxyView.class, getClass(), "submit", StaplerRequest.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            submitImpl(req);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2)}
+     */
+    @Deprecated
+    @Override
+    protected void submit(StaplerRequest req) throws IOException, javax.servlet.ServletException, FormException {
+        try {
+            submitImpl(StaplerRequest.toStaplerRequest2(req));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void submitImpl(StaplerRequest2 req) throws ServletException, FormException {
         String proxiedViewName = req.getSubmittedForm().getString("proxiedViewName");
         if (Jenkins.get().getView(proxiedViewName) == null) {
             throw new FormException("Not an existing global view", "proxiedViewName");
@@ -108,7 +135,7 @@ protected void submit(StaplerRequest req) throws IOException, ServletException,
 
     @RequirePOST
     @Override
-    public Item doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         return getProxiedView().doCreateItem(req, rsp);
     }
 
@@ -139,7 +166,7 @@ public String getDisplayName() {
         @Override
         public boolean isInstantiable() {
             // doesn't make sense to add a ProxyView to the global views
-            return !(Stapler.getCurrentRequest().findAncestorObject(ViewGroup.class) instanceof Jenkins);
+            return !(Stapler.getCurrentRequest2().findAncestorObject(ViewGroup.class) instanceof Jenkins);
         }
 
     }
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 0d299fb9426d..a8d4ca08ea0d 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -76,6 +76,8 @@
 import hudson.util.ConsistentHash;
 import hudson.util.Futures;
 import hudson.util.XStream2;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -107,8 +109,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.model.queue.AsynchronousExecution;
 import jenkins.model.queue.CompositeCauseOfBlockage;
@@ -130,7 +130,7 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -2415,7 +2415,7 @@ public Api getApi() throws AccessDeniedException {
             }
         }
 
-        public HttpResponse doIndex(StaplerRequest req) {
+        public HttpResponse doIndex(StaplerRequest2 req) {
             return HttpResponses.text("Queue item exists. For details check, for example, " + req.getRequestURI() + "api/json?tree=cancelled,executable[url]");
         }
 
diff --git a/core/src/main/java/hudson/model/RSS.java b/core/src/main/java/hudson/model/RSS.java
index 19727656e729..bb41c8af10a2 100644
--- a/core/src/main/java/hudson/model/RSS.java
+++ b/core/src/main/java/hudson/model/RSS.java
@@ -26,13 +26,17 @@
 
 import hudson.FeedAdapter;
 import hudson.util.RunList;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import io.jenkins.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Collection;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * RSS related code.
@@ -52,8 +56,9 @@ public final class RSS {
      *      Entries to be listed in the RSS feed.
      * @param adapter
      *      Controls how to render entries to RSS.
+     * @since TODO
      */
-    public static <E> void forwardToRss(String title, String url, Collection<? extends E> entries, FeedAdapter<E> adapter, StaplerRequest req, HttpServletResponse rsp) throws IOException, ServletException {
+    public static <E> void forwardToRss(String title, String url, Collection<? extends E> entries, FeedAdapter<E> adapter, StaplerRequest2 req, HttpServletResponse rsp) throws IOException, ServletException {
         req.setAttribute("adapter", adapter);
         req.setAttribute("title", title);
         req.setAttribute("url", url);
@@ -72,6 +77,18 @@ public static <E> void forwardToRss(String title, String url, Collection<? exten
         req.getView(Jenkins.get(), "/hudson/" + flavor + ".jelly").forward(req, rsp);
     }
 
+    /**
+     * @deprecated use {@link #forwardToRss(String, String, Collection, FeedAdapter, StaplerRequest2, HttpServletResponse)}
+     */
+    @Deprecated
+    public static <E> void forwardToRss(String title, String url, Collection<? extends E> entries, FeedAdapter<E> adapter, StaplerRequest req, javax.servlet.http.HttpServletResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            forwardToRss(title, url, entries, adapter, StaplerRequest.toStaplerRequest2(req), HttpServletResponseWrapper.toJakartaHttpServletResponse(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Sends the RSS feed to the client using a default feed adapter.
      *
@@ -81,12 +98,25 @@ public static <E> void forwardToRss(String title, String url, Collection<? exten
      *      URL of the model object that owns this feed. Relative to the context root.
      * @param runList
      *      Entries to be listed in the RSS feed.
-     * @since 2.215
+     * @since TODO
      */
-    public static void rss(StaplerRequest req, StaplerResponse rsp, String title, String url, RunList runList) throws IOException, ServletException {
+    public static void rss(StaplerRequest2 req, StaplerResponse2 rsp, String title, String url, RunList runList) throws IOException, ServletException {
         rss(req, rsp, title, url, runList, null);
     }
 
+    /**
+     * @deprecated use {@link #rss(StaplerRequest2, StaplerResponse2, String, String, RunList)}
+     * @since 2.215
+     */
+    @Deprecated
+    public static void rss(StaplerRequest req, StaplerResponse rsp, String title, String url, RunList runList) throws IOException, javax.servlet.ServletException {
+        try {
+            rss(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), title, url, runList, null);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Sends the RSS feed to the client using a specific feed adapter.
      *
@@ -98,10 +128,23 @@ public static void rss(StaplerRequest req, StaplerResponse rsp, String title, St
      *      Entries to be listed in the RSS feed.
      * @param feedAdapter
      *      Controls how to render entries to RSS.
-     * @since 2.215
+     * @since TODO
      */
-    public static void rss(StaplerRequest req, StaplerResponse rsp, String title, String url, RunList runList, FeedAdapter<Run> feedAdapter) throws IOException, ServletException {
+    public static void rss(StaplerRequest2 req, StaplerResponse2 rsp, String title, String url, RunList runList, FeedAdapter<Run> feedAdapter) throws IOException, ServletException {
         final FeedAdapter<Run> feedAdapter_ = feedAdapter == null ? Run.FEED_ADAPTER : feedAdapter;
         forwardToRss(title, url, runList, feedAdapter_, req, rsp);
     }
+
+    /**
+     * @deprecated use {@link #rss(StaplerRequest2, StaplerResponse2, String, String, RunList, FeedAdapter)}
+     * @since 2.215
+     */
+    @Deprecated
+    public static void rss(StaplerRequest req, StaplerResponse rsp, String title, String url, RunList runList, FeedAdapter<Run> feedAdapter) throws IOException, javax.servlet.ServletException {
+        try {
+            rss(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), title, url, runList, feedAdapter);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
 }
diff --git a/core/src/main/java/hudson/model/ReconfigurableDescribable.java b/core/src/main/java/hudson/model/ReconfigurableDescribable.java
index 1747fdb452c1..c044391b77ad 100644
--- a/core/src/main/java/hudson/model/ReconfigurableDescribable.java
+++ b/core/src/main/java/hudson/model/ReconfigurableDescribable.java
@@ -26,10 +26,13 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.slaves.NodeProperty;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Marks modern {@link Describable}s that allow the current instances to pass information down to the next
@@ -44,7 +47,7 @@
  * <strong>Invisible Property:</strong>
  * This mechanism can be used to create an entirely invisible {@link Describable}, which is handy
  * for {@link NodeProperty}, {@link JobProperty}, etc. To do so, define an empty config.jelly to prevent it from
- * showing up in the config UI, then implement {@link #reconfigure(StaplerRequest, JSONObject)}
+ * showing up in the config UI, then implement {@link #reconfigure(StaplerRequest2, JSONObject)}
  * and simply return {@code this}.
  *
  * <p>
@@ -78,5 +81,29 @@ public interface ReconfigurableDescribable<T extends ReconfigurableDescribable<T
      * @return
      *      The new instance. To not to create an instance of a describable, return null.
      */
-    @CheckForNull T reconfigure(@NonNull StaplerRequest req, @CheckForNull JSONObject form) throws FormException;
+    @CheckForNull
+    @StaplerNotDispatchable
+    default T reconfigure(@NonNull StaplerRequest2 req, @CheckForNull JSONObject form) throws FormException {
+        if (Util.isOverridden(ReconfigurableDescribable.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) {
+            return reconfigure(StaplerRequest.fromStaplerRequest2(req), form);
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + ReconfigurableDescribable.class.getSimpleName() + ".reconfigure methods");
+        }
+    }
+
+    /**
+     * @deprecated use {@link #reconfigure(StaplerRequest2, JSONObject)}
+     */
+    @CheckForNull
+    @Deprecated
+    @StaplerNotDispatchable
+    default T reconfigure(@NonNull StaplerRequest req, @CheckForNull JSONObject form) throws FormException {
+        if (Util.isOverridden(ReconfigurableDescribable.class, getClass(), "reconfigure", StaplerRequest2.class, JSONObject.class)) {
+            return reconfigure(StaplerRequest.toStaplerRequest2(req), form);
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + ReconfigurableDescribable.class.getSimpleName() + ".reconfigure methods");
+        }
+    }
 }
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 33658252b922..c6eedc42785f 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -68,6 +68,9 @@
 import hudson.util.LogTaskListener;
 import hudson.util.ProcessTree;
 import hudson.util.XStream2;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -106,8 +109,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.ArtifactManager;
 import jenkins.model.ArtifactManagerConfiguration;
 import jenkins.model.ArtifactManagerFactory;
@@ -119,6 +120,7 @@
 import jenkins.model.lazy.BuildReference;
 import jenkins.model.lazy.LazyBuildMixIn;
 import jenkins.security.MasterToSlaveCallable;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.SystemProperties;
 import jenkins.util.VirtualFile;
 import jenkins.util.io.OnMaster;
@@ -132,7 +134,9 @@
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -1043,7 +1047,7 @@ protected void dropLinks() {
         // RUN may be accessed using permalinks, as "/lastSuccessful" or other, so try to retrieve this base URL
         // looking for "this" in the current request ancestors
         // @see also {@link AbstractItem#getUrl}
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req != null) {
             String seed = Functions.getNearestAncestorUrl(req, this);
             if (seed != null) {
@@ -2157,7 +2161,7 @@ private String convertBytesToString(List<Byte> bytes) {
         return new String(byteArray, getCharset());
     }
 
-    public void doBuildStatus(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doBuildStatus(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         rsp.sendRedirect2(req.getContextPath() + "/images/48x48/" + getBuildStatusUrl());
     }
 
@@ -2260,7 +2264,7 @@ public abstract static class StatusSummarizer implements ExtensionPoint {
     /**
      * Returns the build number in the body.
      */
-    public void doBuildNumber(StaplerResponse rsp) throws IOException {
+    public void doBuildNumber(StaplerResponse2 rsp) throws IOException {
         rsp.setContentType("text/plain");
         rsp.setCharacterEncoding("US-ASCII");
         rsp.setStatus(HttpServletResponse.SC_OK);
@@ -2270,7 +2274,7 @@ public void doBuildNumber(StaplerResponse rsp) throws IOException {
     /**
      * Returns the build time stamp in the body.
      */
-    public void doBuildTimestamp(StaplerRequest req, StaplerResponse rsp, @QueryParameter String format) throws IOException {
+    public void doBuildTimestamp(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter String format) throws IOException {
         rsp.setContentType("text/plain");
         rsp.setCharacterEncoding("US-ASCII");
         rsp.setStatus(HttpServletResponse.SC_OK);
@@ -2282,8 +2286,27 @@ public void doBuildTimestamp(StaplerRequest req, StaplerResponse rsp, @QueryPara
 
     /**
      * Sends out the raw console output.
+     *
+     * @since TODO
      */
+    public void doConsoleText(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
+        if (Util.isOverridden(Run.class, getClass(), "doConsoleText", StaplerRequest.class, StaplerResponse.class)) {
+            doConsoleText(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+        } else {
+            doConsoleTextImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doConsoleText(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
     public void doConsoleText(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        doConsoleTextImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private void doConsoleTextImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         rsp.setContentType("text/plain;charset=UTF-8");
         try (InputStream input = getLogInputStream();
              OutputStream os = rsp.getOutputStream();
@@ -2299,7 +2322,7 @@ public void doConsoleText(StaplerRequest req, StaplerResponse rsp) throws IOExce
      */
     @Deprecated
     public void doProgressiveLog(StaplerRequest req, StaplerResponse rsp) throws IOException {
-        getLogText().doProgressText(req, rsp);
+        getLogText().doProgressText(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
     }
 
     /**
@@ -2320,7 +2343,7 @@ public boolean canToggleLogKeep() {
     }
 
     @RequirePOST
-    public void doToggleLogKeep(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doToggleLogKeep(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         keepLog(!keepLog);
         rsp.forwardToPreviousPage(req);
     }
@@ -2341,9 +2364,37 @@ public void keepLog(boolean newValue) throws IOException {
 
     /**
      * Deletes the build when the button is pressed.
+     *
+     * @since TODO
      */
     @RequirePOST
-    public void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(Run.class, getClass(), "doDoDelete", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doDoDelete(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+            return;
+        } else {
+            doDoDeleteImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doDoDelete(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doDoDeleteImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void doDoDeleteImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         checkPermission(DELETE);
 
         // We should not simply delete the build if it has been explicitly
@@ -2376,7 +2427,7 @@ public void setDescription(String description) throws IOException {
      * Accepts the new description.
      */
     @RequirePOST
-    public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         setDescription(req.getParameter("description"));
         rsp.sendRedirect(".");  // go to the top page
     }
@@ -2507,7 +2558,7 @@ public long getEstimatedDuration() {
     }
 
     @POST
-    public @NonNull HttpResponse doConfigSubmit(StaplerRequest req) throws IOException, ServletException, FormException {
+    public @NonNull HttpResponse doConfigSubmit(StaplerRequest2 req) throws IOException, ServletException, FormException {
         checkPermission(UPDATE);
         try (BulkChange bc = new BulkChange(this)) {
             JSONObject json = req.getSubmittedForm();
@@ -2625,9 +2676,27 @@ public String getEntryAuthor(Run entry) {
         }
     }
 
+    @Override
+    public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
+        if (Util.isOverridden(Run.class, getClass(), "getDynamic", String.class, StaplerRequest.class, StaplerResponse.class)) {
+            return getDynamic(token, StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+        } else {
+            Object returnedResult = super.getDynamic(token, req, rsp);
+            return getDynamicImpl(token, returnedResult);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #getDynamic(String, StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
     @Override
     public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
         Object returnedResult = super.getDynamic(token, req, rsp);
+        return getDynamicImpl(token, returnedResult);
+    }
+
+    private Object getDynamicImpl(String token, Object returnedResult) {
         if (returnedResult == null) {
             //check transient actions too
             for (Action action : getTransientActions()) {
@@ -2669,7 +2738,7 @@ public Object getTarget() {
 
 
     public static class RedirectUp {
-        public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
             // Compromise to handle both browsers (auto-redirect) and programmatic access
             // (want accurate 404 response).. send 404 with javascript to redirect browsers.
             rsp.setStatus(HttpServletResponse.SC_NOT_FOUND);
diff --git a/core/src/main/java/hudson/model/RunParameterDefinition.java b/core/src/main/java/hudson/model/RunParameterDefinition.java
index 9aec159686b9..487d895839dd 100644
--- a/core/src/main/java/hudson/model/RunParameterDefinition.java
+++ b/core/src/main/java/hudson/model/RunParameterDefinition.java
@@ -38,7 +38,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 
 public class RunParameterDefinition extends SimpleParameterDefinition {
@@ -155,7 +155,7 @@ public String getHelpFile() {
         }
 
         @Override
-        public ParameterDefinition newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public ParameterDefinition newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             return req.bindJSON(RunParameterDefinition.class, formData);
         }
 
@@ -202,7 +202,7 @@ public ParameterValue getDefaultParameterValue() {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         RunParameterValue value = req.bindJSON(RunParameterValue.class, jo);
         value.setDescription(getDescription());
         return value;
diff --git a/core/src/main/java/hudson/model/SimpleParameterDefinition.java b/core/src/main/java/hudson/model/SimpleParameterDefinition.java
index 0be175bb4a86..f52f9a338922 100644
--- a/core/src/main/java/hudson/model/SimpleParameterDefinition.java
+++ b/core/src/main/java/hudson/model/SimpleParameterDefinition.java
@@ -5,7 +5,7 @@
 import hudson.cli.CLICommand;
 import java.io.IOException;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Convenient base class for {@link ParameterDefinition} whose value can be represented in a context-independent single string token.
@@ -31,7 +31,7 @@ protected SimpleParameterDefinition(@NonNull String name, @CheckForNull String d
     public abstract ParameterValue createValue(String value);
 
     @Override
-    public final ParameterValue createValue(StaplerRequest req) {
+    public final ParameterValue createValue(StaplerRequest2 req) {
         String[] value = req.getParameterValues(getName());
         if (value == null) {
             return getDefaultParameterValue();
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index 4ad75e039386..588dbf70b40d 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -51,6 +51,7 @@
 import hudson.util.ClockDifference;
 import hudson.util.DescribableList;
 import hudson.util.FormValidation;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -69,7 +70,6 @@
 import java.util.jar.Manifest;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.security.MasterToSlaveCallable;
 import jenkins.slaves.WorkspaceLocator;
@@ -80,8 +80,8 @@
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Information about a Hudson agent node.
@@ -418,7 +418,7 @@ public JnlpJar(String fileName) {
             this.fileName = fileName;
         }
 
-        public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        public void doIndex(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
             URLConnection con = connect();
             // since we end up redirecting users to jnlpJars/foo.jar/, set the content disposition
             // so that browsers can download them in the right file name.
@@ -430,7 +430,7 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException,
         }
 
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
             doIndex(req, rsp);
         }
 
@@ -465,7 +465,7 @@ public URL getURL() throws IOException {
                 }
             }
 
-            URL res = Jenkins.get().servletContext.getResource("/WEB-INF/" + name);
+            URL res = Jenkins.get().getServletContext().getResource("/WEB-INF/" + name);
             if (res == null) {
                 throw new FileNotFoundException(name); // giving up
             } else {
@@ -622,7 +622,7 @@ public FormValidation doCheckNumExecutors(@QueryParameter String value) {
         /**
          * Performs syntactical check on the remote FS for agents.
          */
-        public FormValidation doCheckRemoteFS(@QueryParameter String value) throws IOException, ServletException {
+        public FormValidation doCheckRemoteFS(@QueryParameter String value) throws IOException {
             if (Util.fixEmptyAndTrim(value) == null)
                 return FormValidation.error(Messages.Slave_Remote_Director_Mandatory());
 
diff --git a/core/src/main/java/hudson/model/StockStatusIcon.java b/core/src/main/java/hudson/model/StockStatusIcon.java
index 00ce50b0453b..4fb1a9bfa007 100644
--- a/core/src/main/java/hudson/model/StockStatusIcon.java
+++ b/core/src/main/java/hudson/model/StockStatusIcon.java
@@ -29,9 +29,9 @@ public StockStatusIcon(String image, Localizable description) {
     @Override
     public String getImageOf(String size) {
         if (image.endsWith(".svg")) {
-            return Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH + "/images/svgs/" + image;
+            return Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH + "/images/svgs/" + image;
         } else {
-            return Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH +
+            return Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH +
                 "/images/" + size + "/" + image;
         }
     }
diff --git a/core/src/main/java/hudson/model/StringParameterDefinition.java b/core/src/main/java/hudson/model/StringParameterDefinition.java
index 8a5dfa9f1b04..160e1b1a9c0c 100644
--- a/core/src/main/java/hudson/model/StringParameterDefinition.java
+++ b/core/src/main/java/hudson/model/StringParameterDefinition.java
@@ -36,7 +36,7 @@
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Parameter whose value is a string value.
@@ -147,7 +147,7 @@ public String getHelpFile() {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         StringParameterValue value = req.bindJSON(StringParameterValue.class, jo);
         if (isTrim()) {
             value.doTrim();
diff --git a/core/src/main/java/hudson/model/TaskAction.java b/core/src/main/java/hudson/model/TaskAction.java
index 60ca66ac0536..e0597218f5d5 100644
--- a/core/src/main/java/hudson/model/TaskAction.java
+++ b/core/src/main/java/hudson/model/TaskAction.java
@@ -27,12 +27,12 @@
 import hudson.console.AnnotatedLargeText;
 import hudson.security.ACL;
 import hudson.security.Permission;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.framework.io.LargeText;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
@@ -113,7 +113,7 @@ public TaskThread getWorkerThread() {
     /**
      * Handles incremental log output.
      */
-    public void doProgressiveLog(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doProgressiveLog(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         AnnotatedLargeText text = obtainLog();
         if (text != null) {
             text.doProgressText(req, rsp);
@@ -125,7 +125,7 @@ public void doProgressiveLog(StaplerRequest req, StaplerResponse rsp) throws IOE
     /**
      * Handles incremental log output.
      */
-    public void doProgressiveHtml(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doProgressiveHtml(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         AnnotatedLargeText text = obtainLog();
         if (text != null) {
             text.doProgressiveHtml(req, rsp);
@@ -138,7 +138,7 @@ public void doProgressiveHtml(StaplerRequest req, StaplerResponse rsp) throws IO
      * Clears the error status.
      */
     @RequirePOST
-    public synchronized void doClearError(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doClearError(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         getACL().checkPermission(getPermission());
 
         if (workerThread != null && !workerThread.isRunning())
diff --git a/core/src/main/java/hudson/model/TextParameterDefinition.java b/core/src/main/java/hudson/model/TextParameterDefinition.java
index a22b1903e59b..96d973dc765a 100644
--- a/core/src/main/java/hudson/model/TextParameterDefinition.java
+++ b/core/src/main/java/hudson/model/TextParameterDefinition.java
@@ -32,7 +32,7 @@
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * {@link StringParameterDefinition} that uses textarea, instead of text box.
@@ -68,7 +68,7 @@ public StringParameterValue getDefaultParameterValue() {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         TextParameterValue value = req.bindJSON(TextParameterValue.class, jo);
         value.setDescription(getDescription());
         return value;
diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
index d84e4a684f22..817c1194a3d5 100644
--- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
+++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
@@ -164,7 +164,7 @@ public String getDescription() {
                 DefaultScriptInvoker dsi = new DefaultScriptInvoker();
                 StringWriter sw = new StringWriter();
                 XMLOutput xml = dsi.createXMLOutput(sw, true);
-                dsi.invokeScript(Stapler.getCurrentRequest(), Stapler.getCurrentResponse(), s, this, xml);
+                dsi.invokeScript(Stapler.getCurrentRequest2(), Stapler.getCurrentResponse2(), s, this, xml);
                 return sw.toString();
             } catch (Exception e) {
                 LOGGER.log(Level.WARNING, null, e);
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 4df95b7b3f45..437444feb434 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -58,6 +58,7 @@
 import hudson.util.PersistedList;
 import hudson.util.VersionNumber;
 import hudson.util.XStream2;
+import jakarta.servlet.ServletException;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -107,7 +108,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.net.ssl.SSLHandshakeException;
-import javax.servlet.ServletException;
 import jenkins.MissingDependencyException;
 import jenkins.RestartRequiredException;
 import jenkins.install.InstallUtil;
@@ -115,6 +115,7 @@
 import jenkins.model.Jenkins;
 import jenkins.model.Loadable;
 import jenkins.security.stapler.StaplerDispatchable;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.SystemProperties;
 import jenkins.util.Timer;
 import jenkins.util.io.OnMaster;
@@ -129,7 +130,8 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -439,7 +441,25 @@ public Badge getBadge() {
      * @return The current connection status.
      */
     @Restricted(DoNotUse.class)
+    public HttpResponse doConnectionStatus(StaplerRequest2 request) {
+        if (Util.isOverridden(UpdateCenter.class, getClass(), "doConnectionStatus", StaplerRequest.class)) {
+            return doConnectionStatus(StaplerRequest.fromStaplerRequest2(request));
+        } else {
+            return doConnectionStatusImpl(request);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doConnectionStatus(StaplerRequest2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    @Restricted(DoNotUse.class)
     public HttpResponse doConnectionStatus(StaplerRequest request) {
+        return doConnectionStatusImpl(StaplerRequest.toStaplerRequest2(request));
+    }
+
+    private HttpResponse doConnectionStatusImpl(StaplerRequest2 request) {
         Jenkins.get().checkPermission(Jenkins.SYSTEM_READ);
         try {
             String siteId = request.getParameter("siteId");
@@ -536,12 +556,12 @@ public synchronized void persistInstallStatus() {
      * <p>
      * Supports a "correlationId" request parameter if you only want to get the
      * install status of a set of plugins requested for install through
-     * {@link PluginManager#doInstallPlugins(org.kohsuke.stapler.StaplerRequest)}.
+     * {@link PluginManager#doInstallPlugins(org.kohsuke.stapler.StaplerRequest2)}.
      *
      * @return The current installation status of a plugin set.
      */
     @Restricted(DoNotUse.class)
-    public HttpResponse doInstallStatus(StaplerRequest request) {
+    public HttpResponse doInstallStatus(StaplerRequest2 request) {
         try {
             String correlationId = request.getParameter("correlationId");
             Map<String, Object> response = new HashMap<>();
@@ -754,7 +774,7 @@ private boolean checkMinVersion(@CheckForNull Plugin p, @CheckForNull VersionNum
      * Schedules a Jenkins upgrade.
      */
     @RequirePOST
-    public void doUpgrade(StaplerResponse rsp) throws IOException, ServletException {
+    public void doUpgrade(StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         HudsonUpgradeJob job = new HudsonUpgradeJob(getCoreSource(), Jenkins.getAuthentication2());
         if (!Lifecycle.get().canRewriteHudsonWar()) {
@@ -786,7 +806,7 @@ public HttpResponse doInvalidateData() {
      * Schedules a Jenkins restart.
      */
     @RequirePOST
-    public void doSafeRestart(StaplerRequest request, StaplerResponse response) throws IOException, ServletException {
+    public void doSafeRestart(StaplerRequest2 request, StaplerResponse2 response) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         synchronized (jobs) {
             if (!isRestartScheduled()) {
@@ -801,7 +821,7 @@ public void doSafeRestart(StaplerRequest request, StaplerResponse response) thro
      * Cancel all scheduled jenkins restarts
      */
     @RequirePOST
-    public void doCancelRestart(StaplerResponse response) throws IOException, ServletException {
+    public void doCancelRestart(StaplerResponse2 response) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         synchronized (jobs) {
             for (UpdateCenterJob job : jobs) {
@@ -860,7 +880,7 @@ public boolean isDowngradable() {
      * Performs hudson downgrade.
      */
     @RequirePOST
-    public void doDowngrade(StaplerResponse rsp) throws IOException, ServletException {
+    public void doDowngrade(StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         if (!isDowngradable()) {
             sendError("Jenkins downgrade is not possible, probably backup does not exist");
@@ -877,7 +897,7 @@ public void doDowngrade(StaplerResponse rsp) throws IOException, ServletExceptio
      * Performs hudson downgrade.
      */
     @RequirePOST
-    public void doRestart(StaplerResponse rsp) throws IOException, ServletException {
+    public void doRestart(StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         HudsonDowngradeJob job = new HudsonDowngradeJob(getCoreSource(), Jenkins.getAuthentication2());
         LOGGER.info("Scheduling the core downgrade");
@@ -2392,7 +2412,7 @@ private File getCached(DownloadJob job) {
                  * Could make PluginManager#getDetachedLocation public and consume it here, but this method is
                  * best-effort anyway.
                  */
-                src = Jenkins.get().servletContext.getResource(String.format("/WEB-INF/detached-plugins/%s.hpi", plugin.name));
+                src = Jenkins.get().getServletContext().getResource(String.format("/WEB-INF/detached-plugins/%s.hpi", plugin.name));
             } catch (MalformedURLException e) {
                 return null;
             }
diff --git a/core/src/main/java/hudson/model/UsageStatistics.java b/core/src/main/java/hudson/model/UsageStatistics.java
index 341f135c52f1..04d1be58209a 100644
--- a/core/src/main/java/hudson/model/UsageStatistics.java
+++ b/core/src/main/java/hudson/model/UsageStatistics.java
@@ -67,7 +67,7 @@
 import jenkins.security.FIPS140;
 import jenkins.util.SystemProperties;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -138,7 +138,7 @@ public String getStatData() throws IOException {
         JSONObject o = new JSONObject();
         o.put("stat", 1);
         o.put("install", j.getLegacyInstanceId());
-        o.put("servletContainer", j.servletContext.getServerInfo());
+        o.put("servletContainer", j.getServletContext().getServerInfo());
         o.put("version", Jenkins.VERSION);
 
         List<JSONObject> nodes = new ArrayList<>();
@@ -212,7 +212,7 @@ public Permission getRequiredGlobalConfigPagePermission() {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             // for backward compatibility reasons, this configuration is stored in Jenkins
             if (DISABLED) {
diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index 792622eb3c54..685a80e540a9 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -47,6 +47,8 @@
 import hudson.util.FormValidation;
 import hudson.util.RunList;
 import hudson.util.XStream2;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -64,8 +66,6 @@
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.IdStrategy;
 import jenkins.model.Jenkins;
 import jenkins.model.Loadable;
@@ -79,8 +79,8 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -485,7 +485,7 @@ private LegitimateButUnknownUserDetails(String username) throws IllegalArgumentE
      * Accepts the new description.
      */
     @RequirePOST
-    public void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         checkPermission(Jenkins.ADMINISTER);
 
         description = req.getParameter("description");
@@ -882,7 +882,7 @@ public Api getApi() {
      * Deletes this user from Hudson.
      */
     @RequirePOST
-    public void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         checkPermission(Jenkins.ADMINISTER);
         if (idStrategy().equals(id, Jenkins.getAuthentication2().getName())) {
             rsp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Cannot delete self");
@@ -894,15 +894,15 @@ public void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOExcepti
         rsp.sendRedirect2("../..");
     }
 
-    public void doRssAll(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssAll(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (all builds)", getUrl(), getBuilds().newBuilds());
     }
 
-    public void doRssFailed(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssFailed(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (failed builds)", getUrl(), getBuilds().regressionOnly());
     }
 
-    public void doRssLatest(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssLatest(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         final List<Run> lastBuilds = new ArrayList<>();
         for (Job<?, ?> p : Jenkins.get().allItems(Job.class)) {
             for (Run<?, ?> b = p.getLastBuild(); b != null; b = b.getPreviousBuild()) {
@@ -1010,7 +1010,7 @@ public List<Action> getTransientActions() {
     }
 
     @Override
-    public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    public ContextMenu doContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         return new ContextMenu().from(this, request, response);
     }
 
diff --git a/core/src/main/java/hudson/model/UserProperty.java b/core/src/main/java/hudson/model/UserProperty.java
index a6ebeb738b23..9813cfaba62b 100644
--- a/core/src/main/java/hudson/model/UserProperty.java
+++ b/core/src/main/java/hudson/model/UserProperty.java
@@ -27,6 +27,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;
+import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.model.userproperty.UserPropertyCategory;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.ExportedBean;
 
 /**
@@ -101,8 +103,22 @@ public static List<UserPropertyDescriptor> allByCategoryClass(@NonNull Class<? e
         return onlyForTheCategory;
     }
 
+    @Override
+    public UserProperty reconfigure(StaplerRequest2 req, JSONObject form) throws FormException {
+        if (Util.isOverridden(UserProperty.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) {
+            return reconfigure(StaplerRequest.fromStaplerRequest2(req), form);
+        } else {
+            return reconfigureImpl(req, form);
+        }
+    }
+
+    @Deprecated
     @Override
     public UserProperty reconfigure(StaplerRequest req, JSONObject form) throws FormException {
+        return reconfigureImpl(StaplerRequest.toStaplerRequest2(req), form);
+    }
+
+    private UserProperty reconfigureImpl(StaplerRequest2 req, JSONObject form) throws FormException {
         return form == null ? null : getDescriptor().newInstance(req, form);
     }
 }
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index 7b1bd98eb9ee..e807fa23de30 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -25,7 +25,7 @@
 
 package hudson.model;
 
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 
 import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.io.StreamException;
@@ -57,6 +57,9 @@
 import hudson.util.RunList;
 import hudson.util.XStream2;
 import hudson.views.ListViewColumn;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -80,8 +83,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.sax.SAXSource;
@@ -93,6 +94,7 @@
 import jenkins.model.item_category.Categories;
 import jenkins.model.item_category.Category;
 import jenkins.model.item_category.ItemCategory;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.xml.XMLUtils;
 import jenkins.widgets.HasWidgets;
 import net.sf.json.JSONObject;
@@ -108,7 +110,9 @@
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -673,7 +677,28 @@ public SearchIndexBuilder makeSearchIndex() {
      * Accepts the new description.
      */
     @RequirePOST
-    public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(View.class, getClass(), "doSubmitDescription", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doSubmitDescription(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doSubmitDescriptionImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doSubmitDescription(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        doSubmitDescriptionImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private void doSubmitDescriptionImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         checkPermission(CONFIGURE);
 
         description = req.getParameter("description");
@@ -684,10 +709,10 @@ public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse
     /**
      * Accepts submission from the configuration page.
      *
-     * Subtypes should override the {@link #submit(StaplerRequest)} method.
+     * Subtypes should override the {@link #submit(StaplerRequest2)} method.
      */
     @POST
-    public final synchronized void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public final synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         checkPermission(CONFIGURE);
 
         submit(req);
@@ -710,13 +735,42 @@ public final synchronized void doConfigSubmit(StaplerRequest req, StaplerRespons
      *
      * Load view-specific properties here.
      */
-    protected abstract void submit(StaplerRequest req) throws IOException, ServletException, FormException;
+    protected /* abstract */ void submit(StaplerRequest2 req) throws IOException, ServletException, FormException {
+        if (Util.isOverridden(View.class, getClass(), "submit", StaplerRequest.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + View.class.getSimpleName() + ".submit methods");
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2)}
+     */
+    @Deprecated
+    protected void submit(StaplerRequest req) throws IOException, javax.servlet.ServletException, FormException {
+        if (Util.isOverridden(View.class, getClass(), "submit", StaplerRequest2.class)) {
+            try {
+                submit(StaplerRequest.toStaplerRequest2(req));
+            } catch (ServletException e) {
+                throw ServletExceptionWrapper.fromJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + View.class.getSimpleName() + ".submit methods");
+        }
+    }
+
 
     /**
      * Deletes this view.
      */
     @RequirePOST
-    public synchronized void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         checkPermission(DELETE);
 
         owner.deleteView(this);
@@ -729,13 +783,44 @@ public synchronized void doDoDelete(StaplerRequest req, StaplerResponse rsp) thr
      * Creates a new {@link Item} in this collection.
      *
      * <p>
-     * This method should call {@link ModifiableItemGroup#doCreateItem(StaplerRequest, StaplerResponse)}
+     * This method should call {@link ModifiableItemGroup#doCreateItem(StaplerRequest2, StaplerResponse2)}
      * and then add the newly created item to this view.
      *
      * @return
      *      null if fails.
+     * @since TODO
      */
-    public abstract Item doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException;
+    @RequirePOST
+    public /* abstract */ Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(View.class, getClass(), "doCreateItem", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                return doCreateItem(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + View.class.getSimpleName() + ".doCreateItem methods");
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doCreateItem(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public Item doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        if (Util.isOverridden(View.class, getClass(), "doCreateItem", StaplerRequest2.class, StaplerResponse2.class)) {
+            try {
+                return doCreateItem(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+            } catch (ServletException e) {
+                throw ServletExceptionWrapper.fromJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + View.class.getSimpleName() + ".doCreateItem methods");
+        }
+    }
 
     /**
      * Makes sure that the given name is good as a job name.
@@ -774,7 +859,7 @@ public FormValidation doCheckJobName(@QueryParameter String value) {
      * @return A {@link Categories} entity that is shown as JSON file.
      */
     @Restricted(DoNotUse.class)
-    public Categories doItemCategories(StaplerRequest req, StaplerResponse rsp, @QueryParameter String iconStyle) throws IOException, ServletException {
+    public Categories doItemCategories(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter String iconStyle) throws IOException, ServletException {
         getOwner().checkPermission(Item.CREATE);
 
         rsp.addHeader("Cache-Control", "no-cache, no-store, must-revalidate");
@@ -833,11 +918,11 @@ public Categories doItemCategories(StaplerRequest req, StaplerResponse rsp, @Que
         return categories;
     }
 
-    public void doRssAll(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssAll(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (all builds)", getUrl(), getBuilds().newBuilds());
     }
 
-    public void doRssFailed(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssFailed(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (failed builds)", getUrl(), getBuilds().failureOnly().newBuilds());
     }
 
@@ -851,7 +936,7 @@ public BuildTimelineWidget getTimeline() {
         return new BuildTimelineWidget(getBuilds());
     }
 
-    public void doRssLatest(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doRssLatest(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         List<Run> lastBuilds = new ArrayList<>();
         for (TopLevelItem item : getItems()) {
             if (item instanceof Job job) {
@@ -866,13 +951,13 @@ public void doRssLatest(StaplerRequest req, StaplerResponse rsp) throws IOExcept
      * Accepts {@code config.xml} submission, as well as serve it.
      */
     @WebMethod(name = "config.xml")
-    public HttpResponse doConfigDotXml(StaplerRequest req) throws IOException {
+    public HttpResponse doConfigDotXml(StaplerRequest2 req) throws IOException {
         if (req.getMethod().equals("GET")) {
             // read
             checkPermission(READ);
             return new HttpResponse() {
                 @Override
-                public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+                public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
                     rsp.setContentType("application/xml");
                     View.this.writeXml(rsp.getOutputStream());
                 }
@@ -940,7 +1025,7 @@ public void updateByXml(Source source) throws IOException {
     }
 
     @Override
-    public ModelObjectWithContextMenu.ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    public ModelObjectWithContextMenu.ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         ModelObjectWithContextMenu.ContextMenu m = new ModelObjectWithContextMenu.ContextMenu();
         for (TopLevelItem i : getItems())
             m.add(Functions.getRelativeLinkTo(i), Functions.getRelativeDisplayNameFrom(i, getOwner().getItemGroup()));
@@ -964,15 +1049,15 @@ public static DescriptorExtensionList<View, ViewDescriptor> all() {
 
     /**
      * Returns the {@link ViewDescriptor} instances that can be instantiated for the {@link ViewGroup} in the current
-     * {@link StaplerRequest}.
+     * {@link StaplerRequest2}.
      * <p>
-     * <strong>NOTE: Historically this method is only ever called from a {@link StaplerRequest}</strong>
-     * @return the list of instantiable {@link ViewDescriptor} instances for the current {@link StaplerRequest}
+     * <strong>NOTE: Historically this method is only ever called from a {@link StaplerRequest2}</strong>
+     * @return the list of instantiable {@link ViewDescriptor} instances for the current {@link StaplerRequest2}
      */
     @NonNull
     public static List<ViewDescriptor> allInstantiable() {
         List<ViewDescriptor> r = new ArrayList<>();
-        StaplerRequest request = Stapler.getCurrentRequest();
+        StaplerRequest2 request = Stapler.getCurrentRequest2();
         if (request == null) {
             throw new IllegalStateException("This method can only be invoked from a stapler request");
         }
@@ -1018,7 +1103,10 @@ public static Permission getItemCreatePermission() {
         return Item.CREATE;
     }
 
-    public static View create(StaplerRequest req, StaplerResponse rsp, ViewGroup owner)
+    /**
+     * @since TODO
+     */
+    public static View create(StaplerRequest2 req, StaplerResponse2 rsp, ViewGroup owner)
             throws FormException, IOException, ServletException {
         String mode = req.getParameter("mode");
 
@@ -1070,7 +1158,20 @@ public static View create(StaplerRequest req, StaplerResponse rsp, ViewGroup own
         return v;
     }
 
-    private static View copy(StaplerRequest req, ViewGroup owner, String name) throws IOException {
+    /**
+     * @deprecated use {@link #create(StaplerRequest2, StaplerResponse2, ViewGroup)}
+     */
+    @Deprecated
+    public static View create(StaplerRequest req, StaplerResponse rsp, ViewGroup owner)
+            throws FormException, IOException, javax.servlet.ServletException {
+        try {
+            return create(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), owner);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private static View copy(StaplerRequest2 req, ViewGroup owner, String name) throws IOException {
         View v;
         String from = req.getParameter("from");
         View src = owner.getView(from);
diff --git a/core/src/main/java/hudson/model/ViewDescriptor.java b/core/src/main/java/hudson/model/ViewDescriptor.java
index f38e5d846d9a..e140ac474054 100644
--- a/core/src/main/java/hudson/model/ViewDescriptor.java
+++ b/core/src/main/java/hudson/model/ViewDescriptor.java
@@ -40,7 +40,7 @@
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * {@link Descriptor} for {@link View}.
@@ -108,7 +108,7 @@ public AutoCompletionCandidates doAutoCompleteCopyNewItemFrom(@QueryParameter fi
      * Possible {@link ListViewColumnDescriptor}s that can be used with this view.
      */
     public List<Descriptor<ListViewColumn>> getColumnsDescriptors() {
-        StaplerRequest request = Stapler.getCurrentRequest();
+        StaplerRequest2 request = Stapler.getCurrentRequest2();
         if (request != null) {
             View view = request.findAncestorObject(clazz);
             return view == null ? DescriptorVisibilityFilter.applyType(clazz, ListViewColumn.all())
@@ -121,7 +121,7 @@ public List<Descriptor<ListViewColumn>> getColumnsDescriptors() {
      * Possible {@link ViewJobFilter} types that can be used with this view.
      */
     public List<Descriptor<ViewJobFilter>> getJobFiltersDescriptors() {
-        StaplerRequest request = Stapler.getCurrentRequest();
+        StaplerRequest2 request = Stapler.getCurrentRequest2();
         if (request != null) {
             View view = request.findAncestorObject(clazz);
             return view == null ? DescriptorVisibilityFilter.applyType(clazz, ViewJobFilter.all())
diff --git a/core/src/main/java/hudson/model/ViewJob.java b/core/src/main/java/hudson/model/ViewJob.java
index 0da32700c1bd..055b98cafdb5 100644
--- a/core/src/main/java/hudson/model/ViewJob.java
+++ b/core/src/main/java/hudson/model/ViewJob.java
@@ -25,7 +25,10 @@
 package hudson.model;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.Util;
 import hudson.model.Descriptor.FormException;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.util.LinkedHashSet;
@@ -34,11 +37,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * {@link Job} that monitors activities that happen outside Hudson,
@@ -165,8 +169,30 @@ private void _reload() {
     protected abstract void reload();
 
     @Override
-    protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
+        if (Util.isOverridden(ViewJob.class, getClass(), "submit", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                submit(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            super.submit(req, rsp);
+            submitImpl();
+        }
+    }
+
+    /**
+     * @deprecated use {@link #submit(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @Override
+    protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException, FormException {
         super.submit(req, rsp);
+        submitImpl();
+    }
+
+    private void submitImpl() {
         // make sure to reload to reflect this config change.
         nextUpdate = 0;
     }
diff --git a/core/src/main/java/hudson/model/ViewProperty.java b/core/src/main/java/hudson/model/ViewProperty.java
index 31ad3078d449..15f0e62164c4 100644
--- a/core/src/main/java/hudson/model/ViewProperty.java
+++ b/core/src/main/java/hudson/model/ViewProperty.java
@@ -26,9 +26,11 @@
 
 import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;
+import hudson.Util;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Extensible property of {@link View}.
@@ -68,8 +70,22 @@ public static DescriptorExtensionList<ViewProperty, ViewPropertyDescriptor> all(
         return Jenkins.get().getDescriptorList(ViewProperty.class);
     }
 
+    @Override
+    public ViewProperty reconfigure(StaplerRequest2 req, JSONObject form) throws Descriptor.FormException {
+        if (Util.isOverridden(ViewProperty.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) {
+            return reconfigure(StaplerRequest.fromStaplerRequest2(req), form);
+        } else {
+            return reconfigureImpl(req, form);
+        }
+    }
+
+    @Deprecated
     @Override
     public ViewProperty reconfigure(StaplerRequest req, JSONObject form) throws Descriptor.FormException {
+        return reconfigureImpl(StaplerRequest.toStaplerRequest2(req), form);
+    }
+
+    private ViewProperty reconfigureImpl(StaplerRequest2 req, JSONObject form) throws Descriptor.FormException {
         return form == null ? null : getDescriptor().newInstance(req, form);
     }
 }
diff --git a/core/src/main/java/hudson/model/labels/LabelAtom.java b/core/src/main/java/hudson/model/labels/LabelAtom.java
index 84ee083c488d..f5e597b71b30 100644
--- a/core/src/main/java/hudson/model/labels/LabelAtom.java
+++ b/core/src/main/java/hudson/model/labels/LabelAtom.java
@@ -46,6 +46,7 @@
 import hudson.util.QuotedStringTokenizer;
 import hudson.util.VariableResolver;
 import hudson.util.XStream2;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -56,13 +57,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
@@ -221,7 +221,7 @@ public List<LabelAtomPropertyDescriptor> getApplicablePropertyDescriptors() {
      * Accepts the update to the node configuration.
      */
     @POST
-    public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         final Jenkins app = Jenkins.get();
 
         app.checkPermission(Jenkins.ADMINISTER);
@@ -249,7 +249,7 @@ private boolean isInvalidName() {
      */
     @RequirePOST
     @Restricted(DoNotUse.class)
-    public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         setDescription(req.getParameter("description"));
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAccountAction.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAccountAction.java
index 822cdc6f4c99..c0424e828419 100644
--- a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAccountAction.java
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAccountAction.java
@@ -32,20 +32,20 @@
 import hudson.model.User;
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.security.UserDetailsCache;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.POST;
 
 @Restricted(NoExternalUse.class)
@@ -91,7 +91,7 @@ private static List<UserPropertyDescriptor> allByTwoCategoryClasses(
     }
 
     @POST
-    public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+    public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         User targetUser = this.getTargetUser();
         targetUser.checkPermission(Jenkins.ADMINISTER);
 
diff --git a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAction.java b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAction.java
index caec7c1bdf88..6eadb9f89ece 100644
--- a/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAction.java
+++ b/core/src/main/java/hudson/model/userproperty/UserPropertyCategoryAction.java
@@ -6,14 +6,14 @@
 import hudson.model.UserProperty;
 import hudson.model.UserPropertyDescriptor;
 import hudson.util.FormApply;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.POST;
 
 public abstract class UserPropertyCategoryAction {
@@ -31,7 +31,7 @@ public UserPropertyCategoryAction(User targetUser) {
     public @NonNull abstract List<UserPropertyDescriptor> getMyCategoryDescriptors();
 
     @POST
-    public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+    public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         this.targetUser.checkPermission(Jenkins.ADMINISTER);
 
         JSONObject json = req.getSubmittedForm();
diff --git a/core/src/main/java/hudson/scm/AbstractScmTagAction.java b/core/src/main/java/hudson/scm/AbstractScmTagAction.java
index b861a90b15fe..3bf14e753242 100644
--- a/core/src/main/java/hudson/scm/AbstractScmTagAction.java
+++ b/core/src/main/java/hudson/scm/AbstractScmTagAction.java
@@ -24,17 +24,22 @@
 
 package hudson.scm;
 
+import hudson.Util;
 import hudson.model.AbstractBuild;
 import hudson.model.BuildBadgeAction;
 import hudson.model.Run;
 import hudson.model.TaskAction;
 import hudson.security.ACL;
 import hudson.security.Permission;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import jenkins.model.RunAction2;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Common part of {@code CVSSCM.TagAction} and {@code SubversionTagAction}.
@@ -108,7 +113,32 @@ protected ACL getACL() {
         return run.getACL();
     }
 
-    public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doIndex(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(AbstractScmTagAction.class, getClass(), "doIndex", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doIndex(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doIndexImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doIndex(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doIndexImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void doIndexImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         req.getView(this, chooseAction()).forward(req, rsp);
     }
 
diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java
index 0a1e28d1a152..3562f1c13964 100644
--- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java
+++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java
@@ -32,6 +32,7 @@
 import java.util.List;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * List of all installed {@link RepositoryBrowsers}.
@@ -63,7 +64,7 @@ public static List<Descriptor<RepositoryBrowser<?>>> filter(Class<? extends Repo
      * Creates an instance of {@link RepositoryBrowser} from a form submission.
      *
      * @deprecated since 2008-06-19.
-     *      Use {@link #createInstance(Class, StaplerRequest, JSONObject, String)}.
+     *      Use {@link #createInstance(Class, StaplerRequest2, JSONObject, String)}.
      */
     @Deprecated
     public static <T extends RepositoryBrowser>
@@ -82,13 +83,23 @@ T createInstance(Class<T> type, StaplerRequest req, String fieldName) throws For
     /**
      * Creates an instance of {@link RepositoryBrowser} from a form submission.
      *
-     * @since 1.227
+     * @since TODO
      */
     public static <T extends RepositoryBrowser>
-    T createInstance(Class<T> type, StaplerRequest req, JSONObject parent, String fieldName) throws FormException {
+    T createInstance(Class<T> type, StaplerRequest2 req, JSONObject parent, String fieldName) throws FormException {
         JSONObject o = (JSONObject) parent.get(fieldName);
         if (o == null) return null;
 
         return req.bindJSON(type, o);
     }
+
+    /**
+     * @deprecated use {@link #createInstance(Class, StaplerRequest2, JSONObject, String)}
+     * @since 1.227
+     */
+    @Deprecated
+    public static <T extends RepositoryBrowser>
+    T createInstance(Class<T> type, StaplerRequest req, JSONObject parent, String fieldName) throws FormException {
+        return createInstance(type, StaplerRequest.toStaplerRequest2(req), parent, fieldName);
+    }
 }
diff --git a/core/src/main/java/hudson/scm/SCMS.java b/core/src/main/java/hudson/scm/SCMS.java
index a8fd4ddc4dc1..de92d453d248 100644
--- a/core/src/main/java/hudson/scm/SCMS.java
+++ b/core/src/main/java/hudson/scm/SCMS.java
@@ -28,9 +28,11 @@
 import hudson.model.AbstractProject;
 import hudson.model.Descriptor.FormException;
 import hudson.util.DescriptorList;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.util.List;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * List of all installed SCMs.
@@ -53,7 +55,7 @@ public class SCMS {
      *      The project for which this SCM is configured to.
      */
     @SuppressWarnings("deprecation")
-    public static SCM parseSCM(StaplerRequest req, AbstractProject target) throws FormException, ServletException {
+    public static SCM parseSCM(StaplerRequest2 req, AbstractProject target) throws FormException, ServletException {
         SCM scm = SCM.all().newInstanceFromRadioList(req.getSubmittedForm().getJSONObject("scm"));
         if (scm == null) {
             scm = new NullSCM(); // JENKINS-36043 workaround for AbstractMultiBranchProject.submit
@@ -62,12 +64,24 @@ public static SCM parseSCM(StaplerRequest req, AbstractProject target) throws Fo
         return scm;
     }
 
+    /**
+     * @deprecated use {@link #parseSCM(StaplerRequest2, AbstractProject)}
+     */
+    @Deprecated
+    public static SCM parseSCM(StaplerRequest req, AbstractProject target) throws FormException, javax.servlet.ServletException {
+        try {
+            return parseSCM(StaplerRequest.toStaplerRequest2(req), target);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * @deprecated as of 1.294
-     *      Use {@link #parseSCM(StaplerRequest, AbstractProject)} and pass in the caller's project type.
+     *      Use {@link #parseSCM(StaplerRequest2, AbstractProject)} and pass in the caller's project type.
      */
     @Deprecated
-    public static SCM parseSCM(StaplerRequest req) throws FormException, ServletException {
+    public static SCM parseSCM(StaplerRequest req) throws FormException, javax.servlet.ServletException {
         return parseSCM(req, null);
     }
 
diff --git a/core/src/main/java/hudson/search/Search.java b/core/src/main/java/hudson/search/Search.java
index a3a674ae1106..7773d9e9d696 100644
--- a/core/src/main/java/hudson/search/Search.java
+++ b/core/src/main/java/hudson/search/Search.java
@@ -25,12 +25,14 @@
 
 package hudson.search;
 
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Util;
 import hudson.util.EditDistance;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.AbstractList;
 import java.util.ArrayList;
@@ -40,8 +42,8 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.MemoryReductionUtil;
 import jenkins.util.SystemProperties;
 import org.kohsuke.accmod.Restricted;
@@ -50,7 +52,9 @@
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.DataWriter;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -73,7 +77,32 @@ public class Search implements StaplerProxy {
      */
     private static /* nonfinal for Jenkins script console */ int MAX_SEARCH_SIZE = Integer.getInteger(Search.class.getName() + ".MAX_SEARCH_SIZE", 500);
 
-    public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doIndex(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(Search.class, getClass(), "doIndex", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doIndex(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doIndexImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doIndex(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doIndexImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void doIndexImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         List<Ancestor> l = req.getAncestors();
         for (int i = l.size() - 1; i >= 0; i--) {
             Ancestor a = l.get(i);
@@ -110,7 +139,7 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException,
      *
      * See http://developer.mozilla.org/en/docs/Supporting_search_suggestions_in_search_plugins
      */
-    public void doSuggestOpenSearch(StaplerRequest req, StaplerResponse rsp, @QueryParameter String q) throws IOException, ServletException {
+    public void doSuggestOpenSearch(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter String q) throws IOException, ServletException {
         rsp.setContentType(Flavor.JSON.contentType);
         DataWriter w = Flavor.JSON.createDataWriter(null, rsp);
         w.startArray();
@@ -126,7 +155,7 @@ public void doSuggestOpenSearch(StaplerRequest req, StaplerResponse rsp, @QueryP
     /**
      * Used by search box auto-completion. Returns JSON array.
      */
-    public void doSuggest(StaplerRequest req, StaplerResponse rsp, @QueryParameter String query) throws IOException, ServletException {
+    public void doSuggest(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter String query) throws IOException, ServletException {
         Result r = new Result();
         for (SuggestedItem item : getSuggestions(req, query))
             r.suggestions.add(new Item(item.getPath()));
@@ -141,7 +170,23 @@ public void doSuggest(StaplerRequest req, StaplerResponse rsp, @QueryParameter S
      *      can be empty but never null. The size of the list is always smaller than
      *      a certain threshold to avoid showing too many options.
      */
+    public SearchResult getSuggestions(StaplerRequest2 req, String query) {
+        if (Util.isOverridden(Search.class, getClass(), "getSuggestions", StaplerRequest.class, String.class)) {
+            return getSuggestions(StaplerRequest.fromStaplerRequest2(req), query);
+        } else {
+            return getSuggestionsImpl(req, query);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #getSuggestions(StaplerRequest2, String)}
+     */
+    @Deprecated
     public SearchResult getSuggestions(StaplerRequest req, String query) {
+        return getSuggestionsImpl(StaplerRequest.toStaplerRequest2(req), query);
+    }
+
+    private SearchResult getSuggestionsImpl(StaplerRequest2 req, String query) {
         Set<String> paths = new HashSet<>();  // paths already added, to control duplicates
         SearchResultImpl r = new SearchResultImpl();
         int max = Math.min(
@@ -164,7 +209,7 @@ public int getMaxSearchSize() {
         return MAX_SEARCH_SIZE;
     }
 
-    private @CheckForNull SearchableModelObject findClosestSearchableModelObject(StaplerRequest req) {
+    private @CheckForNull SearchableModelObject findClosestSearchableModelObject(StaplerRequest2 req) {
         List<Ancestor> l = req.getAncestors();
         for (int i = l.size() - 1; i >= 0; i--) {
             Ancestor a = l.get(i);
@@ -178,7 +223,7 @@ public int getMaxSearchSize() {
     /**
      * Creates merged search index for suggestion.
      */
-    private SearchIndex makeSuggestIndex(StaplerRequest req) {
+    private SearchIndex makeSuggestIndex(StaplerRequest2 req) {
         SearchIndexBuilder builder = new SearchIndexBuilder();
         for (Ancestor a : req.getAncestors()) {
             if (a.getObject() instanceof SearchableModelObject) {
diff --git a/core/src/main/java/hudson/search/UserSearchProperty.java b/core/src/main/java/hudson/search/UserSearchProperty.java
index a3515dd08874..7f36476b112b 100644
--- a/core/src/main/java/hudson/search/UserSearchProperty.java
+++ b/core/src/main/java/hudson/search/UserSearchProperty.java
@@ -8,7 +8,7 @@
 import hudson.model.userproperty.UserPropertyCategory;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 
 public class UserSearchProperty extends hudson.model.UserProperty {
@@ -51,7 +51,7 @@ public UserProperty newInstance(User user) {
         }
 
         @Override
-        public UserProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public UserProperty newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             return new UserSearchProperty(formData.optBoolean("insensitiveSearch"));
         }
 
diff --git a/core/src/main/java/hudson/security/AccessDeniedException2.java b/core/src/main/java/hudson/security/AccessDeniedException2.java
index 00daee721251..e745669bad67 100644
--- a/core/src/main/java/hudson/security/AccessDeniedException2.java
+++ b/core/src/main/java/hudson/security/AccessDeniedException2.java
@@ -1,5 +1,6 @@
 package hudson.security;
 
+import io.jenkins.servlet.http.HttpServletResponseWrapper;
 import java.io.PrintWriter;
 import javax.servlet.http.HttpServletResponse;
 import jenkins.util.SystemProperties;
@@ -42,7 +43,7 @@ public AccessDeniedException2(Throwable t, Authentication authentication, Permis
      * Reports the details of the access failure in HTTP headers to assist diagnosis.
      */
     public void reportAsHeaders(HttpServletResponse rsp) {
-        toSpring().reportAsHeaders(rsp);
+        toSpring().reportAsHeaders(HttpServletResponseWrapper.toJakartaHttpServletResponse(rsp));
     }
 
     /**
diff --git a/core/src/main/java/hudson/security/AccessDeniedException3.java b/core/src/main/java/hudson/security/AccessDeniedException3.java
index 82f5d50428ce..90fc521dfd7b 100644
--- a/core/src/main/java/hudson/security/AccessDeniedException3.java
+++ b/core/src/main/java/hudson/security/AccessDeniedException3.java
@@ -1,7 +1,8 @@
 package hudson.security;
 
+import io.jenkins.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.util.SystemProperties;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.Authentication;
@@ -43,6 +44,18 @@ public AccessDeniedException3(Throwable t, Authentication authentication, Permis
      * Reports the details of the access failure in HTTP headers to assist diagnosis.
      */
     public void reportAsHeaders(HttpServletResponse rsp) {
+        reportAsHeadersImpl(rsp);
+    }
+
+    /**
+     * @deprecated use {@link #reportAsHeaders(HttpServletResponse)}
+     */
+    @Deprecated
+    public void reportAsHeaders(javax.servlet.http.HttpServletResponse rsp) {
+        reportAsHeadersImpl(HttpServletResponseWrapper.toJakartaHttpServletResponse(rsp));
+    }
+
+    private void reportAsHeadersImpl(HttpServletResponse rsp) {
         rsp.addHeader("X-You-Are-Authenticated-As", authentication.getName());
         if (REPORT_GROUP_HEADERS) {
             for (GrantedAuthority auth : authentication.getAuthorities()) {
diff --git a/core/src/main/java/hudson/security/AccessDeniedHandlerImpl.java b/core/src/main/java/hudson/security/AccessDeniedHandlerImpl.java
index 68843cfddd16..b1f1e35e1fc8 100644
--- a/core/src/main/java/hudson/security/AccessDeniedHandlerImpl.java
+++ b/core/src/main/java/hudson/security/AccessDeniedHandlerImpl.java
@@ -24,10 +24,10 @@
 
 package hudson.security;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -53,7 +53,7 @@ public void handle(HttpServletRequest req, HttpServletResponse rsp, AccessDenied
             ((AccessDeniedException3) cause).reportAsHeaders(rsp);
         }
 
-        WebApp.get(Jenkins.get().servletContext).getSomeStapler()
+        WebApp.get(Jenkins.get().getServletContext()).getSomeStapler()
                 .invoke(req, rsp, Jenkins.get(), "/accessDenied");
     }
 }
diff --git a/core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java b/core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java
index 2714ec8eba63..0c9559bf140f 100644
--- a/core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java
+++ b/core/src/main/java/hudson/security/AuthenticationProcessingFilter2.java
@@ -26,14 +26,14 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.model.User;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import jenkins.security.SecurityListener;
 import jenkins.security.seed.UserSeedProperty;
 import jenkins.util.SystemProperties;
diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java
index f77385829730..db3001fc40f2 100644
--- a/core/src/main/java/hudson/security/AuthorizationStrategy.java
+++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java
@@ -47,7 +47,7 @@
 import jenkins.security.stapler.StaplerAccessibleType;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Controls authorization throughout Hudson.
@@ -241,7 +241,7 @@ public String getDisplayName() {
             }
 
             @Override
-            public @NonNull AuthorizationStrategy newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+            public @NonNull AuthorizationStrategy newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
                 return UNSECURED;
             }
         }
diff --git a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java
index b2a06024278b..8586fb0317a0 100644
--- a/core/src/main/java/hudson/security/BasicAuthenticationFilter.java
+++ b/core/src/main/java/hudson/security/BasicAuthenticationFilter.java
@@ -27,24 +27,24 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.model.User;
 import hudson.util.Scrambler;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.security.BasicApiTokenHelper;
 import jenkins.security.SecurityListener;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.CompatibleFilter;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -68,7 +68,7 @@
  * This causes the container to perform authentication, but there's no way
  * to find out whether the user has been successfully authenticated or not.
  * So to find this out, we then redirect the user to
- * {@link jenkins.model.Jenkins#doSecured(StaplerRequest, StaplerResponse) /secured/... page}.
+ * {@link jenkins.model.Jenkins#doSecured(StaplerRequest2, StaplerResponse2) /secured/... page}.
  *
  * <p>
  * The handler of the above URL checks if the user is authenticated,
@@ -91,7 +91,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-public class BasicAuthenticationFilter implements Filter {
+public class BasicAuthenticationFilter implements CompatibleFilter {
     private ServletContext servletContext;
 
     @Override
diff --git a/core/src/main/java/hudson/security/ChainedServletFilter.java b/core/src/main/java/hudson/security/ChainedServletFilter.java
index 74e1e463f565..98bc725c2b1a 100644
--- a/core/src/main/java/hudson/security/ChainedServletFilter.java
+++ b/core/src/main/java/hudson/security/ChainedServletFilter.java
@@ -24,27 +24,28 @@
 
 package hudson.security;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.kohsuke.stapler.CompatibleFilter;
 
 /**
  * Servlet {@link Filter} that chains multiple {@link Filter}s.
  *
  * @author Kohsuke Kawaguchi
  */
-public class ChainedServletFilter implements Filter {
+public class ChainedServletFilter implements CompatibleFilter {
     // array is assumed to be immutable once set
     protected volatile Filter[] filters;
 
diff --git a/core/src/main/java/hudson/security/ContainerAuthentication.java b/core/src/main/java/hudson/security/ContainerAuthentication.java
index be7bdc01ab62..571b5cc782e8 100644
--- a/core/src/main/java/hudson/security/ContainerAuthentication.java
+++ b/core/src/main/java/hudson/security/ContainerAuthentication.java
@@ -24,12 +24,12 @@
 
 package hudson.security;
 
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
diff --git a/core/src/main/java/hudson/security/FederatedLoginService.java b/core/src/main/java/hudson/security/FederatedLoginService.java
index 2d176290d8be..38d91f7da901 100644
--- a/core/src/main/java/hudson/security/FederatedLoginService.java
+++ b/core/src/main/java/hudson/security/FederatedLoginService.java
@@ -30,13 +30,13 @@
 import hudson.ExtensionPoint;
 import hudson.model.User;
 import hudson.model.UserProperty;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.Serializable;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -245,7 +245,7 @@ public UnclaimedIdentityException(FederatedIdentity identity) {
         }
 
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
             SecurityRealm sr = Jenkins.get().getSecurityRealm();
             if (sr.allowsSignup()) {
                 try {
diff --git a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
index 4c9dc1add7e7..a8657df65685 100644
--- a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
+++ b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java
@@ -35,13 +35,13 @@
 import hudson.model.Descriptor.FormException;
 import hudson.model.ManagementLink;
 import hudson.util.FormApply;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
 import jenkins.util.ServerTcpPort;
@@ -51,8 +51,8 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.POST;
 
 /**
@@ -108,7 +108,7 @@ public Category getCategory() {
     }
 
     @POST
-    public synchronized void doConfigure(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public synchronized void doConfigure(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         // for compatibility reasons, the actual value is stored in Jenkins
         JSONObject json = req.getSubmittedForm();
         BulkChange bc = new BulkChange(Jenkins.get());
@@ -125,7 +125,7 @@ public synchronized void doConfigure(StaplerRequest req, StaplerResponse rsp) th
         }
     }
 
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         // for compatibility reasons, the actual value is stored in Jenkins
         Jenkins j = Jenkins.get();
         j.checkPermission(Jenkins.ADMINISTER);
@@ -171,7 +171,7 @@ public boolean configure(StaplerRequest req, JSONObject json) throws FormExcepti
         return result;
     }
 
-    private boolean configureDescriptor(StaplerRequest req, JSONObject json, Descriptor<?> d) throws FormException {
+    private boolean configureDescriptor(StaplerRequest2 req, JSONObject json, Descriptor<?> d) throws FormException {
         // collapse the structure to remain backward compatible with the JSON structure before 1.
         String name = d.getJsonSafeClassName();
         JSONObject js = json.has(name) ? json.getJSONObject(name) : new JSONObject(); // if it doesn't have the property, the method returns invalid null object.
diff --git a/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java b/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java
index 786df5d72879..c2c0d8a6abe1 100644
--- a/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java
+++ b/core/src/main/java/hudson/security/HttpSessionContextIntegrationFilter2.java
@@ -25,13 +25,13 @@
 package hudson.security;
 
 import hudson.model.User;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import jenkins.security.seed.UserSeedProperty;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;
diff --git a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
index e99dfdc14f74..950cf3614c82 100644
--- a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
+++ b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java
@@ -24,19 +24,19 @@
 
 package hudson.security;
 
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
+import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
 
 import hudson.Functions;
 import hudson.Util;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.springframework.security.authentication.InsufficientAuthenticationException;
diff --git a/core/src/main/java/hudson/security/HudsonFilter.java b/core/src/main/java/hudson/security/HudsonFilter.java
index 333180b32ead..4438874b6030 100644
--- a/core/src/main/java/hudson/security/HudsonFilter.java
+++ b/core/src/main/java/hudson/security/HudsonFilter.java
@@ -26,17 +26,18 @@
 
 import static java.util.logging.Level.SEVERE;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
+import org.kohsuke.stapler.CompatibleFilter;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.web.authentication.RememberMeServices;
@@ -52,7 +53,7 @@
  * @author Kohsuke Kawaguchi
  * @since 1.160
  */
-public class HudsonFilter implements Filter {
+public class HudsonFilter implements CompatibleFilter {
     /**
      * The SecurityRealm specific filter.
      */
diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index bd122244c7e2..1a6ebe66f749 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -24,7 +24,7 @@
 
 package hudson.security;
 
-import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
+import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
 
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -47,6 +47,15 @@
 import hudson.util.Protector;
 import hudson.util.Scrambler;
 import hudson.util.XStream2;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.nio.charset.StandardCharsets;
@@ -67,15 +76,6 @@
 import java.util.regex.Pattern;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import jenkins.model.Jenkins;
 import jenkins.security.FIPS140;
 import jenkins.security.SecurityListener;
@@ -85,14 +85,15 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.CompatibleFilter;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.ForwardToView;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.mindrot.jbcrypt.BCrypt;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -236,10 +237,10 @@ protected UserDetails authenticate2(String username, String password) throws Aut
     @Override
     public HttpResponse commenceSignup(final FederatedIdentity identity) {
         // store the identity in the session so that we can use this later
-        Stapler.getCurrentRequest().getSession().setAttribute(FEDERATED_IDENTITY_SESSION_KEY, identity);
+        Stapler.getCurrentRequest2().getSession().setAttribute(FEDERATED_IDENTITY_SESSION_KEY, identity);
         return new ForwardToView(this, "signupWithFederatedIdentity.jelly") {
             @Override
-            public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+            public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
                 SignupInfo si = new SignupInfo(identity);
                 si.errorMessage = Messages.HudsonPrivateSecurityRealm_WouldYouLikeToSignUp(identity.getPronoun(), identity.getIdentifier());
                 req.setAttribute("data", si);
@@ -253,7 +254,7 @@ public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object nod
      * with {@link #commenceSignup}.
      */
     @RequirePOST
-    public User doCreateAccountWithFederatedIdentity(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public User doCreateAccountWithFederatedIdentity(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         User u = _doCreateAccount(req, rsp, "signupWithFederatedIdentity.jelly");
         if (u != null)
             ((FederatedIdentity) req.getSession().getAttribute(FEDERATED_IDENTITY_SESSION_KEY)).addTo(u);
@@ -266,11 +267,11 @@ public User doCreateAccountWithFederatedIdentity(StaplerRequest req, StaplerResp
      * Creates an user account. Used for self-registration.
      */
     @RequirePOST
-    public User doCreateAccount(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public User doCreateAccount(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         return _doCreateAccount(req, rsp, "signup.jelly");
     }
 
-    private User _doCreateAccount(StaplerRequest req, StaplerResponse rsp, String formView) throws ServletException, IOException {
+    private User _doCreateAccount(StaplerRequest2 req, StaplerResponse2 rsp, String formView) throws ServletException, IOException {
         if (!allowsSignup())
             throw HttpResponses.errorWithoutStack(SC_UNAUTHORIZED, "User sign up is prohibited");
 
@@ -287,7 +288,7 @@ private User _doCreateAccount(StaplerRequest req, StaplerResponse rsp, String fo
     /**
      * Lets the current user silently login as the given user and report back accordingly.
      */
-    private void loginAndTakeBack(StaplerRequest req, StaplerResponse rsp, User u) throws ServletException, IOException {
+    private void loginAndTakeBack(StaplerRequest2 req, StaplerResponse2 rsp, User u) throws ServletException, IOException {
         HttpSession session = req.getSession(false);
         if (session != null) {
             // avoid session fixation
@@ -309,11 +310,11 @@ private void loginAndTakeBack(StaplerRequest req, StaplerResponse rsp, User u) t
     /**
      * Creates a user account. Used by admins.
      *
-     * This version behaves differently from {@link #doCreateAccount(StaplerRequest, StaplerResponse)} in that
+     * This version behaves differently from {@link #doCreateAccount(StaplerRequest2, StaplerResponse2)} in that
      * this is someone creating another user.
      */
     @RequirePOST
-    public void doCreateAccountByAdmin(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doCreateAccountByAdmin(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         createAccountByAdmin(req, rsp, "addUser.jelly", "."); // send the user back to the listing page on success
     }
 
@@ -321,7 +322,7 @@ public void doCreateAccountByAdmin(StaplerRequest req, StaplerResponse rsp) thro
      * Creates a user account. Requires {@link Jenkins#ADMINISTER}
      */
     @Restricted(NoExternalUse.class)
-    public User createAccountByAdmin(StaplerRequest req, StaplerResponse rsp, String addUserView, String successView) throws IOException, ServletException {
+    public User createAccountByAdmin(StaplerRequest2 req, StaplerResponse2 rsp, String addUserView, String successView) throws IOException, ServletException {
         checkPermission(Jenkins.ADMINISTER);
         User u = createAccount(req, rsp, false, addUserView);
         if (u != null && successView != null) {
@@ -340,7 +341,7 @@ public User createAccountByAdmin(StaplerRequest req, StaplerResponse rsp, String
      * @throws AccountCreationFailedException if account creation failed due to invalid form input
      */
     @Restricted(NoExternalUse.class)
-    public User createAccountFromSetupWizard(StaplerRequest req) throws IOException, AccountCreationFailedException {
+    public User createAccountFromSetupWizard(StaplerRequest2 req) throws IOException, AccountCreationFailedException {
         checkPermission(Jenkins.ADMINISTER);
         SignupInfo si = validateAccountCreationForm(req, false);
         if (!si.errors.isEmpty()) {
@@ -366,7 +367,7 @@ private String getErrorMessages(SignupInfo si) {
      * This can be run by anyone, but only to create the very first user account.
      */
     @RequirePOST
-    public void doCreateFirstAccount(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         if (hasSomeUser()) {
             rsp.sendError(SC_UNAUTHORIZED, "First user was already created");
             return;
@@ -400,7 +401,7 @@ private void tryToMakeAdmin(User u) {
      *      null if failed. The browser is already redirected to retry by the time this method returns.
      *      a valid {@link User} object if the user creation was successful.
      */
-    private User createAccount(StaplerRequest req, StaplerResponse rsp, boolean validateCaptcha, String formView) throws ServletException, IOException {
+    private User createAccount(StaplerRequest2 req, StaplerResponse2 rsp, boolean validateCaptcha, String formView) throws ServletException, IOException {
         SignupInfo si = validateAccountCreationForm(req, validateCaptcha);
 
         if (!si.errors.isEmpty()) {
@@ -416,11 +417,11 @@ private User createAccount(StaplerRequest req, StaplerResponse rsp, boolean vali
      * @param req              the request to process
      * @param validateCaptcha  whether to attempt to validate a captcha in the request
      *
-     * @return a {@link SignupInfo#SignupInfo(StaplerRequest) SignupInfo from given request}, with {@link
+     * @return a {@link SignupInfo#SignupInfo(StaplerRequest2) SignupInfo from given request}, with {@link
      * SignupInfo#errors} containing errors (keyed by field name), if any of the supported fields are invalid
      */
     @SuppressFBWarnings(value = "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", justification = "written to by Stapler")
-    private SignupInfo validateAccountCreationForm(StaplerRequest req, boolean validateCaptcha) {
+    private SignupInfo validateAccountCreationForm(StaplerRequest2 req, boolean validateCaptcha) {
         // form field validation
         // this pattern needs to be generalized and moved to stapler
         SignupInfo si = new SignupInfo(req);
@@ -632,7 +633,7 @@ public static final class SignupInfo {
         public SignupInfo() {
         }
 
-        public SignupInfo(StaplerRequest req) {
+        public SignupInfo(StaplerRequest2 req) {
             req.bindParameters(this);
         }
 
@@ -707,7 +708,7 @@ public boolean isPasswordCorrect(String candidate) {
 
         public String getProtectedPassword() {
             // put session Id in it to prevent a replay attack.
-            return Protector.protect(Stapler.getCurrentRequest().getSession().getId() + ':' + getPassword());
+            return Protector.protect(Stapler.getCurrentRequest2().getSession().getId() + ':' + getPassword());
         }
 
         public String getUsername() {
@@ -825,7 +826,7 @@ public String getDisplayName() {
             }
 
             @Override
-            public Details newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+            public Details newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
                 if (req == null) {
                     // Should never happen, see newInstance() Javadoc
                     throw new FormException("Stapler request is missing in the call", "staplerRequest");
@@ -858,7 +859,7 @@ public Details newInstance(StaplerRequest req, JSONObject formData) throws FormE
                 }
 
                 if (data != null) {
-                    String prefix = Stapler.getCurrentRequest().getSession().getId() + ':';
+                    String prefix = Stapler.getCurrentRequest2().getSession().getId() + ':';
                     if (data.startsWith(prefix)) {
                         return Details.fromHashedPassword(data.substring(prefix.length()));
                     }
@@ -1153,7 +1154,7 @@ public FormValidation doCheckAllowsSignup(@QueryParameter boolean value) {
         }
     }
 
-    private static final Filter CREATE_FIRST_USER_FILTER = new Filter() {
+    private static final Filter CREATE_FIRST_USER_FILTER = new CompatibleFilter() {
         @Override
         public void init(FilterConfig config) throws ServletException {
         }
diff --git a/core/src/main/java/hudson/security/LegacySecurityRealm.java b/core/src/main/java/hudson/security/LegacySecurityRealm.java
index 1e869475caf2..94c895782f74 100644
--- a/core/src/main/java/hudson/security/LegacySecurityRealm.java
+++ b/core/src/main/java/hudson/security/LegacySecurityRealm.java
@@ -28,10 +28,10 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.model.Descriptor;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterConfig;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
diff --git a/core/src/main/java/hudson/security/NoopFilter.java b/core/src/main/java/hudson/security/NoopFilter.java
index 3000bb2e81c0..2b2db184fc5f 100644
--- a/core/src/main/java/hudson/security/NoopFilter.java
+++ b/core/src/main/java/hudson/security/NoopFilter.java
@@ -24,20 +24,21 @@
 
 package hudson.security;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import org.kohsuke.stapler.CompatibleFilter;
 
 /**
  * {@link Filter} that does nothing.
  *
  * @author Kohsuke Kawaguchi
  */
-public class NoopFilter implements Filter {
+public class NoopFilter implements CompatibleFilter {
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
     }
diff --git a/core/src/main/java/hudson/security/RememberMeServicesProxy.java b/core/src/main/java/hudson/security/RememberMeServicesProxy.java
index 2220e313b0cc..1020002794ed 100644
--- a/core/src/main/java/hudson/security/RememberMeServicesProxy.java
+++ b/core/src/main/java/hudson/security/RememberMeServicesProxy.java
@@ -24,8 +24,8 @@
 
 package hudson.security;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.security.ConfidentialStore;
 import org.kohsuke.accmod.Restricted;
diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index b969a57eb781..d10e7994ae22 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -36,6 +36,14 @@
 import hudson.security.captcha.CaptchaSupport;
 import hudson.util.DescriptorList;
 import hudson.util.PluginServletFilter;
+import io.jenkins.servlet.FilterConfigWrapper;
+import io.jenkins.servlet.FilterWrapper;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -44,16 +52,12 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
 import jenkins.model.IdStrategy;
 import jenkins.model.Jenkins;
 import jenkins.security.AcegiSecurityExceptionFilter;
 import jenkins.security.AuthenticationSuccessHandler;
 import jenkins.security.BasicHeaderProcessor;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.SystemProperties;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
@@ -62,7 +66,9 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
@@ -264,7 +270,7 @@ public boolean canLogOut() {
      * of Hudson, but you can return arbitrary URL.
      *
      * @param req
-     *      {@link StaplerRequest} that represents the current request. Primarily so that
+     *      {@link StaplerRequest2} that represents the current request. Primarily so that
      *      you can get the context path. By the time this method is called, the session
      *      is already invalidated. Never null.
      * @param auth
@@ -272,14 +278,31 @@ public boolean canLogOut() {
      *      This parameter allows you to redirect people to different pages depending on who they are.
      * @return
      *      never null.
+     * @since TODO
+     * @see #doLogout(StaplerRequest2, StaplerResponse2)
+     */
+    protected String getPostLogOutUrl2(StaplerRequest2 req, Authentication auth) {
+        if (Util.isOverridden(SecurityRealm.class, getClass(), "getPostLogOutUrl2", StaplerRequest.class, Authentication.class)) {
+            return getPostLogOutUrl2(StaplerRequest.fromStaplerRequest2(req), auth);
+        } else {
+            return getPostLogOutUrl2Impl(req, auth);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #getPostLogOutUrl2(StaplerRequest2, Authentication)}
      * @since 2.266
-     * @see #doLogout(StaplerRequest, StaplerResponse)
      */
+    @Deprecated
     protected String getPostLogOutUrl2(StaplerRequest req, Authentication auth) {
+        return getPostLogOutUrl2Impl(StaplerRequest.toStaplerRequest2(req), auth);
+    }
+
+    private String getPostLogOutUrl2Impl(StaplerRequest2 req, Authentication auth) {
         if (Util.isOverridden(SecurityRealm.class, getClass(), "getPostLogOutUrl", StaplerRequest.class, org.acegisecurity.Authentication.class) && !insideGetPostLogOutUrl.get()) {
             insideGetPostLogOutUrl.set(true);
             try {
-                return getPostLogOutUrl(req, org.acegisecurity.Authentication.fromSpring(auth));
+                return getPostLogOutUrl(StaplerRequest.fromStaplerRequest2(req), org.acegisecurity.Authentication.fromSpring(auth));
             } finally {
                 insideGetPostLogOutUrl.set(false);
             }
@@ -295,7 +318,7 @@ protected String getPostLogOutUrl2(StaplerRequest req, Authentication auth) {
      */
     @Deprecated
     protected String getPostLogOutUrl(StaplerRequest req, org.acegisecurity.Authentication auth) {
-        return getPostLogOutUrl2(req, auth.toSpring());
+        return getPostLogOutUrl2(StaplerRequest.toStaplerRequest2(req), auth.toSpring());
     }
 
     public CaptchaSupport getCaptchaSupport() {
@@ -315,11 +338,37 @@ public List<Descriptor<CaptchaSupport>> getCaptchaSupportDescriptors() {
      *
      * <p>
      * The default implementation erases the session and do a few other clean up, then
-     * redirect the user to the URL specified by {@link #getPostLogOutUrl2(StaplerRequest, Authentication)}.
+     * redirect the user to the URL specified by {@link #getPostLogOutUrl2(StaplerRequest2, Authentication)}.
      *
+     * @since TODO
+     */
+    public void doLogout(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(SecurityRealm.class, getClass(), "doLogout", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                doLogout(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            doLogoutImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doLogout(StaplerRequest2, StaplerResponse2)}
      * @since 1.314
      */
-    public void doLogout(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doLogout(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doLogoutImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    void doLogoutImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         HttpSession session = req.getSession(false);
         if (session != null)
             session.invalidate();
@@ -333,7 +382,7 @@ public void doLogout(StaplerRequest req, StaplerResponse rsp) throws IOException
         rsp.sendRedirect2(getPostLogOutUrl2(req, auth));
     }
 
-    private void resetRememberMeCookie(StaplerRequest req, StaplerResponse rsp, String contextPath) {
+    private void resetRememberMeCookie(StaplerRequest2 req, StaplerResponse2 rsp, String contextPath) {
         Cookie cookie = new Cookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, "");
         cookie.setMaxAge(0);
         cookie.setSecure(req.isSecure());
@@ -342,7 +391,7 @@ private void resetRememberMeCookie(StaplerRequest req, StaplerResponse rsp, Stri
         rsp.addCookie(cookie);
     }
 
-    private void clearStaleSessionCookies(StaplerRequest req, StaplerResponse rsp, String contextPath) {
+    private void clearStaleSessionCookies(StaplerRequest2 req, StaplerResponse2 rsp, String contextPath) {
         /* While "executableWar.jetty.sessionIdCookieName" and
          * "executableWar.jetty.disableCustomSessionIdCookieName"
          * <https://github.com/jenkinsci/extras-executable-war/blob/6558df699d1366b18d045d2ffda3e970df377873/src/main/java/Main.java#L79-L97>
@@ -516,7 +565,7 @@ public HttpResponse commenceSignup(FederatedIdentity identity) {
     /**
      * Generates a captcha image.
      */
-    public final void doCaptcha(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public final void doCaptcha(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (captchaSupport != null) {
             String id = req.getSession().getId();
             rsp.setContentType("image/png");
@@ -533,7 +582,7 @@ public final void doCaptcha(StaplerRequest req, StaplerResponse rsp) throws IOEx
      */
     protected final boolean validateCaptcha(String text) {
         if (captchaSupport != null) {
-            String id = Stapler.getCurrentRequest().getSession().getId();
+            String id = Stapler.getCurrentRequest2().getSession().getId();
             return captchaSupport.validateCaptcha(id, text);
         }
 
@@ -570,10 +619,29 @@ public synchronized SecurityComponents getSecurityComponents() {
      * For other plugins that want to contribute {@link Filter}, see
      * {@link PluginServletFilter}.
      *
-     * @since 1.271
+     * @since TODO
      */
     public Filter createFilter(FilterConfig filterConfig) {
-        LOGGER.entering(SecurityRealm.class.getName(), "createFilter");
+        if (Util.isOverridden(SecurityRealm.class, getClass(), "createFilter", javax.servlet.FilterConfig.class)) {
+            return FilterWrapper.toJakartaFilter(createFilter(
+                    filterConfig != null ? FilterConfigWrapper.fromJakartaFilterConfig(filterConfig) : null));
+        } else {
+            return createFilterImpl(filterConfig);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #createFilter(FilterConfig)}
+     * @since 1.271
+     */
+    @Deprecated
+    public javax.servlet.Filter createFilter(javax.servlet.FilterConfig filterConfig) {
+        return FilterWrapper.fromJakartaFilter(createFilterImpl(
+                filterConfig != null ? FilterConfigWrapper.toJakartaFilterConfig(filterConfig) : null));
+    }
+
+    private Filter createFilterImpl(FilterConfig filterConfig) {
+        LOGGER.entering(SecurityRealm.class.getName(), "createFilterImpl");
 
         SecurityComponents sc = getSecurityComponents();
         List<Filter> filters = new ArrayList<>();
@@ -639,7 +707,7 @@ protected final List<Filter> commonFilters() {
     @Restricted(DoNotUse.class)
     public static String getFrom() {
         String from = null;
-        final StaplerRequest request = Stapler.getCurrentRequest();
+        final StaplerRequest2 request = Stapler.getCurrentRequest2();
 
         // Try to obtain a return point from the query parameter
         if (request != null) {
@@ -734,7 +802,7 @@ public String getDisplayName() {
             }
 
             @Override
-            public SecurityRealm newInstance(StaplerRequest req, JSONObject formData) throws Descriptor.FormException {
+            public SecurityRealm newInstance(StaplerRequest2 req, JSONObject formData) throws Descriptor.FormException {
                 return NO_AUTHENTICATION;
             }
         }
diff --git a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
index 0e8e19d90a06..9b6974a3f2e4 100644
--- a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
+++ b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java
@@ -27,6 +27,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.model.User;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.security.MessageDigest;
 import java.util.Arrays;
 import java.util.Date;
@@ -34,8 +36,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.security.HMACConfidentialKey;
 import jenkins.security.ImpersonatingUserDetailsService2;
diff --git a/core/src/main/java/hudson/security/UnwrapSecurityExceptionFilter.java b/core/src/main/java/hudson/security/UnwrapSecurityExceptionFilter.java
index 2abfea11eb71..683725b2fe0d 100644
--- a/core/src/main/java/hudson/security/UnwrapSecurityExceptionFilter.java
+++ b/core/src/main/java/hudson/security/UnwrapSecurityExceptionFilter.java
@@ -24,14 +24,14 @@
 
 package hudson.security;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import org.apache.commons.jelly.JellyTagException;
+import org.kohsuke.stapler.CompatibleFilter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.access.ExceptionTranslationFilter;
@@ -43,7 +43,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-public class UnwrapSecurityExceptionFilter implements Filter {
+public class UnwrapSecurityExceptionFilter implements CompatibleFilter {
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
     }
diff --git a/core/src/main/java/hudson/security/csrf/CrumbExclusion.java b/core/src/main/java/hudson/security/csrf/CrumbExclusion.java
index 4f4135bd9a88..e7d8d67a219f 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbExclusion.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbExclusion.java
@@ -8,11 +8,16 @@
 
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
+import hudson.Util;
+import io.jenkins.servlet.FilterChainWrapper;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import io.jenkins.servlet.http.HttpServletRequestWrapper;
+import io.jenkins.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * Allows plugins to define exceptions to the CSRF protection filter.
@@ -32,7 +37,57 @@ public abstract class CrumbExclusion implements ExtensionPoint {
      *      true to indicate that the callee had processed this request
      *      (for example by reporting an error, or by executing the rest of the chain.)
      */
-    public abstract boolean process(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException;
+    public /* abstract */ boolean process(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
+        if (Util.isOverridden(
+                CrumbExclusion.class,
+                getClass(),
+                "process",
+                javax.servlet.http.HttpServletRequest.class,
+                javax.servlet.http.HttpServletResponse.class,
+                javax.servlet.FilterChain.class)) {
+            try {
+                return process(
+                        HttpServletRequestWrapper.fromJakartaHttpServletRequest(request),
+                        HttpServletResponseWrapper.fromJakartaHttpServletResponse(response),
+                        FilterChainWrapper.fromJakartaFilterChain(chain));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + CrumbExclusion.class.getSimpleName() + ".process methods");
+        }
+    }
+
+    /**
+     * @deprecated use {@link #process(HttpServletRequest, HttpServletResponse, FilterChain)}
+     */
+    @Deprecated
+    public boolean process(
+            javax.servlet.http.HttpServletRequest request,
+            javax.servlet.http.HttpServletResponse response,
+            javax.servlet.FilterChain chain)
+            throws IOException, javax.servlet.ServletException {
+        if (Util.isOverridden(
+                CrumbExclusion.class,
+                getClass(),
+                "process",
+                HttpServletRequest.class,
+                HttpServletResponse.class,
+                FilterChain.class)) {
+            try {
+                return process(
+                        HttpServletRequestWrapper.toJakartaHttpServletRequest(request),
+                        HttpServletResponseWrapper.toJakartaHttpServletResponse(response),
+                        FilterChainWrapper.toJakartaFilterChain(chain));
+            } catch (ServletException e) {
+                throw ServletExceptionWrapper.fromJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + CrumbExclusion.class.getSimpleName() + ".process methods");
+        }
+    }
 
     public static ExtensionList<CrumbExclusion> all() {
         return ExtensionList.lookup(CrumbExclusion.class);
diff --git a/core/src/main/java/hudson/security/csrf/CrumbFilter.java b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
index 8b4b558938e7..6835a4365a3c 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbFilter.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
@@ -7,6 +7,14 @@
 package hudson.security.csrf;
 
 import hudson.util.MultipartFormDataParser;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,20 +22,12 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 import org.kohsuke.MetaInfServices;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.CompatibleFilter;
 import org.kohsuke.stapler.ForwardToView;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
@@ -38,7 +38,7 @@
  *
  * @author dty
  */
-public class CrumbFilter implements Filter {
+public class CrumbFilter implements CompatibleFilter {
     /**
      * Because servlet containers generally don't specify the ordering of the initialization
      * (and different implementations indeed do this differently --- See JENKINS-3878),
diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
index cd0c51b03fb0..491ec735b591 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
@@ -6,26 +6,31 @@
 
 package hudson.security.csrf;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.DescriptorExtensionList;
 import hudson.ExtensionPoint;
+import hudson.Util;
 import hudson.init.Initializer;
 import hudson.model.Api;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
 import hudson.util.MultipartFormDataParser;
+import io.jenkins.servlet.ServletRequestWrapper;
+import io.jenkins.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
 import jenkins.model.Jenkins;
 import jenkins.security.stapler.StaplerAccessibleType;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -64,7 +69,7 @@ public String getCrumbRequestField() {
      */
     @Exported
     public String getCrumb() {
-        return getCrumb(Stapler.getCurrentRequest());
+        return getCrumb(Stapler.getCurrentRequest2());
     }
 
     /**
@@ -89,6 +94,14 @@ public String getCrumb(ServletRequest request) {
         return crumb;
     }
 
+    /**
+     * @deprecated use {@link #getCrumb(ServletRequest)}
+     */
+    @Deprecated
+    public String getCrumb(javax.servlet.ServletRequest request) {
+        return getCrumb(request != null ? wrap(request) : null);
+    }
+
     /**
      * Create a crumb value based on user specific information in the request.
      * The crumb should be generated by building a cryptographic hash of:
@@ -98,7 +111,30 @@ public String getCrumb(ServletRequest request) {
      *  <li>an implementation specific guarded secret.
      * </ul>
      */
-    protected abstract String issueCrumb(ServletRequest request, String salt);
+    protected /* abstract */ String issueCrumb(ServletRequest request, String salt) {
+        return Util.ifOverridden(
+                () -> issueCrumb(
+                        request != null ? wrap(request) : null, salt),
+                CrumbIssuer.class,
+                getClass(),
+                "issueCrumb",
+                javax.servlet.ServletRequest.class,
+                String.class);
+    }
+
+    /**
+     * @deprecated use {@link #issueCrumb(ServletRequest, String)}
+     */
+    @Deprecated
+    protected String issueCrumb(javax.servlet.ServletRequest request, String salt) {
+        return Util.ifOverridden(
+                () -> issueCrumb(request != null ? wrap(request) : null, salt),
+                CrumbIssuer.class,
+                getClass(),
+                "issueCrumb",
+                ServletRequest.class,
+                String.class);
+    }
 
     /**
      * Get a crumb from a request parameter and validate it against other data
@@ -126,12 +162,63 @@ public boolean validateCrumb(ServletRequest request, MultipartFormDataParser par
         return validateCrumb(request, crumbSalt, parser.get(crumbField));
     }
 
+    /**
+     * @deprecated use {@link #validateCrumb(ServletRequest, MultipartFormDataParser)}
+     */
+    @Deprecated
+    public boolean validateCrumb(javax.servlet.ServletRequest request, MultipartFormDataParser parser) {
+        return validateCrumb(request != null ? wrap(request) : null, parser);
+    }
+
+    private static ServletRequest wrap(@NonNull javax.servlet.ServletRequest request) {
+        if (request instanceof javax.servlet.http.HttpServletRequest httpRequest) {
+            return HttpServletRequestWrapper.toJakartaHttpServletRequest(httpRequest);
+        } else {
+            return ServletRequestWrapper.toJakartaServletRequest(request);
+        }
+    }
+
     /**
      * Validate a previously created crumb against information in the current request.
      *
      * @param crumb The previously generated crumb to validate against information in the current request
      */
-    public abstract boolean validateCrumb(ServletRequest request, String salt, String crumb);
+    public /* abstract */ boolean validateCrumb(ServletRequest request, String salt, String crumb) {
+        return Util.ifOverridden(
+                () -> validateCrumb(
+                        request != null ? wrap(request) : null,
+                        salt,
+                        crumb),
+                CrumbIssuer.class,
+                getClass(),
+                "validateCrumb",
+                javax.servlet.ServletRequest.class,
+                String.class,
+                String.class);
+    }
+
+    private static javax.servlet.ServletRequest wrap(@NonNull ServletRequest request) {
+        if (request instanceof HttpServletRequest httpRequest) {
+            return HttpServletRequestWrapper.fromJakartaHttpServletRequest(httpRequest);
+        } else {
+            return ServletRequestWrapper.fromJakartaServletRequest(request);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #validateCrumb(ServletRequest, String, String)}
+     */
+    @Deprecated
+    public boolean validateCrumb(javax.servlet.ServletRequest request, String salt, String crumb) {
+        return Util.ifOverridden(
+                () -> validateCrumb(request != null ? wrap(request) : null, salt, crumb),
+                CrumbIssuer.class,
+                getClass(),
+                "validateCrumb",
+                ServletRequest.class,
+                String.class,
+                String.class);
+    }
 
     /**
      * Access global configuration for the crumb issuer.
@@ -157,15 +244,15 @@ public Api getApi() {
      */
     @Initializer
     public static void initStaplerCrumbIssuer() {
-        WebApp.get(Jenkins.get().servletContext).setCrumbIssuer(new org.kohsuke.stapler.CrumbIssuer() {
+        WebApp.get(Jenkins.get().getServletContext()).setCrumbIssuer(new org.kohsuke.stapler.CrumbIssuer() {
             @Override
-            public String issueCrumb(StaplerRequest request) {
+            public String issueCrumb(StaplerRequest2 request) {
                 CrumbIssuer ci = Jenkins.get().getCrumbIssuer();
                 return ci != null ? ci.getCrumb(request) : DEFAULT.issueCrumb(request);
             }
 
             @Override
-            public void validateCrumb(StaplerRequest request, String submittedCrumb) {
+            public void validateCrumb(StaplerRequest2 request, String submittedCrumb) {
                 CrumbIssuer ci = Jenkins.get().getCrumbIssuer();
                 if (ci == null) {
                     DEFAULT.validateCrumb(request, submittedCrumb);
@@ -184,7 +271,7 @@ public static class RestrictedApi extends Api {
             super(instance);
         }
 
-        @Override public void doXml(StaplerRequest req, StaplerResponse rsp, @QueryParameter String xpath, @QueryParameter String wrapper, @QueryParameter String tree, @QueryParameter int depth) throws IOException, ServletException {
+        @Override public void doXml(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter String xpath, @QueryParameter String wrapper, @QueryParameter String tree, @QueryParameter int depth) throws IOException, ServletException {
             setHeaders(rsp);
             String text;
             CrumbIssuer ci = (CrumbIssuer) bean;
diff --git a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
index 89c7da39e7b4..7a3bc0c9b1d2 100644
--- a/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/DefaultCrumbIssuer.java
@@ -12,13 +12,13 @@
 import hudson.Util;
 import hudson.model.ModelObject;
 import hudson.model.PersistentDescriptor;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 import jenkins.model.Jenkins;
 import jenkins.security.HexStringConfidentialKey;
 import jenkins.util.SystemProperties;
@@ -27,7 +27,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.springframework.security.core.Authentication;
 
 /**
@@ -69,6 +69,7 @@ private synchronized void initializeMessageDigest() {
     }
 
     @Override
+    @SuppressFBWarnings(value = "NM_WRONG_PACKAGE", justification = "false positive")
     protected synchronized String issueCrumb(ServletRequest request, String salt) {
         if (request instanceof HttpServletRequest) {
             if (md != null) {
@@ -135,7 +136,7 @@ public String getDisplayName() {
         }
 
         @Override
-        public DefaultCrumbIssuer newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public DefaultCrumbIssuer newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             if (req == null) {
                 // This state is prohibited according to the Javadoc of the super method.
                 throw new FormException("DefaultCrumbIssuer new instance method is called for null Stapler request. "
diff --git a/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java b/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java
index 6faa5dfc24e0..61a861fefbe3 100644
--- a/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java
+++ b/core/src/main/java/hudson/security/csrf/GlobalCrumbIssuerConfiguration.java
@@ -35,7 +35,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Show the crumb configuration to the system config page.
@@ -50,7 +50,7 @@ public class GlobalCrumbIssuerConfiguration extends GlobalConfiguration {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         // for compatibility reasons, the actual value is stored in Jenkins
         Jenkins j = Jenkins.get();
 
diff --git a/core/src/main/java/hudson/slaves/Cloud.java b/core/src/main/java/hudson/slaves/Cloud.java
index 6552685a05d0..3bff60c0d0ad 100644
--- a/core/src/main/java/hudson/slaves/Cloud.java
+++ b/core/src/main/java/hudson/slaves/Cloud.java
@@ -47,11 +47,11 @@
 import hudson.slaves.NodeProvisioner.PlannedNode;
 import hudson.util.DescriptorList;
 import hudson.util.FormApply;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.concurrent.Future;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
@@ -60,7 +60,8 @@
 import org.kohsuke.stapler.HttpRedirect;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
 
@@ -319,7 +320,7 @@ public HttpResponse doDoDelete() throws IOException {
      * Accepts the update to the node configuration.
      */
     @POST
-    public HttpResponse doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+    public HttpResponse doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         checkPermission(Jenkins.ADMINISTER);
 
         Jenkins j = Jenkins.get();
@@ -340,7 +341,26 @@ public HttpResponse doConfigSubmit(StaplerRequest req, StaplerResponse rsp) thro
 
     }
 
+    /**
+     * @since TODO
+     */
+    public Cloud reconfigure(@NonNull final StaplerRequest2 req, JSONObject form) throws Descriptor.FormException {
+        if (Util.isOverridden(Cloud.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) {
+            return reconfigure(StaplerRequest.fromStaplerRequest2(req), form);
+        } else {
+            return reconfigureImpl(req, form);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #reconfigure(StaplerRequest2, JSONObject)}
+     */
+    @Deprecated
     public Cloud reconfigure(@NonNull final StaplerRequest req, JSONObject form) throws Descriptor.FormException {
+        return reconfigureImpl(StaplerRequest.toStaplerRequest2(req), form);
+    }
+
+    private Cloud reconfigureImpl(@NonNull final StaplerRequest2 req, JSONObject form) throws Descriptor.FormException {
         if (form == null)     return null;
         return getDescriptor().newInstance(req, form);
     }
diff --git a/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java b/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
index be50bc982062..dd3ec84b131d 100644
--- a/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
+++ b/core/src/main/java/hudson/slaves/EnvironmentVariablesNodeProperty.java
@@ -98,7 +98,7 @@ public String getDisplayName() {
 
         public String getHelpPage() {
             // yes, I know this is a hack.
-            ComputerSet object = Stapler.getCurrentRequest().findAncestorObject(ComputerSet.class);
+            ComputerSet object = Stapler.getCurrentRequest2().findAncestorObject(ComputerSet.class);
             if (object != null) {
                 // we're on a node configuration page, show show that help page
                 return "/help/system-config/nodeEnvironmentVariables.html";
diff --git a/core/src/main/java/hudson/slaves/NodeDescriptor.java b/core/src/main/java/hudson/slaves/NodeDescriptor.java
index 8db1eb48139f..848cabbdf747 100644
--- a/core/src/main/java/hudson/slaves/NodeDescriptor.java
+++ b/core/src/main/java/hudson/slaves/NodeDescriptor.java
@@ -34,14 +34,14 @@
 import hudson.model.Slave;
 import hudson.util.DescriptorList;
 import hudson.util.FormValidation;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * {@link Descriptor} for {@link Slave}.
@@ -83,7 +83,7 @@ public final String newInstanceDetailPage() {
      * @param name
      *      Name of the new node.
      */
-    public void handleNewNodePage(ComputerSet computerSet, String name, StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void handleNewNodePage(ComputerSet computerSet, String name, StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         computerSet.checkName(name);
         req.setAttribute("descriptor", this);
         req.getView(computerSet, "_new.jelly").forward(req, rsp);
diff --git a/core/src/main/java/hudson/slaves/NodeProperty.java b/core/src/main/java/hudson/slaves/NodeProperty.java
index 8605edcf4515..bcb2a2422025 100644
--- a/core/src/main/java/hudson/slaves/NodeProperty.java
+++ b/core/src/main/java/hudson/slaves/NodeProperty.java
@@ -30,6 +30,7 @@
 import hudson.ExtensionPoint;
 import hudson.FilePath;
 import hudson.Launcher;
+import hudson.Util;
 import hudson.model.AbstractBuild;
 import hudson.model.BuildListener;
 import hudson.model.Descriptor.FormException;
@@ -48,6 +49,7 @@
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Extensible property of {@link Node}.
@@ -171,8 +173,25 @@ public void buildEnvVars(@NonNull EnvVars env, @NonNull TaskListener listener) t
         // default is no-op
     }
 
+    @Override
+    public NodeProperty<?> reconfigure(StaplerRequest2 req, JSONObject form) throws FormException {
+        if (Util.isOverridden(NodeProperty.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) {
+            return reconfigure(StaplerRequest.fromStaplerRequest2(req), form);
+        } else {
+            return reconfigureImpl(req, form);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #reconfigure(StaplerRequest2, JSONObject)}
+     */
+    @Deprecated
     @Override
     public NodeProperty<?> reconfigure(StaplerRequest req, JSONObject form) throws FormException {
+        return reconfigureImpl(StaplerRequest.toStaplerRequest2(req), form);
+    }
+
+    private NodeProperty<?> reconfigureImpl(StaplerRequest2 req, JSONObject form) throws FormException {
         return form == null ? null : getDescriptor().newInstance(req, form);
     }
 
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index dbb579b9b3ae..4165f53a7245 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -97,8 +97,8 @@
 import org.kohsuke.stapler.HttpRedirect;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -788,7 +788,7 @@ public List<LogRecord> getLogRecords() throws IOException, InterruptedException
      */
     @RequirePOST
     @Restricted(NoExternalUse.class)
-    public synchronized void doSubmitDescription(StaplerResponse rsp, @QueryParameter String description) throws IOException {
+    public synchronized void doSubmitDescription(StaplerResponse2 rsp, @QueryParameter String description) throws IOException {
         checkPermission(CONFIGURE);
 
         final Slave node = this.getNode();
@@ -828,7 +828,7 @@ public void run() {
 
     @RequirePOST
     @Override
-    public void doLaunchSlaveAgent(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doLaunchSlaveAgent(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         checkPermission(CONNECT);
 
         if (channel != null) {
@@ -871,12 +871,12 @@ public Slave.JnlpJar getJnlpJars(String fileName) {
     }
 
     @WebMethod(name = "slave-agent.jnlp") // backward compatibility
-    public HttpResponse doSlaveAgentJnlp(StaplerRequest req, StaplerResponse res) {
+    public HttpResponse doSlaveAgentJnlp(StaplerRequest2 req, StaplerResponse2 res) {
         return doJenkinsAgentJnlp(req, res);
     }
 
     @WebMethod(name = "jenkins-agent.jnlp")
-    public HttpResponse doJenkinsAgentJnlp(StaplerRequest req, StaplerResponse res) {
+    public HttpResponse doJenkinsAgentJnlp(StaplerRequest2 req, StaplerResponse2 res) {
         LOGGER.log(
                 Level.WARNING,
                 "Agent \"" + getName()
@@ -888,12 +888,12 @@ public HttpResponse doJenkinsAgentJnlp(StaplerRequest req, StaplerResponse res)
 
     class LowPermissionResponse {
         @WebMethod(name = "jenkins-agent.jnlp")
-        public HttpResponse doJenkinsAgentJnlp(StaplerRequest req, StaplerResponse res) {
+        public HttpResponse doJenkinsAgentJnlp(StaplerRequest2 req, StaplerResponse2 res) {
             return SlaveComputer.this.doJenkinsAgentJnlp(req, res);
         }
 
         @WebMethod(name = "slave-agent.jnlp") // backward compatibility
-        public HttpResponse doSlaveAgentJnlp(StaplerRequest req, StaplerResponse res) {
+        public HttpResponse doSlaveAgentJnlp(StaplerRequest2 req, StaplerResponse2 res) {
             return SlaveComputer.this.doJenkinsAgentJnlp(req, res);
         }
     }
diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
index 4300cd1538ab..0ee50010e6a2 100644
--- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java
+++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java
@@ -63,7 +63,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Copies the artifacts into an archive directory.
@@ -367,7 +367,7 @@ public FormValidation doCheckArtifacts(@AncestorInPath AbstractProject project,
         }
 
         @Override
-        public ArtifactArchiver newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public ArtifactArchiver newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             return req.bindJSON(ArtifactArchiver.class, formData);
         }
 
diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java
index 5a58fc7e6716..af71ff83b147 100644
--- a/core/src/main/java/hudson/tasks/BuildTrigger.java
+++ b/core/src/main/java/hudson/tasks/BuildTrigger.java
@@ -73,7 +73,7 @@
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.springframework.security.core.Authentication;
 
 /**
@@ -385,7 +385,7 @@ public String getHelpFile() {
         }
 
         @Override
-        public BuildTrigger newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public BuildTrigger newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             String childProjectsString = formData.getString("childProjects").trim();
             if (childProjectsString.endsWith(",")) {
                 childProjectsString = childProjectsString.substring(0, childProjectsString.length() - 1).trim();
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index 4d843b27b003..2d41e338f212 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -76,7 +76,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.springframework.security.access.AccessDeniedException;
 
 /**
@@ -351,7 +351,7 @@ public FormValidation doCheckTargets(@AncestorInPath AbstractProject<?, ?> proje
         }
 
         @Override
-        public Publisher newInstance(StaplerRequest req, JSONObject formData) {
+        public Publisher newInstance(StaplerRequest2 req, JSONObject formData) {
             return req.bindJSON(Fingerprinter.class, formData);
         }
 
diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index 3c22790d383c..2e9e27326b8e 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -80,7 +80,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Build by using Maven.
@@ -479,7 +479,7 @@ public void setInstallations(MavenInstallation... installations) {
         }
 
         @Override
-        public Builder newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public Builder newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             if (req == null) {
                 // This state is prohibited according to the Javadoc of the super method.
                 throw new FormException("Maven Build Step new instance method is called for null Stapler request. "
diff --git a/core/src/main/java/hudson/tasks/Shell.java b/core/src/main/java/hudson/tasks/Shell.java
index e34c90b89d5c..9cd070136b55 100644
--- a/core/src/main/java/hudson/tasks/Shell.java
+++ b/core/src/main/java/hudson/tasks/Shell.java
@@ -53,7 +53,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Executes a series of commands by using a shell.
@@ -234,7 +234,7 @@ public FormValidation doCheckUnstableReturn(@QueryParameter String value) {
         }
 
         @Override
-        public boolean configure(StaplerRequest req, JSONObject data) throws FormException {
+        public boolean configure(StaplerRequest2 req, JSONObject data) throws FormException {
             req.bindJSON(this, data);
             return super.configure(req, data);
         }
diff --git a/core/src/main/java/hudson/tools/ToolDescriptor.java b/core/src/main/java/hudson/tools/ToolDescriptor.java
index cc9a2399196d..e20eb353af63 100644
--- a/core/src/main/java/hudson/tools/ToolDescriptor.java
+++ b/core/src/main/java/hudson/tools/ToolDescriptor.java
@@ -26,6 +26,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import hudson.Util;
 import hudson.model.Descriptor;
 import hudson.util.DescribableList;
 import hudson.util.FormValidation;
@@ -43,6 +44,7 @@
 import org.jvnet.tiger_types.Types;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * {@link Descriptor} for {@link ToolInstallation}.
@@ -144,8 +146,25 @@ public DescribableList<ToolProperty<?>, ToolPropertyDescriptor> getDefaultProper
     }
 
     @Override
-    @SuppressWarnings("unchecked") // cast to T[]
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
+        if (Util.isOverridden(ToolDescriptor.class, getClass(), "configure", StaplerRequest.class, JSONObject.class)) {
+            return configure(StaplerRequest.fromStaplerRequest2(req), json);
+        } else {
+            return configureImpl(req, json);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #configure(StaplerRequest2, JSONObject)}
+     */
+    @Deprecated
+    @Override
     public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+        return configureImpl(StaplerRequest.toStaplerRequest2(req), json);
+    }
+
+    @SuppressWarnings("unchecked") // cast to T[]
+    private boolean configureImpl(StaplerRequest2 req, JSONObject json) {
         setInstallations(req.bindJSONToList(clazz, json.get("tool")).toArray((T[]) Array.newInstance(clazz, 0)));
         return true;
     }
diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java
index 43fdc6bb1062..f8277a345198 100644
--- a/core/src/main/java/hudson/triggers/SCMTrigger.java
+++ b/core/src/main/java/hudson/triggers/SCMTrigger.java
@@ -89,8 +89,8 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * {@link Trigger} that checks for SCM updates periodically.
@@ -356,7 +356,7 @@ public boolean isPollingThreadCountOptionVisible() {
         }
 
         @Override
-        public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+        public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
             String t = json.optString("pollingThreadCount", null);
             if (doCheckPollingThreadCount(t).kind != FormValidation.Kind.OK) {
                 setPollingThreadCount(THREADS_DEFAULT);
@@ -466,7 +466,7 @@ public String getUrlName() {
         /**
          * Sends out the raw polling log output.
          */
-        public void doPollingLog(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        public void doPollingLog(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
             rsp.setContentType("text/plain;charset=UTF-8");
             try (OutputStream os = rsp.getOutputStream();
                  // Prevent jelly from flushing stream so Content-Length header can be added afterwards
diff --git a/core/src/main/java/hudson/util/BootFailure.java b/core/src/main/java/hudson/util/BootFailure.java
index f23cf7fa66b7..321d8239664c 100644
--- a/core/src/main/java/hudson/util/BootFailure.java
+++ b/core/src/main/java/hudson/util/BootFailure.java
@@ -2,6 +2,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.WebAppMain;
+import jakarta.servlet.ServletContext;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +15,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
 import jenkins.model.Jenkins;
 import jenkins.util.groovy.GroovyHookScript;
 import org.kohsuke.stapler.WebApp;
diff --git a/core/src/main/java/hudson/util/CharacterEncodingFilter.java b/core/src/main/java/hudson/util/CharacterEncodingFilter.java
index cb93c31e7d4a..2e42c0d8098c 100644
--- a/core/src/main/java/hudson/util/CharacterEncodingFilter.java
+++ b/core/src/main/java/hudson/util/CharacterEncodingFilter.java
@@ -24,17 +24,17 @@
 
 package hudson.util;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
 import jenkins.util.SystemProperties;
+import org.kohsuke.stapler.CompatibleFilter;
 
 /**
  * Filter that sets the character encoding to be used in parsing the request
@@ -42,7 +42,7 @@
  *
  * @author Seiji Sogabe
  */
-public class CharacterEncodingFilter implements Filter {
+public class CharacterEncodingFilter implements CompatibleFilter {
 
     /**
      * The default character encoding.
diff --git a/core/src/main/java/hudson/util/ComboBoxModel.java b/core/src/main/java/hudson/util/ComboBoxModel.java
index e245c890db2e..63cac72f4d0d 100644
--- a/core/src/main/java/hudson/util/ComboBoxModel.java
+++ b/core/src/main/java/hudson/util/ComboBoxModel.java
@@ -26,15 +26,15 @@
 
 import static java.util.Arrays.asList;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
-import javax.servlet.ServletException;
 import net.sf.json.JSONArray;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Flavor;
 
 /**
@@ -59,7 +59,7 @@ public ComboBoxModel(String... values) {
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
         rsp.setContentType(Flavor.JSON.contentType);
         PrintWriter w = rsp.getWriter();
         JSONArray.fromObject(this).write(w);
diff --git a/core/src/main/java/hudson/util/DescribableList.java b/core/src/main/java/hudson/util/DescribableList.java
index 9c62af2f191a..dbb499b4df66 100644
--- a/core/src/main/java/hudson/util/DescribableList.java
+++ b/core/src/main/java/hudson/util/DescribableList.java
@@ -50,6 +50,7 @@
 import jenkins.model.DependencyDeclarer;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Persisted list of {@link Describable}s with some operations specific
@@ -167,7 +168,7 @@ public Map<D, T> toMap() {
      * @param json
      *      Structured form data that includes the data for nested descriptor list.
      */
-    public void rebuild(StaplerRequest req, JSONObject json, List<? extends Descriptor<T>> descriptors) throws FormException, IOException {
+    public void rebuild(StaplerRequest2 req, JSONObject json, List<? extends Descriptor<T>> descriptors) throws FormException, IOException {
         List<T> newList = new ArrayList<>();
 
         for (Descriptor<T> d : descriptors) {
@@ -193,9 +194,17 @@ public void rebuild(StaplerRequest req, JSONObject json, List<? extends Descript
         replaceBy(newList);
     }
 
+    /**
+     * @deprecated use {@link #rebuild(StaplerRequest2, JSONObject, List)}
+     */
+    @Deprecated
+    public void rebuild(StaplerRequest req, JSONObject json, List<? extends Descriptor<T>> descriptors) throws FormException, IOException {
+        rebuild(StaplerRequest.toStaplerRequest2(req), json, descriptors);
+    }
+
     /**
      * @deprecated as of 1.271
-     *      Use {@link #rebuild(StaplerRequest, JSONObject, List)} instead.
+     *      Use {@link #rebuild(StaplerRequest2, JSONObject, List)} instead.
      */
     @Deprecated
     public void rebuild(StaplerRequest req, JSONObject json, List<? extends Descriptor<T>> descriptors, String prefix) throws FormException, IOException {
@@ -210,10 +219,18 @@ public void rebuild(StaplerRequest req, JSONObject json, List<? extends Descript
      * is allowed to create multiple instances of the same descriptor. Order is also
      * significant.
      */
-    public void rebuildHetero(StaplerRequest req, JSONObject formData, Collection<? extends Descriptor<T>> descriptors, String key) throws FormException, IOException {
+    public void rebuildHetero(StaplerRequest2 req, JSONObject formData, Collection<? extends Descriptor<T>> descriptors, String key) throws FormException, IOException {
         replaceBy(Descriptor.newInstancesFromHeteroList(req, formData, key, descriptors));
     }
 
+    /**
+     * @deprecated use {@link #rebuildHetero(StaplerRequest2, JSONObject, Collection, String)}
+     */
+    @Deprecated
+    public void rebuildHetero(StaplerRequest req, JSONObject formData, Collection<? extends Descriptor<T>> descriptors, String key) throws FormException, IOException {
+        rebuildHetero(StaplerRequest.toStaplerRequest2(req), formData, descriptors, key);
+    }
+
     /**
      * Picks up {@link DependencyDeclarer}s and allow it to build dependencies.
      */
diff --git a/core/src/main/java/hudson/util/DescriptorList.java b/core/src/main/java/hudson/util/DescriptorList.java
index 94f105892cd8..c9b515d85c4e 100644
--- a/core/src/main/java/hudson/util/DescriptorList.java
+++ b/core/src/main/java/hudson/util/DescriptorList.java
@@ -160,7 +160,7 @@ public T newInstanceFromRadioList(JSONObject config) throws FormException {
         if (config.isNullObject())
             return null;    // none was selected
         int idx = config.getInt("value");
-        return get(idx).newInstance(Stapler.getCurrentRequest(), config);
+        return get(idx).newInstance(Stapler.getCurrentRequest2(), config);
     }
 
     /**
diff --git a/core/src/main/java/hudson/util/ErrorObject.java b/core/src/main/java/hudson/util/ErrorObject.java
index 2f9f39ec8f19..48e1106b35f1 100644
--- a/core/src/main/java/hudson/util/ErrorObject.java
+++ b/core/src/main/java/hudson/util/ErrorObject.java
@@ -24,13 +24,13 @@
 
 package hudson.util;
 
-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
 
 import hudson.Functions;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Basis for error model objects.
@@ -52,7 +52,7 @@ public String getStackTraceString() {
         return Functions.printThrowable(this);
     }
 
-    public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
+    public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException {
         rsp.setStatus(SC_SERVICE_UNAVAILABLE);
         req.getView(this, "index.jelly").forward(req, rsp);
     }
diff --git a/core/src/main/java/hudson/util/FormApply.java b/core/src/main/java/hudson/util/FormApply.java
index 8a1db5bebe4e..dc5e4d64df9b 100644
--- a/core/src/main/java/hudson/util/FormApply.java
+++ b/core/src/main/java/hudson/util/FormApply.java
@@ -24,11 +24,12 @@
 
 package hudson.util;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.HttpResponses.HttpResponseException;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Server-side code related to the {@code <f:apply>} button.
@@ -47,7 +48,7 @@ public class FormApply {
     public static HttpResponseException success(final String destination) {
         return new HttpResponseException() {
             @Override
-            public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+            public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
                 if (isApply(req)) {
                     // if the submission is via 'apply', show a response in the notification bar
                     applyResponse("notificationBar.show('" + Messages.HttpResponses_Saved() + "',notificationBar.SUCCESS)")
@@ -61,11 +62,21 @@ public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object nod
 
     /**
      * Is this submission from the "apply" button?
+     *
+     * @since TODO
      */
-    public static boolean isApply(StaplerRequest req) {
+    public static boolean isApply(StaplerRequest2 req) {
         return Boolean.parseBoolean(req.getParameter("core:apply"));
     }
 
+    /**
+     * @deprecated use {@link #isApply(StaplerRequest2)}
+     */
+    @Deprecated
+    public static boolean isApply(StaplerRequest req) {
+        return isApply(StaplerRequest.toStaplerRequest2(req));
+    }
+
     /**
      * Generates the response for the asynchronous background form submission (AKA the Apply button.)
      * <p>
@@ -75,7 +86,7 @@ public static boolean isApply(StaplerRequest req) {
     public static HttpResponseException applyResponse(final String script) {
         return new HttpResponseException() {
             @Override
-            public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+            public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
                 rsp.setContentType("text/html;charset=UTF-8");
                 rsp.getWriter().println("<html><body><script>" +
                         "window.applyCompletionHandler = function (w) {" +
diff --git a/core/src/main/java/hudson/util/FormFillFailure.java b/core/src/main/java/hudson/util/FormFillFailure.java
index 5ebd0d5a31e6..946d3f8997cf 100644
--- a/core/src/main/java/hudson/util/FormFillFailure.java
+++ b/core/src/main/java/hudson/util/FormFillFailure.java
@@ -27,14 +27,14 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Functions;
 import hudson.Util;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Locale;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Represents a failure in a form field doFillXYZ method.
@@ -132,7 +132,7 @@ private static FormFillFailure _errorWithMarkup(@NonNull final String message, f
         return new FormFillFailure(kind, message) {
             @Override
             public String renderHtml() {
-                StaplerRequest req = Stapler.getCurrentRequest();
+                StaplerRequest2 req = Stapler.getCurrentRequest2();
                 if (req == null) { // being called from some other context
                     return message;
                 }
@@ -182,7 +182,7 @@ private FormFillFailure(FormValidation.Kind kind, String message) {
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node)
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node)
             throws IOException, ServletException {
         rsp.setContentType("text/html;charset=UTF-8");
         rsp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
diff --git a/core/src/main/java/hudson/util/FormValidation.java b/core/src/main/java/hudson/util/FormValidation.java
index c1cfda5ef6a9..f61b95883782 100644
--- a/core/src/main/java/hudson/util/FormValidation.java
+++ b/core/src/main/java/hudson/util/FormValidation.java
@@ -40,6 +40,7 @@
 import hudson.model.Descriptor;
 import hudson.tasks.Builder;
 import hudson.util.ReflectionUtils.Parameter;
+import jakarta.servlet.ServletException;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -58,21 +59,20 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Stream;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Represents the result of the form field validation.
  *
  * <p>
  * Use one of the factory methods to create an instance, then return it from your {@code doCheckXyz}
- * method. (Via {@link HttpResponse}, the returned object will render the result into {@link StaplerResponse}.)
+ * method. (Via {@link HttpResponse}, the returned object will render the result into {@link StaplerResponse2}.)
  * This way of designing form field validation allows you to reuse {@code doCheckXyz()} methods
  * programmatically as well (by using {@link #kind}.
  *
@@ -274,7 +274,7 @@ private static FormValidation _errorWithMarkup(final String message, final Kind
         return new FormValidation(kind, message) {
             @Override
             public String renderHtml() {
-                StaplerRequest req = Stapler.getCurrentRequest();
+                StaplerRequest2 req = Stapler.getCurrentRequest2();
                 if (req == null) { // being called from some other context
                     return message;
                 }
@@ -551,7 +551,7 @@ protected boolean findText(BufferedReader in, String literal) throws IOException
          * @param url
          *      Pass in the URL that was connected. Used for error diagnosis.
          */
-        protected FormValidation handleIOException(String url, IOException e) throws IOException, ServletException {
+        protected FormValidation handleIOException(String url, IOException e) throws IOException {
             // any invalid URL comes here
             if (e.getMessage().equals(url))
                 // Sun JRE (and probably others too) often return just the URL in the error.
@@ -580,7 +580,7 @@ private String getCharset(URLConnection con) {
          * Implement the actual form validation logic, by using other convenience methods defined in this class.
          * If you are not using any of those, you don't need to extend from this class.
          */
-        protected abstract FormValidation check() throws IOException, ServletException;
+        protected abstract FormValidation check() throws IOException;
     }
 
 
@@ -600,7 +600,7 @@ private FormValidation(Kind kind, String message) {
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
         respond(rsp, renderHtml());
     }
 
@@ -609,7 +609,7 @@ public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object nod
     /**
      * Sends out an arbitrary HTML fragment as the output.
      */
-    protected void respond(StaplerResponse rsp, String html) throws IOException, ServletException {
+    protected void respond(StaplerResponse2 rsp, String html) throws IOException, ServletException {
         rsp.setContentType("text/html;charset=UTF-8");
         if (APPLY_CONTENT_SECURITY_POLICY_HEADERS) {
             for (String header : new String[]{"Content-Security-Policy", "X-WebKit-CSP", "X-Content-Security-Policy"}) {
diff --git a/core/src/main/java/hudson/util/Graph.java b/core/src/main/java/hudson/util/Graph.java
index a543e18cd6d7..6e4ef6c59515 100644
--- a/core/src/main/java/hudson/util/Graph.java
+++ b/core/src/main/java/hudson/util/Graph.java
@@ -27,6 +27,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Util;
+import jakarta.servlet.ServletOutputStream;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.HeadlessException;
@@ -34,7 +36,7 @@
 import java.io.IOException;
 import java.util.Calendar;
 import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.SystemProperties;
 import org.jfree.chart.ChartRenderingInfo;
 import org.jfree.chart.ChartUtilities;
@@ -43,7 +45,9 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * A JFreeChart-generated graph that's bound to UI.
@@ -91,7 +95,7 @@ protected Graph(Calendar timestamp, int defaultWidth, int defaultHeight) {
      */
     protected abstract JFreeChart createGraph();
 
-    private BufferedImage render(StaplerRequest req, ChartRenderingInfo info) {
+    private BufferedImage render(StaplerRequest2 req, ChartRenderingInfo info) {
         String w = req.getParameter("width");
         if (w == null) {
             w = String.valueOf(defaultWidth);
@@ -147,8 +151,27 @@ public static Dimension safeDimension(int width, int height, int defaultWidth, i
 
     /**
      * Renders a graph.
+     *
+     * @since TODO
      */
+    public void doPng(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
+        if (Util.isOverridden(Graph.class, getClass(), "doPng", StaplerRequest.class, StaplerResponse.class)) {
+            doPng(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+        } else {
+            doPngImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doPng(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
     public void doPng(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        doPngImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private void doPngImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (req.checkIfModified(timestamp, rsp)) return;
 
         try {
@@ -201,8 +224,27 @@ public void doPng(StaplerRequest req, StaplerResponse rsp) throws IOException {
 
     /**
      * Renders a clickable map.
+     *
+     * @since TODO
      */
+    public void doMap(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
+        if (Util.isOverridden(Graph.class, getClass(), "doMap", StaplerRequest.class, StaplerResponse.class)) {
+            doMap(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+        } else {
+            doMapImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doMap(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
     public void doMap(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        doMapImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+    }
+
+    private void doMapImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (req.checkIfModified(timestamp, rsp)) return;
 
         ChartRenderingInfo info = new ChartRenderingInfo();
diff --git a/core/src/main/java/hudson/util/HttpResponses.java b/core/src/main/java/hudson/util/HttpResponses.java
index 1e24d8216550..a1e91d2374fa 100644
--- a/core/src/main/java/hudson/util/HttpResponses.java
+++ b/core/src/main/java/hudson/util/HttpResponses.java
@@ -25,16 +25,16 @@
 package hudson.util;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
-import javax.servlet.ServletException;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Various {@link HttpResponse} implementations.
@@ -204,7 +204,7 @@ static class JSONObjectResponse implements HttpResponse {
         }
 
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
             byte[] bytes = jsonObject.toString().getBytes(StandardCharsets.UTF_8);
             rsp.setContentType("application/json; charset=UTF-8");
             rsp.setContentLength(bytes.length);
diff --git a/core/src/main/java/hudson/util/HudsonIsLoading.java b/core/src/main/java/hudson/util/HudsonIsLoading.java
index 6e6964fbed17..1f3782dfe155 100644
--- a/core/src/main/java/hudson/util/HudsonIsLoading.java
+++ b/core/src/main/java/hudson/util/HudsonIsLoading.java
@@ -24,13 +24,13 @@
 
 package hudson.util;
 
-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Model object used to display "Jenkins is loading data".
@@ -41,7 +41,7 @@
  * @author Kohsuke Kawaguchi
  */
 public class HudsonIsLoading {
-    public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
+    public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException {
         rsp.setStatus(SC_SERVICE_UNAVAILABLE);
         req.getView(this, "index.jelly").forward(req, rsp);
     }
diff --git a/core/src/main/java/hudson/util/HudsonIsRestarting.java b/core/src/main/java/hudson/util/HudsonIsRestarting.java
index 4e76657a9fa4..ba0a635b3963 100644
--- a/core/src/main/java/hudson/util/HudsonIsRestarting.java
+++ b/core/src/main/java/hudson/util/HudsonIsRestarting.java
@@ -24,13 +24,13 @@
 
 package hudson.util;
 
-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Model object used to display "Hudson is restarting".
@@ -55,7 +55,7 @@ public HudsonIsRestarting() {
         this.safeRestart = false;
     }
 
-    public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
+    public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException {
         rsp.setStatus(SC_SERVICE_UNAVAILABLE);
         req.getView(this, "index.jelly").forward(req, rsp);
     }
diff --git a/core/src/main/java/hudson/util/ListBoxModel.java b/core/src/main/java/hudson/util/ListBoxModel.java
index cf889493acc4..c97ed0f431e7 100644
--- a/core/src/main/java/hudson/util/ListBoxModel.java
+++ b/core/src/main/java/hudson/util/ListBoxModel.java
@@ -25,15 +25,19 @@
 package hudson.util;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.Util;
 import hudson.model.ModelObject;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.export.Flavor;
@@ -166,12 +170,39 @@ public ListBoxModel add(@NonNull String nameAndValue) {
         return this;
     }
 
-    public void writeTo(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    /**
+     * @since TODO
+     */
+    public void writeTo(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+        if (Util.isOverridden(ListBoxModel.class, getClass(), "writeTo", StaplerRequest.class, StaplerResponse.class)) {
+            try {
+                writeTo(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            writeToImpl(req, rsp);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #writeTo(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    public void writeTo(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            writeToImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    private void writeToImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         rsp.serveExposedBean(req, this, Flavor.JSON);
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
         writeTo(req, rsp);
     }
 
diff --git a/core/src/main/java/hudson/util/MultipartFormDataParser.java b/core/src/main/java/hudson/util/MultipartFormDataParser.java
index f173cff9802b..47e880486fba 100644
--- a/core/src/main/java/hudson/util/MultipartFormDataParser.java
+++ b/core/src/main/java/hudson/util/MultipartFormDataParser.java
@@ -25,14 +25,15 @@
 package hudson.util;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
+import io.jenkins.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.fileupload2.core.DiskFileItem;
 import org.apache.commons.fileupload2.core.DiskFileItemFactory;
 import org.apache.commons.fileupload2.core.FileItem;
@@ -40,8 +41,8 @@
 import org.apache.commons.fileupload2.core.FileUploadException;
 import org.apache.commons.fileupload2.core.FileUploadFileCountLimitException;
 import org.apache.commons.fileupload2.core.FileUploadSizeException;
-import org.apache.commons.fileupload2.javax.JavaxServletDiskFileUpload;
-import org.apache.commons.fileupload2.javax.JavaxServletFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -56,7 +57,7 @@ public class MultipartFormDataParser implements AutoCloseable {
 
     /**
      * Limits the number of form fields that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload2.javax.JavaxServletFileUpload#setFileCountMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload#setFileCountMax(long)}.
      * Despite the name, this applies to all form fields, not just actual file attachments.
      * Set to {@code -1} to disable limits.
      */
@@ -64,7 +65,7 @@ public class MultipartFormDataParser implements AutoCloseable {
 
     /**
      * Limits the size (in bytes) of individual fields that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload2.javax.JavaxServletFileUpload#setFileSizeMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload#setFileSizeMax(long)}.
      * Despite the name, this applies to all form fields, not just actual file attachments.
      * Set to {@code -1} to disable limits.
      */
@@ -72,7 +73,7 @@ public class MultipartFormDataParser implements AutoCloseable {
 
     /**
      * Limits the total request size (in bytes) that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload2.javax.JavaxServletFileUpload#setSizeMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload#setSizeMax(long)}.
      * Set to {@code -1} to disable limits.
      */
     private static /* nonfinal for Jenkins script console */ long FILEUPLOAD_MAX_SIZE = Long.getLong(MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_SIZE", -1);
@@ -86,7 +87,7 @@ public MultipartFormDataParser(HttpServletRequest request, int maxParts, long ma
             throw new ServletException("Error creating temporary directory", e);
         }
         tmpDir.deleteOnExit();
-        JavaxServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JavaxServletDiskFileUpload(DiskFileItemFactory.builder().setFile(tmpDir).get());
+        JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JakartaServletDiskFileUpload(DiskFileItemFactory.builder().setFile(tmpDir).get());
         upload.setFileCountMax(maxParts);
         upload.setFileSizeMax(maxPartSize);
         upload.setSizeMax(maxSize);
@@ -116,6 +117,39 @@ public MultipartFormDataParser(HttpServletRequest request) throws ServletExcepti
         this(request, FILEUPLOAD_MAX_FILES, FILEUPLOAD_MAX_FILE_SIZE, FILEUPLOAD_MAX_SIZE);
     }
 
+    /**
+     * @deprecated use {@link #MultipartFormDataParser(HttpServletRequest)}
+     */
+    @Deprecated
+    public MultipartFormDataParser(javax.servlet.http.HttpServletRequest request) throws javax.servlet.ServletException {
+        File tmpDir;
+        try {
+            tmpDir = Files.createTempDirectory("jenkins-multipart-uploads").toFile();
+        } catch (IOException e) {
+            throw new javax.servlet.ServletException("Error creating temporary directory", e);
+        }
+        tmpDir.deleteOnExit();
+        JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory> upload = new JakartaServletDiskFileUpload(DiskFileItemFactory.builder().setFile(tmpDir).get());
+        upload.setFileCountMax(FILEUPLOAD_MAX_FILES);
+        upload.setFileSizeMax(FILEUPLOAD_MAX_FILE_SIZE);
+        upload.setSizeMax(FILEUPLOAD_MAX_SIZE);
+        try {
+            for (FileItem fi : upload.parseRequest(HttpServletRequestWrapper.toJakartaHttpServletRequest(request)))
+                byName.put(fi.getFieldName(), fi);
+        } catch (FileUploadFileCountLimitException e) {
+            throw new javax.servlet.ServletException("File upload field count limit exceeded. Consider setting the Java system property "
+                    + MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILES to a value greater than " + FILEUPLOAD_MAX_FILES + ", or to -1 to disable this limit.", e);
+        } catch (FileUploadByteCountLimitException e) {
+            throw new javax.servlet.ServletException("File upload field size limit exceeded. Consider setting the Java system property "
+                    + MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_FILE_SIZE to a value greater than " + FILEUPLOAD_MAX_FILE_SIZE + ", or to -1 to disable this limit.", e);
+        } catch (FileUploadSizeException e) {
+            throw new javax.servlet.ServletException("File upload total size limit exceeded. Consider setting the Java system property "
+                    + MultipartFormDataParser.class.getName() + ".FILEUPLOAD_MAX_SIZE to a value greater than " + FILEUPLOAD_MAX_SIZE + ", or to -1 to disable this limit.", e);
+        } catch (FileUploadException e) {
+            throw new javax.servlet.ServletException(e);
+        }
+    }
+
     public String get(String key) {
         FileItem fi = byName.get(key);
         if (fi == null)    return null;
diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java
index 037b7010d51a..bb4ecfc18d9b 100644
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
@@ -27,6 +27,15 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.ExtensionPoint;
 import hudson.security.SecurityRealm;
+import io.jenkins.servlet.FilterWrapper;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -35,17 +44,11 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.util.HttpServletFilter;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.CompatibleFilter;
 
 /**
  * Servlet {@link Filter} that chains multiple {@link Filter}s, provided by plugins
@@ -60,7 +63,7 @@
  *
  * @see SecurityRealm
  */
-public final class PluginServletFilter implements Filter, ExtensionPoint {
+public final class PluginServletFilter implements CompatibleFilter, ExtensionPoint {
     private final List<Filter> list = new CopyOnWriteArrayList<>();
 
     private /*almost final*/ FilterConfig config;
@@ -101,13 +104,15 @@ public void init(FilterConfig config) throws ServletException {
      * Dynamically register a new filter.
      * May be paired with {@link #removeFilter}.
      * <p>For most purposes you can instead use {@link HttpServletFilter}.
+     *
+     * @since TODO
      */
     public static void addFilter(Filter filter) throws ServletException {
         Jenkins j = Jenkins.getInstanceOrNull();
 
         PluginServletFilter container = null;
         if (j != null) {
-            container = getInstance(j.servletContext);
+            container = getInstance(j.getServletContext());
         }
         // https://marvelution.atlassian.net/browse/JJI-188
         if (j == null || container == null) {
@@ -120,17 +125,29 @@ public static void addFilter(Filter filter) throws ServletException {
         }
     }
 
+    /**
+     * @deprecated use {@link #addFilter(Filter)}
+     */
+    @Deprecated
+    public static void addFilter(javax.servlet.Filter filter) throws javax.servlet.ServletException {
+        try {
+            addFilter(FilterWrapper.toJakartaFilter(filter));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Checks whether the given filter is already registered in the chain.
      * @param filter the filter to check.
      * @return true if the filter is already registered in the chain.
-     * @since 2.94
+     * @since TODO
      */
     public static boolean hasFilter(Filter filter) {
         Jenkins j = Jenkins.getInstanceOrNull();
         PluginServletFilter container = null;
         if (j != null) {
-            container = getInstance(j.servletContext);
+            container = getInstance(j.getServletContext());
         }
         if (j == null || container == null) {
             return LEGACY.contains(filter);
@@ -139,12 +156,36 @@ public static boolean hasFilter(Filter filter) {
         }
     }
 
+    /**
+     * @deprecated use {@link #hasFilter(Filter)}
+     * @since 2.94
+     */
+    @Deprecated
+    public static boolean hasFilter(javax.servlet.Filter filter) {
+        return hasFilter(FilterWrapper.toJakartaFilter(filter));
+    }
+
+    /**
+     * @since TODO
+     */
     public static void removeFilter(Filter filter) throws ServletException {
         Jenkins j = Jenkins.getInstanceOrNull();
-        if (j == null || getInstance(j.servletContext) == null) {
+        if (j == null || getInstance(j.getServletContext()) == null) {
             LEGACY.remove(filter);
         } else {
-            getInstance(j.servletContext).list.remove(filter);
+            getInstance(j.getServletContext()).list.remove(filter);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #removeFilter(Filter)}
+     */
+    @Deprecated
+    public static void removeFilter(javax.servlet.Filter filter) throws javax.servlet.ServletException {
+        try {
+            removeFilter(FilterWrapper.toJakartaFilter(filter));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
         }
     }
 
@@ -180,7 +221,7 @@ public static void cleanUp() {
         if (jenkins == null) {
             return;
         }
-        PluginServletFilter instance = getInstance(jenkins.servletContext);
+        PluginServletFilter instance = getInstance(jenkins.getServletContext());
         if (instance != null) {
             // While we could rely on the current implementation of list being a CopyOnWriteArrayList
             // safer to just take an explicit copy of the list and operate on the copy
diff --git a/core/src/main/java/hudson/util/QueryParameterMap.java b/core/src/main/java/hudson/util/QueryParameterMap.java
index ba3ce8c0d00a..fc846c6fc73b 100644
--- a/core/src/main/java/hudson/util/QueryParameterMap.java
+++ b/core/src/main/java/hudson/util/QueryParameterMap.java
@@ -24,6 +24,7 @@
 
 package hudson.util;
 
+import jakarta.servlet.http.HttpServletRequest;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -31,7 +32,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * Parses the query string of the URL into a key/value pair.
@@ -70,6 +70,14 @@ public QueryParameterMap(HttpServletRequest req) {
         this(req.getQueryString());
     }
 
+    /**
+     * @deprecated use {@link #QueryParameterMap(HttpServletRequest)}
+     */
+    @Deprecated
+    public QueryParameterMap(javax.servlet.http.HttpServletRequest req) {
+        this(req.getQueryString());
+    }
+
     public String get(String name) {
         List<String> v = store.get(name);
         return v != null ? v.get(0) : null;
diff --git a/core/src/main/java/hudson/util/RemotingDiagnostics.java b/core/src/main/java/hudson/util/RemotingDiagnostics.java
index 06a42beee69d..c18e056e428b 100644
--- a/core/src/main/java/hudson/util/RemotingDiagnostics.java
+++ b/core/src/main/java/hudson/util/RemotingDiagnostics.java
@@ -59,8 +59,8 @@
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
@@ -211,7 +211,7 @@ public HeapDump(AccessControlled owner, VirtualChannel channel) {
 
         @WebMethod(name = "heapdump.hprof")
         @RequirePOST
-        public void doHeapDump(StaplerRequest req, StaplerResponse rsp) throws IOException, InterruptedException {
+        public void doHeapDump(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, InterruptedException {
             owner.checkPermission(Jenkins.ADMINISTER);
             rsp.setContentType("application/octet-stream");
 
diff --git a/core/src/main/java/hudson/views/GlobalDefaultViewConfiguration.java b/core/src/main/java/hudson/views/GlobalDefaultViewConfiguration.java
index b60939aae5ee..81927927c9e6 100644
--- a/core/src/main/java/hudson/views/GlobalDefaultViewConfiguration.java
+++ b/core/src/main/java/hudson/views/GlobalDefaultViewConfiguration.java
@@ -30,7 +30,7 @@
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Adds the default view configuration to the system config page.
@@ -40,7 +40,7 @@
 @Extension(ordinal = 300) @Symbol("defaultView")
 public class GlobalDefaultViewConfiguration extends GlobalConfiguration {
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         // for compatibility reasons, the actual value is stored in Jenkins
         Jenkins j = Jenkins.get();
         if (json.has("primaryView")) {
diff --git a/core/src/main/java/hudson/views/ListViewColumn.java b/core/src/main/java/hudson/views/ListViewColumn.java
index 91e93e2145da..423094af51b3 100644
--- a/core/src/main/java/hudson/views/ListViewColumn.java
+++ b/core/src/main/java/hudson/views/ListViewColumn.java
@@ -42,6 +42,7 @@
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 
 /**
@@ -162,7 +163,7 @@ private static List<ListViewColumn> createDefaultInitialColumnList(List<Descript
                         continue;   // skip this
                     }
                 }
-                ListViewColumn lvc = d.newInstance(null, emptyJSON);
+                ListViewColumn lvc = d.newInstance((StaplerRequest2) null, emptyJSON);
                 if (!lvc.shownByDefault()) {
                     continue; // skip this
                 }
diff --git a/core/src/main/java/hudson/views/MyViewsTabBar.java b/core/src/main/java/hudson/views/MyViewsTabBar.java
index bc73ba9abd9d..f6fc15745b9b 100644
--- a/core/src/main/java/hudson/views/MyViewsTabBar.java
+++ b/core/src/main/java/hudson/views/MyViewsTabBar.java
@@ -41,7 +41,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Extension point for adding a MyViewsTabBar header to Projects {@link MyViewsProperty}.
@@ -100,7 +100,7 @@ public MyViewsTabBar getMyViewsTabBar() {
         }
 
         @Override
-        public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+        public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
             // for compatibility reasons, the actual value is stored in Jenkins
             Jenkins j = Jenkins.get();
 
diff --git a/core/src/main/java/hudson/views/ViewsTabBar.java b/core/src/main/java/hudson/views/ViewsTabBar.java
index 195f72104aba..a7d133e78213 100644
--- a/core/src/main/java/hudson/views/ViewsTabBar.java
+++ b/core/src/main/java/hudson/views/ViewsTabBar.java
@@ -41,7 +41,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Extension point for adding a ViewsTabBar header to Projects {@link ListView}.
@@ -100,7 +100,7 @@ public ViewsTabBar getViewsTabBar() {
         }
 
         @Override
-        public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+        public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
             // for compatibility reasons, the actual value is stored in Jenkins
             Jenkins j = Jenkins.get();
 
diff --git a/core/src/main/java/hudson/widgets/HistoryWidget.java b/core/src/main/java/hudson/widgets/HistoryWidget.java
index 1c291d1a48ff..44f6de67ee6f 100644
--- a/core/src/main/java/hudson/widgets/HistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/HistoryWidget.java
@@ -33,13 +33,13 @@
 import hudson.model.Queue;
 import hudson.model.Run;
 import hudson.util.AlternativeUiTextProvider;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.util.SystemProperties;
 import jenkins.widgets.HistoryPageEntry;
 import jenkins.widgets.HistoryPageFilter;
@@ -49,8 +49,8 @@
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.Header;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Displays the history of records (normally {@link Run}s) on the side panel.
@@ -103,7 +103,7 @@ public class HistoryWidget<O extends ModelObject, T> extends Widget {
      *      The parent model object that owns this widget.
      */
     public HistoryWidget(O owner, Iterable<T> baseList, Adapter<? super T> adapter) {
-        StaplerRequest currentRequest = Stapler.getCurrentRequest();
+        StaplerRequest2 currentRequest = Stapler.getCurrentRequest2();
         this.adapter = adapter;
         this.baseList = baseList;
         this.baseUrl = Functions.getNearestAncestorUrl(currentRequest, owner);
@@ -234,7 +234,7 @@ public void setTrimmed(boolean trimmed) {
      *      The build 'number' to fetch. This is string because various variants
      *      uses non-numbers as the build key.
      */
-    public void doAjax(StaplerRequest req, StaplerResponse rsp,
+    public void doAjax(StaplerRequest2 req, StaplerResponse2 rsp,
           @Header("n") String n) throws IOException, ServletException {
 
         rsp.setContentType("text/html;charset=UTF-8");
@@ -298,7 +298,7 @@ public interface Adapter<T> {
         String getNextKey(String key);
     }
 
-    private Long getPagingParam(@CheckForNull StaplerRequest currentRequest, @CheckForNull String name) {
+    private Long getPagingParam(@CheckForNull StaplerRequest2 currentRequest, @CheckForNull String name) {
         if (currentRequest == null || name == null) {
             return null;
         }
diff --git a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
index 9092526f109b..bd3a5518a75b 100644
--- a/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
+++ b/core/src/main/java/hudson/widgets/RenderOnDemandClosure.java
@@ -27,6 +27,7 @@
 import hudson.Util;
 import hudson.model.Descriptor;
 import hudson.util.PackedMap;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,13 +36,12 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.JellyTagException;
 import org.apache.commons.jelly.Script;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 import org.kohsuke.stapler.framework.adjunct.AdjunctsInPage;
 import org.kohsuke.stapler.jelly.DefaultScriptInvoker;
@@ -95,12 +95,12 @@ public RenderOnDemandClosure(JellyContext context, String attributesToCapture) {
     public HttpResponse render() {
         return new HttpResponse() {
             @Override
-            public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+            public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
                 req.getWebApp().getDispatchValidator().allowDispatch(req, rsp);
                 try {
                     new DefaultScriptInvoker() {
                         @Override
-                        protected JellyContext createContext(StaplerRequest req, StaplerResponse rsp, Script script, Object it) {
+                        protected JellyContext createContext(StaplerRequest2 req, StaplerResponse2 rsp, Script script, Object it) {
                             JellyContext context = super.createContext(req, rsp, script, it);
                             for (int i = bodyStack.length - 1; i > 0; i--) { // exclude bodyStack[0]
                                 context = new JellyContext(context);
@@ -115,7 +115,7 @@ protected JellyContext createContext(StaplerRequest req, StaplerResponse rsp, Sc
                         }
 
                         @Override
-                        protected void exportVariables(StaplerRequest req, StaplerResponse rsp, Script script, Object it, JellyContext context) {
+                        protected void exportVariables(StaplerRequest2 req, StaplerResponse2 rsp, Script script, Object it, JellyContext context) {
                             super.exportVariables(req, rsp, script, it, context);
                             context.setVariables(variables);
                             req.setAttribute("currentDescriptorByNameUrl", currentDescriptorByNameUrl);
diff --git a/core/src/main/java/jenkins/ErrorAttributeFilter.java b/core/src/main/java/jenkins/ErrorAttributeFilter.java
index be67bdab7588..f3dfe05f4f89 100644
--- a/core/src/main/java/jenkins/ErrorAttributeFilter.java
+++ b/core/src/main/java/jenkins/ErrorAttributeFilter.java
@@ -1,24 +1,24 @@
 package jenkins;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.CompatibleFilter;
 import org.springframework.security.core.Authentication;
 
 /**
  * Record the current user authentication for later impersonation if the response is 404 Not Found.
  *
- * @see Jenkins#generateNotFoundResponse(org.kohsuke.stapler.StaplerRequest, org.kohsuke.stapler.StaplerResponse)
+ * @see Jenkins#generateNotFoundResponse(org.kohsuke.stapler.StaplerRequest2, org.kohsuke.stapler.StaplerResponse2)
  */
 @Restricted(NoExternalUse.class)
-public class ErrorAttributeFilter implements Filter {
+public class ErrorAttributeFilter implements CompatibleFilter {
 
     public static final String USER_ATTRIBUTE = "jenkins.ErrorAttributeFilter.user";
 
diff --git a/core/src/main/java/jenkins/I18n.java b/core/src/main/java/jenkins/I18n.java
index d9b234b0d2c7..23fa2a4417eb 100644
--- a/core/src/main/java/jenkins/I18n.java
+++ b/core/src/main/java/jenkins/I18n.java
@@ -32,7 +32,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Internationalization REST (ish) API.
@@ -74,7 +74,7 @@ public String getUrlName() {
      * @param request The request.
      * @return The JSON response.
      */
-    public HttpResponse doResourceBundle(StaplerRequest request) {
+    public HttpResponse doResourceBundle(StaplerRequest2 request) {
         String baseName = request.getParameter("baseName");
 
         if (baseName == null) {
diff --git a/core/src/main/java/jenkins/JenkinsHttpSessionListener.java b/core/src/main/java/jenkins/JenkinsHttpSessionListener.java
index 4d2c7960b25b..9a9c0b9efba3 100644
--- a/core/src/main/java/jenkins/JenkinsHttpSessionListener.java
+++ b/core/src/main/java/jenkins/JenkinsHttpSessionListener.java
@@ -24,9 +24,9 @@
 
 package jenkins;
 
+import jakarta.servlet.http.HttpSessionEvent;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpSessionEvent;
 import jenkins.util.HttpSessionListener;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -37,7 +37,7 @@
  * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
  */
 @Restricted(NoExternalUse.class)
-public final class JenkinsHttpSessionListener implements javax.servlet.http.HttpSessionListener {
+public final class JenkinsHttpSessionListener implements jakarta.servlet.http.HttpSessionListener {
 
     // TODO: Seems like classes like this should live in the /war/src/java
     // But that applies to a number of other classes too and it has never happened, so will
diff --git a/core/src/main/java/jenkins/agents/CloudSet.java b/core/src/main/java/jenkins/agents/CloudSet.java
index 163556a001d1..adbbf51de4e4 100644
--- a/core/src/main/java/jenkins/agents/CloudSet.java
+++ b/core/src/main/java/jenkins/agents/CloudSet.java
@@ -36,6 +36,7 @@
 import hudson.model.UpdateCenter;
 import hudson.slaves.Cloud;
 import hudson.util.FormValidation;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -45,7 +46,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithChildren;
 import jenkins.model.ModelObjectWithContextMenu;
@@ -56,7 +56,8 @@
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
 
@@ -102,7 +103,7 @@ public String getSearchUrl() {
 
     @SuppressWarnings("unused") // stapler
     @Restricted(DoNotUse.class) // stapler
-    public String getCloudUrl(StaplerRequest request, Jenkins jenkins, Cloud cloud) {
+    public String getCloudUrl(StaplerRequest2 request, Jenkins jenkins, Cloud cloud) {
         String context = Functions.getNearestAncestorUrl(request, jenkins);
         if (Jenkins.get().getCloud(cloud.name) != cloud) { // this cloud is not the first occurrence with this name
             return context + "/cloud/cloudByIndex/" + getClouds().indexOf(cloud) + "/";
@@ -111,6 +112,16 @@ public String getCloudUrl(StaplerRequest request, Jenkins jenkins, Cloud cloud)
         }
     }
 
+    /**
+     * @deprecated use {@link #getCloudUrl(StaplerRequest2, Jenkins, Cloud)}
+     */
+    @Deprecated
+    @SuppressWarnings("unused") // stapler
+    @Restricted(DoNotUse.class) // stapler
+    public String getCloudUrl(StaplerRequest request, Jenkins jenkins, Cloud cloud) {
+        return getCloudUrl(StaplerRequest.toStaplerRequest2(request), jenkins, cloud);
+    }
+
     @SuppressWarnings("unused") // stapler
     @Restricted(DoNotUse.class) // stapler
     public Cloud getCloudByIndex(int index) {
@@ -128,13 +139,13 @@ public String getCloudUpdateCenterCategoryLabel() {
     }
 
     @Override
-    public ModelObjectWithContextMenu.ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    public ModelObjectWithContextMenu.ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         ModelObjectWithContextMenu.ContextMenu m = new ModelObjectWithContextMenu.ContextMenu();
         Jenkins.get().clouds.stream().forEach(m::add);
         return m;
     }
 
-    public Cloud getDynamic(String name, StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public Cloud getDynamic(String name, StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         return Jenkins.get().clouds.getByName(name);
     }
 
@@ -186,7 +197,7 @@ public FormValidation doCheckName(@QueryParameter String value) {
      * First check point in creating a new cloud.
      */
     @RequirePOST
-    public synchronized void doCreate(StaplerRequest req, StaplerResponse rsp,
+    public synchronized void doCreate(StaplerRequest2 req, StaplerResponse2 rsp,
                                           @QueryParameter String name, @QueryParameter String mode,
                                           @QueryParameter String from) throws IOException, ServletException, Descriptor.FormException {
         final Jenkins jenkins = Jenkins.get();
@@ -226,7 +237,7 @@ public synchronized void doCreate(StaplerRequest req, StaplerResponse rsp,
         }
     }
 
-    private void handleNewCloudPage(Descriptor<Cloud> descriptor, String name, StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+    private void handleNewCloudPage(Descriptor<Cloud> descriptor, String name, StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         checkName(name);
         JSONObject formData = req.getSubmittedForm();
         formData.put("name", name);
@@ -240,7 +251,7 @@ private void handleNewCloudPage(Descriptor<Cloud> descriptor, String name, Stapl
      * Really creates a new agent.
      */
     @POST
-    public synchronized void doDoCreate(StaplerRequest req, StaplerResponse rsp,
+    public synchronized void doDoCreate(StaplerRequest2 req, StaplerResponse2 rsp,
                                             @QueryParameter String cloudDescriptorName) throws IOException, ServletException, Descriptor.FormException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         Descriptor<Cloud> cloudDescriptor = Cloud.all().findByName(cloudDescriptorName);
@@ -256,7 +267,7 @@ public synchronized void doDoCreate(StaplerRequest req, StaplerResponse rsp,
     }
 
     @POST
-    public void doReorder(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doReorder(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         var names = req.getParameterValues("name");
         if (names == null) {
diff --git a/core/src/main/java/jenkins/agents/WebSocketAgents.java b/core/src/main/java/jenkins/agents/WebSocketAgents.java
index d9560f156ebd..1da8d046d56f 100644
--- a/core/src/main/java/jenkins/agents/WebSocketAgents.java
+++ b/core/src/main/java/jenkins/agents/WebSocketAgents.java
@@ -57,8 +57,8 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 @Extension
 @Restricted(NoExternalUse.class)
@@ -71,7 +71,7 @@ public String getUrlName() {
         return WebSockets.isSupported() ? "wsagents" : null;
     }
 
-    public HttpResponse doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public HttpResponse doIndex(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         String agent = req.getHeader(JnlpConnectionState.CLIENT_NAME_KEY);
         String secret = req.getHeader(JnlpConnectionState.SECRET_KEY);
         String remoteCapabilityStr = req.getHeader(Capability.KEY);
diff --git a/core/src/main/java/jenkins/appearance/AppearanceGlobalConfiguration.java b/core/src/main/java/jenkins/appearance/AppearanceGlobalConfiguration.java
index 96e61c0c9371..007b9a314dd5 100644
--- a/core/src/main/java/jenkins/appearance/AppearanceGlobalConfiguration.java
+++ b/core/src/main/java/jenkins/appearance/AppearanceGlobalConfiguration.java
@@ -30,18 +30,18 @@
 import hudson.model.Descriptor;
 import hudson.model.ManagementLink;
 import hudson.util.FormApply;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.console.ConsoleUrlProviderGlobalConfiguration;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.POST;
 
 @Extension
@@ -94,13 +94,13 @@ public Category getCategory() {
     }
 
     @POST
-    public synchronized void doConfigure(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+    public synchronized void doConfigure(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         boolean result = configure(req, req.getSubmittedForm());
         LOGGER.log(Level.FINE, "appearance saved: " + result);
         FormApply.success(req.getContextPath() + "/manage").generateResponse(req, rsp, null);
     }
 
-    private boolean configure(StaplerRequest req, JSONObject json) throws Descriptor.FormException, IOException {
+    private boolean configure(StaplerRequest2 req, JSONObject json) throws Descriptor.FormException, IOException {
         Jenkins j = Jenkins.get();
         j.checkPermission(Jenkins.MANAGE);
 
@@ -113,7 +113,7 @@ private boolean configure(StaplerRequest req, JSONObject json) throws Descriptor
         return result;
     }
 
-    private boolean configureDescriptor(StaplerRequest req, JSONObject json, Descriptor<?> d) throws Descriptor.FormException {
+    private boolean configureDescriptor(StaplerRequest2 req, JSONObject json, Descriptor<?> d) throws Descriptor.FormException {
         String name = d.getJsonSafeClassName();
         JSONObject js = json.has(name) ? json.getJSONObject(name) : new JSONObject(); // if it doesn't have the property, the method returns invalid null object.
         json.putAll(js);
diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
index 0b9e70c3db53..3310f13fd332 100644
--- a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
+++ b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
@@ -119,9 +119,9 @@ default Descriptor<ConsoleUrlProvider> getDescriptor() {
             url = run.getUrl() + "console";
         }
         if (url.startsWith("/")) {
-            return Stapler.getCurrentRequest().getContextPath() + url;
+            return Stapler.getCurrentRequest2().getContextPath() + url;
         } else {
-            return Stapler.getCurrentRequest().getContextPath() + '/' + url;
+            return Stapler.getCurrentRequest2().getContextPath() + '/' + url;
         }
     }
 
diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProviderGlobalConfiguration.java b/core/src/main/java/jenkins/console/ConsoleUrlProviderGlobalConfiguration.java
index a63fe679f200..0ce3ca071322 100644
--- a/core/src/main/java/jenkins/console/ConsoleUrlProviderGlobalConfiguration.java
+++ b/core/src/main/java/jenkins/console/ConsoleUrlProviderGlobalConfiguration.java
@@ -43,7 +43,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Allows administrators to activate and sort {@link ConsoleUrlProvider} extensions to set defaults for all users.
@@ -79,7 +79,7 @@ public void setProviders(List<ConsoleUrlProvider> providers) {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         // We have to null out providers before data binding to allow all providers to be deleted in the config UI.
         // We use a BulkChange to avoid double saves in other cases.
         try (BulkChange bc = new BulkChange(this)) {
diff --git a/core/src/main/java/jenkins/diagnostics/ControllerExecutorsAgents.java b/core/src/main/java/jenkins/diagnostics/ControllerExecutorsAgents.java
index 017fda058051..028528cd523a 100644
--- a/core/src/main/java/jenkins/diagnostics/ControllerExecutorsAgents.java
+++ b/core/src/main/java/jenkins/diagnostics/ControllerExecutorsAgents.java
@@ -32,8 +32,8 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 @Extension
@@ -58,7 +58,7 @@ public boolean isActivated() {
     }
 
     @RequirePOST
-    public void doAct(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doAct(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (req.hasParameter("no")) {
             disable(true);
             rsp.sendRedirect(req.getContextPath() + "/manage");
diff --git a/core/src/main/java/jenkins/diagnostics/ControllerExecutorsNoAgents.java b/core/src/main/java/jenkins/diagnostics/ControllerExecutorsNoAgents.java
index d06c3c7bff69..8a73178f3849 100644
--- a/core/src/main/java/jenkins/diagnostics/ControllerExecutorsNoAgents.java
+++ b/core/src/main/java/jenkins/diagnostics/ControllerExecutorsNoAgents.java
@@ -32,8 +32,8 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 @Extension
@@ -52,7 +52,7 @@ public boolean isSecurity() {
     }
 
     @RequirePOST
-    public void doAct(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doAct(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (req.hasParameter("no")) {
             disable(true);
             rsp.sendRedirect(req.getContextPath() + "/manage");
diff --git a/core/src/main/java/jenkins/diagnostics/SecurityIsOffMonitor.java b/core/src/main/java/jenkins/diagnostics/SecurityIsOffMonitor.java
index 4ca6972304b3..04c134333063 100644
--- a/core/src/main/java/jenkins/diagnostics/SecurityIsOffMonitor.java
+++ b/core/src/main/java/jenkins/diagnostics/SecurityIsOffMonitor.java
@@ -5,8 +5,8 @@
 import java.io.IOException;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -40,7 +40,7 @@ public boolean isSecurity() {
      * Depending on whether the user said "yes" or "no", send him to the right place.
      */
     @RequirePOST
-    public void doAct(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doAct(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (req.hasParameter("no")) {
             disable(true);
             rsp.sendRedirect(req.getContextPath() + "/manage");
diff --git a/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java b/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java
index 9fdd7bc38436..df7af46879b0 100644
--- a/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java
+++ b/core/src/main/java/jenkins/diagnostics/URICheckEncodingMonitor.java
@@ -14,7 +14,7 @@
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Restricted(NoExternalUse.class)
 @Extension
@@ -36,7 +36,7 @@ public String getDisplayName() {
         return Messages.URICheckEncodingMonitor_DisplayName();
     }
 
-    public FormValidation doCheckURIEncoding(StaplerRequest request) throws IOException {
+    public FormValidation doCheckURIEncoding(StaplerRequest2 request) throws IOException {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
         // expected is non-ASCII String
         final String expected = "\u57f7\u4e8b";
diff --git a/core/src/main/java/jenkins/fingerprints/GlobalFingerprintConfiguration.java b/core/src/main/java/jenkins/fingerprints/GlobalFingerprintConfiguration.java
index 485d0fd2fe55..93f2966c7382 100644
--- a/core/src/main/java/jenkins/fingerprints/GlobalFingerprintConfiguration.java
+++ b/core/src/main/java/jenkins/fingerprints/GlobalFingerprintConfiguration.java
@@ -32,7 +32,7 @@
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Allows configuring the settings of fingerprints.
@@ -74,7 +74,7 @@ public void setFingerprintCleanupDisabled(boolean fingerprintCleanupDisabled) {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) {
+    public boolean configure(StaplerRequest2 req, JSONObject json) {
         req.bindJSON(this, json);
         save();
         return true;
diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java
index 4ecd23ef9e81..2707807906f1 100644
--- a/core/src/main/java/jenkins/install/SetupWizard.java
+++ b/core/src/main/java/jenkins/install/SetupWizard.java
@@ -23,6 +23,16 @@
 import hudson.util.HttpResponses;
 import hudson.util.PluginServletFilter;
 import hudson.util.VersionNumber;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
 import java.net.HttpRetryException;
@@ -43,16 +53,6 @@
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import jenkins.model.Jenkins;
 import jenkins.model.JenkinsLocationConfiguration;
 import jenkins.security.ApiTokenProperty;
@@ -66,10 +66,11 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.CompatibleFilter;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.verb.POST;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -332,7 +333,7 @@ public boolean isUsingSecurityToken() {
      */
     @POST
     @Restricted(NoExternalUse.class)
-    public HttpResponse doCreateAdminUser(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public HttpResponse doCreateAdminUser(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         Jenkins j = Jenkins.get();
 
         j.checkPermission(Jenkins.ADMINISTER);
@@ -416,7 +417,7 @@ public HttpResponse doCreateAdminUser(StaplerRequest req, StaplerResponse rsp) t
 
     @POST
     @Restricted(NoExternalUse.class)
-    public HttpResponse doConfigureInstance(StaplerRequest req, @QueryParameter String rootUrl) {
+    public HttpResponse doConfigureInstance(StaplerRequest2 req, @QueryParameter String rootUrl) {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         Map<String, String> errors = new HashMap<>();
@@ -756,7 +757,7 @@ public boolean hasSetupWizardFilter() {
     /**
      * This filter will validate that the security token is provided
      */
-    private final Filter FORCE_SETUP_WIZARD_FILTER = new Filter() {
+    private final Filter FORCE_SETUP_WIZARD_FILTER = new CompatibleFilter() {
         @Override
         public void init(FilterConfig cfg) throws ServletException {
         }
diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsApi.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsApi.java
index ea2b8e2cf771..8f3f83dd89a9 100644
--- a/core/src/main/java/jenkins/management/AdministrativeMonitorsApi.java
+++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsApi.java
@@ -3,26 +3,26 @@
 import hudson.Extension;
 import hudson.model.PageDecorator;
 import hudson.model.RootAction;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.GET;
 
 @Extension
 @Restricted(NoExternalUse.class)
 public class AdministrativeMonitorsApi implements RootAction {
     @GET
-    public void doNonSecurityPopupContent(StaplerRequest req, StaplerResponse resp) throws IOException, ServletException {
+    public void doNonSecurityPopupContent(StaplerRequest2 req, StaplerResponse2 resp) throws IOException, ServletException {
         AdministrativeMonitorsApiData viewData = new AdministrativeMonitorsApiData(getDecorator().getNonSecurityAdministrativeMonitors());
         req.getView(viewData, "monitorsList.jelly").forward(req, resp);
     }
 
     @GET
-    public void doSecurityPopupContent(StaplerRequest req, StaplerResponse resp) throws IOException, ServletException {
+    public void doSecurityPopupContent(StaplerRequest2 req, StaplerResponse2 resp) throws IOException, ServletException {
         AdministrativeMonitorsApiData viewData = new AdministrativeMonitorsApiData(getDecorator().getSecurityAdministrativeMonitors());
         req.getView(viewData, "monitorsList.jelly").forward(req, resp);
     }
diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsConfiguration.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsConfiguration.java
index 78de6ccfc387..cc4ea526566f 100644
--- a/core/src/main/java/jenkins/management/AdministrativeMonitorsConfiguration.java
+++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsConfiguration.java
@@ -34,13 +34,13 @@
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 @Restricted(NoExternalUse.class)
 public class AdministrativeMonitorsConfiguration extends GlobalConfiguration {
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         JSONArray monitors = json.optJSONArray("administrativeMonitor");
         for (AdministrativeMonitor am : AdministrativeMonitor.all()) {
             try {
diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
index 5b94090f4e3b..d531f898c065 100644
--- a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
+++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
@@ -43,7 +43,7 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Show notifications and popups for active administrative monitors on all pages.
@@ -143,7 +143,7 @@ public Collection<AdministrativeMonitor> getMonitorsToDisplay() {
             return null;
         }
 
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
 
         if (req == null) {
             return null;
diff --git a/core/src/main/java/jenkins/management/ShutdownLink.java b/core/src/main/java/jenkins/management/ShutdownLink.java
index a5ebcba4f8d3..7f8b4cd36495 100644
--- a/core/src/main/java/jenkins/management/ShutdownLink.java
+++ b/core/src/main/java/jenkins/management/ShutdownLink.java
@@ -28,15 +28,15 @@
 import hudson.Extension;
 import hudson.model.ManagementLink;
 import hudson.security.Permission;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.POST;
 
 @Extension(ordinal = Integer.MIN_VALUE)
@@ -66,7 +66,7 @@ public String getUrlName() {
     }
 
     @POST
-    public synchronized void doPrepare(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, InterruptedException {
+    public synchronized void doPrepare(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException {
         Jenkins.get().checkPermission(Jenkins.MANAGE);
 
         JSONObject submittedForm = req.getSubmittedForm();
@@ -77,7 +77,7 @@ public synchronized void doPrepare(StaplerRequest req, StaplerResponse rsp) thro
     }
 
     @POST
-    public synchronized void doCancel(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doCancel(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         Jenkins.get().checkPermission(Jenkins.MANAGE);
 
         LOGGER.log(Level.FINE, "Shutdown cancel requested by user {0}", Jenkins.getAuthentication().getName());
diff --git a/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java b/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
index 9fe7412699f4..d6dfeafd68f4 100644
--- a/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
+++ b/core/src/main/java/jenkins/model/ArtifactManagerConfiguration.java
@@ -31,7 +31,7 @@
 import java.io.IOException;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * List of configured {@link ArtifactManagerFactory}s.
@@ -55,7 +55,7 @@ public DescribableList<ArtifactManagerFactory, ArtifactManagerFactoryDescriptor>
         return artifactManagerFactories;
     }
 
-    @Override public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    @Override public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             artifactManagerFactories.rebuildHetero(req, json, ArtifactManagerFactoryDescriptor.all(), "artifactManagerFactories");
             return true;
diff --git a/core/src/main/java/jenkins/model/AssetManager.java b/core/src/main/java/jenkins/model/AssetManager.java
index 5da61d203026..65882afc64d5 100644
--- a/core/src/main/java/jenkins/model/AssetManager.java
+++ b/core/src/main/java/jenkins/model/AssetManager.java
@@ -4,16 +4,16 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.model.UnprotectedRootAction;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.ClassLoaderReflectionToolkit;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Serves files located in the {@code /assets} classpath directory via the Jenkins core ClassLoader.
@@ -46,7 +46,7 @@ public String getUrlName() {
     /**
      * Exposes assets in the core classloader over HTTP.
      */
-    public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         String path = req.getRestOfPath();
         URL resource = findResource(path);
 
diff --git a/core/src/main/java/jenkins/model/BuiltInNodeMigration.java b/core/src/main/java/jenkins/model/BuiltInNodeMigration.java
index 7f08aa7d5b40..c777407f3c65 100644
--- a/core/src/main/java/jenkins/model/BuiltInNodeMigration.java
+++ b/core/src/main/java/jenkins/model/BuiltInNodeMigration.java
@@ -26,14 +26,14 @@
 
 import hudson.Extension;
 import hudson.model.AdministrativeMonitor;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -51,7 +51,7 @@ public boolean isActivated() {
     }
 
     @RequirePOST
-    public void doAct(StaplerRequest req, StaplerResponse rsp, @QueryParameter String yes, @QueryParameter String no) throws IOException, ServletException {
+    public void doAct(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter String yes, @QueryParameter String no) throws IOException, ServletException {
         if (yes != null) {
             Jenkins.get().performRenameMigration();
         } else if (no != null) {
diff --git a/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java b/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java
index 023eb52a4ff6..869ec901757b 100644
--- a/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalBuildDiscarderConfiguration.java
@@ -33,7 +33,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Global configuration UI for background build discarders
@@ -65,7 +65,7 @@ public DescribableList<GlobalBuildDiscarderStrategy, GlobalBuildDiscarderStrateg
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             configuredBuildDiscarders.rebuildHetero(req, json, GlobalBuildDiscarderStrategyDescriptor.all(), "configuredBuildDiscarders");
             return true;
diff --git a/core/src/main/java/jenkins/model/GlobalConfiguration.java b/core/src/main/java/jenkins/model/GlobalConfiguration.java
index 4a5aa76ba117..af788945b2a2 100644
--- a/core/src/main/java/jenkins/model/GlobalConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalConfiguration.java
@@ -3,10 +3,12 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
+import hudson.Util;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Convenient base class for extensions that contributes to the system configuration page but nothing
@@ -28,7 +30,7 @@
  *
  * <p>
  * While an implementation might store its actual configuration data in various ways,
- * meaning {@link #configure(StaplerRequest, JSONObject)} must be overridden,
+ * meaning {@link #configure(StaplerRequest2, JSONObject)} must be overridden,
  * in the normal case you would simply define persistable fields with getters and setters.
  * The {@code config} view would use data-bound controls like {@code f:entry}.
  * Then make sure your constructor calls {@link #load} and your setters call {@link #save}.
@@ -58,12 +60,29 @@ public String getGlobalConfigPage() {
     }
 
     /**
-     * By default, calls {@link StaplerRequest#bindJSON(Object, JSONObject)},
+     * By default, calls {@link StaplerRequest2#bindJSON(Object, JSONObject)},
      * appropriate when your implementation has getters and setters for all fields.
      * <p>{@inheritDoc}
      */
     @Override
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
+        if (Util.isOverridden(GlobalConfiguration.class, getClass(), "configure", StaplerRequest.class, JSONObject.class)) {
+            return configure(StaplerRequest.fromStaplerRequest2(req), json);
+        } else {
+            return configureImpl(req, json);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #configure(StaplerRequest2, JSONObject)}
+     */
+    @Deprecated
+    @Override
     public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+        return configureImpl(StaplerRequest.toStaplerRequest2(req), json);
+    }
+
+    private boolean configureImpl(StaplerRequest2 req, JSONObject json) throws FormException {
         req.bindJSON(this, json);
         return true;
     }
diff --git a/core/src/main/java/jenkins/model/GlobalNodePropertiesConfiguration.java b/core/src/main/java/jenkins/model/GlobalNodePropertiesConfiguration.java
index b40b261f0f31..2ca6863c014b 100644
--- a/core/src/main/java/jenkins/model/GlobalNodePropertiesConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalNodePropertiesConfiguration.java
@@ -6,7 +6,7 @@
 import java.io.IOException;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Include {@link NodePropertyDescriptor} configurations.
@@ -16,7 +16,7 @@
 @Extension(ordinal = 110) @Symbol("nodeProperties") // historically this was placed above GlobalPluginConfiguration
 public class GlobalNodePropertiesConfiguration extends GlobalConfiguration {
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             Jenkins j = Jenkins.get();
             JSONObject np = json.getJSONObject("globalNodeProperties");
diff --git a/core/src/main/java/jenkins/model/GlobalPluginConfiguration.java b/core/src/main/java/jenkins/model/GlobalPluginConfiguration.java
index e2803a9c1e76..d7b2336f57c0 100644
--- a/core/src/main/java/jenkins/model/GlobalPluginConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalPluginConfiguration.java
@@ -4,11 +4,11 @@
 import hudson.Plugin;
 import hudson.PluginWrapper;
 import hudson.StructuredForm;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Include config.jelly defined for {@link Plugin}s.
@@ -21,7 +21,7 @@
 @Extension(ordinal = 100) @Symbol("plugin") // historically this was placed above general configuration from arbitrary descriptors
 public class GlobalPluginConfiguration  extends GlobalConfiguration {
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             for (JSONObject o : StructuredForm.toList(json, "plugin")) {
                 String pluginName = o.getString("name");
diff --git a/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java b/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
index a1ed1ebd763a..35c3cc3193fd 100644
--- a/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
@@ -29,7 +29,7 @@
 import hudson.security.Permission;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Configures the project naming strategy.
@@ -40,7 +40,7 @@
 public class GlobalProjectNamingStrategyConfiguration extends GlobalConfiguration {
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws hudson.model.Descriptor.FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws hudson.model.Descriptor.FormException {
         // for compatibility reasons, the actual value is stored in Jenkins
         Jenkins j = Jenkins.get();
         final JSONObject optJSONObject = json.optJSONObject("useProjectNamingStrategy");
diff --git a/core/src/main/java/jenkins/model/GlobalQuietPeriodConfiguration.java b/core/src/main/java/jenkins/model/GlobalQuietPeriodConfiguration.java
index e3cbf464acbc..91ccba1c268e 100644
--- a/core/src/main/java/jenkins/model/GlobalQuietPeriodConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalQuietPeriodConfiguration.java
@@ -30,7 +30,7 @@
 import java.io.IOException;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Configures the system-default quiet period.
@@ -44,7 +44,7 @@ public int getQuietPeriod() {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         int i = 0;
         try {
             i = Integer.parseInt(json.getString("quietPeriod"));
diff --git a/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java b/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java
index c2543a24d4b7..e60ac1c9a598 100644
--- a/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalSCMRetryCountConfiguration.java
@@ -31,7 +31,7 @@
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Configures global SCM retry count default.
@@ -45,7 +45,7 @@ public int getScmCheckoutRetryCount() {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             // for compatibility reasons, this value is stored in Jenkins
             Jenkins.get().setScmCheckoutRetryCount(json.getInt("scmCheckoutRetryCount"));
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index a648935527ae..6b3500e6b66a 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -35,12 +35,12 @@
 import static hudson.init.InitMilestone.JOB_LOADED;
 import static hudson.init.InitMilestone.PLUGINS_PREPARED;
 import static hudson.init.InitMilestone.SYSTEM_CONFIG_LOADED;
+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.SEVERE;
 import static java.util.logging.Level.WARNING;
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
@@ -210,6 +210,14 @@
 import hudson.views.MyViewsTabBar;
 import hudson.views.ViewsTabBar;
 import hudson.widgets.Widget;
+import io.jenkins.servlet.RequestDispatcherWrapper;
+import io.jenkins.servlet.ServletContextWrapper;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -257,11 +265,6 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import javax.crypto.SecretKey;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.AgentProtocol;
 import jenkins.ErrorAttributeFilter;
 import jenkins.ExtensionComponentSet;
@@ -283,6 +286,7 @@
 import jenkins.security.stapler.StaplerDispatchValidator;
 import jenkins.security.stapler.StaplerDispatchable;
 import jenkins.security.stapler.StaplerFilteredActionListener;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.security.stapler.TypedFilter;
 import jenkins.slaves.WorkspaceLocator;
 import jenkins.util.JenkinsJVM;
@@ -320,7 +324,9 @@
 import org.kohsuke.stapler.StaplerFallback;
 import org.kohsuke.stapler.StaplerProxy;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.export.Exported;
@@ -744,8 +750,20 @@ private static int getSlaveAgentPortInitialValue(int def) {
     @Deprecated
     public final transient NodeProvisioner overallNodeProvisioner = unlabeledNodeProvisioner;
 
+    /**
+     * @deprecated use {@link #getServletContext}
+     */
+    @Deprecated
+    public final transient javax.servlet.ServletContext servletContext;
+
+    private final transient ServletContext jakartaServletContext;
 
-    public final transient ServletContext servletContext;
+    /**
+     * @since TODO
+     */
+    public ServletContext getServletContext() {
+        return this.jakartaServletContext;
+    }
 
     /**
      * Transient action list. Useful for adding navigation items to the navigation bar
@@ -922,7 +940,8 @@ protected Jenkins(File root, ServletContext context, PluginManager pluginManager
         // As Jenkins is starting, grant this process full control
         try (ACLContext ctx = ACL.as2(ACL.SYSTEM2)) {
             this.root = root;
-            this.servletContext = context;
+            this.jakartaServletContext = context;
+            this.servletContext = ServletContextWrapper.fromJakartServletContext(context);
             computeVersion(context);
             if (theInstance != null)
                 throw new IllegalStateException("second instance");
@@ -972,7 +991,7 @@ protected Jenkins(File root, ServletContext context, PluginManager pluginManager
             if (pluginManager == null)
                 pluginManager = PluginManager.createDefault(this);
             this.pluginManager = pluginManager;
-            WebApp webApp = WebApp.get(servletContext);
+            WebApp webApp = WebApp.get(getServletContext());
             // JSON binding needs to be able to see all the classes from all the plugins
             webApp.setClassLoader(pluginManager.uberClassLoader);
             webApp.setJsonInErrorMessageSanitizer(RedactSecretJsonInErrorMessageSanitizer.INSTANCE);
@@ -990,7 +1009,7 @@ protected Jenkins(File root, ServletContext context, PluginManager pluginManager
             webApp.setDispatchValidator(new StaplerDispatchValidator());
             webApp.setFilteredDispatchTriggerListener(actionListener);
 
-            adjuncts = new AdjunctManager(servletContext, pluginManager.uberClassLoader, "adjuncts/" + SESSION_HASH, TimeUnit.DAYS.toMillis(365));
+            adjuncts = new AdjunctManager(getServletContext(), pluginManager.uberClassLoader, "adjuncts/" + SESSION_HASH, TimeUnit.DAYS.toMillis(365));
 
             ClassFilterImpl.register();
 
@@ -1391,7 +1410,7 @@ public int getExpectedPort() {
         }
 
         @RequirePOST
-        public void doAct(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        public void doAct(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
             j.forceSetSlaveAgentPort(getExpectedPort());
             rsp.sendRedirect2(req.getContextPath() + "/manage");
         }
@@ -1458,9 +1477,9 @@ public void setNoUsageStatistics(Boolean noUsageStatistics) throws IOException {
 
     public Api getApi() {
         /* Do not show "REST API" link in footer when on 404 error page */
-        final StaplerRequest req = Stapler.getCurrentRequest();
+        final StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req != null) {
-            final Object attribute = req.getAttribute("javax.servlet.error.message");
+            final Object attribute = req.getAttribute("jakarta.servlet.error.message");
             if (attribute != null) {
                 return null;
             }
@@ -2506,7 +2525,7 @@ public String getUrlChildPrefix() {
         if (url != null) {
             return Util.ensureEndsWith(url, "/");
         }
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req != null)
             return getRootUrlFromRequest();
         return null;
@@ -2524,7 +2543,7 @@ public String getConfiguredRootUrl() {
     /**
      * Is Jenkins running in HTTPS?
      *
-     * Note that we can't really trust {@link StaplerRequest#isSecure()} because HTTPS might be terminated
+     * Note that we can't really trust {@link StaplerRequest2#isSecure()} because HTTPS might be terminated
      * in the reverse proxy.
      */
     public boolean isRootUrlSecure() {
@@ -2550,7 +2569,7 @@ public boolean isRootUrlSecure() {
      * @since 1.263
      */
     public @NonNull String getRootUrlFromRequest() {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req == null) {
             throw new IllegalStateException("cannot call getRootUrlFromRequest from outside a request handling thread");
         }
@@ -2604,7 +2623,7 @@ public boolean isRootUrlSecure() {
      * @param defaultValue the value to return if the header is absent.
      * @return the originating entry of the header or the default value if the header was not present.
      */
-    private static String getXForwardedHeader(StaplerRequest req, String header, String defaultValue) {
+    private static String getXForwardedHeader(StaplerRequest2 req, String header, String defaultValue) {
         String value = req.getHeader(header);
         if (value != null) {
             int index = value.indexOf(',');
@@ -2791,7 +2810,7 @@ public void setSecurityRealm(@CheckForNull SecurityRealm securityRealm) {
      */
     private void resetFilter(@CheckForNull SecurityRealm securityRealm, @CheckForNull IdStrategy oldUserIdStrategy) {
         try {
-            HudsonFilter filter = HudsonFilter.get(servletContext);
+            HudsonFilter filter = HudsonFilter.get(getServletContext());
             if (filter == null) {
                 // Fix for JENKINS-3069: This filter is not necessarily initialized before the servlets.
                 // when HudsonFilter does come back, it'll initialize itself.
@@ -3263,7 +3282,7 @@ public void onRenamed(TopLevelItem job, String oldName, String newName) throws I
     }
 
     /**
-     * Called in response to {@link Job#doDoDelete(StaplerRequest, StaplerResponse)}
+     * Called in response to {@link Job#doDoDelete(StaplerRequest2, StaplerResponse2)}
      */
     @Override
     public void onDeleted(TopLevelItem item) throws IOException {
@@ -4064,7 +4083,7 @@ public Object getDynamic(String token) {
      * Accepts submission from the configuration page.
      */
     @POST
-    public synchronized void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         try (BulkChange bc = new BulkChange(this)) {
             checkPermission(MANAGE);
 
@@ -4101,11 +4120,11 @@ public void setCrumbIssuer(CrumbIssuer issuer) {
         crumbIssuer = issuer;
     }
 
-    public synchronized void doTestPost(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doTestPost(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         rsp.sendRedirect("foo");
     }
 
-    private boolean configureDescriptor(StaplerRequest req, JSONObject json, Descriptor<?> d) throws FormException {
+    private boolean configureDescriptor(StaplerRequest2 req, JSONObject json, Descriptor<?> d) throws FormException {
         // collapse the structure to remain backward compatible with the JSON structure before 1.
         String name = d.getJsonSafeClassName();
         JSONObject js = json.has(name) ? json.getJSONObject(name) : new JSONObject(); // if it doesn't have the property, the method returns invalid null object.
@@ -4117,7 +4136,7 @@ private boolean configureDescriptor(StaplerRequest req, JSONObject json, Descrip
      * Accepts submission from the node configuration page.
      */
     @POST
-    public synchronized void doConfigExecutorsSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public synchronized void doConfigExecutorsSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         checkPermission(ADMINISTER);
 
         try (BulkChange bc = new BulkChange(this)) {
@@ -4139,7 +4158,7 @@ public synchronized void doConfigExecutorsSubmit(StaplerRequest req, StaplerResp
      * Accepts the new description.
      */
     @RequirePOST
-    public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         getPrimaryView().doSubmitDescription(req, rsp);
     }
 
@@ -4227,7 +4246,7 @@ public synchronized HttpRedirect doCancelQuietDown() {
     }
 
     public HttpResponse doToggleCollapse() throws ServletException, IOException {
-        final StaplerRequest request = Stapler.getCurrentRequest();
+        final StaplerRequest2 request = Stapler.getCurrentRequest2();
         final String paneId = request.getParameter("paneId");
 
         PaneStatusProperties.forCurrentUser().toggleCollapsed(paneId);
@@ -4239,7 +4258,7 @@ public HttpResponse doToggleCollapse() throws ServletException, IOException {
      * Backward compatibility. Redirect to the thread dump.
      */
     // TODO annotate @GET once baseline includes Stapler version XXX
-    public void doClassicThreadDump(StaplerResponse rsp) throws IOException, ServletException {
+    public void doClassicThreadDump(StaplerResponse2 rsp) throws IOException, ServletException {
         rsp.sendRedirect2("threadDump");
     }
 
@@ -4283,7 +4302,7 @@ public Map<String, Map<String, String>> getAllThreadDumps() throws IOException,
 
     @Override
     @RequirePOST
-    public synchronized TopLevelItem doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public synchronized TopLevelItem doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         return itemGroupMixIn.createTopLevelItem(req, rsp);
     }
 
@@ -4308,7 +4327,7 @@ public <T extends TopLevelItem> T copy(T src, String name) throws IOException {
     }
 
     @POST
-    public synchronized void doCreateView(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+    public synchronized void doCreateView(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
         checkPermission(View.CREATE);
         addView(View.create(req, rsp, this));
     }
@@ -4364,7 +4383,7 @@ private static String toPrintableName(String name) {
      *
      * @see BasicAuthenticationFilter
      */
-    public void doSecured(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doSecured(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         // TODO fire something in SecurityListener? (seems to be used only for REST calls when LegacySecurityRealm is active)
 
         if (req.getUserPrincipal() == null) {
@@ -4386,7 +4405,7 @@ public void doSecured(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
      * Called once the user logs in. Just forward to the top page.
      * Used only by {@link LegacySecurityRealm}.
      */
-    public void doLoginEntry(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doLoginEntry(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (req.getUserPrincipal() == null) {
             rsp.sendRedirect2("noPrincipal");
             return;
@@ -4415,13 +4434,28 @@ public void doLoginEntry(StaplerRequest req, StaplerResponse rsp) throws IOExcep
 
     /**
      * Logs out the user.
+     *
+     * @since TODO
      */
-    public void doLogout(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doLogout(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         String user = getAuthentication2().getName();
         securityRealm.doLogout(req, rsp);
         SecurityListener.fireLoggedOut(user);
     }
 
+    /**
+     * @deprecated use {@link #doLogout(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doLogout(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            doLogout(req != null ? StaplerRequest.toStaplerRequest2(req) : null, rsp != null ? StaplerResponse.toStaplerResponse2(rsp) : null);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Serves jar files for inbound agents.
      */
@@ -4429,7 +4463,7 @@ public Slave.JnlpJar getJnlpJars(String fileName) {
         return new Slave.JnlpJar(fileName);
     }
 
-    public Slave.JnlpJar doJnlpJars(StaplerRequest req) {
+    public Slave.JnlpJar doJnlpJars(StaplerRequest2 req) {
         return new Slave.JnlpJar(req.getRestOfPath().substring(1));
     }
 
@@ -4442,7 +4476,7 @@ public synchronized HttpResponse doReload() throws IOException {
         getLifecycle().onReload(getAuthentication2().getName(), null);
 
         // engage "loading ..." UI and then run the actual task in a separate thread
-        WebApp.get(servletContext).setApp(new HudsonIsLoading());
+        WebApp.get(getServletContext()).setApp(new HudsonIsLoading());
 
         new Thread("Jenkins config reload thread") {
             @Override
@@ -4452,7 +4486,7 @@ public void run() {
                     getLifecycle().onReady();
                 } catch (Exception e) {
                     LOGGER.log(SEVERE, "Failed to reload Jenkins config", e);
-                    new JenkinsReloadFailed(e).publish(servletContext, root);
+                    new JenkinsReloadFailed(e).publish(getServletContext(), root);
                 }
             }
         }.start();
@@ -4481,14 +4515,14 @@ public void reload() throws IOException, InterruptedException, ReactorException
 
         User.reload();
         queue.load();
-        WebApp.get(servletContext).setApp(this);
+        WebApp.get(getServletContext()).setApp(this);
     }
 
     /**
      * Do a finger-print check.
      */
     @RequirePOST
-    public void doDoFingerprintCheck(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doDoFingerprintCheck(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         // Parse the request
         try (MultipartFormDataParser p = new MultipartFormDataParser(req, 10)) {
             if (isUseCrumbs() && !getCrumbIssuer().validateCrumb(req, p)) {
@@ -4505,7 +4539,7 @@ public void doDoFingerprintCheck(StaplerRequest req, StaplerResponse rsp) throws
      */
     @RequirePOST
     @SuppressFBWarnings(value = "DM_GC", justification = "for debugging")
-    public void doGc(StaplerResponse rsp) throws IOException {
+    public void doGc(StaplerResponse2 rsp) throws IOException {
         checkPermission(Jenkins.ADMINISTER);
         System.gc();
         rsp.setStatus(HttpServletResponse.SC_OK);
@@ -4523,7 +4557,7 @@ public void doException() {
     }
 
     @Override
-    public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws IOException, JellyException {
+    public ContextMenu doContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws IOException, JellyException {
         ContextMenu menu = new ContextMenu().from(this, request, response);
         for (MenuItem i : menu.items) {
             if (i.url.equals(request.getContextPath() + "/manage")) {
@@ -4535,7 +4569,7 @@ public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse respons
     }
 
     @Override
-    public ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+    public ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
         ContextMenu menu = new ContextMenu();
         for (View view : getViews()) {
             menu.add(view.getViewUrl(), view.getDisplayName());
@@ -4579,7 +4613,7 @@ public DirectoryBrowserSupport doUserContent() {
      * This first replaces "app" to {@link HudsonIsRestarting}
      */
     @CLIMethod(name = "restart")
-    public void doRestart(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, RestartNotSupportedException {
+    public void doRestart(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, RestartNotSupportedException {
         checkPermission(MANAGE);
         if (req != null && req.getMethod().equals("GET")) {
             req.getView(this, "_restart.jelly").forward(req, rsp);
@@ -4600,7 +4634,7 @@ public void doRestart(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
      */
     @WebMethod(name = "404")
     @Restricted(NoExternalUse.class)
-    public void generateNotFoundResponse(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
+    public void generateNotFoundResponse(StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
         if (ResourceDomainConfiguration.isResourceRequest(req)) {
             rsp.forward(this, "_404_simple", req);
         } else {
@@ -4620,12 +4654,12 @@ public void generateNotFoundResponse(StaplerRequest req, StaplerResponse rsp) th
      * Builds that cannot continue while the controller is not running have to finish or pause before it can proceed.
      * No new builds will be started. No new jobs are accepted.
      *
-     * @deprecated use {@link #doSafeRestart(StaplerRequest, String)} instead.
+     * @deprecated use {@link #doSafeRestart(StaplerRequest2, String)} instead.
      *
      */
     @Deprecated(since = "2.414")
     public HttpResponse doSafeRestart(StaplerRequest req) throws IOException, ServletException, RestartNotSupportedException {
-        return doSafeRestart(req, null);
+        return doSafeRestart(StaplerRequest.toStaplerRequest2(req), null);
     }
 
     /**
@@ -4633,7 +4667,7 @@ public HttpResponse doSafeRestart(StaplerRequest req) throws IOException, Servle
      *
      * @since 2.414
      */
-    public HttpResponse doSafeRestart(StaplerRequest req, @QueryParameter("message") String message) throws IOException, ServletException, RestartNotSupportedException {
+    public HttpResponse doSafeRestart(StaplerRequest2 req, @QueryParameter("message") String message) throws IOException, ServletException, RestartNotSupportedException {
         checkPermission(MANAGE);
         if (req != null && req.getMethod().equals("GET")) {
             return HttpResponses.forwardToView(this, "_safeRestart.jelly");
@@ -4664,7 +4698,7 @@ private static Lifecycle restartableLifecycle() throws RestartNotSupportedExcept
      */
     public void restart() throws RestartNotSupportedException {
         final Lifecycle lifecycle = restartableLifecycle();
-        servletContext.setAttribute("app", new HudsonIsRestarting());
+        getServletContext().setAttribute("app", new HudsonIsRestarting());
 
         new Thread("restart thread") {
             final String exitUser = getAuthentication2().getName();
@@ -4717,7 +4751,7 @@ public void run() {
                     doQuietDown(true, 0, message, true);
                     // Make sure isQuietingDown is still true.
                     if (isQuietingDown()) {
-                        servletContext.setAttribute("app", new HudsonIsRestarting(true));
+                        getServletContext().setAttribute("app", new HudsonIsRestarting(true));
                         // give some time for the browser to load the "reloading" page
                         lifecycle.onStatusUpdate("Restart in 10 seconds");
                         Thread.sleep(TimeUnit.SECONDS.toMillis(10));
@@ -4763,7 +4797,7 @@ protected RestartCause() {
      */
     @CLIMethod(name = "shutdown")
     @RequirePOST
-    public void doExit(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doExit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         checkPermission(ADMINISTER);
         final String exitUser = getAuthentication2().getName();
         final String exitAddr = req != null ? req.getRemoteAddr() : null;
@@ -4797,7 +4831,7 @@ public void run() {
      */
     @CLIMethod(name = "safe-shutdown")
     @RequirePOST
-    public HttpResponse doSafeExit(StaplerRequest req) throws IOException {
+    public HttpResponse doSafeExit(StaplerRequest2 req) throws IOException {
         checkPermission(ADMINISTER);
         quietDownInfo = new QuietDownInfo();
         final String exitUser = getAuthentication2().getName();
@@ -4824,6 +4858,15 @@ public void run() {
         return HttpResponses.plainText("Shutting down as soon as all jobs are complete");
     }
 
+    /**
+     * @deprecated use {@link #doSafeExit(StaplerRequest2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public HttpResponse doSafeExit(StaplerRequest req) throws IOException {
+        return doSafeExit(req != null ? StaplerRequest.toStaplerRequest2(req) : null);
+    }
+
     /**
      * Gets the {@link Authentication} object that represents the user
      * associated with the current request.
@@ -4852,21 +4895,47 @@ public void run() {
      * For system diagnostics.
      * Run arbitrary Groovy script.
      */
-    public void doScript(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doScript(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         _doScript(req, rsp, req.getView(this, "_script.jelly"), FilePath.localChannel, getACL());
     }
 
+    /**
+     * @deprecated use {@link #doScript(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doScript(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            _doScript(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), StaplerRequest.toStaplerRequest2(req).getView(this, "_script.jelly"), FilePath.localChannel, getACL());
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Run arbitrary Groovy script and return result as plain text.
      */
-    public void doScriptText(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doScriptText(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         _doScript(req, rsp, req.getView(this, "_scriptText.jelly"), FilePath.localChannel, getACL());
     }
 
     /**
-     * @since 1.509.1
+     * @deprecated use {@link #doScriptText(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    public void doScriptText(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
+        try {
+            _doScript(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), StaplerRequest.toStaplerRequest2(req).getView(this, "_scriptText.jelly"), FilePath.localChannel, getACL());
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
+    /**
+     * @since TODO
      */
-    public static void _doScript(StaplerRequest req, StaplerResponse rsp, RequestDispatcher view, VirtualChannel channel, ACL acl) throws IOException, ServletException {
+    public static void _doScript(StaplerRequest2 req, StaplerResponse2 rsp, RequestDispatcher view, VirtualChannel channel, ACL acl) throws IOException, ServletException {
         // ability to run arbitrary script is dangerous
         acl.checkPermission(ADMINISTER);
 
@@ -4892,13 +4961,26 @@ public static void _doScript(StaplerRequest req, StaplerResponse rsp, RequestDis
         view.forward(req, rsp);
     }
 
+    /**
+     * @deprecated use {@link #_doScript(StaplerRequest2, StaplerResponse2, RequestDispatcher, VirtualChannel, ACL)}
+     * @since 1.509.1
+     */
+    @Deprecated
+    public static void _doScript(StaplerRequest req, StaplerResponse rsp, javax.servlet.RequestDispatcher view, VirtualChannel channel, ACL acl) throws IOException, javax.servlet.ServletException {
+        try {
+            _doScript(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), RequestDispatcherWrapper.toJakartaRequestDispatcher(view), channel, acl);
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Evaluates the Jelly script submitted by the client.
      *
      * This is useful for system administration as well as unit testing.
      */
     @RequirePOST
-    public void doEval(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doEval(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         checkPermission(ADMINISTER);
         req.getWebApp().getDispatchValidator().allowDispatch(req, rsp);
         try {
@@ -4913,7 +4995,7 @@ public void doEval(StaplerRequest req, StaplerResponse rsp) throws IOException,
     /**
      * Sign up for the user account.
      */
-    public void doSignup(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doSignup(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         if (getSecurityRealm().allowsSignup()) {
             req.getView(getSecurityRealm(), "signup.jelly").forward(req, rsp);
             return;
@@ -4924,7 +5006,7 @@ public void doSignup(StaplerRequest req, StaplerResponse rsp) throws IOException
     /**
      * Changes the icon size by changing the cookie
      */
-    public void doIconSize(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doIconSize(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         String qs = req.getQueryString();
         if (qs == null)
             throw new ServletException();
@@ -4939,7 +5021,7 @@ public void doIconSize(StaplerRequest req, StaplerResponse rsp) throws IOExcepti
     }
 
     @RequirePOST
-    public void doFingerprintCleanup(StaplerResponse rsp) throws IOException {
+    public void doFingerprintCleanup(StaplerResponse2 rsp) throws IOException {
         checkPermission(ADMINISTER);
         FingerprintCleanupThread.invoke();
         rsp.setStatus(HttpServletResponse.SC_OK);
@@ -4948,7 +5030,7 @@ public void doFingerprintCleanup(StaplerResponse rsp) throws IOException {
     }
 
     @RequirePOST
-    public void doWorkspaceCleanup(StaplerResponse rsp) throws IOException {
+    public void doWorkspaceCleanup(StaplerResponse2 rsp) throws IOException {
         checkPermission(ADMINISTER);
         WorkspaceCleanupThread.invoke();
         rsp.setStatus(HttpServletResponse.SC_OK);
@@ -4959,7 +5041,7 @@ public void doWorkspaceCleanup(StaplerResponse rsp) throws IOException {
     /**
      * If the user chose the default JDK, make sure we got 'java' in PATH.
      */
-    public FormValidation doDefaultJDKCheck(StaplerRequest request, @QueryParameter String value) {
+    public FormValidation doDefaultJDKCheck(StaplerRequest2 request, @QueryParameter String value) {
         if (!JDK.isDefaultName(value))
             // assume the user configured named ones properly in system config ---
             // or else system config should have reported form field validation errors.
@@ -5022,7 +5104,7 @@ public FormValidation doViewExistsCheck(@QueryParameter String value) {
      * strategy here, though the current implementation is based on
      * file extensions.
      */
-    public void doResources(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doResources(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         String path = req.getRestOfPath();
         // cut off the "..." portion of /resources/.../path/to/file
         // as this is only used to make path unique (which in turn
@@ -5043,7 +5125,7 @@ public void doResources(StaplerRequest req, StaplerResponse rsp) throws IOExcept
     }
 
     /**
-     * Extension list that {@link #doResources(StaplerRequest, StaplerResponse)} can serve.
+     * Extension list that {@link #doResources(StaplerRequest2, StaplerResponse2)} can serve.
      * This set is mutable to allow plugins to add additional extensions.
      */
     @SuppressFBWarnings(value = "MS_MUTABLE_COLLECTION_PKGPROTECT", justification = "mutable to allow plugins to add additional extensions")
@@ -5054,12 +5136,12 @@ public void doResources(StaplerRequest req, StaplerResponse rsp) throws IOExcept
     /**
      * Checks if container uses UTF-8 to decode URLs. See
      * http://wiki.jenkins-ci.org/display/JENKINS/Tomcat#Tomcat-i18n
-     * @deprecated use {@link URICheckEncodingMonitor#doCheckURIEncoding(StaplerRequest)}
+     * @deprecated use {@link URICheckEncodingMonitor#doCheckURIEncoding(StaplerRequest2)}
      */
     @Restricted(NoExternalUse.class)
     @RestrictedSince("2.37")
     @Deprecated
-    public FormValidation doCheckURIEncoding(StaplerRequest request) throws IOException {
+    public FormValidation doCheckURIEncoding(StaplerRequest2 request) throws IOException {
         return ExtensionList.lookupSingleton(URICheckEncodingMonitor.class).doCheckURIEncoding(request);
     }
 
@@ -5214,7 +5296,7 @@ public Object getTarget() {
         try {
             checkPermission(READ);
         } catch (AccessDeniedException e) {
-            if (!isSubjectToMandatoryReadPermissionCheck(Stapler.getCurrentRequest().getRestOfPath())) {
+            if (!isSubjectToMandatoryReadPermissionCheck(Stapler.getCurrentRequest2().getRestOfPath())) {
                 return this;
             }
 
@@ -5244,7 +5326,7 @@ public boolean isSubjectToMandatoryReadPermissionCheck(String restOfPath) {
 
         // TODO SlaveComputer.doSlaveAgentJnlp; there should be an annotation to request unprotected access
         if ((isAgentJnlpPath(restOfPath, "jenkins") || isAgentJnlpPath(restOfPath, "slave"))
-            && "true".equals(Stapler.getCurrentRequest().getParameter("encrypt"))) {
+            && "true".equals(Stapler.getCurrentRequest2().getParameter("encrypt"))) {
             return false;
         }
 
@@ -5419,13 +5501,13 @@ public HttpResponse doDoDelete() throws IOException {
 
         @Override
         @POST
-        public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, FormException {
+        public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
             Jenkins.get().doConfigExecutorsSubmit(req, rsp);
         }
 
         @WebMethod(name = "config.xml")
         @Override
-        public void doConfigDotXml(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        public void doConfigDotXml(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
             throw HttpResponses.status(SC_BAD_REQUEST);
         }
 
@@ -5456,7 +5538,7 @@ public List<LogRecord> getLogRecords() throws IOException, InterruptedException
 
         @Override
         @RequirePOST
-        public void doLaunchSlaveAgent(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        public void doLaunchSlaveAgent(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
             // this computer never returns null from channel, so
             // this method shall never be invoked.
             rsp.sendError(SC_NOT_FOUND);
@@ -5586,7 +5668,7 @@ private static void computeVersion(ServletContext context) {
 
     /**
      * Get the stored version of Jenkins, as stored by
-     * {@link #doConfigSubmit(org.kohsuke.stapler.StaplerRequest, org.kohsuke.stapler.StaplerResponse)}.
+     * {@link #doConfigSubmit(org.kohsuke.stapler.StaplerRequest2, org.kohsuke.stapler.StaplerResponse2)}.
      * <p>
      * Parses the version into {@link VersionNumber}, or null if it's not parseable as a version number
      * (such as when Jenkins is run with {@code mvn jetty:run})
diff --git a/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
index 5aa73c17528a..6725c1f669fb 100644
--- a/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
+++ b/core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java
@@ -12,13 +12,13 @@
 import hudson.model.PersistentDescriptor;
 import hudson.util.FormValidation;
 import hudson.util.XStream2;
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
 import jenkins.util.SystemProperties;
 import jenkins.util.UrlHelper;
 import org.jenkinsci.Symbol;
@@ -167,7 +167,7 @@ private boolean isInvalidRootUrl(@Nullable String value) {
      */
     private void updateSecureSessionFlag() {
         try {
-            ServletContext context = Jenkins.get().servletContext;
+            ServletContext context = Jenkins.get().getServletContext();
             Method m;
             try {
                 m = context.getClass().getMethod("getSessionCookieConfig");
@@ -177,7 +177,7 @@ private void updateSecureSessionFlag() {
             }
             Object sessionCookieConfig = m.invoke(context);
 
-            Class scc = Class.forName("javax.servlet.SessionCookieConfig");
+            Class scc = Class.forName("jakarta.servlet.SessionCookieConfig");
             Method setSecure = scc.getMethod("setSecure", boolean.class);
             boolean v = fixNull(jenkinsUrl).startsWith("https");
             setSecure.invoke(sessionCookieConfig, v);
diff --git a/core/src/main/java/jenkins/model/MasterBuildConfiguration.java b/core/src/main/java/jenkins/model/MasterBuildConfiguration.java
index fa95401fb73d..6fefbba1f6af 100644
--- a/core/src/main/java/jenkins/model/MasterBuildConfiguration.java
+++ b/core/src/main/java/jenkins/model/MasterBuildConfiguration.java
@@ -29,7 +29,7 @@
 import java.io.IOException;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Adds the configuration regarding building on the built-in node.
@@ -47,7 +47,7 @@ public String getLabelString() {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         Jenkins j = Jenkins.get();
         try {
             // for compatibility reasons, this value is stored in Jenkins
diff --git a/core/src/main/java/jenkins/model/ModelObjectWithChildren.java b/core/src/main/java/jenkins/model/ModelObjectWithChildren.java
index c8d544e03ed8..ed06ea4d7aae 100644
--- a/core/src/main/java/jenkins/model/ModelObjectWithChildren.java
+++ b/core/src/main/java/jenkins/model/ModelObjectWithChildren.java
@@ -1,9 +1,13 @@
 package jenkins.model;
 
+import hudson.Util;
 import hudson.model.ModelObject;
 import jenkins.model.ModelObjectWithContextMenu.ContextMenu;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * {@link ModelObject} that has the children context menu in the breadcrumb.
@@ -20,5 +24,26 @@ public interface ModelObjectWithChildren extends ModelObject {
     /**
      * Generates the context menu to list up all the children.
      */
-    ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception;
+    default ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
+        if (Util.isOverridden(ModelObjectWithChildren.class, getClass(), "doChildrenContextMenu", StaplerRequest.class, StaplerResponse.class)) {
+            return doChildrenContextMenu(StaplerRequest.fromStaplerRequest2(request), StaplerResponse.fromStaplerResponse2(response));
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + ModelObjectWithChildren.class.getSimpleName() + "." + "doChildrenContextMenu" + " methods");
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doChildrenContextMenu(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    default ContextMenu doChildrenContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+        if (Util.isOverridden(ModelObjectWithChildren.class, getClass(), "doChildrenContextMenu", StaplerRequest2.class, StaplerResponse2.class)) {
+            return doChildrenContextMenu(StaplerRequest.toStaplerRequest2(request), StaplerResponse.toStaplerResponse2(response));
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + ModelObjectWithChildren.class.getSimpleName() + "." + "doChildrenContextMenu" + " methods");
+        }
+    }
 }
diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
index 26cc3723dabd..2fa50556574c 100644
--- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
+++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -2,6 +2,7 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Functions;
+import hudson.Util;
 import hudson.model.Action;
 import hudson.model.Actionable;
 import hudson.model.BallColor;
@@ -10,14 +11,15 @@
 import hudson.model.ModelObject;
 import hudson.model.Node;
 import hudson.slaves.Cloud;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.management.Badge;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.JellyException;
 import org.apache.commons.jelly.JellyTagException;
@@ -32,7 +34,9 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
@@ -57,10 +61,31 @@ public interface ModelObjectWithContextMenu extends ModelObject {
      * Generates the context menu.
      *
      * The typical implementation is {@code return new ContextMenu().from(this,request,response);},
-     * which implements the default behaviour. See {@link ContextMenu#from(ModelObjectWithContextMenu, StaplerRequest, StaplerResponse)}
+     * which implements the default behaviour. See {@link ContextMenu#from(ModelObjectWithContextMenu, StaplerRequest2, StaplerResponse2)}
      * for more details of what it does. This should suit most implementations.
      */
-    ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception;
+    default ContextMenu doContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
+        if (Util.isOverridden(ModelObjectWithContextMenu.class, getClass(), "doContextMenu", StaplerRequest.class, StaplerResponse.class)) {
+            return doContextMenu(StaplerRequest.fromStaplerRequest2(request), StaplerResponse.fromStaplerResponse2(response));
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + ModelObjectWithContextMenu.class.getSimpleName() + ".doContextMenu methods");
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doContextMenu(StaplerRequest2, StaplerResponse2)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    default ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+        if (Util.isOverridden(ModelObjectWithContextMenu.class, getClass(), "doContextMenu", StaplerRequest2.class, StaplerResponse2.class)) {
+            return doContextMenu(StaplerRequest.toStaplerRequest2(request), StaplerResponse.toStaplerResponse2(response));
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+                    + ModelObjectWithContextMenu.class.getSimpleName() + ".doContextMenu methods");
+        }
+    }
 
     /**
      * Data object that represents the context menu.
@@ -76,7 +101,7 @@ class ContextMenu implements HttpResponse {
         public final List<MenuItem> items = new ArrayList<>();
 
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object o) throws IOException, ServletException {
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object o) throws IOException, ServletException {
             rsp.serveExposedBean(req, this, Flavor.JSON);
         }
 
@@ -98,7 +123,7 @@ public ContextMenu add(Action a) {
             if (!Functions.isContextMenuVisible(a)) {
                 return this;
             }
-            StaplerRequest req = Stapler.getCurrentRequest();
+            StaplerRequest2 req = Stapler.getCurrentRequest2();
             String text = a.getDisplayName();
             String base = Functions.getIconFilePath(a);
             if (base == null)     return this;
@@ -108,7 +133,7 @@ public ContextMenu add(Action a) {
                 Icon icon = Functions.tryGetIcon(base);
                 return add(url, icon.getClassSpec(), text);
             } else {
-                String icon = Stapler.getCurrentRequest().getContextPath() + (base.startsWith("images/") ? Functions.getResourcePath() : "") + '/' + base;
+                String icon = Stapler.getCurrentRequest2().getContextPath() + (base.startsWith("images/") ? Functions.getResourcePath() : "") + '/' + base;
                 return add(url, icon, text);
             }
         }
@@ -267,14 +292,14 @@ public ContextMenu add(Job job) {
          *
          * <p>
          * Unconventional {@link ModelObject} implementations that do not use {@code sidepanel.groovy}
-         * can override {@link ModelObjectWithContextMenu#doContextMenu(StaplerRequest, StaplerResponse)}
+         * can override {@link ModelObjectWithContextMenu#doContextMenu(StaplerRequest2, StaplerResponse2)}
          * directly to provide alternative semantics.
          */
-        public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest request, StaplerResponse response) throws JellyException, IOException {
+        public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request, StaplerResponse2 response) throws JellyException, IOException {
             return from(self, request, response, "sidepanel");
         }
 
-        public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest request, StaplerResponse response, String view) throws JellyException, IOException {
+        public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request, StaplerResponse2 response, String view) throws JellyException, IOException {
             WebApp webApp = WebApp.getCurrent();
             final Script s = webApp.getMetaClass(self).getTearOff(JellyClassTearOff.class).findScript(view);
             if (s != null) {
@@ -401,9 +426,9 @@ public MenuItem() {
 
         public MenuItem withUrl(String url) {
             try {
-                this.url = new URI(Stapler.getCurrentRequest().getRequestURI()).resolve(new URI(url)).toString();
+                this.url = new URI(Stapler.getCurrentRequest2().getRequestURI()).resolve(new URI(url)).toString();
             } catch (URISyntaxException x) {
-                throw new IllegalArgumentException("Bad URI from " + Stapler.getCurrentRequest().getRequestURI() + " vs. " + url, x);
+                throw new IllegalArgumentException("Bad URI from " + Stapler.getCurrentRequest2().getRequestURI() + " vs. " + url, x);
             }
             return this;
         }
@@ -413,7 +438,7 @@ public MenuItem withUrl(String url) {
          */
         public MenuItem withContextRelativeUrl(String url) {
             if (!url.startsWith("/"))   url = '/' + url;
-            this.url = Stapler.getCurrentRequest().getContextPath() + url;
+            this.url = Stapler.getCurrentRequest2().getContextPath() + url;
             return this;
         }
 
@@ -463,7 +488,7 @@ public MenuItem withDisplayName(ModelObject o) {
         }
 
         private String getResourceUrl() {
-            return Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH;
+            return Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH;
         }
 
     }
@@ -483,7 +508,7 @@ interface ContextMenuVisibility extends Action {
         /**
          * Determines whether to show this action right now.
          * Can always return false, for an action which should never be in the context menu;
-         * or could examine {@link Stapler#getCurrentRequest}.
+         * or could examine {@link Stapler#getCurrentRequest2}.
          * @return true to display it, false to hide
          * @see ContextMenu#add(Action)
          */
diff --git a/core/src/main/java/jenkins/model/OptionalJobProperty.java b/core/src/main/java/jenkins/model/OptionalJobProperty.java
index 2b4db11c1b84..1614f33363b1 100644
--- a/core/src/main/java/jenkins/model/OptionalJobProperty.java
+++ b/core/src/main/java/jenkins/model/OptionalJobProperty.java
@@ -24,11 +24,13 @@
 
 package jenkins.model;
 
+import hudson.Util;
 import hudson.model.Job;
 import hudson.model.JobProperty;
 import hudson.model.JobPropertyDescriptor;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Job property which may or may not be present.
@@ -51,11 +53,23 @@ protected OptionalJobPropertyDescriptor(Class<? extends JobProperty<?>> clazz) {
 
         protected OptionalJobPropertyDescriptor() {}
 
+        @Override
+        public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
+            if (Util.isOverridden(OptionalJobPropertyDescriptor.class, getClass(), "newInstance", StaplerRequest.class, JSONObject.class)) {
+                return newInstance(req != null ? StaplerRequest.fromStaplerRequest2(req) : null, formData);
+            } else {
+                return formData.optBoolean("specified") ? super.newInstance(req, formData) : null;
+            }
+        }
+
+        /**
+         * @deprecated use {@link #newInstance(StaplerRequest2, JSONObject)}
+         */
+        @Deprecated
         @Override
         public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
             return formData.optBoolean("specified") ? super.newInstance(req, formData) : null;
         }
-
     }
 
 }
diff --git a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
index 662ffa9359e2..ea8437510818 100644
--- a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
+++ b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
@@ -24,8 +24,8 @@
 
 package jenkins.model;
 
-import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
-import static javax.servlet.http.HttpServletResponse.SC_CREATED;
+import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;
+import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.Util;
@@ -51,14 +51,16 @@
 import hudson.triggers.Trigger;
 import hudson.util.AlternativeUiTextProvider;
 import hudson.views.BuildButtonColumn;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.ServletException;
 import jenkins.model.lazy.LazyBuildMixIn;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.triggers.SCMTriggerItem;
 import jenkins.triggers.TriggeredItem;
 import jenkins.util.TimeDuration;
@@ -73,7 +75,9 @@
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -191,7 +195,7 @@ public final boolean isParameterized() {
      * Standard implementation of {@link ParameterizedJob#doBuild}.
      */
     @SuppressWarnings("deprecation")
-    public final void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
+    public final void doBuild(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
         if (delay == null) {
             delay = new TimeDuration(TimeUnit.MILLISECONDS.convert(asJob().getQuietPeriod(), TimeUnit.SECONDS));
         }
@@ -229,7 +233,7 @@ public final void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParamet
      * Standard implementation of {@link ParameterizedJob#doBuildWithParameters}.
      */
     @SuppressWarnings("deprecation")
-    public final void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
+    public final void doBuildWithParameters(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
         BuildAuthorizationToken.checkPermission(asJob(), asJob().getAuthToken(), req, rsp);
 
         ParametersDefinitionProperty pp = asJob().getProperty(ParametersDefinitionProperty.class);
@@ -247,7 +251,7 @@ public final void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp,
      * Standard implementation of {@link ParameterizedJob#doCancelQueue}.
      */
     @RequirePOST
-    public final void doCancelQueue(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public final void doCancelQueue(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         asJob().checkPermission(Item.CANCEL);
         Jenkins.get().getQueue().cancel(asJob());
         rsp.forwardToPreviousPage(req);
@@ -269,7 +273,7 @@ public final SearchIndexBuilder extendSearchIndex(SearchIndexBuilder sib) {
      * Computes the build cause, using RemoteCause or UserCause as appropriate.
      */
     @Restricted(NoExternalUse.class)
-    public static CauseAction getBuildCause(ParameterizedJob job, StaplerRequest req) {
+    public static CauseAction getBuildCause(ParameterizedJob job, StaplerRequest2 req) {
         Cause cause;
         @SuppressWarnings("deprecation")
         BuildAuthorizationToken authToken = job.getAuthToken();
@@ -401,8 +405,29 @@ default QueueTaskFuture<RunT> scheduleBuild2(int quietPeriod, Action... actions)
          * Schedules a new build command.
          * @see ParameterizedJobMixIn#doBuild
          */
-        default void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
-            getParameterizedJobMixIn().doBuild(req, rsp, delay);
+        default void doBuild(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
+            if (Util.isOverridden(ParameterizedJob.class, getClass(), "doBuild", StaplerRequest.class, StaplerResponse.class, TimeDuration.class)) {
+                try {
+                    doBuild(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp), delay);
+                } catch (javax.servlet.ServletException e) {
+                    throw ServletExceptionWrapper.toJakartaServletException(e);
+                }
+            } else {
+                getParameterizedJobMixIn().doBuild(req, rsp, delay);
+            }
+        }
+
+        /**
+         * @deprecated use {@link #doBuild(StaplerRequest2, StaplerResponse2, TimeDuration)}
+         */
+        @Deprecated
+        @StaplerNotDispatchable
+        default void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter TimeDuration delay) throws IOException, javax.servlet.ServletException {
+            try {
+                getParameterizedJobMixIn().doBuild(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), delay);
+            } catch (ServletException e) {
+                throw ServletExceptionWrapper.fromJakartaServletException(e);
+            }
         }
 
         /**
@@ -410,8 +435,29 @@ default void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParameter Ti
          * Currently only String parameters are supported.
          * @see ParameterizedJobMixIn#doBuildWithParameters
          */
-        default void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
-            getParameterizedJobMixIn().doBuildWithParameters(req, rsp, delay);
+        default void doBuildWithParameters(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter TimeDuration delay) throws IOException, ServletException {
+            if (Util.isOverridden(ParameterizedJob.class, getClass(), "doBuildWithParameters", StaplerRequest.class, StaplerResponse.class, TimeDuration.class)) {
+                try {
+                    doBuildWithParameters(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp), delay);
+                } catch (javax.servlet.ServletException e) {
+                    throw ServletExceptionWrapper.toJakartaServletException(e);
+                }
+            } else {
+                getParameterizedJobMixIn().doBuildWithParameters(req, rsp, delay);
+            }
+        }
+
+        /**
+         * @deprecated use {@link #doBuildWithParameters(StaplerRequest2, StaplerResponse2, TimeDuration)}
+         */
+        @Deprecated
+        @StaplerNotDispatchable
+        default void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp, @QueryParameter TimeDuration delay) throws IOException, javax.servlet.ServletException {
+            try {
+                getParameterizedJobMixIn().doBuildWithParameters(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp), delay);
+            } catch (ServletException e) {
+                throw ServletExceptionWrapper.fromJakartaServletException(e);
+            }
         }
 
         /**
@@ -419,7 +465,7 @@ default void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp, @Que
          * @see ParameterizedJobMixIn#doCancelQueue
          */
         @RequirePOST
-        default void doCancelQueue(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        default void doCancelQueue(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
             getParameterizedJobMixIn().doCancelQueue(req, rsp);
         }
 
@@ -427,7 +473,7 @@ default void doCancelQueue(StaplerRequest req, StaplerResponse rsp) throws IOExc
          * Schedules a new SCM polling command.
          */
         @SuppressWarnings("deprecation")
-        default void doPolling(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        default void doPolling(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
             if (!(this instanceof SCMTriggerItem)) {
                 rsp.sendError(404);
                 return;
@@ -485,7 +531,7 @@ default void makeDisabled(boolean b) throws IOException {
 
         @CLIMethod(name = "disable-job")
         @RequirePOST
-        default HttpResponse doDisable() throws IOException, ServletException {
+        default HttpResponse doDisable() throws IOException {
             checkPermission(CONFIGURE);
             makeDisabled(true);
             return new HttpRedirect(".");
@@ -493,7 +539,7 @@ default HttpResponse doDisable() throws IOException, ServletException {
 
         @CLIMethod(name = "enable-job")
         @RequirePOST
-        default HttpResponse doEnable() throws IOException, ServletException {
+        default HttpResponse doEnable() throws IOException {
             checkPermission(CONFIGURE);
             makeDisabled(false);
             return new HttpRedirect(".");
diff --git a/core/src/main/java/jenkins/model/ProjectNamingStrategy.java b/core/src/main/java/jenkins/model/ProjectNamingStrategy.java
index 76e9ff64587f..796519f7d9c8 100644
--- a/core/src/main/java/jenkins/model/ProjectNamingStrategy.java
+++ b/core/src/main/java/jenkins/model/ProjectNamingStrategy.java
@@ -33,11 +33,11 @@
 import hudson.model.Descriptor;
 import hudson.model.Failure;
 import hudson.util.FormValidation;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import javax.servlet.ServletException;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
diff --git a/core/src/main/java/jenkins/model/experimentalflags/UserExperimentalFlagsProperty.java b/core/src/main/java/jenkins/model/experimentalflags/UserExperimentalFlagsProperty.java
index 85332d26973c..06d1a7696e66 100644
--- a/core/src/main/java/jenkins/model/experimentalflags/UserExperimentalFlagsProperty.java
+++ b/core/src/main/java/jenkins/model/experimentalflags/UserExperimentalFlagsProperty.java
@@ -37,7 +37,7 @@
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 
 /**
@@ -74,7 +74,7 @@ public static final class DescriptorImpl extends UserPropertyDescriptor {
         }
 
         @Override
-        public UserProperty newInstance(@Nullable StaplerRequest req, @NonNull JSONObject formData) throws FormException {
+        public UserProperty newInstance(@Nullable StaplerRequest2 req, @NonNull JSONObject formData) throws FormException {
             JSONObject flagsObj = formData.getJSONObject("flags");
             Map<String, String> flags = new HashMap<>();
             for (String key : flagsObj.keySet()) {
diff --git a/core/src/main/java/jenkins/model/item_category/Categories.java b/core/src/main/java/jenkins/model/item_category/Categories.java
index fd9b475cdf10..9e80eb0085fb 100644
--- a/core/src/main/java/jenkins/model/item_category/Categories.java
+++ b/core/src/main/java/jenkins/model/item_category/Categories.java
@@ -26,16 +26,16 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.ServletException;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 import org.kohsuke.stapler.export.Flavor;
@@ -63,7 +63,7 @@ public List<Category> getItems() {
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
         rsp.serveExposedBean(req, this, Flavor.JSON);
     }
 
diff --git a/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
index 06aad8ed9ef5..98055fb39b2e 100644
--- a/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
@@ -6,9 +6,11 @@
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
 import hudson.model.TaskListener;
-import javax.servlet.ServletException;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
@@ -26,7 +28,10 @@ public abstract class GlobalSettingsProvider extends AbstractDescribableImpl<Glo
      */
     public abstract FilePath supplySettings(AbstractBuild<?, ?> build, TaskListener listener);
 
-    public static GlobalSettingsProvider parseSettingsProvider(StaplerRequest req) throws Descriptor.FormException, ServletException {
+    /**
+     * @since TODO
+     */
+    public static GlobalSettingsProvider parseSettingsProvider(StaplerRequest2 req) throws Descriptor.FormException, ServletException {
         JSONObject settings = req.getSubmittedForm().getJSONObject("globalSettings");
         if (settings == null) {
             return new DefaultGlobalSettingsProvider();
@@ -34,6 +39,18 @@ public static GlobalSettingsProvider parseSettingsProvider(StaplerRequest req) t
         return req.bindJSON(GlobalSettingsProvider.class, settings);
     }
 
+    /**
+     * @deprecated use {@link #parseSettingsProvider(StaplerRequest2)}
+     */
+    @Deprecated
+    public static GlobalSettingsProvider parseSettingsProvider(StaplerRequest req) throws Descriptor.FormException, javax.servlet.ServletException {
+        try {
+            return parseSettingsProvider(StaplerRequest.toStaplerRequest2(req));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Convenience method handling all {@code null} checks. Provides the path on the (possible) remote settings file.
      *
diff --git a/core/src/main/java/jenkins/mvn/SettingsProvider.java b/core/src/main/java/jenkins/mvn/SettingsProvider.java
index 266f9c1cd00c..9173c5dbadf5 100644
--- a/core/src/main/java/jenkins/mvn/SettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/SettingsProvider.java
@@ -6,9 +6,11 @@
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
 import hudson.model.TaskListener;
-import javax.servlet.ServletException;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import jakarta.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
@@ -24,7 +26,7 @@ public abstract class SettingsProvider extends AbstractDescribableImpl<SettingsP
      */
     public abstract FilePath supplySettings(AbstractBuild<?, ?> build, TaskListener listener);
 
-    public static SettingsProvider parseSettingsProvider(StaplerRequest req) throws Descriptor.FormException, ServletException {
+    public static SettingsProvider parseSettingsProvider(StaplerRequest2 req) throws Descriptor.FormException, ServletException {
         JSONObject settings = req.getSubmittedForm().getJSONObject("settings");
         if (settings == null) {
             return new DefaultSettingsProvider();
@@ -32,6 +34,18 @@ public static SettingsProvider parseSettingsProvider(StaplerRequest req) throws
         return req.bindJSON(SettingsProvider.class, settings);
     }
 
+    /**
+     * @deprecated use {@link #parseSettingsProvider(StaplerRequest2)}
+     */
+    @Deprecated
+    public static SettingsProvider parseSettingsProvider(StaplerRequest req) throws Descriptor.FormException, javax.servlet.ServletException {
+        try {
+            return parseSettingsProvider(StaplerRequest.toStaplerRequest2(req));
+        } catch (ServletException e) {
+            throw ServletExceptionWrapper.fromJakartaServletException(e);
+        }
+    }
+
     /**
      * Convenience method handling all {@code null} checks. Provides the path on the (possible) remote settings file.
      *
diff --git a/core/src/main/java/jenkins/security/AcegiSecurityExceptionFilter.java b/core/src/main/java/jenkins/security/AcegiSecurityExceptionFilter.java
index 5aec5265e166..1441ae5a6165 100644
--- a/core/src/main/java/jenkins/security/AcegiSecurityExceptionFilter.java
+++ b/core/src/main/java/jenkins/security/AcegiSecurityExceptionFilter.java
@@ -26,17 +26,17 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.security.UnwrapSecurityExceptionFilter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
 import java.util.function.Function;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import org.acegisecurity.AcegiSecurityException;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.CompatibleFilter;
 import org.springframework.security.web.access.ExceptionTranslationFilter;
 
 /**
@@ -44,7 +44,7 @@
  * Used by other filters like {@link UnwrapSecurityExceptionFilter} and {@link ExceptionTranslationFilter}.
  */
 @Restricted(NoExternalUse.class)
-public class AcegiSecurityExceptionFilter implements Filter {
+public class AcegiSecurityExceptionFilter implements CompatibleFilter {
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
diff --git a/core/src/main/java/jenkins/security/ApiCrumbExclusion.java b/core/src/main/java/jenkins/security/ApiCrumbExclusion.java
index 926eec501882..f001950d3464 100644
--- a/core/src/main/java/jenkins/security/ApiCrumbExclusion.java
+++ b/core/src/main/java/jenkins/security/ApiCrumbExclusion.java
@@ -26,11 +26,11 @@
 
 import hudson.Extension;
 import hudson.security.csrf.CrumbExclusion;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
diff --git a/core/src/main/java/jenkins/security/ApiTokenFilter.java b/core/src/main/java/jenkins/security/ApiTokenFilter.java
index 986408d62604..355c32d9e254 100644
--- a/core/src/main/java/jenkins/security/ApiTokenFilter.java
+++ b/core/src/main/java/jenkins/security/ApiTokenFilter.java
@@ -1,7 +1,7 @@
 package jenkins.security;
 
+import jakarta.servlet.Filter;
 import java.util.List;
-import javax.servlet.Filter;
 
 /**
  * {@link Filter} that performs HTTP basic authentication based on API token.
diff --git a/core/src/main/java/jenkins/security/ApiTokenProperty.java b/core/src/main/java/jenkins/security/ApiTokenProperty.java
index 464fdcbdf16c..804b8edbc56e 100644
--- a/core/src/main/java/jenkins/security/ApiTokenProperty.java
+++ b/core/src/main/java/jenkins/security/ApiTokenProperty.java
@@ -66,7 +66,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
@@ -274,7 +274,7 @@ public TokenInfoAndStats(@NonNull ApiTokenStore.HashedToken token, @NonNull ApiT
      * Allow user to rename tokens
      */
     @Override
-    public UserProperty reconfigure(StaplerRequest req, @CheckForNull JSONObject form) throws FormException {
+    public UserProperty reconfigure(StaplerRequest2 req, @CheckForNull JSONObject form) throws FormException {
         if (form == null) {
             return this;
         }
diff --git a/core/src/main/java/jenkins/security/AuthenticationSuccessHandler.java b/core/src/main/java/jenkins/security/AuthenticationSuccessHandler.java
index a5c7cffceeb8..a9dc6ef787b4 100644
--- a/core/src/main/java/jenkins/security/AuthenticationSuccessHandler.java
+++ b/core/src/main/java/jenkins/security/AuthenticationSuccessHandler.java
@@ -25,8 +25,8 @@
 package jenkins.security;
 
 import hudson.Util;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.springframework.security.core.Authentication;
diff --git a/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java
index d37a59755725..5aab6868ea56 100644
--- a/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java
+++ b/core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java
@@ -4,10 +4,10 @@
 
 import hudson.Extension;
 import hudson.model.User;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.springframework.security.core.Authentication;
diff --git a/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java
index 471e0d3900c7..2906a1aa461b 100644
--- a/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java
+++ b/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java
@@ -4,10 +4,13 @@
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.Util;
+import io.jenkins.servlet.ServletExceptionWrapper;
+import io.jenkins.servlet.http.HttpServletRequestWrapper;
+import io.jenkins.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.core.Authentication;
 
 /**
@@ -35,11 +38,42 @@ public abstract class BasicHeaderAuthenticator implements ExtensionPoint {
      * <p>
      * When no processor can validate the username/password pair, caller will make
      * the request processing fail.
-     * @since 2.266
+     * @since TODO
      */
     @CheckForNull
     public Authentication authenticate2(HttpServletRequest req, HttpServletResponse rsp, String username, String password) throws IOException, ServletException {
-        if (Util.isOverridden(BasicHeaderAuthenticator.class, getClass(), "authenticate", HttpServletRequest.class, HttpServletResponse.class, String.class, String.class)) {
+        if (Util.isOverridden(BasicHeaderAuthenticator.class, getClass(), "authenticate2", javax.servlet.http.HttpServletRequest.class, javax.servlet.http.HttpServletResponse.class, String.class, String.class)) {
+            try {
+                return authenticate2(HttpServletRequestWrapper.fromJakartaHttpServletRequest(req), HttpServletResponseWrapper.fromJakartaHttpServletResponse(rsp), username, password);
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else if (Util.isOverridden(BasicHeaderAuthenticator.class, getClass(), "authenticate", javax.servlet.http.HttpServletRequest.class, javax.servlet.http.HttpServletResponse.class, String.class, String.class)) {
+            try {
+                org.acegisecurity.Authentication a = authenticate(HttpServletRequestWrapper.fromJakartaHttpServletRequest(req), HttpServletResponseWrapper.fromJakartaHttpServletResponse(rsp), username, password);
+                return a != null ? a.toSpring() : null;
+            } catch (javax.servlet.ServletException e) {
+                throw ServletExceptionWrapper.toJakartaServletException(e);
+            }
+        } else {
+            throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the " + BasicHeaderAuthenticator.class.getSimpleName() + ".authenticate2 methods");
+        }
+    }
+
+    /**
+     * @deprecated use {@link #authenticate2(HttpServletRequest, HttpServletResponse, String, String)}
+     * @since 2.266
+     */
+    @CheckForNull
+    @Deprecated
+    public Authentication authenticate2(javax.servlet.http.HttpServletRequest req, javax.servlet.http.HttpServletResponse rsp, String username, String password) throws IOException, javax.servlet.ServletException {
+        if (Util.isOverridden(BasicHeaderAuthenticator.class, getClass(), "authenticate2", HttpServletRequest.class, HttpServletResponse.class, String.class, String.class)) {
+            try {
+                return authenticate2(HttpServletRequestWrapper.toJakartaHttpServletRequest(req), HttpServletResponseWrapper.toJakartaHttpServletResponse(rsp), username, password);
+            } catch (ServletException e) {
+                throw ServletExceptionWrapper.fromJakartaServletException(e);
+            }
+        } else if (Util.isOverridden(BasicHeaderAuthenticator.class, getClass(), "authenticate", javax.servlet.http.HttpServletRequest.class, javax.servlet.http.HttpServletResponse.class, String.class, String.class)) {
             org.acegisecurity.Authentication a = authenticate(req, rsp, username, password);
             return a != null ? a.toSpring() : null;
         } else {
@@ -52,7 +86,7 @@ public Authentication authenticate2(HttpServletRequest req, HttpServletResponse
      */
     @Deprecated
     @CheckForNull
-    public org.acegisecurity.Authentication authenticate(HttpServletRequest req, HttpServletResponse rsp, String username, String password) throws IOException, ServletException {
+    public org.acegisecurity.Authentication authenticate(javax.servlet.http.HttpServletRequest req, javax.servlet.http.HttpServletResponse rsp, String username, String password) throws IOException, javax.servlet.ServletException {
         Authentication a = authenticate2(req, rsp, username, password);
         return a != null ? org.acegisecurity.Authentication.fromSpring(a) : null;
     }
diff --git a/core/src/main/java/jenkins/security/BasicHeaderProcessor.java b/core/src/main/java/jenkins/security/BasicHeaderProcessor.java
index 45b5eb0c70a2..1b31dba65e42 100644
--- a/core/src/main/java/jenkins/security/BasicHeaderProcessor.java
+++ b/core/src/main/java/jenkins/security/BasicHeaderProcessor.java
@@ -7,20 +7,21 @@
 import hudson.security.ACLContext;
 import hudson.security.SecurityRealm;
 import hudson.util.Scrambler;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.CompatibleFilter;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -43,7 +44,7 @@
  * @author Kohsuke Kawaguchi
  */
 @Restricted(NoExternalUse.class)
-public class BasicHeaderProcessor implements Filter {
+public class BasicHeaderProcessor implements CompatibleFilter {
     private AuthenticationEntryPoint authenticationEntryPoint;
     private RememberMeServices rememberMeServices = new NullRememberMeServices();
 
diff --git a/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java
index 1007819c981a..70ef36505683 100644
--- a/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java
+++ b/core/src/main/java/jenkins/security/BasicHeaderRealPasswordAuthenticator.java
@@ -19,11 +19,11 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.ExtensionFilter;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
diff --git a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
index cb8b8accf295..31951b8572fb 100644
--- a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
+++ b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java
@@ -21,7 +21,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -44,7 +44,7 @@ public class LastGrantedAuthoritiesProperty extends UserProperty {
      * Stick to the same object since there's no UI for this.
      */
     @Override
-    public UserProperty reconfigure(StaplerRequest req, JSONObject form) throws FormException {
+    public UserProperty reconfigure(StaplerRequest2 req, JSONObject form) throws FormException {
         req.bindJSON(this, form);
         return this;
     }
diff --git a/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java b/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java
index e67e73b8db33..859b0db4ef1b 100644
--- a/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java
+++ b/core/src/main/java/jenkins/security/NonSerializableSecurityContext.java
@@ -16,7 +16,7 @@
 package jenkins.security;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.springframework.security.core.Authentication;
diff --git a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
index b4c033bfad0e..b409d92d9490 100644
--- a/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
+++ b/core/src/main/java/jenkins/security/QueueItemAuthenticatorConfiguration.java
@@ -11,7 +11,7 @@
 import jenkins.model.GlobalConfigurationCategory;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Show the {@link QueueItemAuthenticator} configurations on the system config page.
@@ -47,7 +47,7 @@ public DescribableList<QueueItemAuthenticator, QueueItemAuthenticatorDescriptor>
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             authenticators.rebuildHetero(req, json, QueueItemAuthenticatorDescriptor.all(), "authenticators");
             return true;
diff --git a/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java b/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java
index cd552fc65130..6b03113019d5 100644
--- a/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java
+++ b/core/src/main/java/jenkins/security/ResourceDomainConfiguration.java
@@ -31,6 +31,7 @@
 import hudson.ExtensionList;
 import hudson.Util;
 import hudson.util.FormValidation;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -43,7 +44,6 @@
 import java.util.Base64;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
 import jenkins.diagnostics.RootUrlNotSetMonitor;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.Jenkins;
@@ -57,7 +57,7 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.verb.POST;
 
 /**
@@ -134,7 +134,7 @@ private FormValidation checkUrl(String resourceRootUrlString, boolean allowOnlin
             return FormValidation.error(Messages.ResourceDomainConfiguration_InvalidRootURL(ex.getMessage()));
         }
 
-        StaplerRequest currentRequest = Stapler.getCurrentRequest();
+        StaplerRequest2 currentRequest = Stapler.getCurrentRequest2();
         if (currentRequest != null) {
             String currentRequestHost = currentRequest.getServerName();
 
diff --git a/core/src/main/java/jenkins/security/ResourceDomainFilter.java b/core/src/main/java/jenkins/security/ResourceDomainFilter.java
index b88fc7045ff6..4e47dbb2e5cd 100644
--- a/core/src/main/java/jenkins/security/ResourceDomainFilter.java
+++ b/core/src/main/java/jenkins/security/ResourceDomainFilter.java
@@ -26,14 +26,14 @@
 
 import hudson.Extension;
 import hudson.Functions;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.util.HttpServletFilter;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
diff --git a/core/src/main/java/jenkins/security/ResourceDomainRootAction.java b/core/src/main/java/jenkins/security/ResourceDomainRootAction.java
index fc18071fade7..bd327599bd2f 100644
--- a/core/src/main/java/jenkins/security/ResourceDomainRootAction.java
+++ b/core/src/main/java/jenkins/security/ResourceDomainRootAction.java
@@ -54,8 +54,8 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -101,7 +101,7 @@ public static ResourceDomainRootAction get() {
         return ExtensionList.lookupSingleton(ResourceDomainRootAction.class);
     }
 
-    public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public void doIndex(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (ResourceDomainConfiguration.isResourceRequest(req)) {
             rsp.sendError(404, ResourceDomainFilter.ERROR_RESPONSE);
         } else {
@@ -110,7 +110,7 @@ public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException
         }
     }
 
-    public Object getDynamic(String id, StaplerRequest req, StaplerResponse rsp) throws Exception {
+    public Object getDynamic(String id, StaplerRequest2 req, StaplerResponse2 rsp) throws Exception {
         if (!ResourceDomainConfiguration.isResourceRequest(req)) {
             req.setAttribute(RESOURCE_DOMAIN_ROOT_ACTION_ERROR, true);
             rsp.sendError(404, "Cannot handle requests to this URL unless on Jenkins resource URL.");
@@ -147,7 +147,7 @@ private Redirection(String url) {
             this.url = url;
         }
 
-        public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
             String restOfPath = req.getRestOfPath();
 
             String url = Jenkins.get().getRootUrl() + this.url + restOfPath;
@@ -169,7 +169,7 @@ private static String getResourceRootUrl() {
     }
 
     /**
-     * Called from {@link DirectoryBrowserSupport#generateResponse(StaplerRequest, StaplerResponse, Object)} to obtain
+     * Called from {@link DirectoryBrowserSupport#generateResponse(StaplerRequest2, StaplerResponse2, Object)} to obtain
      * a token to use when rendering a response.
      *
      * @param dbs the {@link DirectoryBrowserSupport} instance requesting the token
@@ -177,7 +177,7 @@ private static String getResourceRootUrl() {
      * @return a token that can be used to redirect users to the {@link ResourceDomainRootAction}.
      */
     @CheckForNull
-    public Token getToken(@NonNull DirectoryBrowserSupport dbs, @NonNull StaplerRequest req) {
+    public Token getToken(@NonNull DirectoryBrowserSupport dbs, @NonNull StaplerRequest2 req) {
         // This is the "restOfPath" of the DirectoryBrowserSupport, i.e. the directory/file/pattern "inside" the DBS.
         final String dbsFile = req.getOriginalRestOfPath();
 
@@ -212,7 +212,7 @@ private static class InternalResourceRequest {
             this.authenticationName = authenticationName;
         }
 
-        public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
             String restOfPath = req.getRestOfPath();
 
             String requestUrlSuffix = this.browserUrl;
diff --git a/core/src/main/java/jenkins/security/SecureRequester.java b/core/src/main/java/jenkins/security/SecureRequester.java
index 18c634a155ac..489deccab1fd 100644
--- a/core/src/main/java/jenkins/security/SecureRequester.java
+++ b/core/src/main/java/jenkins/security/SecureRequester.java
@@ -2,13 +2,16 @@
 
 import hudson.Extension;
 import hudson.ExtensionPoint;
+import hudson.Util;
 import hudson.model.Api;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
+import jenkins.security.stapler.StaplerNotDispatchable;
 import jenkins.util.SystemProperties;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * An extension point for authorizing REST API access to an object where an unsafe result type would be produced.
@@ -22,13 +25,37 @@ public interface SecureRequester extends ExtensionPoint {
 
     /**
      * Checks if a Jenkins object can be accessed by a given REST request.
-     * For instance, if the {@link StaplerRequest#getReferer} matches a given host, or
+     * For instance, if the {@link StaplerRequest2#getReferer} matches a given host, or
      * anonymous read is allowed for the given object.
      * @param req a request going through the REST API
      * @param bean an exported object of some kind
      * @return true if this requester should be trusted, false to reject
      */
-    boolean permit(StaplerRequest req, Object bean);
+    @StaplerNotDispatchable
+    default boolean permit(StaplerRequest2 req, Object bean) {
+        return Util.ifOverridden(
+                () -> permit(StaplerRequest.fromStaplerRequest2(req), bean),
+                SecureRequester.class,
+                getClass(),
+                "permit",
+                StaplerRequest.class,
+                Object.class);
+    }
+
+    /**
+     * @deprecated use {@link #permit(StaplerRequest2, Object)}
+     */
+    @Deprecated
+    @StaplerNotDispatchable
+    default boolean permit(StaplerRequest req, Object bean) {
+        return Util.ifOverridden(
+                () -> permit(StaplerRequest.toStaplerRequest2(req), bean),
+                SecureRequester.class,
+                getClass(),
+                "permit",
+                StaplerRequest2.class,
+                Object.class);
+    }
 
     @Restricted(NoExternalUse.class)
     @Extension class Default implements SecureRequester {
@@ -42,7 +69,7 @@ public interface SecureRequester extends ExtensionPoint {
             }
         }
 
-        @Override public boolean permit(StaplerRequest req, Object bean) {
+        @Override public boolean permit(StaplerRequest2 req, Object bean) {
             return INSECURE || !Jenkins.get().isUseSecurity();
         }
 
diff --git a/core/src/main/java/jenkins/security/SuspiciousRequestFilter.java b/core/src/main/java/jenkins/security/SuspiciousRequestFilter.java
index 9b9f413606d8..26a1eb5da845 100644
--- a/core/src/main/java/jenkins/security/SuspiciousRequestFilter.java
+++ b/core/src/main/java/jenkins/security/SuspiciousRequestFilter.java
@@ -1,22 +1,22 @@
 package jenkins.security;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.util.SystemProperties;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.CompatibleFilter;
 
 @Restricted(NoExternalUse.class)
-public class SuspiciousRequestFilter implements Filter {
+public class SuspiciousRequestFilter implements CompatibleFilter {
 
     /** System property name set to true or false to indicate whether or not semicolons should be allowed in URL paths. */
     public static final String ALLOW_SEMICOLONS_IN_PATH = SuspiciousRequestFilter.class.getName() + ".allowSemicolonsInPath";
diff --git a/core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java b/core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java
index da4fc322811e..33638a3c9d65 100644
--- a/core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java
+++ b/core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java
@@ -40,7 +40,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Configuration for update site-provided warnings.
@@ -111,7 +111,7 @@ public Set<UpdateSite.Warning> getApplicableWarnings() {
 
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         HashSet<String> newIgnoredWarnings = new HashSet<>();
         for (Object key : json.keySet()) {
             String warningKey = key.toString();
diff --git a/core/src/main/java/jenkins/security/seed/UserSeedSecurityListener.java b/core/src/main/java/jenkins/security/seed/UserSeedSecurityListener.java
index 1996a5efc174..870e6d7de342 100644
--- a/core/src/main/java/jenkins/security/seed/UserSeedSecurityListener.java
+++ b/core/src/main/java/jenkins/security/seed/UserSeedSecurityListener.java
@@ -27,12 +27,12 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.model.User;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import jenkins.security.SecurityListener;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.springframework.security.core.userdetails.UserDetails;
 
 /**
@@ -53,7 +53,7 @@ protected void authenticated2(@NonNull UserDetails details) {
     }
 
     private static void putUserSeedInSession(String username, boolean overwriteSessionSeed) {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req == null) {
             // expected case: CLI
             // But also HudsonPrivateSecurityRealm because of a redirect from Spring Security, the request is not a Stapler one
diff --git a/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java b/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java
index eebfcfdacf0e..028b2dba1db3 100644
--- a/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java
+++ b/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java
@@ -28,6 +28,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -50,7 +51,6 @@
 import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
 import jenkins.YesNoMaybe;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
@@ -59,8 +59,8 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.CancelRequestHandlingException;
 import org.kohsuke.stapler.DispatchValidator;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebApp;
 
 /**
@@ -95,7 +95,7 @@ public class StaplerDispatchValidator implements DispatchValidator {
     public static /* script-console editable */ boolean DISABLED = SystemProperties.getBoolean(ESCAPE_HATCH);
 
     @NonNull
-    private static YesNoMaybe setStatus(@NonNull StaplerRequest req, @NonNull YesNoMaybe status) {
+    private static YesNoMaybe setStatus(@NonNull StaplerRequest2 req, @NonNull YesNoMaybe status) {
         switch (status) {
             case YES:
             case NO:
@@ -110,7 +110,7 @@ private static YesNoMaybe setStatus(@NonNull StaplerRequest req, @NonNull YesNoM
     }
 
     @NonNull
-    private static YesNoMaybe computeStatusIfNull(@NonNull StaplerRequest req, @NonNull Supplier<YesNoMaybe> statusIfNull) {
+    private static YesNoMaybe computeStatusIfNull(@NonNull StaplerRequest2 req, @NonNull Supplier<YesNoMaybe> statusIfNull) {
         Object requestStatus = req.getAttribute(ATTRIBUTE_NAME);
         if (requestStatus instanceof Boolean) {
             return (Boolean) requestStatus ? YesNoMaybe.YES : YesNoMaybe.NO;
@@ -127,7 +127,7 @@ public StaplerDispatchValidator() {
     }
 
     @Override
-    public @CheckForNull Boolean isDispatchAllowed(@NonNull StaplerRequest req, @NonNull StaplerResponse rsp) {
+    public @CheckForNull Boolean isDispatchAllowed(@NonNull StaplerRequest2 req, @NonNull StaplerResponse2 rsp) {
         if (DISABLED) {
             return true;
         }
@@ -145,7 +145,7 @@ public StaplerDispatchValidator() {
     }
 
     @Override
-    public @CheckForNull Boolean isDispatchAllowed(@NonNull StaplerRequest req, @NonNull StaplerResponse rsp, @NonNull String viewName, @CheckForNull Object node) {
+    public @CheckForNull Boolean isDispatchAllowed(@NonNull StaplerRequest2 req, @NonNull StaplerResponse2 rsp, @NonNull String viewName, @CheckForNull Object node) {
         if (DISABLED) {
             return true;
         }
@@ -163,7 +163,7 @@ public StaplerDispatchValidator() {
     }
 
     @Override
-    public void allowDispatch(@NonNull StaplerRequest req, @NonNull StaplerResponse rsp) {
+    public void allowDispatch(@NonNull StaplerRequest2 req, @NonNull StaplerResponse2 rsp) {
         if (DISABLED) {
             return;
         }
@@ -171,7 +171,7 @@ public void allowDispatch(@NonNull StaplerRequest req, @NonNull StaplerResponse
     }
 
     @Override
-    public void requireDispatchAllowed(@NonNull StaplerRequest req, @NonNull StaplerResponse rsp) throws CancelRequestHandlingException {
+    public void requireDispatchAllowed(@NonNull StaplerRequest2 req, @NonNull StaplerResponse2 rsp) throws CancelRequestHandlingException {
         if (DISABLED) {
             return;
         }
diff --git a/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java b/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java
index cc658c275fcf..ad8837c19d83 100644
--- a/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java
+++ b/core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java
@@ -29,8 +29,8 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.Function;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.event.FilteredDispatchTriggerListener;
 import org.kohsuke.stapler.event.FilteredDoActionTriggerListener;
 import org.kohsuke.stapler.event.FilteredFieldTriggerListener;
@@ -49,7 +49,7 @@ public class StaplerFilteredActionListener implements FilteredDoActionTriggerLis
             "Learn more: https://www.jenkins.io/redirect/stapler-routing";
 
     @Override
-    public boolean onDoActionTrigger(Function f, StaplerRequest req, StaplerResponse rsp, Object node) {
+    public boolean onDoActionTrigger(Function f, StaplerRequest2 req, StaplerResponse2 rsp, Object node) {
         LOGGER.log(Level.FINER, LOG_MESSAGE, new Object[]{
                 req.getPathInfo(),
                 f.getSignature(),
@@ -58,7 +58,7 @@ public boolean onDoActionTrigger(Function f, StaplerRequest req, StaplerResponse
     }
 
     @Override
-    public boolean onGetterTrigger(Function f, StaplerRequest req, StaplerResponse rsp, Object node, String expression) {
+    public boolean onGetterTrigger(Function f, StaplerRequest2 req, StaplerResponse2 rsp, Object node, String expression) {
         LOGGER.log(Level.FINER, LOG_MESSAGE, new Object[]{
                 req.getPathInfo(),
                 f.getSignature(),
@@ -67,7 +67,7 @@ public boolean onGetterTrigger(Function f, StaplerRequest req, StaplerResponse r
     }
 
     @Override
-    public boolean onFieldTrigger(FieldRef f, StaplerRequest req, StaplerResponse staplerResponse, Object node, String expression) {
+    public boolean onFieldTrigger(FieldRef f, StaplerRequest2 req, StaplerResponse2 staplerResponse, Object node, String expression) {
         LOGGER.log(Level.FINER, LOG_MESSAGE, new Object[]{
                 req.getPathInfo(),
                 f.getSignature(),
@@ -76,7 +76,7 @@ public boolean onFieldTrigger(FieldRef f, StaplerRequest req, StaplerResponse st
     }
 
     @Override
-    public boolean onDispatchTrigger(StaplerRequest req, StaplerResponse rsp, Object node, String viewName) {
+    public boolean onDispatchTrigger(StaplerRequest2 req, StaplerResponse2 rsp, Object node, String viewName) {
         LOGGER.finer(() -> "New Stapler dispatch rules result in the URL \"" + req.getPathInfo() + "\" no longer being allowed. " +
                 "If you consider it safe to use, add the following to the whitelist: \"" + node.getClass().getName() + " " + viewName + "\". " +
                 "Learn more: https://www.jenkins.io/redirect/stapler-facet-restrictions");
diff --git a/core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java b/core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java
index abc61baf042b..5706504bd8f5 100644
--- a/core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java
+++ b/core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java
@@ -123,7 +123,7 @@ synchronized void resetAndSave() {
 
     private void resetMetaClassCache() {
         // to allow the change to be effective, i.e. rebuild the MetaClass using the new whitelist
-        WebApp.get(Jenkins.get().servletContext).clearMetaClassCache();
+        WebApp.get(Jenkins.get().getServletContext()).clearMetaClassCache();
     }
 
     private synchronized void reloadFromDefault() {
diff --git a/core/src/main/java/jenkins/security/stapler/WebMethodConstants.java b/core/src/main/java/jenkins/security/stapler/WebMethodConstants.java
index 90e14912005d..3227945cb293 100644
--- a/core/src/main/java/jenkins/security/stapler/WebMethodConstants.java
+++ b/core/src/main/java/jenkins/security/stapler/WebMethodConstants.java
@@ -24,20 +24,22 @@
 
 package jenkins.security.stapler;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.Header;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 import org.kohsuke.stapler.json.JsonBody;
@@ -49,10 +51,14 @@ final class WebMethodConstants {
      * If a method has at least one of those parameters, it is considered as an implicit web method
      */
     private static final List<Class<?>> WEB_METHOD_PARAMETERS = List.of(
+            StaplerRequest2.class,
             StaplerRequest.class,
             HttpServletRequest.class,
+            javax.servlet.http.HttpServletRequest.class,
+            StaplerResponse2.class,
             StaplerResponse.class,
-            HttpServletResponse.class
+            HttpServletResponse.class,
+            javax.servlet.http.HttpServletResponse.class
     );
 
     static final Set<String> WEB_METHOD_PARAMETERS_NAMES = Collections.unmodifiableSet(
diff --git a/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java b/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java
index 9dac60c0500c..dd68f02376f4 100644
--- a/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java
+++ b/core/src/main/java/jenkins/slaves/EncryptedSlaveAgentJnlpFile.java
@@ -5,6 +5,11 @@
 import hudson.security.Permission;
 import hudson.slaves.SlaveComputer;
 import hudson.util.Secret;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -17,15 +22,10 @@
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletResponseWrapper;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.ResponseImpl;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Serves the JNLP file.
@@ -70,11 +70,11 @@ public EncryptedSlaveAgentJnlpFile(AccessControlled it, String viewName, String
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, final StaplerResponse res, Object node) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, final StaplerResponse2 res, Object node) throws IOException, ServletException {
         RequestDispatcher view = req.getView(it, viewName);
         if ("true".equals(req.getParameter("encrypt"))) {
             final CapturingServletOutputStream csos = new CapturingServletOutputStream();
-            StaplerResponse temp = new ResponseImpl(req.getStapler(), new HttpServletResponseWrapper(res) {
+            StaplerResponse2 temp = new ResponseImpl(req.getStapler(), new HttpServletResponseWrapper(res) {
                 @Override public ServletOutputStream getOutputStream() {
                     return csos;
                 }
diff --git a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalConfiguration.java b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalConfiguration.java
index 9e2258c5abed..230b1a700115 100644
--- a/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalConfiguration.java
+++ b/core/src/main/java/jenkins/tasks/filters/EnvVarsFilterGlobalConfiguration.java
@@ -37,7 +37,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.Beta;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Configuration of the filter rules that are applied globally,
@@ -75,7 +75,7 @@ public GlobalConfigurationCategory getCategory() {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             activatedGlobalRules.rebuildHetero(req, json, getAllGlobalRules(), "rules");
         } catch (IOException e) {
diff --git a/core/src/main/java/jenkins/telemetry/impl/StaplerDispatches.java b/core/src/main/java/jenkins/telemetry/impl/StaplerDispatches.java
index 66078caa3d33..5cf16e0b0e49 100644
--- a/core/src/main/java/jenkins/telemetry/impl/StaplerDispatches.java
+++ b/core/src/main/java/jenkins/telemetry/impl/StaplerDispatches.java
@@ -38,7 +38,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.EvaluationTrace;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Telemetry implementation gathering information about Stapler dispatch routes.
@@ -86,7 +86,7 @@ private Object buildDispatches() {
     public static class StaplerTrace extends EvaluationTrace.ApplicationTracer {
 
         @Override
-        protected void record(StaplerRequest staplerRequest, String s) {
+        protected void record(StaplerRequest2 staplerRequest, String s) {
             if (Telemetry.isDisabled()) {
                 // do not collect traces while usage statistics are disabled
                 return;
diff --git a/core/src/main/java/jenkins/telemetry/impl/UserLanguages.java b/core/src/main/java/jenkins/telemetry/impl/UserLanguages.java
index 8bf24d1b01a9..0a03b0fe653c 100644
--- a/core/src/main/java/jenkins/telemetry/impl/UserLanguages.java
+++ b/core/src/main/java/jenkins/telemetry/impl/UserLanguages.java
@@ -26,6 +26,9 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.Map;
@@ -33,9 +36,6 @@
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.telemetry.Telemetry;
 import jenkins.util.HttpServletFilter;
 import net.sf.json.JSONObject;
diff --git a/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java b/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java
index bcca8506c5dd..47208f942958 100644
--- a/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java
+++ b/core/src/main/java/jenkins/tools/GlobalToolConfiguration.java
@@ -32,17 +32,17 @@
 import hudson.model.ManagementLink;
 import hudson.security.Permission;
 import hudson.util.FormApply;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.POST;
 
 @Extension(ordinal = Integer.MAX_VALUE - 220)
@@ -81,13 +81,13 @@ public Category getCategory() {
     }
 
     @POST
-    public synchronized void doConfigure(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+    public synchronized void doConfigure(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         boolean result = configure(req, req.getSubmittedForm());
         LOGGER.log(Level.FINE, "tools saved: " + result);
         FormApply.success(req.getContextPath() + "/manage").generateResponse(req, rsp, null);
     }
 
-    private boolean configure(StaplerRequest req, JSONObject json) throws Descriptor.FormException, IOException {
+    private boolean configure(StaplerRequest2 req, JSONObject json) throws Descriptor.FormException, IOException {
         Jenkins j = Jenkins.get();
         j.checkPermission(Jenkins.ADMINISTER);
 
@@ -100,7 +100,7 @@ private boolean configure(StaplerRequest req, JSONObject json) throws Descriptor
         return result;
     }
 
-    private boolean configureDescriptor(StaplerRequest req, JSONObject json, Descriptor<?> d) throws Descriptor.FormException {
+    private boolean configureDescriptor(StaplerRequest2 req, JSONObject json, Descriptor<?> d) throws Descriptor.FormException {
         String name = d.getJsonSafeClassName();
         JSONObject js = json.has(name) ? json.getJSONObject(name) : new JSONObject(); // if it doesn't have the property, the method returns invalid null object.
         json.putAll(js);
diff --git a/core/src/main/java/jenkins/util/FullDuplexHttpService.java b/core/src/main/java/jenkins/util/FullDuplexHttpService.java
index 01f79b029125..28b9334204e4 100644
--- a/core/src/main/java/jenkins/util/FullDuplexHttpService.java
+++ b/core/src/main/java/jenkins/util/FullDuplexHttpService.java
@@ -30,6 +30,8 @@
 import hudson.security.csrf.CrumbExclusion;
 import hudson.util.ChunkedInputStream;
 import hudson.util.ChunkedOutputStream;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -38,13 +40,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponses;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Server-side counterpart to {@link FullDuplexHttpStream}.
@@ -86,7 +86,7 @@ protected FullDuplexHttpService(UUID uuid) {
      * <p>
      * If this connection is lost, we'll abort the channel.
      */
-    public synchronized void download(StaplerRequest req, StaplerResponse rsp) throws InterruptedException, IOException {
+    public synchronized void download(StaplerRequest2 req, StaplerResponse2 rsp) throws InterruptedException, IOException {
         rsp.setStatus(HttpServletResponse.SC_OK);
 
         // server->client channel.
@@ -129,7 +129,7 @@ public synchronized void download(StaplerRequest req, StaplerResponse rsp) throw
     /**
      * This is where we receive inputs from the client.
      */
-    public synchronized void upload(StaplerRequest req, StaplerResponse rsp) throws InterruptedException, IOException {
+    public synchronized void upload(StaplerRequest2 req, StaplerResponse2 rsp) throws InterruptedException, IOException {
         rsp.setStatus(HttpServletResponse.SC_OK);
         InputStream in = req.getInputStream();
         if (DIY_CHUNKING) {
@@ -163,7 +163,7 @@ protected Response(Map<UUID, FullDuplexHttpService> services) {
         }
 
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
             try {
                 // do not require any permission to establish a CLI connection
                 // the actual authentication for the connecting Channel is done by CLICommand
@@ -198,7 +198,7 @@ public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object nod
             }
         }
 
-        protected abstract FullDuplexHttpService createService(StaplerRequest req, UUID uuid) throws IOException, InterruptedException;
+        protected abstract FullDuplexHttpService createService(StaplerRequest2 req, UUID uuid) throws IOException, InterruptedException;
 
     }
 
diff --git a/core/src/main/java/jenkins/util/HttpServletFilter.java b/core/src/main/java/jenkins/util/HttpServletFilter.java
index b83b37d1174d..da00b32b2908 100644
--- a/core/src/main/java/jenkins/util/HttpServletFilter.java
+++ b/core/src/main/java/jenkins/util/HttpServletFilter.java
@@ -29,17 +29,18 @@
 import hudson.init.Initializer;
 import hudson.security.csrf.CrumbExclusion;
 import hudson.util.PluginServletFilter;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
+import org.kohsuke.stapler.CompatibleFilter;
 
 /**
  * More convenient and declarative way to use {@link PluginServletFilter}.
@@ -63,7 +64,7 @@ public interface HttpServletFilter extends ExtensionPoint {
     @Restricted(DoNotUse.class)
     @Initializer
     static void register() throws ServletException {
-        PluginServletFilter.addFilter(new Filter() {
+        PluginServletFilter.addFilter(new CompatibleFilter() {
             @Override
             public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain chain) throws IOException, ServletException {
                 if (req instanceof HttpServletRequest && rsp instanceof HttpServletResponse) {
diff --git a/core/src/main/java/jenkins/util/HttpSessionListener.java b/core/src/main/java/jenkins/util/HttpSessionListener.java
index 7f3649fd2381..85ff806ac6e6 100644
--- a/core/src/main/java/jenkins/util/HttpSessionListener.java
+++ b/core/src/main/java/jenkins/util/HttpSessionListener.java
@@ -28,11 +28,13 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
+import hudson.Util;
+import io.jenkins.servlet.http.HttpSessionEventWrapper;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
 
 /**
- * {@link javax.servlet.http.HttpSessionListener} {@link ExtensionPoint} for Jenkins.
+ * {@link jakarta.servlet.http.HttpSessionListener} {@link ExtensionPoint} for Jenkins.
  * <p>
  * Allows plugins to listen to {@link HttpSession} lifecycle events.
  *
@@ -40,7 +42,7 @@
  * @since 2.2
  */
 @SuppressFBWarnings(value = "NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification = "Should shadow HttpSessionListener")
-public abstract class HttpSessionListener implements ExtensionPoint, javax.servlet.http.HttpSessionListener {
+public abstract class HttpSessionListener implements ExtensionPoint, jakarta.servlet.http.HttpSessionListener, javax.servlet.http.HttpSessionListener {
 
     /**
      * Get all of the {@link HttpSessionListener} implementations.
@@ -52,9 +54,37 @@ public static ExtensionList<HttpSessionListener> all() {
 
     @Override
     public void sessionCreated(HttpSessionEvent httpSessionEvent) {
+        if (Util.isOverridden(HttpSessionListener.class, getClass(), "sessionCreated", javax.servlet.http.HttpSessionEvent.class)) {
+            sessionCreated(HttpSessionEventWrapper.fromJakartaHttpSessionEvent(httpSessionEvent));
+        }
     }
 
     @Override
     public void sessionDestroyed(HttpSessionEvent httpSessionEvent) {
+        if (Util.isOverridden(HttpSessionListener.class, getClass(), "sessionCreated", javax.servlet.http.HttpSessionEvent.class)) {
+            sessionCreated(HttpSessionEventWrapper.fromJakartaHttpSessionEvent(httpSessionEvent));
+        }
+    }
+
+    /**
+     * @deprecated use {@link #sessionCreated(HttpSessionEvent)}
+     */
+    @Deprecated
+    @Override
+    public void sessionCreated(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+        if (Util.isOverridden(HttpSessionListener.class, getClass(), "sessionCreated", HttpSessionEvent.class)) {
+            sessionCreated(HttpSessionEventWrapper.toJakartaHttpSessionEvent(httpSessionEvent));
+        }
+    }
+
+    /**
+     * @deprecated use {@link #sessionDestroyed(HttpSessionEvent)}
+     */
+    @Deprecated
+    @Override
+    public void sessionDestroyed(javax.servlet.http.HttpSessionEvent httpSessionEvent) {
+        if (Util.isOverridden(HttpSessionListener.class, getClass(), "sessionDestroyed", HttpSessionEvent.class)) {
+            sessionDestroyed(HttpSessionEventWrapper.toJakartaHttpSessionEvent(httpSessionEvent));
+        }
     }
 }
diff --git a/core/src/main/java/jenkins/util/JSONSignatureValidator.java b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
index 3cc10ebd4038..e6f5429f43bc 100644
--- a/core/src/main/java/jenkins/util/JSONSignatureValidator.java
+++ b/core/src/main/java/jenkins/util/JSONSignatureValidator.java
@@ -252,12 +252,12 @@ protected Set<TrustAnchor> loadTrustAnchors(CertificateFactory cf) throws IOExce
         // which isn't useful at all
         Set<TrustAnchor> anchors = new HashSet<>(); // CertificateUtil.getDefaultRootCAs();
         Jenkins j = Jenkins.get();
-        for (String cert : j.servletContext.getResourcePaths("/WEB-INF/update-center-rootCAs")) {
+        for (String cert : j.getServletContext().getResourcePaths("/WEB-INF/update-center-rootCAs")) {
             if (cert.endsWith("/") || cert.endsWith(".txt"))  {
                 continue;       // skip directories also any text files that are meant to be documentation
             }
             Certificate certificate;
-            try (InputStream in = j.servletContext.getResourceAsStream(cert)) {
+            try (InputStream in = j.getServletContext().getResourceAsStream(cert)) {
                 if (in == null) continue; // our test for paths ending in / should prevent this from happening
                 certificate = cf.generateCertificate(in);
                 if (certificate instanceof X509Certificate) {
diff --git a/core/src/main/java/jenkins/util/JenkinsJVM.java b/core/src/main/java/jenkins/util/JenkinsJVM.java
index fafe1223a389..c13389493f41 100644
--- a/core/src/main/java/jenkins/util/JenkinsJVM.java
+++ b/core/src/main/java/jenkins/util/JenkinsJVM.java
@@ -1,7 +1,7 @@
 package jenkins.util;
 
 import hudson.WebAppMain;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
diff --git a/core/src/main/java/jenkins/util/ProgressiveRendering.java b/core/src/main/java/jenkins/util/ProgressiveRendering.java
index 460ac3afd82b..9dc2102b5bcc 100644
--- a/core/src/main/java/jenkins/util/ProgressiveRendering.java
+++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java
@@ -26,6 +26,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.AbstractItem;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -39,7 +40,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
 import net.sf.json.JSON;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.Ancestor;
@@ -103,7 +103,7 @@ protected ProgressiveRendering() {
      * For internal use.
      */
     @JavaScriptMethod public final void start() {
-        Ancestor ancestor = Stapler.getCurrentRequest().findAncestor(BoundObjectTable.class);
+        Ancestor ancestor = Stapler.getCurrentRequest2().findAncestor(BoundObjectTable.class);
         if (ancestor == null) {
             throw new IllegalStateException("no BoundObjectTable");
         }
@@ -159,7 +159,7 @@ private void release() {
      */
     @java.lang.SuppressWarnings({"rawtypes", "unchecked"}) // public RequestImpl ctor requires List<AncestorImpl> yet AncestorImpl is not public! API design flaw
     private static RequestImpl createMockRequest() {
-        RequestImpl currentRequest = (RequestImpl) Stapler.getCurrentRequest();
+        RequestImpl currentRequest = (RequestImpl) Stapler.getCurrentRequest2();
         HttpServletRequest original = (HttpServletRequest) currentRequest.getRequest();
         final Map<String, Object> getters = new HashMap<>();
         for (Method method : HttpServletRequest.class.getMethods()) {
@@ -205,7 +205,7 @@ private static void setCurrentRequest(RequestImpl request) {
     /**
      * Actually do the work.
      * <p>The security context will be that in effect when the web request was made.
-     * {@link Stapler#getCurrentRequest} will also be similar to that in effect when the web request was made;
+     * {@link Stapler#getCurrentRequest2} will also be similar to that in effect when the web request was made;
      * at least, {@link Ancestor}s and basic request properties (URI, locale, and so on) will be available.
      * @throws Exception whenever you like; the progress bar will indicate that an error occurred but details go to the log only
      */
diff --git a/core/src/main/java/jenkins/util/ScriptListener.java b/core/src/main/java/jenkins/util/ScriptListener.java
index b07603c17f2a..f75596b8c85d 100644
--- a/core/src/main/java/jenkins/util/ScriptListener.java
+++ b/core/src/main/java/jenkins/util/ScriptListener.java
@@ -36,7 +36,7 @@
 import java.nio.charset.Charset;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * A listener to track in-process script use.
@@ -44,7 +44,7 @@
  * <p>Note that (unsandboxed) script execution can easily result in logging configuration being changed, so if you rely
  * on complete logging of scripting actions, make sure to set up logging to remote systems.</p>
  *
- * @see jenkins.model.Jenkins#_doScript(StaplerRequest, org.kohsuke.stapler.StaplerResponse, javax.servlet.RequestDispatcher, hudson.remoting.VirtualChannel, hudson.security.ACL)
+ * @see jenkins.model.Jenkins#_doScript(StaplerRequest2, org.kohsuke.stapler.StaplerResponse2, jakarta.servlet.RequestDispatcher, hudson.remoting.VirtualChannel, hudson.security.ACL)
  * @see hudson.cli.GroovyCommand
  * @see hudson.cli.GroovyshCommand
  * @see jenkins.util.groovy.GroovyHookScript
diff --git a/core/src/main/java/jenkins/util/SystemProperties.java b/core/src/main/java/jenkins/util/SystemProperties.java
index d32a91e2db79..e3818b69f921 100644
--- a/core/src/main/java/jenkins/util/SystemProperties.java
+++ b/core/src/main/java/jenkins/util/SystemProperties.java
@@ -34,6 +34,9 @@
 import hudson.model.TaskListener;
 import hudson.remoting.Channel;
 import hudson.slaves.ComputerListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -42,9 +45,6 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
 import jenkins.security.MasterToSlaveCallable;
 import jenkins.util.io.OnMaster;
 import org.kohsuke.accmod.Restricted;
diff --git a/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java b/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
index eeb816f31ffd..1539d75715c5 100644
--- a/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
+++ b/core/src/main/java/jenkins/util/groovy/GroovyHookScript.java
@@ -8,6 +8,8 @@
 import groovy.lang.GroovyCodeSource;
 import groovy.lang.GroovyShell;
 import hudson.model.User;
+import io.jenkins.servlet.ServletContextWrapper;
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -15,7 +17,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
 import jenkins.model.Jenkins;
 import jenkins.util.ScriptListener;
 import jenkins.util.SystemProperties;
@@ -55,7 +56,7 @@ public GroovyHookScript(String hook) {
     }
 
     private GroovyHookScript(String hook, Jenkins j) {
-        this(hook, j.servletContext, j.getRootDir(), j.getPluginManager().uberClassLoader);
+        this(hook, j.getServletContext(), j.getRootDir(), j.getPluginManager().uberClassLoader);
     }
 
     public GroovyHookScript(String hook, @NonNull ServletContext servletContext, @NonNull File jenkinsHome, @NonNull ClassLoader loader) {
@@ -65,6 +66,14 @@ public GroovyHookScript(String hook, @NonNull ServletContext servletContext, @No
         this.loader = loader;
     }
 
+    /**
+     * @deprecated use {@link #GroovyHookScript(String, ServletContext, File, ClassLoader)}
+     */
+    @Deprecated
+    public GroovyHookScript(String hook, @NonNull javax.servlet.ServletContext servletContext, @NonNull File jenkinsHome, @NonNull ClassLoader loader) {
+        this(hook, ServletContextWrapper.toJakartaServletContext(servletContext), jenkinsHome, loader);
+    }
+
     public GroovyHookScript bind(String name, Object o) {
         bindings.setProperty(name, o);
         return this;
diff --git a/core/src/main/java/jenkins/websocket/WebSockets.java b/core/src/main/java/jenkins/websocket/WebSockets.java
index 0f275864c23f..5e0152381e3e 100644
--- a/core/src/main/java/jenkins/websocket/WebSockets.java
+++ b/core/src/main/java/jenkins/websocket/WebSockets.java
@@ -24,6 +24,9 @@
 
 package jenkins.websocket;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.channels.ClosedChannelException;
 import java.util.Iterator;
@@ -31,13 +34,11 @@
 import java.util.ServiceLoader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.Beta;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Support for serving WebSocket responses.
@@ -65,11 +66,16 @@ private static Provider findProvider() {
     // TODO ability to handle subprotocols?
 
     public static HttpResponse upgrade(WebSocketSession session) {
-        return (req, rsp, node) -> upgradeResponse(session, req, rsp);
+        return new HttpResponse() {
+            @Override
+            public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
+                upgradeResponse(session, req, rsp);
+            }
+        };
     }
 
     /**
-     * Variant of {@link #upgrade} that does not presume a {@link StaplerRequest}.
+     * Variant of {@link #upgrade} that does not presume a {@link StaplerRequest2}.
      * @since 2.446
      */
     public static void upgradeResponse(WebSocketSession session, HttpServletRequest req, HttpServletResponse rsp) throws IOException, ServletException {
diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java
index 853905eb1c6a..379dd1b4d15e 100644
--- a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java
+++ b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServices.java
@@ -24,8 +24,8 @@
 
 package org.acegisecurity.ui.rememberme;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.acegisecurity.Authentication;
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServicesSpringImpl.java b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServicesSpringImpl.java
index 5a0cd0d63d86..5dca4372020f 100644
--- a/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServicesSpringImpl.java
+++ b/core/src/main/java/org/acegisecurity/ui/rememberme/RememberMeServicesSpringImpl.java
@@ -24,8 +24,8 @@
 
 package org.acegisecurity.ui.rememberme;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.acegisecurity.Authentication;
 
 final class RememberMeServicesSpringImpl implements org.springframework.security.web.authentication.RememberMeServices {
diff --git a/core/src/main/resources/jenkins/model/Jenkins/_404.jelly b/core/src/main/resources/jenkins/model/Jenkins/_404.jelly
index 4605b5926760..7230e4f31acc 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/_404.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/_404.jelly
@@ -29,8 +29,8 @@ THE SOFTWARE.
       Generally kept very similar to 'oops.jelly'.
     -->
     <st:statusCode value="${response.getStatus()}" />
-    ${request.session.setAttribute('from', request.getAttribute('javax.servlet.error.request_uri'))}
-    <l:layout title="${%title(javax.servlet.error.message?:'Not Found')}" type="one-column">
+    ${request.session.setAttribute('from', request.getAttribute('jakarta.servlet.error.request_uri'))}
+    <l:layout title="${%title(jakarta.servlet.error.message?:'Not Found')}" type="one-column">
         <l:header />
         <l:main-panel>
             <h1 style="text-align: center">
@@ -38,7 +38,7 @@ THE SOFTWARE.
                 <span style="font-size:50px"><st:nbsp/>${%Oops!}</span>
             </h1>
             <div id="error-description" style="text-align: center">
-                <h2>${%title(javax.servlet.error.message?:'Not Found')}</h2>
+                <h2>${%title(jakarta.servlet.error.message?:'Not Found')}</h2>
                 <j:if test="${!request.getAttribute('jenkins.security.ResourceDomainRootAction.error')}">
 	                <p>
 	                    <j:choose>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/_404_simple.jelly b/core/src/main/resources/jenkins/model/Jenkins/_404_simple.jelly
index c6a876bb2955..e59083103a55 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/_404_simple.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/_404_simple.jelly
@@ -39,7 +39,7 @@ THE SOFTWARE.
         <st:statusCode value="${response.getStatus()}" />
         <html>
             <head>
-                <title>${%title(javax.servlet.error.message?:'Not Found')}</title>
+                <title>${%title(jakarta.servlet.error.message?:'Not Found')}</title>
                 <link rel="icon" href="${resURL}/favicon.svg" type="image/svg+xml" />
                 <link rel="alternate icon" href="${resURL}/favicon.ico" sizes="any" />
                 <!-- TODO Determine need for these -->
@@ -52,7 +52,7 @@ THE SOFTWARE.
                     <span style="font-size:50px"><st:nbsp/>${%Oops!}</span>
                 </h1>
                 <div style="text-align: center">
-                    <h2>${%title(javax.servlet.error.message?:'Not Found')}</h2>
+                    <h2>${%title(jakarta.servlet.error.message?:'Not Found')}</h2>
                     <a href="${h.inferHudsonURL(request)}">${%Back to Jenkins}</a>
                 </div>
             </body>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/oops.jelly b/core/src/main/resources/jenkins/model/Jenkins/oops.jelly
index 28238c660253..436b4a8fc0a6 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/oops.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/oops.jelly
@@ -41,7 +41,7 @@ THE SOFTWARE.
       <j:if test="${app.shouldShowStackTrace()}">
         <p>${%checkJIRA} ${%vote} ${%pleaseReport} ${%stackTracePlease} ${%checkML}</p>
         <h2>${%Stack trace}</h2>
-        <pre style="margin:2em; clear:both">${h.printThrowable(request.getAttribute('javax.servlet.error.exception'))}</pre>
+        <pre style="margin:2em; clear:both">${h.printThrowable(request.getAttribute('jakarta.servlet.error.exception'))}</pre>
       </j:if>
     </l:main-panel>
   </l:layout>
diff --git a/core/src/test/java/hudson/FunctionsTest.java b/core/src/test/java/hudson/FunctionsTest.java
index 95d5def0bbda..5a0df319bfcc 100644
--- a/core/src/test/java/hudson/FunctionsTest.java
+++ b/core/src/test/java/hudson/FunctionsTest.java
@@ -61,7 +61,7 @@
 import org.jvnet.hudson.test.Issue;
 import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.mockito.MockedStatic;
 
 public class FunctionsTest {
@@ -96,14 +96,14 @@ public void testGetActionUrl_absoluteUriWithoutAuthority() {
     @Test
     public void testGetActionUrl_absolutePath() {
         String contextPath = "/jenkins";
-        StaplerRequest req = createMockRequest(contextPath);
+        StaplerRequest2 req = createMockRequest(contextPath);
         String[] paths = {
             "/",
             "/foo/bar",
         };
 
         try (MockedStatic<Stapler> mocked = mockStatic(Stapler.class)) {
-            mocked.when(Stapler::getCurrentRequest).thenReturn(req);
+            mocked.when(Stapler::getCurrentRequest2).thenReturn(req);
             for (String path : paths) {
                 String result = Functions.getActionUrl(null, createMockAction(path));
                 assertEquals(contextPath + path, result);
@@ -115,14 +115,14 @@ public void testGetActionUrl_absolutePath() {
     public void testGetActionUrl_relativePath() {
         String contextPath = "/jenkins";
         String itUrl = "iturl/";
-        StaplerRequest req = createMockRequest(contextPath);
+        StaplerRequest2 req = createMockRequest(contextPath);
         String[] paths = {
             "foo/bar",
             "./foo/bar",
             "../foo/bar",
         };
         try (MockedStatic<Stapler> mocked = mockStatic(Stapler.class)) {
-            mocked.when(Stapler::getCurrentRequest).thenReturn(req);
+            mocked.when(Stapler::getCurrentRequest2).thenReturn(req);
             for (String path : paths) {
                 String result = Functions.getActionUrl(itUrl, createMockAction(path));
                 assertEquals(contextPath + "/" + itUrl + path, result);
@@ -133,14 +133,14 @@ public void testGetActionUrl_relativePath() {
     @Test
     public void testGetRelativeLinkTo_JobContainedInView() {
         String contextPath = "/jenkins";
-        StaplerRequest req = createMockRequest(contextPath);
+        StaplerRequest2 req = createMockRequest(contextPath);
         try (
                 MockedStatic<Stapler> mocked = mockStatic(Stapler.class);
                 MockedStatic<Jenkins> mockedJenkins = mockStatic(Jenkins.class)
         ) {
             Jenkins j = createMockJenkins(mockedJenkins);
             ItemGroup parent = j;
-            mocked.when(Stapler::getCurrentRequest).thenReturn(req);
+            mocked.when(Stapler::getCurrentRequest2).thenReturn(req);
             View view = mock(View.class);
             when(view.getOwner()).thenReturn(j);
             when(j.getItemGroup()).thenReturn(j);
@@ -155,14 +155,14 @@ public void testGetRelativeLinkTo_JobContainedInView() {
     @Test
     public void testGetRelativeLinkTo_JobFromComputer() {
         String contextPath = "/jenkins";
-        StaplerRequest req = createMockRequest(contextPath);
+        StaplerRequest2 req = createMockRequest(contextPath);
         try (
                 MockedStatic<Stapler> mocked = mockStatic(Stapler.class);
                 MockedStatic<Jenkins> mockedJenkins = mockStatic(Jenkins.class)
         ) {
             Jenkins j = createMockJenkins(mockedJenkins);
             ItemGroup parent = j;
-            mocked.when(Stapler::getCurrentRequest).thenReturn(req);
+            mocked.when(Stapler::getCurrentRequest2).thenReturn(req);
             Computer computer = mock(Computer.class);
             createMockAncestors(req, createAncestor(computer, "."), createAncestor(j, "../.."));
             TopLevelItem i = createMockItem(parent, "job/i/");
@@ -175,14 +175,14 @@ public void testGetRelativeLinkTo_JobFromComputer() {
     @Test
     public void testGetRelativeLinkTo_JobNotContainedInView() {
         String contextPath = "/jenkins";
-        StaplerRequest req = createMockRequest(contextPath);
+        StaplerRequest2 req = createMockRequest(contextPath);
         try (
                 MockedStatic<Stapler> mocked = mockStatic(Stapler.class);
                 MockedStatic<Jenkins> mockedJenkins = mockStatic(Jenkins.class)
         ) {
             Jenkins j = createMockJenkins(mockedJenkins);
             ItemGroup parent = j;
-            mocked.when(Stapler::getCurrentRequest).thenReturn(req);
+            mocked.when(Stapler::getCurrentRequest2).thenReturn(req);
             View view = mock(View.class);
             when(view.getOwner().getItemGroup()).thenReturn(parent);
             createMockAncestors(req, createAncestor(j, "../.."), createAncestor(view, "."));
@@ -198,7 +198,7 @@ private interface TopLevelItemAndItemGroup<T extends TopLevelItem> extends TopLe
     @Test
     public void testGetRelativeLinkTo_JobContainedInViewWithinItemGroup() {
         String contextPath = "/jenkins";
-        StaplerRequest req = createMockRequest(contextPath);
+        StaplerRequest2 req = createMockRequest(contextPath);
         try (
                 MockedStatic<Stapler> mocked = mockStatic(Stapler.class);
                 MockedStatic<Jenkins> mockedJenkins = mockStatic(Jenkins.class)
@@ -206,7 +206,7 @@ public void testGetRelativeLinkTo_JobContainedInViewWithinItemGroup() {
             Jenkins j = createMockJenkins(mockedJenkins);
             TopLevelItemAndItemGroup parent = mock(TopLevelItemAndItemGroup.class);
             when(parent.getShortUrl()).thenReturn("parent/");
-            mocked.when(Stapler::getCurrentRequest).thenReturn(req);
+            mocked.when(Stapler::getCurrentRequest2).thenReturn(req);
             View view = mock(View.class);
             when(view.getOwner()).thenReturn(parent);
             when(parent.getItemGroup()).thenReturn(parent);
@@ -220,13 +220,13 @@ public void testGetRelativeLinkTo_JobContainedInViewWithinItemGroup() {
 
     @Issue("JENKINS-17713")
     @Test public void getRelativeLinkTo_MavenModules() {
-        StaplerRequest req = createMockRequest("/jenkins");
+        StaplerRequest2 req = createMockRequest("/jenkins");
         try (
                 MockedStatic<Stapler> mocked = mockStatic(Stapler.class);
                 MockedStatic<Jenkins> mockedJenkins = mockStatic(Jenkins.class)
         ) {
             Jenkins j = createMockJenkins(mockedJenkins);
-            mocked.when(Stapler::getCurrentRequest).thenReturn(req);
+            mocked.when(Stapler::getCurrentRequest2).thenReturn(req);
             TopLevelItemAndItemGroup ms = mock(TopLevelItemAndItemGroup.class);
             when(ms.getShortUrl()).thenReturn("job/ms/");
             // TODO "." (in second ancestor) is what Stapler currently fails to do. Could edit test to use ".." but set a different request path?
@@ -266,7 +266,7 @@ public void testGetRelativeDisplayNameInsideItemGroup() {
         assertEquals(".. » top", Functions.getRelativeDisplayNameFrom(i2, ig));
     }
 
-    private void createMockAncestors(StaplerRequest req, Ancestor... ancestors) {
+    private void createMockAncestors(StaplerRequest2 req, Ancestor... ancestors) {
         List<Ancestor> ancestorsList = Arrays.asList(ancestors);
         when(req.getAncestors()).thenReturn(ancestorsList);
     }
@@ -307,8 +307,8 @@ private static Action createMockAction(String uri) {
         return action;
     }
 
-    private static StaplerRequest createMockRequest(String contextPath) {
-        StaplerRequest req = mock(StaplerRequest.class);
+    private static StaplerRequest2 createMockRequest(String contextPath) {
+        StaplerRequest2 req = mock(StaplerRequest2.class);
         when(req.getContextPath()).thenReturn(contextPath);
         return req;
     }
diff --git a/core/src/test/java/hudson/GetLocaleStaticHelpUrlTest.java b/core/src/test/java/hudson/GetLocaleStaticHelpUrlTest.java
index a61fc0d54656..f139475b1013 100644
--- a/core/src/test/java/hudson/GetLocaleStaticHelpUrlTest.java
+++ b/core/src/test/java/hudson/GetLocaleStaticHelpUrlTest.java
@@ -37,7 +37,7 @@
 import java.util.Locale;
 import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.Issue;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.lang.Klass;
 
 public class GetLocaleStaticHelpUrlTest {
@@ -45,7 +45,7 @@ public class GetLocaleStaticHelpUrlTest {
     @Test
     public void getStaticHelpUrlAcceptEnResDefault() {
         // Accept-Language: en
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.ENGLISH
         );
 
@@ -60,7 +60,7 @@ public void getStaticHelpUrlAcceptEnResDefault() {
     @Test
     public void getStaticHelpUrlAcceptDeResDeNoCountry() {
         // Accept-Language: de-DE,de;q=0.9,en;q=0.8
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.GERMANY,
                 Locale.GERMAN,
                 Locale.ENGLISH
@@ -78,7 +78,7 @@ public void getStaticHelpUrlAcceptDeResDeNoCountry() {
     @Test
     public void getStaticHelpUrlAcceptDeResDeCountry() {
         // Accept-Language: de-DE,de;q=0.9,en;q=0.8
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.GERMANY,
                 Locale.GERMAN,
                 Locale.ENGLISH
@@ -96,7 +96,7 @@ public void getStaticHelpUrlAcceptDeResDeCountry() {
     @Test
     public void getStaticHelpUrlAcceptDeResBoth() {
         // Accept-Language: de-DE,de;q=0.9,en;q=0.8
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.GERMANY,
                 Locale.GERMAN,
                 Locale.ENGLISH
@@ -115,7 +115,7 @@ public void getStaticHelpUrlAcceptDeResBoth() {
     @Test
     public void getStaticHelpUrlAcceptZhResDefault() {
         // Accept-Language: zh,zh-CN;q=0.9,en-US;q=0.8,en;q=0.7,zh-TW;q=0.6
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.CHINESE,
                 Locale.SIMPLIFIED_CHINESE,
                 Locale.ENGLISH,
@@ -134,7 +134,7 @@ public void getStaticHelpUrlAcceptZhResDefault() {
     @Test
     public void getStaticHelpUrlAcceptZhResZhCountry() {
         // Accept-Language: zh,zh-CN;q=0.9,en-US;q=0.8,en;q=0.7,zh-TW;q=0.6
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.CHINESE,
                 Locale.SIMPLIFIED_CHINESE,
                 Locale.ENGLISH,
@@ -154,7 +154,7 @@ public void getStaticHelpUrlAcceptZhResZhCountry() {
     @Test
     public void getStaticHelpUrlAcceptZhResBoth() {
         // Accept-Language: zh,zh-CN;q=0.9,en-US;q=0.8,en;q=0.7,zh-TW;q=0.6
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.CHINESE,
                 Locale.SIMPLIFIED_CHINESE,
                 Locale.ENGLISH,
@@ -174,7 +174,7 @@ public void getStaticHelpUrlAcceptZhResBoth() {
     @Test
     public void getStaticHelpUrlAcceptZhResMore() {
         // Accept-Language: zh,zh-CN;q=0.9,en-US;q=0.8,en;q=0.7,zh-TW;q=0.6
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.CHINESE,
                 Locale.SIMPLIFIED_CHINESE,
                 Locale.ENGLISH,
@@ -196,7 +196,7 @@ public void getStaticHelpUrlAcceptZhResMore() {
     @Test
     public void getStaticHelpUrlAcceptEnFirst() {
         // Accept-Language: en-US,en;q=0.9,de;q=0.8
-        StaplerRequest req = mockStaplerRequest(
+        StaplerRequest2 req = mockStaplerRequest2(
                 Locale.US,
                 Locale.ENGLISH,
                 Locale.GERMAN
@@ -210,8 +210,8 @@ public void getStaticHelpUrlAcceptEnFirst() {
         assertThatLocaleResourceIs(id, "help-id.html");
     }
 
-    private StaplerRequest mockStaplerRequest(Locale... localeArr) {
-        StaplerRequest req = mock(StaplerRequest.class);
+    private StaplerRequest2 mockStaplerRequest2(Locale... localeArr) {
+        StaplerRequest2 req = mock(StaplerRequest2.class);
         Enumeration<Locale> locales = Collections.enumeration(Arrays.asList(localeArr));
         when(req.getLocales()).thenReturn(locales);
         return req;
diff --git a/core/src/test/java/hudson/model/QueueTest.java b/core/src/test/java/hudson/model/QueueTest.java
index 1a338371ff41..9e3320124e89 100644
--- a/core/src/test/java/hudson/model/QueueTest.java
+++ b/core/src/test/java/hudson/model/QueueTest.java
@@ -3,16 +3,16 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.jvnet.hudson.test.Issue;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -20,7 +20,7 @@
 public class QueueTest {
 
     @Mock
-    StaplerResponse resp;
+    StaplerResponse2 resp;
     @Mock
     Queue.Task task;
     @Mock
diff --git a/core/src/test/java/hudson/model/ViewTest.java b/core/src/test/java/hudson/model/ViewTest.java
index cd76ea6250e3..51b45ab6fb10 100644
--- a/core/src/test/java/hudson/model/ViewTest.java
+++ b/core/src/test/java/hudson/model/ViewTest.java
@@ -13,8 +13,8 @@
 import java.util.List;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.mockito.Mockito;
 
 public class ViewTest {
@@ -186,11 +186,11 @@ public boolean contains(TopLevelItem item) {
         }
 
         @Override
-        protected void submit(StaplerRequest req) {
+        protected void submit(StaplerRequest2 req) {
         }
 
         @Override
-        public Item doCreateItem(StaplerRequest req, StaplerResponse rsp) {
+        public Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) {
             return null;
         }
     }
diff --git a/core/src/test/java/hudson/util/FormValidationTest.java b/core/src/test/java/hudson/util/FormValidationTest.java
index 51deec680af7..a783665c5309 100644
--- a/core/src/test/java/hudson/util/FormValidationTest.java
+++ b/core/src/test/java/hudson/util/FormValidationTest.java
@@ -35,7 +35,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Arrays;
-import javax.servlet.ServletException;
 import org.junit.Test;
 
 /**
@@ -122,10 +121,10 @@ public void formValidationException() {
     }
 
     @Test
-    public void testUrlCheck() throws IOException, ServletException {
+    public void testUrlCheck() throws IOException {
         FormValidation.URLCheck urlCheck = new FormValidation.URLCheck() {
             @Override
-            protected FormValidation check() throws ServletException, IOException {
+            protected FormValidation check() throws IOException {
                 String uri = "https://www.jenkins.io/";
                 try {
                     if (findText(open(URI.create(uri)), "Jenkins")) {
diff --git a/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java b/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java
index 620616a15081..51706cf18680 100644
--- a/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java
+++ b/core/src/test/java/jenkins/model/JenkinsGetRootUrlTest.java
@@ -36,7 +36,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -45,14 +45,14 @@
 public class JenkinsGetRootUrlTest {
 
     private Jenkins jenkins;
-    private StaplerRequest staplerRequest;
+    private StaplerRequest2 staplerRequest;
     private JenkinsLocationConfiguration config;
 
     @Before
     public void setUp() {
         jenkins = mock(Jenkins.class, Mockito.CALLS_REAL_METHODS);
         config = mock(JenkinsLocationConfiguration.class);
-        staplerRequest = mock(StaplerRequest.class);
+        staplerRequest = mock(StaplerRequest2.class);
     }
 
     @Test
@@ -62,7 +62,7 @@ public void getConfiguredRootUrl() {
                 MockedStatic<Stapler> mockedStapler = mockStatic(Stapler.class)
         ) {
             mocked.when(JenkinsLocationConfiguration::get).thenReturn(config);
-            mockedStapler.when(Stapler::getCurrentRequest).thenReturn(staplerRequest);
+            mockedStapler.when(Stapler::getCurrentRequest2).thenReturn(staplerRequest);
 
             configured("http://configured.host");
 
@@ -77,7 +77,7 @@ public void getAccessedRootUrl() {
                 MockedStatic<Stapler> mockedStapler = mockStatic(Stapler.class)
         ) {
             mocked.when(JenkinsLocationConfiguration::get).thenReturn(config);
-            mockedStapler.when(Stapler::getCurrentRequest).thenReturn(staplerRequest);
+            mockedStapler.when(Stapler::getCurrentRequest2).thenReturn(staplerRequest);
 
             accessing("https://real.host/jenkins/");
 
@@ -92,7 +92,7 @@ public void preferConfiguredOverAccessed() {
                 MockedStatic<Stapler> mockedStapler = mockStatic(Stapler.class)
         ) {
             mocked.when(JenkinsLocationConfiguration::get).thenReturn(config);
-            mockedStapler.when(Stapler::getCurrentRequest).thenReturn(staplerRequest);
+            mockedStapler.when(Stapler::getCurrentRequest2).thenReturn(staplerRequest);
             configured("http://configured.host/");
             accessing("http://real.host/");
 
@@ -108,7 +108,7 @@ public void doNotInheritProtocolWhenDispatchingRequest() {
                 MockedStatic<Stapler> mockedStapler = mockStatic(Stapler.class)
         ) {
             mocked.when(JenkinsLocationConfiguration::get).thenReturn(config);
-            mockedStapler.when(Stapler::getCurrentRequest).thenReturn(staplerRequest);
+            mockedStapler.when(Stapler::getCurrentRequest2).thenReturn(staplerRequest);
             configured("http://configured.host/");
             accessing("https://real.host/");
 
@@ -124,7 +124,7 @@ public void doNotInheritProtocolWhenDispatchingRequest2() {
                 MockedStatic<Stapler> mockedStapler = mockStatic(Stapler.class)
         ) {
             mocked.when(JenkinsLocationConfiguration::get).thenReturn(config);
-            mockedStapler.when(Stapler::getCurrentRequest).thenReturn(staplerRequest);
+            mockedStapler.when(Stapler::getCurrentRequest2).thenReturn(staplerRequest);
             configured("https://ci/jenkins/");
             accessing("http://localhost:8080/");
             rootUrlIs("https://ci/jenkins/");
@@ -139,7 +139,7 @@ public void useForwardedProtoWhenPresent() {
                 MockedStatic<Stapler> mockedStapler = mockStatic(Stapler.class)
         ) {
             mocked.when(JenkinsLocationConfiguration::get).thenReturn(config);
-            mockedStapler.when(Stapler::getCurrentRequest).thenReturn(staplerRequest);
+            mockedStapler.when(Stapler::getCurrentRequest2).thenReturn(staplerRequest);
             configured("https://ci/jenkins/");
 
             // Without a forwarded protocol, it should use the request protocol
@@ -180,7 +180,7 @@ public void useForwardedProtoWithIPv6WhenPresent() {
                 MockedStatic<Stapler> mockedStapler = mockStatic(Stapler.class)
         ) {
             mocked.when(JenkinsLocationConfiguration::get).thenReturn(config);
-            mockedStapler.when(Stapler::getCurrentRequest).thenReturn(staplerRequest);
+            mockedStapler.when(Stapler::getCurrentRequest2).thenReturn(staplerRequest);
             configured("http://[::1]/jenkins/");
 
             // Without a forwarded protocol, it should use the request protocol
@@ -219,7 +219,7 @@ private void configured(final String configuredHost) {
     }
 
     private void withHeader(String name, final String value) {
-        final StaplerRequest req = Stapler.getCurrentRequest();
+        final StaplerRequest2 req = Stapler.getCurrentRequest2();
         when(req.getHeader(name)).thenReturn(value);
     }
 
@@ -227,7 +227,7 @@ private void accessing(final String realUrl) {
 
         final URL url = getUrl(realUrl);
 
-        final StaplerRequest req = mock(StaplerRequest.class);
+        final StaplerRequest2 req = mock(StaplerRequest2.class);
         when(req.getScheme()).thenReturn(url.getProtocol());
         when(req.getServerName()).thenReturn(url.getHost());
         when(req.getServerPort()).thenReturn(url.getPort() == -1 ? "https".equals(url.getProtocol()) ? 443 : 80 : url.getPort());
@@ -235,12 +235,12 @@ private void accessing(final String realUrl) {
         when(req.getIntHeader(anyString())).thenAnswer(new Answer<Integer>() {
             @Override public Integer answer(InvocationOnMock invocation) {
                 String name = (String) invocation.getArguments()[0];
-                String value = ((StaplerRequest) invocation.getMock()).getHeader(name);
+                String value = ((StaplerRequest2) invocation.getMock()).getHeader(name);
                 return value != null ? Integer.parseInt(value) : -1;
             }
         });
 
-        when(Stapler.getCurrentRequest()).thenReturn(req);
+        when(Stapler.getCurrentRequest2()).thenReturn(req);
     }
 
     private URL getUrl(final String realUrl) {
diff --git a/core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java b/core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java
index 2da9082c820e..74812507e246 100644
--- a/core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java
+++ b/core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java
@@ -9,8 +9,8 @@
 import org.junit.Test;
 import org.kohsuke.stapler.Function;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.json.JsonResponse;
 import org.kohsuke.stapler.lang.FieldRef;
 
@@ -40,7 +40,7 @@ public static class SomeClass {
                 "staticMethod jenkins.security.stapler.StaplerSignaturesTest$SomeClass getFoo int",
                 "staticMethod jenkins.security.stapler.StaplerSignaturesTest$SomeClass getFoo long",
                 "method jenkins.security.stapler.StaplerSignaturesTest$SomeClass getFoo jenkins.security.stapler.StaplerSignaturesTest$SomeClass",
-                "method jenkins.security.stapler.StaplerSignaturesTest$SomeClass doFoo org.kohsuke.stapler.StaplerRequest org.kohsuke.stapler.StaplerResponse",
+                "method jenkins.security.stapler.StaplerSignaturesTest$SomeClass doFoo org.kohsuke.stapler.StaplerRequest2 org.kohsuke.stapler.StaplerResponse2",
                 "method jenkins.security.stapler.StaplerSignaturesTest$SomeClass doWhatever java.lang.String",
                 "method java.lang.Object getClass",
                 "method java.lang.Object equals java.lang.Object",
@@ -63,7 +63,7 @@ public static void getFoo(long arg) {}
 
         public void getFoo(SomeClass arg) {}
 
-        public void doFoo(StaplerRequest req, StaplerResponse rsp) {}
+        public void doFoo(StaplerRequest2 req, StaplerResponse2 rsp) {}
 
         @StaplerDispatchable @JsonResponse
         public void doWhatever(@QueryParameter String arg) {}
@@ -91,7 +91,7 @@ public static class SomeSubclass extends SomeClass {
                 "staticMethod jenkins.security.stapler.StaplerSignaturesTest$SomeClass getFoo int",
                 "staticMethod jenkins.security.stapler.StaplerSignaturesTest$SomeClass getFoo long",
                 "method jenkins.security.stapler.StaplerSignaturesTest$SomeClass getFoo jenkins.security.stapler.StaplerSignaturesTest$SomeClass",
-                "method jenkins.security.stapler.StaplerSignaturesTest$SomeClass doFoo org.kohsuke.stapler.StaplerRequest org.kohsuke.stapler.StaplerResponse",
+                "method jenkins.security.stapler.StaplerSignaturesTest$SomeClass doFoo org.kohsuke.stapler.StaplerRequest2 org.kohsuke.stapler.StaplerResponse2",
                 "method jenkins.security.stapler.StaplerSignaturesTest$SomeClass doWhatever java.lang.String",
                 "method java.lang.Object getClass",
                 "method java.lang.Object equals java.lang.Object",
diff --git a/pom.xml b/pom.xml
index c3052864caba..47a9714fef3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,8 +52,7 @@ THE SOFTWARE.
   <modules>
     <module>bom</module>
     <module>websocket/spi</module>
-    <module>websocket/jetty10</module>
-    <module>websocket/jetty12-ee8</module>
+    <module>websocket/jetty12-ee9</module>
     <module>core</module>
     <module>war</module>
     <module>test</module>
@@ -98,7 +97,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
-    <winstone.version>7.0</winstone.version>
+    <winstone.version>8.0</winstone.version>
   </properties>
 
   <!--
diff --git a/test/src/test/java/hudson/CustomPluginManagerTest.java b/test/src/test/java/hudson/CustomPluginManagerTest.java
index ff91daeaa6a3..3ce9ae08eb8d 100644
--- a/test/src/test/java/hudson/CustomPluginManagerTest.java
+++ b/test/src/test/java/hudson/CustomPluginManagerTest.java
@@ -32,10 +32,10 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import javax.servlet.ServletContext;
 import jenkins.model.Jenkins;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java b/test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java
index f15daf63781a..89ed65ab1b09 100644
--- a/test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java
+++ b/test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java
@@ -9,10 +9,10 @@
 import hudson.model.UpdateSiteTest;
 import hudson.util.HttpResponses;
 import hudson.util.Retrier;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import org.htmlunit.Page;
 import org.htmlunit.html.HtmlPage;
@@ -23,8 +23,8 @@
 import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.xml.sax.SAXException;
 
 public class PluginManagerCheckUpdateCenterTest {
@@ -152,7 +152,7 @@ public String getUrlName() {
             return "updateSite502";
         }
 
-        public HttpResponse doGetJson(StaplerRequest request) {
+        public HttpResponse doGetJson(StaplerRequest2 request) {
             return HttpResponses.error(502, "Gateway error");
         }
     }
@@ -175,7 +175,7 @@ public String getUrlName() {
             return "updateSiteWrongJson";
         }
 
-        public void doGetJson(StaplerRequest request, StaplerResponse response) throws IOException {
+        public void doGetJson(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
             response.setContentType("text/json");
             response.setStatus(200);
             response.getWriter().append("{wrongjson}");
@@ -201,7 +201,7 @@ public String getUrlName() {
         }
 
         // The url has to end in update-center.json. See: UpdateSite#getMetadataUrlForDownloadable
-        public void doDynamic(StaplerRequest staplerRequest, StaplerResponse staplerResponse) throws ServletException, IOException {
+        public void doDynamic(StaplerRequest2 staplerRequest, StaplerResponse2 staplerResponse) throws ServletException, IOException {
             staplerResponse.setContentType("text/json");
             staplerResponse.setStatus(200);
             staplerResponse.serveFile(staplerRequest,  UpdateSiteTest.extract("update-center.json"));
diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
index 91a236db0266..b75d8fc2f66f 100644
--- a/test/src/test/java/hudson/PluginManagerTest.java
+++ b/test/src/test/java/hudson/PluginManagerTest.java
@@ -52,6 +52,7 @@
 import hudson.security.ACLContext;
 import hudson.util.FormValidation;
 import hudson.util.PersistedList;
+import jakarta.servlet.ServletException;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -83,7 +84,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import javax.servlet.ServletException;
 import jenkins.ClassLoaderReflectionToolkit;
 import jenkins.RestartRequiredException;
 import jenkins.model.GlobalConfiguration;
@@ -108,8 +108,8 @@
 import org.jvnet.hudson.test.Url;
 import org.jvnet.hudson.test.recipes.WithPlugin;
 import org.jvnet.hudson.test.recipes.WithPluginManager;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -178,7 +178,7 @@ public String getUrlName() {
             return "pluginManagerGetPlugin";
         }
 
-        public void doDynamic(StaplerRequest staplerRequest, StaplerResponse staplerResponse) throws ServletException, IOException {
+        public void doDynamic(StaplerRequest2 staplerRequest, StaplerResponse2 staplerResponse) throws ServletException, IOException {
             staplerResponse.setContentType("application/octet-stream");
             staplerResponse.setStatus(200);
             staplerResponse.serveFile(staplerRequest,  PluginManagerTest.class.getClassLoader().getResource("plugins/htmlpublisher.jpi"));
@@ -880,7 +880,7 @@ public String getUrlName() {
             return "security3037UpdateCenter";
         }
 
-        public void doDynamic(StaplerRequest staplerRequest, StaplerResponse staplerResponse) throws ServletException, IOException {
+        public void doDynamic(StaplerRequest2 staplerRequest, StaplerResponse2 staplerResponse) throws ServletException, IOException {
             staplerResponse.setContentType("application/json");
             staplerResponse.setStatus(200);
             staplerResponse.serveFile(staplerRequest, PluginManagerTest.class.getResource("/plugins/security3037-update-center.json"));
@@ -905,7 +905,7 @@ public String getUrlName() {
             return "pluginManagerGetPlugin";
         }
 
-        public void doDynamic(StaplerRequest staplerRequest, StaplerResponse staplerResponse) throws ServletException, IOException {
+        public void doDynamic(StaplerRequest2 staplerRequest, StaplerResponse2 staplerResponse) throws ServletException, IOException {
             staplerResponse.setContentType("application/octet-stream");
             staplerResponse.setStatus(200);
             staplerResponse.serveFile(staplerRequest,  PluginManagerTest.class.getClassLoader().getResource("plugins/htmlpublisher.jpi"));
diff --git a/test/src/test/java/hudson/PluginTest.java b/test/src/test/java/hudson/PluginTest.java
index 79cf3703a39a..7328d36f9381 100644
--- a/test/src/test/java/hudson/PluginTest.java
+++ b/test/src/test/java/hudson/PluginTest.java
@@ -25,9 +25,9 @@
 package hudson;
 
 import hudson.model.UpdateCenter;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.concurrent.Future;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.junit.Ignore;
 import org.junit.Rule;
diff --git a/test/src/test/java/hudson/cli/BuildCommandTest.java b/test/src/test/java/hudson/cli/BuildCommandTest.java
index 3cacae4d0177..8afae30d3edf 100644
--- a/test/src/test/java/hudson/cli/BuildCommandTest.java
+++ b/test/src/test/java/hudson/cli/BuildCommandTest.java
@@ -76,7 +76,7 @@
 import org.jvnet.hudson.test.SmokeTest;
 import org.jvnet.hudson.test.TestBuilder;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * {@link BuildCommand} test.
@@ -274,7 +274,7 @@ public ParameterValue createValue(String value) {
         }
 
         @Override
-        public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+        public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
             return createValue("BAR");
         }
 
diff --git a/test/src/test/java/hudson/cli/CLITest.java b/test/src/test/java/hudson/cli/CLITest.java
index 9471d04224b4..229a99eec51d 100644
--- a/test/src/test/java/hudson/cli/CLITest.java
+++ b/test/src/test/java/hudson/cli/CLITest.java
@@ -37,6 +37,10 @@
 import hudson.model.UnprotectedRootAction;
 import hudson.security.csrf.CrumbExclusion;
 import hudson.util.StreamTaskListener;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -46,10 +50,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.output.TeeOutputStream;
@@ -68,8 +68,8 @@
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 public class CLITest {
 
@@ -150,11 +150,11 @@ public static final class NoJenkinsAction extends CrumbExclusion implements Unpr
         }
 
         @Override public Object getTarget() {
-            doDynamic(Stapler.getCurrentRequest(), Stapler.getCurrentResponse());
+            doDynamic(Stapler.getCurrentRequest2(), Stapler.getCurrentResponse2());
             return this;
         }
 
-        public void doDynamic(StaplerRequest req, StaplerResponse rsp) {
+        public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) {
             rsp.setStatus(200);
         }
 
@@ -230,15 +230,15 @@ public static final class CliProxyAction extends CrumbExclusion implements Unpro
         }
 
         @Override public Object getTarget() {
-            throw doDynamic(Stapler.getCurrentRequest(), Stapler.getCurrentResponse());
+            throw doDynamic(Stapler.getCurrentRequest2(), Stapler.getCurrentResponse2());
         }
 
-        public HttpResponses.HttpResponseException doDynamic(StaplerRequest req, StaplerResponse rsp) {
+        public HttpResponses.HttpResponseException doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) {
             final String url = req.getRequestURIWithQueryString().replaceFirst("/cli-proxy", "");
             // Custom written redirect so no traces of Jenkins are present in headers
             return new HttpResponses.HttpResponseException() {
                 @Override
-                public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException {
+                public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException {
                     rsp.setHeader("Location", url);
                     rsp.setContentType("text/html");
                     rsp.setStatus(HttpURLConnection.HTTP_MOVED_TEMP);
diff --git a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
index 2124f8c19755..54f68a43b66c 100644
--- a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
+++ b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
@@ -92,7 +92,7 @@ public class OldDataMonitorTest {
     /**
      * Note that this doesn't actually run slowly, it just ensures that
      * the {@link OldDataMonitor#changeListener}'s {@code onChange()} can complete
-     * while {@link OldDataMonitor#doDiscard(org.kohsuke.stapler.StaplerRequest, org.kohsuke.stapler.StaplerResponse)}
+     * while {@link OldDataMonitor#doDiscard(org.kohsuke.stapler.StaplerRequest2, org.kohsuke.stapler.StaplerResponse2)}
      * is still running.
      *
      */
@@ -114,7 +114,7 @@ public class OldDataMonitorTest {
         ExecutorService executors = Executors.newSingleThreadExecutor();
 
         Future<Void> discardFuture = executors.submit(() -> {
-            oldDataMonitor.doDiscard(Stapler.getCurrentRequest(), Stapler.getCurrentResponse());
+            oldDataMonitor.doDiscard(Stapler.getCurrentRequest2(), Stapler.getCurrentResponse2());
             return null;
         });
 
diff --git a/test/src/test/java/hudson/model/ApiTest.java b/test/src/test/java/hudson/model/ApiTest.java
index 7422ec78fd98..1ac268423114 100644
--- a/test/src/test/java/hudson/model/ApiTest.java
+++ b/test/src/test/java/hudson/model/ApiTest.java
@@ -32,10 +32,10 @@
 import static org.junit.Assert.fail;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONObject;
 import org.htmlunit.Page;
 import org.htmlunit.WebResponse;
diff --git a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java
index ce7f987ad532..8eea0a4a7890 100644
--- a/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java
+++ b/test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java
@@ -43,6 +43,10 @@
 import hudson.security.AccessDeniedException3;
 import hudson.security.GlobalMatrixAuthorizationStrategy;
 import hudson.slaves.DumbSlave;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -50,10 +54,6 @@
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 import jenkins.model.Jenkins;
 import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.HttpMethod;
@@ -68,8 +68,8 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.PretendSlave;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.security.core.context.SecurityContext;
@@ -85,8 +85,8 @@ public class ComputerConfigDotXmlTest {
     @Rule
     public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    @Mock private StaplerRequest req;
-    @Mock private StaplerResponse rsp;
+    @Mock private StaplerRequest2 req;
+    @Mock private StaplerResponse2 rsp;
 
     private Computer computer;
     private SecurityContext oldSecurityContext;
diff --git a/test/src/test/java/hudson/model/DescriptorTest.java b/test/src/test/java/hudson/model/DescriptorTest.java
index 2a0b09d74b79..d608360e69ed 100644
--- a/test/src/test/java/hudson/model/DescriptorTest.java
+++ b/test/src/test/java/hudson/model/DescriptorTest.java
@@ -49,7 +49,7 @@
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class DescriptorTest {
@@ -115,7 +115,7 @@ private static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
             return id;
         }
 
-        @Override public Builder newInstance(StaplerRequest req, JSONObject formData) {
+        @Override public Builder newInstance(StaplerRequest2 req, JSONObject formData) {
             return new BuilderImpl(id);
         }
 
@@ -213,7 +213,7 @@ public D3D(String id) {
             return id;
         }
 
-        @Override public D3 newInstance(StaplerRequest req, JSONObject formData) {
+        @Override public D3 newInstance(StaplerRequest2 req, JSONObject formData) {
             return new D3(id);
         }
     }
@@ -242,7 +242,7 @@ public void presentStacktraceFromFormException() {
         final Descriptor.FormException fe = new Descriptor.FormException("My Message", cause, "fake");
         FailingHttpStatusCodeException ex = assertThrows(FailingHttpStatusCodeException.class, () ->
             rule.executeOnServer((Callable<Void>) () -> {
-                fe.generateResponse(Stapler.getCurrentRequest(), Stapler.getCurrentResponse(), Jenkins.get());
+                fe.generateResponse(Stapler.getCurrentRequest2(), Stapler.getCurrentResponse2(), Jenkins.get());
                 return null;
             }));
         String response = ex.getResponse().getContentAsString();
diff --git a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
index 24c978e78f8d..fbd1173909df 100644
--- a/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
+++ b/test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java
@@ -97,8 +97,8 @@
 import org.jvnet.hudson.test.SingleFileSCM;
 import org.jvnet.hudson.test.TestBuilder;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -381,7 +381,7 @@ public String getDisplayName() {
             return null;
         }
 
-        public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws Exception {
+        public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws Exception {
             String hash = req.getRestOfPath().substring(1);
             for (byte[] file : files) {
                 if (Util.getDigestOf(new ByteArrayInputStream(file)).equals(hash)) {
diff --git a/test/src/test/java/hudson/model/JobPropertyTest.java b/test/src/test/java/hudson/model/JobPropertyTest.java
index ecd16a70fae7..97343823e332 100644
--- a/test/src/test/java/hudson/model/JobPropertyTest.java
+++ b/test/src/test/java/hudson/model/JobPropertyTest.java
@@ -41,7 +41,7 @@
 import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class JobPropertyTest {
 
@@ -124,7 +124,7 @@ public JobPropertyWithConfigImpl(String name) {
         @TestExtension("configRoundtrip")
         public static class DescriptorImpl extends JobPropertyDescriptor {
             @Override
-            public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+            public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
                 JobPropertyWithConfigImpl prop = (JobPropertyWithConfigImpl) super.newInstance(req, formData);
                 return prop.name.isEmpty() ? null : prop;
             }
@@ -147,7 +147,7 @@ public static class InvisibleImpl extends JobProperty<Job<?, ?>> {
         InvisibleImpl() {}
 
         @Override
-        public JobProperty<?> reconfigure(StaplerRequest req, JSONObject form) {
+        public JobProperty<?> reconfigure(StaplerRequest2 req, JSONObject form) {
             return this;
         }
 
diff --git a/test/src/test/java/hudson/model/ListViewTest.java b/test/src/test/java/hudson/model/ListViewTest.java
index 4eef645d6608..c401cc3f9001 100644
--- a/test/src/test/java/hudson/model/ListViewTest.java
+++ b/test/src/test/java/hudson/model/ListViewTest.java
@@ -46,6 +46,8 @@
 import hudson.security.Permission;
 import hudson.views.StatusFilter;
 import hudson.views.ViewJobFilter;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -58,8 +60,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
 import jenkins.model.Jenkins;
 import org.apache.commons.io.IOUtils;
 import org.htmlunit.AlertHandler;
@@ -75,8 +75,8 @@
 import org.jvnet.hudson.test.JenkinsRule.WebClient;
 import org.jvnet.hudson.test.MockFolder;
 import org.jvnet.hudson.test.recipes.LocalData;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.springframework.security.core.Authentication;
 import org.xml.sax.SAXException;
 
@@ -258,8 +258,8 @@ private void checkLinkFromItemExistsAndIsValid(Item item, ItemGroup ig, Item top
     @Test public void addJobUsingAPI() throws Exception {
         ListView v = new ListView("view", j.jenkins);
         j.jenkins.addView(v);
-        StaplerRequest req = mock(StaplerRequest.class);
-        StaplerResponse rsp = mock(StaplerResponse.class);
+        StaplerRequest2 req = mock(StaplerRequest2.class);
+        StaplerResponse2 rsp = mock(StaplerResponse2.class);
 
         String configXml = IOUtils.toString(getClass().getResourceAsStream(String.format("%s/%s/config.xml", getClass().getSimpleName(), testName.getMethodName())), StandardCharsets.UTF_8);
 
diff --git a/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java b/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java
index 54d3b3a0c847..732deb13d767 100644
--- a/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java
+++ b/test/src/test/java/hudson/model/ParametersDefinitionPropertyTest.java
@@ -43,7 +43,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class ParametersDefinitionPropertyTest {
 
@@ -79,12 +79,12 @@ public KrazyParameterDefinition(String name, String description, String field) {
         }
 
         @Override
-        public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+        public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public ParameterValue createValue(StaplerRequest req) {
+        public ParameterValue createValue(StaplerRequest2 req) {
             throw new UnsupportedOperationException();
         }
 
@@ -92,7 +92,7 @@ public ParameterValue createValue(StaplerRequest req) {
         public static class DescriptorImpl extends ParameterDescriptor {
 
             @Override
-            public ParameterDefinition newInstance(StaplerRequest req, JSONObject formData) {
+            public ParameterDefinition newInstance(StaplerRequest2 req, JSONObject formData) {
                 return new KrazyParameterDefinition(formData.getString("name"), formData.getString("description"), formData.getString("field").toLowerCase(Locale.ENGLISH));
             }
 
diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java
index e3f2d84493e3..389837e46a42 100644
--- a/test/src/test/java/hudson/model/ProjectTest.java
+++ b/test/src/test/java/hudson/model/ProjectTest.java
@@ -108,6 +108,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestBuilder;
 import org.jvnet.hudson.test.TestExtension;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  *
@@ -573,7 +574,7 @@ public void testDoDoDelete() throws Exception {
         j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
         User user = User.getById("john", true);
         try (ACLContext as = ACL.as(user)) {
-            assertThrows("User should not have permission to build project", AccessDeniedException3.class, () -> project.doDoDelete(null, null));
+            assertThrows("User should not have permission to build project", AccessDeniedException3.class, () -> project.doDoDelete((StaplerRequest2) null, null));
         }
         auth.add(Jenkins.READ, user.getId());
         auth.add(Item.READ, user.getId());
diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java
index fa76fd88ae0d..a28f6bae0da5 100644
--- a/test/src/test/java/hudson/model/QueueTest.java
+++ b/test/src/test/java/hudson/model/QueueTest.java
@@ -78,6 +78,7 @@
 import hudson.triggers.SCMTrigger.SCMTriggerCause;
 import hudson.triggers.TimerTrigger.TimerTriggerCause;
 import hudson.util.OneShotEvent;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -101,7 +102,6 @@
 import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.BlockedBecauseOfBuildInProgress;
 import jenkins.model.Jenkins;
 import jenkins.model.queue.QueueIdStrategy;
diff --git a/test/src/test/java/hudson/model/UpdateCenterCustomTest.java b/test/src/test/java/hudson/model/UpdateCenterCustomTest.java
index dc37e2b3c875..2a3a9296c1be 100644
--- a/test/src/test/java/hudson/model/UpdateCenterCustomTest.java
+++ b/test/src/test/java/hudson/model/UpdateCenterCustomTest.java
@@ -28,7 +28,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -59,10 +59,10 @@ private static final class CustomUpdateCenterRule extends JenkinsRule {
         }
 
         @Override
-        protected ServletContext createWebServer() throws Exception {
+        protected ServletContext createWebServer2() throws Exception {
             _oldValue = System.getProperty(PROPERTY_NAME);
             System.setProperty(PROPERTY_NAME, updateCenterClassName);
-            return super.createWebServer();
+            return super.createWebServer2();
         }
 
         @Override
diff --git a/test/src/test/java/hudson/model/UsageStatisticsTest.java b/test/src/test/java/hudson/model/UsageStatisticsTest.java
index 015203308e25..bffd2af0f445 100644
--- a/test/src/test/java/hudson/model/UsageStatisticsTest.java
+++ b/test/src/test/java/hudson/model/UsageStatisticsTest.java
@@ -116,7 +116,7 @@ public void roundtrip() throws Exception {
         // that would cause issues with parsing/analyzing uploaded usage statistics
         assertEquals(1, o.getInt("stat"));
         assertEquals(jenkins.getLegacyInstanceId(), o.getString("install"));
-        assertEquals(jenkins.servletContext.getServerInfo(), o.getString("servletContainer"));
+        assertEquals(jenkins.getServletContext().getServerInfo(), o.getString("servletContainer"));
         assertEquals(Jenkins.VERSION, o.getString("version"));
 
         assertTrue(o.has("plugins"));
diff --git a/test/src/test/java/hudson/model/ViewDescriptorTest.java b/test/src/test/java/hudson/model/ViewDescriptorTest.java
index facfaecd1d77..b4e34cf5a701 100644
--- a/test/src/test/java/hudson/model/ViewDescriptorTest.java
+++ b/test/src/test/java/hudson/model/ViewDescriptorTest.java
@@ -42,7 +42,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MockFolder;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class ViewDescriptorTest {
 
@@ -156,7 +156,7 @@ public String getSomeProperty() {
         }
 
         @Override
-        public ViewProperty reconfigure(StaplerRequest req, JSONObject form) {
+        public ViewProperty reconfigure(StaplerRequest2 req, JSONObject form) {
             return this;
         }
 
diff --git a/test/src/test/java/hudson/model/ViewPropertyTest.java b/test/src/test/java/hudson/model/ViewPropertyTest.java
index 6ebad1958b1d..4f253bb9971f 100644
--- a/test/src/test/java/hudson/model/ViewPropertyTest.java
+++ b/test/src/test/java/hudson/model/ViewPropertyTest.java
@@ -38,7 +38,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -100,7 +100,7 @@ public static class InvisiblePropertyImpl extends ViewProperty {
         }
 
         @Override
-        public ViewProperty reconfigure(StaplerRequest req, JSONObject form) {
+        public ViewProperty reconfigure(StaplerRequest2 req, JSONObject form) {
             return this;
         }
 
diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java
index 4355d82ad063..63dd879d25cc 100644
--- a/test/src/test/java/hudson/model/ViewTest.java
+++ b/test/src/test/java/hudson/model/ViewTest.java
@@ -100,8 +100,8 @@
 import org.jvnet.hudson.test.TestExtension;
 import org.jvnet.hudson.test.recipes.LocalData;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.w3c.dom.Text;
 
 /**
@@ -488,7 +488,7 @@ public void testSave() throws Exception {
         view.save();
         j.jenkins.doReload();
         //wait until all configuration are reloaded
-        if (j.jenkins.servletContext.getAttribute("app") instanceof HudsonIsLoading) {
+        if (j.jenkins.getServletContext().getAttribute("app") instanceof HudsonIsLoading) {
             Thread.sleep(500);
         }
         assertTrue("View does not contains job free after load.", j.jenkins.getView(view.getDisplayName()).contains(j.jenkins.getItem(job.getName())));
@@ -1081,11 +1081,11 @@ public boolean contains(TopLevelItem item) {
         }
 
         @Override
-        protected void submit(StaplerRequest req) {
+        protected void submit(StaplerRequest2 req) {
         }
 
         @Override
-        public Item doCreateItem(StaplerRequest req, StaplerResponse rsp) {
+        public Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) {
             return null;
         }
     }
diff --git a/test/src/test/java/hudson/pages/SystemConfigurationTestCase.java b/test/src/test/java/hudson/pages/SystemConfigurationTestCase.java
index 83f9bc9f20a0..7265655b4982 100644
--- a/test/src/test/java/hudson/pages/SystemConfigurationTestCase.java
+++ b/test/src/test/java/hudson/pages/SystemConfigurationTestCase.java
@@ -35,7 +35,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class SystemConfigurationTestCase {
 
@@ -70,7 +70,7 @@ private static class PageDecoratorImpl extends PageDecorator {
         private String decoratorId;
 
         @Override
-        public boolean configure(StaplerRequest req, JSONObject json) {
+        public boolean configure(StaplerRequest2 req, JSONObject json) {
             decoratorId = json.getString("decoratorId");
             return true;
         }
diff --git a/test/src/test/java/hudson/security/LoginTest.java b/test/src/test/java/hudson/security/LoginTest.java
index 0829a6bc41f6..30b016d717c4 100644
--- a/test/src/test/java/hudson/security/LoginTest.java
+++ b/test/src/test/java/hudson/security/LoginTest.java
@@ -1,6 +1,6 @@
 package hudson.security;
 
-import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
+import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertFalse;
diff --git a/test/src/test/java/hudson/security/SecurityRealmTest.java b/test/src/test/java/hudson/security/SecurityRealmTest.java
index 6ebe98e71bf1..5121086085b2 100644
--- a/test/src/test/java/hudson/security/SecurityRealmTest.java
+++ b/test/src/test/java/hudson/security/SecurityRealmTest.java
@@ -152,10 +152,10 @@ public void getPostLogOutUrl() throws Exception {
         j.jenkins.setSecurityRealm(osr);
         j.executeOnServer(() -> {
             assertEquals("/jenkins/", j.jenkins.getSecurityRealm().getPostLogOutUrl(Stapler.getCurrentRequest(), Jenkins.ANONYMOUS));
-            assertEquals("/jenkins/", j.jenkins.getSecurityRealm().getPostLogOutUrl2(Stapler.getCurrentRequest(), Jenkins.ANONYMOUS2));
+            assertEquals("/jenkins/", j.jenkins.getSecurityRealm().getPostLogOutUrl2(Stapler.getCurrentRequest2(), Jenkins.ANONYMOUS2));
             osr.special = true;
             assertEquals("/jenkins/custom", j.jenkins.getSecurityRealm().getPostLogOutUrl(Stapler.getCurrentRequest(), Jenkins.ANONYMOUS));
-            assertEquals("/jenkins/custom", j.jenkins.getSecurityRealm().getPostLogOutUrl2(Stapler.getCurrentRequest(), Jenkins.ANONYMOUS2));
+            assertEquals("/jenkins/custom", j.jenkins.getSecurityRealm().getPostLogOutUrl2(Stapler.getCurrentRequest2(), Jenkins.ANONYMOUS2));
             return null;
         });
     }
diff --git a/test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java b/test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java
index e7597adaf8fd..0798c39ad2cd 100644
--- a/test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java
+++ b/test/src/test/java/hudson/security/TokenBasedRememberMeServices2Test.java
@@ -299,7 +299,7 @@ public void rememberMeToken_shouldLoadUserDetailsOnlyOnce() throws Exception {
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.getCookieManager().addCookie(cookie);
         // trigger remember me
-        String sessionSeed = wc.executeOnServer(() -> Stapler.getCurrentRequest().getSession(false).getAttribute(UserSeedProperty.USER_SESSION_SEED).toString());
+        String sessionSeed = wc.executeOnServer(() -> Stapler.getCurrentRequest2().getSession(false).getAttribute(UserSeedProperty.USER_SESSION_SEED).toString());
         realm.verifyInvocations(1);
         String userSeed = alice.getProperty(UserSeedProperty.class).getSeed();
 
diff --git a/test/src/test/java/hudson/security/WhoAmITest.java b/test/src/test/java/hudson/security/WhoAmITest.java
index 819b98984e88..a92b25f0269c 100644
--- a/test/src/test/java/hudson/security/WhoAmITest.java
+++ b/test/src/test/java/hudson/security/WhoAmITest.java
@@ -31,11 +31,11 @@
 import static org.hamcrest.Matchers.nullValue;
 
 import hudson.model.User;
+import jakarta.servlet.http.HttpSession;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
-import javax.servlet.http.HttpSession;
 import jenkins.model.Jenkins;
 import jenkins.security.ApiTokenProperty;
 import jenkins.security.apitoken.TokenUuidAndPlainValue;
@@ -73,7 +73,7 @@ public void whoAmI_regular_doesNotProvideSensitiveInformation() throws Exception
         String content = whoAmIPage.getWebResponse().getContentAsString();
 
         String sessionId = wc.executeOnServer(() -> {
-            HttpSession session = Stapler.getCurrentRequest().getSession(false);
+            HttpSession session = Stapler.getCurrentRequest2().getSession(false);
             return session != null ? session.getId() : null;
         });
 
@@ -114,7 +114,7 @@ public void whoAmI_regularApi_doesNotProvideSensitiveInformation() throws Except
         String content = whoAmIPage.getWebResponse().getContentAsString();
 
         String sessionId = wc.executeOnServer(() -> {
-            HttpSession session = Stapler.getCurrentRequest().getSession(false);
+            HttpSession session = Stapler.getCurrentRequest2().getSession(false);
             return session != null ? session.getId() : null;
         });
 
diff --git a/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java b/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java
index adb2184ff239..def3f5746783 100644
--- a/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java
+++ b/test/src/test/java/hudson/security/csrf/CrumbExclusionTest.java
@@ -31,12 +31,12 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.ExtensionList;
 import hudson.model.UnprotectedRootAction;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.HttpMethod;
diff --git a/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java b/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java
index 2904af69fc4d..65141fa93cdd 100644
--- a/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java
+++ b/test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java
@@ -16,9 +16,9 @@
 import static org.junit.Assert.assertTrue;
 
 import hudson.model.User;
+import jakarta.servlet.http.HttpServletResponse;
 import java.net.HttpURLConnection;
 import java.net.URI;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.htmlunit.FailingHttpStatusCodeException;
diff --git a/test/src/test/java/hudson/slaves/CloudTest.java b/test/src/test/java/hudson/slaves/CloudTest.java
index 7ad4dff33aa6..04bb7a04f212 100644
--- a/test/src/test/java/hudson/slaves/CloudTest.java
+++ b/test/src/test/java/hudson/slaves/CloudTest.java
@@ -28,7 +28,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.jvnet.hudson.test.WithoutJenkins;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 
 public class CloudTest {
 
@@ -127,7 +127,7 @@ public static final class TaskCloudAction implements Action {
             return "task";
         }
 
-        public void doIndex(StaplerResponse rsp) throws IOException {
+        public void doIndex(StaplerResponse2 rsp) throws IOException {
             rsp.getOutputStream().println("doIndex called");
         }
     }
diff --git a/test/src/test/java/hudson/slaves/NodePropertyTest.java b/test/src/test/java/hudson/slaves/NodePropertyTest.java
index 6aef28929b11..dc78979910fe 100644
--- a/test/src/test/java/hudson/slaves/NodePropertyTest.java
+++ b/test/src/test/java/hudson/slaves/NodePropertyTest.java
@@ -19,7 +19,7 @@
 import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -52,7 +52,7 @@ public static class InvisibleProperty extends NodeProperty<Slave> {
         boolean reconfigured = false;
 
         @Override
-        public NodeProperty<?> reconfigure(StaplerRequest req, JSONObject form) {
+        public NodeProperty<?> reconfigure(StaplerRequest2 req, JSONObject form) {
             reconfigured = true;
             return this;
         }
diff --git a/test/src/test/java/hudson/util/BootFailureTest.java b/test/src/test/java/hudson/util/BootFailureTest.java
index d083a74a2e26..b8ba0bd8a630 100644
--- a/test/src/test/java/hudson/util/BootFailureTest.java
+++ b/test/src/test/java/hudson/util/BootFailureTest.java
@@ -8,6 +8,8 @@
 import hudson.WebAppMain;
 import hudson.model.Hudson;
 import hudson.model.listeners.ItemListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -16,8 +18,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
 import jenkins.model.Jenkins;
 import org.junit.After;
 import org.junit.Rule;
@@ -25,7 +25,7 @@
 import org.junit.rules.TemporaryFolder;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.NoListenerConfiguration;
+import org.jvnet.hudson.test.NoListenerConfiguration2;
 import org.jvnet.hudson.test.TestEnvironment;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.WebApp;
@@ -66,13 +66,13 @@ public WebAppMain.FileAndDescription getHomeDir(ServletContextEvent event) {
             // Without this gymnastic, the jenkins-test-harness adds a NoListenerConfiguration
             // that prevents us to inject our own custom WebAppMain
             // With this approach we can make the server calls the regular contextInitialized
-            ServletContext ws = createWebServer((context, server) -> {
-                NoListenerConfiguration noListenerConfiguration = context.getBean(NoListenerConfiguration.class);
+            ServletContext ws = createWebServer2((context, server) -> {
+                NoListenerConfiguration2 noListenerConfiguration = context.getBean(NoListenerConfiguration2.class);
                 // future-proof
                 assertNotNull(noListenerConfiguration);
                 if (noListenerConfiguration != null) {
                     context.removeBean(noListenerConfiguration);
-                    context.addBean(new NoListenerConfiguration(context) {
+                    context.addBean(new NoListenerConfiguration2(context) {
                         @Override
                         protected void doStart() {
                             // default behavior of noListenerConfiguration
diff --git a/test/src/test/java/hudson/util/HudsonIsLoadingTest.java b/test/src/test/java/hudson/util/HudsonIsLoadingTest.java
index 21ae31734e30..0a49084ad336 100644
--- a/test/src/test/java/hudson/util/HudsonIsLoadingTest.java
+++ b/test/src/test/java/hudson/util/HudsonIsLoadingTest.java
@@ -1,6 +1,6 @@
 package hudson.util;
 
-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
@@ -19,7 +19,7 @@ public class HudsonIsLoadingTest {
     @Test
     @Issue("JENKINS-55062")
     public void withPrefix() throws Exception {
-        j.jenkins.servletContext.setAttribute("app", new HudsonIsLoading());
+        j.jenkins.getServletContext().setAttribute("app", new HudsonIsLoading());
         JenkinsRule.WebClient wc = j.createWebClient()
                 // this is a failure page already
                 .withThrowExceptionOnFailingStatusCode(false)
diff --git a/test/src/test/java/hudson/util/HudsonIsRestartingTest.java b/test/src/test/java/hudson/util/HudsonIsRestartingTest.java
index 464f16e72da9..d70ea9c33959 100644
--- a/test/src/test/java/hudson/util/HudsonIsRestartingTest.java
+++ b/test/src/test/java/hudson/util/HudsonIsRestartingTest.java
@@ -1,6 +1,6 @@
 package hudson.util;
 
-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+import static jakarta.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
@@ -20,7 +20,7 @@ public class HudsonIsRestartingTest {
     @Test
     @Issue("JENKINS-55062")
     public void withPrefix() throws Exception {
-        j.jenkins.servletContext.setAttribute("app", new HudsonIsRestarting(false));
+        j.jenkins.getServletContext().setAttribute("app", new HudsonIsRestarting(false));
         JenkinsRule.WebClient wc = j.createWebClient()
                 // this is a failure page already
                 .withThrowExceptionOnFailingStatusCode(false)
diff --git a/test/src/test/java/hudson/util/RobustReflectionConverterTest.java b/test/src/test/java/hudson/util/RobustReflectionConverterTest.java
index ff0b255114e1..570c4dfb8f04 100644
--- a/test/src/test/java/hudson/util/RobustReflectionConverterTest.java
+++ b/test/src/test/java/hudson/util/RobustReflectionConverterTest.java
@@ -61,7 +61,7 @@
 import org.jvnet.hudson.test.TestExtension;
 import org.jvnet.hudson.test.recipes.LocalData;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class RobustReflectionConverterTest {
 
@@ -123,7 +123,7 @@ public String getDisplayName() {
             }
 
             @Override
-            public AcceptOnlySpecificKeyword newInstance(StaplerRequest req, JSONObject formData)
+            public AcceptOnlySpecificKeyword newInstance(StaplerRequest2 req, JSONObject formData)
                     throws FormException {
                 AcceptOnlySpecificKeyword instance = super.newInstance(req, formData);
                 if (!instance.isAcceptable()) {
@@ -160,7 +160,7 @@ public String getDisplayName() {
             }
 
             @Override
-            public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData)
+            public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData)
                     throws FormException {
                 // unfortunately, default newInstance bypasses newInstances for members.
                 formData = formData.getJSONObject("keywordProperty");
diff --git a/test/src/test/java/hudson/util/XStream2Security383Test.java b/test/src/test/java/hudson/util/XStream2Security383Test.java
index 2d8002eb4a9e..6fe7b5377e81 100644
--- a/test/src/test/java/hudson/util/XStream2Security383Test.java
+++ b/test/src/test/java/hudson/util/XStream2Security383Test.java
@@ -5,14 +5,14 @@
 import static org.mockito.Mockito.when;
 
 import hudson.model.Items;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.logging.Level;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
 import jenkins.security.ClassFilterImpl;
 import org.apache.commons.io.IOUtils;
 import org.junit.After;
@@ -23,8 +23,8 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -40,10 +40,10 @@ public class XStream2Security383Test {
     public LoggerRule logging = new LoggerRule().record(ClassFilterImpl.class, Level.FINE);
 
     @Mock
-    private StaplerRequest req;
+    private StaplerRequest2 req;
 
     @Mock
-    private StaplerResponse rsp;
+    private StaplerResponse2 rsp;
 
     private AutoCloseable mocks;
 
diff --git a/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java b/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java
index ca0a67e4fe42..7a6de7d6c55f 100644
--- a/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java
+++ b/test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.java
@@ -35,7 +35,7 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.kohsuke.stapler.MockStaplerRequestBuilder;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Tests of {@link GlobalDefaultViewConfiguration}.
@@ -52,7 +52,7 @@ public void shouldNotFailIfTheDefaultViewIsMissing() {
         String viewName = "NonExistentView";
         GlobalDefaultViewConfiguration c = new GlobalDefaultViewConfiguration();
 
-        StaplerRequest create = new MockStaplerRequestBuilder(j, "/configure").build();
+        StaplerRequest2 create = new MockStaplerRequestBuilder(j, "/configure").build();
         JSONObject params = new JSONObject();
         params.accumulate("primaryView", viewName);
         try {
diff --git a/test/src/test/java/jenkins/diagnostics/URICheckEncodingMonitorTest.java b/test/src/test/java/jenkins/diagnostics/URICheckEncodingMonitorTest.java
index ca3fd62b9e4e..dc444f431de5 100644
--- a/test/src/test/java/jenkins/diagnostics/URICheckEncodingMonitorTest.java
+++ b/test/src/test/java/jenkins/diagnostics/URICheckEncodingMonitorTest.java
@@ -22,7 +22,7 @@ public class URICheckEncodingMonitorTest {
     public void emptyValueInResponse() throws Exception {
         j.executeOnServer(() -> {
                 URICheckEncodingMonitor monitor = new URICheckEncodingMonitor();
-                FormValidation validation = monitor.doCheckURIEncoding(Stapler.getCurrentRequest());
+                FormValidation validation = monitor.doCheckURIEncoding(Stapler.getCurrentRequest2());
                 assertThat(validation.kind, is(FormValidation.Kind.WARNING));
                 assertThat(validation.getMessage(), containsString("Your container doesn’t use UTF-8 to decode URLs."));
                 return null;
diff --git a/test/src/test/java/jenkins/install/InstallUtilTest.java b/test/src/test/java/jenkins/install/InstallUtilTest.java
index 9a7d6534f1a4..0047ecc5aa31 100644
--- a/test/src/test/java/jenkins/install/InstallUtilTest.java
+++ b/test/src/test/java/jenkins/install/InstallUtilTest.java
@@ -33,6 +33,7 @@
 import hudson.model.UpdateCenter.DownloadJob.Success;
 import hudson.model.UpdateCenter.UpdateCenterJob;
 import hudson.model.UpdateSite;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,7 +41,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
diff --git a/test/src/test/java/jenkins/model/ContextMenuTest.java b/test/src/test/java/jenkins/model/ContextMenuTest.java
index 313455de02fd..37c994d89017 100644
--- a/test/src/test/java/jenkins/model/ContextMenuTest.java
+++ b/test/src/test/java/jenkins/model/ContextMenuTest.java
@@ -55,7 +55,7 @@ public class ContextMenuTest {
     @Issue("JENKINS-19173")
     @Test public void contextMenuVisibility() throws Exception {
         final FreeStyleProject p = j.createFreeStyleProject("p");
-        Callable<ContextMenu> doContextMenu = () -> p.doContextMenu(Stapler.getCurrentRequest(), Stapler.getCurrentResponse());
+        Callable<ContextMenu> doContextMenu = () -> p.doContextMenu(Stapler.getCurrentRequest2(), Stapler.getCurrentResponse2());
         ActionFactory f = j.jenkins.getExtensionList(TransientProjectActionFactory.class).get(ActionFactory.class);
         f.visible = true;
         ContextMenu menu = j.executeOnServer(doContextMenu);
diff --git a/test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java b/test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java
index 3d42450274e3..74e612cc8432 100644
--- a/test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java
+++ b/test/src/test/java/jenkins/model/GlobalSCMRetryCountConfigurationTest.java
@@ -52,17 +52,17 @@ public void shouldExceptOnNullScmRetryCount() throws Exception {
                     GlobalConfiguration.all().getDynamic("jenkins.model.GlobalSCMRetryCountConfiguration");
 
             json.element("scmCheckoutRetryCount", 5);
-            gc.configure(Stapler.getCurrentRequest(), json);
+            gc.configure(Stapler.getCurrentRequest2(), json);
             assertThat("Wrong value, it should be equal to 5",
                     j.getInstance().getScmCheckoutRetryCount(), equalTo(5));
 
             json.element("scmCheckoutRetryCount", 3);
-            gc.configure(Stapler.getCurrentRequest(), json);
+            gc.configure(Stapler.getCurrentRequest2(), json);
             assertThat("Wrong value, it should be equal to 3",
                     j.getInstance().getScmCheckoutRetryCount(), equalTo(3));
 
             JSONObject emptyJson = new JSONObject();
-            gc.configure(Stapler.getCurrentRequest(), emptyJson);
+            gc.configure(Stapler.getCurrentRequest2(), emptyJson);
         } catch (Descriptor.FormException e) {
             assertThat("Scm Retry count value changed! This shouldn't happen.",
                     j.getInstance().getScmCheckoutRetryCount(), equalTo(3));
diff --git a/test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java b/test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java
index f873a69d30e6..c066ce6452cb 100644
--- a/test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java
+++ b/test/src/test/java/jenkins/model/ParameterizedJobMixInTest.java
@@ -34,8 +34,8 @@
 import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Queue;
 import hudson.model.StringParameterDefinition;
+import jakarta.servlet.http.HttpServletResponse;
 import java.net.URL;
-import javax.servlet.http.HttpServletResponse;
 import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.HttpMethod;
 import org.htmlunit.WebRequest;
@@ -45,6 +45,7 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
+
 /**
  * Tests of {@link ParameterizedJobMixIn}.
  * @author Oleg Nenashev
diff --git a/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java b/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
index 162ac231b664..cd4f898b3d22 100644
--- a/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
+++ b/test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
@@ -21,6 +21,7 @@
 import hudson.model.User;
 import hudson.security.ACL;
 import hudson.security.ACLContext;
+import jakarta.servlet.http.HttpServletResponse;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
@@ -28,7 +29,6 @@
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.security.apitoken.ApiTokenPropertyConfiguration;
 import jenkins.security.apitoken.ApiTokenStore;
diff --git a/test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java b/test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java
index 3a5614dedb9f..0fe9b8865d16 100644
--- a/test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java
+++ b/test/src/test/java/jenkins/security/RedactSecretJsonInErrorMessageSanitizerHtmlTest.java
@@ -53,8 +53,8 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.POST;
 
 @Restricted(NoExternalUse.class)
@@ -121,7 +121,7 @@ public static class TestPassword implements RootAction {
 
         public JSONObject lastJsonReceived;
 
-        public void doSubmitTest(StaplerRequest req, StaplerResponse res) throws Exception {
+        public void doSubmitTest(StaplerRequest2 req, StaplerResponse2 res) throws Exception {
             lastJsonReceived = req.getSubmittedForm();
 
             res.setStatus(200);
@@ -250,7 +250,7 @@ public static class TestDescribablePage implements RootAction {
         public TestDescribable testDescribable;
 
         @POST
-        public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws Exception {
+        public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws Exception {
             Jenkins.get().getDescriptorOrDie(TestDescribable.class).newInstance(req, req.getSubmittedForm());
         }
 
@@ -276,7 +276,7 @@ public static class TestStaplerPage implements RootAction {
         public TestDescribable testDescribable;
 
         @POST
-        public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws Exception {
+        public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws Exception {
             req.bindJSON(TestDescribable.class, req.getSubmittedForm());
         }
 
diff --git a/test/src/test/java/jenkins/security/Security3030Test.java b/test/src/test/java/jenkins/security/Security3030Test.java
index 5e712bdc4e31..3363d7bb9aca 100644
--- a/test/src/test/java/jenkins/security/Security3030Test.java
+++ b/test/src/test/java/jenkins/security/Security3030Test.java
@@ -33,6 +33,7 @@
 import hudson.model.RootAction;
 import hudson.util.HttpResponses;
 import hudson.util.MultipartFormDataParser;
+import jakarta.servlet.ServletException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -42,7 +43,6 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Random;
-import javax.servlet.ServletException;
 import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException;
 import org.apache.commons.fileupload2.core.FileUploadException;
 import org.apache.commons.fileupload2.core.FileUploadFileCountLimitException;
@@ -56,57 +56,57 @@
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.RequestImpl;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.verb.POST;
 
 public class Security3030Test {
-    // TODO Consider parameterizing with Stapler (RequestImpl/StaplerRequestFormAction) + Jenkins (MultipartFormDataParser/MultipartFormDataParserAction)
+    // TODO Consider parameterizing with Stapler (RequestImpl/StaplerRequest2FormAction) + Jenkins (MultipartFormDataParser/MultipartFormDataParserAction)
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
     @Test
     public void fewFilesStapler() throws IOException {
-        assertSubmissionOK(StaplerRequestFormAction.instance(), 20, 10, 1024 * 1024);
-        assertSubmissionOK(StaplerRequestFormAction.instance(), 10, 41, 10);
+        assertSubmissionOK(StaplerRequest2FormAction.instance(), 20, 10, 1024 * 1024);
+        assertSubmissionOK(StaplerRequest2FormAction.instance(), 10, 41, 10);
     }
 
     @Test
     public void tooManyFilesStapler() throws Exception {
-        ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10, 1000, 20, FileUploadFileCountLimitException.class);
+        ServletException ex = assertSubmissionThrows(StaplerRequest2FormAction.instance(), 10, 1000, 20, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
-        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1000, 10, 10, FileUploadFileCountLimitException.class);
+        ex = assertSubmissionThrows(StaplerRequest2FormAction.instance(), 1000, 10, 10, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
         try (FieldValue v = withStaticField(RequestImpl.class, "FILEUPLOAD_MAX_FILES", 10_000)) {
-            assertSubmissionOK(StaplerRequestFormAction.instance(), 1000, 10, 10);
-            ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10_000, 10, 10, FileUploadFileCountLimitException.class);
+            assertSubmissionOK(StaplerRequest2FormAction.instance(), 1000, 10, 10);
+            ex = assertSubmissionThrows(StaplerRequest2FormAction.instance(), 10_000, 10, 10, FileUploadFileCountLimitException.class);
             assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
         }
-        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 10, 1000, 20, FileUploadFileCountLimitException.class);
+        ex = assertSubmissionThrows(StaplerRequest2FormAction.instance(), 10, 1000, 20, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
-        ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1000, 10, 10, FileUploadFileCountLimitException.class);
+        ex = assertSubmissionThrows(StaplerRequest2FormAction.instance(), 1000, 10, 10, FileUploadFileCountLimitException.class);
         assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES"));
     }
 
     @Test
     public void tooLargeFilesStapler() throws Exception {
-        assertSubmissionOK(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024);
+        assertSubmissionOK(StaplerRequest2FormAction.instance(), 1, 50, 10 * 1024 * 1024);
         try (FieldValue v = withStaticField(RequestImpl.class, "FILEUPLOAD_MAX_FILE_SIZE", 1024 * 1024)) {
-            assertSubmissionOK(StaplerRequestFormAction.instance(), 200, 100, 1024);
-            ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadByteCountLimitException.class);
+            assertSubmissionOK(StaplerRequest2FormAction.instance(), 200, 100, 1024);
+            ServletException ex = assertSubmissionThrows(StaplerRequest2FormAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadByteCountLimitException.class);
             assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILE_SIZE"));
         }
-        assertSubmissionOK(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024);
+        assertSubmissionOK(StaplerRequest2FormAction.instance(), 1, 50, 10 * 1024 * 1024);
     }
 
     @Test
     public void tooLargeSubmissionStapler() throws Exception {
-        assertSubmissionOK(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024);
+        assertSubmissionOK(StaplerRequest2FormAction.instance(), 1, 50, 10 * 1024 * 1024);
         try (FieldValue v = withStaticField(RequestImpl.class, "FILEUPLOAD_MAX_SIZE", 1024 * 1024)) {
-            assertSubmissionOK(StaplerRequestFormAction.instance(), 200, 100, 1024);
-            ServletException ex = assertSubmissionThrows(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadSizeException.class);
+            assertSubmissionOK(StaplerRequest2FormAction.instance(), 200, 100, 1024);
+            ServletException ex = assertSubmissionThrows(StaplerRequest2FormAction.instance(), 1, 50, 10 * 1024 * 1024, FileUploadSizeException.class);
             assertThat(ex.getMessage(), containsString(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_SIZE"));
         }
-        assertSubmissionOK(StaplerRequestFormAction.instance(), 1, 50, 10 * 1024 * 1024);
+        assertSubmissionOK(StaplerRequest2FormAction.instance(), 1, 50, 10 * 1024 * 1024);
     }
 
     @Test
@@ -265,7 +265,7 @@ public String getUrlName() {
         }
 
         @POST
-        public HttpResponse doSubmitMultipart(StaplerRequest req) throws FileUploadException, ServletException, IOException {
+        public HttpResponse doSubmitMultipart(StaplerRequest2 req) throws FileUploadException, ServletException, IOException {
             if (expectedWrapped == null) {
                 actualWrapped = null;
                 actual = null;
@@ -284,7 +284,7 @@ public HttpResponse doSubmitMultipart(StaplerRequest req) throws FileUploadExcep
             }
         }
 
-        private HttpResponse processMultipartAndUnwrap(StaplerRequest req) throws FileUploadException, ServletException, IOException {
+        private HttpResponse processMultipartAndUnwrap(StaplerRequest2 req) throws FileUploadException, ServletException, IOException {
             try {
                 return processMultipart(req);
             } catch (ServletException ex) {
@@ -298,7 +298,7 @@ private HttpResponse processMultipartAndUnwrap(StaplerRequest req) throws FileUp
             }
         }
 
-        protected abstract HttpResponse processMultipart(StaplerRequest req) throws ServletException, IOException;
+        protected abstract HttpResponse processMultipart(StaplerRequest2 req) throws ServletException, IOException;
 
         public void setExpectedWrapped(Class<? extends T> expectedWrapped) {
             this.expectedWrapped = expectedWrapped;
@@ -314,12 +314,12 @@ public ServletException getActual() {
     }
 
     @TestExtension
-    public static class StaplerRequestFormAction extends FileUploadAction<FileUploadException> {
-        public static StaplerRequestFormAction instance() {
-            return ExtensionList.lookupSingleton(StaplerRequestFormAction.class);
+    public static class StaplerRequest2FormAction extends FileUploadAction<FileUploadException> {
+        public static StaplerRequest2FormAction instance() {
+            return ExtensionList.lookupSingleton(StaplerRequest2FormAction.class);
         }
 
-        protected HttpResponse processMultipart(StaplerRequest req) throws ServletException, IOException {
+        protected HttpResponse processMultipart(StaplerRequest2 req) throws ServletException, IOException {
             req.getFileItem2("any-name");
             return HttpResponses.ok();
         }
@@ -331,7 +331,7 @@ public static MultipartFormDataParserAction instance() {
             return ExtensionList.lookupSingleton(MultipartFormDataParserAction.class);
         }
 
-        protected HttpResponse processMultipart(StaplerRequest req) throws ServletException {
+        protected HttpResponse processMultipart(StaplerRequest2 req) throws ServletException {
             new MultipartFormDataParser(req);
             return HttpResponses.ok();
         }
diff --git a/test/src/test/java/jenkins/security/Security3135Test.java b/test/src/test/java/jenkins/security/Security3135Test.java
index 358d4ae6c6c3..27ec5f8b0f61 100644
--- a/test/src/test/java/jenkins/security/Security3135Test.java
+++ b/test/src/test/java/jenkins/security/Security3135Test.java
@@ -14,8 +14,8 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 public class Security3135Test {
     public static final String ACTION_URL = "security3135";
@@ -72,7 +72,7 @@ public boolean isRequestMade() {
             return requestMade;
         }
 
-        public void doValidate(StaplerRequest request, StaplerResponse response) {
+        public void doValidate(StaplerRequest2 request, StaplerResponse2 response) {
             requestMade = true;
         }
     }
diff --git a/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java b/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java
index c0f6e95f0e57..cfc20a6bcb55 100644
--- a/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java
+++ b/test/src/test/java/jenkins/security/SuspiciousRequestFilterTest.java
@@ -8,8 +8,8 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.ExtensionList;
 import hudson.model.UnprotectedRootAction;
+import jakarta.servlet.http.HttpServletResponse;
 import java.net.URL;
-import javax.servlet.http.HttpServletResponse;
 import org.htmlunit.WebRequest;
 import org.htmlunit.WebResponse;
 import org.junit.Ignore;
diff --git a/test/src/test/java/jenkins/security/seed/UserSeedSecurityListenerTest.java b/test/src/test/java/jenkins/security/seed/UserSeedSecurityListenerTest.java
index 88e25398ff83..a5f48b49a860 100644
--- a/test/src/test/java/jenkins/security/seed/UserSeedSecurityListenerTest.java
+++ b/test/src/test/java/jenkins/security/seed/UserSeedSecurityListenerTest.java
@@ -27,7 +27,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
@@ -48,7 +48,7 @@ public void authenticateSecondaryUserWhileLoggedIn_shouldNotOverwritePrimaryUser
         AuthenticationManager authenticationManager = j.jenkins.getSecurityRealm().getSecurityComponents().manager2;
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.login("alice").executeOnServer(() -> {
-            HttpSession session = Stapler.getCurrentRequest().getSession();
+            HttpSession session = Stapler.getCurrentRequest2().getSession();
             String existingSeed = (String) session.getAttribute(UserSeedProperty.USER_SESSION_SEED);
             assertNotNull(existingSeed);
             authenticationManager.authenticate(new UsernamePasswordAuthenticationToken("bob", "bob"));
diff --git a/test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java b/test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java
index f808733d5d19..6ad9cd8e6eea 100644
--- a/test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java
+++ b/test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java
@@ -40,7 +40,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 
 @Issue("SECURITY-400")
@@ -99,7 +99,7 @@ public void valid() {
     }
 
     private static void replyOk() {
-        StaplerResponse resp = Stapler.getCurrentResponse();
+        StaplerResponse2 resp = Stapler.getCurrentResponse2();
         try {
             resp.getWriter().write("ok");
             resp.flushBuffer();
diff --git a/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java b/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java
index c6584f673e14..b79bed760d5b 100644
--- a/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java
+++ b/test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java
@@ -4,16 +4,16 @@
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.htmlunit.FailingHttpStatusCodeException;
@@ -36,8 +36,8 @@
 import org.kohsuke.stapler.RequestImpl;
 import org.kohsuke.stapler.ResponseImpl;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 import org.kohsuke.stapler.interceptor.RequirePOST;
@@ -111,17 +111,17 @@ public static class TestNewRulesOk extends AbstractUnprotectedRootAction {
          * Method signature
          */
 
-        public static void doStaticWithRequest(StaplerRequest request) { replyOk(); }
+        public static void doStaticWithRequest(StaplerRequest2 request) { replyOk(); }
 
-        public void doWithRequest(StaplerRequest request) { replyOk(); }
+        public void doWithRequest(StaplerRequest2 request) { replyOk(); }
 
         public void doWithHttpRequest(HttpServletRequest request) { replyOk(); }
 
         // the return type is not taken into consideration if it's not a HttpResponse, it will not prevent the method
         // to be considered as a web method
-        public String doWithRequestAndReturnString(StaplerRequest request) { return "ok"; }
+        public String doWithRequestAndReturnString(StaplerRequest2 request) { return "ok"; }
 
-        public void doWithResponse(StaplerResponse response) { replyOk(); }
+        public void doWithResponse(StaplerResponse2 response) { replyOk(); }
 
         public void doWithHttpResponse(HttpServletResponse response) { replyOk(); }
 
@@ -198,14 +198,14 @@ public Map<String, Object> doAnnotatedJsonResponse() {
          * Parameter annotation
          */
 
-        public void do_CallMeBecauseOfMyUnderscore(StaplerRequest request) { replyOk(); }
+        public void do_CallMeBecauseOfMyUnderscore(StaplerRequest2 request) { replyOk(); }
 
-        public void do$CallMeBecauseOfMyDollar(StaplerRequest request) { replyOk(); }
+        public void do$CallMeBecauseOfMyDollar(StaplerRequest2 request) { replyOk(); }
     }
 
     public static class HttpResponseChild implements HttpResponse {
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
             replyOk();
         }
     }
@@ -215,7 +215,7 @@ public abstract static class HttpResponseExceptionChild extends HttpResponses.Ht
 
     public static class ExceptionImplementingOnlyHttpResponse extends RuntimeException implements HttpResponse {
         @Override
-        public void generateResponse(StaplerRequest staplerRequest, StaplerResponse staplerResponse, Object o) throws IOException, ServletException {
+        public void generateResponse(StaplerRequest2 staplerRequest, StaplerResponse2 staplerResponse, Object o) throws IOException, ServletException {
             replyOk();
         }
     }
@@ -329,12 +329,12 @@ public void testAnnotatedMethodOk_annotatedRequirePost() throws Exception {
     public void testAnnotatedMethodOk_annotatedJavaScriptScriptMethod() throws Exception {
         webApp.setCrumbIssuer(new CrumbIssuer() {
             @Override
-            public String issueCrumb(StaplerRequest request) {
+            public String issueCrumb(StaplerRequest2 request) {
                 return "test";
             }
 
             @Override
-            public void validateCrumb(StaplerRequest request, String submittedCrumb) {
+            public void validateCrumb(StaplerRequest2 request, String submittedCrumb) {
                 // no exception thrown = validated
             }
         });
@@ -455,7 +455,7 @@ public void testSpecialCasesOk() throws Exception {
     @TestExtension
     public static class TestNewRulesNotOk extends AbstractUnprotectedRootAction {
         // do not respect the do[^a-z].* format
-        public void dontCallMeBecauseOfMyDont(StaplerRequest request) { replyOk(); }
+        public void dontCallMeBecauseOfMyDont(StaplerRequest2 request) { replyOk(); }
 
         // do not seem to be an expected web method, in case a developer has such methods,
         // addition of WebMethod annotation is sufficient
diff --git a/test/src/test/java/jenkins/security/stapler/DynamicTest.java b/test/src/test/java/jenkins/security/stapler/DynamicTest.java
index a413b1b3bd69..cee1474fface 100644
--- a/test/src/test/java/jenkins/security/stapler/DynamicTest.java
+++ b/test/src/test/java/jenkins/security/stapler/DynamicTest.java
@@ -13,7 +13,7 @@
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Issue("SECURITY-400")
 public class DynamicTest {
@@ -58,7 +58,7 @@ public HttpResponse doResponse2() {
             return null;
         }
 
-        public void doDynamic(StaplerRequest req) {
+        public void doDynamic(StaplerRequest2 req) {
             throw HttpResponses.errorWithoutStack(200, req.getRestOfPath());
         }
 
diff --git a/test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java b/test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java
index dbf2f5b16e44..7839ddaf7fa2 100644
--- a/test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java
+++ b/test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java
@@ -34,7 +34,7 @@
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class PreventRoutingTest extends StaplerAbstractTest {
 
@@ -105,7 +105,7 @@ public Renderable getLegitRoutable2() {
     }
 
     private static void notStaplerGetter(@NonNull Object o) {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         if (req != null) {
             List<Ancestor> ancestors = req.getAncestors();
             if (!ancestors.isEmpty() && ancestors.get(ancestors.size() - 1).getObject() == o) {
diff --git a/test/src/test/java/jenkins/security/stapler/Security400Test.java b/test/src/test/java/jenkins/security/stapler/Security400Test.java
index c2b64323c65e..3ce8826dea97 100644
--- a/test/src/test/java/jenkins/security/stapler/Security400Test.java
+++ b/test/src/test/java/jenkins/security/stapler/Security400Test.java
@@ -84,7 +84,7 @@ public class Security400Test {
 
     @Before
     public void prepareFilterListener() {
-        WebApp webApp = WebApp.get(j.jenkins.servletContext);
+        WebApp webApp = WebApp.get(j.jenkins.getServletContext());
         webApp.setFilteredDoActionTriggerListener((f, req, rsp, node) -> {
             filteredDoActionTriggered = true;
             return false;
diff --git a/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java b/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java
index b36b0de579be..a9f8cb2df164 100644
--- a/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java
+++ b/test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java
@@ -46,7 +46,7 @@
 import org.junit.ClassRule;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.WebMethod;
 
@@ -66,7 +66,7 @@ public void setUp() throws Exception {
         j = rule;
         j.jenkins.setCrumbIssuer(null);
 
-        this.webApp = (WebApp) j.jenkins.servletContext.getAttribute(WebApp.class.getName());
+        this.webApp = (WebApp) j.jenkins.getServletContext().getAttribute(WebApp.class.getName());
 
         webApp.setFilteredGetterTriggerListener((f, req, rst, node, expression) -> {
             filteredGetMethodTriggered = true;
@@ -134,7 +134,7 @@ public void doIndex() {
     //================================= utility methods =================================
 
     protected static void replyOk() {
-        StaplerResponse resp = Stapler.getCurrentResponse();
+        StaplerResponse2 resp = Stapler.getCurrentResponse2();
         try {
             resp.getWriter().write("ok");
             resp.flushBuffer();
diff --git a/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java b/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
index 0483b2825e43..2ebf2cbb5c1f 100644
--- a/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
+++ b/test/src/test/java/jenkins/security/stapler/StaplerDispatchValidatorTest.java
@@ -47,7 +47,7 @@ public class StaplerDispatchValidatorTest {
 
     @Before
     public void setUp() throws Exception {
-        StaplerDispatchValidator validator = StaplerDispatchValidator.getInstance(j.jenkins.servletContext);
+        StaplerDispatchValidator validator = StaplerDispatchValidator.getInstance(j.jenkins.getServletContext());
         try (InputStream whitelist = getClass().getResourceAsStream("StaplerDispatchValidatorTest/whitelist.txt")) {
             validator.loadWhitelist(whitelist);
         }
diff --git a/test/src/test/java/jenkins/security/stapler/StaplerRoutableActionTest.java b/test/src/test/java/jenkins/security/stapler/StaplerRoutableActionTest.java
index 02acda598ccc..15b6965ce9b2 100644
--- a/test/src/test/java/jenkins/security/stapler/StaplerRoutableActionTest.java
+++ b/test/src/test/java/jenkins/security/stapler/StaplerRoutableActionTest.java
@@ -6,7 +6,7 @@
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.WebMethod;
 
 @Issue("SECURITY-400")
@@ -29,7 +29,7 @@ public void doWebMethod3() throws HttpResponses.HttpResponseException {
             replyOk();
         }
 
-        public void doWebMethod4(StaplerRequest request) {
+        public void doWebMethod4(StaplerRequest2 request) {
             replyOk();
         }
 
diff --git a/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java b/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java
index 9e849a227864..9fed43b27781 100644
--- a/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java
+++ b/test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java
@@ -41,7 +41,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.WebMethod;
 
 @Issue("SECURITY-400")
@@ -224,30 +224,30 @@ public static class ActionWithWhitelist extends AbstractUnprotectedRootAction {
             return "do-action";
         }
 
-        public static String DO_ACTION_SIGNATURE = "method jenkins.security.stapler.StaticRoutingDecisionProviderTest$ActionWithWhitelist doAction org.kohsuke.stapler.StaplerRequest";
+        public static String DO_ACTION_SIGNATURE = "method jenkins.security.stapler.StaticRoutingDecisionProviderTest$ActionWithWhitelist doAction org.kohsuke.stapler.StaplerRequest2";
 
-        public void doAction(StaplerRequest request) {
+        public void doAction(StaplerRequest2 request) {
             replyOk();
         }
 
-        public static String DO_ACTION_STAPLER_ROUTABLE_SIGNATURE = "method jenkins.security.stapler.StaticRoutingDecisionProviderTest$ActionWithWhitelist doActionWithStaplerDispatchable org.kohsuke.stapler.StaplerRequest";
+        public static String DO_ACTION_STAPLER_ROUTABLE_SIGNATURE = "method jenkins.security.stapler.StaticRoutingDecisionProviderTest$ActionWithWhitelist doActionWithStaplerDispatchable org.kohsuke.stapler.StaplerRequest2";
 
         @StaplerDispatchable
-        public void doActionWithStaplerDispatchable(StaplerRequest request) {
+        public void doActionWithStaplerDispatchable(StaplerRequest2 request) {
             replyOk();
         }
 
-        public static String DO_ACTION_STAPLER_NONROUTABLE_SIGNATURE = "method jenkins.security.stapler.StaticRoutingDecisionProviderTest$ActionWithWhitelist doActionWithStaplerNotDispatchable org.kohsuke.stapler.StaplerRequest";
+        public static String DO_ACTION_STAPLER_NONROUTABLE_SIGNATURE = "method jenkins.security.stapler.StaticRoutingDecisionProviderTest$ActionWithWhitelist doActionWithStaplerNotDispatchable org.kohsuke.stapler.StaplerRequest2";
 
         @StaplerNotDispatchable
-        public void doActionWithStaplerNotDispatchable(StaplerRequest request) {
+        public void doActionWithStaplerNotDispatchable(StaplerRequest2 request) {
             replyOk();
         }
 
-        public static String DO_ACTION_STAPLER_WEBMETHOD_SIGNATURE = "method jenkins.security.stapler.StaticRoutingDecisionProviderTest$ActionWithWhitelist doActionWithWebMethod org.kohsuke.stapler.StaplerRequest";
+        public static String DO_ACTION_STAPLER_WEBMETHOD_SIGNATURE = "method jenkins.security.stapler.StaticRoutingDecisionProviderTest$ActionWithWhitelist doActionWithWebMethod org.kohsuke.stapler.StaplerRequest2";
 
         @WebMethod(name = "actionWithWebMethod")
-        public void doActionWithWebMethod(StaplerRequest request) {
+        public void doActionWithWebMethod(StaplerRequest2 request) {
             replyOk();
         }
     }
diff --git a/test/src/test/java/jenkins/security/stapler/TypedFilterTest.java b/test/src/test/java/jenkins/security/stapler/TypedFilterTest.java
index fdebee225bad..ac0ea1bf155d 100644
--- a/test/src/test/java/jenkins/security/stapler/TypedFilterTest.java
+++ b/test/src/test/java/jenkins/security/stapler/TypedFilterTest.java
@@ -4,7 +4,7 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.StaplerProxy;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Issue("SECURITY-400")
 public class TypedFilterTest extends StaplerAbstractTest {
@@ -48,7 +48,7 @@ public void getTarget_withArg_isNotRoutableWithStaplerNotDispatchable() throws E
 
     @TestExtension
     public static class GetTarget4 extends AbstractUnprotectedRootAction {
-        public Renderable getTarget(StaplerRequest req) {
+        public Renderable getTarget(StaplerRequest2 req) {
             return new Renderable();
         }
     }
@@ -98,7 +98,7 @@ public void getStaplerFallback_withArg_isNotRoutableWithStaplerNotDispatchable()
 
     @TestExtension
     public static class GetStaplerFallback4 extends AbstractUnprotectedRootAction {
-        public Renderable getStaplerFallback(StaplerRequest req) {
+        public Renderable getStaplerFallback(StaplerRequest2 req) {
             return new Renderable();
         }
     }
@@ -203,7 +203,7 @@ public void getDynamic_withArgStartingWithString_isRoutable() throws Exception {
 
     @TestExtension
     public static class GetDynamic3 extends AbstractUnprotectedRootAction {
-        public Renderable getDynamic(StaplerRequest req, String someArgs) {
+        public Renderable getDynamic(StaplerRequest2 req, String someArgs) {
             return new Renderable();
         }
     }
@@ -216,7 +216,7 @@ public void getDynamic_withArgNotStartingWithString_isNotRoutable() throws Excep
 
     @TestExtension
     public static class GetDynamic4 extends AbstractUnprotectedRootAction {
-        public Renderable getDynamic(StaplerRequest req) {
+        public Renderable getDynamic(StaplerRequest2 req) {
             return new Renderable();
         }
     }
diff --git a/test/src/test/java/jenkins/telemetry/TelemetryTest.java b/test/src/test/java/jenkins/telemetry/TelemetryTest.java
index f465fdf2fd8a..701ffa7e4d0e 100644
--- a/test/src/test/java/jenkins/telemetry/TelemetryTest.java
+++ b/test/src/test/java/jenkins/telemetry/TelemetryTest.java
@@ -15,6 +15,10 @@
 import hudson.ExtensionList;
 import hudson.model.UnprotectedRootAction;
 import hudson.security.csrf.CrumbExclusion;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
@@ -26,10 +30,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONObject;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.IOUtils;
@@ -39,8 +39,8 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 public class TelemetryTest {
     @Rule
@@ -304,7 +304,7 @@ public boolean process(HttpServletRequest request, HttpServletResponse response,
 
     @TestExtension
     public static class TelemetryReceiver implements UnprotectedRootAction {
-        public void doEvents(StaplerRequest request, StaplerResponse response) throws IOException {
+        public void doEvents(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
             StringWriter sw = new StringWriter();
             IOUtils.copy(request.getInputStream(), sw, StandardCharsets.UTF_8);
             JSONObject json = JSONObject.fromObject(sw.toString());
diff --git a/test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java b/test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java
index e39d906ff51b..461588cd3480 100644
--- a/test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java
+++ b/test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java
@@ -30,6 +30,10 @@
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
 import hudson.security.csrf.CrumbExclusion;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -38,17 +42,13 @@
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class FullDuplexHttpServiceTest {
 
@@ -83,7 +83,7 @@ public String getUrlName() {
         public HttpResponse doIndex() {
             return new FullDuplexHttpService.Response(duplexServices) {
                 @Override
-                protected FullDuplexHttpService createService(StaplerRequest req, UUID uuid) throws IOException, InterruptedException {
+                protected FullDuplexHttpService createService(StaplerRequest2 req, UUID uuid) throws IOException, InterruptedException {
                     return new FullDuplexHttpService(uuid) {
                         @Override
                         protected void run(InputStream upload, OutputStream download) throws IOException, InterruptedException {
diff --git a/test/src/test/java/jenkins/util/SystemPropertiesTest.java b/test/src/test/java/jenkins/util/SystemPropertiesTest.java
index d0b498f88e57..d29655b765ac 100644
--- a/test/src/test/java/jenkins/util/SystemPropertiesTest.java
+++ b/test/src/test/java/jenkins/util/SystemPropertiesTest.java
@@ -28,8 +28,8 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
 
-import javax.servlet.ServletContextEvent;
-import org.eclipse.jetty.ee8.webapp.WebAppContext;
+import jakarta.servlet.ServletContextEvent;
+import org.eclipse.jetty.ee9.webapp.WebAppContext;
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Assume;
@@ -49,7 +49,7 @@ public class SystemPropertiesTest {
 
     @Before
     public void setUp() {
-        new SystemProperties.Listener().contextInitialized(new ServletContextEvent(j.jenkins.servletContext));
+        new SystemProperties.Listener().contextInitialized(new ServletContextEvent(j.jenkins.getServletContext()));
     }
 
     @After
@@ -103,7 +103,7 @@ public void shouldReturnWebAppPropertyIfSystemPropertyNotSetAndDefaultIsSet() th
      * @param value value of the property
      */
     protected void setWebAppInitParameter(String property, String value) {
-        Assume.assumeThat(j.jenkins.servletContext, Matchers.instanceOf(WebAppContext.Context.class));
-        ((WebAppContext.Context) j.jenkins.servletContext).getContextHandler().getInitParams().put(property, value);
+        Assume.assumeThat(j.jenkins.getServletContext(), Matchers.instanceOf(WebAppContext.Context.class));
+        ((WebAppContext.Context) j.jenkins.getServletContext()).getContextHandler().getInitParams().put(property, value);
     }
 }
diff --git a/test/src/test/java/lib/form/AdvancedButtonTest.java b/test/src/test/java/lib/form/AdvancedButtonTest.java
index 9d19a00c05f0..9b41fd1df8f4 100644
--- a/test/src/test/java/lib/form/AdvancedButtonTest.java
+++ b/test/src/test/java/lib/form/AdvancedButtonTest.java
@@ -16,7 +16,7 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  *
@@ -54,7 +54,7 @@ public String getUrlName() {
             return "self";
         }
 
-        public FormValidation doSubmitNestedOptionalBlock(StaplerRequest req) throws Exception {
+        public FormValidation doSubmitNestedOptionalBlock(StaplerRequest2 req) throws Exception {
             JSONObject f = req.getSubmittedForm();
             assertEquals("avalue", f.getString("a"));
             assertEquals("bvalue", f.getString("b"));
diff --git a/test/src/test/java/lib/form/BooleanRadioTest.java b/test/src/test/java/lib/form/BooleanRadioTest.java
index 185acee61d96..072937f157a2 100644
--- a/test/src/test/java/lib/form/BooleanRadioTest.java
+++ b/test/src/test/java/lib/form/BooleanRadioTest.java
@@ -16,7 +16,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class BooleanRadioTest {
 
@@ -46,7 +46,7 @@ public static final class DescriptorImpl extends Descriptor<BooleanRadioTestDesc
 
     @TestExtension
     public static final class RootActionImpl extends InvisibleAction implements RootAction {
-        public FormValidation doSubmitTest1(StaplerRequest req) throws Exception {
+        public FormValidation doSubmitTest1(StaplerRequest2 req) throws Exception {
             JSONObject f = req.getSubmittedForm();
             System.out.println(f);
             BooleanRadioTestDescribable r = req.bindJSON(BooleanRadioTestDescribable.class, f);
diff --git a/test/src/test/java/lib/form/DropdownListTest.java b/test/src/test/java/lib/form/DropdownListTest.java
index 6ae425d3629c..e8ec382de4f0 100644
--- a/test/src/test/java/lib/form/DropdownListTest.java
+++ b/test/src/test/java/lib/form/DropdownListTest.java
@@ -10,7 +10,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -33,7 +33,7 @@ public String getUrlName() {
             return "self";
         }
 
-        public FormValidation doSubmitTest1(StaplerRequest req) throws Exception {
+        public FormValidation doSubmitTest1(StaplerRequest2 req) throws Exception {
             JSONObject f = req.getSubmittedForm();
             System.out.println(f);
             return FormValidation.ok();
diff --git a/test/src/test/java/lib/form/EnumSetTest.java b/test/src/test/java/lib/form/EnumSetTest.java
index 2b3289254513..c63a9341c13b 100644
--- a/test/src/test/java/lib/form/EnumSetTest.java
+++ b/test/src/test/java/lib/form/EnumSetTest.java
@@ -15,7 +15,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -46,7 +46,7 @@ public static final class DescriptorImpl extends Descriptor<EnumSetTestDescribab
 
     @TestExtension
     public static final class RootActionImpl extends InvisibleAction implements RootAction {
-        public FormValidation doSubmitTest1(StaplerRequest req) throws Exception {
+        public FormValidation doSubmitTest1(StaplerRequest2 req) throws Exception {
             JSONObject f = req.getSubmittedForm();
             System.out.println(f);
             EnumSetTestDescribable r = req.bindJSON(EnumSetTestDescribable.class, f);
diff --git a/test/src/test/java/lib/form/EnumTest.java b/test/src/test/java/lib/form/EnumTest.java
index 5f37deecafe5..92fecd3c300f 100644
--- a/test/src/test/java/lib/form/EnumTest.java
+++ b/test/src/test/java/lib/form/EnumTest.java
@@ -17,7 +17,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class EnumTest {
     @Rule
@@ -61,7 +61,7 @@ public static class Form extends InvisibleAction implements RootAction, Describa
         public BallColor enum1 = BallColor.YELLOW;
         public BallColor enum2 = null;
 
-        public void doSubmitForm(StaplerRequest req) throws Exception {
+        public void doSubmitForm(StaplerRequest2 req) throws Exception {
             JSONObject json = req.getSubmittedForm();
             System.out.println(json);
         }
diff --git a/test/src/test/java/lib/form/ExpandableTextboxTest.java b/test/src/test/java/lib/form/ExpandableTextboxTest.java
index 5e40ea263b30..52dda457594f 100644
--- a/test/src/test/java/lib/form/ExpandableTextboxTest.java
+++ b/test/src/test/java/lib/form/ExpandableTextboxTest.java
@@ -53,7 +53,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.WebMethod;
 import org.w3c.dom.NodeList;
 
@@ -147,7 +147,7 @@ public String getUrlName() {
         }
 
         @WebMethod(name = "submit")
-        public HttpResponse doSubmit(StaplerRequest request) {
+        public HttpResponse doSubmit(StaplerRequest2 request) {
             return HttpResponses.plainText("method:" + request.getMethod());
         }
     }
diff --git a/test/src/test/java/lib/form/NameRefTest.java b/test/src/test/java/lib/form/NameRefTest.java
index b343d6e46fde..b1980745931b 100644
--- a/test/src/test/java/lib/form/NameRefTest.java
+++ b/test/src/test/java/lib/form/NameRefTest.java
@@ -33,7 +33,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Tests the handling of @nameRef in the form tree.
@@ -50,7 +50,7 @@ public class NameRefTest {
 
     public static class JenkinsRuleWithJelly extends JenkinsRule {
 
-        public HttpResponse doSubmitTest1(StaplerRequest req) throws Exception {
+        public HttpResponse doSubmitTest1(StaplerRequest2 req) throws Exception {
             JSONObject f = req.getSubmittedForm();
             f.remove("Submit");
             System.out.println(f);
diff --git a/test/src/test/java/lib/form/PasswordTest.java b/test/src/test/java/lib/form/PasswordTest.java
index e71fb93f8e8b..facb1d7418df 100644
--- a/test/src/test/java/lib/form/PasswordTest.java
+++ b/test/src/test/java/lib/form/PasswordTest.java
@@ -84,7 +84,7 @@
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.springframework.security.core.Authentication;
 
 public class PasswordTest {
@@ -244,7 +244,7 @@ public static class DescriptorImpl extends JobPropertyDescriptor {
             static String checkedSecret;
 
             public FormValidation doCheckSecret(@QueryParameter String value) {
-                StaplerRequest req = Stapler.getCurrentRequest();
+                StaplerRequest2 req = Stapler.getCurrentRequest2();
                 incomingURL = req.getRequestURIWithQueryString();
                 System.err.println("processing " + incomingURL + " via " + req.getMethod() + ": " + value);
                 checkedSecret = value;
diff --git a/test/src/test/java/lib/form/RepeatableTest.java b/test/src/test/java/lib/form/RepeatableTest.java
index 56dd22430811..996132434cae 100644
--- a/test/src/test/java/lib/form/RepeatableTest.java
+++ b/test/src/test/java/lib/form/RepeatableTest.java
@@ -55,7 +55,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Alan.Harder@sun.com
@@ -658,7 +658,7 @@ public DescriptorExtensionList<Fruit, Descriptor<Fruit>> getFruitDescriptors() {
             return Jenkins.get().getDescriptorList(Fruit.class);
         }
 
-        public void doSubmitTest(StaplerRequest req) throws Exception {
+        public void doSubmitTest(StaplerRequest2 req) throws Exception {
             formData = req.getSubmittedForm();
             if (bindClass != null) {
                 bindResult = req.bindJSONToList(bindClass, formData.get("items"));
diff --git a/test/src/test/java/lib/form/RowSetTest.java b/test/src/test/java/lib/form/RowSetTest.java
index cb24e173038a..b775b24d77e2 100644
--- a/test/src/test/java/lib/form/RowSetTest.java
+++ b/test/src/test/java/lib/form/RowSetTest.java
@@ -11,7 +11,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -28,7 +28,7 @@ public void json() throws Exception {
 
     @TestExtension
     public static class Subject extends InvisibleAction implements RootAction {
-        public void doSubmitTest1(StaplerRequest req) throws Exception {
+        public void doSubmitTest1(StaplerRequest2 req) throws Exception {
             JSONObject json = req.getSubmittedForm();
             json.remove(CrumbIssuer.DEFAULT_CRUMB_NAME);
             json.remove("Submit");
diff --git a/test/src/test/java/lib/form/RowVisibilityGroupTest.java b/test/src/test/java/lib/form/RowVisibilityGroupTest.java
index 6b090cc28dbe..6508193392c3 100644
--- a/test/src/test/java/lib/form/RowVisibilityGroupTest.java
+++ b/test/src/test/java/lib/form/RowVisibilityGroupTest.java
@@ -25,7 +25,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Tests the 'rowvg-start' and 'rowvg-end' CSS attributes and their effects.
@@ -162,7 +162,7 @@ public static final class RootActionImpl extends InvisibleAction implements Desc
         public Drink drink;
         private Beer beer;
 
-        public void doSubmitTest2(StaplerRequest req) throws Exception {
+        public void doSubmitTest2(StaplerRequest2 req) throws Exception {
             JSONObject json = req.getSubmittedForm();
             System.out.println(json);
             beer = (Beer) req.bindJSON(Drink.class, json.getJSONObject("drink"));
diff --git a/test/src/test/java/lib/form/ValidateButtonTest.java b/test/src/test/java/lib/form/ValidateButtonTest.java
index da9bc286be14..675795a6e323 100644
--- a/test/src/test/java/lib/form/ValidateButtonTest.java
+++ b/test/src/test/java/lib/form/ValidateButtonTest.java
@@ -56,7 +56,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  *
@@ -214,7 +214,7 @@ public static final class DescriptorImpl extends Descriptor<NoInjectionArePossib
             public String paramMethod = "validateInjection";
             public String paramWith = null;
 
-            public void doValidateInjection(StaplerRequest request) {
+            public void doValidateInjection(StaplerRequest2 request) {
                 wasCalled = true;
             }
         }
@@ -267,7 +267,7 @@ public static class ValidateProperty extends JobProperty<Job<?, ?>> {
         public static class DescriptorImpl extends JobPropertyDescriptor {
             public boolean called = false;
 
-            public void doSomething(StaplerRequest req) {
+            public void doSomething(StaplerRequest2 req) {
                 called = true;
             }
         }
diff --git a/test/src/test/java/lib/layout/ConfirmationLinkTest.java b/test/src/test/java/lib/layout/ConfirmationLinkTest.java
index 42a52cc3c6e8..dca6f81f73f2 100644
--- a/test/src/test/java/lib/layout/ConfirmationLinkTest.java
+++ b/test/src/test/java/lib/layout/ConfirmationLinkTest.java
@@ -46,7 +46,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.WebMethod;
 
 public class ConfirmationLinkTest {
@@ -202,7 +202,7 @@ public String getUrlName() {
         }
 
         @WebMethod(name = "submit")
-        public HttpResponse doSubmit(StaplerRequest request) {
+        public HttpResponse doSubmit(StaplerRequest2 request) {
             return HttpResponses.plainText("method:" + request.getMethod());
         }
     }
diff --git a/test/src/test/java/lib/layout/StopButtonTest.java b/test/src/test/java/lib/layout/StopButtonTest.java
index e29aa99c7198..79c0d0ee68b5 100644
--- a/test/src/test/java/lib/layout/StopButtonTest.java
+++ b/test/src/test/java/lib/layout/StopButtonTest.java
@@ -42,7 +42,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.WebMethod;
 
 public class StopButtonTest {
@@ -143,7 +143,7 @@ public static class TestRootAction implements UnprotectedRootAction {
         }
 
         @WebMethod(name = "submit")
-        public HttpResponse doSubmit(StaplerRequest request) {
+        public HttpResponse doSubmit(StaplerRequest2 request) {
             return HttpResponses.plainText("method:" + request.getMethod());
         }
     }
diff --git a/test/src/test/java/lib/layout/TaskTest.java b/test/src/test/java/lib/layout/TaskTest.java
index 4e6918d2be0a..9dfac80a1c4a 100644
--- a/test/src/test/java/lib/layout/TaskTest.java
+++ b/test/src/test/java/lib/layout/TaskTest.java
@@ -27,8 +27,8 @@
 import static org.junit.Assert.assertTrue;
 
 import hudson.model.UnprotectedRootAction;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import org.htmlunit.html.HtmlElementUtil;
 import org.htmlunit.html.HtmlPage;
 import org.junit.Rule;
@@ -36,8 +36,8 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.JenkinsRule.WebClient;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class TaskTest {
@@ -56,7 +56,7 @@ public class TaskTest {
     public static class MockAction implements UnprotectedRootAction {
         private boolean called = false;
 
-        @RequirePOST public void doPost(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
+        @RequirePOST public void doPost(StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
             if (called) throw new AssertionError();
             called = true;
             rsp.forwardToPreviousPage(req);
diff --git a/test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java b/test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java
index cf8b1eee4fcc..2e9e9c1c793b 100644
--- a/test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java
+++ b/test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java
@@ -25,16 +25,16 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.mockito.Mockito;
 
 /**
- * Mocked version of {@link StaplerRequest}.
+ * Mocked version of {@link StaplerRequest2}.
  * @author Oleg Nenashev
  */
 public class MockStaplerRequestBuilder {
@@ -66,7 +66,7 @@ public MockStaplerRequestBuilder withAncestor(AncestorImpl ancestor) {
         return this;
     }
 
-    public StaplerRequest build() {
+    public StaplerRequest2 build() {
         HttpServletRequest rawRequest = Mockito.mock(HttpServletRequest.class);
         return new RequestImpl(stapler != null ? stapler : new Stapler(), rawRequest, ancestors, tokens);
     }
diff --git a/test/src/test/java/org/kohsuke/stapler/Security1097Test.java b/test/src/test/java/org/kohsuke/stapler/Security1097Test.java
index 650304e5bc40..28e63811e712 100644
--- a/test/src/test/java/org/kohsuke/stapler/Security1097Test.java
+++ b/test/src/test/java/org/kohsuke/stapler/Security1097Test.java
@@ -6,11 +6,11 @@
 import hudson.Extension;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
+import jakarta.servlet.ServletException;
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
 import java.util.Arrays;
 import java.util.List;
-import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.html.HtmlPage;
@@ -74,7 +74,7 @@ public String getUrlName() {
         }
 
         /* Deliberate CSRF vulnerability */
-        public void doConfigSubmit1(StaplerRequest req) throws ServletException {
+        public void doConfigSubmit1(StaplerRequest2 req) throws ServletException {
             req.getSubmittedForm();
         }
 
diff --git a/war/pom.xml b/war/pom.xml
index 3772fa834be2..383906f31b8f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -87,12 +87,7 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
-      <artifactId>websocket-jetty10</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.main</groupId>
-      <artifactId>websocket-jetty12-ee8</artifactId>
+      <artifactId>websocket-jetty12-ee9</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -161,13 +156,22 @@ THE SOFTWARE.
                     <exclude>org.jenkins-ci:commons-jelly</exclude>
                     <exclude>org.jenkins-ci.main:cli</exclude>
                     <exclude>org.jenkins-ci.main:jenkins-core</exclude>
-                    <exclude>org.jenkins-ci.main:websocket-jetty10</exclude>
-                    <exclude>org.jenkins-ci.main:websocket-jetty12-ee8</exclude>
+                    <exclude>org.jenkins-ci.main:websocket-jetty12-ee9</exclude>
                     <exclude>org.jenkins-ci.main:websocket-spi</exclude>
+                    <exclude>org.jvnet.hudson:commons-jelly-tags-define</exclude>
                     <exclude>org.jvnet.winp:winp</exclude>
                     <exclude>org.kohsuke.stapler:stapler</exclude>
                     <exclude>org.kohsuke.stapler:stapler-groovy</exclude>
                     <exclude>org.kohsuke.stapler:stapler-jelly</exclude>
+                    <exclude>org.springframework.security:spring-security-core</exclude>
+                    <exclude>org.springframework.security:spring-security-crypto</exclude>
+                    <exclude>org.springframework.security:spring-security-web</exclude>
+                    <exclude>org.springframework:spring-aop</exclude>
+                    <exclude>org.springframework:spring-beans</exclude>
+                    <exclude>org.springframework:spring-context</exclude>
+                    <exclude>org.springframework:spring-core</exclude>
+                    <exclude>org.springframework:spring-expression</exclude>
+                    <exclude>org.springframework:spring-web</exclude>
                   </excludes>
                 </enforceBytecodeVersion>
               </rules>
@@ -636,8 +640,8 @@ THE SOFTWARE.
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.eclipse.jetty.ee8</groupId>
-        <artifactId>jetty-ee8-maven-plugin</artifactId>
+        <groupId>org.eclipse.jetty.ee9</groupId>
+        <artifactId>jetty-ee9-maven-plugin</artifactId>
         <version>12.0.12</version>
         <configuration>
           <!--
diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml
deleted file mode 100644
index 5147b02b81d6..000000000000
--- a/websocket/jetty10/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-The MIT License
-
-Copyright (c) 2019, CloudBees, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.jenkins-ci.main</groupId>
-    <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <artifactId>websocket-jetty10</artifactId>
-  <name>Jetty 10 implementation for WebSocket</name>
-  <description>An implementation of the WebSocket handler that works with Jetty 10.</description>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.jenkins-ci.main</groupId>
-        <artifactId>jenkins-bom</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jenkins-ci</groupId>
-      <artifactId>winstone</artifactId>
-      <version>6.21</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.main</groupId>
-      <artifactId>websocket-spi</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.kohsuke</groupId>
-      <artifactId>access-modifier-annotation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kohsuke.metainf-services</groupId>
-      <artifactId>metainf-services</artifactId>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/websocket/jetty10/src/main/java/jenkins/websocket/Jetty10Provider.java b/websocket/jetty10/src/main/java/jenkins/websocket/Jetty10Provider.java
deleted file mode 100644
index b5243e627f52..000000000000
--- a/websocket/jetty10/src/main/java/jenkins/websocket/Jetty10Provider.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright 2022 CloudBees, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package jenkins.websocket;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.WebSocketListener;
-import org.eclipse.jetty.websocket.api.WriteCallback;
-import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
-import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
-import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
-import org.kohsuke.MetaInfServices;
-import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.NoExternalUse;
-
-@Restricted(NoExternalUse.class)
-@MetaInfServices(Provider.class)
-public class Jetty10Provider implements Provider {
-
-    /**
-     * Number of seconds a WebsocketConnection may stay idle until it expires.
-     * Zero to disable.
-     * This value must be higher than the <code>jenkins.websocket.pingInterval</code>.
-     * Per <a href=https://www.eclipse.org/jetty/documentation/jetty-10/programming-guide/index.html#pg-websocket-session-ping>Jetty 10 documentation</a>
-     * a ping mechanism should keep the websocket active. Therefore, the idle timeout must be higher than the ping
-     * interval to avoid timeout issues.
-     */
-    private static long IDLE_TIMEOUT_SECONDS = Long.getLong("jenkins.websocket.idleTimeout", 60L);
-
-    private static final String ATTR_LISTENER = Jetty10Provider.class.getName() + ".listener";
-
-    private boolean initialized = false;
-
-    public Jetty10Provider() {
-        JettyWebSocketServerContainer.class.hashCode();
-    }
-
-    private void init(HttpServletRequest req) {
-        if (!initialized) {
-            JettyWebSocketServerContainer.getContainer(req.getServletContext()).setIdleTimeout(Duration.ofSeconds(IDLE_TIMEOUT_SECONDS));
-            initialized = true;
-        }
-    }
-
-    @Override
-    public Handler handle(HttpServletRequest req, HttpServletResponse rsp, Listener listener) throws Exception {
-        init(req);
-        req.setAttribute(ATTR_LISTENER, listener);
-        // TODO Jetty 10 has no obvious equivalent to WebSocketServerFactory.isUpgradeRequest; RFC6455Negotiation?
-        if (!"websocket".equalsIgnoreCase(req.getHeader("Upgrade"))) {
-            rsp.sendError(HttpServletResponse.SC_BAD_REQUEST, "only WS connections accepted here");
-            return null;
-        }
-        if (!JettyWebSocketServerContainer.getContainer(req.getServletContext()).upgrade(Jetty10Provider::createWebSocket, req, rsp)) {
-            rsp.sendError(HttpServletResponse.SC_BAD_REQUEST, "did not manage to upgrade");
-            return null;
-        }
-        return new Handler() {
-            @Override
-            public Future<Void> sendBinary(ByteBuffer data) throws IOException {
-                CompletableFuture<Void> f = new CompletableFuture<>();
-                session().getRemote().sendBytes(data, new WriteCallbackImpl(f));
-                return f;
-            }
-
-            @Override
-            public void sendBinary(ByteBuffer partialByte, boolean isLast) throws IOException {
-                session().getRemote().sendPartialBytes(partialByte, isLast);
-            }
-
-            @Override
-            public Future<Void> sendText(String text) throws IOException {
-                CompletableFuture<Void> f = new CompletableFuture<>();
-                session().getRemote().sendString(text, new WriteCallbackImpl(f));
-                return f;
-            }
-
-            @Override
-            public Future<Void> sendPing(ByteBuffer applicationData) throws IOException {
-                CompletableFuture<Void> f = new CompletableFuture<>();
-                session().getRemote().sendPing(applicationData, new WriteCallbackImpl(f));
-                return f;
-            }
-
-            @Override
-            public void close() throws IOException {
-                session().close();
-            }
-
-            private Session session() {
-                Session session = (Session) listener.getProviderSession();
-                if (session == null) {
-                    throw new IllegalStateException("missing session");
-                }
-                return session;
-            }
-        };
-    }
-
-    private static final class WriteCallbackImpl implements WriteCallback {
-        private final CompletableFuture<Void> f;
-
-        WriteCallbackImpl(CompletableFuture<Void> f) {
-            this.f = f;
-        }
-
-        @Override
-        public void writeSuccess() {
-            f.complete(null);
-        }
-
-        @Override
-        public void writeFailed(Throwable x) {
-            f.completeExceptionally(x);
-        }
-    }
-
-    private static Object createWebSocket(JettyServerUpgradeRequest req, JettyServerUpgradeResponse resp) {
-        Listener listener = (Listener) req.getHttpServletRequest().getAttribute(ATTR_LISTENER);
-        if (listener == null) {
-            throw new IllegalStateException("missing listener attribute");
-        }
-        return new WebSocketListener() {
-            @Override
-            public void onWebSocketBinary(byte[] payload, int offset, int length) {
-                listener.onWebSocketBinary(payload, offset, length);
-            }
-
-            @Override
-            public void onWebSocketText(String message) {
-                listener.onWebSocketText(message);
-            }
-
-            @Override
-            public void onWebSocketClose(int statusCode, String reason) {
-                listener.onWebSocketClose(statusCode, reason);
-            }
-
-            @Override
-            public void onWebSocketConnect(Session session) {
-                listener.onWebSocketConnect(session);
-            }
-
-            @Override
-            public void onWebSocketError(Throwable cause) {
-                listener.onWebSocketError(cause);
-            }
-        };
-    }
-
-}
diff --git a/websocket/jetty12-ee8/pom.xml b/websocket/jetty12-ee9/pom.xml
similarity index 95%
rename from websocket/jetty12-ee8/pom.xml
rename to websocket/jetty12-ee9/pom.xml
index 9a7a9ca94545..2253163b3c4c 100644
--- a/websocket/jetty12-ee8/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -32,9 +32,9 @@ THE SOFTWARE.
     <relativePath>../..</relativePath>
   </parent>
 
-  <artifactId>websocket-jetty12-ee8</artifactId>
-  <name>Jetty 12 (EE 8) implementation for WebSocket</name>
-  <description>An implementation of the WebSocket handler that works with Jetty 12 (EE 8).</description>
+  <artifactId>websocket-jetty12-ee9</artifactId>
+  <name>Jetty 12 (EE 9) implementation for WebSocket</name>
+  <description>An implementation of the WebSocket handler that works with Jetty 12 (EE 9).</description>
 
   <dependencyManagement>
     <dependencies>
diff --git a/websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java b/websocket/jetty12-ee9/src/main/java/jenkins/websocket/Jetty12EE9Provider.java
similarity index 90%
rename from websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java
rename to websocket/jetty12-ee9/src/main/java/jenkins/websocket/Jetty12EE9Provider.java
index cc006b180f26..bf6ff9671056 100644
--- a/websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java
+++ b/websocket/jetty12-ee9/src/main/java/jenkins/websocket/Jetty12EE9Provider.java
@@ -24,26 +24,26 @@
 
 package jenkins.websocket;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.eclipse.jetty.ee8.websocket.api.Session;
-import org.eclipse.jetty.ee8.websocket.api.WebSocketListener;
-import org.eclipse.jetty.ee8.websocket.api.WriteCallback;
-import org.eclipse.jetty.ee8.websocket.server.JettyServerUpgradeRequest;
-import org.eclipse.jetty.ee8.websocket.server.JettyServerUpgradeResponse;
-import org.eclipse.jetty.ee8.websocket.server.JettyWebSocketServerContainer;
+import org.eclipse.jetty.ee9.websocket.api.Session;
+import org.eclipse.jetty.ee9.websocket.api.WebSocketListener;
+import org.eclipse.jetty.ee9.websocket.api.WriteCallback;
+import org.eclipse.jetty.ee9.websocket.server.JettyServerUpgradeRequest;
+import org.eclipse.jetty.ee9.websocket.server.JettyServerUpgradeResponse;
+import org.eclipse.jetty.ee9.websocket.server.JettyWebSocketServerContainer;
 import org.kohsuke.MetaInfServices;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 @Restricted(NoExternalUse.class)
 @MetaInfServices(Provider.class)
-public class Jetty12EE8Provider implements Provider {
+public class Jetty12EE9Provider implements Provider {
 
     /**
      * Number of seconds a WebsocketConnection may stay idle until it expires.
@@ -55,11 +55,11 @@ public class Jetty12EE8Provider implements Provider {
      */
     private static long IDLE_TIMEOUT_SECONDS = Long.getLong("jenkins.websocket.idleTimeout", 60L);
 
-    private static final String ATTR_LISTENER = Jetty12EE8Provider.class.getName() + ".listener";
+    private static final String ATTR_LISTENER = Jetty12EE9Provider.class.getName() + ".listener";
 
     private boolean initialized = false;
 
-    public Jetty12EE8Provider() {
+    public Jetty12EE9Provider() {
         JettyWebSocketServerContainer.class.hashCode();
     }
 
@@ -79,7 +79,7 @@ public Handler handle(HttpServletRequest req, HttpServletResponse rsp, Listener
             rsp.sendError(HttpServletResponse.SC_BAD_REQUEST, "only WS connections accepted here");
             return null;
         }
-        if (!JettyWebSocketServerContainer.getContainer(req.getServletContext()).upgrade(Jetty12EE8Provider::createWebSocket, req, rsp)) {
+        if (!JettyWebSocketServerContainer.getContainer(req.getServletContext()).upgrade(Jetty12EE9Provider::createWebSocket, req, rsp)) {
             rsp.sendError(HttpServletResponse.SC_BAD_REQUEST, "did not manage to upgrade");
             return null;
         }
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index a99aada6a446..178413f92c8e 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -52,7 +52,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
+      <version>5.0.0</version>
     </dependency>
   </dependencies>
 
diff --git a/websocket/spi/src/main/java/jenkins/websocket/Provider.java b/websocket/spi/src/main/java/jenkins/websocket/Provider.java
index 19f50f1eaf26..fdb8ec408011 100644
--- a/websocket/spi/src/main/java/jenkins/websocket/Provider.java
+++ b/websocket/spi/src/main/java/jenkins/websocket/Provider.java
@@ -24,11 +24,11 @@
 
 package jenkins.websocket;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.Future;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * Defines a way for Jenkins core to serve WebSocket connections.

From 48b9b17167f779dcd814f1e6bdf3b087374fcb15 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 15:01:12 -0700
Subject: [PATCH 387/449] Update dependency postcss to v8.4.42 (#9686)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 71015ede4105..136c093feaa8 100644
--- a/war/package.json
+++ b/war/package.json
@@ -37,7 +37,7 @@
     "globals": "15.9.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.1",
-    "postcss": "8.4.41",
+    "postcss": "8.4.42",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "10.0.2",
     "postcss-scss": "4.0.9",
diff --git a/war/yarn.lock b/war/yarn.lock
index 62ea2de5f6b4..e4cade1d015f 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4393,7 +4393,7 @@ __metadata:
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.1"
-    postcss: "npm:8.4.41"
+    postcss: "npm:8.4.42"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:10.0.2"
     postcss-scss: "npm:4.0.9"
@@ -6073,14 +6073,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.41, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
-  version: 8.4.41
-  resolution: "postcss@npm:8.4.41"
+"postcss@npm:8.4.42, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
+  version: 8.4.42
+  resolution: "postcss@npm:8.4.42"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/c1828fc59e7ec1a3bf52b3a42f615dba53c67960ed82a81df6441b485fe43c20aba7f4e7c55425762fd99c594ecabbaaba8cf5b30fd79dfec5b52a9f63a2d690
+  checksum: 10c0/ac4dd01b07b2b9db12c24284aed497d35436ed05e4944be6cf00eb8daa4914fd9fbc5ec729e47981b4f1a9c51847d043d1808c796b9440ae0c5e8ff7a29bc821
   languageName: node
   linkType: hard
 

From 307f680c69f79fa9c879eecf18c7429cd9b06846 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 3 Sep 2024 16:24:20 -0700
Subject: [PATCH 388/449] Disable newly-added flaky test (#9687)

---
 test/src/test/java/hudson/cli/CLIActionTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/src/test/java/hudson/cli/CLIActionTest.java b/test/src/test/java/hudson/cli/CLIActionTest.java
index dab7ec8a88ad..ebda2dec5855 100644
--- a/test/src/test/java/hudson/cli/CLIActionTest.java
+++ b/test/src/test/java/hudson/cli/CLIActionTest.java
@@ -43,6 +43,7 @@
 import org.apache.commons.io.input.NullInputStream;
 import org.apache.commons.io.output.CountingOutputStream;
 import org.apache.commons.io.output.TeeOutputStream;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -135,7 +136,7 @@ private void assertExitCode(int code, boolean useApiToken, File jar, String... a
         assertEquals(code, proc.join());
     }
 
-    @Test public void authenticationFailed() throws Exception {
+    @Ignore("TODO flaky test") @Test public void authenticationFailed() throws Exception {
         j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
         j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy().grant(Jenkins.ADMINISTER).everywhere().toAuthenticated());
         var jar = tmp.newFile("jenkins-cli.jar");

From e00445fe2b01c1594049aee369cd007c4bac87f6 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:22:06 +0000
Subject: [PATCH 389/449] [maven-release-plugin] prepare release jenkins-2.475

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 6 +++---
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty12-ee9/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index cd55b58d52c9..b34d5f257057 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.475</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6309811a2e8b..0d0b35e35ccf 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.475</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 9bff5e5ad0b2..6763f06aa7db 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.475</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..20af8c548927 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.475</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 47a9714fef3c..00aee21f0917 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.475</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.475</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.475</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-27T13:51:01Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-04T09:02:38Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 229c19fe390e..2f165a105cc1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.475</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 383906f31b8f..0385fba75129 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.475</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index 2253163b3c4c..afc4bec32810 100644
--- a/websocket/jetty12-ee9/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.475</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 178413f92c8e..635e320f8b00 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.475</version>
     <relativePath>../..</relativePath>
   </parent>
 

From daadfbdd22ed9acd39554df776926bd16f8be6e6 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:22:25 +0000
Subject: [PATCH 390/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 8 ++++----
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty12-ee9/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index b34d5f257057..cd55b58d52c9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.475</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 0d0b35e35ccf..6309811a2e8b 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.475</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 6763f06aa7db..9bff5e5ad0b2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.475</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 20af8c548927..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.475</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 00aee21f0917..25d55bf7eef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.475</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.475</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.475</revision>
+    <revision>2.476</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-09-04T09:02:38Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-04T12:22:06Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 2f165a105cc1..229c19fe390e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.475</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 0385fba75129..383906f31b8f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.475</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index afc4bec32810..2253163b3c4c 100644
--- a/websocket/jetty12-ee9/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.475</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 635e320f8b00..178413f92c8e 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.475</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 828c26e6109121afa10bb130944eeda3488b3f11 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 18:20:57 -0700
Subject: [PATCH 391/449] Update dependency postcss to v8.4.43 (#9690)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 136c093feaa8..968a82ac8c30 100644
--- a/war/package.json
+++ b/war/package.json
@@ -37,7 +37,7 @@
     "globals": "15.9.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.1",
-    "postcss": "8.4.42",
+    "postcss": "8.4.43",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "10.0.2",
     "postcss-scss": "4.0.9",
diff --git a/war/yarn.lock b/war/yarn.lock
index e4cade1d015f..b2e9807a0b5a 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4393,7 +4393,7 @@ __metadata:
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.1"
-    postcss: "npm:8.4.42"
+    postcss: "npm:8.4.43"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:10.0.2"
     postcss-scss: "npm:4.0.9"
@@ -6073,14 +6073,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.42, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
-  version: 8.4.42
-  resolution: "postcss@npm:8.4.42"
+"postcss@npm:8.4.43, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
+  version: 8.4.43
+  resolution: "postcss@npm:8.4.43"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/ac4dd01b07b2b9db12c24284aed497d35436ed05e4944be6cf00eb8daa4914fd9fbc5ec729e47981b4f1a9c51847d043d1808c796b9440ae0c5e8ff7a29bc821
+  checksum: 10c0/7cc9c6393ca00fcdca6fef8d119218df9357389b9fed30b6d4b463fc0e85159595a877f4ac0a2a565ea4c447cab1f424e527e68d8b7d40b8c94a6684663d45c5
   languageName: node
   linkType: hard
 

From d2f17f5e25b84d69d723903ce407f12a6e01ee1a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 18:21:28 -0700
Subject: [PATCH 392/449] Update dependency io.jenkins.plugins:checks-api to
 v2.2.1 (#9689)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index 383906f31b8f..bcf7761ac7cd 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -339,7 +339,7 @@ THE SOFTWARE.
                   <!-- dependency of junit -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>checks-api</artifactId>
-                  <version>2.2.0</version>
+                  <version>2.2.1</version>
                   <type>hpi</type>
                 </artifactItem>
 

From aa59e99fb01c5533917bf3d56c37e61985e50162 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 07:09:17 +0100
Subject: [PATCH 393/449] Update dependency sortablejs to v1.15.3 (#9691)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 968a82ac8c30..d1b75fd991b8 100644
--- a/war/package.json
+++ b/war/package.json
@@ -57,7 +57,7 @@
     "hotkeys-js": "3.12.2",
     "jquery": "3.7.1",
     "lodash": "4.17.21",
-    "sortablejs": "1.15.2",
+    "sortablejs": "1.15.3",
     "tippy.js": "6.3.7",
     "window-handle": "1.0.1"
   },
diff --git a/war/yarn.lock b/war/yarn.lock
index b2e9807a0b5a..6b256c9820fd 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4400,7 +4400,7 @@ __metadata:
     prettier: "npm:3.3.3"
     sass: "npm:1.77.8"
     sass-loader: "npm:16.0.1"
-    sortablejs: "npm:1.15.2"
+    sortablejs: "npm:1.15.3"
     style-loader: "npm:4.0.0"
     stylelint: "npm:16.9.0"
     stylelint-checkstyle-reporter: "npm:1.0.0"
@@ -6515,10 +6515,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sortablejs@npm:1.15.2":
-  version: 1.15.2
-  resolution: "sortablejs@npm:1.15.2"
-  checksum: 10c0/9b9101f47a46976070f1e7ab45d1850a8754f6e71252506868731292af46a7f1a3add03914fe074cd2a6bdfe8cd6cad149cfa260fe8a53475f5306ae679bf38c
+"sortablejs@npm:1.15.3":
+  version: 1.15.3
+  resolution: "sortablejs@npm:1.15.3"
+  checksum: 10c0/dfd79a7dd7041fe1080d58d2191cd4df62cfc9912bbb4069f295fb2c5f23eb31112931614faddce7011d30fe784d26af3416c94182e02bcf4f6274509b60242e
   languageName: node
   linkType: hard
 

From c530f2d4162e3d1e75395dc63b215ddb65318063 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:42:14 +0100
Subject: [PATCH 394/449] Update dependency postcss to v8.4.44 (#9694)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index d1b75fd991b8..eaff5bc9f2f6 100644
--- a/war/package.json
+++ b/war/package.json
@@ -37,7 +37,7 @@
     "globals": "15.9.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.1",
-    "postcss": "8.4.43",
+    "postcss": "8.4.44",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "10.0.2",
     "postcss-scss": "4.0.9",
diff --git a/war/yarn.lock b/war/yarn.lock
index 6b256c9820fd..db4b4cb95f84 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4393,7 +4393,7 @@ __metadata:
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.1"
-    postcss: "npm:8.4.43"
+    postcss: "npm:8.4.44"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:10.0.2"
     postcss-scss: "npm:4.0.9"
@@ -6073,14 +6073,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.43, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
-  version: 8.4.43
-  resolution: "postcss@npm:8.4.43"
+"postcss@npm:8.4.44, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
+  version: 8.4.44
+  resolution: "postcss@npm:8.4.44"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/7cc9c6393ca00fcdca6fef8d119218df9357389b9fed30b6d4b463fc0e85159595a877f4ac0a2a565ea4c447cab1f424e527e68d8b7d40b8c94a6684663d45c5
+  checksum: 10c0/53c33338261a3d4f4198f8893e9dfe8b828d8d9186142ee85f02d228f04245c5bbe31239411a357a556ad20ed96f28db24d0921d63edc428fdc9133289371a1d
   languageName: node
   linkType: hard
 

From c517470d3ae2112e35166d0cf35ab7071a6ab7e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 11:05:31 -0700
Subject: [PATCH 395/449] Update jenkins/ath Docker tag to v5967 (#9692)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 6890d5908ab6..57d58a29b664 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5957.v7c0e2f7ca_63e
+export ATH_VERSION=5967.v93f5d2201526
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From db5121061c90fee5c0387e7bd2cf49fe74b31bc7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 14:19:06 -0700
Subject: [PATCH 396/449] Update jenkins/ath Docker tag to v5968 (#9699)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 57d58a29b664..28aefd42b4c4 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5967.v93f5d2201526
+export ATH_VERSION=5968.v180888e51761
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From 15a6eeea16049283d4caa59aadc888baf51bf686 Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Fri, 6 Sep 2024 14:54:46 +0100
Subject: [PATCH 397/449] pass the docker group to the container so it can run
 docker tests (#9701)

The ATH image no longer SUIDs the docker executable but relies on
permissions of the docker.sock.
This was needed to allow test-containers based tests to run as this uses
the socket directly rather than relying on the docker cli.

cf: https://github.com/jenkinsci/acceptance-test-harness/pull/1706
---
 ath.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ath.sh b/ath.sh
index 28aefd42b4c4..45427edd5214 100644
--- a/ath.sh
+++ b/ath.sh
@@ -26,11 +26,15 @@ fi
 mkdir -p target/ath-reports
 chmod a+rwx target/ath-reports
 
+# obtain the groupId to grant to access the docker socket to run tests needing docker
+dockergid=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock)
+
 exec docker run --rm \
 	--env JDK \
 	--env ATH_VERSION \
 	--env BROWSER \
 	--shm-size 2g `# avoid selenium.WebDriverException exceptions like 'Failed to decode response from marionette' and webdriver closed` \
+	--group-add ${dockergid} \
 	--volume "$(pwd)"/war/target/jenkins.war:/jenkins.war:ro \
 	--volume /var/run/docker.sock:/var/run/docker.sock:rw \
 	--volume "$(pwd)"/target/ath-reports:/reports:rw \

From 6b85060d4aa438964cfeeacca322bc03c4fe866d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:19:11 -0700
Subject: [PATCH 398/449] Update dependency
 org.eclipse.jetty.ee9:jetty-ee9-maven-plugin to v12.0.13 (#9700)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/renovate.json | 2 +-
 pom.xml               | 4 ++--
 war/pom.xml           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 1f023c99f4f5..1de5552206ed 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -36,7 +36,7 @@
       ],
       "enabled": false,
       "matchPackageNames": [
-        "org.eclipse.jetty:jetty-maven-plugin",
+        "org.eclipse.jetty.ee9:jetty-ee9-maven-plugin",
         "org.jenkins-ci:winstone"
       ]
     },
diff --git a/pom.xml b/pom.xml
index 25d55bf7eef4..86e2ff541a3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,8 +96,8 @@ THE SOFTWARE.
     <antlr.version>4.13.2</antlr.version>
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
-    <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
-    <winstone.version>8.0</winstone.version>
+    <!-- Make sure to keep the jetty-ee9-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
+    <winstone.version>8.1</winstone.version>
   </properties>
 
   <!--
diff --git a/war/pom.xml b/war/pom.xml
index bcf7761ac7cd..937b8e72a5e5 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -574,7 +574,7 @@ THE SOFTWARE.
             </configuration>
           </execution>
           <execution>
-            <!-- see jetty-maven-plugin config and WebAppMain -->
+            <!-- see jetty-ee9-maven-plugin config and WebAppMain -->
             <id>support-log-formatter</id>
             <goals>
               <goal>copy</goal>
@@ -642,7 +642,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.eclipse.jetty.ee9</groupId>
         <artifactId>jetty-ee9-maven-plugin</artifactId>
-        <version>12.0.12</version>
+        <version>12.0.13</version>
         <configuration>
           <!--
             Reload webapp when you hit ENTER. (See JETTY-282 for more)

From 6e7335e411fbfb66047a4836fa1ef7b789a29225 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 7 Sep 2024 12:34:06 +0100
Subject: [PATCH 399/449] Update dependency sass to v1.78.0 (#9703)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index eaff5bc9f2f6..0f1be4f025eb 100644
--- a/war/package.json
+++ b/war/package.json
@@ -42,7 +42,7 @@
     "postcss-preset-env": "10.0.2",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.3",
-    "sass": "1.77.8",
+    "sass": "1.78.0",
     "sass-loader": "16.0.1",
     "style-loader": "4.0.0",
     "stylelint": "16.9.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index db4b4cb95f84..5eadb6fbe076 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4398,7 +4398,7 @@ __metadata:
     postcss-preset-env: "npm:10.0.2"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.3"
-    sass: "npm:1.77.8"
+    sass: "npm:1.78.0"
     sass-loader: "npm:16.0.1"
     sortablejs: "npm:1.15.3"
     style-loader: "npm:4.0.0"
@@ -6356,16 +6356,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.77.8":
-  version: 1.77.8
-  resolution: "sass@npm:1.77.8"
+"sass@npm:1.78.0":
+  version: 1.78.0
+  resolution: "sass@npm:1.78.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/2bfd62794070352c804f949e69bd8bb5b4ec846deeb924251b2c3f7b503170fb1ae186f513f0166907749eb34e0277dee747edcb78c886fb471aac01be1e864c
+  checksum: 10c0/6577a87c00b03a5a50f3a11b4b6592f28abce34e61812e381535a3b712151bd94db3ca06467d20395431e0f38a23f99e616d6859d771fb6d4617c359f590c48c
   languageName: node
   linkType: hard
 

From 525a8be453ea0c4adc83a102eebc74d1de13dfcf Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Sat, 7 Sep 2024 20:19:01 +0100
Subject: [PATCH 400/449] Disable dependents toggle in plugin manager with
 system read (#9463)

---
 .../resources/hudson/PluginManager/_table.js  |  33 +++---
 .../hudson/PluginManager/installed.jelly      | 109 +++++++++---------
 2 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/core/src/main/resources/hudson/PluginManager/_table.js b/core/src/main/resources/hudson/PluginManager/_table.js
index 8174fa1e833d..4806c3f573bb 100644
--- a/core/src/main/resources/hudson/PluginManager/_table.js
+++ b/core/src/main/resources/hudson/PluginManager/_table.js
@@ -504,24 +504,27 @@ window.addEventListener("load", function () {
     });
   });
 
-  // Enable/disable the 'Update' button depending on if any updates are checked
-  const anyCheckboxesSelected = () => {
-    return (
-      document.querySelectorAll("input[type='checkbox']:checked:not(:disabled)")
-        .length > 0
-    );
-  };
   const updateButton = document.querySelector("#button-update");
-  const checkboxes = document.querySelectorAll(
-    "input[type='checkbox'], [data-select], .jenkins-table__checkbox",
-  );
-  checkboxes.forEach((checkbox) => {
-    checkbox.addEventListener("click", () => {
-      setTimeout(() => {
-        updateButton.disabled = !anyCheckboxesSelected();
+  if (updateButton) {
+    // Enable/disable the 'Update' button depending on if any updates are checked
+    const anyCheckboxesSelected = () => {
+      return (
+        document.querySelectorAll(
+          "input[type='checkbox']:checked:not(:disabled)",
+        ).length > 0
+      );
+    };
+    const checkboxes = document.querySelectorAll(
+      "input[type='checkbox'], [data-select], .jenkins-table__checkbox",
+    );
+    checkboxes.forEach((checkbox) => {
+      checkbox.addEventListener("click", () => {
+        setTimeout(() => {
+          updateButton.disabled = !anyCheckboxesSelected();
+        });
       });
     });
-  });
+  }
 
   // Show update center error if element exists
   const updateCenterError = document.querySelector("#update-center-error");
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
index 3c3ee43e0193..951e0cf2877d 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.jelly
+++ b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -99,6 +99,13 @@ THE SOFTWARE.
                         </span>
                       </a>
                     </div>
+                    <j:if test="${p.hasMandatoryDependencies()}">
+                      <div class="dependency-list">
+                        <j:forEach var="dependency" items="${p.mandatoryDependencies}">
+                          <span data-plugin-id="${dependency.shortName}" />
+                        </j:forEach>
+                      </div>
+                    </j:if>
                     <div class="jenkins-!-margin-top-1">
                       <j:set var="indexPage" value="${p.indexPage.toString()}"/>
                       <j:set var="excerpt"
@@ -170,56 +177,52 @@ THE SOFTWARE.
                   <l:isAdmin>
                     <td class="jenkins-table__cell--tight">
                       <div class="jenkins-table__cell__button-wrapper">
-                        <j:if test="${p.downgradable}">
-                          <form method="post"
-                                class="jenkins-buttons-row"
-                                action="${rootURL}/updateCenter/plugin/${p.shortName}/downgrade">
-                            <button class="jenkins-button jenkins-button--tertiary jenkins-!-color-orange"
-                                    style="padding: 0.5rem"
-                                    tooltip="${%downgradeTo(p.backupVersion)}">
-                              <l:icon src="symbol-downgrade-circle"/>
-                              <span style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 60px;">
-                                ${p.backupVersion}
-                              </span>
-                            </button>
-                          </form>
-                        </j:if>
+                          <j:if test="${p.downgradable}">
+                            <form method="post"
+                                  class="jenkins-buttons-row"
+                                  action="${rootURL}/updateCenter/plugin/${p.shortName}/downgrade">
+                              <button class="jenkins-button jenkins-button--tertiary jenkins-!-color-orange"
+                                      style="padding: 0.5rem"
+                                      tooltip="${%downgradeTo(p.backupVersion)}">
+                                <l:icon src="symbol-downgrade-circle"/>
+                                <span
+                                    style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 60px;">
+                                  ${p.backupVersion}
+                                </span>
+                              </button>
+                            </form>
+                          </j:if>
                       </div>
                     </td>
-                    <td class="jenkins-table__cell--tight uninstall">
-                      <div class="jenkins-table__cell__button-wrapper">
-                        <j:choose>
-                          <j:when test="${p.isDeleted()}">
-                            <p>${%Uninstallation pending}</p>
-                          </j:when>
-                          <j:otherwise>
-                            <j:if test="${p.hasMandatoryDependents() or p.hasImpliedDependents()}">
-                              <div class="dependent-list">
-                                <j:forEach var="dependent" items="${p.mandatoryDependents}">
-                                  <span data-plugin-id="${dependent}"></span>
-                                </j:forEach>
-                                <j:set var="impliedDependents" value="${p.impliedDependents}"/>
-                                <j:choose>
-                                  <j:when test="${impliedDependents.size() lt 15}">
-                                    <j:forEach var="dependent" items="${impliedDependents}">
-                                      <span data-plugin-id="${dependent}"></span>
-                                    </j:forEach>
-                                  </j:when>
-                                  <j:otherwise>
-                                    <p>
-                                      ${%detached-many-dependents(impliedDependents.size())}
-                                    </p>
-                                  </j:otherwise>
-                                </j:choose>
-                              </div>
-                            </j:if>
-                            <j:if test="${p.hasMandatoryDependencies()}">
-                              <div class="dependency-list">
-                                <j:forEach var="dependency" items="${p.mandatoryDependencies}">
-                                  <span data-plugin-id="${dependency.shortName}"></span>
-                                </j:forEach>
-                              </div>
-                            </j:if>
+                  </l:isAdmin>
+                  <td class="jenkins-table__cell--tight uninstall ${readOnlyMode and !p.isDeleted() ? 'jenkins-hidden' : ''}">
+                    <div class="jenkins-table__cell__button-wrapper">
+                      <j:choose>
+                        <j:when test="${p.isDeleted()}">
+                          <p>${%Uninstallation pending}</p>
+                        </j:when>
+                        <j:otherwise>
+                          <j:if test="${p.hasMandatoryDependents() or p.hasImpliedDependents()}">
+                            <div class="dependent-list">
+                              <j:forEach var="dependent" items="${p.mandatoryDependents}">
+                                <span data-plugin-id="${dependent}" />
+                              </j:forEach>
+                              <j:set var="impliedDependents" value="${p.impliedDependents}"/>
+                              <j:choose>
+                                <j:when test="${impliedDependents.size() lt 15}">
+                                  <j:forEach var="dependent" items="${impliedDependents}">
+                                    <span data-plugin-id="${dependent}" />
+                                  </j:forEach>
+                                </j:when>
+                                <j:otherwise>
+                                  <p>
+                                    ${%detached-many-dependents(impliedDependents.size())}
+                                  </p>
+                                </j:otherwise>
+                              </j:choose>
+                            </div>
+                          </j:if>
+                          <l:isAdmin>
                             <button data-action="uninstall"
                                     type="button"
                                     class="jenkins-button jenkins-button--tertiary jenkins-!-destructive-color"
@@ -228,11 +231,11 @@ THE SOFTWARE.
                                     data-message="${%uninstall-title(p.updateInfo.displayName ?: p.displayName)}">
                               <l:icon src="symbol-close-circle"/>
                             </button>
-                          </j:otherwise>
-                        </j:choose>
-                      </div>
-                    </td>
-                  </l:isAdmin>
+                          </l:isAdmin>
+                        </j:otherwise>
+                      </j:choose>
+                    </div>
+                  </td>
                 </tr>
               </j:forEach>
               <!-- failed ones -->

From c05d756096ae6a5db750d88521c4548c1653018f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 7 Sep 2024 13:01:01 -0700
Subject: [PATCH 401/449] Update dependency postcss to v8.4.45 (#9704)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/war/package.json b/war/package.json
index 0f1be4f025eb..1adda658dd6b 100644
--- a/war/package.json
+++ b/war/package.json
@@ -37,7 +37,7 @@
     "globals": "15.9.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.1",
-    "postcss": "8.4.44",
+    "postcss": "8.4.45",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "10.0.2",
     "postcss-scss": "4.0.9",
diff --git a/war/yarn.lock b/war/yarn.lock
index 5eadb6fbe076..f12c358b3dac 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4393,7 +4393,7 @@ __metadata:
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.1"
-    postcss: "npm:8.4.44"
+    postcss: "npm:8.4.45"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:10.0.2"
     postcss-scss: "npm:4.0.9"
@@ -6073,14 +6073,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.44, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
-  version: 8.4.44
-  resolution: "postcss@npm:8.4.44"
+"postcss@npm:8.4.45, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
+  version: 8.4.45
+  resolution: "postcss@npm:8.4.45"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.1"
     source-map-js: "npm:^1.2.0"
-  checksum: 10c0/53c33338261a3d4f4198f8893e9dfe8b828d8d9186142ee85f02d228f04245c5bbe31239411a357a556ad20ed96f28db24d0921d63edc428fdc9133289371a1d
+  checksum: 10c0/ad6f8b9b1157d678560373696109745ab97a947d449f8a997acac41c7f1e4c0f3ca4b092d6df1387f430f2c9a319987b1780dbdc27e35800a88cde9b606c1e8f
   languageName: node
   linkType: hard
 

From 2431b7c9b328b0bc883cfb9f9a0c52b6e9cfb79c Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Mon, 9 Sep 2024 17:13:20 +0200
Subject: [PATCH 402/449] [JENKINS-72988] validate displayname against items in
 the same ItemGroup (#9152)

Co-authored-by: Kris Stern <krisstern@outlook.com>
---
 .../hudson/model/TopLevelItemDescriptor.java  |  2 +-
 core/src/main/java/jenkins/model/Jenkins.java | 41 ++++++++++++++++---
 .../test/java/jenkins/model/JenkinsTest.java  | 20 ++++-----
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
index 817c1194a3d5..b6177005c2d2 100644
--- a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
+++ b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
@@ -293,6 +293,6 @@ public static ExtensionList<TopLevelItemDescriptor> all() {
 
     @Restricted(NoExternalUse.class)
     public FormValidation doCheckDisplayNameOrNull(@AncestorInPath TopLevelItem item, @QueryParameter String value) {
-        return Jenkins.get().doCheckDisplayName(value, item.getName());
+        return Jenkins.get().checkDisplayName(value, item);
     }
 }
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 6b3500e6b66a..3c756bbb7ba0 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -5372,8 +5372,9 @@ public View getStaplerFallback() {
      * job that the user is configuring though to prevent a validation warning
      * if the user sets the displayName to what it currently is.
      */
-    boolean isDisplayNameUnique(String displayName, String currentJobName) {
-        Collection<TopLevelItem> itemCollection = items.values();
+    boolean isDisplayNameUnique(ItemGroup<?> itemGroup, String displayName, String currentJobName) {
+
+        Collection<TopLevelItem> itemCollection = (Collection<TopLevelItem>) itemGroup.getItems(t -> t instanceof TopLevelItem);
 
         // if there are a lot of projects, we'll have to store their
         // display names in a HashSet or something for a quick check
@@ -5397,8 +5398,8 @@ else if (displayName.equals(item.getDisplayName())) {
      * @param name The name to test
      * @param currentJobName The name of the job that the user is configuring
      */
-    boolean isNameUnique(String name, String currentJobName) {
-        Item item = getItem(name);
+    boolean isNameUnique(ItemGroup<?> itemGroup, String name, String currentJobName) {
+        Item item = itemGroup.getItem(name);
 
         if (null == item) {
             // the candidate name didn't return any items so the name is unique
@@ -5420,17 +5421,45 @@ else if (item.getName().equals(currentJobName)) {
      * existing display names or project names
      * @param displayName The display name to test
      * @param jobName The name of the job the user is configuring
+     *
+     * @deprecated use {@link TopLevelItemDescriptor#doCheckDisplayNameOrNull(TopLevelItem, String)}
      */
+    @Deprecated
     public FormValidation doCheckDisplayName(@QueryParameter String displayName,
             @QueryParameter String jobName) {
         displayName = displayName.trim();
 
         LOGGER.fine(() -> "Current job name is " + jobName);
 
-        if (!isNameUnique(displayName, jobName)) {
+        if (!isNameUnique(this, displayName, jobName)) {
+            return FormValidation.warning(Messages.Jenkins_CheckDisplayName_NameNotUniqueWarning(displayName));
+        }
+        else if (!isDisplayNameUnique(this, displayName, jobName)) {
+            return FormValidation.warning(Messages.Jenkins_CheckDisplayName_DisplayNameNotUniqueWarning(displayName));
+        }
+        else {
+            return FormValidation.ok();
+        }
+    }
+
+    /**
+     * Checks to see if the candidate displayName collides with any
+     * existing display names or project names in the items parent group
+     * @param displayName The display name to test
+     * @param item The item to check for duplicates
+     */
+    @Restricted(NoExternalUse.class)
+    public FormValidation checkDisplayName(String displayName,
+                                           TopLevelItem item) {
+        displayName = displayName.trim();
+        String jobName = item.getName();
+
+        LOGGER.fine(() -> "Current job name is " + jobName);
+
+        if (!isNameUnique(item.getParent(), displayName, jobName)) {
             return FormValidation.warning(Messages.Jenkins_CheckDisplayName_NameNotUniqueWarning(displayName));
         }
-        else if (!isDisplayNameUnique(displayName, jobName)) {
+        else if (!isDisplayNameUnique(item.getParent(), displayName, jobName)) {
             return FormValidation.warning(Messages.Jenkins_CheckDisplayName_DisplayNameNotUniqueWarning(displayName));
         }
         else {
diff --git a/test/src/test/java/jenkins/model/JenkinsTest.java b/test/src/test/java/jenkins/model/JenkinsTest.java
index a8d846c5d79b..c44b12cdd037 100644
--- a/test/src/test/java/jenkins/model/JenkinsTest.java
+++ b/test/src/test/java/jenkins/model/JenkinsTest.java
@@ -203,8 +203,8 @@ public void testIsDisplayNameUniqueTrue() throws Exception {
         p.setDisplayName("displayName");
 
         Jenkins jenkins = Jenkins.get();
-        assertTrue(jenkins.isDisplayNameUnique("displayName1", curJobName));
-        assertTrue(jenkins.isDisplayNameUnique(jobName, curJobName));
+        assertTrue(jenkins.isDisplayNameUnique(jenkins, "displayName1", curJobName));
+        assertTrue(jenkins.isDisplayNameUnique(jenkins, jobName, curJobName));
     }
 
     @Test
@@ -220,7 +220,7 @@ public void testIsDisplayNameUniqueFalse() throws Exception {
         p.setDisplayName(displayName);
 
         Jenkins jenkins = Jenkins.get();
-        assertFalse(jenkins.isDisplayNameUnique(displayName, curJobName));
+        assertFalse(jenkins.isDisplayNameUnique(jenkins, displayName, curJobName));
     }
 
     @Test
@@ -233,7 +233,7 @@ public void testIsDisplayNameUniqueSameAsCurrentJob() throws Exception {
 
         Jenkins jenkins = Jenkins.get();
         // should be true as we don't test against the current job
-        assertTrue(jenkins.isDisplayNameUnique(displayName, curJobName));
+        assertTrue(jenkins.isDisplayNameUnique(jenkins, displayName, curJobName));
     }
 
     @Test
@@ -244,7 +244,7 @@ public void testIsNameUniqueTrue() throws Exception {
         j.createFreeStyleProject(jobName);
 
         Jenkins jenkins = Jenkins.get();
-        assertTrue(jenkins.isNameUnique("jobName1", curJobName));
+        assertTrue(jenkins.isNameUnique(jenkins, "jobName1", curJobName));
     }
 
     @Test
@@ -255,7 +255,7 @@ public void testIsNameUniqueFalse() throws Exception {
         j.createFreeStyleProject(jobName);
 
         Jenkins jenkins = Jenkins.get();
-        assertFalse(jenkins.isNameUnique(jobName, curJobName));
+        assertFalse(jenkins.isNameUnique(jenkins, jobName, curJobName));
     }
 
     @Test
@@ -267,7 +267,7 @@ public void testIsNameUniqueSameAsCurrentJob() throws Exception {
 
         Jenkins jenkins = Jenkins.get();
         // true because we don't test against the current job
-        assertTrue(jenkins.isNameUnique(curJobName, curJobName));
+        assertTrue(jenkins.isNameUnique(jenkins, curJobName, curJobName));
     }
 
     @Test
@@ -281,7 +281,7 @@ public void testDoCheckDisplayNameUnique() throws Exception {
         p.setDisplayName("displayName");
 
         Jenkins jenkins = Jenkins.get();
-        FormValidation v = jenkins.doCheckDisplayName("1displayName", curJobName);
+        FormValidation v = jenkins.checkDisplayName("1displayName", curProject);
         assertEquals(FormValidation.ok(), v);
     }
 
@@ -297,7 +297,7 @@ public void testDoCheckDisplayNameSameAsDisplayName() throws Exception {
         p.setDisplayName(displayName);
 
         Jenkins jenkins = Jenkins.get();
-        FormValidation v = jenkins.doCheckDisplayName(displayName, curJobName);
+        FormValidation v = jenkins.checkDisplayName(displayName, curProject);
         assertEquals(FormValidation.Kind.WARNING, v.kind);
     }
 
@@ -313,7 +313,7 @@ public void testDoCheckDisplayNameSameAsJobName() throws Exception {
         p.setDisplayName(displayName);
 
         Jenkins jenkins = Jenkins.get();
-        FormValidation v = jenkins.doCheckDisplayName(jobName, curJobName);
+        FormValidation v = jenkins.checkDisplayName(jobName, curProject);
         assertEquals(FormValidation.Kind.WARNING, v.kind);
     }
 

From 4334aa0723ba6fbb99b3f6a580dc2f1df3b0262e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Jes=C3=BAs=20Alejo=20Sillero?=
 <juanjesusalejosillero@gmail.com>
Date: Mon, 9 Sep 2024 17:13:51 +0200
Subject: [PATCH 403/449] fix(i18n): correct typo in Spanish translation for
 'Preparation' (#9702)

---
 .../model/UpdateCenter/ConnectionCheckJob/row_es.properties     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/hudson/model/UpdateCenter/ConnectionCheckJob/row_es.properties b/core/src/main/resources/hudson/model/UpdateCenter/ConnectionCheckJob/row_es.properties
index a8b6a75ee4aa..62fbb51ea4a5 100644
--- a/core/src/main/resources/hudson/model/UpdateCenter/ConnectionCheckJob/row_es.properties
+++ b/core/src/main/resources/hudson/model/UpdateCenter/ConnectionCheckJob/row_es.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Preparation=Preaparación
+Preparation=Preparación

From 85d6358c32fd9cf2638082f31f1f3c705db99148 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 9 Sep 2024 08:14:48 -0700
Subject: [PATCH 404/449] Compatibility for `ChainedServletFilter` (#9696)

---
 .../hudson/security/ChainedServletFilter.java |  21 +--
 .../security/ChainedServletFilter2.java       | 122 ++++++++++++++++++
 .../hudson/security/LegacySecurityRealm.java  |   2 +-
 .../java/hudson/security/SecurityRealm.java   |   4 +-
 4 files changed, 136 insertions(+), 13 deletions(-)
 create mode 100644 core/src/main/java/hudson/security/ChainedServletFilter2.java

diff --git a/core/src/main/java/hudson/security/ChainedServletFilter.java b/core/src/main/java/hudson/security/ChainedServletFilter.java
index 98bc725c2b1a..a0a458f810f6 100644
--- a/core/src/main/java/hudson/security/ChainedServletFilter.java
+++ b/core/src/main/java/hudson/security/ChainedServletFilter.java
@@ -24,28 +24,29 @@
 
 package hudson.security;
 
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
-import org.kohsuke.stapler.CompatibleFilter;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * Servlet {@link Filter} that chains multiple {@link Filter}s.
  *
  * @author Kohsuke Kawaguchi
+ * @deprecated use {@link ChainedServletFilter2}
  */
-public class ChainedServletFilter implements CompatibleFilter {
+@Deprecated
+public class ChainedServletFilter implements Filter {
     // array is assumed to be immutable once set
     protected volatile Filter[] filters;
 
diff --git a/core/src/main/java/hudson/security/ChainedServletFilter2.java b/core/src/main/java/hudson/security/ChainedServletFilter2.java
new file mode 100644
index 000000000000..027738bfdfc9
--- /dev/null
+++ b/core/src/main/java/hudson/security/ChainedServletFilter2.java
@@ -0,0 +1,122 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.security;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+
+/**
+ * Servlet {@link Filter} that chains multiple {@link Filter}s.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class ChainedServletFilter2 implements Filter {
+    // array is assumed to be immutable once set
+    protected volatile Filter[] filters;
+
+    public ChainedServletFilter2() {
+        filters = new Filter[0];
+    }
+
+    public ChainedServletFilter2(Filter... filters) {
+        this(Arrays.asList(filters));
+    }
+
+    public ChainedServletFilter2(Collection<? extends Filter> filters) {
+        setFilters(filters);
+    }
+
+    public void setFilters(Collection<? extends Filter> filters) {
+        this.filters = filters.toArray(new Filter[0]);
+    }
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        if (LOGGER.isLoggable(Level.FINEST))
+            for (Filter f : filters)
+                LOGGER.finest("ChainedServletFilter2 contains: " + f);
+
+        for (Filter f : filters)
+            f.init(filterConfig);
+    }
+
+    private static final Pattern UNINTERESTING_URIS = Pattern.compile("/(images|jsbundles|css|scripts|adjuncts)/|/favicon[.](ico|svg)|/ajax");
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, final FilterChain chain) throws IOException, ServletException {
+        String uri = request instanceof HttpServletRequest ? ((HttpServletRequest) request).getRequestURI() : "?";
+        Level level = UNINTERESTING_URIS.matcher(uri).find() ? Level.FINER : Level.FINE;
+        LOGGER.log(level, () -> "starting filter on " + uri);
+
+        new FilterChain() {
+            private int position = 0;
+            // capture the array for thread-safety
+            private final Filter[] filters = ChainedServletFilter2.this.filters;
+
+            @Override
+            public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
+                if (position == filters.length) {
+                    LOGGER.log(level, () -> uri + " end: " + status());
+                    chain.doFilter(request, response);
+                } else {
+                    Filter next = filters[position++];
+                    try {
+                        LOGGER.log(level, () -> uri + " @" + position + " " + next + " »");
+                        next.doFilter(request, response, this);
+                        LOGGER.log(level, () -> uri + " @" + position + " " + next + " « success: " + status());
+                    } catch (IOException | ServletException | RuntimeException x) {
+                        LOGGER.log(level, () -> uri + " @" + position + " " + next + " « " + x + ": " + status());
+                        throw x;
+                    }
+                }
+            }
+
+            private int status() {
+                return response instanceof HttpServletResponse ? ((HttpServletResponse) response).getStatus() : 0;
+            }
+        }.doFilter(request, response);
+
+    }
+
+    @Override
+    public void destroy() {
+        for (Filter f : filters)
+            f.destroy();
+    }
+
+    private static final Logger LOGGER = Logger.getLogger(ChainedServletFilter2.class.getName());
+}
diff --git a/core/src/main/java/hudson/security/LegacySecurityRealm.java b/core/src/main/java/hudson/security/LegacySecurityRealm.java
index 94c895782f74..120b8d8e2cab 100644
--- a/core/src/main/java/hudson/security/LegacySecurityRealm.java
+++ b/core/src/main/java/hudson/security/LegacySecurityRealm.java
@@ -89,7 +89,7 @@ public Filter createFilter(FilterConfig filterConfig) {
         // when using container-authentication we can't hit /login directly.
         // we first have to hit protected /loginEntry, then let the container
         // trap that into /login.
-        return new ChainedServletFilter(filters);
+        return new ChainedServletFilter2(filters);
     }
 
     /**
diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index d10e7994ae22..d99e3487eaa6 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -678,7 +678,7 @@ private Filter createFilterImpl(FilterConfig filterConfig) {
         }
         filters.add(new RememberMeAuthenticationFilter(sc.manager2, sc.rememberMe2));
         filters.addAll(commonFilters());
-        return new ChainedServletFilter(filters);
+        return new ChainedServletFilter2(filters);
     }
 
     protected final List<Filter> commonFilters() {
@@ -781,7 +781,7 @@ public GroupDetails loadGroupByGroupname2(String groupname, boolean fetchMembers
          */
         @Override
         public Filter createFilter(FilterConfig filterConfig) {
-            return new ChainedServletFilter();
+            return new ChainedServletFilter2();
         }
 
         /**

From 1b8c1984dc3b7ab1fa4364808518ee2714254c55 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 11:19:46 -0700
Subject: [PATCH 405/449] Update dependency io.jenkins.plugins:font-awesome-api
 to v6.6.0-2 (#9708)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 229c19fe390e..5cc425330ae9 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -75,7 +75,7 @@ THE SOFTWARE.
         <!-- RequireUpperBoundDeps between bootstrap5-api and echarts-api -->
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>font-awesome-api</artifactId>
-        <version>6.6.0-1</version>
+        <version>6.6.0-2</version>
       </dependency>
       <dependency>
         <groupId>io.jenkins.plugins</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 937b8e72a5e5..4ec3aeb16166 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -400,7 +400,7 @@ THE SOFTWARE.
                   <!-- dependency of bootstrap5-api and echarts-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>font-awesome-api</artifactId>
-                  <version>6.6.0-1</version>
+                  <version>6.6.0-2</version>
                   <type>hpi</type>
                 </artifactItem>
 

From 0c49380fe78e3deda1b5b9d47bed3ddac8775a26 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 16:47:09 -0700
Subject: [PATCH 406/449] Update eslint monorepo to v9.10.0 (#9710)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  4 ++--
 war/yarn.lock    | 33 +++++++++++++++++++++------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/war/package.json b/war/package.json
index 1adda658dd6b..e6b18f5a2a37 100644
--- a/war/package.json
+++ b/war/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.25.6",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
-    "@eslint/js": "9.9.1",
+    "@eslint/js": "9.10.0",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.9.1",
+    "eslint": "9.10.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.9.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index f12c358b3dac..eb19ca5a25e3 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -1878,10 +1878,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.9.1":
-  version: 9.9.1
-  resolution: "@eslint/js@npm:9.9.1"
-  checksum: 10c0/a3a91de2ce78469f7c4eee78c1eba77360706e1d0fa0ace2e19102079bcf237b851217c85ea501dc92c4c3719d60d9df966977abc8554d4c38e3638c1f53dcb2
+"@eslint/js@npm:9.10.0":
+  version: 9.10.0
+  resolution: "@eslint/js@npm:9.10.0"
+  checksum: 10c0/2ac45a002dc1ccf25be46ea61001ada8d77248d1313ab4e53f3735e5ae00738a757874e41f62ad6fbd49df7dffeece66e5f53ff0d7b78a99ce4c68e8fea66753
   languageName: node
   linkType: hard
 
@@ -1892,6 +1892,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint/plugin-kit@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@eslint/plugin-kit@npm:0.1.0"
+  dependencies:
+    levn: "npm:^0.4.1"
+  checksum: 10c0/fae97cd4efc1c32501c286abba1b5409848ce8c989e1ca6a5bb057a304a2cd721e6e957f6bc35ce95cfd0871e822ed42df3c759fecdad72c30e70802e26f83c7
+  languageName: node
+  linkType: hard
+
 "@humanwhocodes/module-importer@npm:^1.0.1":
   version: 1.0.1
   resolution: "@humanwhocodes/module-importer@npm:1.0.1"
@@ -3516,15 +3525,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.9.1":
-  version: 9.9.1
-  resolution: "eslint@npm:9.9.1"
+"eslint@npm:9.10.0":
+  version: 9.10.0
+  resolution: "eslint@npm:9.10.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.11.0"
     "@eslint/config-array": "npm:^0.18.0"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.9.1"
+    "@eslint/js": "npm:9.10.0"
+    "@eslint/plugin-kit": "npm:^0.1.0"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3547,7 +3557,6 @@ __metadata:
     is-glob: "npm:^4.0.0"
     is-path-inside: "npm:^3.0.3"
     json-stable-stringify-without-jsonify: "npm:^1.0.1"
-    levn: "npm:^0.4.1"
     lodash.merge: "npm:^4.6.2"
     minimatch: "npm:^3.1.2"
     natural-compare: "npm:^1.4.0"
@@ -3561,7 +3570,7 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/5e71efda7c0a14ee95436d5cdfed04ee61dfb1d89d7a32b50a424de2e680af82849628ea6581950c2e0726491f786a3cfd0032ce013c1c5093786e475cfdfb33
+  checksum: 10c0/7357f3995b15043eea83c8c0ab16c385ce3f28925c1b11cfcd6b2ede8faab3d91ede84a68173dd5f6e3e176e177984e6218de58b7b8388e53e2881f1ec07c836
   languageName: node
   linkType: hard
 
@@ -4378,12 +4387,12 @@ __metadata:
     "@babel/cli": "npm:7.25.6"
     "@babel/core": "npm:7.25.2"
     "@babel/preset-env": "npm:7.25.4"
-    "@eslint/js": "npm:9.9.1"
+    "@eslint/js": "npm:9.10.0"
     babel-loader: "npm:9.1.3"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"
-    eslint: "npm:9.9.1"
+    eslint: "npm:9.10.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
     globals: "npm:15.9.0"

From 561231f7255e82af271c3840b61515074cf144fb Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:09:56 +0000
Subject: [PATCH 407/449] [maven-release-plugin] prepare release jenkins-2.476

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 6 +++---
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty12-ee9/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index cd55b58d52c9..4d759458a217 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.476</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6309811a2e8b..64e02898350a 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.476</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 9bff5e5ad0b2..f1bddad8810b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.476</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..eafc70de3013 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.476</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 86e2ff541a3c..84cee786904f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.476</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.476</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.476</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-09-04T12:22:06Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-10T10:34:40Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 5cc425330ae9..66ec67e9ab83 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.476</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 4ec3aeb16166..a7f15e690c1e 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.476</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index 2253163b3c4c..c1fcdd7d5168 100644
--- a/websocket/jetty12-ee9/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.476</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 178413f92c8e..5ae252d9ad9c 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.476</version>
     <relativePath>../..</relativePath>
   </parent>
 

From eb6be17bf025768da30b0cfcf1c52808c9c94d10 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:10:20 +0000
Subject: [PATCH 408/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 8 ++++----
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty12-ee9/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 4d759458a217..cd55b58d52c9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.476</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 64e02898350a..6309811a2e8b 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.476</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index f1bddad8810b..9bff5e5ad0b2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.476</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index eafc70de3013..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.476</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 84cee786904f..aadf88d18411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.476</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.476</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.476</revision>
+    <revision>2.477</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-09-10T10:34:40Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-10T14:09:56Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 66ec67e9ab83..5cc425330ae9 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.476</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index a7f15e690c1e..4ec3aeb16166 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.476</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index c1fcdd7d5168..2253163b3c4c 100644
--- a/websocket/jetty12-ee9/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.476</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 5ae252d9ad9c..178413f92c8e 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.476</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From 11c405b5b3a8e75578720d3b62bbe6b023b69d50 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:40:08 -0700
Subject: [PATCH 409/449] Update dependency
 org.apache.maven.plugins:maven-jarsigner-plugin to v3.1.0 (#9712)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aadf88d18411..e693ea705490 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,7 @@ THE SOFTWARE.
         </plugin>
         <plugin>
           <artifactId>maven-jarsigner-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.1.0</version>
           <configuration>
             <!--
               during the development, debug profile will cause

From 905df3df7d38d80716724fb5b321c292076d1573 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:40:46 -0700
Subject: [PATCH 410/449] Update dependency org.jenkins-ci.plugins:junit to
 v1299 (#9714)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 5cc425330ae9..1a7af0be19b8 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -230,7 +230,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1296.vb_f538b_c88630</version>
+      <version>1299.v8d143a_ca_6538</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index 4ec3aeb16166..eca002266f3f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -311,7 +311,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1296.vb_f538b_c88630</version>
+                  <version>1299.v8d143a_ca_6538</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 53f32030791851e07bcc79f0b58ca26e580ad419 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Tue, 10 Sep 2024 22:52:20 +0200
Subject: [PATCH 411/449] [JENKINS-73709] Build without forking the compiler
 (#9709)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e693ea705490..9f52b05a6ff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,6 @@ THE SOFTWARE.
           <artifactId>maven-compiler-plugin</artifactId>
           <!-- Version specified in parent POM -->
           <configuration>
-            <fork>true</fork>
             <compilerReuseStrategy>alwaysNew</compilerReuseStrategy>
             <compilerArgs>
               <!--

From 66a781032a9ee908e0460f3c94925bd9e6aca30c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:31:40 -0600
Subject: [PATCH 412/449] Update dependency
 org.jenkins-ci.plugins:cloudbees-folder to v6.951.v5f91d88d76b_b_ (#9715)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 1a7af0be19b8..08904fc24752 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -218,7 +218,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>cloudbees-folder</artifactId>
-      <version>6.942.vb_43318a_156b_2</version>
+      <version>6.951.v5f91d88d76b_b_</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 78e132dceffa3a568b8aa5f78404f062e300121e Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 10 Sep 2024 19:32:04 -0700
Subject: [PATCH 413/449] Build tests without forking the compiler (#9717)

---
 test/pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 08904fc24752..2a3a99b715da 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -408,14 +408,6 @@ THE SOFTWARE.
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <!-- Version specified in grandparent POM -->
-        <configuration>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

From 35d767790ffb42a337a69fd8a9b941decf05fe6d Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 11 Sep 2024 04:32:36 +0200
Subject: [PATCH 414/449] Introduce `HistoricalBuild` interface (#9674)

* Introduce HistoricalBuild interface

This allows to display Run-like objects in build history without having concrete Run present in the Jenkins instance.

* Remove BuildHistoryWidget#entries.jelly

* JDK17 level

Co-authored-by: Jesse Glick <jglick@cloudbees.com>

---------

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
---
 core/src/main/java/hudson/model/Job.java      |   9 +-
 core/src/main/java/hudson/model/Run.java      | 134 ++---------
 .../hudson/widgets/BuildHistoryWidget.java    |   4 +-
 .../java/hudson/widgets/HistoryWidget.java    |  13 +-
 .../java/jenkins/model/HistoricalBuild.java   | 211 ++++++++++++++++++
 .../jenkins/widgets/HistoryPageEntry.java     |   8 +-
 .../jenkins/widgets/HistoryPageFilter.java    |  40 ++--
 .../widgets/BuildHistoryWidget/entries.jelly  |  32 ---
 .../hudson/widgets/HistoryWidget/entry.jelly  |   2 +-
 .../lib/hudson/buildProgressBar.jelly         |  22 +-
 10 files changed, 285 insertions(+), 190 deletions(-)
 create mode 100644 core/src/main/java/jenkins/model/HistoricalBuild.java
 delete mode 100644 core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly

diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 10637d666d68..2ba53d7182a0 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -90,6 +90,7 @@
 import jenkins.model.BuildDiscarder;
 import jenkins.model.BuildDiscarderProperty;
 import jenkins.model.DirectlyModifiableTopLevelItemGroup;
+import jenkins.model.HistoricalBuild;
 import jenkins.model.Jenkins;
 import jenkins.model.JenkinsLocationConfiguration;
 import jenkins.model.ModelObjectWithChildren;
@@ -636,9 +637,9 @@ protected HistoryWidget createHistoryWidget() {
         throw new IllegalStateException("HistoryWidget is now created via WidgetFactory implementation");
     }
 
-    public static final HistoryWidget.Adapter<Run> HISTORY_ADAPTER = new Adapter<>() {
+    public static final HistoryWidget.Adapter<HistoricalBuild> HISTORY_ADAPTER = new Adapter<>() {
         @Override
-        public int compare(Run record, String key) {
+        public int compare(HistoricalBuild record, String key) {
             try {
                 int k = Integer.parseInt(key);
                 return record.getNumber() - k;
@@ -648,12 +649,12 @@ public int compare(Run record, String key) {
         }
 
         @Override
-        public String getKey(Run record) {
+        public String getKey(HistoricalBuild record) {
             return String.valueOf(record.getNumber());
         }
 
         @Override
-        public boolean isBuilding(Run record) {
+        public boolean isBuilding(HistoricalBuild record) {
             return record.isBuilding();
         }
 
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index f4084bcbf254..5359634d9642 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -115,6 +115,7 @@
 import jenkins.model.ArtifactManagerConfiguration;
 import jenkins.model.ArtifactManagerFactory;
 import jenkins.model.BuildDiscarder;
+import jenkins.model.HistoricalBuild;
 import jenkins.model.Jenkins;
 import jenkins.model.JenkinsLocationConfiguration;
 import jenkins.model.RunAction2;
@@ -159,7 +160,7 @@
  */
 @ExportedBean
 public abstract class Run<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, RunT>>
-        extends Actionable implements ExtensionPoint, Comparable<RunT>, AccessControlled, PersistenceRoot, DescriptorByNameOwner, OnMaster, StaplerProxy, WithConsoleUrl {
+        extends Actionable implements ExtensionPoint, Comparable<RunT>, AccessControlled, PersistenceRoot, DescriptorByNameOwner, OnMaster, StaplerProxy, HistoricalBuild, WithConsoleUrl {
 
     /**
      * The original {@link Queue.Item#getId()} has not yet been mapped onto the {@link Run} instance.
@@ -167,15 +168,6 @@ public abstract class Run<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      */
     public static final long QUEUE_ID_UNKNOWN = -1;
 
-    /**
-     * Target size limit for truncated {@link #description}s in the Build History Widget.
-     * This is applied to the raw, unformatted description. Especially complex formatting
-     * like hyperlinks can result in much less text being shown than this might imply.
-     * Negative values will disable truncation, {@code 0} will enforce empty strings.
-     * @since 2.223
-     */
-    private static /* non-final for Groovy */ int TRUNCATED_DESCRIPTION_LIMIT = SystemProperties.getInteger("historyWidget.descriptionLimit", 100);
-
     protected final transient @NonNull JobT project;
 
     /**
@@ -463,12 +455,12 @@ public int compareTo(@NonNull RunT that) {
     }
 
     /**
-     * Get the {@link Queue.Item#getId()} of the original queue item from where this Run instance
-     * originated.
-     * @return The queue item ID.
+     * {@inheritDoc}
+     *
      * @since 1.601
      */
     @Exported
+    @Override
     public long getQueueId() {
         return queueId;
     }
@@ -484,15 +476,8 @@ public void setQueueId(long queueId) {
         this.queueId = queueId;
     }
 
-    /**
-     * Returns the build result.
-     *
-     * <p>
-     * When a build is {@link #isBuilding() in progress}, this method
-     * returns an intermediate result.
-     * @return The status of the build, if it has completed or some build step has set a status; may be null if the build is ongoing.
-     */
     @Exported
+    @Override
     public @CheckForNull Result getResult() {
         return result;
     }
@@ -520,6 +505,7 @@ public void setResult(@NonNull Result r) {
     /**
      * Gets the subset of {@link #getActions()} that consists of {@link BuildBadgeAction}s.
      */
+    @Override
     public @NonNull List<BuildBadgeAction> getBadgeActions() {
         List<BuildBadgeAction> r = getActions(BuildBadgeAction.class);
         if (isKeepLog()) {
@@ -529,11 +515,8 @@ public void setResult(@NonNull Result r) {
         return r;
     }
 
-    /**
-     * Returns true if the build is not completed yet.
-     * This includes "not started yet" state.
-     */
     @Exported
+    @Override
     public boolean isBuilding() {
         return state.compareTo(State.POST_PRODUCTION) < 0;
     }
@@ -652,11 +635,11 @@ public final boolean isKeepLog() {
     }
 
     /**
-     * When the build is scheduled.
-     *
+     * {@inheritDoc}
      * @see #getStartTimeInMillis()
      */
     @Exported
+    @Override
     public @NonNull Calendar getTimestamp() {
         GregorianCalendar c = new GregorianCalendar();
         c.setTimeInMillis(timestamp);
@@ -691,73 +674,12 @@ public final long getStartTimeInMillis() {
     }
 
     @Exported
+    @Override
     @CheckForNull
     public String getDescription() {
         return description;
     }
 
-
-    /**
-     * Returns the length-limited description.
-     * The method tries to take HTML tags within the description into account, but it is a best-effort attempt.
-     * Also, the method will likely not work properly if a non-HTML {@link hudson.markup.MarkupFormatter} is used.
-     * @return The length-limited description.
-     * @deprecated truncated description based on the {@link #TRUNCATED_DESCRIPTION_LIMIT} setting.
-     */
-    @Deprecated
-    public @CheckForNull String getTruncatedDescription() {
-        if (TRUNCATED_DESCRIPTION_LIMIT < 0) { // disabled
-            return description;
-        }
-        if (TRUNCATED_DESCRIPTION_LIMIT == 0) { // Someone wants to suppress descriptions, why not?
-            return "";
-        }
-
-        final int maxDescrLength = TRUNCATED_DESCRIPTION_LIMIT;
-        final String localDescription = description;
-        if (localDescription == null || localDescription.length() < maxDescrLength) {
-            return localDescription;
-        }
-
-        final String ending = "...";
-        final int sz = localDescription.length(), maxTruncLength = maxDescrLength - ending.length();
-
-        boolean inTag = false;
-        int displayChars = 0;
-        int lastTruncatablePoint = -1;
-
-        for (int i = 0; i < sz; i++) {
-            char ch = localDescription.charAt(i);
-            if (ch == '<') {
-                inTag = true;
-            } else if (ch == '>') {
-                inTag = false;
-                if (displayChars <= maxTruncLength) {
-                    lastTruncatablePoint = i + 1;
-                }
-            }
-            if (!inTag) {
-                displayChars++;
-                if (displayChars <= maxTruncLength && ch == ' ') {
-                    lastTruncatablePoint = i;
-                }
-            }
-        }
-
-        String truncDesc = localDescription;
-
-        // Could not find a preferred truncatable index, force a trunc at maxTruncLength
-        if (lastTruncatablePoint == -1)
-            lastTruncatablePoint = maxTruncLength;
-
-        if (displayChars >= maxDescrLength) {
-            truncDesc = truncDesc.substring(0, lastTruncatablePoint) + ending;
-        }
-
-        return truncDesc;
-
-    }
-
     /**
      * Gets the string that says how long since this build has started.
      *
@@ -776,9 +698,7 @@ public String getDescription() {
         return Util.XS_DATETIME_FORMATTER2.format(Instant.ofEpochMilli(timestamp));
     }
 
-    /**
-     * Gets the string that says how long the build took to run.
-     */
+    @Override
     public @NonNull String getDurationString() {
         if (hasntStartedYet()) {
             return Messages.Run_NotStartedYet();
@@ -797,9 +717,7 @@ public long getDuration() {
         return duration;
     }
 
-    /**
-     * Gets the icon color for display.
-     */
+    @Override
     public @NonNull BallColor getIconColor() {
         if (!isBuilding()) {
             // already built
@@ -834,6 +752,7 @@ public String toString() {
     }
 
     @Exported
+    @Override
     public String getFullDisplayName() {
         return project.getFullDisplayName() + ' ' + getDisplayName();
     }
@@ -859,6 +778,7 @@ public void setDisplayName(String value) throws IOException {
     }
 
     @Exported(visibility = 2)
+    @Override
     public int getNumber() {
         return number;
     }
@@ -1036,14 +956,8 @@ protected void dropLinks() {
         return nextBuild;
     }
 
-    /**
-     * Returns the URL of this {@link Run}, relative to the context root of Hudson.
-     *
-     * @return
-     *      String like "job/foo/32/" with trailing slash but no leading slash.
-     */
-    // I really messed this up. I'm hoping to fix this some time
-    // it shouldn't have trailing '/', and instead it should have leading '/'
+
+    @Override
     public @NonNull String getUrl() {
 
         // RUN may be accessed using permalinks, as "/lastSuccessful" or other, so try to retrieve this base URL
@@ -1107,6 +1021,12 @@ public String getConsoleUrl() {
         return new File(project.getBuildDir(), Integer.toString(number));
     }
 
+    @Override
+    public List<ParameterValue> getParameterValues() {
+        ParametersAction a = getAction(ParametersAction.class);
+        return a != null ? a.getParameters() : List.of();
+    }
+
     /**
      * Gets an object responsible for storing and retrieving build artifacts.
      * If {@link #pickArtifactManager} has previously been called on this build,
@@ -2175,14 +2095,6 @@ public void doBuildStatus(StaplerRequest2 req, StaplerResponse2 rsp) throws IOEx
         rsp.sendRedirect2(req.getContextPath() + "/images/48x48/" + getBuildStatusUrl());
     }
 
-    public @NonNull String getBuildStatusUrl() {
-        return getIconColor().getImage();
-    }
-
-    public String getBuildStatusIconClassName() {
-        return getIconColor().getIconClassName();
-    }
-
     public static class Summary {
         /**
          * Is this build worse or better, compared to the previous build?
diff --git a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
index 2c171b594f5a..bf75e2bf0c7a 100644
--- a/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/BuildHistoryWidget.java
@@ -33,6 +33,7 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import jenkins.model.HistoricalBuild;
 import jenkins.model.Jenkins;
 import jenkins.model.queue.QueueItem;
 import jenkins.widgets.HistoryPageFilter;
@@ -47,7 +48,7 @@
  * <p>
  * This widget enhances {@link HistoryWidget} by groking the notion
  * that {@link #owner} can be in the queue toward the next build.
- *
+ * @param <T> typically {@link HistoricalBuild}
  * @author Kohsuke Kawaguchi
  */
 public class BuildHistoryWidget<T> extends HistoryWidget<Task, T> {
@@ -84,7 +85,6 @@ public HistoryPageFilter getHistoryPageFilter() {
         final HistoryPageFilter<T> historyPageFilter = newPageFilter();
 
         historyPageFilter.add(baseList, getQueuedItems());
-        historyPageFilter.widget = this;
 
         return updateFirstTransientBuildKey(historyPageFilter);
     }
diff --git a/core/src/main/java/hudson/widgets/HistoryWidget.java b/core/src/main/java/hudson/widgets/HistoryWidget.java
index 44f6de67ee6f..e7dcafbb5426 100644
--- a/core/src/main/java/hudson/widgets/HistoryWidget.java
+++ b/core/src/main/java/hudson/widgets/HistoryWidget.java
@@ -31,7 +31,6 @@
 import hudson.model.Job;
 import hudson.model.ModelObject;
 import hudson.model.Queue;
-import hudson.model.Run;
 import hudson.util.AlternativeUiTextProvider;
 import jakarta.servlet.ServletException;
 import java.io.IOException;
@@ -40,6 +39,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import jenkins.model.HistoricalBuild;
 import jenkins.util.SystemProperties;
 import jenkins.widgets.HistoryPageEntry;
 import jenkins.widgets.HistoryPageFilter;
@@ -53,12 +53,12 @@
 import org.kohsuke.stapler.StaplerResponse2;
 
 /**
- * Displays the history of records (normally {@link Run}s) on the side panel.
+ * Displays the history of records on the side panel.
  *
  * @param <O>
- *      Owner of the widget.
+ *      Owner of the widget, typically {@link Job}
  * @param <T>
- *      Type individual record.
+ *      Type individual record, typically {@link HistoricalBuild}
  * @author Kohsuke Kawaguchi
  */
 public class HistoryWidget<O extends ModelObject, T> extends Widget {
@@ -142,7 +142,7 @@ public String getFirstTransientBuildKey() {
      * @return
      *      The history page filter that was passed in.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("unchecked") // TODO actually not type-safe
     protected HistoryPageFilter updateFirstTransientBuildKey(HistoryPageFilter historyPageFilter) {
         updateFirstTransientBuildKey(historyPageFilter.runs);
         return historyPageFilter;
@@ -195,7 +195,7 @@ private List<HistoryPageEntry<T>> toPageEntries(Iterable<T> historyItemList) {
     /**
      * Get a {@link jenkins.widgets.HistoryPageFilter} for rendering a page of queue items.
      */
-    public HistoryPageFilter getHistoryPageFilter() {
+    public HistoryPageFilter<T> getHistoryPageFilter() {
         HistoryPageFilter<T> historyPageFilter = newPageFilter();
 
         historyPageFilter.add(baseList);
@@ -205,6 +205,7 @@ public HistoryPageFilter getHistoryPageFilter() {
 
     protected HistoryPageFilter<T> newPageFilter() {
         HistoryPageFilter<T> historyPageFilter = new HistoryPageFilter<>(THRESHOLD);
+        historyPageFilter.widget = this;
 
         if (newerThan != null) {
             historyPageFilter.setNewerThan(newerThan);
diff --git a/core/src/main/java/jenkins/model/HistoricalBuild.java b/core/src/main/java/jenkins/model/HistoricalBuild.java
new file mode 100644
index 000000000000..2f9f14aefff7
--- /dev/null
+++ b/core/src/main/java/jenkins/model/HistoricalBuild.java
@@ -0,0 +1,211 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2024 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.model;
+
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.markup.MarkupFormatter;
+import hudson.model.BallColor;
+import hudson.model.BuildBadgeAction;
+import hudson.model.ModelObject;
+import hudson.model.ParameterValue;
+import hudson.model.ParametersAction;
+import hudson.model.Queue;
+import hudson.model.Result;
+import hudson.model.Run;
+import hudson.widgets.BuildHistoryWidget;
+import java.util.Calendar;
+import java.util.List;
+import jenkins.util.SystemProperties;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.Beta;
+
+/**
+ * A {@link Run}-like object as it might be displayed by {@link BuildHistoryWidget}.
+ *
+ * @since TODO
+ */
+@Restricted(Beta.class)
+public interface HistoricalBuild extends ModelObject {
+
+    /**
+     * @return A build number
+     */
+    int getNumber();
+
+    /**
+     * Returns the URL of this {@link HistoricalBuild}, relative to the context root of Jenkins.
+     *
+     * @return
+     *      String like "job/foo/32/" with trailing slash but no leading slash.
+     */
+    @NonNull String getUrl();
+
+    /**
+     * Returns a human-readable description which is used on the main build page.
+     * <p>
+     * It can also be quite long, and it may use markup in a format defined by a {@link hudson.markup.MarkupFormatter}.
+     * {@link #getTruncatedDescription()} may be used to retrieve a size-limited description,
+     * but it implies some limitations.
+     * @return the build description.
+     */
+    @CheckForNull
+    String getDescription();
+
+    /**
+     * @return a human-readable full display name of this build.
+     */
+    @NonNull
+    String getFullDisplayName();
+
+    /**
+     * Get the {@link Queue.Item#getId()} of the original queue item from where this {@link HistoricalBuild} instance
+     * originated.
+     * @return The queue item ID.
+     */
+    long getQueueId();
+
+    /**
+     * Returns the build result.
+     *
+     * <p>
+     * When a build is {@link #isBuilding() in progress}, this method
+     * returns an intermediate result.
+     * @return The status of the build, if it has completed or some build step has set a status; may be null if the build is ongoing.
+     */
+    @CheckForNull
+    Result getResult();
+
+    /** @see ParametersAction#getParameters */
+    @NonNull
+    List<ParameterValue> getParameterValues();
+
+    /**
+     * Returns true if the build is not completed yet.
+     * This includes "not started yet" state.
+     */
+    boolean isBuilding();
+
+    /**
+     * Gets the icon color for display.
+     */
+    @NonNull
+    BallColor getIconColor();
+
+    @NonNull
+    default String getBuildStatusIconClassName() {
+        return getIconColor().getIconClassName();
+    }
+
+    @NonNull
+    default String getBuildStatusUrl() {
+        return getIconColor().getImage();
+    }
+
+    /**
+     * When the build is scheduled.
+     */
+    @NonNull
+    Calendar getTimestamp();
+
+    /**
+     * Gets the string that says how long the build took to run.
+     */
+    @NonNull
+    String getDurationString();
+
+    /**
+     * Gets the list of {@link BuildBadgeAction}s applicable to this instance.
+     */
+    @NonNull
+    List<BuildBadgeAction> getBadgeActions();
+
+    /**
+     * Returns the length-limited description.
+     * The method tries to take HTML tags within the description into account, but it is a best-effort attempt.
+     * Also, the method will likely not work properly if a non-HTML {@link MarkupFormatter} is used.
+     * @return The length-limited description.
+     */
+    @CheckForNull
+    default String getTruncatedDescription() {
+        String description = getDescription();
+        /*
+         * Target size limit for truncated {@link #description}s in the Build History Widget.
+         * This is applied to the raw, unformatted description. Especially complex formatting
+         * like hyperlinks can result in much less text being shown than this might imply.
+         * Negative values will disable truncation, {@code 0} will enforce empty strings.
+         */
+        int truncatedDescriptionLimit = SystemProperties.getInteger("historyWidget.descriptionLimit", 100);
+        if (truncatedDescriptionLimit < 0) { // disabled
+            return description;
+        }
+        if (truncatedDescriptionLimit == 0) { // Someone wants to suppress descriptions, why not?
+            return "";
+        }
+
+        if (description == null || description.length() < truncatedDescriptionLimit) {
+            return description;
+        }
+
+        final String ending = "...";
+        final int sz = description.length(), maxTruncLength = truncatedDescriptionLimit - ending.length();
+
+        boolean inTag = false;
+        int displayChars = 0;
+        int lastTruncatablePoint = -1;
+
+        for (int i = 0; i < sz; i++) {
+            char ch = description.charAt(i);
+            if (ch == '<') {
+                inTag = true;
+            } else if (ch == '>') {
+                inTag = false;
+                if (displayChars <= maxTruncLength) {
+                    lastTruncatablePoint = i + 1;
+                }
+            }
+            if (!inTag) {
+                displayChars++;
+                if (displayChars <= maxTruncLength && ch == ' ') {
+                    lastTruncatablePoint = i;
+                }
+            }
+        }
+
+        String truncDesc = description;
+
+        // Could not find a preferred truncatable index, force a trunc at maxTruncLength
+        if (lastTruncatablePoint == -1)
+            lastTruncatablePoint = maxTruncLength;
+
+        if (displayChars >= truncatedDescriptionLimit) {
+            truncDesc = truncDesc.substring(0, lastTruncatablePoint) + ending;
+        }
+
+        return truncDesc;
+
+    }
+
+}
diff --git a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java
index 98f0a7aac58e..2770fa928b02 100644
--- a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java
+++ b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java
@@ -26,16 +26,16 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.model.Run;
+import jenkins.model.HistoricalBuild;
 import jenkins.model.queue.QueueItem;
 
 /**
  * Represents an entry used by the {@link HistoryPageFilter}.
  *
  * <p>
- * Wraps {@link QueueItem} and {@link Run} instances from the build queue, normalizing
+ * Wraps {@link QueueItem} and {@link HistoricalBuild} instances from the build queue, normalizing
  * access to the info required for pagination.
- *
- *
+ * @param <T> typically {@link HistoricalBuild} or {@link QueueItem}
  * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
  */
 public class HistoryPageEntry<T> {
@@ -57,7 +57,7 @@ public long getEntryId() {
     protected static long getEntryId(@NonNull Object entry) {
         if (entry instanceof QueueItem) {
             return ((QueueItem) entry).getId();
-        } else if (entry instanceof Run run) {
+        } else if (entry instanceof HistoricalBuild run) {
             return Long.MIN_VALUE + run.getNumber();
         } else if (entry instanceof Number) {
             // Used for testing purposes because of JENKINS-30899 and JENKINS-30909
diff --git a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java
index 6b6d9fa214cb..f51c27c22122 100644
--- a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java
+++ b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java
@@ -30,9 +30,6 @@
 import hudson.model.AbstractBuild;
 import hudson.model.Job;
 import hudson.model.ParameterValue;
-import hudson.model.ParametersAction;
-import hudson.model.Queue;
-import hudson.model.Run;
 import hudson.search.UserSearchProperty;
 import hudson.util.Iterators;
 import hudson.widgets.HistoryWidget;
@@ -43,11 +40,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import jenkins.model.HistoricalBuild;
 import jenkins.model.queue.QueueItem;
 
 /**
  * History page filter.
- *
+ * @param <T> typically {@link HistoricalBuild}
  * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
  */
 public class HistoryPageFilter<T> {
@@ -57,10 +56,10 @@ public class HistoryPageFilter<T> {
     private Long olderThan;
     private String searchString;
 
-    // Need to use different Lists for QueueItem and Runs because
+    // Need to use different Lists for QueueItem and HistoricalBuilds because
     // we need access to them separately in the jelly files for rendering.
     public final List<HistoryPageEntry<QueueItem>> queueItems = new ArrayList<>();
-    public final List<HistoryPageEntry<Run>> runs = new ArrayList<>();
+    public final List<HistoryPageEntry<HistoricalBuild>> runs = new ArrayList<>();
 
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "read by Stapler")
     public boolean hasUpPage = false; // there are newer builds than on this page
@@ -242,13 +241,9 @@ public int compare(Object o1, Object o2) {
     }
 
     private long getNextBuildNumber(@NonNull Object entry) {
-        if (entry instanceof QueueItem) {
-            Queue.Task task = ((QueueItem) entry).getTask();
-            if (task instanceof Job) {
-                return ((Job) task).getNextBuildNumber();
-            }
-        } else if (entry instanceof Run) {
-            return ((Run) entry).getParent().getNextBuildNumber();
+        // TODO refactor into method on HistoryWidget
+        if (widget != null && widget.owner instanceof Job job) {
+            return job.getNextBuildNumber();
         }
 
         // TODO maybe this should be an error?
@@ -261,12 +256,13 @@ private void addQueueItem(QueueItem item) {
         updateNewestOldest(entry.getEntryId());
     }
 
-    private void addRun(Run run) {
-        HistoryPageEntry<Run> entry = new HistoryPageEntry<>(run);
+    private void addRun(HistoricalBuild run) {
+        HistoryPageEntry<HistoricalBuild> entry = new HistoryPageEntry<>(run);
         // Assert that runs have been added in descending order
         if (!runs.isEmpty()) {
             if (entry.getEntryId() > runs.get(runs.size() - 1).getEntryId()) {
-                throw new IllegalStateException("Runs were out of order");
+                throw new IllegalStateException("Cannot add newer " + run + " to descending-order list " +
+                    runs.stream().map(HistoryPageEntry::getEntry).collect(Collectors.toList()));
             }
         }
         runs.add(entry);
@@ -288,8 +284,7 @@ private boolean add(Object entry) {
             }
             addQueueItem(item);
             return true;
-        } else if (entry instanceof Run) {
-            Run run = (Run) entry;
+        } else if (entry instanceof HistoricalBuild run) {
             if (searchString != null && !fitsSearchParams(run)) {
                 return false;
             }
@@ -322,7 +317,7 @@ private boolean fitsSearchParams(@NonNull QueueItem item) {
         return false;
     }
 
-    private boolean fitsSearchParams(@NonNull Run run) {
+    private boolean fitsSearchParams(@NonNull HistoricalBuild run) {
         if (searchString == null) {
             return true;
         }
@@ -340,8 +335,8 @@ private boolean fitsSearchParams(@NonNull Run run) {
         } else if (run instanceof AbstractBuild && fitsSearchBuildVariables((AbstractBuild) run)) {
             return true;
         } else {
-            ParametersAction parametersAction = run.getAction(ParametersAction.class);
-            if (parametersAction != null && fitsSearchBuildParameters(parametersAction)) {
+            List<ParameterValue> parameters = run.getParameterValues();
+            if (fitsSearchBuildParameters(parameters)) {
                 return true;
             }
         }
@@ -381,8 +376,7 @@ private boolean fitsSearchBuildVariables(AbstractBuild<?, ?> runAsBuild) {
         return false;
     }
 
-    private boolean fitsSearchBuildParameters(ParametersAction parametersAction) {
-        List<ParameterValue> parameters = parametersAction.getParameters();
+    private boolean fitsSearchBuildParameters(List<ParameterValue> parameters) {
         for (ParameterValue parameter : parameters) {
             if (!parameter.isSensitive() && fitsSearchString(parameter.getValue())) {
                 return true;
diff --git a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
deleted file mode 100644
index 54309319f0a3..000000000000
--- a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<!--
-  Render build histories.
--->
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
-  <st:include page="entries.jelly" />
-</j:jelly>
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
index dc367464b57c..60c3bdec4aba 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <!--
-  Render a single build history entry indicated by ${build} (hudson.model.Build)
+  Render a single build history entry indicated by ${build} (jenkins.model.HistoricalBuild)
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:i="jelly:fmt">
diff --git a/core/src/main/resources/lib/hudson/buildProgressBar.jelly b/core/src/main/resources/lib/hudson/buildProgressBar.jelly
index 55d2a50c825b..49aac35f0909 100644
--- a/core/src/main/resources/lib/hudson/buildProgressBar.jelly
+++ b/core/src/main/resources/lib/hudson/buildProgressBar.jelly
@@ -26,8 +26,8 @@ THE SOFTWARE.
   <st:documentation>
     Progress bar for a build in progress.
 
-    <st:attribute name="build" use="required" type="hudson.model.Queue.Executable">
-      Build in progress. Must have a url property.
+    <st:attribute name="build" use="required">
+      Build in progress. Must have a url property; may have an executor property.
     </st:attribute>
     <st:attribute name="executor">
       Executor that's carrying out the build. If null, defaults to "build.executor"
@@ -37,9 +37,17 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
   <j:set var="executor" value="${executor?:build.executor}" /> <!-- TODO use Executor.of -->
-  <t:progressBar tooltip="${%text(executor.timestampString,executor.estimatedRemainingTime)}"
-                 red="${executor.isLikelyStuck()}"
-                 pos="${executor.progress}" href="${h.getConsoleUrl(build) ?: (rootURL + '/' + build.url + 'console')}"
-                 tooltipTemplate="${%text('%0','%1')}"
-                 animate="${attrs.animate}"/>
+  <j:choose>
+    <j:when test="${executor != null}">
+      <t:progressBar tooltip="${%text(executor.timestampString,executor.estimatedRemainingTime)}"
+                     red="${executor.isLikelyStuck()}"
+                     pos="${executor.progress}" href="${h.getConsoleUrl(build) ?: (rootURL + '/' + build.url + 'console')}"
+                     tooltipTemplate="${%text('%0','%1')}"
+                     animate="${attrs.animate}"/>
+    </j:when>
+    <j:otherwise>
+      <!-- TODO could offer estimatedRemainingTime etc. via HistoricalBuild -->
+      <t:progressBar href="${h.getConsoleUrl(build) ?: (rootURL + '/' + build.url + 'console')}"/>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>

From 65f374c35a3caf9b3a5aacff442edb552a0f4141 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 05:13:32 -0600
Subject: [PATCH 415/449] Update dependency org.jenkins-ci.plugins:junit to
 v1300 (#9716)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 2a3a99b715da..83dc98da7e29 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -230,7 +230,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1299.v8d143a_ca_6538</version>
+      <version>1300.v03d9d8a_cf1fb_</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/war/pom.xml b/war/pom.xml
index eca002266f3f..47b268761f3a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -311,7 +311,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1299.v8d143a_ca_6538</version>
+                  <version>1300.v03d9d8a_cf1fb_</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 36c155e65e00acdf0bd8c3a5215b55d25a074b4f Mon Sep 17 00:00:00 2001
From: Alexander Brandes <mc.cache@web.de>
Date: Thu, 12 Sep 2024 10:01:35 +0200
Subject: [PATCH 416/449] Automate the since updater (#7240)

Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>
---
 .github/workflows/run-since-updater.yml | 41 +++++++++++++++++++++++++
 update-since-todo.py                    | 16 +++++++---
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/run-since-updater.yml

diff --git a/.github/workflows/run-since-updater.yml b/.github/workflows/run-since-updater.yml
new file mode 100644
index 000000000000..03bcfe5b7c9d
--- /dev/null
+++ b/.github/workflows/run-since-updater.yml
@@ -0,0 +1,41 @@
+name: Run update-since-todo.py
+
+on:
+  schedule:
+    - cron: "0 16 * * THU"
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  since_updater:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'jenkinsci' }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Run update-since-todo.py
+        run: |
+          body=$(./update-since-todo.py)
+
+          {
+            echo 'PROGRESS<<EOF'
+            echo "${body}"
+            echo 'EOF'
+          } >> $GITHUB_OUTPUT
+        id: run_script
+        shell: bash
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Fill in since annotations
+          title: Fill in since annotations
+          body: ${{ steps.run_script.outputs.PROGRESS }}
+          base: master
+          labels: skip-changelog
+          branch: actions/update-since-todo
+          delete-branch: true
diff --git a/update-since-todo.py b/update-since-todo.py
index 044d441a935e..3b0241a9928f 100755
--- a/update-since-todo.py
+++ b/update-since-todo.py
@@ -3,6 +3,7 @@
 import argparse
 import fileinput
 import io
+import os
 import shutil
 import subprocess
 
@@ -18,7 +19,7 @@ def update_file(file, lineno, old, new):
     :param old: The old substring.
     :param new: The new substring.
     """
-    print("\tUpdating file in place")
+    print("* Updating file in place")
     with fileinput.FileInput(file, inplace=True) as f:
         for line in f:
             if f.lineno() == lineno and old in line:
@@ -44,13 +45,13 @@ def analyze_file(file, lineno, commits_and_tags, dry_run=False):
         .split("\n", 1)[0]
         .split(" ", 1)[0]
     )
-    print(f"\tfirst sha: {line_sha}")
+    print(f"* first sha: {line_sha}")
     first_tag = subprocess.check_output(
         [GIT, "tag", "--sort=creatordate", "--contains", line_sha, "jenkins-*"],
         text=True,
     ).split("\n", 1)[0]
     if first_tag:
-        print(f"\tfirst tag was {first_tag}")
+        print(f"* first tag was {first_tag}")
         commits_and_tags[line_sha] = first_tag
         if not dry_run:
             since_version = first_tag.replace("jenkins-", "")
@@ -75,10 +76,11 @@ def analyze_file(file, lineno, commits_and_tags, dry_run=False):
 
     else:
         print(
-            "\tNot updating file, no tag found. "
+            "* Not updating file, no tag found. "
             "Normal if the associated PR/commit is not merged and released yet; "
             "otherwise make sure to fetch tags from jenkinsci/jenkins"
         )
+    print() # Add a newline for markdown rendering
 
 
 def analyze_files(commits_and_tags, dry_run=False):
@@ -99,6 +101,10 @@ def analyze_files(commits_and_tags, dry_run=False):
         "*.jelly",
         "*.js",
     ]
+
+    runningInCI = os.environ.get("CI", "false") == "true"
+    if runningInCI:
+        print("<details><summary>Detailed output</summary>\n\n")
     with subprocess.Popen(cmd, stdout=subprocess.PIPE) as proc:
         for line in io.TextIOWrapper(proc.stdout):
             parts = line.rstrip().split(":", 2)
@@ -107,6 +113,8 @@ def analyze_files(commits_and_tags, dry_run=False):
         if retcode:
             raise subprocess.CalledProcessError(retcode, cmd)
     print()
+    if runningInCI:
+        print("</details>\n")
 
 
 def display_results(commits_and_tags):

From 5fc92c6c2d9d397c08478147fd39b55000d426fa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:01:59 +0100
Subject: [PATCH 417/449] Update jenkins/ath Docker tag to v5992 (#9720)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 45427edd5214..2df3d4909e10 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5968.v180888e51761
+export ATH_VERSION=5992.v39030e88deb_3
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From bb7a30a7778116e2d1a7c931d76477fb258ad6b0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:02:10 +0100
Subject: [PATCH 418/449] Update dependency
 org.jenkins-ci.plugins:script-security to v1361 (#9719)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 83dc98da7e29..97fa920d4090 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -118,7 +118,7 @@ THE SOFTWARE.
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
-        <version>1358.vb_26663c13537</version>
+        <version>1361.v913100720139</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 47b268761f3a..32a0c23d9dca 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -304,7 +304,7 @@ THE SOFTWARE.
                   <!-- dependency of command-launcher, junit, matrix-project, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>script-security</artifactId>
-                  <version>1358.vb_26663c13537</version>
+                  <version>1361.v913100720139</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From ce3d8c102c00f06c21f63796a6421b80bff6e4ca Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Fri, 13 Sep 2024 07:42:40 +0100
Subject: [PATCH 419/449] Update appearance of 'Jenkins is starting' pages
 (#9707)

* Init

* Update simple-page.scss

* Simplify

* Update simple-page.scss

* Delete loading.css

* Update some translations

* Remove some translations (still more to update)

* WIP translations - just need to confirm with friends

* Update/remove translations
---
 .../WindowsInstallerLink/_restart.jelly       | 22 ++---
 .../WindowsInstallerLink/_restart.properties  |  2 +
 .../hudson/util/HudsonIsLoading/index.jelly   | 24 +++---
 .../util/HudsonIsLoading/index.properties     |  4 +
 .../util/HudsonIsLoading/index_bg.properties  |  4 +-
 .../util/HudsonIsLoading/index_cs.properties  |  4 +-
 .../util/HudsonIsLoading/index_da.properties  |  4 +-
 .../util/HudsonIsLoading/index_de.properties  |  4 +-
 .../util/HudsonIsLoading/index_es.properties  |  4 +-
 .../util/HudsonIsLoading/index_fr.properties  |  4 +-
 .../util/HudsonIsLoading/index_it.properties  |  5 +-
 .../util/HudsonIsLoading/index_ja.properties  |  4 +-
 .../util/HudsonIsLoading/index_ko.properties  |  3 +-
 .../util/HudsonIsLoading/index_lt.properties  |  5 +-
 .../util/HudsonIsLoading/index_lv.properties  |  3 +-
 .../util/HudsonIsLoading/index_nl.properties  |  4 +-
 .../util/HudsonIsLoading/index_pl.properties  |  4 +-
 .../HudsonIsLoading/index_pt_BR.properties    |  3 +-
 .../util/HudsonIsLoading/index_ru.properties  |  4 +-
 .../util/HudsonIsLoading/index_sr.properties  |  3 +-
 .../HudsonIsLoading/index_sv_SE.properties    |  3 +-
 .../util/HudsonIsLoading/index_tr.properties  |  3 +-
 .../HudsonIsLoading/index_zh_TW.properties    |  1 -
 .../util/HudsonIsRestarting/index.jelly       | 45 +++++-----
 .../util/HudsonIsRestarting/index.properties  |  2 +
 .../HudsonIsRestarting/index_bg.properties    |  4 +-
 .../HudsonIsRestarting/index_da.properties    |  4 +-
 .../HudsonIsRestarting/index_de.properties    |  4 +-
 .../HudsonIsRestarting/index_es.properties    |  4 +-
 .../HudsonIsRestarting/index_fr.properties    |  4 +-
 .../HudsonIsRestarting/index_it.properties    |  4 +-
 .../HudsonIsRestarting/index_ja.properties    |  4 +-
 .../HudsonIsRestarting/index_nb_NO.properties |  3 +-
 .../HudsonIsRestarting/index_nl.properties    |  3 +-
 .../HudsonIsRestarting/index_pt_BR.properties |  3 +-
 .../HudsonIsRestarting/index_ru.properties    |  3 +-
 .../HudsonIsRestarting/index_sr.properties    |  3 +-
 .../HudsonIsRestarting/index_sv_SE.properties |  3 +-
 .../HudsonIsRestarting/index_uk.properties    |  3 +-
 .../HudsonIsRestarting/index_zh_TW.properties |  3 +-
 war/src/main/scss/components/_spinner.scss    | 12 +--
 war/src/main/scss/simple-page.scss            | 45 ++++++++--
 war/src/main/webapp/css/loading.css           | 86 -------------------
 43 files changed, 139 insertions(+), 224 deletions(-)
 create mode 100644 core/src/main/resources/hudson/util/HudsonIsLoading/index.properties
 create mode 100644 core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties
 delete mode 100644 war/src/main/webapp/css/loading.css

diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly
index 6f04bbd02baf..5423852829c6 100644
--- a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly
+++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.jelly
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml" xmlns:l="/lib/layout">
     <j:new var="h" className="hudson.Functions" />
     <st:statusCode value="503" /><!-- SERVICE NOT AVAILABLE -->
     <st:header name="Expires" value="0" />
@@ -40,21 +40,17 @@ THE SOFTWARE.
             <!-- mobile friendly layout -->
             <meta name="viewport" content="width=device-width, initial-scale=1" />
             <link rel="stylesheet" href="${resURL}/jsbundles/simple-page.css" type="text/css" />
-            <link rel="stylesheet" href="${resURL}/css/loading.css" type="text/css" />
         </head>
         <body>
             <div class="simple-page" role="main">
-                <div class="modal signup">
-                    <div class="signupIntroDefault">
-                        <div class="logo" />
-                        <h1 class="loading">
-                            ${%Please wait while Jenkins is restarting}
-                            <span>.</span><span>.</span><span>.</span>
-                        </h1>
-                        <p>
-                            ${%blurb}
-                        </p>
-                    </div>
+                <div class="app-jenkins-booting">
+                    <div class="logo" />
+                    <h1 class="loading">
+                        <l:spinner text="${%Please wait while Jenkins is restarting}" />
+                    </h1>
+                    <p>
+                        ${%blurb}
+                    </p>
                 </div>
             </div>
             <script src="${resURL}/scripts/loading.js" type="text/javascript" />
diff --git a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.properties b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.properties
index ebb93f595ae9..31baf30f4b27 100644
--- a/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.properties
+++ b/core/src/main/resources/hudson/lifecycle/WindowsInstallerLink/_restart.properties
@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+Please\ wait\ while\ Jenkins\ is\ restarting=\
+ Jenkins is restarting
 blurb=You should be taken automatically to the new Jenkins in a few seconds. \
   If for some reason the service fails to start, please check the Windows event log for errors and consult the wiki page \
   located at the <a href="https://www.jenkins.io/redirect/troubleshooting/windows-service-fails-to-start">official wiki</a>.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly b/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
index 77fa395340aa..b4b89dc37f9f 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml" xmlns:l="/lib/layout">
     <j:new var="h" className="hudson.Functions" />
     <st:statusCode value="503" /><!-- SERVICE NOT AVAILABLE -->
     <st:header name="Expires" value="0" />
@@ -40,23 +40,19 @@ THE SOFTWARE.
             <!-- mobile friendly layout -->
             <meta name="viewport" content="width=device-width, initial-scale=1" />
             <link rel="stylesheet" href="${resURL}/jsbundles/simple-page.css" type="text/css" />
-            <link rel="stylesheet" href="${resURL}/css/loading.css" type="text/css" />
         </head>
         <body>
             <div class="simple-page" role="main">
-                <div class="modal signup">
-                    <div class="signupIntroDefault">
-                        <div class="logo">
-                          <img src="${imagesURL}/svgs/logo.svg" alt="Jenkins logo" />
-                        </div>
-                        <h1 class="loading">
-                            ${%Please wait while Jenkins is getting ready to work}
-                            <span>.</span><span>.</span><span>.</span>
-                        </h1>
-                        <p class="restarting">
-                            ${%Your browser will reload automatically when Jenkins is ready.}
-                        </p>
+                <div class="app-jenkins-booting">
+                    <div class="logo">
+                      <img src="${imagesURL}/svgs/logo.svg" alt="Jenkins logo" />
                     </div>
+                    <h1 class="loading">
+                        <l:spinner text="${%Please wait while Jenkins is getting ready to work}" />
+                    </h1>
+                    <p class="restarting">
+                        ${%Your browser will reload automatically when Jenkins is ready}
+                    </p>
                 </div>
             </div>
             <script src="${resURL}/scripts/loading.js" type="text/javascript" />
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index.properties
new file mode 100644
index 000000000000..aa8045ec46d1
--- /dev/null
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index.properties
@@ -0,0 +1,4 @@
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\
+ Jenkins is getting ready to work
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
+ Your browser will reload automatically when Jenkins is ready
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties
index c4dbafc096d3..c331f8a818e5 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_bg.properties
@@ -20,7 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
  Браузърът ви ще се презареди автоматично, когато Jenkins е готов.
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\
- Изчакайте докато Jenkins стане готов за работа
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties
index a6178e681dfb..97b9b1734536 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_cs.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Počkejte prosím, než aplikace Jenkins zcela naběhne
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jakmile bude Jenkins připraven, stránka se automaticky obnoví.
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Počkejte, než aplikace Jenkins zcela naběhne
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jakmile bude Jenkins připraven, stránka se automaticky obnoví.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties
index e21aea6cced6..4acb9a57466b 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_da.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din browser vil genindlæse siden automatisk når Jenkins er klar.
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Vent venligst imens Jenkins gør klar til at arbejde
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din browser vil genindlæse siden automatisk når Jenkins er klar.
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Vent imens Jenkins gør klar til at arbejde
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties
index 5c8ce353b0a1..61c881694d73 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_de.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins wird gestartet. Bitte warten
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist.
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins wird gestartet
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties
index af8a8155bcd7..b969a775dc32 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_es.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Por favor espera hasta que Jenkins esté listo.
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Su navegador recargará automáticamente esta página cuando Jenkins esté listo.
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Espera hasta que Jenkins esté listo.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Su navegador recargará automáticamente esta página cuando Jenkins esté listo.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties
index 1700e54e1d59..3dc42107ac02 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_fr.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Merci d''attendre que Jenkins soit prêt
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Votre navigateur web sera rafraîchi automatiquement lorsque Jenkins sera prêt.
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Attendre que Jenkins soit prêt
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Votre navigateur web sera rafraîchi automatiquement lorsque Jenkins sera prêt.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties
index d51ce8d127b6..c8f8d963106b 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_it.properties
@@ -21,9 +21,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Attendere finché \
-  Jenkins si prepara a funzionare
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Attendere prego, Jenkins sta caricando
 Starting\ Jenkins=Avvio di Jenkins in corso
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Quando \
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Quando \
   Jenkins sarà pronto per funzionare, la finestra del browser si aggiornerà \
   automaticamente.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties
index ea257511d10f..fa6f1bad9ad1 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ja.properties
@@ -20,7 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\
-  Jenkinsの準備ができるまで、お待ちください。
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
   Jenkinsの準備が完了すると、ブラウザは自動的にリロードされます。
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties
index 9cd2f2882b1b..982019562984 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ko.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins가 준비 될 때까지 기다려주세요.
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins가 준비 되면 자동 리로딩 합니다.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins가 준비 되면 자동 리로딩 합니다.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties
index e58dc1096e11..856b81052af0 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties
@@ -1,6 +1,3 @@
 # This file is under the MIT License by authors
 
-# /jenkins-core/src/main/resources/hudson/util/HudsonIsLoading/index_lt.properties
-
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins ruošiamas darbui, prašome palaukti
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Kuomet Jenkins bus paruoštas, Jūsų naršyklė persikraus automatiškai.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Kuomet Jenkins bus paruoštas, Jūsų naršyklė persikraus automatiškai.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties
index 5d2407f80bd1..334fd8f68ae9 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_lv.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Lūdzu uzgaidiet, kamēr Jenkins sagatavojās darbam...
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jūsu pārlūks automātiski pārlādēsies, kad Jenkins būs gatavs.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jūsu pārlūks automātiski pārlādēsies, kad Jenkins būs gatavs.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties
index 9020673e1798..9e65918cc884 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_nl.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins is aan het opstarten. Gelieve even te wachten.
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Uw browser zal zich vernieuwen wanneer Jenkins gereed is.
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins is aan het opstarten
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Uw browser zal zich vernieuwen wanneer Jenkins gereed is.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties
index 0b15e437ed76..c1c5d8d00312 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pl.properties
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Poczekaj proszę, aż Jenkins będzie gotowy do pracy
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Twoja przeglądarka automatycznie przeładuje stronę, kiedy Jenkins będzie gotowy.
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins jest przygotowywany do pracy
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Twoja przeglądarka automatycznie przeładuje stronę, kiedy Jenkins będzie gotowy.
 Starting\ Jenkins=Uruchamianie Jenkinsa
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties
index 1577f6d6549e..101fe1fbbcc8 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_pt_BR.properties
@@ -20,6 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Por favor aguarde enquanto o Jenkins se prepara para trabalhar
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto.
 Starting\ Jenkins=Iniciando\ o\ Jenkins
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties
index 0b0c44865cf2..769f7ab8945c 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_ru.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Пожалуйста, подождите. Jenkins готовится к работе
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Эта страница будет перезагружена, когда Jenkins будет готов.
+Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins готовится к работе
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Эта страница будет перезагружена, когда Jenkins будет готов.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties
index ef611a407eff..1ed534354f35 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_sr.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман.
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Молимо вас, сачекајте док се Jenkins припрема.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties
index e8e233a4a78d..a6c28b828d7b 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_sv_SE.properties
@@ -1,5 +1,4 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Var god vänta medan Jenkins förbereds
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din webbläsare laddas om automatiskt när Jenkins är redo.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din webbläsare laddas om automatiskt när Jenkins är redo.
 Starting\ Jenkins=Jenkins startar upp
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties
index 75ceabc3dd0e..034738e3f8ac 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_tr.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins kullanıma hazır oluncaya kadar lütfen bekleyiniz
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins hazır olduğunda tarayıcınız otomatik olarak yeniden yüklenecektir.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins hazır olduğunda tarayıcınız otomatik olarak yeniden yüklenecektir.
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties
index e1c348f32d51..75f38bb2f774 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index_zh_TW.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins 就緒後，您的瀏覽器會自動重載頁面。
 Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=Jenkins 準備要上工了，請耐心等候
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
index c51e37e67687..79a190db686e 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:x="jelly:xml" xmlns:l="/lib/layout">
     <j:new var="h" className="hudson.Functions" />
     <st:statusCode value="503" /><!-- SERVICE NOT AVAILABLE -->
     <st:header name="Expires" value="0" />
@@ -40,34 +40,29 @@ THE SOFTWARE.
             <!-- mobile friendly layout -->
             <meta name="viewport" content="width=device-width, initial-scale=1" />
             <link rel="stylesheet" href="${resURL}/jsbundles/simple-page.css" type="text/css" />
-            <link rel="stylesheet" href="${resURL}/css/loading.css" type="text/css" />
         </head>
         <body>
             <div class="simple-page" role="main">
-                <div class="modal signup">
-                    <div class="signupIntroDefault">
-                        <div class="logo">
-                          <img src="${imagesURL}/svgs/logo.svg" alt="Jenkins logo" />
-                        </div>
-                        <h1 class="loading">
-                            ${%Please wait while Jenkins is restarting}
-                            <span>.</span><span>.</span><span>.</span>
-                        </h1>
-                        <p class="restarting">
-                            ${%Your browser will reload automatically when Jenkins is ready.}
-                        </p>
-                        <j:if test="${it.safeRestart}">
-                            <div class="safe-restarting">
-                                <p>
-                                    <strong>${%Safe Restart}</strong>
-                                </p>
-                                <p>
-                                    ${%Builds on agents can usually continue.}
-                                </p>
-                            </div>
-                        </j:if>
-
+                <div class="app-jenkins-booting">
+                    <div class="logo">
+                      <img src="${imagesURL}/svgs/logo.svg" alt="Jenkins logo" />
                     </div>
+                    <h1 class="loading">
+                        <l:spinner text="${%Please wait while Jenkins is restarting}" />
+                    </h1>
+                    <p class="restarting">
+                        ${%Your browser will reload automatically when Jenkins is ready}
+                    </p>
+                    <j:if test="${it.safeRestart}">
+                        <div class="safe-restarting">
+                            <p>
+                                <strong>${%Safe Restart}</strong>
+                            </p>
+                            <p>
+                                ${%Builds on agents can usually continue.}
+                            </p>
+                        </div>
+                    </j:if>
                 </div>
             </div>
             <script src="${resURL}/scripts/loading.js" type="text/javascript" />
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties
new file mode 100644
index 000000000000..6ad13259188f
--- /dev/null
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties
@@ -0,0 +1,2 @@
+Please\ wait\ while\ Jenkins\ is\ restarting=\
+ Jenkins is restarting
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties
index 5008885a291a..2fc6724ce0aa 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_bg.properties
@@ -20,7 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ restarting=\
- Изчакайте докато Jenkins рестартира
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
  Браузър ви автоматично ще презареди страницата, когато Jenkins е готов.
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties
index 16914e8d8254..04373ef93cb6 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_da.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din browser vil genindlæse siden automatisk når Jenkins er klar.
-Please\ wait\ while\ Jenkins\ is\ restarting=Vent venligst imens Jenkins genstarter
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din browser vil genindlæse siden automatisk når Jenkins er klar.
+Please\ wait\ while\ Jenkins\ is\ restarting=Vent venligst Jenkins genstarter
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties
index 1750883d183d..9dea3f4e2e41 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_de.properties
@@ -1,5 +1,5 @@
-Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins wird neu gestartet. Bitte warten.
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist.
+Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins wird neu gestartet
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Der Webbrowser wird diese Seite automatisch neu laden, sobald Jenkins hochgefahren ist.
 Safe\ Restart=Sicherer Neustart
 Builds\ on\ agents\ can\ usually\ continue.=Builds auf Agenten laufen in der Regel weiter.
 Restart=Neustarten
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties
index 7c6125c37624..4ce22a2664ad 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Por favor espera hasta que Jenkins acabe de reiniciarse.
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Su navegador recargará esta página cuando Jenkins esté listo.
+Please\ wait\ while\ Jenkins\ is\ restarting=Espera hasta que Jenkins acabe de reiniciarse
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Su navegador recargará esta página cuando Jenkins esté listo.
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties
index efce31db91aa..ef2491cf87df 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_fr.properties
@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 Restarting\ Jenkins=Redémarrage de Jenkins
-Please\ wait\ while\ Jenkins\ is\ restarting=Veuillez attendre pendant que Jenkins redémarre
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Votre navigateur se rafraîchira automatiquement quand Jenkins sera prêt.
+Please\ wait\ while\ Jenkins\ is\ restarting=Attendre pendant que Jenkins redémarre
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Votre navigateur se rafraîchira automatiquement quand Jenkins sera prêt.
 Safe\ Restart=Redémarrage sans danger
 Builds\ on\ agents\ can\ usually\ continue.=Les builds sur les agents peuvent généralement se poursuivre.
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_it.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_it.properties
index 4f54ef52a89f..9f5df7c4131c 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_it.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_it.properties
@@ -21,9 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Attendere finché Jenkins si sta \
-  riavviando
 Restarting\ Jenkins=Riavvio di Jenkins in corso
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Quando \
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Quando \
   Jenkins sarà pronto per funzionare, la finestra del browser si aggiornerà \
   automaticamente.
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ja.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ja.properties
index 76b280e6da63..fa6f1bad9ad1 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ja.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ja.properties
@@ -20,7 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ restarting=\
-  Jenkinsが再起動するまでしばらくお待ちください
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=\
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
   Jenkinsの準備が完了すると、ブラウザは自動的にリロードされます。
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nb_NO.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nb_NO.properties
index a20538adecdb..c25adffcdc60 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nb_NO.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nb_NO.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Vennligst vent mens Jenkins restartes
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Nettleseren vil automatisk lastes på nytt når Jenkins er klar
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Nettleseren vil automatisk lastes på nytt når Jenkins er klar
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nl.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nl.properties
index 343d92136586..ddf3ff9cbe54 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nl.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_nl.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins wordt herstart. Gelieve even te wachten.
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Uw browser zal zich vernieuwen wanneer Jenkins gereed is.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Uw browser zal zich vernieuwen wanneer Jenkins gereed is.
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties
index 3e6f01596eb9..6a361205b7d1 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_pt_BR.properties
@@ -20,6 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Por favor aguarde enquanto o Jenkins está reiniciando
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Seu navegador recarregará automaticamente quando o Jenkins estiver pronto.
 Restarting\ Jenkins=Reiniciando\ o\ Jenkins
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ru.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ru.properties
index 896b441f7fb9..1c8a94f884c2 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ru.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_ru.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Пожалуйста, подождите, Jenkins перезагружается
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Когда перезагрузка будет завершена, страница должна автоматически обновиться
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Когда перезагрузка будет завершена, страница должна автоматически обновиться
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sr.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sr.properties
index 028e5be0ff2b..1ed534354f35 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sr.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sr.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Молимо вас, сачекајте док се поново покреће Jenkins.
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Ваш веб-прегледач ће се аутоматски освежити када буде Jenkins био спреман.
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sv_SE.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sv_SE.properties
index f174baeca3eb..2067bb997665 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sv_SE.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_sv_SE.properties
@@ -1,7 +1,6 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Vänta medan Jenkins startar om
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Din webbläsare laddas om automatiskt när Jenkins är redo.
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Din webbläsare laddas om automatiskt när Jenkins är redo.
 Restarting\ Jenkins=Jenkins startar om
 
 Safe\ Restart=Säker omstart
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_uk.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_uk.properties
index b67d35e570a1..e3e1f1da0ff8 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_uk.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_uk.properties
@@ -1,4 +1,3 @@
 # This file is under the MIT License by authors
 
-Please\ wait\ while\ Jenkins\ is\ restarting=Зачекайте, будь ласка, поки Jenkins перегрузиться
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Ваш браузер буде прегружено після того як Jenkins буде готовий
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Ваш браузер буде прегружено після того як Jenkins буде готовий
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_zh_TW.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_zh_TW.properties
index 7e5a5f204148..a88b436fbce6 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index_zh_TW.properties
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index_zh_TW.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready.=Jenkins 就緒後，您的瀏覽器會自動重載頁面。
-Please\ wait\ while\ Jenkins\ is\ restarting=Jenkins 重新啟動中，請耐心等候
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Jenkins 就緒後，您的瀏覽器會自動重載頁面。
diff --git a/war/src/main/scss/components/_spinner.scss b/war/src/main/scss/components/_spinner.scss
index af5732ca8320..c1a3fde2dd9c 100644
--- a/war/src/main/scss/components/_spinner.scss
+++ b/war/src/main/scss/components/_spinner.scss
@@ -10,23 +10,23 @@
   &::after {
     content: "";
     display: inline-block;
-    width: 1.3rem;
-    height: 1.3rem;
+    width: 0.9lh;
+    height: 0.9lh;
     border-radius: 100%;
-    border: 0.175rem solid currentColor;
+    border: 0.125lh solid currentColor;
   }
 
   &::before {
     position: relative;
-    margin-right: 0.75rem;
+    margin-right: 0.5lh;
     opacity: 0.2;
-    align-self: flex-start;
   }
 
   &::after {
     position: absolute;
-    top: 0;
+    top: 50%;
     left: 0;
+    translate: 0 -0.45lh;
     clip-path: inset(0 0 50% 50%);
     animation: loading-spinner 1s infinite linear;
 
diff --git a/war/src/main/scss/simple-page.scss b/war/src/main/scss/simple-page.scss
index 08bb4f1493e2..43c82a975b76 100644
--- a/war/src/main/scss/simple-page.scss
+++ b/war/src/main/scss/simple-page.scss
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 @use "./base/core";
+@use "./components/spinner";
 @use "./pages/sign-in-register";
 
 .simple-page h1 {
@@ -36,11 +37,10 @@
 }
 
 .simple-page .safe-restarting {
-  font-size: var(--font-size-sm);
-  padding: 15px;
+  padding: 10px 30px;
   border-radius: 10px;
   text-align: center;
-  margin: 5% auto auto;
+  margin-top: 2rem;
   background-color: var(--alert-success-bg-color);
   border: 1px solid var(--alert-success-border-color);
 
@@ -74,7 +74,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  min-height: 90vh;
+  min-height: 100vh;
 }
 
 .simple-page .jenkins-button {
@@ -90,7 +90,7 @@
 }
 
 .simple-page .logo > img {
-  height: 130px;
+  height: 140px;
 }
 
 .simple-page form .submit input {
@@ -108,3 +108,38 @@
 .simple-page .jenkins-alert {
   color: var(--danger-color, #c4000a);
 }
+
+@keyframes fade-in-jenkins-booting {
+  from {
+    scale: 97.5%;
+    opacity: 0;
+    filter: blur(1px);
+  }
+}
+
+.app-jenkins-booting {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  animation: fade-in-jenkins-booting 0.4s both 0.2s;
+  // Optical compensation to visually center content
+  margin-top: -3rem;
+
+  * {
+    font-size: 1rem;
+    margin: 0;
+  }
+}
+
+.loading {
+  margin: 1rem 0 0;
+
+  p {
+    font-weight: 500;
+    font-size: 1.125rem;
+  }
+}
+
+.restarting {
+  color: var(--text-color-secondary);
+}
diff --git a/war/src/main/webapp/css/loading.css b/war/src/main/webapp/css/loading.css
deleted file mode 100644
index e0c1bdc8016d..000000000000
--- a/war/src/main/webapp/css/loading.css
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2018, CloudBees, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-@keyframes blink {
-  /**
-     * At the start of the animation the dot
-     * has an opacity of .2
-     */
-  0% {
-    opacity: 0.2;
-  }
-  /**
-     * At 20% the dot is fully visible and
-     * then fades out slowly
-     */
-  20% {
-    opacity: 1;
-  }
-  /**
-     * Until it reaches an opacity of .2 and
-     * the animation can start again
-     */
-  100% {
-    opacity: 0.2;
-  }
-}
-.loading span {
-  /**
-     * Use the blink animation, which is defined above
-     */
-  animation-name: blink;
-  /**
-     * The animation should take 1.4 seconds
-     */
-  animation-duration: 1.4s;
-  /**
-     * It will repeat itself forever
-     */
-  animation-iteration-count: infinite;
-  /**
-     * This makes sure that the starting style (opacity: .2)
-     * of the animation is applied before the animation starts.
-     * Otherwise we would see a short flash or would have
-     * to set the default styling of the dots to the same
-     * as the animation. Same applies for the ending styles.
-     */
-  animation-fill-mode: both;
-}
-
-.loading span:nth-child(2) {
-  /**
-     * Starts the animation of the third dot
-     * with a delay of .2s, otherwise all dots
-     * would animate at the same time
-     */
-  animation-delay: 0.2s;
-}
-
-.loading span:nth-child(3) {
-  /**
-     * Starts the animation of the third dot
-     * with a delay of .4s, otherwise all dots
-     * would animate at the same time
-     */
-  animation-delay: 0.4s;
-}

From d5271c8d2f38a2ba8b1f9d8fcbb66070e5e5333d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 07:43:31 +0100
Subject: [PATCH 420/449] Update dependency postcss-preset-env to v10.0.3
 (#9722)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 war/package.json |  2 +-
 war/yarn.lock    | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/war/package.json b/war/package.json
index e6b18f5a2a37..882d4220c8d6 100644
--- a/war/package.json
+++ b/war/package.json
@@ -39,7 +39,7 @@
     "mini-css-extract-plugin": "2.9.1",
     "postcss": "8.4.45",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "10.0.2",
+    "postcss-preset-env": "10.0.3",
     "postcss-scss": "4.0.9",
     "prettier": "3.3.3",
     "sass": "1.78.0",
diff --git a/war/yarn.lock b/war/yarn.lock
index eb19ca5a25e3..eb14c96722b8 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3185,10 +3185,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssdb@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "cssdb@npm:8.1.0"
-  checksum: 10c0/1fa1f1566c7e9964f5c71e443583eaba16a90933a3ef6803815c4281d084b75da948c415bade33d7085894fe0929c082fcb3135bf4400048cfff40d227ebd5dd
+"cssdb@npm:^8.1.1":
+  version: 8.1.1
+  resolution: "cssdb@npm:8.1.1"
+  checksum: 10c0/d60facfad3bca70e21100fc35b9205cb9d3d0ac642f44f0a687e54bf787f21c43d28ce2d17fcd405f67950fb4709516108fe1f3cb15df570eff1007b5fbbc787
   languageName: node
   linkType: hard
 
@@ -4404,7 +4404,7 @@ __metadata:
     mini-css-extract-plugin: "npm:2.9.1"
     postcss: "npm:8.4.45"
     postcss-loader: "npm:8.1.1"
-    postcss-preset-env: "npm:10.0.2"
+    postcss-preset-env: "npm:10.0.3"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.3.3"
     sass: "npm:1.78.0"
@@ -5840,12 +5840,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-opacity-percentage@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "postcss-opacity-percentage@npm:2.0.0"
+"postcss-opacity-percentage@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-opacity-percentage@npm:3.0.0"
   peerDependencies:
-    postcss: ^8.2
-  checksum: 10c0/f031f3281060c4c0ede8f9a5832f65a3d8c2a1896ff324c41de42016e092635f0e0abee07545b01db93dc430a9741674a1d09c377c6c01cd8c2f4be65f889161
+    postcss: ^8.4
+  checksum: 10c0/15c7d66036fa966d265c8737196646b3f93deb83d4eea0b17ed5033460599afc31d3a989345e4d7c472963b2a2bb75c83d06979d5d30d6a60fcc7f74cb6d8d40
   languageName: node
   linkType: hard
 
@@ -5892,9 +5892,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-preset-env@npm:10.0.2":
-  version: 10.0.2
-  resolution: "postcss-preset-env@npm:10.0.2"
+"postcss-preset-env@npm:10.0.3":
+  version: 10.0.3
+  resolution: "postcss-preset-env@npm:10.0.3"
   dependencies:
     "@csstools/postcss-cascade-layers": "npm:^5.0.0"
     "@csstools/postcss-color-function": "npm:^4.0.2"
@@ -5931,7 +5931,7 @@ __metadata:
     css-blank-pseudo: "npm:^7.0.0"
     css-has-pseudo: "npm:^7.0.0"
     css-prefers-color-scheme: "npm:^10.0.0"
-    cssdb: "npm:^8.1.0"
+    cssdb: "npm:^8.1.1"
     postcss-attribute-case-insensitive: "npm:^7.0.0"
     postcss-clamp: "npm:^4.1.0"
     postcss-color-functional-notation: "npm:^7.0.2"
@@ -5950,7 +5950,7 @@ __metadata:
     postcss-lab-function: "npm:^7.0.2"
     postcss-logical: "npm:^8.0.0"
     postcss-nesting: "npm:^13.0.0"
-    postcss-opacity-percentage: "npm:^2.0.0"
+    postcss-opacity-percentage: "npm:^3.0.0"
     postcss-overflow-shorthand: "npm:^6.0.0"
     postcss-page-break: "npm:^3.0.4"
     postcss-place: "npm:^10.0.0"
@@ -5959,7 +5959,7 @@ __metadata:
     postcss-selector-not: "npm:^8.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/51eb19994dfdbb041e87082833bedf8976053c182ae8dafab6b3ee1bf2cfd309ab9c186644ed032518011e44fbcc9f0552083bc431535779a80a919bbe78d10d
+  checksum: 10c0/da42caa2aab4d825fddfde00ebe2416d338c7b9a6f79a68840297888a8384f85991991c3fa10cf2d359fb230c885375f5cebd7bd63972725cd2a596d218f8b6a
   languageName: node
   linkType: hard
 

From dab6597416836c3578b510e7d2faeff2d3ebbcde Mon Sep 17 00:00:00 2001
From: Devin Nusbaum <dwnusbaum@users.noreply.github.com>
Date: Fri, 13 Sep 2024 18:21:22 -0400
Subject: [PATCH 421/449] [JENKINS-73687] Make deserialization of `Map` fields
 in XML files more robust (#9653)

* Improve resilience against malformed XML files during deserialization

* Improve error message
---
 .../java/hudson/util/RobustMapConverter.java  |  7 +++
 .../hudson/util/RobustMapConverterTest.java   | 45 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/core/src/main/java/hudson/util/RobustMapConverter.java b/core/src/main/java/hudson/util/RobustMapConverter.java
index 896138ace0e9..f845e38771cc 100644
--- a/core/src/main/java/hudson/util/RobustMapConverter.java
+++ b/core/src/main/java/hudson/util/RobustMapConverter.java
@@ -25,6 +25,7 @@
 package hudson.util;
 
 import com.thoughtworks.xstream.XStreamException;
+import com.thoughtworks.xstream.converters.ConversionException;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.converters.collections.MapConverter;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
@@ -64,6 +65,12 @@ final class RobustMapConverter extends MapConverter {
     }
 
     private Object read(HierarchicalStreamReader reader, UnmarshallingContext context, Map map) {
+        if (!reader.hasMoreChildren()) {
+            var exception = new ConversionException("Invalid map entry");
+            reader.appendErrors(exception);
+            RobustReflectionConverter.addErrorInContext(context, exception);
+            return ERROR;
+        }
         reader.moveDown();
         try {
             return readBareItem(reader, context, map);
diff --git a/core/src/test/java/hudson/util/RobustMapConverterTest.java b/core/src/test/java/hudson/util/RobustMapConverterTest.java
index d5ac80124ea8..b74ac9303f71 100644
--- a/core/src/test/java/hudson/util/RobustMapConverterTest.java
+++ b/core/src/test/java/hudson/util/RobustMapConverterTest.java
@@ -25,6 +25,7 @@
 package hudson.util;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
@@ -142,4 +143,48 @@ private Map<Object, Object> preparePayload() {
         }
         return map;
     }
+
+    @Test
+    public void robustAgainstInvalidEntry() {
+        XStream2 xstream2 = new XStream2();
+        String xml =
+            """
+            <hudson.util.RobustMapConverterTest_-Data>
+              <map>
+                <string>key1</string>
+                <entry>
+                  <string>key2</string>
+                  <string>value2</string>
+                </entry>
+              </map>
+            </hudson.util.RobustMapConverterTest_-Data>
+            """;
+        Data data = (Data) xstream2.fromXML(xml);
+        assertThat(data.map, equalTo(Map.of("key2", "value2")));
+    }
+
+    @Test
+    public void robustAgainstInvalidEntryWithNoValue() {
+        XStream2 xstream2 = new XStream2();
+        String xml =
+            """
+            <hudson.util.RobustMapConverterTest_-Data>
+              <map>
+                <entry>
+                  <string>key1</string>
+                </entry>
+                <entry>
+                  <string>key2</string>
+                  <string>value2</string>
+                </entry>
+              </map>
+            </hudson.util.RobustMapConverterTest_-Data>
+            """;
+        Data data = (Data) xstream2.fromXML(xml);
+        assertThat(data.map, equalTo(Map.of("key2", "value2")));
+    }
+
+    private static final class Data {
+        Map<String, String> map;
+    }
 }

From 6a5b5f61ebd886c4c28086928da0a6919f8b41e4 Mon Sep 17 00:00:00 2001
From: Thorsten Scherler <scherler@gmail.com>
Date: Sat, 14 Sep 2024 00:21:31 +0200
Subject: [PATCH 422/449] [JENKINS-73695] Prevent unnecessary horizontal
 scrollbar in Firefox (#9695)

* [JENKINS-73695] reduce table width to prevent horizontal scrollbar in FF

Signed-off-by: Thorsten Scherler <scherler@gmail.com>

* [JENKINS-73695] use media query for ff

Signed-off-by: Thorsten Scherler <scherler@gmail.com>

* Update war/src/main/scss/components/_table.scss

Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com>

---------

Signed-off-by: Thorsten Scherler <scherler@gmail.com>
Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
---
 war/src/main/scss/components/_table.scss | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss
index f247407a8f3b..7d8b9e274f6e 100644
--- a/war/src/main/scss/components/_table.scss
+++ b/war/src/main/scss/components/_table.scss
@@ -13,13 +13,16 @@
   background-clip: padding-box;
   margin-bottom: var(--section-padding);
 
-  &::before {
-    content: "";
-    position: absolute;
-    inset: -4px -4px -2px;
-    border: var(--card-border-width) solid var(--table-border-color);
-    border-radius: inherit;
-    pointer-events: none;
+  // The '::before' pseudo-element is causing overflow issues in Firefox, so disable it for that browser
+  @supports (not (-moz-appearance: none)) {
+    &::before {
+      content: "";
+      position: absolute;
+      inset: -4px -4px -2px;
+      border: var(--card-border-width) solid var(--table-border-color);
+      border-radius: inherit;
+      pointer-events: none;
+    }
   }
 
   * {

From be3d711d690d5cf670ced78019717b4c609eda1b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:21:38 -0600
Subject: [PATCH 423/449] Fill in since annotations (#9721)

Co-authored-by: timja <21194782+timja@users.noreply.github.com>
---
 core/src/main/java/hudson/Functions.java         | 16 ++++++++--------
 core/src/main/java/hudson/Plugin.java            |  4 ++--
 core/src/main/java/hudson/PluginManager.java     |  2 +-
 core/src/main/java/hudson/Util.java              |  2 +-
 core/src/main/java/hudson/WebAppMain.java        |  2 +-
 .../java/hudson/console/AnnotatedLargeText.java  |  6 +++---
 .../src/main/java/hudson/model/AbstractItem.java |  8 ++++----
 .../main/java/hudson/model/AbstractProject.java  |  2 +-
 core/src/main/java/hudson/model/Actionable.java  |  4 ++--
 .../hudson/model/BuildAuthorizationToken.java    |  4 ++--
 core/src/main/java/hudson/model/Descriptor.java  | 12 ++++++------
 core/src/main/java/hudson/model/Hudson.java      |  4 ++--
 .../main/java/hudson/model/ItemGroupMixIn.java   |  2 +-
 core/src/main/java/hudson/model/Job.java         |  6 +++---
 core/src/main/java/hudson/model/JobProperty.java |  2 +-
 core/src/main/java/hudson/model/Project.java     |  2 +-
 core/src/main/java/hudson/model/RSS.java         |  6 +++---
 core/src/main/java/hudson/model/Run.java         |  4 ++--
 core/src/main/java/hudson/model/View.java        |  4 ++--
 .../main/java/hudson/scm/RepositoryBrowsers.java |  2 +-
 .../main/java/hudson/security/SecurityRealm.java |  6 +++---
 core/src/main/java/hudson/slaves/Cloud.java      |  2 +-
 .../java/hudson/slaves/ComputerListener.java     |  2 +-
 core/src/main/java/hudson/tasks/LogRotator.java  |  2 +-
 core/src/main/java/hudson/util/FormApply.java    |  2 +-
 core/src/main/java/hudson/util/Graph.java        |  4 ++--
 core/src/main/java/hudson/util/ListBoxModel.java |  2 +-
 .../java/hudson/util/PluginServletFilter.java    |  6 +++---
 .../java/jenkins/console/ConsoleUrlProvider.java |  2 +-
 core/src/main/java/jenkins/model/Jenkins.java    |  6 +++---
 .../java/jenkins/mvn/GlobalSettingsProvider.java |  2 +-
 .../security/BasicHeaderAuthenticator.java       |  2 +-
 32 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 46794c280264..150b1b658c16 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -379,7 +379,7 @@ public static String addSuffix(int n, String singular, String plural) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static RunUrl decompose(StaplerRequest2 req) {
         List<Ancestor> ancestors = req.getAncestors();
@@ -610,7 +610,7 @@ public static <T> Iterable<T> reverse(Collection<T> collection) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static Cookie getCookie(HttpServletRequest req, String name) {
         Cookie[] cookies = req.getCookies();
@@ -633,7 +633,7 @@ public static javax.servlet.http.Cookie getCookie(javax.servlet.http.HttpServlet
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static String getCookie(HttpServletRequest req, String name, String defaultValue) {
         Cookie c = getCookie(req, name);
@@ -753,7 +753,7 @@ public static long getHourLocalTimezone() {
      * This is used to determine the "current" URL assigned to the given object,
      * so that one can compute relative URLs from it.
      *
-     * @since TODO
+     * @since 2.475
      */
     public static String getNearestAncestorUrl(StaplerRequest2 req, Object it) {
         List list = req.getAncestors();
@@ -981,7 +981,7 @@ public static boolean hasPermission(Object object, Permission permission) throws
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static void adminCheck(StaplerRequest2 req, StaplerResponse2 rsp, Object required, Permission permission) throws IOException, ServletException {
         // this is legacy --- all views should be eventually converted to
@@ -1013,7 +1013,7 @@ public static void adminCheck(StaplerRequest req, StaplerResponse rsp, Object re
     /**
      * Infers the hudson installation URL from the given request.
      *
-     * @since TODO
+     * @since 2.475
      */
     public static String inferHudsonURL(StaplerRequest2 req) {
         String rootUrl = Jenkins.get().getRootUrl();
@@ -2132,7 +2132,7 @@ public static List<Descriptor<CrumbIssuer>> getCrumbIssuerDescriptors() {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static String getCrumb(StaplerRequest2 req) {
         Jenkins h = Jenkins.getInstanceOrNull();
@@ -2328,7 +2328,7 @@ public static String createRenderOnDemandProxy(JellyContext context, String attr
     /**
      * Called from renderOnDemand.jelly to generate the parameters for the proxy object generation.
      *
-     * @since TODO
+     * @since 2.475
      */
     @Restricted(NoExternalUse.class)
     public static StaplerRequest2.RenderOnDemandParameters createRenderOnDemandProxyParameters(JellyContext context, String attributesToCapture) {
diff --git a/core/src/main/java/hudson/Plugin.java b/core/src/main/java/hudson/Plugin.java
index 1427da9fda8a..065b604095ad 100644
--- a/core/src/main/java/hudson/Plugin.java
+++ b/core/src/main/java/hudson/Plugin.java
@@ -224,7 +224,7 @@ public void configure(JSONObject formData) throws IOException, javax.servlet.Ser
      * <p>
      * If you are using this method, you'll likely be interested in
      * using {@link #save()} and {@link #load()}.
-     * @since TODO
+     * @since 2.475
      */
     public void configure(StaplerRequest2 req, JSONObject formData) throws IOException, ServletException, FormException {
         try {
@@ -250,7 +250,7 @@ public void configure(StaplerRequest req, JSONObject formData) throws IOExceptio
     /**
      * This method serves static resources in the plugin under {@code hudson/plugin/SHORTNAME}.
      *
-     * @since TODO
+     * @since 2.475
      */
     public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         if (Util.isOverridden(Plugin.class, getClass(), "doDynamic", StaplerRequest.class, StaplerResponse.class)) {
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index e1f5d4cc1184..b90b2eb9f6d4 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -379,7 +379,7 @@ PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
     private final PluginStrategy strategy;
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     protected PluginManager(ServletContext context, File rootDir) {
         this.context = context;
diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 5ca66e9c4424..b4529a0ea279 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -1852,7 +1852,7 @@ public static long daysElapsedSince(@NonNull Date date) {
      * Find the specific ancestor, or throw an exception.
      * Useful for an ancestor we know is inside the URL to ease readability
      *
-     * @since TODO
+     * @since 2.475
      */
     @Restricted(NoExternalUse.class)
     public static @NonNull <T> T getNearestAncestorOfTypeOrThrow(@NonNull StaplerRequest2 request, @NonNull Class<T> clazz) {
diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java
index 986452797f90..d62e8da6223a 100644
--- a/core/src/main/java/hudson/WebAppMain.java
+++ b/core/src/main/java/hudson/WebAppMain.java
@@ -322,7 +322,7 @@ private void recordBootAttempt(File home) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static void installExpressionFactory(ServletContextEvent event) {
         JellyFacet.setExpressionFactory(event, new ExpressionFactory2());
diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java
index 1798512f3e03..963435afe1ae 100644
--- a/core/src/main/java/hudson/console/AnnotatedLargeText.java
+++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java
@@ -95,7 +95,7 @@ public AnnotatedLargeText(ByteBuffer memory, Charset charset, boolean completed,
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public void doProgressiveHtml(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (Util.isOverridden(AnnotatedLargeText.class, getClass(), "doProgressiveHtml", StaplerRequest.class, StaplerResponse.class)) {
@@ -122,7 +122,7 @@ private void doProgressiveHtmlImpl(StaplerRequest2 req, StaplerResponse2 rsp) th
     /**
      * Aliasing what I think was a wrong name in {@link LargeText}
      *
-     * @since TODO
+     * @since 2.475
      */
     public void doProgressiveText(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         doProgressText(req, rsp);
@@ -146,7 +146,7 @@ private boolean isHtml() {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Override
     protected void setContentType(StaplerResponse2 rsp) {
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index af64ff19df34..0e712d8a2e88 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -649,7 +649,7 @@ private Object readResolve() {
     /**
      * Accepts the new description.
      *
-     * @since TODO
+     * @since 2.475
      */
     @RequirePOST
     public synchronized void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
@@ -690,7 +690,7 @@ private void doSubmitDescriptionImpl(StaplerRequest2 req, StaplerResponse2 rsp)
      * since it predates {@code <l:confirmationLink>}. {@code /delete} goes to a Jelly page
      * which should now be unused by core but is left in case plugins are still using it.
      *
-     * @since TODO
+     * @since 2.475
      */
     @RequirePOST
     public void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException {
@@ -736,7 +736,7 @@ private void doDoDeleteImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IO
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Override
     public void delete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
@@ -830,7 +830,7 @@ protected void performDelete() throws IOException, InterruptedException {
     /**
      * Accepts {@code config.xml} submission, as well as serve it.
      *
-     * @since TODO
+     * @since 2.475
      */
     @WebMethod(name = "config.xml")
     public void doConfigDotXml(StaplerRequest2 req, StaplerResponse2 rsp)
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
index a380943687f7..61f407034c43 100644
--- a/core/src/main/java/hudson/model/AbstractProject.java
+++ b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1778,7 +1778,7 @@ public void doPolling(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExcept
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Override
     protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
diff --git a/core/src/main/java/hudson/model/Actionable.java b/core/src/main/java/hudson/model/Actionable.java
index d8088319021b..45a8978a0388 100644
--- a/core/src/main/java/hudson/model/Actionable.java
+++ b/core/src/main/java/hudson/model/Actionable.java
@@ -342,7 +342,7 @@ public <T extends Action> T getAction(Class<T> type) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
         if (Util.isOverridden(Actionable.class, getClass(), "getDynamic", String.class, StaplerRequest.class, StaplerResponse.class)) {
@@ -374,7 +374,7 @@ private Object getDynamicImpl(String token, StaplerRequest2 req, StaplerResponse
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Override
     public ContextMenu doContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java
index 3611824fb54d..365403124c3a 100644
--- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java
+++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java
@@ -54,7 +54,7 @@ public BuildAuthorizationToken(String token) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static BuildAuthorizationToken create(StaplerRequest2 req) {
         if (req.getParameter("pseudoRemoteTrigger") != null) {
@@ -79,7 +79,7 @@ public static BuildAuthorizationToken create(StaplerRequest req) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static void checkPermission(Job<?, ?> project, BuildAuthorizationToken token, StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (token != null && token.token != null) {
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index e2067bfc6944..562b96e37b8e 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -580,7 +580,7 @@ public T newInstance(StaplerRequest req) throws FormException {
      *
      * @throws FormException
      *      Signals a problem in the submitted form.
-     * @since TODO
+     * @since 2.475
      */
     public T newInstance(@Nullable StaplerRequest2 req, @NonNull JSONObject formData) throws FormException {
         if (Util.isOverridden(Descriptor.class, getClass(), "newInstance", StaplerRequest.class, JSONObject.class)) {
@@ -626,7 +626,7 @@ private T newInstanceImpl(@Nullable StaplerRequest2 req, @NonNull JSONObject for
      * Replacement for {@link StaplerRequest2#bindJSON(Class, JSONObject)} which honors {@link #newInstance(StaplerRequest2, JSONObject)}.
      * This is automatically used inside {@link #newInstance(StaplerRequest2, JSONObject)} so a direct call would only be necessary
      * in case the top level binding might use a {@link Descriptor} which overrides {@link #newInstance(StaplerRequest2, JSONObject)}.
-     * @since TODO
+     * @since 2.475
      */
     public static <T> T bindJSON(StaplerRequest2 req, Class<T> type, JSONObject src) {
         return bindJSON(req, type, src, false);
@@ -859,7 +859,7 @@ public boolean configure(StaplerRequest req) throws FormException {
      *      See <a href="https://www.jenkins.io/doc/developer/forms/structured-form-submission/">the developer documentation</a>.
      * @return false
      *      to keep the client in the same config page.
-     * @since TODO
+     * @since 2.475
      */
     public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         if (Util.isOverridden(Descriptor.class, getClass(), "configure", StaplerRequest.class, JSONObject.class)) {
@@ -1062,7 +1062,7 @@ private void doHelpImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExce
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Restricted(NoExternalUse.class)
     public static URL getStaticHelpUrl(StaplerRequest2 req, Klass<?> c, String suffix) {
@@ -1142,7 +1142,7 @@ Map<Descriptor<T>, T> toMap(Iterable<T> describables) {
      *      List of descriptors to create instances from.
      * @return
      *      Can be empty but never null.
-     * @since TODO
+     * @since 2.475
      */
     public static <T extends Describable<T>>
     List<T> newInstancesFromHeteroList(StaplerRequest2 req, JSONObject formData, String key,
@@ -1162,7 +1162,7 @@ List<T> newInstancesFromHeteroList(StaplerRequest req, JSONObject formData, Stri
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static <T extends Describable<T>>
     List<T> newInstancesFromHeteroList(StaplerRequest2 req, Object formData,
diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index 7d45fd63d749..5ae161199c63 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -81,7 +81,7 @@ public static Hudson getInstance() {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public Hudson(File root, ServletContext context) throws IOException, InterruptedException, ReactorException {
         this(root, context, null);
@@ -96,7 +96,7 @@ public Hudson(File root, javax.servlet.ServletContext context) throws IOExceptio
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public Hudson(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
         super(root, context, pluginManager);
diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index 62a46f395247..404d213f7344 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -144,7 +144,7 @@ public static <K, V extends Item> Map<K, V> loadChildren(ItemGroup parent, File
      * Creates a {@link TopLevelItem} for example from the submission of the {@code /lib/hudson/newFromList/form} tag
      * or throws an exception if it fails.
      *
-     * @since TODO
+     * @since 2.475
      */
     public synchronized TopLevelItem createTopLevelItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         acl.checkPermission(Item.CREATE);
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 2ba53d7182a0..e4d54d44b375 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -860,7 +860,7 @@ public RunT getNearestOldBuild(int n) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Override
     public Object getDynamic(String token, StaplerRequest2 req,
@@ -1208,7 +1208,7 @@ public String getEntryAuthor(FeedItem entry) {
 
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Override
     public ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception {
@@ -1434,7 +1434,7 @@ public synchronized void doConfigSubmit(StaplerRequest2 req,
      * Derived class can override this to perform additional config submission
      * work.
      *
-     * @since TODO
+     * @since 2.475
      */
     protected void submit(StaplerRequest2 req, StaplerResponse2 rsp)
             throws IOException, ServletException, FormException {
diff --git a/core/src/main/java/hudson/model/JobProperty.java b/core/src/main/java/hudson/model/JobProperty.java
index 70ef159547c0..c7444de3343a 100644
--- a/core/src/main/java/hudson/model/JobProperty.java
+++ b/core/src/main/java/hudson/model/JobProperty.java
@@ -186,7 +186,7 @@ public Collection<?> getJobOverrides() {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Override
     public JobProperty<?> reconfigure(StaplerRequest2 req, JSONObject form) throws FormException {
diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java
index eb31add23938..30efe857e891 100644
--- a/core/src/main/java/hudson/model/Project.java
+++ b/core/src/main/java/hudson/model/Project.java
@@ -228,7 +228,7 @@ public MavenInstallation inferMavenInstallation() {
 //
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     @Override
     protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
diff --git a/core/src/main/java/hudson/model/RSS.java b/core/src/main/java/hudson/model/RSS.java
index bb41c8af10a2..98cf0fb74032 100644
--- a/core/src/main/java/hudson/model/RSS.java
+++ b/core/src/main/java/hudson/model/RSS.java
@@ -56,7 +56,7 @@ public final class RSS {
      *      Entries to be listed in the RSS feed.
      * @param adapter
      *      Controls how to render entries to RSS.
-     * @since TODO
+     * @since 2.475
      */
     public static <E> void forwardToRss(String title, String url, Collection<? extends E> entries, FeedAdapter<E> adapter, StaplerRequest2 req, HttpServletResponse rsp) throws IOException, ServletException {
         req.setAttribute("adapter", adapter);
@@ -98,7 +98,7 @@ public static <E> void forwardToRss(String title, String url, Collection<? exten
      *      URL of the model object that owns this feed. Relative to the context root.
      * @param runList
      *      Entries to be listed in the RSS feed.
-     * @since TODO
+     * @since 2.475
      */
     public static void rss(StaplerRequest2 req, StaplerResponse2 rsp, String title, String url, RunList runList) throws IOException, ServletException {
         rss(req, rsp, title, url, runList, null);
@@ -128,7 +128,7 @@ public static void rss(StaplerRequest req, StaplerResponse rsp, String title, St
      *      Entries to be listed in the RSS feed.
      * @param feedAdapter
      *      Controls how to render entries to RSS.
-     * @since TODO
+     * @since 2.475
      */
     public static void rss(StaplerRequest2 req, StaplerResponse2 rsp, String title, String url, RunList runList, FeedAdapter<Run> feedAdapter) throws IOException, ServletException {
         final FeedAdapter<Run> feedAdapter_ = feedAdapter == null ? Run.FEED_ADAPTER : feedAdapter;
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 5359634d9642..37b09fd47d25 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -2209,7 +2209,7 @@ public void doBuildTimestamp(StaplerRequest2 req, StaplerResponse2 rsp, @QueryPa
     /**
      * Sends out the raw console output.
      *
-     * @since TODO
+     * @since 2.475
      */
     public void doConsoleText(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (Util.isOverridden(Run.class, getClass(), "doConsoleText", StaplerRequest.class, StaplerResponse.class)) {
@@ -2287,7 +2287,7 @@ public void keepLog(boolean newValue) throws IOException {
     /**
      * Deletes the build when the button is pressed.
      *
-     * @since TODO
+     * @since 2.475
      */
     @RequirePOST
     public void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index e807fa23de30..5d53a49ef0b7 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -788,7 +788,7 @@ public synchronized void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) t
      *
      * @return
      *      null if fails.
-     * @since TODO
+     * @since 2.475
      */
     @RequirePOST
     public /* abstract */ Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
@@ -1104,7 +1104,7 @@ public static Permission getItemCreatePermission() {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static View create(StaplerRequest2 req, StaplerResponse2 rsp, ViewGroup owner)
             throws FormException, IOException, ServletException {
diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java
index 3562f1c13964..3c1e818a0385 100644
--- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java
+++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java
@@ -83,7 +83,7 @@ T createInstance(Class<T> type, StaplerRequest req, String fieldName) throws For
     /**
      * Creates an instance of {@link RepositoryBrowser} from a form submission.
      *
-     * @since TODO
+     * @since 2.475
      */
     public static <T extends RepositoryBrowser>
     T createInstance(Class<T> type, StaplerRequest2 req, JSONObject parent, String fieldName) throws FormException {
diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java
index d99e3487eaa6..0706f99a4a31 100644
--- a/core/src/main/java/hudson/security/SecurityRealm.java
+++ b/core/src/main/java/hudson/security/SecurityRealm.java
@@ -278,7 +278,7 @@ public boolean canLogOut() {
      *      This parameter allows you to redirect people to different pages depending on who they are.
      * @return
      *      never null.
-     * @since TODO
+     * @since 2.475
      * @see #doLogout(StaplerRequest2, StaplerResponse2)
      */
     protected String getPostLogOutUrl2(StaplerRequest2 req, Authentication auth) {
@@ -340,7 +340,7 @@ public List<Descriptor<CaptchaSupport>> getCaptchaSupportDescriptors() {
      * The default implementation erases the session and do a few other clean up, then
      * redirect the user to the URL specified by {@link #getPostLogOutUrl2(StaplerRequest2, Authentication)}.
      *
-     * @since TODO
+     * @since 2.475
      */
     public void doLogout(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         if (Util.isOverridden(SecurityRealm.class, getClass(), "doLogout", StaplerRequest.class, StaplerResponse.class)) {
@@ -619,7 +619,7 @@ public synchronized SecurityComponents getSecurityComponents() {
      * For other plugins that want to contribute {@link Filter}, see
      * {@link PluginServletFilter}.
      *
-     * @since TODO
+     * @since 2.475
      */
     public Filter createFilter(FilterConfig filterConfig) {
         if (Util.isOverridden(SecurityRealm.class, getClass(), "createFilter", javax.servlet.FilterConfig.class)) {
diff --git a/core/src/main/java/hudson/slaves/Cloud.java b/core/src/main/java/hudson/slaves/Cloud.java
index 3bff60c0d0ad..05f9bb9c0139 100644
--- a/core/src/main/java/hudson/slaves/Cloud.java
+++ b/core/src/main/java/hudson/slaves/Cloud.java
@@ -342,7 +342,7 @@ public HttpResponse doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) th
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public Cloud reconfigure(@NonNull final StaplerRequest2 req, JSONObject form) throws Descriptor.FormException {
         if (Util.isOverridden(Cloud.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) {
diff --git a/core/src/main/java/hudson/slaves/ComputerListener.java b/core/src/main/java/hudson/slaves/ComputerListener.java
index f5d220c1104e..6e52220ce3a8 100644
--- a/core/src/main/java/hudson/slaves/ComputerListener.java
+++ b/core/src/main/java/hudson/slaves/ComputerListener.java
@@ -214,7 +214,7 @@ public void onConfigurationChange() {}
     /**
      * Indicates that the computer has become idle.
      *
-     * @since TODO
+     * @since 2.476
      */
     public void onIdle(Computer c) {}
 
diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java
index c22d5af2e3d2..ca95081b0385 100644
--- a/core/src/main/java/hudson/tasks/LogRotator.java
+++ b/core/src/main/java/hudson/tasks/LogRotator.java
@@ -111,7 +111,7 @@ public CollatedLogRotatorException(String msg, Collection<Exception> values) {
 
     /**
      * If enabled also remove last successful build.
-     * @since TODO
+     * @since 2.474
      */
     private boolean removeLastBuild;
 
diff --git a/core/src/main/java/hudson/util/FormApply.java b/core/src/main/java/hudson/util/FormApply.java
index dc5e4d64df9b..280a3051286a 100644
--- a/core/src/main/java/hudson/util/FormApply.java
+++ b/core/src/main/java/hudson/util/FormApply.java
@@ -63,7 +63,7 @@ public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object n
     /**
      * Is this submission from the "apply" button?
      *
-     * @since TODO
+     * @since 2.475
      */
     public static boolean isApply(StaplerRequest2 req) {
         return Boolean.parseBoolean(req.getParameter("core:apply"));
diff --git a/core/src/main/java/hudson/util/Graph.java b/core/src/main/java/hudson/util/Graph.java
index 6e4ef6c59515..6d89fd6a6369 100644
--- a/core/src/main/java/hudson/util/Graph.java
+++ b/core/src/main/java/hudson/util/Graph.java
@@ -152,7 +152,7 @@ public static Dimension safeDimension(int width, int height, int defaultWidth, i
     /**
      * Renders a graph.
      *
-     * @since TODO
+     * @since 2.475
      */
     public void doPng(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (Util.isOverridden(Graph.class, getClass(), "doPng", StaplerRequest.class, StaplerResponse.class)) {
@@ -225,7 +225,7 @@ private void doPngImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExcep
     /**
      * Renders a clickable map.
      *
-     * @since TODO
+     * @since 2.475
      */
     public void doMap(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         if (Util.isOverridden(Graph.class, getClass(), "doMap", StaplerRequest.class, StaplerResponse.class)) {
diff --git a/core/src/main/java/hudson/util/ListBoxModel.java b/core/src/main/java/hudson/util/ListBoxModel.java
index c97ed0f431e7..27efa0a8c573 100644
--- a/core/src/main/java/hudson/util/ListBoxModel.java
+++ b/core/src/main/java/hudson/util/ListBoxModel.java
@@ -171,7 +171,7 @@ public ListBoxModel add(@NonNull String nameAndValue) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public void writeTo(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         if (Util.isOverridden(ListBoxModel.class, getClass(), "writeTo", StaplerRequest.class, StaplerResponse.class)) {
diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java
index bb4ecfc18d9b..5e6ca8704dff 100644
--- a/core/src/main/java/hudson/util/PluginServletFilter.java
+++ b/core/src/main/java/hudson/util/PluginServletFilter.java
@@ -105,7 +105,7 @@ public void init(FilterConfig config) throws ServletException {
      * May be paired with {@link #removeFilter}.
      * <p>For most purposes you can instead use {@link HttpServletFilter}.
      *
-     * @since TODO
+     * @since 2.475
      */
     public static void addFilter(Filter filter) throws ServletException {
         Jenkins j = Jenkins.getInstanceOrNull();
@@ -141,7 +141,7 @@ public static void addFilter(javax.servlet.Filter filter) throws javax.servlet.S
      * Checks whether the given filter is already registered in the chain.
      * @param filter the filter to check.
      * @return true if the filter is already registered in the chain.
-     * @since TODO
+     * @since 2.475
      */
     public static boolean hasFilter(Filter filter) {
         Jenkins j = Jenkins.getInstanceOrNull();
@@ -166,7 +166,7 @@ public static boolean hasFilter(javax.servlet.Filter filter) {
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static void removeFilter(Filter filter) throws ServletException {
         Jenkins j = Jenkins.getInstanceOrNull();
diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
index dcd3883ba07c..637cf10145c6 100644
--- a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
+++ b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
@@ -85,7 +85,7 @@ default Descriptor<ConsoleUrlProvider> getDescriptor() {
 
     /**
      * Looks up the {@link #getConsoleUrl} value from the first provider to offer one.
-     * @since TODO
+     * @since 2.476
      */
     static @NonNull String consoleUrlOf(Run<?, ?> run) {
         final List<ConsoleUrlProvider> providers = new ArrayList<>();
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 3c756bbb7ba0..9af524b6b1d9 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -759,7 +759,7 @@ private static int getSlaveAgentPortInitialValue(int def) {
     private final transient ServletContext jakartaServletContext;
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public ServletContext getServletContext() {
         return this.jakartaServletContext;
@@ -4435,7 +4435,7 @@ public void doLoginEntry(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExc
     /**
      * Logs out the user.
      *
-     * @since TODO
+     * @since 2.475
      */
     public void doLogout(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         String user = getAuthentication2().getName();
@@ -4933,7 +4933,7 @@ public void doScriptText(StaplerRequest req, StaplerResponse rsp) throws IOExcep
     }
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static void _doScript(StaplerRequest2 req, StaplerResponse2 rsp, RequestDispatcher view, VirtualChannel channel, ACL acl) throws IOException, ServletException {
         // ability to run arbitrary script is dangerous
diff --git a/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
index 98055fb39b2e..9e0a2cef24fb 100644
--- a/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
+++ b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java
@@ -29,7 +29,7 @@ public abstract class GlobalSettingsProvider extends AbstractDescribableImpl<Glo
     public abstract FilePath supplySettings(AbstractBuild<?, ?> build, TaskListener listener);
 
     /**
-     * @since TODO
+     * @since 2.475
      */
     public static GlobalSettingsProvider parseSettingsProvider(StaplerRequest2 req) throws Descriptor.FormException, ServletException {
         JSONObject settings = req.getSubmittedForm().getJSONObject("globalSettings");
diff --git a/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java
index 2906a1aa461b..7b012292efbd 100644
--- a/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java
+++ b/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java
@@ -38,7 +38,7 @@ public abstract class BasicHeaderAuthenticator implements ExtensionPoint {
      * <p>
      * When no processor can validate the username/password pair, caller will make
      * the request processing fail.
-     * @since TODO
+     * @since 2.475
      */
     @CheckForNull
     public Authentication authenticate2(HttpServletRequest req, HttpServletResponse rsp, String username, String password) throws IOException, ServletException {

From 4e9b0462e526e93672091fbe222d8d6ae6a67e28 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:21:46 -0600
Subject: [PATCH 424/449] Update peter-evans/create-pull-request digest to
 d121e62 (#9725)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/run-since-updater.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-since-updater.yml b/.github/workflows/run-since-updater.yml
index 03bcfe5b7c9d..409520a5f73f 100644
--- a/.github/workflows/run-since-updater.yml
+++ b/.github/workflows/run-since-updater.yml
@@ -29,7 +29,7 @@ jobs:
         id: run_script
         shell: bash
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7
+        uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Fill in since annotations

From 7ff5aaa0fdc337fcc6e7f02d95dd6df2721763d5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:21:55 -0600
Subject: [PATCH 425/449] Update dependency
 org.springframework:spring-framework-bom to v6.1.13 (#9726)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index cd55b58d52c9..39e1714b809a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -62,7 +62,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>6.1.12</version>
+        <version>6.1.13</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

From 239ced05afca9312e4563785f84acb7abfe68433 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 15 Sep 2024 20:28:22 +0100
Subject: [PATCH 426/449] Use Notice component for views lacking jobs (#9724)

* Use notice for views lacking jobs

* Update _notice.scss

* Rename text to title, use 'invokeBody' rather than description field
---
 .../hudson/PluginManager/installed.jelly          |  2 +-
 .../resources/hudson/PluginManager/updates.jelly  |  2 +-
 .../hudson/logging/LogRecorder/index.jelly        |  2 +-
 .../main/resources/hudson/model/View/noJob.jelly  | 11 ++++++-----
 .../jenkins/model/Jenkins/systemInfo.jelly        |  2 +-
 core/src/main/resources/lib/layout/notice.jelly   | 11 +++++++----
 war/src/main/scss/components/_notice.scss         | 15 +++++++++++++--
 7 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
index 951e0cf2877d..c9b7dd93f200 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.jelly
+++ b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -71,7 +71,7 @@ THE SOFTWARE.
 
       <j:choose>
         <j:when test="${noPlugins}">
-          <l:notice icon="symbol-plugins" text="${%No plugins installed}" />
+          <l:notice icon="symbol-plugins" title="${%No plugins installed}" />
         </j:when>
         <j:otherwise>
           <table id="plugins" class="jenkins-table sortable">
diff --git a/core/src/main/resources/hudson/PluginManager/updates.jelly b/core/src/main/resources/hudson/PluginManager/updates.jelly
index da79d1958cf9..d4163fb7cfbe 100644
--- a/core/src/main/resources/hudson/PluginManager/updates.jelly
+++ b/core/src/main/resources/hudson/PluginManager/updates.jelly
@@ -230,7 +230,7 @@ THE SOFTWARE.
             </table>
           </j:when>
           <j:otherwise>
-            <l:notice icon="symbol-up-to-date" text="${%No updates available}" />
+            <l:notice icon="symbol-up-to-date" title="${%No updates available}" />
           </j:otherwise>
         </j:choose>
         <d:invokeBody/>
diff --git a/core/src/main/resources/hudson/logging/LogRecorder/index.jelly b/core/src/main/resources/hudson/logging/LogRecorder/index.jelly
index 0428fbc5bd9f..eedda4e43049 100644
--- a/core/src/main/resources/hudson/logging/LogRecorder/index.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorder/index.jelly
@@ -67,7 +67,7 @@ THE SOFTWARE.
     </l:app-bar>
 
     <j:if test="${noLogs}">
-      <l:notice text="${%No logs available}" icon="symbol-journal" />
+      <l:notice title="${%No logs available}" icon="symbol-journal" />
     </j:if>
 
     <t:logRecords logRecords="${it.logRecords}"/>
diff --git a/core/src/main/resources/hudson/model/View/noJob.jelly b/core/src/main/resources/hudson/model/View/noJob.jelly
index 4145b1118be8..23011d448e4b 100644
--- a/core/src/main/resources/hudson/model/View/noJob.jelly
+++ b/core/src/main/resources/hudson/model/View/noJob.jelly
@@ -23,9 +23,10 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
-    ${%description_1}
-    <j:if test="${it.hasPermission(it.CONFIGURE)}">
-        ${%description_2}
-    </j:if>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
+    <l:notice title="${%description_1}" icon="symbol-weather-icon-health-00to19">
+        <j:if test="${it.hasPermission(it.CONFIGURE)}">
+            ${%description_2}
+        </j:if>
+    </l:notice>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
index 554215da00c3..f9d7825ed233 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
 
         <j:choose>
           <j:when test="${empty(app.pluginManager.plugins) and empty(app.pluginManager.failedPlugins)}">
-            <l:notice icon="symbol-plugins" text="${%No plugins installed}" />
+            <l:notice icon="symbol-plugins" title="${%No plugins installed}" />
           </j:when>
           <j:otherwise>
             <table class="jenkins-table sortable">
diff --git a/core/src/main/resources/lib/layout/notice.jelly b/core/src/main/resources/lib/layout/notice.jelly
index 247f4e34b1e3..8a2e666a8b38 100644
--- a/core/src/main/resources/lib/layout/notice.jelly
+++ b/core/src/main/resources/lib/layout/notice.jelly
@@ -23,10 +23,10 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:d="jelly:define">
   <st:documentation>
-    <st:attribute name="text" use="required">
-      Sets the text for the notice. HTML isn't supported.
+    <st:attribute name="title" use="required">
+      Sets the title for the notice. HTML isn't supported.
     </st:attribute>
     <st:attribute name="icon" use="required">
       Sets the icon for the notice. Supports Jenkins Symbols and regular images.
@@ -35,6 +35,9 @@ THE SOFTWARE.
 
   <div class="jenkins-notice">
     <l:icon src="${attrs.icon}" />
-    <div>${attrs.text}</div>
+    <div>${attrs.title}</div>
+    <div class="jenkins-notice__description">
+      <d:invokeBody />
+    </div>
   </div>
 </j:jelly>
diff --git a/war/src/main/scss/components/_notice.scss b/war/src/main/scss/components/_notice.scss
index d02928fa3aec..44f70de01a90 100644
--- a/war/src/main/scss/components/_notice.scss
+++ b/war/src/main/scss/components/_notice.scss
@@ -8,11 +8,22 @@
   background: var(--button-background);
   border-radius: 0.66rem;
   font-size: var(--font-size-base);
-  margin-bottom: 30px;
-  font-weight: 500;
+  margin-bottom: var(--section-padding);
+  font-weight: 450;
+  padding: calc(var(--section-padding) * 2);
+  text-align: center;
 
   svg {
     width: 2.5rem;
     height: 2.5rem;
   }
+
+  &__description {
+    color: var(--text-color-secondary);
+    margin-top: -0.375rem;
+
+    &:empty {
+      display: none;
+    }
+  }
 }

From 0037be68b722373a95941aac5e459f43db993962 Mon Sep 17 00:00:00 2001
From: Thorsten Scherler <scherler@gmail.com>
Date: Mon, 16 Sep 2024 11:40:32 +0200
Subject: [PATCH 427/449] [JENKINS-73744] npm scripts lint:fix do not work
 (#9718)

Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
---
 war/.babelrc => .babelrc               |   0
 .gitignore                             |  24 +-
 war/.prettierignore => .prettierignore |  14 +-
 war/.stylelintrc.js => .stylelintrc.js |   2 +-
 CONTRIBUTING.md                        |   8 +-
 eslint.config.cjs                      |   6 +-
 war/package.json => package.json       |  14 +-
 pom.xml                                | 193 ++++++
 war/pom.xml                            | 134 +---
 war/yarn.lock => yarn.lock             | 821 +++++++++++++------------
 10 files changed, 653 insertions(+), 563 deletions(-)
 rename war/.babelrc => .babelrc (100%)
 rename war/.prettierignore => .prettierignore (58%)
 rename war/.stylelintrc.js => .stylelintrc.js (94%)
 rename war/package.json => package.json (75%)
 rename war/yarn.lock => yarn.lock (91%)

diff --git a/war/.babelrc b/.babelrc
similarity index 100%
rename from war/.babelrc
rename to .babelrc
diff --git a/.gitignore b/.gitignore
index 021201b717a3..c09d79fcf8c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,27 @@ jenkins_*.changes
 *.pkg
 *.zip
 push-build.sh
-war/node_modules/
-war/yarn-error.log
+node_modules/
+yarn-error.log
 .java-version
 .checkstyle
+
+/rebel.xml
+junit.xml
+
+# Yarn
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.pnp.*
+.yarn/*
+.yarnrc.yml
+!.yarn/patches
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+
+# Node
+node/
+node_modules/
+
+# Generated JavaScript Bundles
+jsbundles
diff --git a/war/.prettierignore b/.prettierignore
similarity index 58%
rename from war/.prettierignore
rename to .prettierignore
index 8047dce8ba4f..042e5d268c0c 100644
--- a/war/.prettierignore
+++ b/.prettierignore
@@ -10,14 +10,14 @@ node/
 .yarnrc.yml
 
 # libraries / external deps / generated files
-src/main/js/plugin-setup-wizard/bootstrap-detached.js
-src/main/webapp/scripts/yui
-src/main/webapp/jsbundles/
-src/main/scss/_bootstrap.scss
+war/src/main/js/plugin-setup-wizard/bootstrap-detached.js
+war/src/main/webapp/scripts/yui
+war/src/main/webapp/jsbundles/
+war/src/main/scss/_bootstrap.scss
 
 # test files that we don't need formatted
-../test/src/test/resources
-../test/jmh-report.json
+test/src/test/resources
+test/jmh-report.json
 
 # doesn't work, see https://github.com/prettier/prettier/issues/5340
 *.hbs
@@ -25,4 +25,4 @@ src/main/scss/_bootstrap.scss
 .yarn
 
 # Incorrectly flagging forwarding slashes in regex
-../.github/renovate.json
+.github/renovate.json
diff --git a/war/.stylelintrc.js b/.stylelintrc.js
similarity index 94%
rename from war/.stylelintrc.js
rename to .stylelintrc.js
index cfea225e3035..711c7c77f83a 100644
--- a/war/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
   extends: "stylelint-config-standard",
   customSyntax: "postcss-scss",
-  ignoreFiles: ["src/main/scss/_bootstrap.scss"],
+  ignoreFiles: ["war/src/main/scss/_bootstrap.scss"],
   rules: {
     "no-descending-specificity": null,
     "selector-class-pattern": "[a-z]",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5933560a951b..d2f4700a3ab7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,13 +55,12 @@ MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/ja
 To run the Yarn frontend build, after [building the WAR file](#building-the-war-file), add the downloaded versions of Node and Yarn to your path:
 
 ```sh
-export PATH=$PWD/war/node:$PWD/war/node/yarn/dist/bin:$PATH
+export PATH=$PWD/node:$PWD/node/yarn/dist/bin:$PATH
 ```
 
 Then you can run Yarn with e.g.
 
 ```sh
-cd war
 yarn
 ```
 
@@ -75,10 +74,9 @@ On one terminal, start a development server that will not process frontend asset
 MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED' mvn -pl war jetty:run -Dskip.yarn
 ```
 
-On another terminal, move to the `war` folder and start a [webpack](https://webpack.js.org/) dev server, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build):
+Open another terminal and start a [webpack](https://webpack.js.org/) dev server, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build):
 
 ```sh
-cd war
 yarn start
 ```
 
@@ -113,14 +111,12 @@ mvn spotless:apply
 To view frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:
 
 ```sh
-cd war
 yarn lint
 ```
 
 To fix frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:
 
 ```sh
-cd war
 yarn lint:fix
 ```
 
diff --git a/eslint.config.cjs b/eslint.config.cjs
index c25e303ba5db..f6c1c6181e46 100644
--- a/eslint.config.cjs
+++ b/eslint.config.cjs
@@ -16,8 +16,8 @@ module.exports = [
       "**/jsbundles/",
 
       // External scripts
-      "war/.pnp.cjs",
-      "war/.pnp.loader.mjs",
+      ".pnp.cjs",
+      ".pnp.loader.mjs",
       "war/src/main/js/plugin-setup-wizard/bootstrap-detached.js",
       "war/src/main/webapp/scripts/yui/*",
     ],
@@ -93,7 +93,7 @@ module.exports = [
       "eslint.config.cjs",
       "war/postcss.config.js",
       "war/webpack.config.js",
-      "war/.stylelintrc.js",
+      ".stylelintrc.js",
     ],
     languageOptions: {
       globals: {
diff --git a/war/package.json b/package.json
similarity index 75%
rename from war/package.json
rename to package.json
index 882d4220c8d6..9f40f36fff5b 100644
--- a/war/package.json
+++ b/package.json
@@ -10,16 +10,16 @@
   },
   "private": true,
   "scripts": {
-    "dev": "webpack --config webpack.config.js",
-    "prod": "webpack --config webpack.config.js --mode=production",
+    "dev": "webpack --config war/webpack.config.js",
+    "prod": "webpack --config war/webpack.config.js --mode=production",
     "build": "yarn prod",
     "start": "yarn dev --watch",
-    "lint:js": "eslint ../ && prettier --check ../",
-    "lint:js-ci": "eslint ../ -f checkstyle -o target/eslint-warnings.xml && prettier --check ../",
-    "lint:css": "stylelint src/main/scss",
-    "lint:css-ci": "stylelint src/main/scss --custom-formatter stylelint-checkstyle-reporter -o target/stylelint-warnings.xml",
+    "lint:js": "eslint . && prettier --check .",
+    "lint:js-ci": "eslint . -f checkstyle -o target/eslint-warnings.xml && prettier --check .",
+    "lint:css": "stylelint war/src/main/scss",
+    "lint:css-ci": "stylelint war/src/main/scss --custom-formatter stylelint-checkstyle-reporter -o target/stylelint-warnings.xml",
     "lint:ci": "yarn lint:js-ci && yarn lint:css-ci",
-    "lint:fix": "eslint --fix ../ && prettier --write ../ && stylelint src/main/scss --fix",
+    "lint:fix": "eslint --fix . && prettier --write . && stylelint war/src/main/scss --fix",
     "lint": "yarn lint:js && yarn lint:css"
   },
   "devDependencies": {
diff --git a/pom.xml b/pom.xml
index 9f52b05a6ff9..86265c667654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,12 @@ THE SOFTWARE.
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-ee9-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
     <winstone.version>8.1</winstone.version>
+    <node.version>20.17.0</node.version>
+    <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
+    <yarn.version>1.22.19</yarn.version>
+    <!-- maven-antrun-plugin will download this Yarn version. -->
+    <yarn-berry.version>4.4.1</yarn-berry.version>
+    <yarn-berry.sha256sum>920b4530755296dc2ce8b4351f057d4a26429524fcb2789d277560d94837c27e</yarn-berry.sha256sum>
   </properties>
 
   <!--
@@ -415,5 +421,192 @@ THE SOFTWARE.
         <changelog.url>https://www.jenkins.io/changelog-stable</changelog.url>
       </properties>
     </profile>
+    <profile>
+      <id>yarn-ci-lint</id>
+      <activation>
+        <property>
+          <name>env.CI</name>
+        </property>
+        <file>
+          <exists>package.json</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.eirslett</groupId>
+            <artifactId>frontend-maven-plugin</artifactId>
+            <version>1.15.0</version>
+            <executions>
+              <execution>
+                <id>yarn lint:ci</id>
+                <goals>
+                  <goal>yarn</goal>
+                </goals>
+                <configuration>
+                  <arguments>lint:ci</arguments>
+                  <skip>${yarn.lint.skip}</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>yarn-lint</id>
+      <activation>
+        <property>
+          <name>!env.CI</name>
+        </property>
+        <file>
+          <exists>package.json</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.eirslett</groupId>
+            <artifactId>frontend-maven-plugin</artifactId>
+            <version>1.15.0</version>
+            <executions>
+              <execution>
+                <id>yarn lint</id>
+                <goals>
+                  <goal>yarn</goal>
+                </goals>
+                <configuration>
+                  <arguments>lint</arguments>
+                  <skip>${yarn.lint.skip}</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>yarn-execution</id>
+      <activation>
+        <file>
+          <exists>package.json</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>download-yarn</id>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>initialize</phase>
+                <configuration>
+                  <target>
+                    <property name="yarn.dest" value="${project.basedir}/.yarn/releases/yarn-${yarn-berry.version}.cjs" />
+                    <dirname file="${yarn.dest}" property="yarn.dest.dir" />
+                    <mkdir dir="${yarn.dest.dir}" />
+                    <get dest="${yarn.dest}" src="https://repo.yarnpkg.com/${yarn-berry.version}/packages/yarnpkg-cli/bin/yarn.js" usetimestamp="true" />
+                    <checksum algorithm="SHA-256" file="${yarn.dest}" property="${yarn-berry.sha256sum}" verifyProperty="yarn.checksum.matches" />
+                    <condition property="yarn.checksum.matches.fail">
+                      <equals arg1="${yarn.checksum.matches}" arg2="false" />
+                    </condition>
+                    <fail if="yarn.checksum.matches.fail">Checksum error</fail>
+                    <echo file="${project.basedir}/.yarnrc.yml">yarnPath: ${yarn.dest}</echo>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>com.github.eirslett</groupId>
+            <artifactId>frontend-maven-plugin</artifactId>
+            <version>1.15.0</version>
+            <executions>
+
+              <execution>
+                <id>install node and yarn</id>
+                <goals>
+                  <goal>install-node-and-yarn</goal>
+                </goals>
+                <phase>initialize</phase>
+                <configuration>
+                  <nodeVersion>v${node.version}</nodeVersion>
+                  <yarnVersion>v${yarn.version}</yarnVersion>
+                  <nodeDownloadRoot>https://repo.jenkins-ci.org/nodejs-dist/</nodeDownloadRoot>
+                  <!-- tried to create a mirror for yarnDownloadRoot but it did not work -->
+                </configuration>
+              </execution>
+
+              <execution>
+                <id>yarn install</id>
+                <goals>
+                  <goal>yarn</goal>
+                </goals>
+                <phase>initialize</phase>
+              </execution>
+
+              <execution>
+                <id>yarn build</id>
+                <goals>
+                  <goal>yarn</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <arguments>build</arguments>
+                </configuration>
+              </execution>
+
+              <execution>
+                <id>yarn lint</id>
+                <goals>
+                  <goal>yarn</goal>
+                </goals>
+                <configuration>
+                  <arguments>lint:ci</arguments>
+                  <skip>${yarn.lint.skip}</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>clean-node</id>
+      <activation>
+        <property>
+          <name>cleanNode</name>
+        </property>
+        <file>
+          <exists>package.json</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-clean-plugin</artifactId>
+            <!-- Version specified in grandparent POM -->
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>node</directory>
+                  <followSymlinks>false</followSymlinks>
+                </fileset>
+                <fileset>
+                  <directory>node_modules</directory>
+                  <followSymlinks>false</followSymlinks>
+                </fileset>
+              </filesets>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/war/pom.xml b/war/pom.xml
index 32a0c23d9dca..ab2100469ba4 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -49,12 +49,7 @@ THE SOFTWARE.
     <mina-sshd-api.version>2.13.2-125.v200281b_61d59</mina-sshd-api.version>
     <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
     <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
-    <node.version>20.17.0</node.version>
-    <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
-    <yarn.version>1.22.19</yarn.version>
-    <!-- maven-antrun-plugin will download this Yarn version. -->
-    <yarn-berry.version>4.4.1</yarn-berry.version>
-    <yarn-berry.sha256sum>920b4530755296dc2ce8b4351f057d4a26429524fcb2789d277560d94837c27e</yarn-berry.sha256sum>
+
   </properties>
 
   <dependencyManagement>
@@ -727,132 +722,5 @@ THE SOFTWARE.
       </build>
     </profile>
 
-    <!--
-      The following profiles are required to integration the node/yarn build into this maven build.
-      Hopefully we can push these profiles down into a parent pom.
-    -->
-    <profile>
-      <id>yarn-execution</id>
-      <activation>
-        <file>
-          <exists>package.json</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>download-yarn</id>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <phase>initialize</phase>
-                <configuration>
-                  <target>
-                    <property name="yarn.dest" value="${project.basedir}/.yarn/releases/yarn-${yarn-berry.version}.cjs" />
-                    <dirname file="${yarn.dest}" property="yarn.dest.dir" />
-                    <mkdir dir="${yarn.dest.dir}" />
-                    <get dest="${yarn.dest}" src="https://repo.yarnpkg.com/${yarn-berry.version}/packages/yarnpkg-cli/bin/yarn.js" usetimestamp="true" />
-                    <checksum algorithm="SHA-256" file="${yarn.dest}" property="${yarn-berry.sha256sum}" verifyProperty="yarn.checksum.matches" />
-                    <condition property="yarn.checksum.matches.fail">
-                      <equals arg1="${yarn.checksum.matches}" arg2="false" />
-                    </condition>
-                    <fail if="yarn.checksum.matches.fail">Checksum error</fail>
-                    <echo file="${project.basedir}/.yarnrc.yml">yarnPath: ${yarn.dest}</echo>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>com.github.eirslett</groupId>
-            <artifactId>frontend-maven-plugin</artifactId>
-            <version>1.15.0</version>
-            <executions>
-
-              <execution>
-                <id>install node and yarn</id>
-                <goals>
-                  <goal>install-node-and-yarn</goal>
-                </goals>
-                <phase>initialize</phase>
-                <configuration>
-                  <nodeVersion>v${node.version}</nodeVersion>
-                  <yarnVersion>v${yarn.version}</yarnVersion>
-                  <nodeDownloadRoot>https://repo.jenkins-ci.org/nodejs-dist/</nodeDownloadRoot>
-                  <!-- tried to create a mirror for yarnDownloadRoot but it did not work -->
-                </configuration>
-              </execution>
-
-              <execution>
-                <id>yarn install</id>
-                <goals>
-                  <goal>yarn</goal>
-                </goals>
-                <phase>initialize</phase>
-              </execution>
-
-              <execution>
-                <id>yarn build</id>
-                <goals>
-                  <goal>yarn</goal>
-                </goals>
-                <phase>generate-sources</phase>
-                <configuration>
-                  <arguments>build</arguments>
-                </configuration>
-              </execution>
-
-              <execution>
-                <id>yarn lint</id>
-                <goals>
-                  <goal>yarn</goal>
-                </goals>
-                <configuration>
-                  <arguments>lint:ci</arguments>
-                  <skip>${yarn.lint.skip}</skip>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>clean-node</id>
-      <activation>
-        <property>
-          <name>cleanNode</name>
-        </property>
-        <file>
-          <exists>package.json</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-clean-plugin</artifactId>
-            <!-- Version specified in grandparent POM -->
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>node</directory>
-                  <followSymlinks>false</followSymlinks>
-                </fileset>
-                <fileset>
-                  <directory>node_modules</directory>
-                  <followSymlinks>false</followSymlinks>
-                </fileset>
-              </filesets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
diff --git a/war/yarn.lock b/yarn.lock
similarity index 91%
rename from war/yarn.lock
rename to yarn.lock
index eb14c96722b8..de7c0e057fe5 100644
--- a/war/yarn.lock
+++ b/yarn.lock
@@ -5,20 +5,13 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@aashutoshrathi/word-wrap@npm:^1.2.3":
-  version: 1.2.6
-  resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
-  checksum: 10c0/53c2b231a61a46792b39a0d43bc4f4f776bb4542aa57ee04930676802e5501282c2fc8aac14e4cd1f1120ff8b52616b6ff5ab539ad30aa2277d726444b71619f
-  languageName: node
-  linkType: hard
-
 "@ampproject/remapping@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "@ampproject/remapping@npm:2.2.1"
+  version: 2.3.0
+  resolution: "@ampproject/remapping@npm:2.3.0"
   dependencies:
-    "@jridgewell/gen-mapping": "npm:^0.3.0"
-    "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 10c0/92ce5915f8901d8c7cd4f4e6e2fe7b9fd335a29955b400caa52e0e5b12ca3796ada7c2f10e78c9c5b0f9c2539dff0ffea7b19850a56e1487aa083531e1e46d43
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10c0/81d63cca5443e0f0c72ae18b544cc28c7c0ec2cea46e7cb888bb0e0f411a1191d0d6b7af798d54e30777d8d1488b2ec0732aac2be342d3d7d3ffd271c6f489ed
   languageName: node
   linkType: hard
 
@@ -89,15 +82,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.4":
-  version: 7.25.5
-  resolution: "@babel/generator@npm:7.25.5"
+"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.6":
+  version: 7.25.6
+  resolution: "@babel/generator@npm:7.25.6"
   dependencies:
-    "@babel/types": "npm:^7.25.4"
+    "@babel/types": "npm:^7.25.6"
     "@jridgewell/gen-mapping": "npm:^0.3.5"
     "@jridgewell/trace-mapping": "npm:^0.3.25"
     jsesc: "npm:^2.5.1"
-  checksum: 10c0/eb8af30c39476e4f4d6b953f355fcf092258291f78d65fb759b7d5e5e6fd521b5bfee64a4e2e4290279f0dcd25ccf8c49a61807828b99b5830d2b734506da1fd
+  checksum: 10c0/f89282cce4ddc63654470b98086994d219407d025497f483eb03ba102086e11e2b685b27122f6ff2e1d93b5b5fa0c3a6b7e974fbf2e4a75b685041a746a4291e
   languageName: node
   linkType: hard
 
@@ -163,7 +156,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.6.1, @babel/helper-define-polyfill-provider@npm:^0.6.2":
+"@babel/helper-define-polyfill-provider@npm:^0.6.2":
   version: 0.6.2
   resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2"
   dependencies:
@@ -307,12 +300,12 @@ __metadata:
   linkType: hard
 
 "@babel/helpers@npm:^7.25.0":
-  version: 7.25.0
-  resolution: "@babel/helpers@npm:7.25.0"
+  version: 7.25.6
+  resolution: "@babel/helpers@npm:7.25.6"
   dependencies:
     "@babel/template": "npm:^7.25.0"
-    "@babel/types": "npm:^7.25.0"
-  checksum: 10c0/b7fe007fc4194268abf70aa3810365085e290e6528dcb9fbbf7a765d43c74b6369ce0f99c5ccd2d44c413853099daa449c9a0123f0b212ac8d18643f2e8174b8
+    "@babel/types": "npm:^7.25.6"
+  checksum: 10c0/448c1cdabccca42fd97a252f73f1e4bcd93776dbf24044f3b4f49b756bf2ece73ee6df05177473bb74ea7456dddd18d6f481e4d96d2cc7839d078900d48c696c
   languageName: node
   linkType: hard
 
@@ -328,14 +321,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.4":
-  version: 7.25.4
-  resolution: "@babel/parser@npm:7.25.4"
+"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.6":
+  version: 7.25.6
+  resolution: "@babel/parser@npm:7.25.6"
   dependencies:
-    "@babel/types": "npm:^7.25.4"
+    "@babel/types": "npm:^7.25.6"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/bdada5662f15d1df11a7266ec3bc9bb769bf3637ecf3d051eafcfc8f576dcf5a3ac1007c5e059db4a1e1387db9ae9caad239fc4f79e4c2200930ed610e779993
+  checksum: 10c0/f88a0e895dbb096fd37c4527ea97d12b5fc013720602580a941ac3a339698872f0c911e318c292b184c36b5fbe23b612f05aff9d24071bc847c7b1c21552c41d
   languageName: node
   linkType: hard
 
@@ -463,24 +456,24 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-syntax-import-assertions@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7"
+  version: 7.25.6
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.25.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/b82c53e095274ee71c248551352d73441cf65b3b3fc0107258ba4e9aef7090772a425442b3ed1c396fa207d0efafde8929c87a17d3c885b3ca2021316e87e246
+  checksum: 10c0/55afa63b1b1355bcc1d85a9ad9d2c78983e27beee38e232d5c1ab59eac39127ce3c3817d6686e3ab1d0aff5edd8e38a6852885c65d3e518accdd183a445ef411
   languageName: node
   linkType: hard
 
 "@babel/plugin-syntax-import-attributes@npm:^7.24.7":
-  version: 7.24.7
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7"
+  version: 7.25.6
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.25.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.24.7"
+    "@babel/helper-plugin-utils": "npm:^7.24.8"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/eccc54d0f03c96d0eec7a6e2fa124dadbc7298345b62ffc4238f173308c4325b5598f139695ff05a95cf78412ef6903599e4b814496612bf39aad4715a16375b
+  checksum: 10c0/0e9359cf2d117476310961dfcfd7204ed692e933707da10d6194153d3996cd2ea5b7635fc90d720dce3612083af89966bb862561064a509c350320dc98644751
   languageName: node
   linkType: hard
 
@@ -1309,11 +1302,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.8.4":
-  version: 7.23.8
-  resolution: "@babel/runtime@npm:7.23.8"
+  version: 7.25.6
+  resolution: "@babel/runtime@npm:7.25.6"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/ba5e8fbb32ef04f6cab5e89c54a0497c2fde7b730595cc1af93496270314f13ff2c6a9360fdb2f0bdd4d6b376752ce3cf85642bd6b876969a6a62954934c2df8
+  checksum: 10c0/d6143adf5aa1ce79ed374e33fdfd74fa975055a80bc6e479672ab1eadc4e4bfd7484444e17dd063a1d180e051f3ec62b357c7a2b817e7657687b47313158c3d2
   languageName: node
   linkType: hard
 
@@ -1329,28 +1322,28 @@ __metadata:
   linkType: hard
 
 "@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3, @babel/traverse@npm:^7.25.4":
-  version: 7.25.4
-  resolution: "@babel/traverse@npm:7.25.4"
+  version: 7.25.6
+  resolution: "@babel/traverse@npm:7.25.6"
   dependencies:
     "@babel/code-frame": "npm:^7.24.7"
-    "@babel/generator": "npm:^7.25.4"
-    "@babel/parser": "npm:^7.25.4"
+    "@babel/generator": "npm:^7.25.6"
+    "@babel/parser": "npm:^7.25.6"
     "@babel/template": "npm:^7.25.0"
-    "@babel/types": "npm:^7.25.4"
+    "@babel/types": "npm:^7.25.6"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 10c0/37c9b49b277e051fe499ef5f6f217370c4f648d6370564d70b5e6beb2da75bfda6d7dab1d39504d89e9245448f8959bc1a5880d2238840cdc3979b35338ed0f5
+  checksum: 10c0/964304c6fa46bd705428ba380bf73177eeb481c3f26d82ea3d0661242b59e0dd4329d23886035e9ca9a4ceb565c03a76fd615109830687a27bcd350059d6377e
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.4, @babel/types@npm:^7.4.4":
-  version: 7.25.4
-  resolution: "@babel/types@npm:7.25.4"
+"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.6, @babel/types@npm:^7.4.4":
+  version: 7.25.6
+  resolution: "@babel/types@npm:7.25.6"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.24.8"
     "@babel/helper-validator-identifier": "npm:^7.24.7"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/9aa25dfcd89cc4e4dde3188091c34398a005a49e2c2b069d0367b41e1122c91e80fd92998c52a90f2fb500f7e897b6090ec8be263d9cb53d0d75c756f44419f2
+  checksum: 10c0/89d45fbee24e27a05dca2d08300a26b905bd384a480448823f6723c72d3a30327c517476389b7280ce8cb9a2c48ef8f47da7f9f6d326faf6f53fd6b68237bdc4
   languageName: node
   linkType: hard
 
@@ -1952,7 +1945,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.5":
+"@jridgewell/gen-mapping@npm:^0.3.5":
   version: 0.3.5
   resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
@@ -1964,9 +1957,9 @@ __metadata:
   linkType: hard
 
 "@jridgewell/resolve-uri@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "@jridgewell/resolve-uri@npm:3.1.1"
-  checksum: 10c0/0dbc9e29bc640bbbdc5b9876d2859c69042bfcf1423c1e6421bcca53e826660bff4e41c7d4bcb8dbea696404231a6f902f76ba41835d049e20f2dd6cffb713bf
+  version: 3.1.2
+  resolution: "@jridgewell/resolve-uri@npm:3.1.2"
+  checksum: 10c0/d502e6fb516b35032331406d4e962c21fe77cdf1cbdb49c6142bcbd9e30507094b18972778a6e27cbad756209cfe34b1a27729e6fa08a2eb92b33943f680cf1e
   languageName: node
   linkType: hard
 
@@ -1978,23 +1971,23 @@ __metadata:
   linkType: hard
 
 "@jridgewell/source-map@npm:^0.3.3":
-  version: 0.3.5
-  resolution: "@jridgewell/source-map@npm:0.3.5"
+  version: 0.3.6
+  resolution: "@jridgewell/source-map@npm:0.3.6"
   dependencies:
-    "@jridgewell/gen-mapping": "npm:^0.3.0"
-    "@jridgewell/trace-mapping": "npm:^0.3.9"
-  checksum: 10c0/b985d9ebd833a21a6e9ace820c8a76f60345a34d9e28d98497c16b6e93ce1f131bff0abd45f8585f14aa382cce678ed680d628c631b40a9616a19cfbc2049b68
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+  checksum: 10c0/6a4ecc713ed246ff8e5bdcc1ef7c49aaa93f7463d948ba5054dda18b02dcc6a055e2828c577bcceee058f302ce1fc95595713d44f5c45e43d459f88d267f2f04
   languageName: node
   linkType: hard
 
 "@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
-  version: 1.4.15
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5
+  version: 1.5.0
+  resolution: "@jridgewell/sourcemap-codec@npm:1.5.0"
+  checksum: 10c0/2eb864f276eb1096c3c11da3e9bb518f6d9fc0023c78344cdc037abadc725172c70314bdb360f2d4b7bffec7f5d657ce006816bc5d4ecb35e61b66132db00c18
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9":
+"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
   version: 0.3.25
   resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
@@ -2039,24 +2032,24 @@ __metadata:
   linkType: hard
 
 "@npmcli/agent@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "@npmcli/agent@npm:2.2.0"
+  version: 2.2.2
+  resolution: "@npmcli/agent@npm:2.2.2"
   dependencies:
     agent-base: "npm:^7.1.0"
     http-proxy-agent: "npm:^7.0.0"
     https-proxy-agent: "npm:^7.0.1"
     lru-cache: "npm:^10.0.1"
-    socks-proxy-agent: "npm:^8.0.1"
-  checksum: 10c0/7b89590598476dda88e79c473766b67c682aae6e0ab0213491daa6083dcc0c171f86b3868f5506f22c09aa5ea69ad7dfb78f4bf39a8dca375d89a42f408645b3
+    socks-proxy-agent: "npm:^8.0.3"
+  checksum: 10c0/325e0db7b287d4154ecd164c0815c08007abfb07653cc57bceded17bb7fd240998a3cbdbe87d700e30bef494885eccc725ab73b668020811d56623d145b524ae
   languageName: node
   linkType: hard
 
 "@npmcli/fs@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@npmcli/fs@npm:3.1.0"
+  version: 3.1.1
+  resolution: "@npmcli/fs@npm:3.1.1"
   dependencies:
     semver: "npm:^7.3.5"
-  checksum: 10c0/162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
+  checksum: 10c0/c37a5b4842bfdece3d14dfdb054f73fe15ed2d3da61b34ff76629fb5b1731647c49166fd2a8bf8b56fcfa51200382385ea8909a3cbecdad612310c114d3f6c99
   languageName: node
   linkType: hard
 
@@ -2182,11 +2175,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 20.11.6
-  resolution: "@types/node@npm:20.11.6"
+  version: 22.5.4
+  resolution: "@types/node@npm:22.5.4"
   dependencies:
-    undici-types: "npm:~5.26.4"
-  checksum: 10c0/922bc1e78076bb79fd168902c80321b54487181e3be3386e183fc535d102d91c8902da25148eaec841410fab7fb872fd4a93ec9ac9299cedf0ebcbf16b442aa1
+    undici-types: "npm:~6.19.2"
+  checksum: 10c0/b445daa7eecd761ad4d778b882d6ff7bcc3b4baad2086ea9804db7c5d4a4ab0298b00d7f5315fc640a73b5a1d52bbf9628e09c9fec0cf44dbf9b4df674a8717d
   languageName: node
   linkType: hard
 
@@ -2198,11 +2191,11 @@ __metadata:
   linkType: hard
 
 "@types/yargs@npm:^17.0.8":
-  version: 17.0.32
-  resolution: "@types/yargs@npm:17.0.32"
+  version: 17.0.33
+  resolution: "@types/yargs@npm:17.0.33"
   dependencies:
     "@types/yargs-parser": "npm:*"
-  checksum: 10c0/2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf
+  checksum: 10c0/d16937d7ac30dff697801c3d6f235be2166df42e4a88bf730fa6dc09201de3727c0a9500c59a672122313341de5f24e45ee0ff579c08ce91928e519090b7906b
   languageName: node
   linkType: hard
 
@@ -2430,20 +2423,20 @@ __metadata:
   linkType: hard
 
 "acorn@npm:^8.12.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2":
-  version: 8.12.0
-  resolution: "acorn@npm:8.12.0"
+  version: 8.12.1
+  resolution: "acorn@npm:8.12.1"
   bin:
     acorn: bin/acorn
-  checksum: 10c0/a19f9dead009d3b430fa3c253710b47778cdaace15b316de6de93a68c355507bc1072a9956372b6c990cbeeb167d4a929249d0faeb8ae4bb6911d68d53299549
+  checksum: 10c0/51fb26cd678f914e13287e886da2d7021f8c2bc0ccc95e03d3e0447ee278dd3b40b9c57dc222acd5881adcf26f3edc40901a4953403232129e3876793cd17386
   languageName: node
   linkType: hard
 
-"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "agent-base@npm:7.1.0"
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "agent-base@npm:7.1.1"
   dependencies:
     debug: "npm:^4.3.4"
-  checksum: 10c0/fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce
+  checksum: 10c0/e59ce7bed9c63bf071a30cc471f2933862044c97fd9958967bfe22521d7a0f601ce4ed5a8c011799d0c726ca70312142ae193bbebb60f576b52be19d4a363b50
   languageName: node
   linkType: hard
 
@@ -2504,14 +2497,14 @@ __metadata:
   linkType: hard
 
 "ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.9.0":
-  version: 8.12.0
-  resolution: "ajv@npm:8.12.0"
+  version: 8.17.1
+  resolution: "ajv@npm:8.17.1"
   dependencies:
-    fast-deep-equal: "npm:^3.1.1"
+    fast-deep-equal: "npm:^3.1.3"
+    fast-uri: "npm:^3.0.1"
     json-schema-traverse: "npm:^1.0.0"
     require-from-string: "npm:^2.0.2"
-    uri-js: "npm:^4.2.2"
-  checksum: 10c0/ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e
+  checksum: 10c0/ec3ba10a573c6b60f94639ffc53526275917a2df6810e4ab5a6b959d87459f9ef3f00d5e7865b82677cb7d21590355b34da14d1d0b9c32d75f95a187e76fff35
   languageName: node
   linkType: hard
 
@@ -2523,9 +2516,9 @@ __metadata:
   linkType: hard
 
 "ansi-regex@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "ansi-regex@npm:6.0.1"
-  checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
+  version: 6.1.0
+  resolution: "ansi-regex@npm:6.1.0"
+  checksum: 10c0/a91daeddd54746338478eef88af3439a7edf30f8e23196e2d6ed182da9add559c601266dbef01c2efa46a958ad6f1f8b176799657616c702b5b02e799e7fd8dc
   languageName: node
   linkType: hard
 
@@ -2618,27 +2611,27 @@ __metadata:
   linkType: hard
 
 "async@npm:^3.2.2":
-  version: 3.2.5
-  resolution: "async@npm:3.2.5"
-  checksum: 10c0/1408287b26c6db67d45cb346e34892cee555b8b59e6c68e6f8c3e495cad5ca13b4f218180e871f3c2ca30df4ab52693b66f2f6ff43644760cab0b2198bda79c1
+  version: 3.2.6
+  resolution: "async@npm:3.2.6"
+  checksum: 10c0/36484bb15ceddf07078688d95e27076379cc2f87b10c03b6dd8a83e89475a3c8df5848859dd06a4c95af1e4c16fc973de0171a77f18ea00be899aca2a4f85e70
   languageName: node
   linkType: hard
 
 "autoprefixer@npm:^10.4.19":
-  version: 10.4.19
-  resolution: "autoprefixer@npm:10.4.19"
+  version: 10.4.20
+  resolution: "autoprefixer@npm:10.4.20"
   dependencies:
-    browserslist: "npm:^4.23.0"
-    caniuse-lite: "npm:^1.0.30001599"
+    browserslist: "npm:^4.23.3"
+    caniuse-lite: "npm:^1.0.30001646"
     fraction.js: "npm:^4.3.7"
     normalize-range: "npm:^0.1.2"
-    picocolors: "npm:^1.0.0"
+    picocolors: "npm:^1.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: 10c0/fe0178eb8b1da4f15c6535cd329926609b22d1811e047371dccce50563623f8075dd06fb167daff059e4228da651b0bdff6d9b44281541eaf0ce0b79125bfd19
+  checksum: 10c0/e1f00978a26e7c5b54ab12036d8c13833fad7222828fc90914771b1263f51b28c7ddb5803049de4e77696cbd02bb25cfc3634e80533025bb26c26aacdf938940
   languageName: node
   linkType: hard
 
@@ -2656,15 +2649,15 @@ __metadata:
   linkType: hard
 
 "babel-plugin-polyfill-corejs2@npm:^0.4.10":
-  version: 0.4.10
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.10"
+  version: 0.4.11
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.11"
   dependencies:
     "@babel/compat-data": "npm:^7.22.6"
-    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.2"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/910bfb1d809cae49cf43348f9b1e4a5e4c895aa25686fdd2ff8af7b7a996b88ad39597707905d097e08d4e70e14340ac935082ef4e035e77f68741f813f2a80d
+  checksum: 10c0/b2217bc8d5976cf8142453ed44daabf0b2e0e75518f24eac83b54a8892e87a88f1bd9089daa92fd25df979ecd0acfd29b6bc28c4182c1c46344cee15ef9bce84
   languageName: node
   linkType: hard
 
@@ -2681,13 +2674,13 @@ __metadata:
   linkType: hard
 
 "babel-plugin-polyfill-regenerator@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.6.1"
+  version: 0.6.2
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.6.2"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/0b55a35a75a261f62477d8d0f0c4a8e3b66f109323ce301d7de6898e168c41224de3bc26a92f48f2c7fcc19dfd1fc60fe71098bfd4f804a0463ff78586892403
+  checksum: 10c0/bc541037cf7620bc84ddb75a1c0ce3288f90e7d2799c070a53f8a495c8c8ae0316447becb06f958dd25dcce2a2fce855d318ecfa48036a1ddb218d55aa38a744
   languageName: node
   linkType: hard
 
@@ -2713,9 +2706,9 @@ __metadata:
   linkType: hard
 
 "binary-extensions@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "binary-extensions@npm:2.2.0"
-  checksum: 10c0/d73d8b897238a2d3ffa5f59c0241870043aa7471335e89ea5e1ff48edb7c2d0bb471517a3e4c5c3f4c043615caa2717b5f80a5e61e07503d51dc85cb848e665d
+  version: 2.3.0
+  resolution: "binary-extensions@npm:2.3.0"
+  checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5
   languageName: node
   linkType: hard
 
@@ -2754,7 +2747,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1, browserslist@npm:^4.23.3":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.23.1, browserslist@npm:^4.23.3":
   version: 4.23.3
   resolution: "browserslist@npm:4.23.3"
   dependencies:
@@ -2776,8 +2769,8 @@ __metadata:
   linkType: hard
 
 "cacache@npm:^18.0.0":
-  version: 18.0.2
-  resolution: "cacache@npm:18.0.2"
+  version: 18.0.4
+  resolution: "cacache@npm:18.0.4"
   dependencies:
     "@npmcli/fs": "npm:^3.1.0"
     fs-minipass: "npm:^3.0.0"
@@ -2791,7 +2784,7 @@ __metadata:
     ssri: "npm:^10.0.0"
     tar: "npm:^6.1.11"
     unique-filename: "npm:^3.0.0"
-  checksum: 10c0/7992665305cc251a984f4fdbab1449d50e88c635bc43bf2785530c61d239c61b349e5734461baa461caaee65f040ab14e2d58e694f479c0810cffd181ba5eabc
+  checksum: 10c0/6c055bafed9de4f3dcc64ac3dc7dd24e863210902b7c470eb9ce55a806309b3efff78033e3d8b4f7dcc5d467f2db43c6a2857aaaf26f0094b8a351d44c42179f
   languageName: node
   linkType: hard
 
@@ -2814,10 +2807,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001646":
-  version: 1.0.30001653
-  resolution: "caniuse-lite@npm:1.0.30001653"
-  checksum: 10c0/7aedf037541c93744148f599daea93d46d1f93ab4347997189efa2d1f003af8eadd7e1e05347ef09261ac1dc635ce375b8c6c00796245fffb4120a124824a14f
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001646":
+  version: 1.0.30001660
+  resolution: "caniuse-lite@npm:1.0.30001660"
+  checksum: 10c0/d28900b56c597176d515c3175ca75c454f2d30cb2c09a44d7bdb009bb0c4d8a2557905adb77642889bbe9feb85fbfe9d974c8b8e53521fb4b50ee16ab246104e
   languageName: node
   linkType: hard
 
@@ -2869,9 +2862,9 @@ __metadata:
   linkType: hard
 
 "chrome-trace-event@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "chrome-trace-event@npm:1.0.3"
-  checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c
+  version: 1.0.4
+  resolution: "chrome-trace-event@npm:1.0.4"
+  checksum: 10c0/3058da7a5f4934b87cf6a90ef5fb68ebc5f7d06f143ed5a4650208e5d7acae47bc03ec844b29fbf5ba7e46e8daa6acecc878f7983a4f4bb7271593da91e61ff5
   languageName: node
   linkType: hard
 
@@ -3201,43 +3194,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "cssnano-preset-default@npm:7.0.1"
+"cssnano-preset-default@npm:^7.0.6":
+  version: 7.0.6
+  resolution: "cssnano-preset-default@npm:7.0.6"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.3"
     css-declaration-sorter: "npm:^7.2.0"
     cssnano-utils: "npm:^5.0.0"
-    postcss-calc: "npm:^10.0.0"
-    postcss-colormin: "npm:^7.0.0"
-    postcss-convert-values: "npm:^7.0.0"
-    postcss-discard-comments: "npm:^7.0.0"
-    postcss-discard-duplicates: "npm:^7.0.0"
+    postcss-calc: "npm:^10.0.2"
+    postcss-colormin: "npm:^7.0.2"
+    postcss-convert-values: "npm:^7.0.4"
+    postcss-discard-comments: "npm:^7.0.3"
+    postcss-discard-duplicates: "npm:^7.0.1"
     postcss-discard-empty: "npm:^7.0.0"
     postcss-discard-overridden: "npm:^7.0.0"
-    postcss-merge-longhand: "npm:^7.0.0"
-    postcss-merge-rules: "npm:^7.0.0"
+    postcss-merge-longhand: "npm:^7.0.4"
+    postcss-merge-rules: "npm:^7.0.4"
     postcss-minify-font-values: "npm:^7.0.0"
     postcss-minify-gradients: "npm:^7.0.0"
-    postcss-minify-params: "npm:^7.0.0"
-    postcss-minify-selectors: "npm:^7.0.0"
+    postcss-minify-params: "npm:^7.0.2"
+    postcss-minify-selectors: "npm:^7.0.4"
     postcss-normalize-charset: "npm:^7.0.0"
     postcss-normalize-display-values: "npm:^7.0.0"
     postcss-normalize-positions: "npm:^7.0.0"
     postcss-normalize-repeat-style: "npm:^7.0.0"
     postcss-normalize-string: "npm:^7.0.0"
     postcss-normalize-timing-functions: "npm:^7.0.0"
-    postcss-normalize-unicode: "npm:^7.0.0"
+    postcss-normalize-unicode: "npm:^7.0.2"
     postcss-normalize-url: "npm:^7.0.0"
     postcss-normalize-whitespace: "npm:^7.0.0"
-    postcss-ordered-values: "npm:^7.0.0"
-    postcss-reduce-initial: "npm:^7.0.0"
+    postcss-ordered-values: "npm:^7.0.1"
+    postcss-reduce-initial: "npm:^7.0.2"
     postcss-reduce-transforms: "npm:^7.0.0"
-    postcss-svgo: "npm:^7.0.0"
-    postcss-unique-selectors: "npm:^7.0.0"
+    postcss-svgo: "npm:^7.0.1"
+    postcss-unique-selectors: "npm:^7.0.3"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/bee65239d25de2ba87e85b4091cbc1cac9ba1b57c9f803dff5a71ea8a55a885045805840dd732be284c28cca6343dece37fc76d7096aba37cfa02eff2ee7714c
+  checksum: 10c0/5c827a9f6b35475267af0512d55f569994b8334eb06565498daa2070ef52f0cdd2013f5efc1cbc0b4664370f491b0080f93c8ee56a7730d38fdf451fb65b030c
   languageName: node
   linkType: hard
 
@@ -3251,14 +3244,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "cssnano@npm:7.0.1"
+  version: 7.0.6
+  resolution: "cssnano@npm:7.0.6"
   dependencies:
-    cssnano-preset-default: "npm:^7.0.1"
-    lilconfig: "npm:^3.1.1"
+    cssnano-preset-default: "npm:^7.0.6"
+    lilconfig: "npm:^3.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/8b17d13efe98ec2db2fbde9ca24e91842b9afe2f80becc5e4271ee1170d77cf73eed3cdc2f35ed51bacdeac763ff85db45ae8e9627a8862bf01d457a819a640e
+  checksum: 10c0/19ff09931a1531e7c0c0d8928da554d99213aa0bb1f3b93cc6b4987727d60a8cd5537b113a5cf4f95cc1db65bba3f2b35476bd63bb57e7469d4eab73e07d736d
   languageName: node
   linkType: hard
 
@@ -3272,14 +3265,14 @@ __metadata:
   linkType: hard
 
 "debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6":
-  version: 4.3.6
-  resolution: "debug@npm:4.3.6"
+  version: 4.3.7
+  resolution: "debug@npm:4.3.7"
   dependencies:
-    ms: "npm:2.1.2"
+    ms: "npm:^2.1.3"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/3293416bff072389c101697d4611c402a6bacd1900ac20c0492f61a9cdd6b3b29750fc7f5e299f8058469ef60ff8fb79b86395a30374fbd2490113c1c7112285
+  checksum: 10c0/1471db19c3b06d485a622d62f65947a19a23fbd0dd73f7fd3eafb697eec5360cde447fb075919987899b1a2096e85d35d4eb5a4de09a57600ac9cf7e6c8e768b
   languageName: node
   linkType: hard
 
@@ -3360,9 +3353,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.5.4":
-  version: 1.5.13
-  resolution: "electron-to-chromium@npm:1.5.13"
-  checksum: 10c0/1d88ac39447e1d718c4296f92fe89836df4688daf2d362d6c49108136795f05a56dd9c950f1c6715e0395fa037c3b5f5ea686c543fdc90e6d74a005877c45022
+  version: 1.5.19
+  resolution: "electron-to-chromium@npm:1.5.19"
+  checksum: 10c0/73e25a928e041d707565fb08371b6ba5f3d7d99c78adddfd553660f28809ca22f1608ff295da3c764903a8eae890cbdd701b1b64b3e1eaeb298cb8aecbf21937
   languageName: node
   linkType: hard
 
@@ -3421,11 +3414,11 @@ __metadata:
   linkType: hard
 
 "envinfo@npm:^7.7.3":
-  version: 7.11.0
-  resolution: "envinfo@npm:7.11.0"
+  version: 7.13.0
+  resolution: "envinfo@npm:7.13.0"
   bin:
     envinfo: dist/cli.js
-  checksum: 10c0/4415b9c1ca32cdf92ce126136b9965eeac2efd6ab7e5278c06e8f86d048edad87ef4084710313a6d938ef9bc084ab17e1caee16339d731d230f3e2650f3aaf4d
+  checksum: 10c0/9c279213cbbb353b3171e8e333fd2ed564054abade08ab3d735fe136e10a0e14e0588e1ce77e6f01285f2462eaca945d64f0778be5ae3d9e82804943e36a4411
   languageName: node
   linkType: hard
 
@@ -3446,16 +3439,16 @@ __metadata:
   linkType: hard
 
 "es-module-lexer@npm:^1.2.1":
-  version: 1.4.1
-  resolution: "es-module-lexer@npm:1.4.1"
-  checksum: 10c0/b7260a138668554d3f0ddcc728cb4b60c2fa463f15545cf155ecbdd5450a1348952d58298a7f48642e900ee579f21d7f5304b6b3c61b3d9fc2d4b2109b5a9dff
+  version: 1.5.4
+  resolution: "es-module-lexer@npm:1.5.4"
+  checksum: 10c0/300a469488c2f22081df1e4c8398c78db92358496e639b0df7f89ac6455462aaf5d8893939087c1a1cbcbf20eed4610c70e0bcb8f3e4b0d80a5d2611c539408c
   languageName: node
   linkType: hard
 
 "escalade@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "escalade@npm:3.1.2"
-  checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287
+  version: 3.2.0
+  resolution: "escalade@npm:3.2.0"
+  checksum: 10c0/ced4dd3a78e15897ed3be74e635110bbf3b08877b0a41be50dcb325ee0e0b5f65fc2d50e9845194d7c4633f327e2e1c6cce00a71b617c5673df0374201d67f65
   languageName: node
   linkType: hard
 
@@ -3596,11 +3589,11 @@ __metadata:
   linkType: hard
 
 "esquery@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "esquery@npm:1.5.0"
+  version: 1.6.0
+  resolution: "esquery@npm:1.6.0"
   dependencies:
     estraverse: "npm:^5.1.0"
-  checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213
+  checksum: 10c0/cb9065ec605f9da7a76ca6dadb0619dfb611e37a81e318732977d90fab50a256b95fee2d925fba7c2f3f0523aa16f91587246693bc09bc34d5a59575fe6e93d2
   languageName: node
   linkType: hard
 
@@ -3682,6 +3675,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-uri@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "fast-uri@npm:3.0.1"
+  checksum: 10c0/3cd46d6006083b14ca61ffe9a05b8eef75ef87e9574b6f68f2e17ecf4daa7aaadeff44e3f0f7a0ef4e0f7e7c20fc07beec49ff14dc72d0b500f00386592f2d10
+  languageName: node
+  linkType: hard
+
 "fastest-levenshtein@npm:^1.0.12, fastest-levenshtein@npm:^1.0.16":
   version: 1.0.16
   resolution: "fastest-levenshtein@npm:1.0.16"
@@ -3697,11 +3697,11 @@ __metadata:
   linkType: hard
 
 "fastq@npm:^1.6.0":
-  version: 1.16.0
-  resolution: "fastq@npm:1.16.0"
+  version: 1.17.1
+  resolution: "fastq@npm:1.17.1"
   dependencies:
     reusify: "npm:^1.0.4"
-  checksum: 10c0/38c1b49adba639af020727284a02af021acab764efd7f088bc31364e8a5b01ce9031eb6c5f7f304019b8267c3b7c236e79d6904884f50f94f83b1700b8a6619a
+  checksum: 10c0/1095f16cea45fb3beff558bb3afa74ca7a9250f5a670b65db7ed585f92b4b48381445cd328b3d87323da81e43232b5d5978a8201bde84e0cd514310f1ea6da34
   languageName: node
   linkType: hard
 
@@ -3715,11 +3715,11 @@ __metadata:
   linkType: hard
 
 "file-entry-cache@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "file-entry-cache@npm:9.0.0"
+  version: 9.1.0
+  resolution: "file-entry-cache@npm:9.1.0"
   dependencies:
     flat-cache: "npm:^5.0.0"
-  checksum: 10c0/07b0a4f062dc0aa258f3e1b06ac083ea25313f5e289943e146fafdaf3315dcc031635545eea7fe98fe5598b91d6c7f48dba7a251dd7ac20108a6ebf7d00b0b1c
+  checksum: 10c0/4b4dbc1e972f50202b1a4430d30fd99378ef6e2a64857176abdc65c5e4730a948fb37e274478520a7bacbc70f3abba455a4b9d2c1915c53f30d11dc85d3fef5e
   languageName: node
   linkType: hard
 
@@ -3773,13 +3773,12 @@ __metadata:
   linkType: hard
 
 "flat-cache@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "flat-cache@npm:4.0.0"
+  version: 4.0.1
+  resolution: "flat-cache@npm:4.0.1"
   dependencies:
     flatted: "npm:^3.2.9"
     keyv: "npm:^4.5.4"
-    rimraf: "npm:^5.0.5"
-  checksum: 10c0/8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547
+  checksum: 10c0/2c59d93e9faa2523e4fda6b4ada749bed432cfa28c8e251f33b25795e426a1c6dbada777afb1f74fcfff33934fdbdea921ee738fcc33e71adc9d6eca984a1cfc
   languageName: node
   linkType: hard
 
@@ -3810,12 +3809,12 @@ __metadata:
   linkType: hard
 
 "foreground-child@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "foreground-child@npm:3.1.1"
+  version: 3.3.0
+  resolution: "foreground-child@npm:3.3.0"
   dependencies:
     cross-spawn: "npm:^7.0.0"
     signal-exit: "npm:^4.0.1"
-  checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
+  checksum: 10c0/028f1d41000553fcfa6c4bb5c372963bf3d9bf0b1f25a87d1a6253014343fb69dfb1b42d9625d7cf44c8ba429940f3d0ff718b62105d4d4a4f6ef8ca0a53faa2
   languageName: node
   linkType: hard
 
@@ -3923,18 +3922,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7":
-  version: 10.3.10
-  resolution: "glob@npm:10.3.10"
+"glob@npm:^10.2.2, glob@npm:^10.3.10":
+  version: 10.4.5
+  resolution: "glob@npm:10.4.5"
   dependencies:
     foreground-child: "npm:^3.1.0"
-    jackspeak: "npm:^2.3.5"
-    minimatch: "npm:^9.0.1"
-    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry: "npm:^1.10.1"
+    jackspeak: "npm:^3.1.2"
+    minimatch: "npm:^9.0.4"
+    minipass: "npm:^7.1.2"
+    package-json-from-dist: "npm:^1.0.0"
+    path-scurry: "npm:^1.11.1"
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 10c0/13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d
+  checksum: 10c0/19a9759ea77b8e3ca0a43c2f07ecddc2ad46216b786bb8f993c445aee80d345925a21e5280c7b7c6c59e860a0154b84e4b2b60321fea92cd3c56b4a7489f160e
   languageName: node
   linkType: hard
 
@@ -4080,12 +4080,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hasown@npm:2.0.0"
+"hasown@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "hasown@npm:2.0.2"
   dependencies:
     function-bind: "npm:^1.1.2"
-  checksum: 10c0/5d415b114f410661208c95e7ab4879f1cc2765b8daceff4dc8718317d1cb7b9ffa7c5d1eafd9a4389c9aab7445d6ea88e05f3096cb1e529618b55304956b87fc
+  checksum: 10c0/3769d434703b8ac66b209a4cca0737519925bbdb61dd887f93a16372b14694c63ff4e797686d87c90f08168e81082248b9b028bad60d4da9e0d1148766f56eb9
   languageName: node
   linkType: hard
 
@@ -4111,22 +4111,22 @@ __metadata:
   linkType: hard
 
 "http-proxy-agent@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "http-proxy-agent@npm:7.0.0"
+  version: 7.0.2
+  resolution: "http-proxy-agent@npm:7.0.2"
   dependencies:
     agent-base: "npm:^7.1.0"
     debug: "npm:^4.3.4"
-  checksum: 10c0/a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8
+  checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921
   languageName: node
   linkType: hard
 
 "https-proxy-agent@npm:^7.0.1":
-  version: 7.0.2
-  resolution: "https-proxy-agent@npm:7.0.2"
+  version: 7.0.5
+  resolution: "https-proxy-agent@npm:7.0.5"
   dependencies:
     agent-base: "npm:^7.0.2"
     debug: "npm:4"
-  checksum: 10c0/7735eb90073db087e7e79312e3d97c8c04baf7ea7ca7b013382b6a45abbaa61b281041a98f4e13c8c80d88f843785bcc84ba189165b4b4087b1e3496ba656d77
+  checksum: 10c0/2490e3acec397abeb88807db52cac59102d5ed758feee6df6112ab3ccd8325e8a1ce8bce6f4b66e5470eca102d31e425ace904242e4fa28dbe0c59c4bafa7b2c
   languageName: node
   linkType: hard
 
@@ -4156,9 +4156,9 @@ __metadata:
   linkType: hard
 
 "immutable@npm:^4.0.0":
-  version: 4.3.4
-  resolution: "immutable@npm:4.3.4"
-  checksum: 10c0/c15b9f0fa7b3c9315725cb00704fddad59f0e668a7379c39b9a528a8386140ee9effb015ae51a5b423e05c59d15fc0b38c970db6964ad6b3e05d0761db68441f
+  version: 4.3.7
+  resolution: "immutable@npm:4.3.7"
+  checksum: 10c0/9b099197081b22f6433003e34929da8ecddbbdc1474cdc8aa3b7669dee4adda349c06143de22def36016d1b6de5322b043eccd7a11db1dad2ca85dad4fff5435
   languageName: node
   linkType: hard
 
@@ -4173,14 +4173,14 @@ __metadata:
   linkType: hard
 
 "import-local@npm:^3.0.2":
-  version: 3.1.0
-  resolution: "import-local@npm:3.1.0"
+  version: 3.2.0
+  resolution: "import-local@npm:3.2.0"
   dependencies:
     pkg-dir: "npm:^4.2.0"
     resolve-cwd: "npm:^3.0.0"
   bin:
     import-local-fixture: fixtures/cli.js
-  checksum: 10c0/c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2
+  checksum: 10c0/94cd6367a672b7e0cb026970c85b76902d2710a64896fa6de93bd5c571dd03b228c5759308959de205083e3b1c61e799f019c9e36ee8e9c523b993e1057f0433
   languageName: node
   linkType: hard
 
@@ -4229,10 +4229,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "ip@npm:2.0.1"
-  checksum: 10c0/cab8eb3e88d0abe23e4724829621ec4c4c5cb41a7f936a2e626c947128c1be16ed543448d42af7cca95379f9892bfcacc1ccd8d09bc7e8bea0e86d492ce33616
+"ip-address@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "ip-address@npm:9.0.5"
+  dependencies:
+    jsbn: "npm:1.1.0"
+    sprintf-js: "npm:^1.1.3"
+  checksum: 10c0/331cd07fafcb3b24100613e4b53e1a2b4feab11e671e655d46dc09ee233da5011284d09ca40c4ecbdfe1d0004f462958675c224a804259f2f78d2465a87824bc
   languageName: node
   linkType: hard
 
@@ -4253,11 +4256,11 @@ __metadata:
   linkType: hard
 
 "is-core-module@npm:^2.13.0":
-  version: 2.13.1
-  resolution: "is-core-module@npm:2.13.1"
+  version: 2.15.1
+  resolution: "is-core-module@npm:2.15.1"
   dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518
+    hasown: "npm:^2.0.2"
+  checksum: 10c0/53432f10c69c40bfd2fa8914133a68709ff9498c86c3bf5fca3cdf3145a56fd2168cbf4a43b29843a6202a120a5f9c5ffba0a4322e1e3441739bc0b641682612
   languageName: node
   linkType: hard
 
@@ -4367,16 +4370,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jackspeak@npm:^2.3.5":
-  version: 2.3.6
-  resolution: "jackspeak@npm:2.3.6"
+"jackspeak@npm:^3.1.2":
+  version: 3.4.3
+  resolution: "jackspeak@npm:3.4.3"
   dependencies:
     "@isaacs/cliui": "npm:^8.0.2"
     "@pkgjs/parseargs": "npm:^0.11.0"
   dependenciesMeta:
     "@pkgjs/parseargs":
       optional: true
-  checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
+  checksum: 10c0/6acc10d139eaefdbe04d2f679e6191b3abf073f111edf10b1de5302c97ec93fffeb2fdd8681ed17f16268aa9dd4f8c588ed9d1d3bffbbfa6e8bf897cbb3149b9
   languageName: node
   linkType: hard
 
@@ -4460,11 +4463,11 @@ __metadata:
   linkType: hard
 
 "jiti@npm:^1.20.0":
-  version: 1.21.0
-  resolution: "jiti@npm:1.21.0"
+  version: 1.21.6
+  resolution: "jiti@npm:1.21.6"
   bin:
     jiti: bin/jiti.js
-  checksum: 10c0/7f361219fe6c7a5e440d5f1dba4ab763a5538d2df8708cdc22561cf25ea3e44b837687931fca7cdd8cdd9f567300e90be989dd1321650045012d8f9ed6aab07f
+  checksum: 10c0/05b9ed58cd30d0c3ccd3c98209339e74f50abd9a17e716f65db46b6a35812103f6bde6e134be7124d01745586bca8cc5dae1d0d952267c3ebe55171949c32e56
   languageName: node
   linkType: hard
 
@@ -4505,6 +4508,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsbn@npm:1.1.0":
+  version: 1.1.0
+  resolution: "jsbn@npm:1.1.0"
+  checksum: 10c0/4f907fb78d7b712e11dea8c165fe0921f81a657d3443dde75359ed52eb2b5d33ce6773d97985a089f09a65edd80b11cb75c767b57ba47391fee4c969f7215c96
+  languageName: node
+  linkType: hard
+
 "jsesc@npm:^2.5.1":
   version: 2.5.2
   resolution: "jsesc@npm:2.5.2"
@@ -4611,10 +4621,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "lilconfig@npm:3.1.1"
-  checksum: 10c0/311b559794546894e3fe176663427326026c1c644145be9e8041c58e268aa9328799b8dfe7e4dd8c6a4ae305feae95a1c9e007db3569f35b42b6e1bc8274754c
+"lilconfig@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "lilconfig@npm:3.1.2"
+  checksum: 10c0/f059630b1a9bddaeba83059db00c672b64dc14074e9f232adce32b38ca1b5686ab737eb665c5ba3c32f147f0002b4bee7311ad0386a9b98547b5623e87071fbe
   languageName: node
   linkType: hard
 
@@ -4712,10 +4722,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
-  version: 10.1.0
-  resolution: "lru-cache@npm:10.1.0"
-  checksum: 10c0/778bc8b2626daccd75f24c4b4d10632496e21ba064b126f526c626fbdbc5b28c472013fccd45d7646b9e1ef052444824854aed617b59cd570d01a8b7d651fc1e
+"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
+  version: 10.4.3
+  resolution: "lru-cache@npm:10.4.3"
+  checksum: 10c0/ebd04fbca961e6c1d6c0af3799adcc966a1babe798f685bb84e6599266599cd95d94630b10262f5424539bc4640107e8a33aa28585374abf561d30d16f4b39fb
   languageName: node
   linkType: hard
 
@@ -4728,15 +4738,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "lru-cache@npm:6.0.0"
-  dependencies:
-    yallist: "npm:^4.0.0"
-  checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9
-  languageName: node
-  linkType: hard
-
 "make-dir@npm:^2.1.0":
   version: 2.1.0
   resolution: "make-dir@npm:2.1.0"
@@ -4748,8 +4749,8 @@ __metadata:
   linkType: hard
 
 "make-fetch-happen@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "make-fetch-happen@npm:13.0.0"
+  version: 13.0.1
+  resolution: "make-fetch-happen@npm:13.0.1"
   dependencies:
     "@npmcli/agent": "npm:^2.0.0"
     cacache: "npm:^18.0.0"
@@ -4760,9 +4761,10 @@ __metadata:
     minipass-flush: "npm:^1.0.5"
     minipass-pipeline: "npm:^1.2.4"
     negotiator: "npm:^0.6.3"
+    proc-log: "npm:^4.2.0"
     promise-retry: "npm:^2.0.1"
     ssri: "npm:^10.0.0"
-  checksum: 10c0/43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
+  checksum: 10c0/df5f4dbb6d98153b751bccf4dc4cc500de85a96a9331db9805596c46aa9f99d9555983954e6c1266d9f981ae37a9e4647f42b9a4bb5466f867f4012e582c9e7e
   languageName: node
   linkType: hard
 
@@ -4855,12 +4857,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.1":
-  version: 9.0.3
-  resolution: "minimatch@npm:9.0.3"
+"minimatch@npm:^9.0.4":
+  version: 9.0.5
+  resolution: "minimatch@npm:9.0.5"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 10c0/85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
+  checksum: 10c0/de96cf5e35bdf0eab3e2c853522f98ffbe9a36c37797778d2665231ec1f20a9447a7e567cb640901f89e4daaa95ae5d70c65a9e8aa2bb0019b6facbc3c0575ed
   languageName: node
   linkType: hard
 
@@ -4881,8 +4883,8 @@ __metadata:
   linkType: hard
 
 "minipass-fetch@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "minipass-fetch@npm:3.0.4"
+  version: 3.0.5
+  resolution: "minipass-fetch@npm:3.0.5"
   dependencies:
     encoding: "npm:^0.1.13"
     minipass: "npm:^7.0.3"
@@ -4891,7 +4893,7 @@ __metadata:
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 10c0/1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
+  checksum: 10c0/9d702d57f556274286fdd97e406fc38a2f5c8d15e158b498d7393b1105974b21249289ec571fa2b51e038a4872bfc82710111cf75fae98c662f3d6f95e72152b
   languageName: node
   linkType: hard
 
@@ -4938,10 +4940,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3":
-  version: 7.0.4
-  resolution: "minipass@npm:7.0.4"
-  checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "minipass@npm:7.1.2"
+  checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557
   languageName: node
   linkType: hard
 
@@ -4964,10 +4966,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:2.1.2":
-  version: 2.1.2
-  resolution: "ms@npm:2.1.2"
-  checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
+"ms@npm:^2.1.3":
+  version: 2.1.3
+  resolution: "ms@npm:2.1.3"
+  checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
   languageName: node
   linkType: hard
 
@@ -5002,8 +5004,8 @@ __metadata:
   linkType: hard
 
 "node-gyp@npm:latest":
-  version: 10.0.1
-  resolution: "node-gyp@npm:10.0.1"
+  version: 10.2.0
+  resolution: "node-gyp@npm:10.2.0"
   dependencies:
     env-paths: "npm:^2.2.0"
     exponential-backoff: "npm:^3.1.1"
@@ -5011,13 +5013,13 @@ __metadata:
     graceful-fs: "npm:^4.2.6"
     make-fetch-happen: "npm:^13.0.0"
     nopt: "npm:^7.0.0"
-    proc-log: "npm:^3.0.0"
+    proc-log: "npm:^4.1.0"
     semver: "npm:^7.3.5"
-    tar: "npm:^6.1.2"
+    tar: "npm:^6.2.1"
     which: "npm:^4.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: 10c0/abddfff7d873312e4ed4a5fb75ce893a5c4fb69e7fcb1dfa71c28a6b92a7f1ef6b62790dffb39181b5a82728ba8f2f32d229cf8cbe66769fe02cea7db4a555aa
+  checksum: 10c0/00630d67dbd09a45aee0a5d55c05e3916ca9e6d427ee4f7bc392d2d3dc5fad7449b21fc098dd38260a53d9dcc9c879b36704a1994235d4707e7271af7e9a835b
   languageName: node
   linkType: hard
 
@@ -5029,13 +5031,13 @@ __metadata:
   linkType: hard
 
 "nopt@npm:^7.0.0":
-  version: 7.2.0
-  resolution: "nopt@npm:7.2.0"
+  version: 7.2.1
+  resolution: "nopt@npm:7.2.1"
   dependencies:
     abbrev: "npm:^2.0.0"
   bin:
     nopt: bin/nopt.js
-  checksum: 10c0/9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
+  checksum: 10c0/a069c7c736767121242037a22a788863accfa932ab285a1eb569eb8cd534b09d17206f68c37f096ae785647435e0c5a5a0a67b42ec743e481a455e5ae6a6df81
   languageName: node
   linkType: hard
 
@@ -5079,16 +5081,16 @@ __metadata:
   linkType: hard
 
 "optionator@npm:^0.9.3":
-  version: 0.9.3
-  resolution: "optionator@npm:0.9.3"
+  version: 0.9.4
+  resolution: "optionator@npm:0.9.4"
   dependencies:
-    "@aashutoshrathi/word-wrap": "npm:^1.2.3"
     deep-is: "npm:^0.1.3"
     fast-levenshtein: "npm:^2.0.6"
     levn: "npm:^0.4.1"
     prelude-ls: "npm:^1.2.1"
     type-check: "npm:^0.4.0"
-  checksum: 10c0/66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c
+    word-wrap: "npm:^1.2.5"
+  checksum: 10c0/4afb687a059ee65b61df74dfe87d8d6815cd6883cb8b3d5883a910df72d0f5d029821f37025e4bccf4048873dbdb09acc6d303d27b8f76b1a80dd5a7d5334675
   languageName: node
   linkType: hard
 
@@ -5169,6 +5171,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"package-json-from-dist@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "package-json-from-dist@npm:1.0.0"
+  checksum: 10c0/e3ffaf6ac1040ab6082a658230c041ad14e72fabe99076a2081bb1d5d41210f11872403fc09082daf4387fc0baa6577f96c9c0e94c90c394fd57794b66aa4033
+  languageName: node
+  linkType: hard
+
 "parent-module@npm:^1.0.0":
   version: 1.0.1
   resolution: "parent-module@npm:1.0.1"
@@ -5232,13 +5241,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.10.1":
-  version: 1.10.1
-  resolution: "path-scurry@npm:1.10.1"
+"path-scurry@npm:^1.11.1":
+  version: 1.11.1
+  resolution: "path-scurry@npm:1.11.1"
   dependencies:
-    lru-cache: "npm:^9.1.1 || ^10.0.0"
+    lru-cache: "npm:^10.2.0"
     minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-  checksum: 10c0/e5dc78a7348d25eec61ab166317e9e9c7b46818aa2c2b9006c507a6ff48c672d011292d9662527213e558f5652ce0afcc788663a061d8b59ab495681840c0c1e
+  checksum: 10c0/32a13711a2a505616ae1cc1b5076801e453e7aae6ac40ab55b388bb91b9d0547a52f5aaceff710ea400205f18691120d4431e520afbe4266b836fadede15872d
   languageName: node
   linkType: hard
 
@@ -5250,9 +5259,9 @@ __metadata:
   linkType: hard
 
 "picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "picocolors@npm:1.0.1"
-  checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400
+  version: 1.1.0
+  resolution: "picocolors@npm:1.1.0"
+  checksum: 10c0/86946f6032148801ef09c051c6fb13b5cf942eaf147e30ea79edb91dd32d700934edebe782a1078ff859fb2b816792e97ef4dab03d7f0b804f6b01a0df35e023
   languageName: node
   linkType: hard
 
@@ -5322,15 +5331,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "postcss-calc@npm:10.0.0"
+"postcss-calc@npm:^10.0.2":
+  version: 10.0.2
+  resolution: "postcss-calc@npm:10.0.2"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.2"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.38
-  checksum: 10c0/d4d529f2f71b49f17441eed74a7564ccd2779c72ed8648d4bb2530261a27c0ca01fe6a07260e7bf57e55f46dd68dea07e52fd1a6b538db7bc13015124be258a5
+  checksum: 10c0/f57c9db7a7a2f3a0cdf45990089c051248d995bb2b9d1bd1fcd1634507851e92ea85bbc71a3594e359e9e9287ba0a820c90d6d292126a4b735cda364a86ce9cf
   languageName: node
   linkType: hard
 
@@ -5384,29 +5393,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-colormin@npm:7.0.0"
+"postcss-colormin@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-colormin@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.3"
     caniuse-api: "npm:^3.0.0"
     colord: "npm:^2.9.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d365a5365e0a94748309d32c7208cd06249bc53eb82cc32c771de4073b109fa8552e58d60dbe84d7e69e68081ed8a01fbf645d38a650e90cb2e13b21043cd796
+  checksum: 10c0/76d09fb7e0218698e622a7c2cfc9087985f48f3a7e44f2655d5eefac4ae9c04198ae9d408dc7ace15d3aa5bde80e7031e462b0cb9b5bd50cfa76bbb1503c755b
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-convert-values@npm:7.0.0"
+"postcss-convert-values@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-convert-values@npm:7.0.4"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5d7cfa06f307e024574a1842016f006691e0c1932352f53a99ce8f2f9930c64c3c1ae17518e9e4e5176630b99f1beaab37bc339bc779fb07dc543670ae66bb21
+  checksum: 10c0/9839b29f7c638672115c9fef5ed7df016aa43ea9dd42a4a2ace16e6a49c75246d2c19f3e03a6409ed3bc7c2fa4de6203bf5789cef8268c76618326b68e3bc591
   languageName: node
   linkType: hard
 
@@ -5464,21 +5473,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-discard-comments@npm:7.0.0"
+"postcss-discard-comments@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "postcss-discard-comments@npm:7.0.3"
+  dependencies:
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/7fef7deea85c1e68161f69057be19a3aedd54d23c9b464c9b1531faa7a115f0c96a4f0ee3a560ce300578599dbc8114fe0fb744208b20b9d2fd8df1b4b39c58a
+  checksum: 10c0/7700c8fb9a83c6ea5cc784267b9afd6e2968fda0358d583af5913baa28dfc91b0f2a4bd0b2bd62a86ebcb8dadb2547e287beae25b5a097e21c1f723367ccf112
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-discard-duplicates@npm:7.0.0"
+"postcss-discard-duplicates@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-discard-duplicates@npm:7.0.1"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/37d568dc18d47b8b9f0fd6d5115b1faf96c2bf429fc4586508a773533479e18627d6260cad6a3ca7d3bfc2f220fd9448410aee40e07f2ec6c6f96bbe3595dbc8
+  checksum: 10c0/5cc2cac249f68004864865ea2ec38b7d5e28184f33e904e531ff57b533aacb73ec49e4a7d83219184001b8d167e5bcabc1673248134468d7ebaa0bfb9ff78f0a
   languageName: node
   linkType: hard
 
@@ -5611,29 +5622,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-merge-longhand@npm:7.0.0"
+"postcss-merge-longhand@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-merge-longhand@npm:7.0.4"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^7.0.0"
+    stylehacks: "npm:^7.0.4"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/5f814f396a5107dcb5e74c2d4e55ebcd03b9bc2b3619ed7aea63a441854023ce349bc371d30aec1ac33a375139afac02709e7721e055b5e624701ac6576e8a10
+  checksum: 10c0/6f50f7775dd361f83daf1acb3e0001d700ed2b7b9bea02df172143adc7fa196ce9209c9e482010ce36fd704512433b62692c5ab2eef5226db71ea3e694654dc7
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-merge-rules@npm:7.0.0"
+"postcss-merge-rules@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-merge-rules@npm:7.0.4"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.3"
     caniuse-api: "npm:^3.0.0"
     cssnano-utils: "npm:^5.0.0"
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/d9cb3a4e55db57aa7ba0bb1caefb82db93c8493d2b3db66091dae9d5794ca04729e660115765ff254d0eb960e4db037f6c5b92562b396b05216888d12acc08e0
+  checksum: 10c0/fffdcef4ada68e92ab8e6dc34a3b9aa2b87188cd4d08f5ba0ff2aff7e3e3c7f086830748ff64db091b5ccb9ac59ac37cfaab1268ed3efb50ab9c4f3714eb5f6d
   languageName: node
   linkType: hard
 
@@ -5661,27 +5672,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-minify-params@npm:7.0.0"
+"postcss-minify-params@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-minify-params@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.3"
     cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/28a7ae313a197aeaff8b3fa1e695a6443b11a74258374a05adee6a1b05f5849ef52037b7a5069d6910614b03b4610acdaf4a76f38b89cb42e813a8cb5ec2fc01
+  checksum: 10c0/0e041f70554bae9d4a66c8ab2f2f3ed8bf73862c9d5ff9972ac7f1a596badd1544f093fa2362dd33e96c038af9e10287cdbfec9f480c49bffdcbaca9fdcb1e4e
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-minify-selectors@npm:7.0.0"
+"postcss-minify-selectors@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "postcss-minify-selectors@npm:7.0.4"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.16"
+    cssesc: "npm:^3.0.0"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/6baf0ea71b8dfd01bdb5b516d01aa00244c55cad8d9c674358d735cef2a6aca6586dd480d419cc8d3f470e6d2d7d19354592044f19766993caf9800d3d7e0d36
+  checksum: 10c0/212b8f3d62eb2a27ed57d4e76b75b0886806ddb9e2497c0bb79308fa75dabaaaa4ed2b97734896e87603272d05231fd74aee2c256a48d77aa468b5b64cc7866a
   languageName: node
   linkType: hard
 
@@ -5806,15 +5818,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-normalize-unicode@npm:7.0.0"
+"postcss-normalize-unicode@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-normalize-unicode@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.3"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/f2d6ab0076c006dcf3ed33ba30686f2d29e81a408c66acced22e2c942df6d613697ea786137833dd258aafab5fda4d3eb27df13a82df830357dbad9b79154881
+  checksum: 10c0/0df1aac932cc2340715178fd024e0f6d872ea5a4bee1bc8357317a75a7b2c904d885f754cc162af001aa2a9ded7c54fac7cbcd701e21e995c1ace92dc08f2b9d
   languageName: node
   linkType: hard
 
@@ -5849,15 +5861,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-ordered-values@npm:7.0.0"
+"postcss-ordered-values@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-ordered-values@npm:7.0.1"
   dependencies:
     cssnano-utils: "npm:^5.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/42b14f9518b573318594c2aeb2f13fd1fbe44936d14f1b28a438e7a82644ace9a2946699bebfe7a2d383534dc24e7203c35308d749f3c585a86daa238ad920a4
+  checksum: 10c0/9fc62e9039c7d4fa417d165678b065fc577a7232aa41a94a4e9208ad7db2268e1ce003aaad7c6a569afdf890a43416b0bf21047461505b4e3a16eec311a6eb63
   languageName: node
   linkType: hard
 
@@ -5974,15 +5986,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-reduce-initial@npm:7.0.0"
+"postcss-reduce-initial@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-reduce-initial@npm:7.0.2"
   dependencies:
-    browserslist: "npm:^4.23.0"
+    browserslist: "npm:^4.23.3"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/ed50cd680ce258df953b82ce9b3fb52564d08548724577810800e236d017d80430cbccb4b1ad38b0f4d521663598e44ab93136b20064231181ef49e1e113ae10
+  checksum: 10c0/1e6fafaf5fac52b351c8de156ed62e4e1f48da7eb07f9ce90da54b45dca61da9af1e954b8a343271cb3e4ec99e0c5f18d7f9f96da0ca144511fca04498fac78c
   languageName: node
   linkType: hard
 
@@ -6042,7 +6054,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.2":
+"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.2":
   version: 6.1.2
   resolution: "postcss-selector-parser@npm:6.1.2"
   dependencies:
@@ -6052,26 +6064,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-svgo@npm:7.0.0"
+"postcss-svgo@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-svgo@npm:7.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    svgo: "npm:^3.2.0"
+    svgo: "npm:^3.3.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/0e724069b5de83aa2b8f8a4746cb60cb663e0a8bbab0e4ba995649cb0562205af57d1f54b89fb90d8ae04a4b7ac3ac6e3751afffc3cff697cb19f7a36b71b195
+  checksum: 10c0/7c7b177e6f4e2a3e9ada76d53afa02e08d900c8ac15600ba9daa80480269d538405e544bd8091bc5eb7529173a476896fad885a72a247258265424b29a9195ed
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "postcss-unique-selectors@npm:7.0.0"
+"postcss-unique-selectors@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "postcss-unique-selectors@npm:7.0.3"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.16"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/33b532ad0e9271c5a379859e18adfdc72986bb538672cc0fbc06295d824f82dba3f7b57264e18a3214901bc5244ff5408d28b530374d24a088507287c7f520ce
+  checksum: 10c0/2eb90eb0745d1e29d411ea5108f1cd9737de5b8f739cabc717074872bc4015950c9963f870b23b33b9ef45e7887eecfe5560cffee56616d4e0b8d0fac4f7cb10
   languageName: node
   linkType: hard
 
@@ -6109,10 +6121,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proc-log@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "proc-log@npm:3.0.0"
-  checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc
+"proc-log@npm:^4.1.0, proc-log@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "proc-log@npm:4.2.0"
+  checksum: 10c0/17db4757c2a5c44c1e545170e6c70a26f7de58feb985091fb1763f5081cab3d01b181fb2dd240c9f4a4255a1d9227d163d5771b7e69c9e49a561692db865efb9
   languageName: node
   linkType: hard
 
@@ -6305,17 +6317,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "rimraf@npm:5.0.5"
-  dependencies:
-    glob: "npm:^10.3.7"
-  bin:
-    rimraf: dist/esm/bin.mjs
-  checksum: 10c0/d50dbe724f33835decd88395b25ed35995077c60a50ae78ded06e0185418914e555817aad1b4243edbff2254548c2f6ad6f70cc850040bebb4da9e8cc016f586
-  languageName: node
-  linkType: hard
-
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
@@ -6420,13 +6421,11 @@ __metadata:
   linkType: hard
 
 "semver@npm:^7.3.5, semver@npm:^7.5.4":
-  version: 7.5.4
-  resolution: "semver@npm:7.5.4"
-  dependencies:
-    lru-cache: "npm:^6.0.0"
+  version: 7.6.3
+  resolution: "semver@npm:7.6.3"
   bin:
     semver: bin/semver.js
-  checksum: 10c0/5160b06975a38b11c1ab55950cb5b8a23db78df88275d3d8a42ccf1f29e55112ac995b3a26a522c36e3b5f76b0445f1eef70d696b8c7862a2b4303d7b0e7609e
+  checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf
   languageName: node
   linkType: hard
 
@@ -6503,24 +6502,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks-proxy-agent@npm:^8.0.1":
-  version: 8.0.2
-  resolution: "socks-proxy-agent@npm:8.0.2"
+"socks-proxy-agent@npm:^8.0.3":
+  version: 8.0.4
+  resolution: "socks-proxy-agent@npm:8.0.4"
   dependencies:
-    agent-base: "npm:^7.0.2"
+    agent-base: "npm:^7.1.1"
     debug: "npm:^4.3.4"
-    socks: "npm:^2.7.1"
-  checksum: 10c0/a842402fc9b8848a31367f2811ca3cd14c4106588b39a0901cd7a69029998adfc6456b0203617c18ed090542ad0c24ee4e9d4c75a0c4b75071e214227c177eb7
+    socks: "npm:^2.8.3"
+  checksum: 10c0/345593bb21b95b0508e63e703c84da11549f0a2657d6b4e3ee3612c312cb3a907eac10e53b23ede3557c6601d63252103494caa306b66560f43af7b98f53957a
   languageName: node
   linkType: hard
 
-"socks@npm:^2.7.1":
-  version: 2.7.1
-  resolution: "socks@npm:2.7.1"
+"socks@npm:^2.8.3":
+  version: 2.8.3
+  resolution: "socks@npm:2.8.3"
   dependencies:
-    ip: "npm:^2.0.0"
+    ip-address: "npm:^9.0.5"
     smart-buffer: "npm:^4.2.0"
-  checksum: 10c0/43f69dbc9f34fc8220bc51c6eea1c39715ab3cfdb115d6e3285f6c7d1a603c5c75655668a5bbc11e3c7e2c99d60321fb8d7ab6f38cda6a215fadd0d6d0b52130
+  checksum: 10c0/d54a52bf9325165770b674a67241143a3d8b4e4c8884560c4e0e078aace2a728dffc7f70150660f51b85797c4e1a3b82f9b7aa25e0a0ceae1a243365da5c51a7
   languageName: node
   linkType: hard
 
@@ -6532,9 +6531,9 @@ __metadata:
   linkType: hard
 
 "source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "source-map-js@npm:1.2.0"
-  checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
+  version: 1.2.1
+  resolution: "source-map-js@npm:1.2.1"
+  checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf
   languageName: node
   linkType: hard
 
@@ -6555,6 +6554,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sprintf-js@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "sprintf-js@npm:1.1.3"
+  checksum: 10c0/09270dc4f30d479e666aee820eacd9e464215cdff53848b443964202bf4051490538e5dd1b42e1a65cf7296916ca17640aebf63dae9812749c7542ee5f288dec
+  languageName: node
+  linkType: hard
+
 "sprintf-js@npm:~1.0.2":
   version: 1.0.3
   resolution: "sprintf-js@npm:1.0.3"
@@ -6563,11 +6569,11 @@ __metadata:
   linkType: hard
 
 "ssri@npm:^10.0.0":
-  version: 10.0.5
-  resolution: "ssri@npm:10.0.5"
+  version: 10.0.6
+  resolution: "ssri@npm:10.0.6"
   dependencies:
     minipass: "npm:^7.0.3"
-  checksum: 10c0/b091f2ae92474183c7ac5ed3f9811457e1df23df7a7e70c9476eaa9a0c4a0c8fc190fb45acefbf023ca9ee864dd6754237a697dc52a0fb182afe65d8e77443d8
+  checksum: 10c0/e5a1e23a4057a86a97971465418f22ea89bd439ac36ade88812dd920e4e61873e8abd6a9b72a03a67ef50faa00a2daf1ab745c5a15b46d03e0544a0296354227
   languageName: node
   linkType: hard
 
@@ -6627,15 +6633,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "stylehacks@npm:7.0.0"
+"stylehacks@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "stylehacks@npm:7.0.4"
   dependencies:
-    browserslist: "npm:^4.23.0"
-    postcss-selector-parser: "npm:^6.0.16"
+    browserslist: "npm:^4.23.3"
+    postcss-selector-parser: "npm:^6.1.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 10c0/c1c0231974ab7922af3a535a9cb78bfe84997767da7defe111cc76d7f10c9e139fe8cb0f9d5bea87b0c0cc0166c82a6ec98a3d6242d7e29ef90adceecfd330ae
+  checksum: 10c0/b4d0b280ba274503ecc04111cc11c713e0d65db079fbcd8b42d6350be1cca20e28611eddee93b419aa208176a0d3a5fff83d83ef958d1876713809b6a2787c0c
   languageName: node
   linkType: hard
 
@@ -6771,9 +6777,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svgo@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "svgo@npm:3.2.0"
+"svgo@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "svgo@npm:3.3.2"
   dependencies:
     "@trysound/sax": "npm:0.2.0"
     commander: "npm:^7.2.0"
@@ -6784,7 +6790,7 @@ __metadata:
     picocolors: "npm:^1.0.0"
   bin:
     svgo: ./bin/svgo
-  checksum: 10c0/28fa9061ccbcf2e3616d48d1feb613aaa05f8f290a329beb0e585914f1864385152934a7d4d683a4609fafbae3d51666633437c359c5c5ef74fb58ad09092a7c
+  checksum: 10c0/a6badbd3d1d6dbb177f872787699ab34320b990d12e20798ecae915f0008796a0f3c69164f1485c9def399e0ce0a5683eb4a8045e51a5e1c364bb13a0d9f79e1
   languageName: node
   linkType: hard
 
@@ -6808,7 +6814,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^6.1.11, tar@npm:^6.1.2":
+"tar@npm:^6.1.11, tar@npm:^6.2.1":
   version: 6.2.1
   resolution: "tar@npm:6.2.1"
   dependencies:
@@ -6845,8 +6851,8 @@ __metadata:
   linkType: hard
 
 "terser@npm:^5.26.0":
-  version: 5.27.0
-  resolution: "terser@npm:5.27.0"
+  version: 5.32.0
+  resolution: "terser@npm:5.32.0"
   dependencies:
     "@jridgewell/source-map": "npm:^0.3.3"
     acorn: "npm:^8.8.2"
@@ -6854,7 +6860,7 @@ __metadata:
     source-map-support: "npm:~0.5.20"
   bin:
     terser: bin/terser
-  checksum: 10c0/bed0d39d9a7f2b82c87173e48081c46426a8820ba1dcb864bbfccd2df2b7fb8498a7ea4c8ef045ccce5713b23a6b4c3a784967f1b9f3115adaa7f51712f6e6ae
+  checksum: 10c0/94daae4881258eb7d09abd46378e23d11ee46caa507b2fb26c5595c7e490914be734e0de38c50041dc38fae5fca24de11badf042dfbbfc1d336ed117335c420a
   languageName: node
   linkType: hard
 
@@ -6900,18 +6906,18 @@ __metadata:
   linkType: hard
 
 "uglify-js@npm:^3.1.4":
-  version: 3.17.4
-  resolution: "uglify-js@npm:3.17.4"
+  version: 3.19.3
+  resolution: "uglify-js@npm:3.19.3"
   bin:
     uglifyjs: bin/uglifyjs
-  checksum: 10c0/8b7fcdca69deb284fed7d2025b73eb747ce37f9aca6af53422844f46427152d5440601b6e2a033e77856a2f0591e4167153d5a21b68674ad11f662034ec13ced
+  checksum: 10c0/83b0a90eca35f778e07cad9622b80c448b6aad457c9ff8e568afed978212b42930a95f9e1be943a1ffa4258a3340fbb899f41461131c05bb1d0a9c303aed8479
   languageName: node
   linkType: hard
 
-"undici-types@npm:~5.26.4":
-  version: 5.26.5
-  resolution: "undici-types@npm:5.26.5"
-  checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501
+"undici-types@npm:~6.19.2":
+  version: 6.19.8
+  resolution: "undici-types@npm:6.19.8"
+  checksum: 10c0/078afa5990fba110f6824823ace86073b4638f1d5112ee26e790155f481f2a868cc3e0615505b6f4282bdf74a3d8caad715fd809e870c2bb0704e3ea6082f344
   languageName: node
   linkType: hard
 
@@ -6995,12 +7001,12 @@ __metadata:
   linkType: hard
 
 "watchpack@npm:^2.4.1":
-  version: 2.4.1
-  resolution: "watchpack@npm:2.4.1"
+  version: 2.4.2
+  resolution: "watchpack@npm:2.4.2"
   dependencies:
     glob-to-regexp: "npm:^0.4.1"
     graceful-fs: "npm:^4.1.2"
-  checksum: 10c0/c694de0a61004e587a8a0fdc9cfec20ee692c52032d9ab2c2e99969a37fdab9e6e1bd3164ed506f9a13f7c83e65563d563e0d6b87358470cdb7309b83db78683
+  checksum: 10c0/ec60a5f0e9efaeca0102fd9126346b3b2d523e01c34030d3fddf5813a7125765121ebdc2552981136dcd2c852deb1af0b39340f2fcc235f292db5399d0283577
   languageName: node
   linkType: hard
 
@@ -7148,6 +7154,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"word-wrap@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "word-wrap@npm:1.2.5"
+  checksum: 10c0/e0e4a1ca27599c92a6ca4c32260e8a92e8a44f4ef6ef93f803f8ed823f486e0889fc0b93be4db59c8d51b3064951d25e43d434e95dc8c960cc3a63d65d00ba20
+  languageName: node
+  linkType: hard
+
 "wordwrap@npm:^1.0.0":
   version: 1.0.0
   resolution: "wordwrap@npm:1.0.0"
@@ -7228,8 +7241,8 @@ __metadata:
   linkType: hard
 
 "yocto-queue@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "yocto-queue@npm:1.0.0"
-  checksum: 10c0/856117aa15cf5103d2a2fb173f0ab4acb12b4b4d0ed3ab249fdbbf612e55d1cadfd27a6110940e24746fb0a78cf640b522cc8bca76f30a3b00b66e90cf82abe0
+  version: 1.1.1
+  resolution: "yocto-queue@npm:1.1.1"
+  checksum: 10c0/cb287fe5e6acfa82690acb43c283de34e945c571a78a939774f6eaba7c285bacdf6c90fbc16ce530060863984c906d2b4c6ceb069c94d1e0a06d5f2b458e2a92
   languageName: node
   linkType: hard

From 2d2adefabdf9edf025a277c95d1fc9d33bbfe14c Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:38:47 +0100
Subject: [PATCH 428/449] Refine content and appearance of the user account
 screen (#9521)

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
 .../java/hudson/model/TimeZoneProperty.java   |  5 ++++
 .../hudson/model/UserPropertyDescriptor.java  | 12 ++++++++++
 .../ConsoleUrlProviderUserProperty.java       |  5 ++++
 .../hudson/model/Messages.properties          |  3 ++-
 .../model/TimeZoneProperty/config.jelly       |  2 +-
 .../model/TimeZoneProperty/config.properties  | 20 ----------------
 .../TimeZoneProperty/config_fr.properties     | 20 ----------------
 .../TimeZoneProperty/config_it.properties     | 22 ------------------
 .../TimeZoneProperty/config_ja.properties     | 22 ------------------
 .../TimeZoneProperty/config_pt_BR.properties  | 23 -------------------
 .../TimeZoneProperty/config_sv_SE.properties  | 20 ----------------
 .../TimeZoneProperty/config_zh_TW.properties  | 20 ----------------
 .../TimeZoneProperty/help-timeZoneName.html   |  3 ---
 .../help-timeZoneName_ja.html                 |  3 ---
 .../help-timeZoneName_sv_SE.html              |  4 ----
 .../index.jelly                               | 18 ++++++++-------
 .../index.properties                          |  4 +++-
 .../config.jelly                              |  3 ---
 .../config.properties                         |  1 -
 .../config_sv_SE.properties                   |  1 -
 .../jenkins/console/Messages.properties       |  1 +
 .../src/main/resources/lib/form/section.jelly |  8 +++++++
 war/src/main/scss/components/_section.scss    |  7 ++++++
 .../main/webapp/help/user/description.html    |  5 ----
 .../main/webapp/help/user/description_bg.html |  6 -----
 .../main/webapp/help/user/description_de.html |  6 -----
 .../main/webapp/help/user/description_fr.html |  5 ----
 .../main/webapp/help/user/description_it.html |  7 ------
 .../main/webapp/help/user/description_ja.html |  4 ----
 .../main/webapp/help/user/description_nl.html |  7 ------
 .../webapp/help/user/description_pt_BR.html   |  6 -----
 .../main/webapp/help/user/description_ru.html |  5 ----
 .../main/webapp/help/user/description_tr.html |  7 ------
 .../webapp/help/user/description_zh_TW.html   |  4 ----
 war/src/main/webapp/help/user/fullName.html   |  5 ----
 .../main/webapp/help/user/fullName_bg.html    |  4 ----
 .../main/webapp/help/user/fullName_de.html    |  6 -----
 .../main/webapp/help/user/fullName_fr.html    |  5 ----
 .../main/webapp/help/user/fullName_it.html    |  6 -----
 .../main/webapp/help/user/fullName_ja.html    |  4 ----
 .../main/webapp/help/user/fullName_nl.html    |  5 ----
 .../main/webapp/help/user/fullName_pt_BR.html |  6 -----
 .../main/webapp/help/user/fullName_ru.html    |  5 ----
 .../main/webapp/help/user/fullName_tr.html    |  6 -----
 .../main/webapp/help/user/fullName_zh_TW.html |  4 ----
 45 files changed, 54 insertions(+), 291 deletions(-)
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config.properties
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html
 delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html
 delete mode 100644 core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties
 delete mode 100644 core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties
 delete mode 100644 war/src/main/webapp/help/user/description.html
 delete mode 100644 war/src/main/webapp/help/user/description_bg.html
 delete mode 100644 war/src/main/webapp/help/user/description_de.html
 delete mode 100644 war/src/main/webapp/help/user/description_fr.html
 delete mode 100644 war/src/main/webapp/help/user/description_it.html
 delete mode 100644 war/src/main/webapp/help/user/description_ja.html
 delete mode 100644 war/src/main/webapp/help/user/description_nl.html
 delete mode 100644 war/src/main/webapp/help/user/description_pt_BR.html
 delete mode 100644 war/src/main/webapp/help/user/description_ru.html
 delete mode 100644 war/src/main/webapp/help/user/description_tr.html
 delete mode 100644 war/src/main/webapp/help/user/description_zh_TW.html
 delete mode 100644 war/src/main/webapp/help/user/fullName.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_bg.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_de.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_fr.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_it.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_ja.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_nl.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_pt_BR.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_ru.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_tr.html
 delete mode 100644 war/src/main/webapp/help/user/fullName_zh_TW.html

diff --git a/core/src/main/java/hudson/model/TimeZoneProperty.java b/core/src/main/java/hudson/model/TimeZoneProperty.java
index 2675448dad80..95956026a76e 100644
--- a/core/src/main/java/hudson/model/TimeZoneProperty.java
+++ b/core/src/main/java/hudson/model/TimeZoneProperty.java
@@ -62,6 +62,11 @@ public String getDisplayName() {
             return Messages.TimeZoneProperty_DisplayName();
         }
 
+        @Override
+        public String getDescription() {
+            return Messages.TimeZoneProperty_Description();
+        }
+
         @Override
         public UserProperty newInstance(User user) {
             return new TimeZoneProperty();
diff --git a/core/src/main/java/hudson/model/UserPropertyDescriptor.java b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
index 66762bf3c716..b5a115404be3 100644
--- a/core/src/main/java/hudson/model/UserPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
@@ -26,6 +26,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.model.userproperty.UserPropertyCategory;
 import java.util.Optional;
 import org.jenkinsci.Symbol;
@@ -126,4 +127,15 @@ public boolean isEnabled() {
     protected @CheckForNull String getUserPropertyCategoryAsString() {
         return null;
     }
+
+    /**
+     * Optional description for the configurable object
+     * Displays as plain text
+     *
+     * @since TODO
+     */
+    @Nullable
+    public String getDescription() {
+        return null;
+    }
 }
diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java b/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java
index 3763036b9686..5308a6d7c6ee 100644
--- a/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java
+++ b/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java
@@ -65,6 +65,11 @@ public String getDisplayName() {
             return Messages.consoleUrlProviderDisplayName();
         }
 
+        @Override
+        public String getDescription() {
+            return Messages.consoleUrlProviderDisplayName_Description();
+        }
+
         @Override
         public UserProperty newInstance(User user) {
             return new ConsoleUrlProviderUserProperty();
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index d56c57ff5ee0..fbe7a70ae53b 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -408,7 +408,8 @@ Jenkins.IsRestarting=Jenkins is restarting
 User.IllegalUsername="{0}" is prohibited as a username for security reasons.
 User.IllegalFullname="{0}" is prohibited as a full name for security reasons.
 
-TimeZoneProperty.DisplayName=User Defined Time Zone
+TimeZoneProperty.DisplayName=Time zone
+TimeZoneProperty.Description=Select a time zone to use rather than the system default
 TimeZoneProperty.DisplayDefaultTimeZone=Default
 TimeZoneProperty.current_time_in_=Current time in {0}: {1}
 TimeZoneProperty.current_time_on_server_in_in_proposed_di=Current time on server in {0}: {1}; in proposed display zone: {2}
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly b/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly
index 2c3bde11f734..988c2993af69 100644
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly
+++ b/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:entry field="timeZoneName" title="${%title}">
+  <f:entry field="timeZoneName">
     <f:select />
   </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties
deleted file mode 100644
index df0ea286bace..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=Time Zone
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties
deleted file mode 100644
index 754326ab5ed3..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=Fuseau horaire
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties
deleted file mode 100644
index dd8664b821bc..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Italian localization plugin for Jenkins
-# Copyright © 2020 Alessandro Menti
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-title=Fuso orario
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties
deleted file mode 100644
index 9a2e6c2da365..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2020 Takashi Harano
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=タイムゾーン
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties
deleted file mode 100644
index 69165e681fc9..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-title=Fuso horário
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties
deleted file mode 100644
index 81b54683063b..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=Tidszon
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties
deleted file mode 100644
index a35c89f565ff..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-title=時區
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html
deleted file mode 100644
index 4bb418b353c4..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-  Specify user defined time zone for displaying time rather than system default.
-</div>
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html
deleted file mode 100644
index 92d9ed7db039..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-  システムデフォルトの代わりに、ユーザーが指定したタイムゾーンで時刻を表示します。
-</div>
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html
deleted file mode 100644
index 25f230308212..000000000000
--- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  Ange användardefinierad tidszon för visa klockslag istället för
-  systemstandarden.
-</div>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
index 8d2a8e9368e7..c6b458cecfe9 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
     <l:layout permission="${app.ADMINISTER}" title="${%title}">
         <st:include page="sidepanel.jelly" it="${it.targetUser}" />
         <l:main-panel>
-            <f:form method="post" action="configSubmit" name="config">
+            <f:form method="post" action="configSubmit" name="config" class="jenkins-form">
                 <h1>
                     ${%title}
                 </h1>
@@ -39,18 +39,20 @@ THE SOFTWARE.
                 <j:set var="it" value="${thisAction.targetUser}" />
                 <j:set var="instance" value="${it}"/>
 
-                <f:entry title="${%Full name}" help="/help/user/fullName.html">
-                    <f:textbox field="fullName" />
-                </f:entry>
-                <f:entry title="${%Description}" help="/help/user/description.html">
-                    <f:textarea field="description" codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription" />
-                </f:entry>
+                <f:section>
+                    <f:entry title="${%Full name}" description="${%Full name.Description}">
+                        <f:textbox field="fullName" />
+                    </f:entry>
+                    <f:entry title="${%Description}" description="${%Description.Description}">
+                        <f:textarea field="description" codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription" />
+                    </f:entry>
+                </f:section>
 
                 <j:set var="descriptors" value="${thisAction.myCategoryDescriptors}" />
                 <j:set var="instances" value="${it.properties}" />
                 <j:forEach var="d" items="${descriptors}" varStatus="loop">
                     <j:if test="${d.enabled}">
-                        <f:section title="${d.displayName}">
+                        <f:section title="${d.displayName}" description="${d.description}">
                             <j:set var="descriptor" value="${d}" />
                             <j:set var="instance" value="${instances[d]}" />
 
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
index 41e4d5b9689f..dfeb5024042c 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
@@ -21,5 +21,7 @@
 # THE SOFTWARE.
 
 title=Account
-Full\ name=Full Name
+Full\ name=Full name
+Full\ name.Description=We recommend using your real name so people can recognize you instead of your ID
 Description=Description
+Description.Description=Enter a short description about yourself so that visitors know who you are
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
index 57f5af6d2097..3ea825131863 100644
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
+++ b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly
@@ -5,9 +5,6 @@
           <!-- Dummy field to always have an entry in form submissions so users can delete all providers. -->
           <f:checkbox field="unused" checked="true" />
         </f:invisibleEntry>
-        <f:block>
-            ${%description}
-        </f:block>
         <f:entry>
             <f:repeatableHeteroProperty field="providers" hasHeader="true" oneEach="true" header="${%Providers}" />
         </f:entry>
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties
deleted file mode 100644
index 9ebb3cd824ca..000000000000
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties
+++ /dev/null
@@ -1 +0,0 @@
-description=Controls what visualization tool handles build console links. Providers higher in the list take precedence over providers lower in the list. All providers configured here take precedence over those configured globally by administrators.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties
deleted file mode 100644
index d0a8ed3d0459..000000000000
--- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties
+++ /dev/null
@@ -1 +0,0 @@
-description=Styr vilket visualiseringsverktyg som hanterar konsollänkar för byggen. Leverantörer högre upp i listan har företräde framför leverantörer längre ned i listan. Alla leverantörer som konfigurerats här har företräde framför de som har konfigurerats globalt av administratörer.
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/console/Messages.properties b/core/src/main/resources/jenkins/console/Messages.properties
index 20a460d49709..72347e1df5b6 100644
--- a/core/src/main/resources/jenkins/console/Messages.properties
+++ b/core/src/main/resources/jenkins/console/Messages.properties
@@ -1,2 +1,3 @@
 consoleUrlProviderDisplayName=Console URL Provider
+consoleUrlProviderDisplayName.Description=Select which view you want to use for build console links. Views listed higher will be prioritized over those listed lower. The views you choose here will be used rather than those set by administrators.
 defaultProviderDisplayName=Default
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/section.jelly b/core/src/main/resources/lib/form/section.jelly
index 706920ad6ecc..1e7e7ebbb2d5 100644
--- a/core/src/main/resources/lib/form/section.jelly
+++ b/core/src/main/resources/lib/form/section.jelly
@@ -32,6 +32,9 @@ THE SOFTWARE.
       If null is given, the entire <f:section> tag becomes no-op.
       ]]>
     </st:attribute>
+    <st:attribute name="description" since="TODO">
+      Optional attribute to set a description for the section
+    </st:attribute>
     <st:attribute name="icon">
       Optional attribute to set an icon for the section, this is only visible when using section-to-sidebar-items.js
     </st:attribute>
@@ -50,6 +53,11 @@ THE SOFTWARE.
           ${attrs.title}
         </div>
       </j:if>
+      <j:if test="${attrs.description != null}">
+        <div class="jenkins-section__description">
+          ${attrs.description}
+        </div>
+      </j:if>
       <d:invokeBody />
     </section>
   </f:rowSet>
diff --git a/war/src/main/scss/components/_section.scss b/war/src/main/scss/components/_section.scss
index 9a53a7238339..4e0768d8f6e0 100644
--- a/war/src/main/scss/components/_section.scss
+++ b/war/src/main/scss/components/_section.scss
@@ -34,6 +34,13 @@
   font-weight: 500;
 }
 
+.jenkins-section__description {
+  // Tweaked margin so that it appears visually centred when placed next to `.jenkins-section__title`
+  margin: -0.5rem 0 1rem;
+  color: var(--text-color-secondary);
+  line-height: 1.66;
+}
+
 .jenkins-section__items {
   display: grid;
   grid-template-columns: 1fr;
diff --git a/war/src/main/webapp/help/user/description.html b/war/src/main/webapp/help/user/description.html
deleted file mode 100644
index 8d4d4ee62729..000000000000
--- a/war/src/main/webapp/help/user/description.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  This description is placed on the user top page so that visitors can know who
-  you are. You can use any HTML tags (or markup in the configured language)
-  here. Consider putting some links to other pages related to you.
-</div>
diff --git a/war/src/main/webapp/help/user/description_bg.html b/war/src/main/webapp/help/user/description_bg.html
deleted file mode 100644
index 81894e55816e..000000000000
--- a/war/src/main/webapp/help/user/description_bg.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Това описание стои отгоре на вашата страница като потребител, така че другите
-  потребители да знаят кой сте. Може да използвате HTML или друг език с
-  маркиране, стига да е настроен. Добре е да поставите връзки към други
-  страници, които ви описват.
-</div>
diff --git a/war/src/main/webapp/help/user/description_de.html b/war/src/main/webapp/help/user/description_de.html
deleted file mode 100644
index 4ddca12dfbf9..000000000000
--- a/war/src/main/webapp/help/user/description_de.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Diese Beschreibung wird in der Benutzeransicht angezeigt. Andere Benutzer
-  können dadurch mehr über Sie erfahren. Sie können in der Beschreibung
-  beliebige HTML-Auszeichnungen verwenden, also beispielsweise auch Links auf
-  andere Webangebote, die mit Ihnen in Zusammenhang stehen.
-</div>
diff --git a/war/src/main/webapp/help/user/description_fr.html b/war/src/main/webapp/help/user/description_fr.html
deleted file mode 100644
index 7744e9764cea..000000000000
--- a/war/src/main/webapp/help/user/description_fr.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Cette description est placée sur la page principale de l'utilisateur, afin que
-  les visiteurs puissent vous connaitre. Vous pouvez utiliser des tags HTML.
-  N'hésitez pas à ajouter des liens vers d'autres pages vous concernant.
-</div>
diff --git a/war/src/main/webapp/help/user/description_it.html b/war/src/main/webapp/help/user/description_it.html
deleted file mode 100644
index 009e9203ac3d..000000000000
--- a/war/src/main/webapp/help/user/description_it.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  Questa descrizione è collocata nella pagina principale utente in modo che i
-  visitatori possano conoscere la propria identità. In questo campo è possibile
-  utilizzare tutti i tag HTML (o i marcatori nel linguaggio configurato). Si
-  prenda in considerazione l'aggiunta di alcuni collegamenti ad altre pagine
-  correlate a sé stessi.
-</div>
diff --git a/war/src/main/webapp/help/user/description_ja.html b/war/src/main/webapp/help/user/description_ja.html
deleted file mode 100644
index c2a1c9a21f53..000000000000
--- a/war/src/main/webapp/help/user/description_ja.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  この説明はあなたが誰なのか知ることができるように、ユーザーのトップページに表示されます。
-  ここではどんなHTMLタグでも使用できます。あなたに関する他のページにリンクすることを考えてみてください。
-</div>
diff --git a/war/src/main/webapp/help/user/description_nl.html b/war/src/main/webapp/help/user/description_nl.html
deleted file mode 100644
index 458d60b66613..000000000000
--- a/war/src/main/webapp/help/user/description_nl.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  Deze beschrijving zal worden toegevoegd aan de specifiek pagina van een
-  gebruiker. Op deze manier zullen andere gebruikers van Jenkins, eenvoudig, te
-  weten kunnen komen wie U bent. HTML kan gebruikt worden in dit veld. Het kan
-  interessant zijn om in deze beschrijving, referentie toe te voegen naar ander
-  pagina's over uzelf of uw activiteiten.
-</div>
diff --git a/war/src/main/webapp/help/user/description_pt_BR.html b/war/src/main/webapp/help/user/description_pt_BR.html
deleted file mode 100644
index 15e9a0c45428..000000000000
--- a/war/src/main/webapp/help/user/description_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Esta descri&#231;&#227;o &#233; colocada no topo da p&#225;gina do
-  usu&#225;rio tal que os visitantes possam saber quem voc&#234; &#233;.
-  Voc&#234; pode usar qualquer marca&#231;&#227;o HTML aqui. Considere colocar
-  alguns links para outras p&#225;ginas relacionadas a voc&#234;.
-</div>
diff --git a/war/src/main/webapp/help/user/description_ru.html b/war/src/main/webapp/help/user/description_ru.html
deleted file mode 100644
index 08e6008fde69..000000000000
--- a/war/src/main/webapp/help/user/description_ru.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Это описание будет помещено в шапку страницы пользователя, так чтобы
-  посетители могли определить кто вы. Вы можете использовать HTML. Возможно,
-  размещение ссылок с подробной информацией о вас будет уместным.
-</div>
diff --git a/war/src/main/webapp/help/user/description_tr.html b/war/src/main/webapp/help/user/description_tr.html
deleted file mode 100644
index ca5cf685ca82..000000000000
--- a/war/src/main/webapp/help/user/description_tr.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-  Bu a&#231;&#305;klama alan&#305;, kullan&#305;c&#305; sayfas&#305;n&#305;n en
-  &#252;st&#252;nde yer alacakt&#305;r. Ziyaret&#231;ilerin sizi
-  tan&#305;malar&#305; i&#231;in bu alan&#305; bilgilendirme ama&#231;l&#305;
-  kullanabilirsiniz. HTML tag'leri kullan&#305;labilir. Sizinle ilgili
-  olabilecek ba&#351;ka sayfalar&#305;n linklerini de koyabilirsiniz.
-</div>
diff --git a/war/src/main/webapp/help/user/description_zh_TW.html b/war/src/main/webapp/help/user/description_zh_TW.html
deleted file mode 100644
index 4ff51596f575..000000000000
--- a/war/src/main/webapp/help/user/description_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  這個說明會放在使用者首頁上，讓訪客知道您是誰。 您可以使用任何 HTML
-  標籤。說不定您可以放一些有關自己的連結。
-</div>
diff --git a/war/src/main/webapp/help/user/fullName.html b/war/src/main/webapp/help/user/fullName.html
deleted file mode 100644
index 453efdda5e5e..000000000000
--- a/war/src/main/webapp/help/user/fullName.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Specify your name in a more human-friendly format, so that people can see your
-  real name as opposed to your ID. For example, "Jane Doe" is usually easier for
-  people to understand than IDs like "jd513".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_bg.html b/war/src/main/webapp/help/user/fullName_bg.html
deleted file mode 100644
index 6c27c38ad910..000000000000
--- a/war/src/main/webapp/help/user/fullName_bg.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  Указване на име вместо идентификатор, с което хората да ви разпознават
-  по-лесно. „Иван Петров“ е по-разбираемо от „ip2873“.
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_de.html b/war/src/main/webapp/help/user/fullName_de.html
deleted file mode 100644
index e7f1a6d4fe59..000000000000
--- a/war/src/main/webapp/help/user/fullName_de.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Geben Sie Ihren vollständigen Namen an, damit andere Benutzer Ihren echten
-  Namen anstelle Ihres Benutzerkontos sehen können. Beispiel: "Jasmin
-  Mustermann" ist für die meisten Benutzer verständlicher als das Benutzerkonto
-  "jm531".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_fr.html b/war/src/main/webapp/help/user/fullName_fr.html
deleted file mode 100644
index e6438c57da48..000000000000
--- a/war/src/main/webapp/help/user/fullName_fr.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Indiquez votre nom dans un format lisible pour un humain. Les visiteurs
-  verront votre vrai nom à côté de votre identifiant. "Jean Dupont" est plus
-  facile à retenir que "jd513"...
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_it.html b/war/src/main/webapp/help/user/fullName_it.html
deleted file mode 100644
index 9a81fd145602..000000000000
--- a/war/src/main/webapp/help/user/fullName_it.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Specificare il proprio nome in un formato più a misura d'uomo in modo che gli
-  utenti possano visualizzare il proprio nome reale anziché il proprio ID. Ad
-  esempio, "Mario Rossi" è solitamente più facile da comprendere per le persone
-  anziché "mr513".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_ja.html b/war/src/main/webapp/help/user/fullName_ja.html
deleted file mode 100644
index 451745435d07..000000000000
--- a/war/src/main/webapp/help/user/fullName_ja.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  IDではなく本名が分かるように、より親しみのある形式であなたの名前を指定します。
-  例えば、"Jane Doe"は"jd513"のようなIDよりも分かりやすいでしょう。
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_nl.html b/war/src/main/webapp/help/user/fullName_nl.html
deleted file mode 100644
index 225051ab6181..000000000000
--- a/war/src/main/webapp/help/user/fullName_nl.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Vul uw volledige naam in. Deze naam zal gebruikt worden i.p.v. uw id waar
-  mogelijk. Bv. "Els Desmet" is voor de meeste mensen duidelijker dan een id
-  zoals "ed513".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_pt_BR.html b/war/src/main/webapp/help/user/fullName_pt_BR.html
deleted file mode 100644
index 5a69cacb7065..000000000000
--- a/war/src/main/webapp/help/user/fullName_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Especifique seu nome em um formato mais amig&#225;vel, tal que as pessoas
-  possam ver seu verdadeiro nome ao inv&#233;s de seu ID. Por exemplo,
-  "Jo&#227;o da Silva" &#233; geralmente mais f&#225;cil para as pessoas
-  entenderem do que "js513".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_ru.html b/war/src/main/webapp/help/user/fullName_ru.html
deleted file mode 100644
index 6de0eb415bab..000000000000
--- a/war/src/main/webapp/help/user/fullName_ru.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-  Укажите ваше имя в более дружелюбной форме, чтобы могли видеть ваше настоящее
-  имя, а не просто идентификатор. Например, "Василий Пупкин" обычно приятнее
-  видеть, чем "vas_pup_1".
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_tr.html b/war/src/main/webapp/help/user/fullName_tr.html
deleted file mode 100644
index 229a7dea2a09..000000000000
--- a/war/src/main/webapp/help/user/fullName_tr.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-  Kullan&#305;c&#305;lar&#305;n sizi kullan&#305;c&#305; ad&#305;n&#305;zdan
-  daha anlaml&#305; bir isimle tan&#305;yabilmesini isterseniz, tam
-  ad&#305;n&#305;z&#305; bu k&#305;s&#305;ma yazabilirsiniz. Mesela, "Jane Doe",
-  "jd513"ten daha anlaml&#305;d&#305;r.
-</div>
diff --git a/war/src/main/webapp/help/user/fullName_zh_TW.html b/war/src/main/webapp/help/user/fullName_zh_TW.html
deleted file mode 100644
index ddbbb5556df7..000000000000
--- a/war/src/main/webapp/help/user/fullName_zh_TW.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-  設定您能讓一般人看得懂的名字，讓別人知道您的姓名，而不光只有 ID。
-  舉例來說，大多數人應該都會覺得「張三」比 "mrchang3" 這個 ID 還要容易看懂。
-</div>

From de25478f3f978253f47c45d0e84f03250da28623 Mon Sep 17 00:00:00 2001
From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com>
Date: Tue, 17 Sep 2024 03:36:50 +0200
Subject: [PATCH 429/449] [JENKINS-73785] Restore `ContextMenu#from` with
 `StaplerRequest`/`Response` args (#9737)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
---
 .../main/java/jenkins/model/ModelObjectWithContextMenu.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
index 2fa50556574c..f46280fef0c0 100644
--- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
+++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -299,6 +299,10 @@ public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request
             return from(self, request, response, "sidepanel");
         }
 
+        public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest request, StaplerResponse response) throws JellyException, IOException {
+            return from(self, StaplerRequest.toStaplerRequest2(request), StaplerResponse.toStaplerResponse2(response), "sidepanel");
+        }
+
         public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request, StaplerResponse2 response, String view) throws JellyException, IOException {
             WebApp webApp = WebApp.getCurrent();
             final Script s = webApp.getMetaClass(self).getTearOff(JellyClassTearOff.class).findScript(view);

From 973cbb83da9c9b6a7f47c943abacc63bf4db8ad4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:37:47 -0700
Subject: [PATCH 430/449] Update dependency
 org.jenkins-ci.plugins:script-security to v1362 (#9736)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 97fa920d4090..c69b54a23c0d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -118,7 +118,7 @@ THE SOFTWARE.
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
-        <version>1361.v913100720139</version>
+        <version>1362.v67dc1f0e1b_b_3</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index ab2100469ba4..abaff935b96c 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -299,7 +299,7 @@ THE SOFTWARE.
                   <!-- dependency of command-launcher, junit, matrix-project, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>script-security</artifactId>
-                  <version>1361.v913100720139</version>
+                  <version>1362.v67dc1f0e1b_b_3</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From 3441eec8c5b695b500891828bc97883bcbda129b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:38:53 -0700
Subject: [PATCH 431/449] Update dependency net.java.dev.jna:jna to v5.15.0
 (#9730)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 39e1714b809a..575161bc492b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -169,7 +169,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
-        <version>5.14.0</version>
+        <version>5.15.0</version>
       </dependency>
       <dependency>
         <groupId>net.java.sezpoz</groupId>

From 4b889e6c51768a09913085b881565444bdcdaecf Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 18:39:22 -0700
Subject: [PATCH 432/449] Update dependency
 org.jenkins-ci.main:jenkins-test-harness to v2270 (#9731)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index c69b54a23c0d..10b2f89df4e1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2265.v3da_49c8134d6</version>
+      <version>2270.v87a_0ea_b_54da_0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From c073b2badcbcced12fd696111644fa3a636068ba Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:51:34 +0000
Subject: [PATCH 433/449] [maven-release-plugin] prepare release jenkins-2.477

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 6 +++---
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty12-ee9/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 575161bc492b..650f36ad0301 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.477</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6309811a2e8b..11198a0358f2 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.477</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 9bff5e5ad0b2..cb4eec32c6c8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.477</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..b502ceb9b06e 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.477</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 86265c667654..c7b4e756bd19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.477</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.477</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.477</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-09-10T14:09:56Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-17T10:33:58Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 10b2f89df4e1..2de8f2bd745a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.477</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index abaff935b96c..4b9e906a1e3d 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.477</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index 2253163b3c4c..51cc4b05ad66 100644
--- a/websocket/jetty12-ee9/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.477</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 178413f92c8e..34c7162fcf47 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.477</version>
     <relativePath>../..</relativePath>
   </parent>
 

From d462f64a996e7ebeca85925447526218d6576cd3 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:51:56 +0000
Subject: [PATCH 434/449] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 8 ++++----
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty12-ee9/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 650f36ad0301..575161bc492b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.477</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 11198a0358f2..6309811a2e8b 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.477</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index cb4eec32c6c8..9bff5e5ad0b2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.477</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index b502ceb9b06e..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.477</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index c7b4e756bd19..68f8e353ac9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.477</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.477</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.477</revision>
+    <revision>2.478</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-09-17T10:33:58Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-09-17T13:51:35Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 2de8f2bd745a..10b2f89df4e1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.477</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 4b9e906a1e3d..abaff935b96c 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.477</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index 51cc4b05ad66..2253163b3c4c 100644
--- a/websocket/jetty12-ee9/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.477</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 34c7162fcf47..178413f92c8e 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.477</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 

From d67b011b53a47c448fa28de6341790aa0704e232 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:29:17 -0700
Subject: [PATCH 435/449] Update peter-evans/create-pull-request digest to
 6cd32fd (#9732)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/run-since-updater.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-since-updater.yml b/.github/workflows/run-since-updater.yml
index 409520a5f73f..901c18944615 100644
--- a/.github/workflows/run-since-updater.yml
+++ b/.github/workflows/run-since-updater.yml
@@ -29,7 +29,7 @@ jobs:
         id: run_script
         shell: bash
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7
+        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Fill in since annotations

From 6b4c14b324b8d25682ddcc2a10334e27ae423b58 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:29:34 -0700
Subject: [PATCH 436/449] Update jenkins/ath Docker tag to v5997 (#9740)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ath.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ath.sh b/ath.sh
index 2df3d4909e10..1816e037466b 100644
--- a/ath.sh
+++ b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5992.v39030e88deb_3
+export ATH_VERSION=5997.v2a_1a_696620a_0
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

From 6ee8a25bdd77a6e526b5bab969b4a9c2f765eaeb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:29:52 -0700
Subject: [PATCH 437/449] Update dependency org.jenkins-ci.plugins:credentials
 to v1378 (#9741)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 10b2f89df4e1..98448860e3b1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -224,7 +224,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1371.vfee6b_095f0a_3</version>
+      <version>1378.v81ef4269d764</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 1b5030cea4e871ef3feca8bdb656ff894aede6f3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 10:30:13 -0700
Subject: [PATCH 438/449] Update dependency postcss to v8.4.47 (#9745)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 9f40f36fff5b..4a378c272ce3 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "globals": "15.9.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.1",
-    "postcss": "8.4.45",
+    "postcss": "8.4.47",
     "postcss-loader": "8.1.1",
     "postcss-preset-env": "10.0.3",
     "postcss-scss": "4.0.9",
diff --git a/yarn.lock b/yarn.lock
index de7c0e057fe5..86f491ab8d08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4405,7 +4405,7 @@ __metadata:
     jquery: "npm:3.7.1"
     lodash: "npm:4.17.21"
     mini-css-extract-plugin: "npm:2.9.1"
-    postcss: "npm:8.4.45"
+    postcss: "npm:8.4.47"
     postcss-loader: "npm:8.1.1"
     postcss-preset-env: "npm:10.0.3"
     postcss-scss: "npm:4.0.9"
@@ -5258,7 +5258,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
+"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0":
   version: 1.1.0
   resolution: "picocolors@npm:1.1.0"
   checksum: 10c0/86946f6032148801ef09c051c6fb13b5cf942eaf147e30ea79edb91dd32d700934edebe782a1078ff859fb2b816792e97ef4dab03d7f0b804f6b01a0df35e023
@@ -6094,14 +6094,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.45, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
-  version: 8.4.45
-  resolution: "postcss@npm:8.4.45"
+"postcss@npm:8.4.47, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
+  version: 8.4.47
+  resolution: "postcss@npm:8.4.47"
   dependencies:
     nanoid: "npm:^3.3.7"
-    picocolors: "npm:^1.0.1"
-    source-map-js: "npm:^1.2.0"
-  checksum: 10c0/ad6f8b9b1157d678560373696109745ab97a947d449f8a997acac41c7f1e4c0f3ca4b092d6df1387f430f2c9a319987b1780dbdc27e35800a88cde9b606c1e8f
+    picocolors: "npm:^1.1.0"
+    source-map-js: "npm:^1.2.1"
+  checksum: 10c0/929f68b5081b7202709456532cee2a145c1843d391508c5a09de2517e8c4791638f71dd63b1898dba6712f8839d7a6da046c72a5e44c162e908f5911f57b5f44
   languageName: node
   linkType: hard
 
@@ -6530,7 +6530,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0":
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.1":
   version: 1.2.1
   resolution: "source-map-js@npm:1.2.1"
   checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf

From 6c00956d9a808f84d4f637b3b675cd3521227cf3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 11:24:00 -0700
Subject: [PATCH 439/449] Update Yarn to v4.5.0 (#9744)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 pom.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 4a378c272ce3..505f8a0a189c 100644
--- a/package.json
+++ b/package.json
@@ -65,5 +65,5 @@
     "defaults",
     "not IE 11"
   ],
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.5.0"
 }
diff --git a/pom.xml b/pom.xml
index 68f8e353ac9c..d6c92da04ccf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,8 +102,8 @@ THE SOFTWARE.
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->
-    <yarn-berry.version>4.4.1</yarn-berry.version>
-    <yarn-berry.sha256sum>920b4530755296dc2ce8b4351f057d4a26429524fcb2789d277560d94837c27e</yarn-berry.sha256sum>
+    <yarn-berry.version>4.5.0</yarn-berry.version>
+    <yarn-berry.sha256sum>cc00dce5de4f68d11450519a0f69eadf2a1cbe5cc0d8e740bfac817a31d76874</yarn-berry.sha256sum>
   </properties>
 
   <!--

From a37868ffcf97c63a517e8c9c06a0296c0d086137 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:13:04 -0700
Subject: [PATCH 440/449] Update dependency
 org.jenkins-ci.main:jenkins-test-harness to v2272 (#9746)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml                                             | 2 +-
 test/src/test/java/hudson/ClassicPluginStrategyTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index 98448860e3b1..f76b3ca89439 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2270.v87a_0ea_b_54da_0</version>
+      <version>2272.v5db_817b_a_6f0d</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/test/src/test/java/hudson/ClassicPluginStrategyTest.java b/test/src/test/java/hudson/ClassicPluginStrategyTest.java
index e8472cef0d81..1bf06531d68d 100644
--- a/test/src/test/java/hudson/ClassicPluginStrategyTest.java
+++ b/test/src/test/java/hudson/ClassicPluginStrategyTest.java
@@ -71,7 +71,7 @@ protected Collection<String> loadBundledPlugins() {
             }
         };
         setPluginManager(pluginManager);
-        return new Hudson(home, createWebServer(), pluginManager);
+        return new Hudson(home, createWebServer2(), pluginManager);
      }
     };
 

From 3767f78ae32b0170089d3537039d31f89a6441c9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 19:33:51 -0700
Subject: [PATCH 441/449] Update dependency
 org.jenkins-ci.plugins.workflow:workflow-support to v926 (#9748)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 war/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pom.xml b/test/pom.xml
index f76b3ca89439..b187684451a3 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -134,7 +134,7 @@ THE SOFTWARE.
         <!-- Required by plugin-util-api -->
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-support</artifactId>
-        <version>920.v59f71ce16f04</version>
+        <version>926.v9f4f9b_b_98c19</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/war/pom.xml b/war/pom.xml
index abaff935b96c..66486c9e9802 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -342,7 +342,7 @@ THE SOFTWARE.
                   <!-- dependency of checks-api and plugin-util-api -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-support</artifactId>
-                  <version>920.v59f71ce16f04</version>
+                  <version>926.v9f4f9b_b_98c19</version>
                   <type>hpi</type>
                 </artifactItem>
 

From 1836bd6ef4cece1e261dcce22f57dab3cc898c7f Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:06:41 +0100
Subject: [PATCH 442/449] Add full stops to user page descriptions (#9750)

---
 core/src/main/resources/hudson/model/Messages.properties      | 2 +-
 .../UserPropertyCategoryAccountAction/index.properties        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index fbe7a70ae53b..f0d52f795ec0 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -409,7 +409,7 @@ User.IllegalUsername="{0}" is prohibited as a username for security reasons.
 User.IllegalFullname="{0}" is prohibited as a full name for security reasons.
 
 TimeZoneProperty.DisplayName=Time zone
-TimeZoneProperty.Description=Select a time zone to use rather than the system default
+TimeZoneProperty.Description=Select a time zone to use rather than the system default.
 TimeZoneProperty.DisplayDefaultTimeZone=Default
 TimeZoneProperty.current_time_in_=Current time in {0}: {1}
 TimeZoneProperty.current_time_on_server_in_in_proposed_di=Current time on server in {0}: {1}; in proposed display zone: {2}
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
index dfeb5024042c..648592ed85ae 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties
@@ -22,6 +22,6 @@
 
 title=Account
 Full\ name=Full name
-Full\ name.Description=We recommend using your real name so people can recognize you instead of your ID
+Full\ name.Description=We recommend using your real name so people can recognize you instead of your ID.
 Description=Description
-Description.Description=Enter a short description about yourself so that visitors know who you are
+Description.Description=Enter a short description about yourself so that visitors know who you are.

From 13acb4fe4c6d41212aee7da3630f1d8130797cba Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 16:55:10 -0700
Subject: [PATCH 443/449] Update dependency
 org.jenkins-ci.main:jenkins-test-harness to v2274 (#9752)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index b187684451a3..8a8ef0aea853 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2272.v5db_817b_a_6f0d</version>
+      <version>2274.v0a_d306e311d1</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 0f6bac39ebbe9bf8af122fdd829fd36d35a09d72 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 16:55:37 -0700
Subject: [PATCH 444/449] Update peter-evans/create-pull-request digest to
 5e91468 (#9751)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/run-since-updater.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-since-updater.yml b/.github/workflows/run-since-updater.yml
index 901c18944615..6241acdc2dc4 100644
--- a/.github/workflows/run-since-updater.yml
+++ b/.github/workflows/run-since-updater.yml
@@ -29,7 +29,7 @@ jobs:
         id: run_script
         shell: bash
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Fill in since annotations

From 5bbbebeeafa00e2ba122c5e1939c0905dc45e8ee Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 20:29:03 -0700
Subject: [PATCH 445/449] Update dependency
 org.jenkins-ci.main:jenkins-test-harness to v2276 (#9754)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 8a8ef0aea853..b37f81b65ec9 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2274.v0a_d306e311d1</version>
+      <version>2276.va_79e4182e71e</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 82dfb0948c7f463e570ef17076924260e2684517 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 20:29:18 -0700
Subject: [PATCH 446/449] Update dependency commons-io:commons-io to v2.17.0
 (#9753)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 575161bc492b..47321614432c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -129,7 +129,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.16.1</version>
+        <version>2.17.0</version>
       </dependency>
       <dependency>
         <groupId>commons-jelly</groupId>

From f9fef613ce1e096a930f2b8d1c143d9764c5f3e7 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Thu, 19 Sep 2024 10:47:42 +0200
Subject: [PATCH 447/449] Clean up a few plain `e.printStackTrace()` calls
 (#9742)

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
---
 .../hudson/lifecycle/WindowsInstallerLink.java    |  4 ++--
 core/src/main/java/hudson/model/AbstractItem.java |  2 +-
 core/src/main/java/hudson/model/ViewJob.java      | 15 ++++++++++++---
 core/src/main/java/jenkins/model/Jenkins.java     |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
index c54a90d1c576..af0ddf9a6ecf 100644
--- a/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
+++ b/core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
@@ -226,7 +226,7 @@ public void run() {
                                         new File(installationDir, "jenkins.exe"), "start", task, installationDir);
                                 task.getLogger().println(r == 0 ? "Successfully started" : "start service failed. Exit code=" + r);
                             } catch (IOException | InterruptedException e) {
-                                e.printStackTrace();
+                                LOGGER.log(Level.WARNING, null, e);
                             }
                         }
 
@@ -241,7 +241,7 @@ private DefaultLogger createLogger() {
                     Jenkins.get().cleanUp();
                     System.exit(0);
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    LOGGER.log(Level.SEVERE, null, e);
                 }
             }
         }.start();
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 0e712d8a2e88..8ba7aafe15cd 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -434,7 +434,7 @@ protected void renameTo(final String newName) throws IOException {
                             Util.deleteRecursive(oldRoot);
                         } catch (IOException e) {
                             // but ignore the error, since we expect that
-                            e.printStackTrace();
+                            LOGGER.log(Level.WARNING, "Ignoring IOException while deleting", e);
                         }
                     }
 
diff --git a/core/src/main/java/hudson/model/ViewJob.java b/core/src/main/java/hudson/model/ViewJob.java
index 055b98cafdb5..c030fea0122c 100644
--- a/core/src/main/java/hudson/model/ViewJob.java
+++ b/core/src/main/java/hudson/model/ViewJob.java
@@ -236,14 +236,23 @@ private boolean terminating() {
         @Override
         public void run() {
             while (!terminating()) {
+                String jobName = null;
                 try {
-                    getNext()._reload();
+                    var next = getNext();
+                    jobName = next.getFullName();
+                    next._reload();
+                    jobName = null;
                 } catch (InterruptedException e) {
                     // treat this as a death signal
                     return;
-                } catch (Throwable t) {
+                } catch (Exception e) {
                     // otherwise ignore any error
-                    t.printStackTrace();
+                    if (jobName != null) {
+                        var finalJobName = jobName;
+                        LOGGER.log(Level.WARNING, e, () -> "Failed to reload job " + finalJobName);
+                    } else {
+                        LOGGER.log(Level.WARNING, e, () -> "Failed to obtain next job in the reload queue");
+                    }
                 }
             }
         }
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 9af524b6b1d9..705044cd8fa0 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -5631,7 +5631,7 @@ private static void computeVersion(ServletContext context) {
             if (is != null)
                 props.load(is);
         } catch (IOException e) {
-            e.printStackTrace(); // if the version properties is missing, that's OK.
+            LOGGER.log(Level.WARNING, e, () -> "Failed to load jenkins-version.properties");
         }
         String ver = props.getProperty("version");
         if (ver == null)   ver = UNCOMPUTED_VERSION;

From 25d0c9d1947b3ee92a151b3b455030fa2bd37c7e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:29:36 -0700
Subject: [PATCH 448/449] Update dependency babel-loader to v9.2.1 (#9755)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 505f8a0a189c..98e3d16815fb 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.4",
     "@eslint/js": "9.10.0",
-    "babel-loader": "9.1.3",
+    "babel-loader": "9.2.1",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 86f491ab8d08..a7d14833c4d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2635,16 +2635,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:9.1.3":
-  version: 9.1.3
-  resolution: "babel-loader@npm:9.1.3"
+"babel-loader@npm:9.2.1":
+  version: 9.2.1
+  resolution: "babel-loader@npm:9.2.1"
   dependencies:
     find-cache-dir: "npm:^4.0.0"
     schema-utils: "npm:^4.0.0"
   peerDependencies:
     "@babel/core": ^7.12.0
     webpack: ">=5"
-  checksum: 10c0/e3fc3c9e02bd908b37e8e8cd4f3d7280cf6ac45e33fc203aedbb615135a0fecc33bf92573b71a166a827af029d302c0b060354985cd91d510320bd70a2f949eb
+  checksum: 10c0/efb82faff4c7c27e9c15bb28bf11c73200e61cf365118a9514e8d74dd489d0afc2a0d5aaa62cb4254eefc2ab631579224d95a03fd245410f28ea75e24de54ba4
   languageName: node
   linkType: hard
 
@@ -4391,7 +4391,7 @@ __metadata:
     "@babel/core": "npm:7.25.2"
     "@babel/preset-env": "npm:7.25.4"
     "@eslint/js": "npm:9.10.0"
-    babel-loader: "npm:9.1.3"
+    babel-loader: "npm:9.2.1"
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:7.1.2"
     css-minimizer-webpack-plugin: "npm:7.0.0"

From 32039daa66fcdf4c4cdb672a596248daa2086f32 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 19 Sep 2024 10:30:19 -0700
Subject: [PATCH 449/449] Fill in since annotations (#9758)

Co-authored-by: timja <21194782+timja@users.noreply.github.com>
---
 core/src/main/java/hudson/model/UserPropertyDescriptor.java | 2 +-
 core/src/main/java/jenkins/model/HistoricalBuild.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/hudson/model/UserPropertyDescriptor.java b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
index b5a115404be3..f19a54e14aa0 100644
--- a/core/src/main/java/hudson/model/UserPropertyDescriptor.java
+++ b/core/src/main/java/hudson/model/UserPropertyDescriptor.java
@@ -132,7 +132,7 @@ public boolean isEnabled() {
      * Optional description for the configurable object
      * Displays as plain text
      *
-     * @since TODO
+     * @since 2.477
      */
     @Nullable
     public String getDescription() {
diff --git a/core/src/main/java/jenkins/model/HistoricalBuild.java b/core/src/main/java/jenkins/model/HistoricalBuild.java
index 2f9f14aefff7..480eb9935654 100644
--- a/core/src/main/java/jenkins/model/HistoricalBuild.java
+++ b/core/src/main/java/jenkins/model/HistoricalBuild.java
@@ -45,7 +45,7 @@
 /**
  * A {@link Run}-like object as it might be displayed by {@link BuildHistoryWidget}.
  *
- * @since TODO
+ * @since 2.477
  */
 @Restricted(Beta.class)
 public interface HistoricalBuild extends ModelObject {