Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
5a02996e
Commit
5a02996e
authored
Jan 12, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix release train version's comparison with other version types
Fixes gh-24782
parent
c5d4ca93
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
ReleaseTrainDependencyVersion.java
...build/bom/bomr/version/ReleaseTrainDependencyVersion.java
+2
-2
ReleaseTrainDependencyVersionTests.java
.../bom/bomr/version/ReleaseTrainDependencyVersionTests.java
+9
-1
No files found.
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/ReleaseTrainDependencyVersion.java
View file @
5a02996e
/*
* Copyright 2012-202
0
the original author or authors.
* Copyright 2012-202
1
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -48,7 +48,7 @@ final class ReleaseTrainDependencyVersion implements DependencyVersion {
@Override
public
int
compareTo
(
DependencyVersion
other
)
{
if
(!(
other
instanceof
ReleaseTrainDependencyVersion
))
{
return
0
;
return
-
1
;
}
ReleaseTrainDependencyVersion
otherReleaseTrain
=
(
ReleaseTrainDependencyVersion
)
other
;
int
comparison
=
this
.
releaseTrain
.
compareTo
(
otherReleaseTrain
.
releaseTrain
);
...
...
buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/ReleaseTrainDependencyVersionTests.java
View file @
5a02996e
/*
* Copyright 2012-202
0
the original author or authors.
* Copyright 2012-202
1
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -92,6 +92,14 @@ public class ReleaseTrainDependencyVersionTests {
assertThat
(
version
(
"Kay-SR6"
).
isSameMinorAndNewerThan
(
version
(
"Kay-SR7"
))).
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
)
{
return
ReleaseTrainDependencyVersion
.
parse
(
input
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment