Merge branch '3.3.x'

Closes gh-43480

Author: philwebb

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

@@ -87,11 +87,13 @@ protected String issueBody(Upgrade upgrade, Issue existingUpgrade) {
 		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

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

@@ -88,7 +88,7 @@ protected String issueBody(Upgrade upgrade, Issue existingUpgrade) {
 		if (existingUpgrade != null) {
 			lines.add("Supersedes #" + existingUpgrade.getNumber());
 		}
-		return String.join("\\r\\n\\r\\n", lines);
+		return String.join("\n\n", lines);
 	}
 
 }