Skip to content

Commit 7d95684

Browse files
committed
Include related tickets in changelog.
1 parent 45cc490 commit 7d95684

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/main/java/org/springframework/data/release/issues/TicketReference.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ public boolean isIssue() {
6262
return getReference() == Reference.Ticket;
6363
}
6464

65+
public boolean isRelated() {
66+
return getReference() == Reference.Related;
67+
}
68+
6569
public boolean isPullRequest() {
6670
return getReference() == Reference.PullRequest;
6771
}

src/main/java/org/springframework/data/release/issues/github/ChangelogGenerator.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import lombok.Getter;
2020

21-
import java.util.Arrays;
2221
import java.util.Collections;
2322
import java.util.Comparator;
2423
import java.util.HashSet;
@@ -30,8 +29,6 @@
3029
import java.util.regex.Pattern;
3130
import java.util.stream.Collectors;
3231

33-
import org.springframework.stereotype.Component;
34-
3532
/**
3633
* Generates a changelog markdown file which includes bug fixes, enhancements and contributors for a given milestone.
3734
*
@@ -81,7 +78,8 @@ private String generateContent(List<ChangeItem> issues,
8178
BiFunction<ChangelogSection, String, String> sectionContentPostProcessor, boolean includeIssueNumbers) {
8279
StringBuilder content = new StringBuilder();
8380
addSectionContent(content,
84-
this.sections.collate(issues.stream().filter(it -> it.getReference().isIssue()).map(ChangeItem::getIssue).collect(Collectors.toList())),
81+
this.sections.collate(issues.stream().filter(it -> it.getReference().isIssue() || it.getReference().isRelated())
82+
.map(ChangeItem::getIssue).collect(Collectors.toList())),
8583
sectionContentPostProcessor, includeIssueNumbers);
8684
Set<GitHubUser> contributors = getContributors(issues);
8785
if (!contributors.isEmpty()) {

0 commit comments

Comments
 (0)