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

It's alive:

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-05-11 15:28:12 +02:00
parent 311e28b33e
commit afd644efc4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,10 +62,12 @@ public class SpringReleaser {
assertNoSnapshotsForANonSnapshotProject(projectsToUpdate, versionFromScRelease);
} else {
String fixedVersionForProject = this.properties.getFixedVersions().get(originalVersion.projectName);
versionFromScRelease = new ProjectVersion(originalVersion.projectName, fixedVersionForProject);
versionFromScRelease = new ProjectVersion(originalVersion.projectName, fixedVersionForProject == null ?
originalVersion.version : fixedVersionForProject);
projectsToUpdate = this.properties.getFixedVersions().entrySet().stream()
.map(entry -> new ProjectVersion(entry.getKey(), entry.getValue()))
.distinct().collect(Collectors.toCollection(Projects::new));
projectsToUpdate.add(versionFromScRelease);
printSettingVersionFromFixedVersions(projectsToUpdate);
}
final Args defaultArgs = new Args(this.releaser, project, projectsToUpdate,
@@ -80,7 +82,9 @@ public class SpringReleaser {
private void printSettingVersionFromFixedVersions(Projects projectsToUpdate) {
log.info("\n\n\n=== RETRIEVED VERSIONS ===\n\nWill use the fixed versions"
+ " of projects [{}]", projectsToUpdate);
+ " of projects\n\n {}", projectsToUpdate
.stream().map(p -> p.projectName + " => " + p.version)
.collect(Collectors.joining("\n")));
}
private void assertNoSnapshotsForANonSnapshotProject(Projects projects,