Merge branch '2.4.x' into 2.5.x

Author: philwebb

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/buildtoolplugins/otherbuildsystems/examplerepackageimplementation/MyBuildTool.java

@@ -37,7 +37,7 @@ public void build() throws IOException {
 	private void getLibraries(LibraryCallback callback) throws IOException {
 		// Build system specific implementation, callback for each dependency
 		for (File nestedJar : getCompileScopeJars()) {
-			callback.library(new Library(null, nestedJar, LibraryScope.COMPILE, null, false, false, true));
+			callback.library(new Library(nestedJar, LibraryScope.COMPILE));
 		}
 		// ...
 	}

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Library.java

@@ -49,12 +49,9 @@ public class Library {
 	 * Create a new {@link Library}.
 	 * @param file the source file
 	 * @param scope the scope of the library
-	 * @deprecated since 2.4.8 for removal in 2.6.0 in favor of
-	 * {@link #Library(String, File, LibraryScope, LibraryCoordinates, boolean, boolean, boolean)}
 	 */
-	@Deprecated
 	public Library(File file, LibraryScope scope) {
-		this(file, scope, false);
+		this(null, file, scope, null, false, false, true);
 	}
 
 	/**