root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into 2.5.x

This commit is contained in:
Phillip Webb 2021-06-23 17:27:46 -07:00
parent af37f59136 63ed921554
commit fd83158fa5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -49,12 +49,9 @@ public class Library {
* Create a new {@link Library}. * Create a new {@link Library}.
* @param file the source file * @param file the source file
* @param scope the scope of the library * @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) { public Library(File file, LibraryScope scope) {
this(file, scope, false); this(null, file, scope, null, false, false, true);
} }
/** /**