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

Fixed version updating

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-11-22 15:16:46 +01:00
parent df3ea5744d
commit 1bf3a68005
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
View File

@@ -89,8 +89,7 @@ public class Releaser {
ProjectVersion originalVersion = originalVersion(project);
log.info("Original project version is [{}]", originalVersion);
if ((scReleaseVersion.isRelease() || scReleaseVersion.isServiceRelease()) && originalVersion.isSnapshot()) {
Projects newProjects = new Projects(projects);
newProjects.remove(scReleaseVersion.projectName);
Projects newProjects = new Projects();
newProjects.add(new ProjectVersion(originalVersion.projectName, originalVersion.bumpedVersion()));
updateProjectFromScRelease(project, newProjects, originalVersion, SKIP_SNAPSHOT_ASSERTION);
this.projectGitHandler.commitAfterBumpingVersions(project, originalVersion);

4
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java
View File

@@ -66,9 +66,9 @@ class Versions {
Versions(Set<ProjectVersion> versions) {
this.bootVersion = versions.stream().filter(projectVersion -> SPRING_BOOT_PROJECT_NAME.equals(projectVersion.projectName))
.findFirst().orElseThrow(() -> new IllegalStateException("Boot Version is Missing")).version;
.findFirst().orElse(new ProjectVersion(SPRING_BOOT_PROJECT_NAME, "")).version;
this.scBuildVersion = versions.stream().filter(projectVersion -> BUILD_ARTIFACT_ID.equals(projectVersion.projectName))
.findFirst().orElseThrow(() -> new IllegalStateException("Spring Cloud Build Version is Missing")).version;
.findFirst().orElse(new ProjectVersion(BUILD_ARTIFACT_ID, "")).version;
this.projects = versions.stream()
.map(projectVersion -> new Project(projectVersion.projectName, projectVersion.version))
.collect(Collectors.toSet());

12
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java
View File

@@ -127,18 +127,6 @@ public class VersionsTests {
return projects;
}
Set<Project> snapshotProjects() {
Set<Project> projects = new HashSet<>();
projects.add(new Project("foo", "1.0.0.BUILD-SNAPSHOT"));
return projects;
}
Set<Project> releaseProjects() {
Set<Project> projects = new HashSet<>();
projects.add(new Project("foo", "1.0.0.RELEASE"));
return projects;
}
Set<Project> mixedProjects() {
Set<Project> projects = new HashSet<>();
projects.add(new Project("foo", "1.0.0.BUILD-SNAPSHOT"));