SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing the way calver release train version is updated; fixes gh-253

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-05-26 17:45:36 +02:00
parent b3c4ef2cdc
commit 6c2de37f1f
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
releaser-core/src/main/java/releaser/internal/project/ProjectVersion.java
View File

@@ -173,7 +173,7 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
}
private SplitVersion bumpedVersion(SplitVersion splitVersion) {
if (splitVersion.isReleaseTrain()) {
if (splitVersion.isReleaseTrain() && !splitVersion.isCalverReleaseTrain()) {
return splitVersion;
}
return splitVersion.fullVersionWithIncrementedPatch();
@@ -191,7 +191,7 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
throw new IllegalStateException("Version can't end with a delimiter!");
}
SplitVersion splitByHyphen = tryHyphenSeparatedVersion(version);
if (splitByHyphen != null && !splitByHyphen.calverReleaseTrain()) {
if (splitByHyphen != null) {
return splitByHyphen;
}
return dotSeparatedReleaseTrainsAndVersions(version);
@@ -310,11 +310,11 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
}
public boolean isCalver() {
return this.assertVersion().calverReleaseTrain();
return this.assertVersion().isCalverReleaseTrain();
}
public String majorAndMinor() {
return this.assertVersion().major + this.assertVersion().delimiter + this.assertVersion().minor;
return this.assertVersion().major + "." + this.assertVersion().minor;
}
/**
@@ -741,10 +741,10 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
// 2020.0.0-SNAPSHOT or Hoxton-BUILD-SNAPSHOT or 2020.x.x
private boolean isReleaseTrain() {
return isOldReleaseTrain() || calverReleaseTrain();
return isOldReleaseTrain() || isCalverReleaseTrain();
}
public boolean calverReleaseTrain() {
public boolean isCalverReleaseTrain() {
try {
return Integer.parseInt(this.major) >= 2020;
}

7
releaser-core/src/test/java/releaser/internal/buildsystem/ProjectVersionTests.java
View File

@@ -200,6 +200,13 @@ public class ProjectVersionTests {
then(projectVersion(version).postReleaseSnapshotVersion()).isEqualTo("1.0.2-SNAPSHOT");
}
@Test
public void should_bump_version_by_patch_version_when_bumping_releases_with_new_notation() {
String version = "2021.0.0";
then(projectVersion(version).postReleaseSnapshotVersion()).isEqualTo("2021.0.1-SNAPSHOT");
}
@Test
public void should_bump_version_by_patch_version_when_bumping_releases_with_hyphen() {
String version = "1.0.1-RELEASE";