Merge branch '3.4.x' into 3.5.x

Closes gh-48061

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java

@@ -279,16 +279,26 @@ public void stop() throws WebServerException {
 			}
 			try {
 				this.undertow.stop();
-				for (Closeable closeable : this.closeables) {
-					closeable.close();
-				}
 			}
 			catch (Exception ex) {
 				throw new WebServerException("Unable to stop Undertow", ex);
 			}
 		}
 	}
 
+	@Override
+	public void destroy() {
+		stop();
+		try {
+			for (Closeable closeable : this.closeables) {
+				closeable.close();
+			}
+		}
+		catch (IOException ex) {
+			throw new WebServerException("Unable to destroy Undertow", ex);
+		}
+	}
+
 	@Override
 	public int getPort() {
 		List<Port> ports = getActualPorts();

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java

@@ -255,18 +255,6 @@ protected void portClashOfSecondaryConnectorResultsInPortInUseException() throws
 		super.portClashOfSecondaryConnectorResultsInPortInUseException();
 	}
 
-	@Test
-	@Override
-	@Disabled("Restart after stop is not supported with Undertow")
-	protected void restartAfterStop() {
-	}
-
-	@Test
-	@Override
-	@Disabled("Undertow's architecture prevents separating stop and destroy")
-	protected void servletContextListenerContextDestroyedIsNotCalledWhenContainerIsStopped() {
-	}
-
 	private void testAccessLog(String prefix, String suffix, String expectedFile)
 			throws IOException, URISyntaxException {
 		UndertowServletWebServerFactory factory = getFactory();