Merge branch 'master' into BEE-51743

bom/pom.xml

@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
-    <stapler.version>1927.vca_a_9061b_2f28</stapler.version>
+    <stapler.version>1928.v9115fe47607f</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
@@ -70,7 +70,7 @@ THE SOFTWARE.
         <!-- 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>6.3.4</version>
+        <version>6.4.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -129,7 +129,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.17.0</version>
+        <version>2.18.0</version>
       </dependency>
       <dependency>
         <groupId>commons-jelly</groupId>
@@ -335,7 +335,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.kohsuke.stapler</groupId>
         <artifactId>json-lib</artifactId>
-        <version>2.4-jenkins-7</version>
+        <version>2.4-jenkins-8</version>
       </dependency>
       <dependency>
         <groupId>org.kohsuke.stapler</groupId>

core/src/main/java/jenkins/model/Nodes.java

@@ -118,15 +118,15 @@ public void setNodes(final @NonNull Collection<? extends Node> nodes) throws IOE
             toRemove.putAll(Nodes.this.nodes);
             for (var node : nodes) {
                 final var name = node.getNodeName();
+                Nodes.this.nodes.put(name, node);
+                node.onLoad(Nodes.this, name);
                 var oldNode = toRemove.get(name);
                 if (oldNode != null) {
                     NodeListener.fireOnUpdated(oldNode, node);
                     toRemove.remove(name);
                 } else {
                     NodeListener.fireOnCreated(node);
                 }
-                Nodes.this.nodes.put(name, node);
-                node.onLoad(Nodes.this, name);
             }
             Nodes.this.nodes.keySet().removeAll(toRemove.keySet());
             jenkins.updateComputerList();

core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy

@@ -42,7 +42,7 @@ def listWarnings(warnings, boolean core) {
             }
         }
     }
-    if (fixables == warnings.size) {
+    if (fixables == warnings.size()) {
         dd {
             if (fixables == 1) {
                 raw(_(core ? "allFixable1Core" : "allFixable1", rootURL))

core/src/main/resources/lib/form/helpLink.jelly

@@ -55,7 +55,7 @@ THE SOFTWARE.
   </st:documentation>
   <j:choose>
     <j:when test="${attrs.url!=null}">
-      <j:set var="altText" value="${attrs.featureName != null ? '%Help for feature:' + ' ' + h.escape(attrs.featureName) : '%Help'}" />
+      <j:set var="altText" value="${attrs.featureName != null ? '%Help for feature:' + ' ' + attrs.featureName : '%Help'}" />
       <a href="#" class="jenkins-help-button" tooltip="${altText}" helpURL="${rootURL}${attrs.url}">
         <!-- .jenkins-help-button span element is required as it's restyled in CSS -->
         <span>?</span>

core/src/main/resources/lib/layout/card.jelly

@@ -43,7 +43,7 @@ THE SOFTWARE.
     <div class="jenkins-card__title">
       ${attrs.title}
       <div class="jenkins-card__controls">
-        <j:out value="${controls}"/>
+        <j:out value="${attrs.controls}"/>
         <j:if test="${attrs.expandable != null}">
           <a href="${attrs.expandable}" class="jenkins-card__reveal" tooltip="${%Expand}">
             <l:icon src="symbol-expand" />

package.json

@@ -57,7 +57,7 @@
     "hotkeys-js": "3.12.2",
     "jquery": "3.7.1",
     "lodash": "4.17.21",
-    "sortablejs": "1.15.3",
+    "sortablejs": "1.15.4",
     "tippy.js": "6.3.7",
     "window-handle": "1.0.1"
   },
@@ -68,5 +68,5 @@
   "engines": {
     "node": ">=20.0.0"
   },
-  "packageManager": "[email protected].1"
+  "packageManager": "[email protected].3"
 }

pom.xml

@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.487</revision>
+    <revision>2.488</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-11-19T13:49:45Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-11-25T19:14:52Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
@@ -98,7 +98,7 @@ 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.2</winstone.version>
-    <node.version>20.18.0</node.version>
+    <node.version>20.18.1</node.version>
   </properties>
 
   <!--

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>932.vb_555de1b_a_b_94</version>
+        <version>936.v9fa_77211ca_e1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2353.ve3f890c6eea_f</version>
+      <version>2361.v8f64d70711fb_</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -344,7 +344,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>design-library</artifactId>
-                  <version>323.v301efa_39c6eb_</version>
+                  <version>325.v40b_a_ccf974db_</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>design-library.jpi</destFileName>

test/src/test/java/jenkins/model/NodesTest.java

@@ -287,6 +287,7 @@ public static class CheckSetNodes extends NodeListener {
 
         @Override
         protected void onCreated(@NonNull Node node) {
+            node.getRootDir();
             created.add(node.getNodeName());
         }
 

test/src/test/java/jenkins/security/Security2779Test.java

@@ -49,7 +49,7 @@ private void noCrossSiteScriptingInHelp(String selector) throws Exception {
 
         // assert leading space to identify unintentional double-escaping (<) as test failure
         assertThat("tooltip does not contain dangerous HTML", jsResultString, not(containsString(" <img src=x")));
-        assertThat("tooltip contains safe text", jsResultString, containsString("lt;img src=x"));
+        assertThat("tooltip contains safe text", jsResultString, containsString(" &lt;img src=x"));
     }
 
     @TestExtension

war/pom.xml

@@ -350,7 +350,7 @@ THE SOFTWARE.
                   <!-- dependency of checks-api and plugin-util-api -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-support</artifactId>
-                  <version>932.vb_555de1b_a_b_94</version>
+                  <version>936.v9fa_77211ca_e1</version>
                   <type>hpi</type>
                 </artifactItem>
 

yarn.lock

@@ -4413,7 +4413,7 @@ __metadata:
     prettier: "npm:3.3.3"
     sass: "npm:1.81.0"
     sass-loader: "npm:16.0.3"
-    sortablejs: "npm:1.15.3"
+    sortablejs: "npm:1.15.4"
     style-loader: "npm:4.0.0"
     stylelint: "npm:16.10.0"
     stylelint-checkstyle-reporter: "npm:1.0.0"
@@ -6561,10 +6561,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sortablejs@npm:1.15.3":
-  version: 1.15.3
-  resolution: "sortablejs@npm:1.15.3"
-  checksum: 10c0/dfd79a7dd7041fe1080d58d2191cd4df62cfc9912bbb4069f295fb2c5f23eb31112931614faddce7011d30fe784d26af3416c94182e02bcf4f6274509b60242e
+"sortablejs@npm:1.15.4":
+  version: 1.15.4
+  resolution: "sortablejs@npm:1.15.4"
+  checksum: 10c0/aa22614b8aadc0253eb19b88c29d748af37bb3ab3d16a58c619a3bc806a96b5742e51908bffe94ab4d75a6f7458ea1524a4619c109a1e0716bb72b2ae25463e5
   languageName: node
   linkType: hard