Merge branch 'master' into chore/remove-commons-lang-2.6

Author: alecharp

bom/pom.xml

@@ -210,7 +210,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>annotation-indexer</artifactId>
-        <version>1.18</version>
+        <version>1.213.v92788b_1f0a_21</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>

package.json

@@ -42,7 +42,7 @@
     "postcss-preset-env": "10.6.0",
     "postcss-scss": "4.0.9",
     "prettier": "3.7.4",
-    "sass": "1.97.1",
+    "sass": "1.97.2",
     "sass-loader": "16.0.6",
     "style-loader": "4.0.0",
     "stylelint": "16.26.1",

test/pom.xml

@@ -192,7 +192,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2544.v272f2b_d841b_2</version>
+      <version>2545.va_5c4d760c7ef</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

test/src/test/java/hudson/model/QueueTest.java

@@ -90,8 +90,6 @@
 import java.io.UncheckedIOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -112,7 +110,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.BlockedBecauseOfBuildInProgress;
 import jenkins.model.Jenkins;
@@ -132,7 +129,6 @@
 import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.LogRecorder;
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
 import org.jvnet.hudson.test.MockQueueItemAuthenticator;
 import org.jvnet.hudson.test.SequenceLock;
@@ -150,8 +146,6 @@
 @WithJenkins
 public class QueueTest {
 
-    private final LogRecorder logging = new LogRecorder().record(Queue.class, Level.FINE);
-
     private JenkinsRule r;
 
     @BeforeEach
@@ -173,8 +167,6 @@ void persistence() throws Exception {
         assertNotNull(testProject.scheduleBuild2(0, new UserIdCause()));
         q.save();
 
-        System.out.println(Files.readString(r.jenkins.getRootDir().toPath().resolve("queue.xml"), StandardCharsets.UTF_8));
-
         assertEquals(1, q.getItems().length);
         q.clear();
         assertEquals(0, q.getItems().length);
@@ -228,8 +220,6 @@ void persistence2() throws Exception {
         assertNotNull(testProject.scheduleBuild2(0, new UserIdCause()));
         q.save();
 
-        System.out.println(Files.readString(r.jenkins.getRootDir().toPath().resolve("queue.xml"), StandardCharsets.UTF_8));
-
         assertEquals(1, q.getItems().length);
         q.clear();
         assertEquals(0, q.getItems().length);
@@ -372,7 +362,6 @@ Started by timer (2 times)
                         Started by remote host 4.3.2.1 with note: test
                         Started by remote host 1.2.3.4 with note: foo"""),
                    "Build page should combine duplicates and show counts: " + buildPage);
-        System.out.println(new XmlFile(new File(build.getRootDir(), "build.xml")).asString());
     }
 
     @Issue("JENKINS-8790")
@@ -1243,7 +1232,22 @@ void testGetCauseOfBlockageForNonConcurrentFreestyle() throws Exception {
 
         assertEquals(expected.getShortDescription(), actual.getShortDescription());
         Queue.getInstance().doCancelItem(r.jenkins.getQueue().getBlockedItems().get(0).getId());
-        r.assertBuildStatusSuccess(r.waitForCompletion(build));
+
+        build.doStop(); // Stop build 1 early
+        r.waitForCompletion(build);
+        build.delete(); // Delete build 1
+
+        // Stop and delete build 2 if it is running.  Seen running on slower Windows computers
+        if (t1.isBuilding()) {
+            FreeStyleBuild build2 = t1.getLastBuild();
+            build2.doStop();
+            r.waitForCompletion(build2);
+            build2.delete();
+        }
+
+        assertFalse(t1.isBuilding(), "Job unexpectedly building");
+        assertNull(t1.getQueueItem(), "Job unexpectedly has non-null entry in queue " + t1.getQueueItem());
+        assertFalse(t1.isInQueue(), "Job unexpectedly in queue");
     }
 
     @Test

yarn.lock

@@ -4538,7 +4538,7 @@ __metadata:
     postcss-preset-env: "npm:10.6.0"
     postcss-scss: "npm:4.0.9"
     prettier: "npm:3.7.4"
-    sass: "npm:1.97.1"
+    sass: "npm:1.97.2"
     sass-loader: "npm:16.0.6"
     sortablejs: "npm:1.15.6"
     style-loader: "npm:4.0.0"
@@ -6533,9 +6533,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.97.1":
-  version: 1.97.1
-  resolution: "sass@npm:1.97.1"
+"sass@npm:1.97.2":
+  version: 1.97.2
+  resolution: "sass@npm:1.97.2"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -6546,7 +6546,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/c389d5d6405869b49fa2291e8328500fe7936f3b72136bc2c338bee6e7fec936bb9a48d77a1310dea66aa4669ba74ae6b82a112eb32521b9b36d740138a39ea0
+  checksum: 10c0/5622a4f9d0acf5cdfb72c73c448366b3ec7bfe2b6e1ecb62c6e9f8eaff9c02a6afd86a31ded246fc818fe660cedea6bd27335e82fc9bd7cce46c29f95774bece
   languageName: node
   linkType: hard