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

#163 - Report correct calver to Sagan.

Browse Source
This commit is contained in:
Mark Paluch
2020-12-08 08:32:42 +01:00
parent 59acd5e240
commit d56cb53182
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/release/model/DocumentationMetadata.java
View File

@@ -65,10 +65,12 @@ public class DocumentationMetadata {
if (train.usesCalver()) { if (train.usesCalver()) {
if (version.isBugFixVersion() || version.isReleaseVersion()) { if (version.isBugFixVersion() || version.isReleaseVersion()) {
return train.getCalver().toMajorMinorBugfix(); return train.getCalver().withBugfix(version.getVersion().getBugfix()).toMajorMinorBugfix();
} }
return String.format("%s-%s", train.getCalver().toMajorMinorBugfix(), version.getReleaseTrainSuffix()); return String.format("%s-%s",
train.getCalver().withBugfix(version.getVersion().getBugfix()).toMajorMinorBugfix(),
version.getReleaseTrainSuffix());
} }
return String.format("%s-%s", train.getName(), return String.format("%s-%s", train.getName(),