diff --git a/bom/pom.xml b/bom/pom.xml
index bf498077c163..61de025b3e9b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
2.0.0-M2
- 1927.vca_a_9061b_2f28
+ 1928.v9115fe47607f
2.4.21
@@ -70,7 +70,7 @@ THE SOFTWARE.
org.springframework.security
spring-security-bom
- 6.3.4
+ 6.4.1
pom
import
@@ -129,7 +129,7 @@ THE SOFTWARE.
commons-io
commons-io
- 2.17.0
+ 2.18.0
commons-jelly
@@ -335,7 +335,7 @@ THE SOFTWARE.
org.kohsuke.stapler
json-lib
- 2.4-jenkins-7
+ 2.4-jenkins-8
org.kohsuke.stapler
diff --git a/core/src/main/java/jenkins/model/Nodes.java b/core/src/main/java/jenkins/model/Nodes.java
index a01c3fc342b5..ae78028c2d2f 100644
--- a/core/src/main/java/jenkins/model/Nodes.java
+++ b/core/src/main/java/jenkins/model/Nodes.java
@@ -118,6 +118,8 @@ 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);
@@ -125,8 +127,6 @@ public void setNodes(final @NonNull Collection extends Node> nodes) throws IOE
} else {
NodeListener.fireOnCreated(node);
}
- Nodes.this.nodes.put(name, node);
- node.onLoad(Nodes.this, name);
}
Nodes.this.nodes.keySet().removeAll(toRemove.keySet());
jenkins.updateComputerList();
diff --git a/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy b/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy
index 56cbb0bb4ddd..89b634002006 100644
--- a/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy
+++ b/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))
diff --git a/core/src/main/resources/lib/form/helpLink.jelly b/core/src/main/resources/lib/form/helpLink.jelly
index e7f2aa213c54..a388baf05f87 100644
--- a/core/src/main/resources/lib/form/helpLink.jelly
+++ b/core/src/main/resources/lib/form/helpLink.jelly
@@ -55,7 +55,7 @@ THE SOFTWARE.
-
+
?
diff --git a/core/src/main/resources/lib/layout/card.jelly b/core/src/main/resources/lib/layout/card.jelly
index 2c6845738227..e17f559be414 100644
--- a/core/src/main/resources/lib/layout/card.jelly
+++ b/core/src/main/resources/lib/layout/card.jelly
@@ -43,7 +43,7 @@ THE SOFTWARE.
${attrs.title}
-
+
diff --git a/package.json b/package.json
index 36570c241b79..8a49fdd736b9 100644
--- a/package.json
+++ b/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": "yarn@4.5.1"
+ "packageManager": "yarn@4.5.3"
}
diff --git a/pom.xml b/pom.xml
index b8c1adb1f89f..8543045f068e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,9 +73,9 @@ THE SOFTWARE.
- 2.487
+ 2.488
-SNAPSHOT
- 2024-11-19T13:49:45Z
+ 2024-11-25T19:14:52Z
github
@@ -98,7 +98,7 @@ THE SOFTWARE.
false
8.2
- 20.18.0
+ 20.18.1
org.jenkins-ci.plugins.workflow
workflow-support
- 932.vb_555de1b_a_b_94
+ 936.v9fa_77211ca_e1
@@ -178,7 +178,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-test-harness
- 2353.ve3f890c6eea_f
+ 2361.v8f64d70711fb_
test
@@ -344,7 +344,7 @@ THE SOFTWARE.
io.jenkins.plugins
design-library
- 323.v301efa_39c6eb_
+ 325.v40b_a_ccf974db_
hpi
${project.build.outputDirectory}/plugins
design-library.jpi
diff --git a/test/src/test/java/jenkins/model/NodesTest.java b/test/src/test/java/jenkins/model/NodesTest.java
index ef2bee08ef4a..5b222e313a5f 100644
--- a/test/src/test/java/jenkins/model/NodesTest.java
+++ b/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());
}
diff --git a/test/src/test/java/jenkins/security/Security2779Test.java b/test/src/test/java/jenkins/security/Security2779Test.java
index ef8ef8fef7d5..8e2460687aaf 100644
--- a/test/src/test/java/jenkins/security/Security2779Test.java
+++ b/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("
org.jenkins-ci.plugins.workflow
workflow-support
- 932.vb_555de1b_a_b_94
+ 936.v9fa_77211ca_e1
hpi
diff --git a/yarn.lock b/yarn.lock
index da39cebd7125..e406b095def5 100644
--- a/yarn.lock
+++ b/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