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

Setting proper value for spring-cloud-release

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

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

@@ -168,12 +168,11 @@ public class SpringReleaser {
assertNoSnapshotsForANonSnapshotProject(projectsToUpdate, versionFromScRelease);
} else {
ProjectVersion originalVersion = new ProjectVersion(project);
String fixedVersionForProject = this.properties.getFixedVersions().get(originalVersion.projectName);
versionFromScRelease = new ProjectVersion(originalVersion.projectName, fixedVersionForProject == null ?
originalVersion.version : fixedVersionForProject);
String fixedVersionForProject = this.properties.getFixedVersions().get("spring-cloud-release");
versionFromScRelease = new ProjectVersion(originalVersion.projectName, fixedVersionForProject);
projectsToUpdate = this.properties.getFixedVersions().entrySet().stream()
.map(entry -> new ProjectVersion(entry.getKey(), entry.getValue()))
.distinct().collect(Collectors.toCollection(Projects::new));
.collect(Collectors.toCollection(Projects::new));
projectsToUpdate.add(versionFromScRelease);
printSettingVersionFromFixedVersions(projectsToUpdate);
}