Merge branch 'master' into fix-23864-firefox-builds

Author: AmoghParmar

ath.sh

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

bom/pom.xml

@@ -41,7 +41,7 @@ THE SOFTWARE.
     <commons-fileupload2.version>2.0.0-M4</commons-fileupload2.version>
     <groovy.version>2.4.21</groovy.version>
     <jelly.version>1.1-jenkins-20250731</jelly.version>
-    <stapler.version>2061.v3949245133a_f</stapler.version>
+    <stapler.version>2065.v7db_c1fcf0a_d0</stapler.version>
   </properties>
 
   <dependencyManagement>
@@ -215,7 +215,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>annotation-indexer</artifactId>
-        <version>1.18</version>
+        <version>1.213.v92788b_1f0a_21</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>
@@ -250,17 +250,17 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>symbol-annotation</artifactId>
-        <version>1.25</version>
+        <version>1.26</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>task-reactor</artifactId>
-        <version>1.9</version>
+        <version>1.10</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>version-number</artifactId>
-        <version>1.12</version>
+        <version>1.14</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>

core/pom.xml

@@ -40,7 +40,7 @@ THE SOFTWARE.
 
   <properties>
     <!-- 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>
+    <remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
     <!-- Filled in by jacoco-maven-plugin -->
     <jacocoSurefireArgs />
   </properties>
@@ -419,7 +419,7 @@ THE SOFTWARE.
       <!-- working around MCOMPILER-97 -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>core-annotation-processors</artifactId>
-      <version>13.v2dcfc22a_a_b_29</version>
+      <version>59.ve181f58722c6</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -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/hudson/security/HudsonPrivateSecurityRealm.java

@@ -363,11 +363,14 @@ private String getErrorMessages(SignupInfo si) {
      * This can be run by anyone, but only to create the very first user account.
      */
     @RequirePOST
-    public void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
+    public synchronized void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp)
+            throws IOException, ServletException {
+
         if (hasSomeUser()) {
             rsp.sendError(SC_UNAUTHORIZED, "First user was already created");
             return;
         }
+
         User u = createAccount(req, rsp, false, "firstUser.jelly");
         if (u != null) {
             tryToMakeAdmin(u);

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/java/jenkins/telemetry/impl/JavaSystemProperties.java

@@ -70,13 +70,13 @@ public String getDisplayName() {
     @NonNull
     @Override
     public LocalDate getStart() {
-        return LocalDate.of(2023, 12, 17);
+        return LocalDate.of(2026, 1, 4);
     }
 
     @NonNull
     @Override
     public LocalDate getEnd() {
-        return LocalDate.of(2024, 4, 1);
+        return LocalDate.of(2026, 4, 1);
     }
 
     @Override

core/src/main/resources/jenkins/agents/CloudSet/index.jelly

@@ -27,7 +27,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
-  <l:settings-subpage managementLink="${it.managementLink}" header="${null}">
+  <l:settings-subpage managementLink="${it.managementLink}" header="${null}" noDefer="true">
     <l:isAdmin>
       <script src="${resURL}/jsbundles/pages/cloud-set.js" type="text/javascript" />
       <link rel="stylesheet" href="${resURL}/jsbundles/pages/cloud-set.css" type="text/css" />

core/src/main/resources/lib/layout/job-subpage.jelly

@@ -103,7 +103,7 @@ THE SOFTWARE.
                 </j:when>
               </j:choose>
 
-              <l:overflowButton>
+              <l:overflowButton id="more-item-actions">
                 <dd:custom>
                   <div class="app-build-overflow">
                     <j:set var="mode" value="side-panel" />