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

Fix snapshot version rollover for new release schema

Browse Source 
Not sure it will handle all cases, but at least for now anything that is 3.1.x will properly be bumped to 3.1.1-SNAPSHOT
This commit is contained in:
Oleg Zhurakousky
2020-12-21 17:53:00 +01:00
parent 959a525e75
commit e96fa93dc6
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,6 +206,27 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
int numberOfHyphens = splitByHyphens - 1;
int indexOfFirstHyphen = version.indexOf("-");
boolean buildSnapshot = version.endsWith("BUILD-SNAPSHOT");
String[] splitVersion = StringUtils.delimitedListToStringArray(version, ".");
boolean newVersionSchema = splitVersion.length == 3;
for (int i = 0; i < splitVersion.length && newVersionSchema; i++) {
try {
int v = Integer.parseInt(splitVersion[i]);
if (i == 0) {
newVersionSchema = v == 3;
}
else if (i == 1) {
newVersionSchema = v >= 1;
}
}
catch (Exception e) {
newVersionSchema = false;
}
}
if (newVersionSchema) {
SplitVersion v = SplitVersion.hyphen(splitVersion);
return v;
}
if (numberOfHyphens == 1 && !buildSnapshot
|| (numberOfHyphens > 1 && buildSnapshot)) {
// Dysprosium or 1.0.0

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

@@ -221,6 +221,10 @@ public class ProjectVersionTests {
then(projectVersion(version).postReleaseSnapshotVersion())
.isEqualTo("1.0.2-SNAPSHOT");
version = "3.1.0";
then(projectVersion(version).postReleaseSnapshotVersion())
.isEqualTo("3.1.1-SNAPSHOT");
}
@Test
@@ -286,9 +290,9 @@ public class ProjectVersionTests {
String version = "1.0.1-SR1";
then(projectVersion(version).isServiceRelease()).isTrue();
//
String newServiceReleaseVersion = "2020.0.1";
//
then(projectVersion(newServiceReleaseVersion).isServiceRelease()).isTrue();
newServiceReleaseVersion = "3.0.1";