From db45b4247c7b129119cbf13a7790227c0e9bffaf Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Jan 2022 15:51:09 +0100 Subject: [PATCH] Polishing. Refine commit message keywords, fall back to main as the changelog lower bound. See #194 --- .../springframework/data/release/git/GitOperations.java | 9 ++++++++- .../data/release/git/ParsedCommitMessage.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java index 5a0cf7d..f51bfd4 100644 --- a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java +++ b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java @@ -488,7 +488,14 @@ public class GitOperations { Optional fromTag = tags.filter(iteration.getTrain()).findTag(iteration.getIteration()); - Tag tag = fromTag.get(); + if (!fromTag.isPresent()) { + + // fall back to main + return repo.parseCommit(repo.resolve(Branch.MAIN.toString())); + } + + Tag tag = fromTag.orElseThrow(() -> new IllegalStateException( + String.format("Cannot determine from tag for %s %s", project.getName(), iteration))); return repo.parseCommit(repo.resolve(tag.getName())); } diff --git a/release-tools/src/main/java/org/springframework/data/release/git/ParsedCommitMessage.java b/release-tools/src/main/java/org/springframework/data/release/git/ParsedCommitMessage.java index ba5e88d..d5d6124 100644 --- a/release-tools/src/main/java/org/springframework/data/release/git/ParsedCommitMessage.java +++ b/release-tools/src/main/java/org/springframework/data/release/git/ParsedCommitMessage.java @@ -45,7 +45,7 @@ class ParsedCommitMessage { private static final Pattern GITHUB_TICKET = Pattern.compile("((?>#|gh-)\\d+)"); private static final Pattern GITHUB_CLOSE_SYNTAX = Pattern.compile( - "(?>closes|closed|close|fixes|fixed|fix|resolves|resolved|resolve|see)[\\s:]*((?>#|gh-)\\d+)", + "(?>closes|closed|close|fixes|fixed|fix|resolves|resolved|resolve|see|related to)[\\s:]*((?>#|gh-)\\d+)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); private static final Pattern GITHUB_PREFIX_SYNTAX = Pattern.compile("^(#\\d+)");