mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.4.x' into 2.5.x
Closes gh-27497
This commit is contained in:
commit
9127588082
@ -69,8 +69,9 @@ public final class InteractiveUpgradeResolver implements UpgradeResolver {
|
||||
for (Library library : libraries) {
|
||||
librariesByName.put(library.getName(), library);
|
||||
}
|
||||
return libraries.stream().map((library) -> resolveUpgrade(library, librariesByName))
|
||||
.filter((upgrade) -> upgrade != null).collect(Collectors.toList());
|
||||
return libraries.stream().filter((library) -> !library.getName().equals("Spring Boot"))
|
||||
.map((library) -> resolveUpgrade(library, librariesByName)).filter((upgrade) -> upgrade != null)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private Upgrade resolveUpgrade(Library library, Map<String, Library> libraries) {
|
||||
|
Loading…
Reference in New Issue
Block a user