Skip to content

Commit b1a30f9

Browse files
christophstroblmp911de
authored andcommitted
Mention all changes for GA releases on GitHub release page.
Closes #70
1 parent f1f37b4 commit b1a30f9

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Diff for: src/main/java/org/springframework/data/release/git/GitOperations.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ public TrainIteration getPreviousIteration(TrainIteration trainIteration) {
436436

437437
Assert.notNull(trainIteration, "TrainIteration must not be null!");
438438

439-
if (trainIteration.getIteration().isMilestone() && trainIteration.getIteration().getIterationValue() == 1) {
439+
if (isGaOrFirstMilestone(trainIteration.getIteration())) {
440440

441441
Train trainToUse = getPreviousTrain(trainIteration);
442442
return trainToUse.getIteration(Iteration.GA);
@@ -546,6 +546,10 @@ private static Train getPreviousTrain(TrainIteration trainIteration) {
546546
return trainToUse;
547547
}
548548

549+
private static boolean isGaOrFirstMilestone(Iteration iteration) {
550+
return iteration.isGAIteration() || (iteration.isMilestone() && iteration.getIterationValue() == 1);
551+
}
552+
549553
private Stream<Branch> getRemoteBranches(Project project) {
550554

551555
return doWithGit(project, git -> {

Diff for: src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ void shouldDeterminePreviousIterationFromGA() throws Exception {
8484

8585
TrainIteration hopperRc1 = gitOperations.getPreviousIteration(ReleaseTrains.HOPPER.getIteration(Iteration.GA));
8686

87-
assertThat(hopperRc1.getTrain()).isEqualTo(ReleaseTrains.HOPPER);
88-
assertThat(hopperRc1.getIteration()).isEqualTo(Iteration.RC1);
87+
assertThat(hopperRc1.getTrain()).isEqualTo(ReleaseTrains.GOSLING);
88+
assertThat(hopperRc1.getIteration()).isEqualTo(Iteration.GA);
8989

9090
TrainIteration hopperM1 = gitOperations.getPreviousIteration(ReleaseTrains.HOPPER.getIteration(Iteration.RC1));
9191

0 commit comments

Comments
 (0)