Merge branch 'master' into restore-view-actions

Author: janfaracik

.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=6242.v4b_a_848d63ed8
 
 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

core/pom.xml

@@ -57,7 +57,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-bom</artifactId>
-        <version>2.10.1</version>
+        <version>2.10.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -453,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>

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();
+    }
 }

core/src/main/java/hudson/views/DefaultMyViewsTabBar.java

@@ -35,7 +35,9 @@
  * @author Winston Prakash
  * @since 1.378
  * @see MyViewsTabBar
+ * @deprecated No longer used
  */
+@Deprecated
 public class DefaultMyViewsTabBar extends MyViewsTabBar {
     @DataBoundConstructor
     public DefaultMyViewsTabBar() {

core/src/main/java/hudson/views/MyViewsTabBar.java

@@ -58,7 +58,9 @@
  * @author Winston Prakash
  * @since 1.378
  * @see MyViewsTabBarDescriptor
+ * @deprecated Implement {@link ViewsTabBar}
  */
+@Deprecated
 public abstract class MyViewsTabBar implements Describable<MyViewsTabBar>, ExtensionPoint {
     /**
      * Returns all the registered {@link ListViewColumn} descriptors.

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

@@ -1941,10 +1941,12 @@ public Jenkins getItemGroup() {
         return this;
    }
 
+    @Deprecated
     public MyViewsTabBar getMyViewsTabBar() {
         return myViewsTabBar;
     }
 
+    @Deprecated
     public void setMyViewsTabBar(MyViewsTabBar myViewsTabBar) {
         this.myViewsTabBar = myViewsTabBar;
     }

core/src/main/java/jenkins/security/ConfidentialStore.java

@@ -1,5 +1,6 @@
 package jenkins.security;
 
+import com.google.common.annotations.VisibleForTesting;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
@@ -19,6 +20,8 @@
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import org.kohsuke.MetaInfServices;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
  * The actual storage for the data held by {@link ConfidentialKey}s, and the holder
@@ -98,9 +101,11 @@ public abstract class ConfidentialStore {
         return cs;
     }
 
-    static final class Mock extends ConfidentialStore {
+    @Restricted(NoExternalUse.class)
+    @VisibleForTesting
+    public static final class Mock extends ConfidentialStore {
 
-        static final Mock INSTANCE = new Mock();
+        public static final Mock INSTANCE = new Mock();
 
         private final SecureRandom rand;
 
@@ -116,7 +121,7 @@ static final class Mock extends ConfidentialStore {
             rand.setSeed(new byte[] {1, 2, 3, 4});
         }
 
-        void clear() {
+        public void clear() {
             data.clear();
         }