Merge branch 'master' into SECURITY-771/Fix-test-logic

Author: A1exKH

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6512.v7b_8c43086a_6f
+export ATH_VERSION=6518.v018e9d499cf2
 
 if [[ $# -eq 0 ]]; then
 	export JDK=21

core/pom.xml

@@ -651,7 +651,7 @@ THE SOFTWARE.
         <!-- Version specified in grandparent POM -->
         <configuration>
           <!-- Make sure to keep the directives in test/pom.xml and war/pom.xml in sync with these. -->
-          <argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -javaagent:${org.mockito:mockito-core:jar}</argLine>
+          <argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -javaagent:"${org.mockito:mockito-core:jar}"</argLine>
           <reuseForks>false</reuseForks>
         </configuration>
       </plugin>

core/src/main/java/hudson/model/Build.java

@@ -83,7 +83,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-public abstract class Build<P extends Project<P, B>, B extends Build<P, B>>
+public abstract class   Build<P extends Project<P, B>, B extends Build<P, B>>
     extends AbstractBuild<P, B> {
 
     /**

core/src/main/java/hudson/model/BuildableItem.java

@@ -57,4 +57,14 @@ default boolean scheduleBuild(int quietPeriod) {
     }
 
     boolean scheduleBuild(int quietPeriod, Cause c);
+
+    /**
+     * Whether the item is buildable.
+     *
+     * @return true, if the item can be built.
+     * @since TODO
+     */
+    default boolean isBuildable() {
+        return true;
+    }
 }

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

@@ -40,6 +40,7 @@
 import hudson.model.Cause;
 import hudson.model.CauseAction;
 import hudson.model.Item;
+import hudson.model.ItemGroup;
 import hudson.model.Items;
 import hudson.model.Job;
 import hudson.model.ParameterDefinition;
@@ -562,8 +563,17 @@ default RunT createExecutable() throws IOException {
             return null;
         }
 
+        @Override
         default boolean isBuildable() {
-            return !isDisabled() && !((Job) this).isHoldOffBuildUntilSave();
+            if (isDisabled() || ((Job) this).isHoldOffBuildUntilSave()) {
+                return false;
+            }
+            // If parent is disabled, child jobs (e.g., branch jobs) should not be buildable
+            ItemGroup<? extends Item> parentGroup = ((Job) this).getParent();
+            if (parentGroup instanceof BuildableItem bi) {
+                return bi.isBuildable();
+            }
+            return true;
         }
 
         @Extension

core/src/main/resources/hudson/model/DirectoryBrowserSupport/dir.jelly

@@ -34,7 +34,9 @@ THE SOFTWARE.
       <!-- parent path -->
         <div class="parentPath">
           <form>
-            <a href="${topPath}">${it.owner.name}</a> /
+            <a href="${topPath}">
+              ${it.owner.displayName}
+            </a> /
             <j:forEach var="p" items="${parentPath}">
               <a href="${p.href}">${p.title}</a>
               /

core/src/main/resources/hudson/views/BuildButtonColumn/icon.js

@@ -14,7 +14,7 @@ Behaviour.specify(
         method: "post",
         headers: crumb.wrap({}),
       }).then((rsp) => {
-        if (rsp.ok) {
+        if (rsp.status === 201) {
           notificationBar.show(message, notificationBar.SUCCESS);
         } else {
           notificationBar.show(failure, notificationBar.ERROR);

core/src/main/resources/lib/hudson/project/configurable/configurable.js

@@ -10,7 +10,7 @@
         method: "post",
         headers: crumb.wrap({}),
       }).then((rsp) => {
-        if (rsp.ok) {
+        if (rsp.status === 201) {
           notificationBar.show(success, notificationBar.SUCCESS);
         } else {
           notificationBar.show(failure, notificationBar.ERROR);

package.json

@@ -23,9 +23,9 @@
     "lint": "yarn lint:js && yarn lint:css"
   },
   "devDependencies": {
-    "@babel/cli": "7.28.3",
-    "@babel/core": "7.28.5",
-    "@babel/preset-env": "7.28.5",
+    "@babel/cli": "7.28.6",
+    "@babel/core": "7.28.6",
+    "@babel/preset-env": "7.28.6",
     "@eslint/js": "9.39.2",
     "babel-loader": "10.0.0",
     "clean-webpack-plugin": "4.0.0",
@@ -39,15 +39,15 @@
     "mini-css-extract-plugin": "2.9.4",
     "postcss": "8.5.6",
     "postcss-loader": "8.2.0",
-    "postcss-preset-env": "10.6.0",
+    "postcss-preset-env": "11.1.1",
     "postcss-scss": "4.0.9",
-    "prettier": "3.7.4",
+    "prettier": "3.8.0",
     "sass": "1.97.2",
     "sass-loader": "16.0.6",
     "style-loader": "4.0.0",
-    "stylelint": "16.26.1",
+    "stylelint": "17.0.0",
     "stylelint-checkstyle-reporter": "1.1.1",
-    "stylelint-config-standard-scss": "16.0.0",
+    "stylelint-config-standard-scss": "17.0.0",
     "webpack": "5.104.1",
     "webpack-cli": "6.0.1",
     "webpack-remove-empty-scripts": "1.1.1"

pom.xml

@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.547</revision>
+    <revision>2.548</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2026-01-13T06:41:44Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2026-01-20T06:41:48Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
@@ -99,7 +99,7 @@ THE SOFTWARE.
     <ban-junit4-imports.skip>false</ban-junit4-imports.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.1029.vd3071f6b_5988</winstone.version>
-    <node.version>24.12.0</node.version>
+    <node.version>24.13.0</node.version>
   </properties>
 
   <!--