Merge branch '2.3.x' into 2.4.x

Closes gh-26747

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -131,11 +131,7 @@ private static URL toURL(String entry) {
 	}
 
 	private static boolean isManifestOnlyJar(URL url) {
-		return isSurefireBooterJar(url) || isShortenedIntelliJJar(url);
-	}
-
-	private static boolean isSurefireBooterJar(URL url) {
-		return url.getPath().contains("surefirebooter");
+		return isShortenedIntelliJJar(url);
 	}
 
 	private static boolean isShortenedIntelliJJar(URL url) {