From f083aefba697433998195d41c501306b6b009058 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 10 Mar 2020 16:04:35 +0000 Subject: [PATCH] Consider plugins and imported boms when finding possible dependency upgrades Closes gh-20483 --- .../boot/build/bom/bomr/InteractiveUpgradeResolver.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/InteractiveUpgradeResolver.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/InteractiveUpgradeResolver.java index b216e9e382..ff71a617cd 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/InteractiveUpgradeResolver.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/InteractiveUpgradeResolver.java @@ -70,6 +70,14 @@ public final class InteractiveUpgradeResolver implements UpgradeResolver { moduleVersions.put(group.getId() + ":" + module.getName(), getLaterVersionsForModule(group.getId(), module.getName(), library.getVersion())); } + for (String bom : group.getBoms()) { + moduleVersions.put(group.getId() + ":" + bom, + getLaterVersionsForModule(group.getId(), bom, library.getVersion())); + } + for (String plugin : group.getPlugins()) { + moduleVersions.put(group.getId() + ":" + plugin, + getLaterVersionsForModule(group.getId(), plugin, library.getVersion())); + } } List allVersions = moduleVersions.values().stream().flatMap(SortedSet::stream).distinct() .filter((dependencyVersion) -> isPermitted(dependencyVersion, library.getProhibitedVersions()))