From 25d57b1ceebc48968b2bbcecdcf6102975100f2c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 24 Sep 2018 08:27:54 +0200 Subject: [PATCH] Now should work; fixes gh-96 --- .../internal/spring/ReleaserPropertiesUpdater.java | 3 ++- .../cloud/release/internal/spring/SpringReleaser.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserPropertiesUpdater.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserPropertiesUpdater.java index a3442481..8038157d 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserPropertiesUpdater.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/ReleaserPropertiesUpdater.java @@ -28,10 +28,11 @@ class ReleaserPropertiesUpdater { this.context = context; } - void updateProperties(ReleaserProperties properties, File clonedProjectFromOrg) { + ReleaserProperties updateProperties(ReleaserProperties properties, File clonedProjectFromOrg) { ReleaserProperties props = updatePropertiesFromFile(properties, clonedProjectFromOrg); log.info("Updated properties [\n\n{}\n\n]", props); updateProperties(props); + return props; } void updateProperties(ReleaserProperties props) { 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 37afa976..788d9f55 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 @@ -71,9 +71,9 @@ public class SpringReleaser { private void processProjectForMetaRelease(ReleaserProperties copy, Options options, String project) { log.info("Original properties [\n\n{}\n\n]", copy); - this.updater.updateProperties(copy); File clonedProjectFromOrg = this.releaser.clonedProjectFromOrg(project); - updatePropertiesIfCustomConfigPresent(copy, clonedProjectFromOrg); + ReleaserProperties updatedProps = updatePropertiesIfCustomConfigPresent(copy, clonedProjectFromOrg); + this.updater.updateProperties(updatedProps); log.info("Successfully cloned the project [{}] to [{}]", project, clonedProjectFromOrg); try { processProject(options, clonedProjectFromOrg, TaskType.RELEASE); @@ -90,9 +90,9 @@ public class SpringReleaser { return copy; } - private void updatePropertiesIfCustomConfigPresent(ReleaserProperties copy, + private ReleaserProperties updatePropertiesIfCustomConfigPresent(ReleaserProperties copy, File clonedProjectFromOrg) { - this.updater.updateProperties(copy, clonedProjectFromOrg); + return this.updater.updateProperties(copy, clonedProjectFromOrg); } private List metaReleaseProjects(Options options) {