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

Merge branch '3.2.x' into 3.3.x 

Closes gh-42783
This commit is contained in:
Andy Wilkinson 2024-10-18 12:55:25 +01:00
parent 66fd0b179a 706f30838b
commit 2a60a967bd
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ package org.springframework.boot.build.bom.bomr;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -52,7 +53,12 @@ public final class InteractiveUpgradeResolver implements UpgradeResolver {
} }
List<LibraryWithVersionOptions> libraryUpdates = this.libraryUpdateResolver List<LibraryWithVersionOptions> libraryUpdates = this.libraryUpdateResolver
.findLibraryUpdates(librariesToUpgrade, librariesByName); .findLibraryUpdates(librariesToUpgrade, librariesByName);
return libraryUpdates.stream().map(this::resolveUpgrade).filter(Objects::nonNull).toList(); try {
return libraryUpdates.stream().map(this::resolveUpgrade).filter(Objects::nonNull).toList();
}
catch (UpgradesInterruptedException ex) {
return Collections.emptyList();
}
} }
private Upgrade resolveUpgrade(LibraryWithVersionOptions libraryWithVersionOptions) { private Upgrade resolveUpgrade(LibraryWithVersionOptions libraryWithVersionOptions) {
@ -69,8 +75,15 @@ public final class InteractiveUpgradeResolver implements UpgradeResolver {
options.addAll(libraryWithVersionOptions.getVersionOptions()); options.addAll(libraryWithVersionOptions.getVersionOptions());
return questions.selectOption(question, options, defaultOption); return questions.selectOption(question, options, defaultOption);
}).get(); }).get();
if (this.userInputHandler.interrupted()) {
throw new UpgradesInterruptedException();
}
return (selected.equals(defaultOption)) ? null return (selected.equals(defaultOption)) ? null
: new Upgrade(libraryWithVersionOptions.getLibrary(), selected.getVersion()); : new Upgrade(libraryWithVersionOptions.getLibrary(), selected.getVersion());
} }
static class UpgradesInterruptedException extends RuntimeException {
}
} }