From 6fd9121623b9f297f5752a2492c6434d9ac688e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2025 07:35:13 -0700
Subject: [PATCH 1/4] Update dependency
 org.jenkins-ci.plugins.workflow:workflow-support to v946 (#10243)

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 41d5bcefc052..5f7064f31bed 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>944.v5a_859593b_98a_</version>
+        <version>946.v2a_79d8a_4b_e14</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/war/pom.xml b/war/pom.xml
index aafcfab57abe..0a8335f52602 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -352,7 +352,7 @@ THE SOFTWARE.
                   <!-- dependency of checks-api and plugin-util-api -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-support</artifactId>
-                  <version>944.v5a_859593b_98a_</version>
+                  <version>946.v2a_79d8a_4b_e14</version>
                   <type>hpi</type>
                 </artifactItem>
 

From f8c9f3753ca2df1d795673d5c7f625ae685c165b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2025 07:35:23 -0700
Subject: [PATCH 2/4] Update dependency
 org.jenkins-ci.plugins:apache-httpcomponents-client-4-api to
 v4.5.14-269.vfa_2321039a_83 (#10247)

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 0a8335f52602..13efe46422a1 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -497,7 +497,7 @@ THE SOFTWARE.
                   <!-- dependency of jdk-tool -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>apache-httpcomponents-client-4-api</artifactId>
-                  <version>4.5.14-208.v438351942757</version>
+                  <version>4.5.14-269.vfa_2321039a_83</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

From e61ecca4fcd9c13b9c07e18555b0dc4159d6d69d Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 8 Feb 2025 06:37:48 -0800
Subject: [PATCH 3/4] Migrate from deprecated EE 8 methods to non-deprecated
 equivalents (#10233)

* Migrate from deprecated EE 8 methods to non-deprecated equivalents

* Clean up `GlobalComputerRetentionCheckIntervalConfiguration` as well
---
 core/src/main/java/hudson/Functions.java           |  2 +-
 .../java/jenkins/console/ConsoleUrlProvider.java   |  2 +-
 ...omputerRetentionCheckIntervalConfiguration.java |  4 ++--
 .../java/jenkins/model/GlobalConfiguration.java    |  2 +-
 .../resources/hudson/PluginManager/available.jelly |  2 +-
 .../resources/hudson/PluginManager/installed.jelly |  2 +-
 .../resources/hudson/PluginManager/updates.jelly   |  2 +-
 .../diagnosis/MemoryUsageMonitor/index.jelly       |  2 +-
 .../AbstractModelObject/descriptionForm.jelly      |  4 ++--
 .../hudson/model/AbstractProject/changes.jelly     |  4 ++--
 .../resources/hudson/model/AllView/noJob.groovy    |  2 +-
 .../resources/hudson/model/ComputerSet/_new.jelly  |  4 ++--
 .../hudson/model/ParametersAction/index.jelly      |  2 +-
 .../model/ParametersDefinitionProperty/index.jelly |  2 +-
 .../resources/hudson/model/Run/delete-retry.jelly  |  2 +-
 .../main/resources/hudson/model/View/index.jelly   |  2 +-
 .../hudson/search/Search/search-failed.jelly       |  4 ++--
 .../GlobalSecurityConfiguration/index.groovy       |  2 +-
 .../HudsonPrivateSecurityRealm/signup.jelly        |  4 ++--
 .../resources/hudson/security/WhoAmI/index.jelly   |  2 +-
 .../hudson/util/HudsonIsLoading/index.jelly        |  2 +-
 .../hudson/util/HudsonIsRestarting/index.jelly     |  2 +-
 .../resources/jenkins/agents/CloudSet/_new.jelly   |  2 +-
 .../SetupWizard/authenticate-security-token.jelly  |  2 +-
 .../resources/jenkins/model/Jenkins/_404.jelly     |  6 +++---
 .../jenkins/model/Jenkins/_404_simple.jelly        |  2 +-
 .../resources/jenkins/model/Jenkins/login.jelly    |  8 ++++----
 .../resources/jenkins/model/Jenkins/oops.jelly     |  6 +++---
 .../model/Jenkins/projectRelationship.jelly        | 14 +++++++-------
 .../security/seed/UserSeedProperty/config.jelly    |  2 +-
 .../main/resources/lib/form/editableComboBox.jelly |  4 ++--
 .../main/resources/lib/hudson/scriptConsole.jelly  |  2 +-
 .../main/resources/lib/layout/breadcrumbBar.jelly  |  2 +-
 core/src/main/resources/lib/layout/layout.jelly    |  4 ++--
 ...terRetentionCheckIntervalConfigurationTest.java |  4 ++--
 35 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 3ae81031b087..6c2d0b7a0e00 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -1989,7 +1989,7 @@ public static String joinPath(String... components) {
      */
     public static @CheckForNull String getConsoleUrl(WithConsoleUrl withConsoleUrl) {
         String consoleUrl = withConsoleUrl.getConsoleUrl();
-        return consoleUrl != null ? Stapler.getCurrentRequest().getContextPath() + '/' + consoleUrl : null;
+        return consoleUrl != null ? Stapler.getCurrentRequest2().getContextPath() + '/' + consoleUrl : null;
     }
 
     /**
diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
index 9c6080ac02fa..f779c07e62c2 100644
--- a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
+++ b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java
@@ -80,7 +80,7 @@ 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();
+        return Stapler.getCurrentRequest2().getContextPath() + '/' + run.getConsoleUrl();
     }
 
     static List<ConsoleUrlProvider> all() {
diff --git a/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java b/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
index 46d760fe8ee2..9766cd977220 100644
--- a/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfiguration.java
@@ -6,7 +6,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 check interval for computer retention.
@@ -56,7 +56,7 @@ private void setComputerRetentionCheckInterval(int interval) throws IllegalArgum
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         try {
             final int interval = json.getInt("computerRetentionCheckInterval");
             setComputerRetentionCheckInterval(interval);
diff --git a/core/src/main/java/jenkins/model/GlobalConfiguration.java b/core/src/main/java/jenkins/model/GlobalConfiguration.java
index af788945b2a2..bc0d7004031a 100644
--- a/core/src/main/java/jenkins/model/GlobalConfiguration.java
+++ b/core/src/main/java/jenkins/model/GlobalConfiguration.java
@@ -67,7 +67,7 @@ public String getGlobalConfigPage() {
     @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);
+            return configure(req != null ? StaplerRequest.fromStaplerRequest2(req) : null, json);
         } else {
             return configureImpl(req, json);
         }
diff --git a/core/src/main/resources/hudson/PluginManager/available.jelly b/core/src/main/resources/hudson/PluginManager/available.jelly
index bfe5b36aaf55..73e095bd01d3 100644
--- a/core/src/main/resources/hudson/PluginManager/available.jelly
+++ b/core/src/main/resources/hudson/PluginManager/available.jelly
@@ -38,7 +38,7 @@ THE SOFTWARE.
                         placeholder="${%Search available plugins}"
                         id="filter-box"
                         autofocus="true"
-                        value="${request.getParameter('filter')}" />
+                        value="${request2.getParameter('filter')}" />
         </div>
         <div class="jenkins-app-bar__controls">
           <l:isAdmin>
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
index c9b7dd93f200..81b175b955d4 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.jelly
+++ b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -43,7 +43,7 @@ THE SOFTWARE.
                         placeholder="${%Search installed plugins}"
                         id="filter-box"
                         autofocus="true"
-                        value="${request.getParameter('filter')}"
+                        value="${request2.getParameter('filter')}"
                         enabled="${!noPlugins}" />
         </div>
       </div>
diff --git a/core/src/main/resources/hudson/PluginManager/updates.jelly b/core/src/main/resources/hudson/PluginManager/updates.jelly
index d4163fb7cfbe..5ce8a810ff81 100644
--- a/core/src/main/resources/hudson/PluginManager/updates.jelly
+++ b/core/src/main/resources/hudson/PluginManager/updates.jelly
@@ -41,7 +41,7 @@ THE SOFTWARE.
                         placeholder="${%Search plugin updates}"
                         id="filter-box"
                         autofocus="true"
-                        value="${request.getParameter('filter')}"
+                        value="${request2.getParameter('filter')}"
                         enabled="${!empty(list)}" />
         </div>
         <div class="jenkins-app-bar__controls">
diff --git a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly
index bb0efd378ea8..43c579130aab 100644
--- a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly
+++ b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
       <h1>
         ${%JVM Memory Usage}
       </h1>
-      <j:set var="type" value="${request.getParameter('type') ?: 'min'}" />
+      <j:set var="type" value="${request2.getParameter('type') ?: 'min'}" />
       <div>
         ${%Timespan}:
         <j:choose>
diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
index 633e67f3568f..b1754861c0e9 100644
--- a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
+++ b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly
@@ -30,14 +30,14 @@ THE SOFTWARE.
   <j:if test="${it.getPrimaryView() != null}">
     <j:set var="it" value="${it.getPrimaryView()}"/>
   </j:if>
-  <j:set var="submissionUrl" value="${request.getParameter('submissionUrl')}" defaultValue="submitDescription"/>
+  <j:set var="submissionUrl" value="${request2.getParameter('submissionUrl')}" defaultValue="submitDescription"/>
   <j:invokeStatic className="hudson.Util" method="isSafeToRedirectTo" var="isSafeToRedirectTo">
     <j:arg value="${submissionUrl}"/>
   </j:invokeStatic>
   <j:if test="${!isSafeToRedirectTo}">
     <j:set var="submissionUrl" value="submitDescription"/>
   </j:if>
-  <j:set var="initialDescription" value="${request.getParameter('description')}" defaultValue="${it.description}"/>
+  <j:set var="initialDescription" value="${request2.getParameter('description')}" defaultValue="${it.description}"/>
   <l:ajax>
     <form action="${submissionUrl}" method="post">
       <table>
diff --git a/core/src/main/resources/hudson/model/AbstractProject/changes.jelly b/core/src/main/resources/hudson/model/AbstractProject/changes.jelly
index bc2ad59d226b..dd6ec243a73f 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/changes.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/changes.jelly
@@ -31,8 +31,8 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <l:breadcrumb title="${%Changes}" />
     <l:main-panel>
-      <j:set var="from" value="${request.getParameter('from')}"/>
-      <j:set var="to" value="${request.getParameter('to')}"/>
+      <j:set var="from" value="${request2.getParameter('from')}"/>
+      <j:set var="to" value="${request2.getParameter('to')}"/>
       <j:set var="browser" value="${it.scm.effectiveBrowser}"/> <!-- for compatibility; newer project-changes.jelly override this -->
 
       <h1>
diff --git a/core/src/main/resources/hudson/model/AllView/noJob.groovy b/core/src/main/resources/hudson/model/AllView/noJob.groovy
index f62125fed9b6..6a9e355d303e 100644
--- a/core/src/main/resources/hudson/model/AllView/noJob.groovy
+++ b/core/src/main/resources/hudson/model/AllView/noJob.groovy
@@ -111,7 +111,7 @@ div {
             section(class: "empty-state-section") {
                 ul(class: "empty-state-section-list") {
                     li(class: "content-block") {
-                        a(href: "${rootURL}/${app.securityRealm.loginUrl}?from=${request.requestURI}",
+                        a(href: "${rootURL}/${app.securityRealm.loginUrl}?from=${request2.requestURI}",
                                 class: "content-block__link") {
                             span(_("Log in to Jenkins"))
                             span(class: "trailing-icon") {
diff --git a/core/src/main/resources/hudson/model/ComputerSet/_new.jelly b/core/src/main/resources/hudson/model/ComputerSet/_new.jelly
index 36e2f23fd7a0..5d3a79782e39 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/_new.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/_new.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
     <l:main-panel>
       <f:form method="post" action="doCreateItem" name="config" class="jenkins-form">
         <f:entry title="${%Name}" help="${requestScope.descriptor.getHelpFile('name')}">
-          <f:textbox name="name" value="${request.getParameter('name')}" clazz="required" checkMessage="${%Name is mandatory}"/>
+          <f:textbox name="name" value="${request2.getParameter('name')}" clazz="required" checkMessage="${%Name is mandatory}"/>
         </f:entry>
 
         <!-- main body of the configuration -->
@@ -40,7 +40,7 @@ THE SOFTWARE.
         <st:include class="${requestScope.descriptor.clazz}" page="configure-entries.jelly" />
         
         <f:bottomButtonBar>
-          <input type="hidden" name="type" value="${request.getParameter('mode')}"/>
+          <input type="hidden" name="type" value="${request2.getParameter('mode')}"/>
 
           <f:submit value="${%Save}"/>
         </f:bottomButtonBar>
diff --git a/core/src/main/resources/hudson/model/ParametersAction/index.jelly b/core/src/main/resources/hudson/model/ParametersAction/index.jelly
index a035793cfab3..c8e8bf3aaff6 100644
--- a/core/src/main/resources/hudson/model/ParametersAction/index.jelly
+++ b/core/src/main/resources/hudson/model/ParametersAction/index.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
     <j:invoke var="buildClass" on="${currentThread.contextClassLoader}" method="loadClass">
       <j:arg value="hudson.model.Run" />
     </j:invoke>
-    <j:set var="build" value="${request.findAncestorObject(buildClass)}" />
+    <j:set var="build" value="${request2.findAncestorObject(buildClass)}" />
     <st:include page="sidepanel.jelly" it="${build}" />
     <l:main-panel>
 	  <t:buildCaption it="${build}">${title}</t:buildCaption>
diff --git a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly
index 1302960c1afc..0bea62baf0a0 100644
--- a/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly
+++ b/core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly
@@ -40,7 +40,7 @@ THE SOFTWARE.
     <l:main-panel>
       <h1>${it.job.pronoun} ${it.job.displayName}</h1>
       <p class="jenkins-description">${%description}</p>
-      <j:set var="delay" value="${request.getParameter('delay')}" />
+      <j:set var="delay" value="${request2.getParameter('delay')}" />
       <f:form method="post" action="build${empty(delay)?'':'?delay='+delay}" name="parameters"
               tableClass="parameters" class="jenkins-form">
         <j:forEach var="parameterDefinition" items="${it.parameterDefinitions}">
diff --git a/core/src/main/resources/hudson/model/Run/delete-retry.jelly b/core/src/main/resources/hudson/model/Run/delete-retry.jelly
index 79dfa6beedf3..5e405e52843f 100644
--- a/core/src/main/resources/hudson/model/Run/delete-retry.jelly
+++ b/core/src/main/resources/hudson/model/Run/delete-retry.jelly
@@ -20,7 +20,7 @@
         <tr><td>
           <div id="delete-error" style="display: none">
             <pre>
-              ${request.getAttribute('stackTraces')}
+              ${request2.getAttribute('stackTraces')}
             </pre>
           </div>
         </td></tr>
diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
index 14632b8e60e8..661e2e22cebf 100644
--- a/core/src/main/resources/hudson/model/View/index.jelly
+++ b/core/src/main/resources/hudson/model/View/index.jelly
@@ -44,7 +44,7 @@ THE SOFTWARE.
         </l:main-panel>
         <l:header>
           <!-- for screen resolution detection -->
-          <script id="screenResolution-script" data-use-secure-cookie="${request.secure}"/>
+          <script id="screenResolution-script" data-use-secure-cookie="${request2.secure}"/>
           <st:adjunct includes="hudson.model.View.screen-resolution"/>
         </l:header>
     </l:layout>
diff --git a/core/src/main/resources/hudson/search/Search/search-failed.jelly b/core/src/main/resources/hudson/search/Search/search-failed.jelly
index 2805b3324aca..e9e51752faf8 100644
--- a/core/src/main/resources/hudson/search/Search/search-failed.jelly
+++ b/core/src/main/resources/hudson/search/Search/search-failed.jelly
@@ -27,7 +27,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:set var="q" value="${request.getParameter('q')}"/>
+  <j:set var="q" value="${request2.getParameter('q')}"/>
   <j:new var="h" className="hudson.Functions" /><!-- needed for printing title. -->
   <l:layout title="${%Search for} '${q}'">
     <l:main-panel>
@@ -48,7 +48,7 @@ THE SOFTWARE.
             </j:forEach>
           </ol>
             <j:if test="${items.hasMoreResults()}">
-              <j:set var="max" value="${request.hasParameter('max')?request.getParameter('max'):100}"/>
+              <j:set var="max" value="${request2.hasParameter('max')?request2.getParameter('max'):100}"/>
               <j:choose>
                 <j:when test="${max &gt; it.getMaxSearchSize()}">
                  <em>Only showing the first ${it.getMaxSearchSize()} results,
diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
index 9c3c80607ca8..a04bace5bfdc 100644
--- a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
+++ b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
@@ -10,7 +10,7 @@ def f=namespace(lib.FormTagLib)
 def l=namespace(lib.LayoutTagLib)
 def st=namespace("jelly:stapler")
 
-l.layout(permission:app.SYSTEM_READ, title:my.displayName, cssclass:request.getParameter('decorate'), type:"one-column") {
+l.layout(permission:app.SYSTEM_READ, title:my.displayName, cssclass:request2.getParameter('decorate'), type:"one-column") {
     l.main_panel {
         l.app_bar(title: my.displayName)
 
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
index 00f3622eb8e1..0db0bf150bf2 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
@@ -34,13 +34,13 @@ THE SOFTWARE.
     needed to generate a session if non exists,
     without it we would add ";jsessionid=" to the url which will result in a 404
     -->
-    <j:set var="_" value="${request.getSession()}"/>
+    <j:set var="_" value="${request2.getSession()}"/>
     <x:doctype name="html"/>
     <!-- in case of error we want to surround the form elements with an error hint -->
     <j:set var="inputClass" value="${data.errorMessage!=null ? 'jenkins-input--error' : ''}"/>
     <j:set var="simpleDecorator" value="${h.simplePageDecorator}"/>
     <j:set var="simpleDecorators" value="${h.simplePageDecorators}"/>
-    <html lang="${request.getLocale().toLanguageTag()}">
+    <html lang="${request2.getLocale().toLanguageTag()}">
       <head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}">
         <title>${%Register} - Jenkins</title>
         <!-- we do not want bots on this page -->
diff --git a/core/src/main/resources/hudson/security/WhoAmI/index.jelly b/core/src/main/resources/hudson/security/WhoAmI/index.jelly
index 695340024b71..1ef5ce4ae8a2 100644
--- a/core/src/main/resources/hudson/security/WhoAmI/index.jelly
+++ b/core/src/main/resources/hudson/security/WhoAmI/index.jelly
@@ -65,7 +65,7 @@ THE SOFTWARE.
 
       <h2>Request Headers</h2>
       <table>
-        <j:forEach var="n" items="${request.getHeaderNames()}">
+        <j:forEach var="n" items="${request2.getHeaderNames()}">
           <j:choose>
             <j:when test="${it.isHeaderDangerous(n)}" >
               <tr>
diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly b/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
index b4b89dc37f9f..08bf94031982 100644
--- a/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
+++ b/core/src/main/resources/hudson/util/HudsonIsLoading/index.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
     <!-- get default/common page variable -->
     ${h.initPageVariables(context)}
     <x:doctype name="html" />
-    <html lang="${request.getLocale().toLanguageTag()}">
+    <html lang="${request2.getLocale().toLanguageTag()}">
         <head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}">
             <title>${%Starting Jenkins}</title>
             <!-- we do not want bots on this page -->
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
index 79a190db686e..34d5b04fdc31 100644
--- a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
+++ b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
     <!-- get default/common page variable -->
     ${h.initPageVariables(context)}
     <x:doctype name="html" />
-    <html lang="${request.getLocale().toLanguageTag()}">
+    <html lang="${request2.getLocale().toLanguageTag()}">
         <head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}">
             <title>${%Restarting Jenkins}</title>
             <!-- we do not want bots on this page -->
diff --git a/core/src/main/resources/jenkins/agents/CloudSet/_new.jelly b/core/src/main/resources/jenkins/agents/CloudSet/_new.jelly
index bc882a546e98..25bac27e175d 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="cloudDescriptorName" value="${request.getParameter('mode')}"/>
+          <input type="hidden" name="cloudDescriptorName" value="${request2.getParameter('mode')}"/>
 
           <f:submit value="${%Save}"/>
         </f:bottomButtonBar>
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 2adc245beb0f..3877ce94b3d9 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
@@ -5,7 +5,7 @@
     <l:main-panel>
       <st:include page="client-scripts" />
       <form action="${app.instance.securityRealm.authenticationGatewayUrl}" method="POST">
-        <input type="hidden" name="from" value="${request.getParameter('from')}" />
+        <input type="hidden" name="from" value="${request2.getParameter('from')}" />
         <div class="plugin-setup-wizard bootstrap-3">
           <div class="modal fade in" style="display: block;">
             <div class="modal-dialog">
diff --git a/core/src/main/resources/jenkins/model/Jenkins/_404.jelly b/core/src/main/resources/jenkins/model/Jenkins/_404.jelly
index 2578c10b99bd..16e4952b6fab 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/_404.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/_404.jelly
@@ -28,8 +28,8 @@ THE SOFTWARE.
       This is the page designated by web.xml to handle 404 errors. Show a nice error message and suggest logging in if applicable.
       Generally kept very similar to 'oops.jelly'.
     -->
-    <st:statusCode value="${response.getStatus()}" />
-    ${request.session.setAttribute('from', request.getAttribute('jakarta.servlet.error.request_uri'))}
+    <st:statusCode value="${response2.getStatus()}" />
+    ${request2.session.setAttribute('from', request2.getAttribute('jakarta.servlet.error.request_uri'))}
     <l:layout title="${%title(jakarta.servlet.error.message?:'Not Found')}" type="one-column">
         <l:header />
         <l:main-panel>
@@ -39,7 +39,7 @@ THE SOFTWARE.
             </h1>
             <div id="error-description" style="text-align: center">
                 <h2>${%title(jakarta.servlet.error.message?:'Not Found')}</h2>
-                <j:if test="${!request.getAttribute('jenkins.security.ResourceDomainRootAction.error')}">
+                <j:if test="${!request2.getAttribute('jenkins.security.ResourceDomainRootAction.error')}">
 	                <p>
 	                    <j:choose>
 	                        <j:when test="${app.useSecurity}">
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 e59083103a55..cbdb6c35dd17 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/_404_simple.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/_404_simple.jelly
@@ -36,7 +36,7 @@ THE SOFTWARE.
         <st:setHeader name="Referrer-Policy" value="same-origin" />
         <st:setHeader name="Cross-Origin-Opener-Policy" value="same-origin" />
         <x:doctype name="html" />
-        <st:statusCode value="${response.getStatus()}" />
+        <st:statusCode value="${response2.getStatus()}" />
         <html>
             <head>
                 <title>${%title(jakarta.servlet.error.message?:'Not Found')}</title>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/login.jelly b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
index 7b8f93aa086b..85d0f124283f 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/login.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
     <st:setHeader name="Expires" value="0" />
     <st:setHeader name="Cache-Control" value="no-cache,no-store,must-revalidate" />
     <!-- needed for cli -->
-    <j:if test="${request.servletPath=='/' || request.servletPath==''}">
+    <j:if test="${request2.servletPath=='/' || request2.servletPath==''}">
       ${h.advertiseHeaders(response)}
       <j:forEach var="pd" items="${h.pageDecorators}">
         <st:include it="${pd}" page="httpHeaders.jelly" optional="true"/>
@@ -39,19 +39,19 @@ THE SOFTWARE.
       needed to generate a session if non exists,
       without it we would add ";jsessionid=" to the url which will result in a 404
     -->
-    <j:set var="_" value="${request.getSession()}"/>
+    <j:set var="_" value="${request2.getSession()}"/>
     <!-- get default/common page variable -->
     ${h.initPageVariables(context)}
     <x:doctype name="html" />
     <!-- needed for the redirect after login -->
-    <j:set var="from" value="${error ? request.session.getAttribute('from') : request.getParameter('from')}"/>
+    <j:set var="from" value="${error ? request2.session.getAttribute('from') : request2.getParameter('from')}"/>
     <!-- in case of error we want to surround the form elements with an error hint -->
     <j:set var="inputClass" value="${error ? 'jenkins-input--error' : ''}"/>
     <j:set var="simpleDecorator" value="${h.simplePageDecorator}"/>
     <j:set var="simpleDecorators" value="${h.simplePageDecorators}"/>
 
     <!-- real deal starting here -->
-    <html lang="${request.getLocale().toLanguageTag()}">
+    <html lang="${request2.getLocale().toLanguageTag()}">
       <head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}">
         <title>${%signIn} - Jenkins</title>
         <!-- we do not want bots on this page -->
diff --git a/core/src/main/resources/jenkins/model/Jenkins/oops.jelly b/core/src/main/resources/jenkins/model/Jenkins/oops.jelly
index 436b4a8fc0a6..189549909851 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/oops.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/oops.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <!--
     This is the page designated by web.xml and UncaughtExceptionHandler to process an exception thrown by us.
   -->
-  <st:statusCode value="${response.getStatus()}" />
+  <st:statusCode value="${response2.getStatus()}" />
   <l:layout title="Jenkins" type="one-column">
     <l:header />
     <l:main-panel>
@@ -36,12 +36,12 @@ THE SOFTWARE.
         </h1>
         <div id="error-description">
           <h2 style="text-align: center">${%problemHappened}</h2>
-        <p style="text-align: center">Logging ID=${request.getAttribute('jenkins.exception.id')}</p>
+        <p style="text-align: center">Logging ID=${request2.getAttribute('jenkins.exception.id')}</p>
       </div>
       <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('jakarta.servlet.error.exception'))}</pre>
+        <pre style="margin:2em; clear:both">${h.printThrowable(request2.getAttribute('jakarta.servlet.error.exception'))}</pre>
       </j:if>
     </l:main-panel>
   </l:layout>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
index c058c951439e..f907cc392e80 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/projectRelationship.jelly
@@ -44,25 +44,25 @@ THE SOFTWARE.
       <form action="projectRelationship" method="get">
         <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')}"/>
+          <f:combobox id="lhs" fillUrl="fillJobNameItems" name="lhs" value="${request2.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')}"/>
+          <f:combobox id="rhs" fillUrl="fillJobNameItems" name="rhs" value="${request2.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(request2.getParameter('lhs')) and !empty(request2.getParameter('rhs'))}">
+          <j:set var="jl" value="${app.getItemByFullName(request2.getParameter('lhs'))}"/>
+          <j:set var="jr" value="${app.getItemByFullName(request2.getParameter('rhs'))}"/>
 
           <j:choose>
             <j:when test="${jl==null}">
-              <p class="error">No such project '${request.getParameter('lhs')}'</p>
+              <p class="error">No such project '${request2.getParameter('lhs')}'</p>
             </j:when>
             <j:when test="${jr==null}">
-              <p class="error">No such project '${request.getParameter('rhs')}'</p>
+              <p class="error">No such project '${request2.getParameter('rhs')}'</p>
             </j:when>
             <j:otherwise>
               <table width="100%">
diff --git a/core/src/main/resources/jenkins/security/seed/UserSeedProperty/config.jelly b/core/src/main/resources/jenkins/security/seed/UserSeedProperty/config.jelly
index cdcc55a7ffee..2613236f74d0 100644
--- a/core/src/main/resources/jenkins/security/seed/UserSeedProperty/config.jelly
+++ b/core/src/main/resources/jenkins/security/seed/UserSeedProperty/config.jelly
@@ -13,7 +13,7 @@
                             id="user-seed-property-reset-seed"
                             data-target-url="${descriptor.descriptorFullUrl}/renewSessionSeed"
                             data-confirm="${%resetSeed.confirmation}"
-                            data-redirect-url="${request.contextPath}/"
+                            data-redirect-url="${request2.contextPath}/"
                             data-confirm-title="${%resetSeed.confirmationTitle}">
                         ${%resetSeed.button}
                     </button>
diff --git a/core/src/main/resources/lib/form/editableComboBox.jelly b/core/src/main/resources/lib/form/editableComboBox.jelly
index a8db66721d13..6307d2030444 100644
--- a/core/src/main/resources/lib/form/editableComboBox.jelly
+++ b/core/src/main/resources/lib/form/editableComboBox.jelly
@@ -41,8 +41,8 @@ THE SOFTWARE.
   </st:documentation>
 
   <st:once>
-    <script type="text/javascript" src="${request.contextPath}/scripts/utilities.js"/>
-    <script type="text/javascript" src="${request.contextPath}/scripts/combobox.js"/>
+    <script type="text/javascript" src="${request2.contextPath}/scripts/utilities.js"/>
+    <script type="text/javascript" src="${request2.contextPath}/scripts/combobox.js"/>
   </st:once>
 
   <f:prepareDatabinding/>
diff --git a/core/src/main/resources/lib/hudson/scriptConsole.jelly b/core/src/main/resources/lib/hudson/scriptConsole.jelly
index 89998ca88001..71a6abf3d53e 100644
--- a/core/src/main/resources/lib/hudson/scriptConsole.jelly
+++ b/core/src/main/resources/lib/hudson/scriptConsole.jelly
@@ -46,7 +46,7 @@ THE SOFTWARE.
           </p>
 
           <form action="script" method="post">
-            <textarea id="script" name="script" class="script">${request.getParameter('script')}</textarea>
+            <textarea id="script" name="script" class="script">${request2.getParameter('script')}</textarea>
             <div align="right">
               <f:submit  value="${%Run}"/>
             </div>
diff --git a/core/src/main/resources/lib/layout/breadcrumbBar.jelly b/core/src/main/resources/lib/layout/breadcrumbBar.jelly
index a77723e50f98..bcb250379ac4 100644
--- a/core/src/main/resources/lib/layout/breadcrumbBar.jelly
+++ b/core/src/main/resources/lib/layout/breadcrumbBar.jelly
@@ -41,7 +41,7 @@ THE SOFTWARE.
 
   <div id="breadcrumbBar" class="jenkins-breadcrumbs" aria-label="breadcrumb">
     <ol class="jenkins-breadcrumbs__list" id="breadcrumbs">
-      <j:forEach var="anc" items="${request.ancestors}" indexVar="index">
+      <j:forEach var="anc" items="${request2.ancestors}" indexVar="index">
         <j:if test="${h.isModel(anc.object) and anc.prev.url!=anc.url}">
           <j:set var="mode" value="breadcrumbs" />
           <l:breadcrumb title="${anc.object == app ? '%Dashboard' : anc.object.displayName}"
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 0fb62437aa57..3aaa6f8ddcfe 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -90,9 +90,9 @@ THE SOFTWARE.
   <j:set var="layoutType" value="${attrs.type}"/>
 </j:if>
 
-<j:set var="_" value="${request.getSession()}"/>
+<j:set var="_" value="${request2.getSession()}"/>
 <j:set var="extensionsAvailable" value="${h.extensionsAvailable}"/>
-<j:if test="${request.servletPath=='/' || request.servletPath==''}">
+<j:if test="${request2.servletPath=='/' || request2.servletPath==''}">
   ${h.advertiseHeaders(response)}
   <j:if test="${extensionsAvailable}">
     <j:forEach var="pd" items="${h.pageDecorators}">
diff --git a/test/src/test/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfigurationTest.java b/test/src/test/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfigurationTest.java
index 9e7cf9f4ff81..16c17607a7dc 100644
--- a/test/src/test/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfigurationTest.java
+++ b/test/src/test/java/jenkins/model/GlobalComputerRetentionCheckIntervalConfigurationTest.java
@@ -102,7 +102,7 @@ public void saveCycle() {
         JSONObject json = new JSONObject();
         json.element("computerRetentionCheckInterval", 5);
         try {
-            c.configure(Stapler.getCurrentRequest(), json);
+            c.configure(Stapler.getCurrentRequest2(), json);
         } catch (Descriptor.FormException e) {
             throw new RuntimeException(e);
         }
@@ -121,7 +121,7 @@ private void checkSaveInvalidValueOf(int interval, String message) {
         JSONObject json = new JSONObject();
         json.element("computerRetentionCheckInterval", interval);
         try {
-            c.configure(Stapler.getCurrentRequest(), json);
+            c.configure(Stapler.getCurrentRequest2(), json);
             throw new RuntimeException("expected .configure() to throw");
         } catch (Descriptor.FormException e) {
             assertEquals(e.getMessage(), message);

From 72d2b7bcf5b8284a1d2420296d836700388e764a Mon Sep 17 00:00:00 2001
From: Rian-Ismael <106334437+Rian-Ismael@users.noreply.github.com>
Date: Sat, 8 Feb 2025 11:38:09 -0300
Subject: [PATCH 4/4] Split one test into two in MarkupTextTest (#10226)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update MarkupTextTest.java

Improves the readability of the test. Splitting assertions into separate tests improves clarity and ensures each test verifies a single scenario or state. This enhances readability, maintainability, and debugging efficiency.

* Update core/src/test/java/hudson/MarkupTextTest.java

Co-authored-by: Kris Stern <krisstern@outlook.com>

---------

Co-authored-by: Kris Stern <krisstern@outlook.com>
---
 core/src/test/java/hudson/MarkupTextTest.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/hudson/MarkupTextTest.java b/core/src/test/java/hudson/MarkupTextTest.java
index 6c3ff369eccc..1b69d0be8d25 100644
--- a/core/src/test/java/hudson/MarkupTextTest.java
+++ b/core/src/test/java/hudson/MarkupTextTest.java
@@ -81,13 +81,16 @@ public void literalTextSurround() {
      * Start/end tag nesting should be correct regardless of the order tags are added.
      */
     @Test
-    public void adjacent() {
+    public void addMarkupInOrder() {
         MarkupText text = new MarkupText("abcdef");
         text.addMarkup(0, 3, "$", "$");
         text.addMarkup(3, 6, "#", "#");
         assertEquals("$abc$#def#", text.toString(false));
+    }
 
-        text = new MarkupText("abcdef");
+    @Test
+    public void addMarkupInReversedOrder() {
+        MarkupText text = new MarkupText("abcdef");
         text.addMarkup(3, 6, "#", "#");
         text.addMarkup(0, 3, "$", "$");
         assertEquals("$abc$#def#", text.toString(false));