Merge branch 'master' into fix-chevron-click

Author: MarkEWaite

.github/renovate.json

@@ -106,6 +106,16 @@
       ],
       "enabled": false,
       "description": "maven-metadata.xml is missing for this really old package which is required by renovate"
+    },
+    {
+      "description": "Jackson 2.19.0 causes issues with Kubernetes client. See https://github.com/jenkinsci/bom/pull/5114",
+      "matchManagers": [
+        "maven"
+      ],
+      "allowedVersions": "<2.19.0",
+      "matchPackageNames": [
+        "org.jenkins-ci.plugins:jackson2-api"
+      ]
     }
   ],
   "customManagers": [

.github/workflows/require-changelog-label.yml

@@ -11,7 +11,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: mheap/github-action-required-labels@388fd6af37b34cdfe5a23b37060e763217e58b03 # v5
+      - uses: mheap/github-action-required-labels@fb29a14a076b0f74099f6198f77750e8fc236016 # v5
         with:
           mode: minimum
           count: 1

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6180.v889d0fe56785
+export ATH_VERSION=6250.v4a_41b_57c8a_84
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17
@@ -26,33 +26,46 @@ fi
 mkdir -p target/ath-reports
 chmod a+rwx target/ath-reports
 
+curl \
+	--fail \
+	--silent \
+	--show-error \
+	--output /tmp/ath.yml \
+	--location "https://raw.githubusercontent.com/jenkinsci/acceptance-test-harness/refs/tags/${ATH_VERSION}/docker-compose.yml"
+
+sed -i -e "s/jenkins\/ath:latest/jenkins\/ath:${ATH_VERSION}/g" /tmp/ath.yml
+
 # obtain the groupId to grant to access the docker socket to run tests needing docker
-dockergid=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock)
+if [[ -z ${DOCKER_GID:-} ]]; then
+	DOCKER_GID=$(docker run --rm -v /var/run/docker.sock:/var/run/docker.sock ubuntu:noble stat -c %g /var/run/docker.sock) || exit 1
+	export DOCKER_GID
+fi
+
+trap 'docker-compose --file /tmp/ath.yml kill && docker-compose --file /tmp/ath.yml down' EXIT
 
-exec docker run --rm \
+exec docker-compose \
+	--file /tmp/ath.yml \
+	run \
 	--env JDK \
 	--env ATH_VERSION \
 	--env BROWSER \
-	--shm-size 2g `# avoid selenium.WebDriverException exceptions like 'Failed to decode response from marionette' and webdriver closed` \
-	--group-add ${dockergid} \
+	--name mvn \
+	--no-TTY \
+	--rm \
 	--volume "$(pwd)"/war/target/jenkins.war:/jenkins.war:ro \
-	--volume /var/run/docker.sock:/var/run/docker.sock:rw \
 	--volume "$(pwd)"/target/ath-reports:/reports:rw \
-	--interactive \
-	jenkins/ath:"$ATH_VERSION" \
+	mvn \
 	bash <<-'INSIDE'
 		set -o errexit
 		set -o nounset
 		set -o pipefail
 		set -o xtrace
 		cd
 		set-java.sh "${JDK}"
-		# Start the VNC system provided by the image from the default user home directory
-		eval "$(vnc.sh)"
 		env | sort
-		git clone --branch "$ATH_VERSION" --depth 1 https://github.com/jenkinsci/acceptance-test-harness
+		git clone --branch "${ATH_VERSION}" --depth 1 https://github.com/jenkinsci/acceptance-test-harness
 		cd acceptance-test-harness
-		run.sh "$BROWSER" /jenkins.war \
+		run.sh "remote-webdriver-${BROWSER}" /jenkins.war \
 			-Dmaven.test.failure.ignore \
 			-DforkCount=1 \
 			-Dgroups=org.jenkinsci.test.acceptance.junit.SmokeTest

bom/pom.xml

@@ -38,7 +38,7 @@ THE SOFTWARE.
   <description>The module contains dependencies that are used by a specific Jenkins version</description>
 
   <properties>
-    <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
+    <commons-fileupload2.version>2.0.0-M3</commons-fileupload2.version>
     <groovy.version>2.4.21</groovy.version>
     <jelly.version>1.1-jenkins-20250108</jelly.version>
     <stapler.version>1983.v93c53e94b_c04</stapler.version>
@@ -71,7 +71,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.4.5</version>
+        <version>6.5.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

core/pom.xml

@@ -39,7 +39,6 @@ THE SOFTWARE.
   <url>https://github.com/jenkinsci/jenkins</url>
 
   <properties>
-    <xmlunit.version>2.10.0</xmlunit.version>
     <!-- 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>
     <!-- Filled in by jacoco-maven-plugin -->
@@ -55,6 +54,13 @@ THE SOFTWARE.
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-bom</artifactId>
+        <version>2.10.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -447,7 +453,7 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -458,13 +464,11 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-core</artifactId>
-      <version>${xmlunit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
       <artifactId>xmlunit-matchers</artifactId>
-      <version>${xmlunit.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

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

@@ -203,15 +203,6 @@ public void serveFile(StaplerRequest req, StaplerResponse rsp, FilePath root, St
     }
 
     private void serveFile(StaplerRequest2 req, StaplerResponse2 rsp, VirtualFile root, String icon, boolean serveDirIndex) throws IOException, ServletException, InterruptedException {
-        // handle form submission
-        String pattern = req.getParameter("pattern");
-        if (pattern == null)
-            pattern = req.getParameter("path"); // compatibility with Hudson<1.129
-        if (pattern != null && Util.isSafeToRedirectTo(pattern)) { // avoid open redirect
-            rsp.sendRedirect2(pattern);
-            return;
-        }
-
         String path = getPath(req);
         if (path.replace('\\', '/').contains("/../")) {
             // don't serve anything other than files in the artifacts dir

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

@@ -50,6 +50,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Vector;
 import java.util.concurrent.Callable;
@@ -284,7 +285,14 @@ public void recordCauseOfInterruption(Run<?, ?> build, TaskListener listener) {
             lock.writeLock().unlock();
         }
 
-        build.addAction(new InterruptedBuildAction(r));
+        InterruptedBuildAction action = build.getAction(InterruptedBuildAction.class);
+        if (action != null) {
+            Collection<CauseOfInterruption> combinedCauses = new LinkedHashSet<>(action.getCauses());
+            combinedCauses.addAll(r);
+            build.replaceAction(new InterruptedBuildAction(combinedCauses));
+        } else {
+            build.addAction(new InterruptedBuildAction(r));
+        }
         for (CauseOfInterruption c : r)
             c.print(listener);
     }

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

@@ -34,6 +34,7 @@
 import hudson.security.ACL;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
+import hudson.views.DefaultViewsTabBar;
 import hudson.views.MyViewsTabBar;
 import hudson.views.ViewsTabBar;
 import jakarta.servlet.ServletException;
@@ -81,6 +82,8 @@ public class MyViewsProperty extends UserProperty implements ModifiableViewGroup
     @CheckForNull
     private String primaryViewName;
 
+    private ViewsTabBar viewsTabBar = new DefaultViewsTabBar();
+
     /**
      * Always hold at least one view.
      */
@@ -124,6 +127,9 @@ public Object readResolve() {
             protected void primaryView(String name) { primaryViewName = name; }
         };
 
+        if (viewsTabBar == null) {
+            viewsTabBar = new DefaultViewsTabBar();
+        }
         return this;
     }
 
@@ -284,6 +290,7 @@ public ListBoxModel doFillPrimaryViewNameItems(@AncestorInPath User user) throws
                 MyViewsProperty property = user.getProperty(MyViewsProperty.class);
                 if (property == null) {
                     property = new MyViewsProperty();
+                    property.readResolve();
                     user.addProperty(property);
                 }
                 for (View view : property.views) {
@@ -303,7 +310,11 @@ public UserProperty reconfigure(StaplerRequest2 req, JSONObject form) throws For
 
     @Override
     public ViewsTabBar getViewsTabBar() {
-        return Jenkins.get().getViewsTabBar();
+        return viewsTabBar;
+    }
+
+    public void setViewsTabBar(ViewsTabBar viewsTabBar) {
+        this.viewsTabBar = viewsTabBar;
     }
 
     @Override

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

@@ -93,7 +93,6 @@
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -1541,7 +1540,7 @@ public void maintain() {
 
             { // blocked -> buildable
                 // copy as we'll mutate the list and we want to process in a potentially different order
-                List<BlockedItem> blockedItems = new ArrayList<>(blockedProjects.values());
+                List<BlockedItem> blockedItems = new ArrayList<>((blockedProjects));
                 // if facing a cycle of blocked tasks, ensure we process in the desired sort order
                 if (s != null) {
                     s.sortBlockedItems(blockedItems);
@@ -2954,29 +2953,8 @@ public boolean containsKey(Task task) {
             return get(task) != null;
         }
 
-        public T remove(Task task) {
-            Iterator<T> it = iterator();
-            while (it.hasNext()) {
-                T t = it.next();
-                if (t.task.equals(task)) {
-                    it.remove();
-                    return t;
-                }
-            }
-            return null;
-        }
-
-        public void put(Task task, T item) {
-            assert item.task.equals(task);
-            add(item);
-        }
-
-        public ItemList<T> values() {
-            return this;
-        }
-
         /**
-         * Works like {@link #remove(Task)} but also marks the {@link Item} as cancelled.
+         * Removes a task and marks the {@link Item} as cancelled.
          */
         public T cancel(Task p) {
             T x = get(p);

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

@@ -33,6 +33,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import jenkins.model.Jenkins;
+import jenkins.views.ViewsTabBarUserProperty;
 
 /**
  * Container of {@link View}s.
@@ -159,4 +160,23 @@ default List<Action> getViewActions() {
         return Jenkins.get().getActions();
     }
 
+    /**
+     * Returns the ViewsTabBar that the user has configured.
+     *
+     * @return users TabBar
+     * @since TODO
+     */
+    default ViewsTabBar getUserViewsTabBar() {
+        User user = User.current();
+        if (user != null) {
+            ViewsTabBarUserProperty viewsTabBarUserProperty = user.getProperty(ViewsTabBarUserProperty.class);
+            if (viewsTabBarUserProperty != null) {
+                ViewsTabBar userViewTabsBars = viewsTabBarUserProperty.getViewsTabBar();
+                if (userViewTabsBars != null) {
+                    return userViewTabsBars;
+                }
+            }
+        }
+        return getViewsTabBar();
+    }
 }