Merge branch 'master' into fix-offline-install-logic

Author: prabhu463

.github/FUNDING.yml

@@ -97,5 +97,9 @@
       "datasourceTemplate": "maven"
     }
   ],
+  "lockFileMaintenance": {
+    "enabled": true,
+    "automerge": false
+  },
   "labels": ["dependencies", "skip-changelog"]
 }

.github/renovate.json

@@ -17,7 +17,7 @@ jobs:
           discourse-author-username: jenkins-release-bot
           discourse-category: 23
       - name: Post on mailing list
-        uses: dawidd6/action-send-mail@62a2d05b79935ad4fb90ce9079928099579c14ac # v9
+        uses: dawidd6/action-send-mail@ba302ba66e88942841281c984a6b31ca6d6289e6 # v11
         with:
           server_address: smtp.gmail.com
           server_port: 465

.github/workflows/announce-lts-rc.yml

@@ -35,7 +35,7 @@ jobs:
         env:
           GITHUB_AUTH: github-actions:${{ secrets.GITHUB_TOKEN }}
       - name: Upload Changelog YAML
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: changelog.yaml
           path: changelog.yaml

.github/workflows/changelog.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Set up JDK 21
-        uses: actions/setup-java@fe779bf55ef683c9413269276a7588bb9cedf07a #v 5.0.0
+        uses: actions/setup-java@1d018f9b8b9b505bb578a83b230fabcce01af93b #v 5.0.0
         with:
           distribution: "temurin"
           java-version: 21

.github/workflows/publish-release-artifact.yml

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6578.vcd7330d974d1
+export ATH_VERSION=6587.v2a_7493c89346
 
 if [[ $# -eq 0 ]]; then
 	export JDK=21

ath.sh

@@ -113,7 +113,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
         <executions>
           <execution>
             <goals>

cli/pom.xml

@@ -163,9 +163,12 @@ public void perform(Job<?, ?> job) throws IOException, InterruptedException {
         Run lsb = removeLastBuild ? null : job.getLastSuccessfulBuild();
         Run lstb = removeLastBuild ? null : job.getLastStableBuild();
 
+        Map<Integer, ? extends Run<?, ?>> runMap = job.getBuildsAsMap();
         if (numToKeep != -1) {
-            job.getBuildsAsMap().entrySet().stream().skip(numToKeep).map(Map.Entry::getValue)
-                    .filter(r -> !shouldKeepRun(r, lsb, lstb)).forEach(r -> {
+            // Iterate through keySet() instead of entrySet() or values() to avoid triggering lazy loading
+            // for the first `numToKeep` builds
+            runMap.keySet().stream().skip(numToKeep).map(runMap::get)
+                    .filter(r -> r != null && !shouldKeepRun(r, lsb, lstb)).forEach(r -> {
                 LOGGER.log(FINE, "{0} is to be removed", r);
                 try { r.delete(); }
                 catch (IOException ex) { exceptionMap.computeIfAbsent(r, key -> new HashSet<>()).add(ex); }
@@ -190,8 +193,10 @@ public void perform(Job<?, ?> job) throws IOException, InterruptedException {
         }
 
         if (artifactNumToKeep != null && artifactNumToKeep != -1) {
-            job.getBuildsAsMap().entrySet().stream().skip(artifactNumToKeep).map(Map.Entry::getValue)
-                    .filter(r -> !shouldKeepRun(r, lsb, lstb)).forEach(r -> {
+            // Iterate through keySet() instead of entrySet() or values() to avoid triggering lazy loading
+            // for the first `artifactNumToKeep` builds
+            runMap.keySet().stream().skip(artifactNumToKeep).map(runMap::get)
+                    .filter(r -> r != null && !shouldKeepRun(r, lsb, lstb)).forEach(r -> {
                 LOGGER.log(FINE, "{0} is to be purged of artifacts", r);
                 try { r.deleteArtifacts(); }
                 catch (IOException ex) { exceptionMap.computeIfAbsent(r, key -> new HashSet<>()).add(ex); }

core/src/main/java/hudson/tasks/LogRotator.java

@@ -169,12 +169,20 @@ public boolean remove(Object o) {
 
         @Override
         public Iterator<Integer> iterator() {
-            return new AdaptedIterator<>(BuildReferenceMapAdapter.this.entrySet().iterator()) {
-                @Override
-                protected Integer adapt(Map.Entry<Integer, R> e) {
-                    return e.getKey();
-                }
-            };
+            return Iterators.removeNull(Iterators.map(
+                    BuildReferenceMapAdapter.this.core.entrySet().iterator(), coreEntry -> {
+                        BuildReference<R> ref = coreEntry.getValue();
+                        if (!ref.isSet()) {
+                            R r = resolver.resolveBuildRef(ref);
+                            if (r == null) {
+                                return null;
+                            }
+                        }
+                        if (ref.isUnloadable()) {
+                            return null;
+                        }
+                        return ref.number;
+                    }));
         }
 
         @Override
@@ -273,19 +281,9 @@ public Iterator<Map.Entry<Integer, R>> iterator() {
                 private Map.Entry<Integer, R> current;
                 private final Iterator<Map.Entry<Integer, R>> it = Iterators.removeNull(Iterators.map(
                         BuildReferenceMapAdapter.this.core.entrySet().iterator(), coreEntry -> {
-                            BuildReference<R> ref = coreEntry.getValue();
-                            if (!ref.isSet()) {
-                                R r = resolver.resolveBuildRef(ref);
-                                // load not loaded or unloadable build
-                                if (r == null) {
-                                    return null;
-                                }
-                                return new EntryAdapter(coreEntry, r);
-                            }
-                            if (ref.isUnloadable()) {
-                                return null;
-                            }
-                            return new EntryAdapter(coreEntry);
+                            R r = resolver.resolveBuildRef(coreEntry.getValue());
+                            // if null - load not allowed or build is unloadable
+                            return r == null ? null : new AbstractMap.SimpleImmutableEntry<>(coreEntry.getKey(), r);
                         }));
 
                 @Override
@@ -314,59 +312,6 @@ public Spliterator<Map.Entry<Integer, R>> spliterator() {
         }
     }
 
-    private class EntryAdapter implements Entry<Integer, R> {
-        private final Map.Entry<Integer, BuildReference<R>> coreEntry;
-        private volatile R resolvedValue;
-
-        EntryAdapter(Map.Entry<Integer, BuildReference<R>> coreEntry) {
-            this(coreEntry, null);
-        }
-
-        EntryAdapter(Map.Entry<Integer, BuildReference<R>> coreEntry, R resolvedValue) {
-            this.coreEntry = coreEntry;
-            this.resolvedValue = resolvedValue;
-        }
-
-        private Map.Entry<Integer, R> getResolvedEntry() {
-            return new AbstractMap.SimpleEntry<>(getKey(), getValue());
-        }
-
-        @Override
-        public Integer getKey() {
-            return coreEntry.getKey();
-        }
-
-        @Override
-        public R getValue() {
-            R value = resolvedValue;
-            if (value != null) {
-                return value;
-            }
-            return resolvedValue = resolver.resolveBuildRef(coreEntry.getValue());
-        }
-
-        @Override
-        public R setValue(R value) {
-            // BuildReferenceAdapter is read only
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public String toString() {
-            return getResolvedEntry().toString();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return (o instanceof Map.Entry<?, ?>) && getResolvedEntry().equals(o);
-        }
-
-        @Override
-        public int hashCode() {
-            return getResolvedEntry().hashCode();
-        }
-    }
-
     /**
      * An interface for resolving build references into actual build instances
      * and extracting basic metadata from them.

core/src/main/java/jenkins/model/lazy/BuildReferenceMapAdapter.java

@@ -27,10 +27,11 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <t:scriptConsole>
-    <pre>println System.getenv("PATH")</pre>
-    <pre>println "uname -a".execute().text</pre>
-    <p>
+  <j:set var="script" value='println System.getenv("PATH")' />
+  <j:set var="script2" value='println "uname -a".execute().text' />
+
+  <t:scriptConsole scripts="${[script, script2]}">
+    <p class="jenkins-section__description">
       ${%This execution happens in the agent JVM.}
     </p>
   </t:scriptConsole>