Merge branch '4.0.x'

Closes gh-50637

Author: snicoll

buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java

@@ -141,17 +141,18 @@ private Stream<EvaluationResult> evaluate(JavaClasses javaClasses) {
 
 	private void withCompileClasspath(Callable<?> callable) throws Exception {
 		ClassLoader previous = Thread.currentThread().getContextClassLoader();
-		try {
-			List<URL> urls = new ArrayList<>();
-			for (File file : getCompileClasspath().getFiles()) {
-				urls.add(file.toURI().toURL());
-			}
-			ClassLoader classLoader = new URLClassLoader(urls.toArray(new URL[0]), getClass().getClassLoader());
-			Thread.currentThread().setContextClassLoader(classLoader);
-			callable.call();
+		List<URL> urls = new ArrayList<>();
+		for (File file : getCompileClasspath().getFiles()) {
+			urls.add(file.toURI().toURL());
 		}
-		finally {
-			Thread.currentThread().setContextClassLoader(previous);
+		try (URLClassLoader classLoader = new URLClassLoader(urls.toArray(new URL[0]), getClass().getClassLoader())) {
+			Thread.currentThread().setContextClassLoader(classLoader);
+			try {
+				callable.call();
+			}
+			finally {
+				Thread.currentThread().setContextClassLoader(previous);
+			}
 		}
 	}