From 4c88de539bec628d274de6bdf351544d1834aaaa Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 31 Jul 2018 22:54:44 +0200 Subject: [PATCH] Setting branch name to sc-release value for blog post etc. --- .../cloud/release/internal/spring/SpringReleaser.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 876fb53b..21e98ddb 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 @@ -149,6 +149,9 @@ public class SpringReleaser { projectsToUpdateForFixedVersions() : projectsAndVersion.projectVersions; ProjectVersion version = projects.containsProject(this.properties.getMetaRelease().getReleaseTrainProjectName()) ? projects.forName(this.properties.getMetaRelease().getReleaseTrainProjectName()) : versionFromBranch(); + if (options.metaRelease) { + this.properties.getPom().setBranch(version.version); + } return new Args(this.releaser, projects, version, this.properties, options.interactive); } @@ -168,7 +171,8 @@ public class SpringReleaser { assertNoSnapshotsForANonSnapshotProject(projectsToUpdate, versionFromScRelease); } else { ProjectVersion originalVersion = new ProjectVersion(project); - String fixedVersionForProject = this.properties.getFixedVersions().get("spring-cloud-release"); + String fixedVersionForProject = this.properties.getFixedVersions() + .get(this.properties.getMetaRelease().getReleaseTrainProjectName()); versionFromScRelease = new ProjectVersion(originalVersion.projectName, fixedVersionForProject); projectsToUpdate = this.properties.getFixedVersions().entrySet().stream() .map(entry -> new ProjectVersion(entry.getKey(), entry.getValue()))