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

New versions

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-06-04 16:38:47 +02:00
parent 33bfb552a1
commit 572332c35e
4 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
projects/spring-cloud/src/test/java/releaser/cloud/spring/single/SpringSingleProjectAcceptanceTests.java
View File

@@ -122,11 +122,11 @@ public class SpringSingleProjectAcceptanceTests
Iterator<RevCommit> iterator = commits.iterator();
tagIsPresentInOrigin(origin, "v2.1.2.RELEASE");
commitIsPresent(iterator,
"Bumping versions to 2.1.3.BUILD-SNAPSHOT after release");
"Bumping versions to 2.1.3.SNAPSHOT after release");
commitIsPresent(iterator, "Going back to snapshots");
commitIsPresent(iterator, "Update SNAPSHOT to 2.1.2.RELEASE");
pomVersionIsEqualTo(project, "2.1.3.BUILD-SNAPSHOT");
consulPomParentVersionIsEqualTo(project, "2.1.3.BUILD-SNAPSHOT");
pomVersionIsEqualTo(project, "2.1.3.SNAPSHOT");
consulPomParentVersionIsEqualTo(project, "2.1.3.SNAPSHOT");
then(gitHubHandler.closedMilestones).isTrue();
then(emailTemplate()).doesNotExist();
then(blogTemplate()).doesNotExist();
@@ -187,10 +187,10 @@ public class SpringSingleProjectAcceptanceTests
tagIsPresentInOrigin(origin, "v2.1.6.RELEASE");
// we're running against camden sc-release
commitIsPresent(iterator,
"Bumping versions to 2.1.7.BUILD-SNAPSHOT after release");
"Bumping versions to 2.1.7.SNAPSHOT after release");
commitIsPresent(iterator, "Going back to snapshots");
commitIsPresent(iterator, "Update SNAPSHOT to 2.1.6.RELEASE");
pomVersionIsEqualTo(project, "2.1.7.BUILD-SNAPSHOT");
pomVersionIsEqualTo(project, "2.1.7.SNAPSHOT");
pomParentVersionIsEqualTo(project, "spring-cloud-build-dependencies",
"2.1.6.RELEASE");
then(gitHubHandler.closedMilestones).isTrue();
@@ -249,7 +249,7 @@ public class SpringSingleProjectAcceptanceTests
Iterable<RevCommit> commits = listOfCommits(project);
tagIsPresentInOrigin(origin, "v1.2.0.RC1");
commitIsNotPresent(commits,
"Bumping versions to 1.2.1.BUILD-SNAPSHOT after release");
"Bumping versions to 1.2.1.SNAPSHOT after release");
Iterator<RevCommit> iterator = listOfCommits(project).iterator();
commitIsPresent(iterator, "Going back to snapshots");
commitIsPresent(iterator, "Update SNAPSHOT to 1.2.0.RC1");

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

@@ -611,6 +611,8 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
private static final String SNAPSHOT_SUFFIX = "SNAPSHOT";
private static final String LEGACY_SNAPSHOT_SUFFIX = "BUILD-SNAPSHOT";
final String major;
final String minor;
@@ -734,7 +736,14 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
}
private SplitVersion withSnapshot() {
return new SplitVersion(major, minor, patch, delimiter, SNAPSHOT_SUFFIX);
return new SplitVersion(major, minor, patch, delimiter, suffix());
}
private String suffix() {
if (suffix.endsWith(LEGACY_SNAPSHOT_SUFFIX)) {
return LEGACY_SNAPSHOT_SUFFIX;
}
return SNAPSHOT_SUFFIX;
}
}

4
releaser-core/src/test/java/releaser/internal/ReleaserTests.java
View File

@@ -152,8 +152,8 @@ public class ReleaserTests {
.contains("Project was successfully updated")
.contains("Successfully reverted the commit and bumped snapshot versions")
.contains("spring-boot-starter=>3.0.0.RELEASE")
.contains("spring-cloud-build=>2.0.1.BUILD-SNAPSHOT")
.contains("changed=>1.0.1.BUILD-SNAPSHOT");
.contains("spring-cloud-build=>2.0.1.SNAPSHOT")
.contains("changed=>1.0.1.SNAPSHOT");
}
@Test

12
releaser-core/src/test/java/releaser/internal/buildsystem/ProjectsTests.java
View File

@@ -78,9 +78,9 @@ public class ProjectsTests {
@Test
public void should_create_project_with_bumped_original_version_and_original_parent_versions() {
Set<ProjectVersion> projectVersions = new HashSet<>();
ProjectVersion build = new ProjectVersion("spring-cloud-build", "1.0.0.RELEASE");
ProjectVersion build = new ProjectVersion("spring-cloud-build", "1.0.0-RELEASE");
projectVersions.add(build);
ProjectVersion boot = new ProjectVersion("spring-boot-starter", "2.0.0.RELEASE");
ProjectVersion boot = new ProjectVersion("spring-boot-starter", "2.0.0-RELEASE");
projectVersions.add(boot);
ProjectVersion bootDeps = new ProjectVersion("spring-boot-dependencies",
"2.0.0.RELEASE");
@@ -94,9 +94,9 @@ public class ProjectsTests {
projects);
then(forRollback.forName("spring-cloud-build").version)
.isEqualTo("1.0.1.BUILD-SNAPSHOT");
.isEqualTo("1.0.1-SNAPSHOT");
then(forRollback.forName("spring-boot-starter").version)
.isEqualTo("2.0.0.RELEASE");
.isEqualTo("2.0.0-RELEASE");
then(forRollback.forName("spring-boot-dependencies").version)
.isEqualTo("2.0.0.RELEASE");
then(forRollback.forName("spring-cloud-starter-foo").version)
@@ -168,9 +168,9 @@ public class ProjectsTests {
then(bumped.forName("spring-boot-starter").version).isEqualTo("2.0.0.RELEASE");
then(bumped.forName("foo").version).isEqualTo("1.0.1.SNAPSHOT");
then(bumped.forName("bar").version).isEqualTo("1.0.1.SNAPSHOT");
then(bumped.forName("baz").version).isEqualTo("1.0.2.SNAPSHOT");
then(bumped.forName("baz").version).isEqualTo("1.0.2.BUILD-SNAPSHOT");
then(bumped.forName("foo2").version).isEqualTo("1.0.1.SNAPSHOT");
then(bumped.forName("foo3").version).isEqualTo("Finchley.SNAPSHOT");
then(bumped.forName("foo3").version).isEqualTo("Finchley.BUILD-SNAPSHOT");
then(bumped.forName("foo4").version).isEqualTo("Finchley.SNAPSHOT");
}