From 5ea9c741c80a039d19e646d33d5518937fb16450 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 10 Dec 2024 13:00:57 -0800 Subject: [PATCH 1/2] Don't duplicate lines when issue has release notes link --- .../springframework/boot/build/bom/bomr/MoveToSnapshots.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java index dde8daabc0..2981277eb2 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java @@ -87,7 +87,9 @@ 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()); } From 709b9bb149721652fd82a6c56fa049190d3bdd19 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 10 Dec 2024 13:19:53 -0800 Subject: [PATCH 2/2] Allow Jackson to escape new line chars when BOMR adds issues Remove the escaping logic when building the issue body so that Jackson can perform the actual escaping. Prior to this commit, the message body was double escaped. Closes gh-43479 --- .../springframework/boot/build/bom/bomr/MoveToSnapshots.java | 2 +- .../org/springframework/boot/build/bom/bomr/UpgradeBom.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java index 2981277eb2..f047598731 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/MoveToSnapshots.java @@ -93,7 +93,7 @@ public abstract class MoveToSnapshots extends UpgradeDependencies { if (existingUpgrade != null) { lines.add("Supersedes #" + existingUpgrade.getNumber()); } - return String.join("\\r\\n\\r\\n", lines); + return String.join("\n\n", lines); } @Override diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java index 31db135268..b78628629d 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java @@ -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); } }