From b1a30f90b5ef09bc361a14e93809785d5520fa9d Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 17 Nov 2023 10:45:32 +0100 Subject: [PATCH] Mention all changes for GA releases on GitHub release page. Closes #70 --- .../org/springframework/data/release/git/GitOperations.java | 6 +++++- .../data/release/git/GitOperationsIntegrationTests.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/release/git/GitOperations.java b/src/main/java/org/springframework/data/release/git/GitOperations.java index 6968fa7..ac1918d 100644 --- a/src/main/java/org/springframework/data/release/git/GitOperations.java +++ b/src/main/java/org/springframework/data/release/git/GitOperations.java @@ -436,7 +436,7 @@ public class GitOperations { Assert.notNull(trainIteration, "TrainIteration must not be null!"); - if (trainIteration.getIteration().isMilestone() && trainIteration.getIteration().getIterationValue() == 1) { + if (isGaOrFirstMilestone(trainIteration.getIteration())) { Train trainToUse = getPreviousTrain(trainIteration); return trainToUse.getIteration(Iteration.GA); @@ -546,6 +546,10 @@ public class GitOperations { return trainToUse; } + private static boolean isGaOrFirstMilestone(Iteration iteration) { + return iteration.isGAIteration() || (iteration.isMilestone() && iteration.getIterationValue() == 1); + } + private Stream getRemoteBranches(Project project) { return doWithGit(project, git -> { diff --git a/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java b/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java index 535304f..867d3cd 100644 --- a/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java @@ -84,8 +84,8 @@ class GitOperationsIntegrationTests extends AbstractIntegrationTests { TrainIteration hopperRc1 = gitOperations.getPreviousIteration(ReleaseTrains.HOPPER.getIteration(Iteration.GA)); - assertThat(hopperRc1.getTrain()).isEqualTo(ReleaseTrains.HOPPER); - assertThat(hopperRc1.getIteration()).isEqualTo(Iteration.RC1); + assertThat(hopperRc1.getTrain()).isEqualTo(ReleaseTrains.GOSLING); + assertThat(hopperRc1.getIteration()).isEqualTo(Iteration.GA); TrainIteration hopperM1 = gitOperations.getPreviousIteration(ReleaseTrains.HOPPER.getIteration(Iteration.RC1));