Merge pull request #9858 from MarkEWaite/stable-2.479-backport-2

Backporting for 2.479.1 (part 2)
jenkinsci · Oct 12, 2024 · a347514 · a347514
2 parents 7849dfb + c2ec435
commit a347514
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -356,7 +356,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>9.7</version>
+        <version>9.7.1</version>
       </dependency>
       <dependency>
         <groupId>org.samba.jcifs</groupId>

diff --git a/core/src/main/java/jenkins/model/queue/ItemDeletion.java b/core/src/main/java/jenkins/model/queue/ItemDeletion.java
@@ -266,12 +266,10 @@ public static void cancelBuildsInProgress(@NonNull Item initiatingItem) throws F
                     // comparison with executor.getCurrentExecutable() == executable currently should always be
                     // true as we no longer recycle Executors, but safer to future-proof in case we ever
                     // revisit recycling.
-                    if (!entry.getKey().isAlive()
+                    if (!entry.getKey().isActive()
                             || entry.getValue() != entry.getKey().getCurrentExecutable()) {
                         iterator.remove();
                     }
-                    // I don't know why, but we have to keep interrupting
-                    entry.getKey().interrupt(Result.ABORTED);
                 }
                 Thread.sleep(50L);
             }

diff --git a/war/pom.xml b/war/pom.xml
@@ -494,7 +494,7 @@ THE SOFTWARE.
                   <!-- dependency of scm-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>asm-api</artifactId>
-                  <version>9.7-33.v4d23ef79fcc8</version>
+                  <version>9.7.1-95.v9f552033802a_</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>