From 1bf3a6800523d1c4e83bb650812896f500d2224e Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 22 Nov 2017 15:16:46 +0100 Subject: [PATCH] Fixed version updating --- .../cloud/release/internal/Releaser.java | 3 +-- .../cloud/release/internal/pom/Versions.java | 4 ++-- .../cloud/release/internal/pom/VersionsTests.java | 12 ------------ 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java index 723ba4c7..c638f395 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java @@ -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); diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java index 130d7c28..cad89b4d 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java @@ -66,9 +66,9 @@ class Versions { Versions(Set 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()); diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java index f839a84b..cea26ddd 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java @@ -127,18 +127,6 @@ public class VersionsTests { return projects; } - Set snapshotProjects() { - Set projects = new HashSet<>(); - projects.add(new Project("foo", "1.0.0.BUILD-SNAPSHOT")); - return projects; - } - - Set releaseProjects() { - Set projects = new HashSet<>(); - projects.add(new Project("foo", "1.0.0.RELEASE")); - return projects; - } - Set mixedProjects() { Set projects = new HashSet<>(); projects.add(new Project("foo", "1.0.0.BUILD-SNAPSHOT"));