From a366895fe2f3072b1e83057847033e1bf73729ef Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 17 Apr 2023 10:44:31 +0200 Subject: [PATCH] Fix milestone lookup for release project. See #37 --- .../data/release/issues/IssueTrackerCommands.java | 4 ++-- .../data/release/issues/github/Milestone.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java b/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java index 2e39a79..beb7a45 100644 --- a/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java +++ b/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java @@ -97,7 +97,7 @@ public class IssueTrackerCommands extends TimedCommand { @CliCommand(value = "tracker setup-next") public String trackerSetupNext(@CliOption(key = "", mandatory = true) TrainIteration iteration) { - jiraCreateReleaseVersions(iteration); + createReleaseVersions(iteration); return createReleaseTickets(iteration); } @@ -116,7 +116,7 @@ public class IssueTrackerCommands extends TimedCommand { } @CliCommand(value = "tracker create releaseversions") - public void jiraCreateReleaseVersions(@CliOption(key = "", mandatory = true) TrainIteration iteration) { + public void createReleaseVersions(@CliOption(key = "", mandatory = true) TrainIteration iteration) { run(executor, withReleaseProject(iteration), module -> getTrackerFor(module).createReleaseVersion(module)); } diff --git a/src/main/java/org/springframework/data/release/issues/github/Milestone.java b/src/main/java/org/springframework/data/release/issues/github/Milestone.java index 0358f9b..d963e7f 100644 --- a/src/main/java/org/springframework/data/release/issues/github/Milestone.java +++ b/src/main/java/org/springframework/data/release/issues/github/Milestone.java @@ -36,6 +36,11 @@ class Milestone { } public boolean matches(ModuleIteration moduleIteration) { + + if (moduleIteration.getProject().isUseShortVersionMilestones()) { + return title.equals(moduleIteration.getReleaseVersionString()); + } + return title.contains(moduleIteration.getShortVersionString()); }