Merge branch 'master' into migrate_to_junit5_test_1

# Conflicts:
#	test/src/test/java/hudson/logging/LogRecorderManagerTest.java

Author: strangelookingnerd

.github/renovate.json

@@ -23,12 +23,6 @@
         "team:sig-ux"
       ]
     },
-    {
-      "matchPackageNames": [
-        "node"
-      ],
-      "allowedVersions": "/20.[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>
@@ -206,11 +206,6 @@ THE SOFTWARE.
         <artifactId>groovy-all</artifactId>
         <version>${groovy.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.connectbot</groupId>
-        <artifactId>jbcrypt</artifactId>
-        <version>1.0.2</version>
-      </dependency>
       <dependency>
         <!-- Groovy shell uses this, but it doesn't declare the dependency -->
         <groupId>org.fusesource.jansi</groupId>

core/pom.xml

@@ -246,10 +246,6 @@ THE SOFTWARE.
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.connectbot</groupId>
-      <artifactId>jbcrypt</artifactId>
-    </dependency>
     <dependency>
       <!-- Groovy shell uses this, but it doesn't declare the dependency -->
       <groupId>org.fusesource.jansi</groupId>

core/src/main/java/hudson/PluginManager.java

@@ -1557,6 +1557,10 @@ public HttpResponse doPluginsSearch(@QueryParameter String query, @QueryParamete
                         releaseTimestamp.put("displayValue", Messages.PluginManager_ago(Functions.getTimeSpanString(plugin.releaseTimestamp)));
                         jsonObject.put("releaseTimestamp", releaseTimestamp);
                     }
+                    if (plugin.healthScore != null) {
+                        jsonObject.put("healthScore", plugin.healthScore);
+                        jsonObject.put("healthScoreClass", plugin.healthScoreClass);
+                    }
                     return jsonObject;
                 })
                 .collect(toList());

core/src/main/java/hudson/PluginWrapper.java

@@ -222,6 +222,8 @@ public boolean hasDerivedDependencyErrors() {
      */
     private static Set<String> CORE_ONLY_DEPENDANT = Set.of("jenkins-core");
 
+    private Integer healthScore;
+
     /**
      * Set the list of components that depend on this plugin.
      * @param dependents The list of components that depend on this plugin.
@@ -423,6 +425,32 @@ public void injectJarsToClasspath(File... jars) throws Exception {
 
     }
 
+    @Restricted(NoExternalUse.class) // Jelly use only
+    public Integer getHealthScore() {
+        if (this.healthScore == null) {
+            this.healthScore = getInfoFromAllSites().stream()
+                    .filter(Objects::nonNull)
+                    .filter(p -> p.healthScore != null)
+                    .findFirst()
+                    .map(plugin -> plugin.healthScore)
+                    .orElse(null);
+        }
+        return this.healthScore;
+    }
+
+    @Restricted(NoExternalUse.class)
+    public static String getHealthScoreClassForScore(int score) {
+        if (score > 80) return "top";
+        if (score > 60) return "middle";
+        return "bottom";
+    }
+
+    @Restricted(NoExternalUse.class) // Jelly use only
+    public String getHealthScoreClass() {
+        if (this.healthScore == null) return null;
+        return getHealthScoreClassForScore(this.healthScore);
+    }
+
     @ExportedBean
     public static final class Dependency {
         @Exported

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/Computer.java

@@ -782,7 +782,7 @@ public List<AbstractProject> getTiedJobs() {
     }
 
     public RunList getBuilds() {
-        return RunList.fromJobs((Iterable) Jenkins.get().allItems(Job.class)).node(getNode());
+        return RunList.fromJobs((Iterable) Jenkins.get().allItems(AbstractProject.class)).node(getNode());
     }
 
     /**