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

Now should work; fixes gh-96

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-09-24 08:27:54 +02:00
parent eac165513a
commit 25d57b1cee
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

8
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java
View File

@@ -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<String> metaReleaseProjects(Options options) {