Merge branch '2.3.x' into 2.4.x

Closes gh-26450

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java

 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -172,13 +172,9 @@ class HandlerTests {
 		TestJarCreator.createTestJar(testJar);
 		URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
 		JarURLConnection connection = (JarURLConnection) url.openConnection();
-		JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile());
-		try {
+		try (JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile())) {
 			assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
 		}
-		finally {
-			jarFile.close();
-		}
 	}
 
 	@Test
@@ -187,13 +183,9 @@ class HandlerTests {
 		TestJarCreator.createTestJar(testJar);
 		URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
 		JarURLConnection connection = (JarURLConnection) url.openConnection();
-		JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile());
-		try {
+		try (JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile())) {
 			assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
 		}
-		finally {
-			jarFile.close();
-		}
 	}
 
 	private void assertStandardAndCustomHandlerUrlsAreEqual(String context, String spec) throws MalformedURLException {

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/consumer/SampleIntegrationParentApplicationTests.java

 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,20 +49,12 @@ class SampleIntegrationParentApplicationTests {
 	void testVanillaExchange(@TempDir Path temp) throws Exception {
 		File inputDir = new File(temp.toFile(), "input");
 		File outputDir = new File(temp.toFile(), "output");
-		ConfigurableApplicationContext app = SpringApplication.run(SampleParentContextApplication.class,
-				"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir);
-		try {
-			ConfigurableApplicationContext producer = SpringApplication.run(ProducerApplication.class,
-					"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir, "World");
-			try {
+		try (ConfigurableApplicationContext app = SpringApplication.run(SampleParentContextApplication.class,
+				"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir)) {
+			try (ConfigurableApplicationContext producer = SpringApplication.run(ProducerApplication.class,
+					"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir, "World")) {
 				awaitOutputContaining(outputDir, "Hello World");
 			}
-			finally {
-				producer.close();
-			}
-		}
-		finally {
-			app.close();
 		}
 	}