From f39bf06da731cf3f6cf259d474222ee1f6133926 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 31 Jul 2018 22:43:43 +0200 Subject: [PATCH] Setting proper value for spring-cloud-release --- .../cloud/release/internal/spring/SpringReleaser.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java index b5f9a30e..876fb53b 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java @@ -168,12 +168,11 @@ public class SpringReleaser { assertNoSnapshotsForANonSnapshotProject(projectsToUpdate, versionFromScRelease); } else { ProjectVersion originalVersion = new ProjectVersion(project); - String fixedVersionForProject = this.properties.getFixedVersions().get(originalVersion.projectName); - versionFromScRelease = new ProjectVersion(originalVersion.projectName, fixedVersionForProject == null ? - originalVersion.version : fixedVersionForProject); + String fixedVersionForProject = this.properties.getFixedVersions().get("spring-cloud-release"); + versionFromScRelease = new ProjectVersion(originalVersion.projectName, fixedVersionForProject); projectsToUpdate = this.properties.getFixedVersions().entrySet().stream() .map(entry -> new ProjectVersion(entry.getKey(), entry.getValue())) - .distinct().collect(Collectors.toCollection(Projects::new)); + .collect(Collectors.toCollection(Projects::new)); projectsToUpdate.add(versionFromScRelease); printSettingVersionFromFixedVersions(projectsToUpdate); }