Make sure the TestResourceManager is closed before the CL is closed

core/deployment/src/main/java/io/quarkus/runner/bootstrap/StartupActionImpl.java

@@ -11,6 +11,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,6 +53,7 @@ public class StartupActionImpl implements StartupAction {
     private final String applicationClassName;
     private final Map<String, String> devServicesProperties;
     private final List<RuntimeApplicationShutdownBuildItem> runtimeApplicationShutdownBuildItems;
+    private final List<Closeable> runtimeCloseTasks = new ArrayList<>();
 
     public StartupActionImpl(CuratedApplication curatedApplication, BuildResult buildResult) {
         this.curatedApplication = curatedApplication;
@@ -125,6 +127,13 @@ public void run() {
                                 log.error("Failed to run close task", t);
                             }
                         }
+                        for (var closeTask : runtimeCloseTasks) {
+                            try {
+                                closeTask.close();
+                            } catch (Throwable t) {
+                                log.error("Failed to run close task", t);
+                            }
+                        }
                     }
                 }
             }, "Quarkus Main Thread");
@@ -168,6 +177,11 @@ public void run() {
         }
     }
 
+    @Override
+    public void addRuntimeCloseTask(Closeable closeTask) {
+        this.runtimeCloseTasks.add(closeTask);
+    }
+
     private void doClose() {
         try {
             runtimeClassLoader.loadClass(Quarkus.class.getName()).getMethod("blockingExit").invoke(null);
@@ -234,6 +248,13 @@ public void run() {
             }
             return result.get();
         } finally {
+            for (var closeTask : runtimeCloseTasks) {
+                try {
+                    closeTask.close();
+                } catch (Throwable t) {
+                    log.error("Failed to run close task", t);
+                }
+            }
             runtimeClassLoader.close();
             Thread.currentThread().setContextClassLoader(old);
             for (var i : runtimeApplicationShutdownBuildItems) {
@@ -294,6 +315,13 @@ public void close() throws IOException {
                             // (e.g. ServiceLoader calls)
                             Thread.currentThread().setContextClassLoader(runtimeClassLoader);
                             closeTask.close();
+                            for (var closeTask : runtimeCloseTasks) {
+                                try {
+                                    closeTask.close();
+                                } catch (Throwable t) {
+                                    log.error("Failed to run close task", t);
+                                }
+                            }
                         } finally {
                             Thread.currentThread().setContextClassLoader(original);
                             runtimeClassLoader.close();

independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java

@@ -1,5 +1,6 @@
 package io.quarkus.bootstrap.app;
 
+import java.io.Closeable;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -31,4 +32,6 @@ public interface StartupAction {
      */
     int runMainClassBlocking(String... args) throws Exception;
 
+    void addRuntimeCloseTask(Closeable closeTask);
+
 }

test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java

@@ -237,6 +237,7 @@ public Thread newThread(Runnable r) {
             Map<String, String> properties = (Map<String, String>) testResourceManager.getClass().getMethod("start")
                     .invoke(testResourceManager);
             startupAction.overrideConfig(properties);
+            startupAction.addRuntimeCloseTask(testResourceManager);
             hasPerTestResources = (boolean) testResourceManager.getClass().getMethod("hasPerTestResources")
                     .invoke(testResourceManager);
 
@@ -276,7 +277,6 @@ public Thread newThread(Runnable r) {
             RestorableSystemProperties restorableSystemProperties = RestorableSystemProperties.setProperties(
                     Collections.singletonMap("test.url", TestHTTPResourceManager.getUri(runningQuarkusApplication)));
 
-            Closeable tm = testResourceManager;
             Closeable shutdownTask = new Closeable() {
                 @Override
                 public void close() throws IOException {
@@ -292,12 +292,8 @@ public void close() throws IOException {
                                 shutdownTasks.pop().run();
                             }
                         } finally {
-                            try {
-                                tm.close();
-                            } finally {
-                                restorableSystemProperties.close();
-                                shutdownHangDetection();
-                            }
+                            restorableSystemProperties.close();
+                            shutdownHangDetection();
                         }
                         try {
                             TestClassIndexer.removeIndex(requiredTestClass);
@@ -1233,23 +1229,15 @@ protected void doClose() throws IOException {
                 Thread.currentThread().setContextClassLoader(runningQuarkusApplication.getClassLoader());
             }
             try {
+                // this will close the application, the test resources, the class loader...
                 resource.close();
             } catch (Throwable e) {
                 log.error("Failed to shutdown Quarkus", e);
             } finally {
                 runningQuarkusApplication = null;
                 clonePattern = null;
-                try {
-                    if (QuarkusTestExtension.this.originalCl != null) {
-                        setCCL(QuarkusTestExtension.this.originalCl);
-                    }
-                    testResourceManager.close();
-                } catch (Exception e) {
-                    log.error("Failed to shutdown Quarkus test resources", e);
-                } finally {
-                    Thread.currentThread().setContextClassLoader(old);
-                    ConfigProviderResolver.setInstance(null);
-                }
+                Thread.currentThread().setContextClassLoader(old);
+                ConfigProviderResolver.setInstance(null);
             }
         }
     }