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

Merge branch '3.2.x'

This commit is contained in:
Andy Wilkinson 2024-01-15 17:07:22 +00:00
parent 12d390d564 7b6b3a581e
commit b79d1cef7d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/StandardLibraryUpdateResolver.java
View File

@ -87,8 +87,10 @@ class StandardLibraryUpdateResolver implements LibraryUpdateResolver {
if (versionAlignment != null) {
Set<String> alignedVersions = versionAlignment.resolve();
if (alignedVersions != null && alignedVersions.size() == 1) {
return new VersionOption.AlignedVersionOption(
DependencyVersion.parse(alignedVersions.iterator().next()), versionAlignment);
DependencyVersion alignedVersion = DependencyVersion.parse(alignedVersions.iterator().next());
if (!alignedVersion.equals(library.getVersion().getVersion())) {
return new VersionOption.AlignedVersionOption(alignedVersion, versionAlignment);
}
}
}
return null;