From ae964df95370987b4a41e3368b6772001f5589c4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Oct 2024 15:21:12 +0100
Subject: [PATCH 1/3] [JENKINS-73917] Update dependency org.ow2.asm:asm to
 v9.7.1 (#9831)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 09fecfaff9ae42905d8bf801c2f67e60ec7cb0db)
---
 bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 541cc32a0c00..1d5fa04ce2ef 100644
--- 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>

From 6aee271284c846b0d2e9982c8572197249ffc888 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Oct 2024 14:40:36 -0600
Subject: [PATCH 2/3] [JENKINS-73917] Update dependency
 io.jenkins.plugins:asm-api to v9.7.1-95.v9f552033802a_ (#9834)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit a582fc10ac2f5499b39332af5536cb0368bda8e6)
---
 war/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/pom.xml b/war/pom.xml
index f256a95017ca..d83ca1742a18 100644
--- 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>

From c2ec4351600c62ae30efe5850a32a8fb1bb05545 Mon Sep 17 00:00:00 2001
From: Devin Nusbaum <dwnusbaum@users.noreply.github.com>
Date: Sun, 6 Oct 2024 16:41:02 -0400
Subject: [PATCH 3/3] [JENKINS-73824] Wait for Pipeline builds to complete
 before allowing their jobs to be deleted (#9790)

* Wait for Pipelines to complete before allowing their jobs to be deleted

* Create mock Job/Run classes that use AsynchronousExecution to be able to add a regression test in core

* [JENKINS-73824] Do not repeatedly interrupt executables in ItemDeletion.cancelBuildsInProgress

* [JENKINS-73824] Delete ItemDeletionTest based on https://github.com/jenkinsci/jenkins/pull/9790#discussion_r1777727008

(cherry picked from commit 4d7b993c5b6af6490af7e4ca55e6a4a57a5027a6)
---
 core/src/main/java/jenkins/model/queue/ItemDeletion.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/main/java/jenkins/model/queue/ItemDeletion.java b/core/src/main/java/jenkins/model/queue/ItemDeletion.java
index a2d954fbc459..b278f4d24c93 100644
--- 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);
             }