root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x 

Closes gh-24783
This commit is contained in:
Andy Wilkinson 2021-01-12 14:17:24 +00:00
parent a5dbe3091b 5a02996eca
commit 139152ccce
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/ReleaseTrainDependencyVersion.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -48,7 +48,7 @@ final class ReleaseTrainDependencyVersion implements DependencyVersion {
@Override @Override
public int compareTo(DependencyVersion other) { public int compareTo(DependencyVersion other) {
if (!(other instanceof ReleaseTrainDependencyVersion)) { if (!(other instanceof ReleaseTrainDependencyVersion)) {
return 0; return -1;
} }
ReleaseTrainDependencyVersion otherReleaseTrain = (ReleaseTrainDependencyVersion) other; ReleaseTrainDependencyVersion otherReleaseTrain = (ReleaseTrainDependencyVersion) other;
int comparison = this.releaseTrain.compareTo(otherReleaseTrain.releaseTrain); int comparison = this.releaseTrain.compareTo(otherReleaseTrain.releaseTrain);

10
buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/ReleaseTrainDependencyVersionTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -107,6 +107,14 @@ public class ReleaseTrainDependencyVersionTests {
assertThat(version("Kay-SR6").isSameMinorAndNewerThan(calendarVersion("2020.0.0"))).isFalse(); assertThat(version("Kay-SR6").isSameMinorAndNewerThan(calendarVersion("2020.0.0"))).isFalse();
} }
@Test
void whenComparedWithADifferentDependencyVersionTypeThenTheResultsAreNonZero() {
ReleaseTrainDependencyVersion dysprosium = ReleaseTrainDependencyVersion.parse("Dysprosium-SR16");
ArtifactVersionDependencyVersion twentyTwenty = ArtifactVersionDependencyVersion.parse("2020.0.0");
assertThat(dysprosium.compareTo(twentyTwenty)).isLessThan(0);
assertThat(twentyTwenty.compareTo(dysprosium)).isGreaterThan(0);
}
private static ReleaseTrainDependencyVersion version(String input) { private static ReleaseTrainDependencyVersion version(String input) {
return ReleaseTrainDependencyVersion.parse(input); return ReleaseTrainDependencyVersion.parse(input);
} }