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

Setting branch name to sc-release value for blog post etc.

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-07-31 22:54:44 +02:00
parent f39bf06da7
commit 4c88de539b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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