Init

.prettierignore

@@ -9,7 +9,6 @@ node/
 
 # libraries / external deps / generated files
 src/main/js/plugin-setup-wizard/bootstrap-detached.js
-war/src/main/webapp/scripts/yui
 war/src/main/webapp/jsbundles/
 src/main/scss/_bootstrap.scss
 

bom/pom.xml

@@ -41,7 +41,7 @@ THE SOFTWARE.
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
     <groovy.version>2.4.21</groovy.version>
     <jelly.version>1.1-jenkins-20250108</jelly.version>
-    <stapler.version>1940.v41211a_a_b_b_d8b_</stapler.version>
+    <stapler.version>1942.v708e07325402</stapler.version>
   </properties>
 
   <dependencyManagement>
@@ -132,11 +132,6 @@ THE SOFTWARE.
         <artifactId>commons-io</artifactId>
         <version>2.18.0</version>
       </dependency>
-      <dependency>
-        <groupId>commons-jelly</groupId>
-        <artifactId>commons-jelly-tags-xml</artifactId>
-        <version>1.1</version>
-      </dependency>
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
@@ -243,11 +238,21 @@ THE SOFTWARE.
         <artifactId>annotation-indexer</artifactId>
         <version>1.18</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci</groupId>
+        <artifactId>commons-jelly</artifactId>
+        <version>${jelly.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>commons-jelly-tags-fmt</artifactId>
         <version>${jelly.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jenkins-ci</groupId>
+        <artifactId>commons-jelly-tags-xml</artifactId>
+        <version>${jelly.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>commons-jexl</artifactId>

core/pom.xml

@@ -166,40 +166,6 @@ THE SOFTWARE.
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-jelly</groupId>
-      <artifactId>commons-jelly-tags-xml</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-jelly</groupId>
-          <artifactId>commons-jelly</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-jelly</groupId>
-          <artifactId>commons-jelly-tags-junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-jexl</groupId>
-          <artifactId>commons-jexl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>dom4j</groupId>
-          <artifactId>dom4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xalan</groupId>
-          <artifactId>xalan</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <!-- Jenkins doesn't use this directly, but some plugins wanted to use the latest -->
       <groupId>commons-lang</groupId>
@@ -310,6 +276,20 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci</groupId>
       <artifactId>commons-jelly-tags-fmt</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>commons-jelly-tags-xml</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jaxen</groupId>
+          <artifactId>jaxen</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>commons-jexl</artifactId>

core/src/main/java/hudson/Functions.java

@@ -36,6 +36,7 @@
 import hudson.init.InitMilestone;
 import hudson.model.AbstractProject;
 import hudson.model.Action;
+import hudson.model.Actionable;
 import hudson.model.Computer;
 import hudson.model.Describable;
 import hudson.model.Descriptor;
@@ -161,6 +162,9 @@
 import jenkins.console.ConsoleUrlProvider;
 import jenkins.console.DefaultConsoleUrlProvider;
 import jenkins.console.WithConsoleUrl;
+import jenkins.model.Detail;
+import jenkins.model.DetailFactory;
+import jenkins.model.DetailGroup;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
@@ -664,17 +668,14 @@ public static String validateIconSize(String iconSize) throws SecurityException
     }
 
     /**
-     * Gets the suffix to use for YUI JavaScript.
-     */
-    public static String getYuiSuffix() {
-        return DEBUG_YUI ? "debug" : "min";
-    }
-
-    /**
-     * Set to true if you need to use the debug version of YUI.
+     * No longer used, to be removed after enough plugins have adopted a version of the test harness with
+     * <a href="https://github.com/jenkinsci/jenkins-test-harness/pull/874">jenkins-test-harness/pull/874</a> in it.
+     *
+     * @deprecated removed without replacement
      */
     @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
-    public static boolean DEBUG_YUI = SystemProperties.getBoolean("debug.YUI");
+    @Deprecated(forRemoval = true, since = "TODO")
+    public static boolean DEBUG_YUI;
 
     /**
      * Creates a sub map by using the given range (both ends inclusive).
@@ -2589,6 +2590,33 @@ public static String generateItemId() {
         return String.valueOf(Math.floor(Math.random() * 3000));
     }
 
+    /**
+     * Returns a grouped list of Detail objects for the given Actionable object
+     */
+    @Restricted(NoExternalUse.class)
+    public static Map<DetailGroup, List<Detail>> getDetailsFor(Actionable object) {
+        List<Detail> details = new ArrayList<>();
+
+        for (DetailFactory taf : DetailFactory.factoriesFor(object.getClass())) {
+            details.addAll(taf.createFor(object));
+        }
+
+        Map<DetailGroup, List<Detail>> orderedMap = new TreeMap<>(Comparator.comparingInt(DetailGroup::getOrder));
+
+        for (Detail detail : details) {
+            if (detail.isApplicable()) {
+                orderedMap.computeIfAbsent(detail.getGroup(), k -> new ArrayList<>()).add(detail);
+            }
+        }
+
+        for (Map.Entry<DetailGroup, List<Detail>> entry : orderedMap.entrySet()) {
+            List<Detail> detailList = entry.getValue();
+            detailList.sort(Comparator.comparingInt(Detail::getOrder));
+        }
+
+        return orderedMap;
+    }
+
     @Restricted(NoExternalUse.class)
     public static ExtensionList<SearchFactory> getSearchFactories() {
         return SearchFactory.all();

core/src/main/java/hudson/cli/CLICommand.java

@@ -53,11 +53,6 @@
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import jenkins.util.SystemProperties;
-import org.apache.commons.discovery.ResourceClassIterator;
-import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.commons.discovery.resource.ClassLoaders;
-import org.apache.commons.discovery.resource.classes.DiscoverClasses;
-import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
 import org.jvnet.hudson.annotation_indexer.Index;
 import org.jvnet.tiger_types.Types;
 import org.kohsuke.accmod.Restricted;
@@ -566,27 +561,13 @@ public static CLICommand getCurrent() {
         if (j != null) { // only when running on the controller
             // Register OptionHandlers through META-INF/services/annotations and Annotation Indexer
             try {
-                for (Class c : Index.list(OptionHandlerExtension.class, Jenkins.get().pluginManager.uberClassLoader, Class.class)) {
+                for (Class c : Index.list(OptionHandlerExtension.class, j.getPluginManager().uberClassLoader, Class.class)) {
                     Type t = Types.getBaseClass(c, OptionHandler.class);
                     CmdLineParser.registerHandler(Types.erasure(Types.getTypeArgument(t, 0)), c);
                 }
             } catch (IOException e) {
                 throw new UncheckedIOException(e);
             }
-
-            // Register OptionHandlers through META-INF/services and Commons Discovery
-            ClassLoaders cls = new ClassLoaders();
-            cls.put(j.getPluginManager().uberClassLoader);
-            ResourceNameIterator servicesIter =
-                new DiscoverServiceNames(cls).findResourceNames(OptionHandler.class.getName());
-            final ResourceClassIterator itr =
-                new DiscoverClasses(cls).findResourceClasses(servicesIter);
-
-            while (itr.hasNext()) {
-                Class h = itr.nextResourceClass().loadClass();
-                Class c = Types.erasure(Types.getTypeArgument(Types.getBaseClass(h, OptionHandler.class), 0));
-                CmdLineParser.registerHandler(c, h);
-            }
         }
     }
 

core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java

@@ -42,7 +42,7 @@
 /**
  * Refers to an {@link Item} by its name.
  * May be subclassed to handle specific kinds of items.
- * (Use {@code @MetaInfServices(OptionHandler.class)} to register the subclass.)
+ * (Use {@code @OptionHandlerExtension} to register the subclass.)
  * @param <T> the kind of item being handled
  * @since 1.538
  */

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

@@ -40,6 +40,7 @@
 import hudson.AbortException;
 import hudson.BulkChange;
 import hudson.EnvVars;
+import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.FeedAdapter;
@@ -53,6 +54,8 @@
 import hudson.console.ModelHyperlinkNote;
 import hudson.console.PlainTextConsoleOutputStream;
 import hudson.model.Descriptor.FormException;
+import hudson.model.details.DurationDetail;
+import hudson.model.details.TimestampDetail;
 import hudson.model.listeners.RunListener;
 import hudson.model.listeners.SaveableListener;
 import hudson.model.queue.SubTask;
@@ -115,6 +118,8 @@
 import jenkins.model.ArtifactManagerConfiguration;
 import jenkins.model.ArtifactManagerFactory;
 import jenkins.model.BuildDiscarder;
+import jenkins.model.Detail;
+import jenkins.model.DetailFactory;
 import jenkins.model.HistoricalBuild;
 import jenkins.model.Jenkins;
 import jenkins.model.JenkinsLocationConfiguration;
@@ -2669,4 +2674,17 @@ public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExcept
             out.flush();
         }
     }
+
+    @Extension
+    public static final class BasicRunDetailFactory extends DetailFactory<Run> {
+
+        @Override
+        public Class<Run> type() {
+            return Run.class;
+        }
+
+        @NonNull @Override public Collection<? extends Detail> createFor(@NonNull Run target) {
+            return List.of(new TimestampDetail(target), new DurationDetail(target));
+        }
+    }
 }

core/src/main/java/hudson/model/details/DurationDetail.java

@@ -0,0 +1,14 @@
+package hudson.model.details;
+
+import hudson.model.Run;
+import jenkins.model.Detail;
+
+/**
+ * Displays the duration of the given run, or, if the run has completed, shows the total time it took to execute
+ */
+public class DurationDetail extends Detail {
+
+    public DurationDetail(Run<?, ?> run) {
+        super(run);
+    }
+}

core/src/main/java/hudson/model/details/TimestampDetail.java

@@ -0,0 +1,14 @@
+package hudson.model.details;
+
+import hudson.model.Run;
+import jenkins.model.Detail;
+
+/**
+ * Displays the start time of the given run
+ */
+public class TimestampDetail extends Detail {
+
+    public TimestampDetail(Run<?, ?> run) {
+        super(run);
+    }
+}

core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java

@@ -186,7 +186,10 @@ public GroupDetails loadGroupByGroupname(String groupname) throws org.acegisecur
     class Authenticator extends AbstractUserDetailsAuthenticationProvider {
         @Override
         protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
-            // authentication is assumed to be done already in the retrieveUser method
+            // Authentication is done in the retrieveUser method. Note that this method being a no-op is only safe
+            // because we use Spring Security's default NullUserCache. If caching was enabled, it would be possible to
+            // log in as any cached user with any password unless we updated this method to check the provided
+            // authentication as recommended in the superclass method's documentation, so be careful reusing this code.
         }
 
         @Override

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

@@ -0,0 +1,74 @@
+package jenkins.model;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
+import hudson.model.Actionable;
+import hudson.model.ModelObject;
+import hudson.model.Run;
+import org.jenkins.ui.icon.IconSpec;
+
+/**
+ * {@link Detail} represents a piece of information about a {@link Run}.
+ * Such information could include:
+ * <ul>
+ *  <li>the date and time the run started</li>
+ *  <li>the amount of time the run took to complete</li>
+ *  <li>SCM information for the build</li>
+ *  <li>who kicked the build off</li>
+ * </ul>
+ * @since TODO
+ */
+public abstract class Detail implements ModelObject, IconSpec {
+
+    private final Actionable object;
+
+    public Detail(Actionable object) {
+        this.object = object;
+    }
+
+    public Actionable getObject() {
+        return object;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public @Nullable String getIconClassName() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @Nullable String getDisplayName() {
+        return null;
+    }
+
+    /**
+     * Optional URL for the {@link Detail}
+     */
+    public @Nullable String getUrl() {
+        return null;
+    }
+
+    /**
+     * Returns true if this detail is applicable to the given Actionable object
+     */
+    public boolean isApplicable() {
+        return true;
+    }
+
+    /**
+     * @return the grouping of the detail
+     */
+    public DetailGroup getGroup() {
+        return DetailGroup.GENERAL;
+    }
+
+    /**
+     * @return order in the group, zero is first, MAX_VALUE is any order
+     */
+    public int getOrder() {
+        return Integer.MAX_VALUE;
+    }
+}