Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source 
Closes gh-43480
This commit is contained in:
Phillip Webb
2024-12-10 13:21:33 -08:00
parent 123502b8d7 709b9bb149
commit 52992fb510
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,11 +87,13 @@ public abstract class MoveToSnapshots extends UpgradeDependencies {
if (releaseNotesLink != null) {
lines.add("Upgrade to [%s](%s).".formatted(description, releaseNotesLink));
}
lines.add("Upgrade to %s.".formatted(description));
else {
lines.add("Upgrade to %s.".formatted(description));
}
if (existingUpgrade != null) {
lines.add("Supersedes #" + existingUpgrade.getNumber());
}
return String.join("\\r\\n\\r\\n", lines);
return String.join("\n\n", lines);
}
@Override

2
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java
View File

@@ -88,7 +88,7 @@ public abstract class UpgradeBom extends UpgradeDependencies {
if (existingUpgrade != null) {
lines.add("Supersedes #" + existingUpgrade.getNumber());
}
return String.join("\\r\\n\\r\\n", lines);
return String.join("\n\n", lines);
}
}