Merge branch '3.2.x'

wilkinsona · wilkinsona · commit be35e5e997c9 · 2024-07-12T16:00:40.000+01:00
Closes gh-41473
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/ArtifactVersionDependencyVersion.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/ArtifactVersionDependencyVersion.java
@@ -81,6 +81,9 @@ private boolean isSameMinor(ArtifactVersionDependencyVersion other) {
 
 	@Override
 	public boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots) {
+		if (candidate instanceof MultipleComponentsDependencyVersion) {
+			return super.isUpgrade(candidate, movingToSnapshots);
+		}
 		if (!(candidate instanceof ArtifactVersionDependencyVersion)) {
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,9 @@ private boolean isSameMinor(ArtifactVersionDependencyVersion other) {`
`81`	`81`
`82`	`82`	`@Override`
`83`	`83`	`public boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots) {`
	`84`	`+ if (candidate instanceof MultipleComponentsDependencyVersion) {`
	`85`	`+ return super.isUpgrade(candidate, movingToSnapshots);`
	`86`	`+ }`
`84`	`87`	`if (!(candidate instanceof ArtifactVersionDependencyVersion)) {`
`85`	`88`	`return false;`
`86`	`89`	`}`