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 

Closes gh-27497
This commit is contained in:
Andy Wilkinson 2021-07-26 15:36:52 +01:00
parent 04dc62904f ea6cb74ccf
commit 9127588082
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/InteractiveUpgradeResolver.java
View File

@ -69,8 +69,9 @@ public final class InteractiveUpgradeResolver implements UpgradeResolver {
for (Library library : libraries) { for (Library library : libraries) {
librariesByName.put(library.getName(), library); librariesByName.put(library.getName(), library);
} }
return libraries.stream().map((library) -> resolveUpgrade(library, librariesByName)) return libraries.stream().filter((library) -> !library.getName().equals("Spring Boot"))
.filter((upgrade) -> upgrade != null).collect(Collectors.toList()); .map((library) -> resolveUpgrade(library, librariesByName)).filter((upgrade) -> upgrade != null)
.collect(Collectors.toList());
} }
private Upgrade resolveUpgrade(Library library, Map<String, Library> libraries) { private Upgrade resolveUpgrade(Library library, Map<String, Library> libraries) {