diff --git a/src/main/java/org/springframework/data/release/jira/JiraVersion.java b/src/main/java/org/springframework/data/release/jira/JiraVersion.java index 64a622f..5928d33 100644 --- a/src/main/java/org/springframework/data/release/jira/JiraVersion.java +++ b/src/main/java/org/springframework/data/release/jira/JiraVersion.java @@ -46,7 +46,8 @@ class JiraVersion { @Override public String toString() { - Iteration iteration = module.hasCustomFirstIteration() ? module.getCustomFirstIteration() : this.iteration; + Iteration iteration = this.iteration.isInitialIteration() && module.hasCustomFirstIteration() ? module + .getCustomFirstIteration() : this.iteration; if (iteration.isServiceIteration()) { return String.format("%s.%s (%s %s)", module.getVersion(), iteration.getBugfixValue(), train.getName(), diff --git a/src/main/java/org/springframework/data/release/model/ModuleIteration.java b/src/main/java/org/springframework/data/release/model/ModuleIteration.java index 2f55f97..91d605a 100644 --- a/src/main/java/org/springframework/data/release/model/ModuleIteration.java +++ b/src/main/java/org/springframework/data/release/model/ModuleIteration.java @@ -56,13 +56,6 @@ public class ModuleIteration implements IterationVersion { .getCustomFirstIteration() : this.iteration; } - public String getJiraVersionName() { - - Iteration iteration = module.hasCustomFirstIteration() ? module.getCustomFirstIteration() : this.iteration; - - return String.format("%s %s (%s)", module.getVersion(), iteration.getName(), train.getName()); - } - /** * Returns the {@link String} representation of the logical version of the {@link ModuleIteration}. * diff --git a/src/test/java/org/springframework/data/release/jira/JiraVersionUnitTests.java b/src/test/java/org/springframework/data/release/jira/JiraVersionUnitTests.java index 5f10ce0..71d236b 100644 --- a/src/test/java/org/springframework/data/release/jira/JiraVersionUnitTests.java +++ b/src/test/java/org/springframework/data/release/jira/JiraVersionUnitTests.java @@ -52,6 +52,15 @@ public class JiraVersionUnitTests { assertThat(version.toString(), is("1.0 M2 (Dijkstra)")); } + @Test + public void doesNotUseCustomIterationOnNonFirstiterations() { + + ModuleIteration module = ReleaseTrains.DIJKSTRA.getModuleIteration(Iteration.RC1, "Elasticsearch"); + + JiraVersion version = new JiraVersion(module); + assertThat(version.toString(), is("1.0 RC1 (Dijkstra)")); + } + private void assertIterationVersion(Iteration iteration, String expected) { ModuleIteration module = ReleaseTrains.DIJKSTRA.getModuleIteration(iteration, "Commons");