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

restoring the original version of releaser properties after releasing a project

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-06-29 22:45:02 +02:00
parent afdd65d050
commit 116924ee19
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,10 @@ class ReleaserPropertiesUpdater {
void updateProperties(ReleaserProperties properties, File clonedProjectFromOrg) {
ReleaserProperties props = updatePropertiesFromFile(properties, clonedProjectFromOrg);
updateProperties(props);
}
void updateProperties(ReleaserProperties props) {
Map<String, ReleaserPropertiesAware> beans = this.context
.getBeansOfType(ReleaserPropertiesAware.class);
beans.values().forEach(aware -> aware.setReleaserProperties(props));

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

@@ -58,8 +58,9 @@ public class SpringReleaser {
if (options.metaRelease) {
log.info("Meta Release picked. Will iterate over all projects and perform release of each one");
this.properties.getGit().setFetchVersionsFromGit(false);
ReleaserProperties copy = clonePropertiesForProject();
metaReleaseProjects(options)
.forEach(project -> processProjectForMetaRelease(options, project));
.forEach(project -> processProjectForMetaRelease(copy, options, project));
} else {
log.info("Single project release picked. Will release only the current project");
File projectFolder = projectFolder();
@@ -68,13 +69,13 @@ public class SpringReleaser {
this.optionsProcessor.postReleaseOptions(options, postReleaseOptionsAgs(options, projectsAndVersion));
}
private void processProjectForMetaRelease(Options options, String project) {
private void processProjectForMetaRelease(ReleaserProperties copy, Options options, String project) {
File clonedProjectFromOrg = this.releaser.clonedProjectFromOrg(project);
ReleaserProperties copy = clonePropertiesForProject();
updatePropertiesIfCustomConfigPresent(copy, clonedProjectFromOrg);
log.info("Successfully cloned the project [{}] to [{}]", project, clonedProjectFromOrg);
try {
processProject(options, clonedProjectFromOrg, TaskType.RELEASE);
this.updater.updateProperties(copy);
} catch (Exception e) {
log.error("\n\n\nBUILD FAILED!!!\n\nException occurred for project <" +
project + "> \n\n", e);