From 3aa9d7b4c7ebe06846a532a939e8879607c42678 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 25 Oct 2017 10:25:58 +0200 Subject: [PATCH] Fixed release notes generation; fixes #53 --- .../cloud/release/internal/git/GithubMilestones.java | 4 +++- .../src/main/resources/templates/notes.hbs | 2 +- .../cloud/release/internal/git/GithubMilestonesTests.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubMilestones.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubMilestones.java index bed2a372..43621546 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubMilestones.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubMilestones.java @@ -96,7 +96,9 @@ class GithubMilestones { try { URL url = foundMilestoneUrl(foundMilestone); log.info("Found a matching milestone with issues URL [{}]", url); - return url.toString().replace("https://api.github.com/repos", "https://github.com") + "?closed=1"; + return url.toString() + .replace("https://api.github.com/repos", "https://github.com") + .replace("milestones", "milestone")+ "?closed=1"; } catch (IOException e) { throw new IllegalStateException(e); diff --git a/spring-cloud-release-tools-core/src/main/resources/templates/notes.hbs b/spring-cloud-release-tools-core/src/main/resources/templates/notes.hbs index 3304b909..d89adbb3 100644 --- a/spring-cloud-release-tools-core/src/main/resources/templates/notes.hbs +++ b/spring-cloud-release-tools-core/src/main/resources/templates/notes.hbs @@ -2,5 +2,5 @@ {{ date }} -{{#each projects}} - {{name}} `{{version}}` ([issues]({{ closedMilestoneUrl }})) +{{#each projects}} - {{name}} `{{version}}` {{#if closedMilestoneUrl}}([issues]({{ closedMilestoneUrl }})){{/if}} {{/each}} \ No newline at end of file diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GithubMilestonesTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GithubMilestonesTests.java index 530f8e52..410cec72 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GithubMilestonesTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GithubMilestonesTests.java @@ -118,7 +118,7 @@ public class GithubMilestonesTests { String url = milestones.milestoneUrl(gaSleuthProject()); - then(url).isEqualTo("https://github.com/spring-cloud/spring-cloud-sleuth/milestones/33?closed=1"); + then(url).isEqualTo("https://github.com/spring-cloud/spring-cloud-sleuth/milestone/33?closed=1"); } @Test