Merge branch 'master' into migrate_to_junit5_test_2

# Conflicts:
#	test/src/test/java/hudson/tasks/LogRotatorTest.java

Author: strangelookingnerd

.github/renovate.json

@@ -23,12 +23,6 @@
         "team:sig-ux"
       ]
     },
-    {
-      "matchPackageNames": [
-        "node"
-      ],
-      "allowedVersions": "/22.[0-9]+.[0-9]+(.[0-9]+)?$/"
-    },
     {
       "description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned",
       "matchManagers": [
@@ -124,7 +118,7 @@
         "<node.version>(?<currentValue>.*?)</node.version>"
       ],
       "depNameTemplate": "node",
-      "datasourceTemplate": "npm"
+      "datasourceTemplate": "node-version"
     },
     {
       "customType": "regex",

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>1971.vf47a_d79853d7</stapler.version>
+    <stapler.version>1979.v5048d87384d7</stapler.version>
   </properties>
 
   <dependencyManagement>

core/src/main/java/hudson/console/AnnotatedLargeText.java

@@ -141,7 +141,10 @@ public void doProgressiveText(StaplerRequest req, StaplerResponse rsp) throws IO
      * and use this request attribute to differentiate.
      */
     private boolean isHtml() {
-        StaplerRequest2 req = Stapler.getCurrentRequest2();
+        return isHtml(Stapler.getCurrentRequest2());
+    }
+
+    private boolean isHtml(StaplerRequest2 req) {
         return req != null && req.getAttribute("html") != null;
     }
 
@@ -207,6 +210,11 @@ public long writeLogTo(long start, Writer w) throws IOException {
             return super.writeLogTo(start, w);
     }
 
+    @Override
+    protected boolean delegateToWriteLogTo(StaplerRequest2 req, StaplerResponse2 rsp) {
+        return isHtml(req);
+    }
+
     /**
      * Strips annotations using a {@link PlainTextConsoleOutputStream}.
      * {@inheritDoc}

core/src/main/java/hudson/console/ConsoleAnnotator.java

@@ -118,6 +118,11 @@ public ConsoleAnnotator annotate(T context, MarkupText text) {
                 default:    return this;
             }
         }
+
+        @Override
+        public String toString() {
+            return "ConsoleAnnotatorAggregator" + list;
+        }
     }
 
     /**

core/src/main/java/hudson/logging/LogRecorder.java

@@ -31,7 +31,6 @@
 import hudson.BulkChange;
 import hudson.Extension;
 import hudson.FilePath;
-import hudson.RestrictedSince;
 import hudson.Util;
 import hudson.XmlFile;
 import hudson.model.AbstractModelObject;
@@ -43,7 +42,6 @@
 import hudson.remoting.Channel;
 import hudson.remoting.VirtualChannel;
 import hudson.slaves.ComputerListener;
-import hudson.util.CopyOnWriteList;
 import hudson.util.FormApply;
 import hudson.util.FormValidation;
 import hudson.util.HttpResponses;
@@ -104,15 +102,6 @@
 public class LogRecorder extends AbstractModelObject implements Loadable, Saveable {
     private volatile String name;
 
-    /**
-     * No longer used.
-     *
-     * @deprecated use {@link #getLoggers()}
-     */
-    @Deprecated
-    @Restricted(NoExternalUse.class)
-    @RestrictedSince("2.324")
-    public final transient CopyOnWriteList<Target> targets = new CopyOnWriteList<>();
     private List<Target> loggers = new ArrayList<>();
     private static final TargetComparator TARGET_COMPARATOR = new TargetComparator();
 
@@ -124,22 +113,6 @@ public LogRecorder(String name) {
         new WeakLogHandler(handler, Logger.getLogger(""));
     }
 
-    private Object readResolve() {
-        if (loggers == null) {
-            loggers = new ArrayList<>();
-        }
-
-        List<Target> tempLoggers = new ArrayList<>(loggers);
-
-        if (!targets.isEmpty()) {
-            loggers.addAll(targets.getView());
-        }
-        if (!tempLoggers.isEmpty() && !targets.getView().equals(tempLoggers)) {
-            targets.addAll(tempLoggers);
-        }
-        return this;
-    }
-
     public List<Target> getLoggers() {
         return loggers;
     }
@@ -455,7 +428,6 @@ public synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rs
             recorders.remove(new LogRecorder(name));
             this.name = newName;
             recorders.add(this);
-            getParent().setRecorders(recorders); // ensure that legacy logRecorders field is synced on save
             redirect = "../" + Util.rawEncode(newName) + '/';
         }
 
@@ -491,31 +463,12 @@ public synchronized void load() throws IOException {
     public synchronized void save() throws IOException {
         if (BulkChange.contains(this))   return;
 
-        handlePluginUpdatingLegacyLogManagerMap();
         getConfigFile().write(this);
         loggers.forEach(Target::enable);
 
         SaveableListener.fireOnChange(this, getConfigFile());
     }
 
-    @SuppressWarnings("deprecation") // this is for compatibility
-    private void handlePluginUpdatingLegacyLogManagerMap() {
-        if (getParent().logRecorders.size() > getParent().getRecorders().size()) {
-            for (LogRecorder logRecorder : getParent().logRecorders.values()) {
-                if (!getParent().getRecorders().contains(logRecorder)) {
-                    getParent().getRecorders().add(logRecorder);
-                }
-            }
-        }
-        if (getParent().getRecorders().size() > getParent().logRecorders.size()) {
-            for (LogRecorder logRecorder : getParent().getRecorders()) {
-                if (!getParent().logRecorders.containsKey(logRecorder.getName())) {
-                    getParent().logRecorders.put(logRecorder.getName(), logRecorder);
-                }
-            }
-        }
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {

core/src/main/java/hudson/logging/LogRecorderManager.java

@@ -155,7 +155,6 @@ public void load() throws IOException {
             lr.load();
             recorders.add(lr);
         }
-        setRecorders(recorders); // ensure that legacy logRecorders field is synced on load
     }
 
     /**

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

@@ -72,7 +72,6 @@
 import io.jenkins.servlet.ServletExceptionWrapper;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -1466,19 +1465,34 @@ public Collection<Fingerprint> getBuildFingerprints() {
      */
     @SuppressFBWarnings(value = "RV_RETURN_VALUE_IGNORED", justification = "method signature does not permit plumbing through the return value")
     public void writeLogTo(long offset, @NonNull XMLOutput out) throws IOException {
-        long start = offset;
+        AnnotatedLargeText<?> logText = getLogText();
         if (offset > 0) {
-            try (BufferedInputStream bufferedInputStream = new BufferedInputStream(getLogInputStream())) {
-                if (offset == bufferedInputStream.skip(offset)) {
-                    int r;
-                    do {
-                        r = bufferedInputStream.read();
-                        start = r == -1 ? 0 : start + 1;
-                    } while (r != -1 && r != '\n');
-                }
+            long _offset = offset;
+            try {
+                logText.writeRawLogTo(offset - 1, new OutputStream() {
+                    long pos = _offset;
+                    @Override
+                    public void write(int b) throws IOException {
+                        if (b == '\n') {
+                            throw new Halt(pos);
+                        } else {
+                            pos++;
+                        }
+                    }
+                });
+            } catch (Halt halt) {
+                offset = halt.offset;
             }
         }
-        getLogText().writeHtmlTo(start, out.asWriter());
+        logText.writeHtmlTo(offset, out.asWriter());
+    }
+
+    private static final class Halt extends IOException {
+        final long offset;
+
+        Halt(long offset) {
+            this.offset = offset;
+        }
     }
 
     /**

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

@@ -24,14 +24,20 @@
 
 package jenkins.model;
 
+import com.google.common.annotations.VisibleForTesting;
 import hudson.Extension;
+import hudson.ExtensionList;
 import hudson.model.Job;
 import hudson.model.Run;
 import hudson.model.listeners.RunListener;
+import hudson.remoting.SingleLaneExecutorService;
 import hudson.util.LogTaskListener;
+import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jenkins.util.Timer;
 import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
@@ -43,18 +49,32 @@ public class GlobalBuildDiscarderListener extends RunListener<Run> {
 
     private static final Logger LOGGER = Logger.getLogger(GlobalBuildDiscarderListener.class.getName());
 
+    private final ExecutorService executor = new SingleLaneExecutorService(Timer.get());
+
     @Override
     public void onFinalized(Run run) {
-        Job job = run.getParent();
-        try {
-            // Job-level build discarder execution is unconditional.
-            job.logRotate();
-        } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e, () -> "Failed to rotate log for " + run);
-        }
-        // Avoid calling Job.logRotate twice in case JobGlobalBuildDiscarderStrategy is configured globally.
-        BackgroundGlobalBuildDiscarder.processJob(new LogTaskListener(LOGGER, Level.FINE), job,
-                GlobalBuildDiscarderConfiguration.get().getConfiguredBuildDiscarders().stream()
-                        .filter(s -> !(s instanceof JobGlobalBuildDiscarderStrategy)));
+        executor.execute(() -> {
+            Job job = run.getParent();
+            try {
+                // Job-level build discarder execution is unconditional.
+                job.logRotate();
+            } catch (Exception e) {
+                LOGGER.log(Level.WARNING, e, () -> "Failed to rotate log for " + run);
+            }
+            // Avoid calling Job.logRotate twice in case JobGlobalBuildDiscarderStrategy is configured globally.
+            BackgroundGlobalBuildDiscarder.processJob(new LogTaskListener(LOGGER, Level.FINE), job,
+                    GlobalBuildDiscarderConfiguration.get().getConfiguredBuildDiscarders().stream()
+                            .filter(s -> !(s instanceof JobGlobalBuildDiscarderStrategy)));
+        });
+    }
+
+    /**
+     * Waits for all currently scheduled or running discards to complete.
+     */
+    @VisibleForTesting
+    @Restricted(DoNotUse.class)
+    public static void await() throws Exception {
+        ExtensionList.lookupSingleton(GlobalBuildDiscarderListener.class).executor.submit(() -> {}).get();
     }
+
 }

core/src/main/resources/lib/layout/header/actions.jelly

@@ -46,7 +46,7 @@
         <x:attribute name="data-type">header-action</x:attribute>
         <x:attribute name="draggable">false</x:attribute>
         <x:attribute name="class">jenkins-button ${isCurrent ? '' : 'jenkins-button--tertiary'}</x:attribute>
-        <l:icon src="${icon}" class="jenkins-avatar" />
+        <l:icon src="${icon}" class="${action.class.name == 'jenkins.model.navigation.UserAction' ? 'jenkins-avatar' : ''}"/>
         <span class="jenkins-visually-hidden" data-type="action-label">${action.displayName}</span>
         <j:if test="${badge != null}">
           <span class="jenkins-badge jenkins-!-${badge.severity}-color" />

core/src/test/java/hudson/model/RunTest.java

@@ -280,6 +280,11 @@ public void wontPushOffsetOnRenderingFromBeginning() throws Exception {
         assertWriteLogToEquals(new String(new char[5]).replace("\0", SAMPLE_BUILD_OUTPUT) + "Finished: SUCCESS.\n", 0);
     }
 
+    @Test
+    public void wontPushOffsetOnRenderingFromBeginningOfLine() throws Exception {
+        assertWriteLogToEquals(new String(new char[3]).replace("\0", SAMPLE_BUILD_OUTPUT) + "Finished: SUCCESS.\n", 2 * SAMPLE_BUILD_OUTPUT.length());
+    }
+
     @Test
     public void willRenderNothingIfOffsetSetOnLastLine() throws Exception {
         assertWriteLogToEquals("", 5 * SAMPLE_BUILD_OUTPUT.length() + 6);