From ea703dc4d5c99b46b033bd25f84507c6eb16df59 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 31 Mar 2021 08:51:25 +0200 Subject: [PATCH] Consider all pre-releases for minor/major dependency upgrades. Closes #181 --- .../dependency/DependencyOperations.java | 4 ++-- .../DependencyOperationsUnitTests.java | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/dependency/DependencyOperations.java b/release-tools/src/main/java/org/springframework/data/release/dependency/DependencyOperations.java index 50414fb..1c41388 100644 --- a/release-tools/src/main/java/org/springframework/data/release/dependency/DependencyOperations.java +++ b/release-tools/src/main/java/org/springframework/data/release/dependency/DependencyOperations.java @@ -253,7 +253,7 @@ public class DependencyOperations { return availableVersions.stream().filter(it -> { - if (!iteration.isMilestone() && StringUtils.hasText(it.getModifier())) { + if (iteration.isPublic() && StringUtils.hasText(it.getModifier())) { return false; } @@ -268,7 +268,7 @@ public class DependencyOperations { return availableVersions.stream().filter(it -> { - if (!iteration.isMilestone() && StringUtils.hasText(it.getModifier())) { + if (iteration.isPublic() && StringUtils.hasText(it.getModifier())) { return false; } diff --git a/release-tools/src/test/java/org/springframework/data/release/dependency/DependencyOperationsUnitTests.java b/release-tools/src/test/java/org/springframework/data/release/dependency/DependencyOperationsUnitTests.java index c3629b7..d700fcd 100644 --- a/release-tools/src/test/java/org/springframework/data/release/dependency/DependencyOperationsUnitTests.java +++ b/release-tools/src/test/java/org/springframework/data/release/dependency/DependencyOperationsUnitTests.java @@ -115,7 +115,7 @@ class DependencyOperationsUnitTests { } @Test - void shouldSkipMilestoneVersionForNonMilestoneIteration() { + void shouldReportMilestoneVersionForRCIteration() { List availableVersions = Stream.of("5.7.0", "5.7.1", "5.7.2-M2") // .map(DependencyVersion::of) // @@ -125,6 +125,22 @@ class DependencyOperationsUnitTests { DependencyUpgradeProposal proposal = DependencyOperations.getDependencyUpgradeProposal(Iteration.RC1, DependencyVersion.of("5.7.1"), availableVersions); + assertThat(proposal.getLatest()).extracting(DependencyVersion::getIdentifier).isEqualTo("5.7.2-M2"); + assertThat(proposal.getProposal()).extracting(DependencyVersion::getIdentifier).isEqualTo("5.7.2-M2"); + assertThat(proposal.getNewerVersions()).extracting(DependencyVersion::getIdentifier).containsExactly("5.7.2-M2"); + } + + @Test + void shouldSkipMilestoneVersionForNonMilestoneIteration() { + + List availableVersions = Stream.of("5.7.0", "5.7.1", "5.7.2-M2") // + .map(DependencyVersion::of) // + .sorted() // + .collect(Collectors.toList()); + + DependencyUpgradeProposal proposal = DependencyOperations.getDependencyUpgradeProposal(Iteration.GA, + DependencyVersion.of("5.7.1"), availableVersions); + assertThat(proposal.getLatest()).extracting(DependencyVersion::getIdentifier).isEqualTo("5.7.1"); assertThat(proposal.getProposal()).extracting(DependencyVersion::getIdentifier).isEqualTo("5.7.1"); assertThat(proposal.getNewerVersions()).extracting(DependencyVersion::getIdentifier).containsExactly("5.7.2-M2");