Merge branch '2.5.x' into 2.6.x

This commit is contained in:
Phillip Webb
2022-05-17 21:48:50 -07:00
14 changed files with 37 additions and 43 deletions

View File

@@ -91,7 +91,7 @@ class WarPluginAction implements PluginApplicationAction {
.convention(resolveMainClassName.flatMap((resolver) -> manifestStartClass.isPresent()
? manifestStartClass : resolveMainClassName.get().readMainClassName()));
});
bootWarProvider.map((bootWar) -> bootWar.getClasspath());
bootWarProvider.map(War::getClasspath);
return bootWarProvider;
}