Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider all pre-releases for minor/major dependency upgrades.

Browse Source 
Closes #181
This commit is contained in:
Mark Paluch
2021-03-31 08:51:25 +02:00
parent e2d7b527ab
commit ea703dc4d5
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release-tools/src/main/java/org/springframework/data/release/dependency/DependencyOperations.java
View File

@@ -253,7 +253,7 @@ public class DependencyOperations {
return availableVersions.stream().filter(it -> { return availableVersions.stream().filter(it -> {
if (!iteration.isMilestone() && StringUtils.hasText(it.getModifier())) { if (iteration.isPublic() && StringUtils.hasText(it.getModifier())) {
return false; return false;
} }
@@ -268,7 +268,7 @@ public class DependencyOperations {
return availableVersions.stream().filter(it -> { return availableVersions.stream().filter(it -> {
if (!iteration.isMilestone() && StringUtils.hasText(it.getModifier())) { if (iteration.isPublic() && StringUtils.hasText(it.getModifier())) {
return false; return false;
} }

18
release-tools/src/test/java/org/springframework/data/release/dependency/DependencyOperationsUnitTests.java
View File

@@ -115,7 +115,7 @@ class DependencyOperationsUnitTests {
} }
@Test @Test
void shouldSkipMilestoneVersionForNonMilestoneIteration() { void shouldReportMilestoneVersionForRCIteration() {
List<DependencyVersion> availableVersions = Stream.of("5.7.0", "5.7.1", "5.7.2-M2") // List<DependencyVersion> availableVersions = Stream.of("5.7.0", "5.7.1", "5.7.2-M2") //
.map(DependencyVersion::of) // .map(DependencyVersion::of) //
@@ -125,6 +125,22 @@ class DependencyOperationsUnitTests {
DependencyUpgradeProposal proposal = DependencyOperations.getDependencyUpgradeProposal(Iteration.RC1, DependencyUpgradeProposal proposal = DependencyOperations.getDependencyUpgradeProposal(Iteration.RC1,
DependencyVersion.of("5.7.1"), availableVersions); 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<DependencyVersion> 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.getLatest()).extracting(DependencyVersion::getIdentifier).isEqualTo("5.7.1");
assertThat(proposal.getProposal()).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"); assertThat(proposal.getNewerVersions()).extracting(DependencyVersion::getIdentifier).containsExactly("5.7.2-M2");