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

Logs

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-09-23 12:58:16 +02:00
parent 8e6060db1b
commit 9644d74e3c
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java
View File

@@ -527,7 +527,8 @@ class CommandPicker {
profiles);
}
else {
log.info("The version [" + version.toString() + "] is a snapshot one - will not add any profiles");
log.info("The version [" + version.toString()
+ "] is a snapshot one - will not add any profiles");
}
return trimmedCommand;
}

16
releaser-spring/src/main/java/releaser/internal/spring/Arguments.java
View File

@@ -146,15 +146,11 @@ public final class Arguments implements Serializable {
@Override
public String toString() {
return "Arguments{" +
"project=" + project +
", projects=" + projects +
", originalVersion=" + originalVersion +
", versionFromBom=" + versionFromBom +
", properties=" + properties +
", options=" + options +
", projectToRun=" + projectToRun +
", processedProjects=" + processedProjects +
'}';
return "Arguments{" + "project=" + project + ", projects=" + projects
+ ", originalVersion=" + originalVersion + ", versionFromBom="
+ versionFromBom + ", properties=" + properties + ", options=" + options
+ ", projectToRun=" + projectToRun + ", processedProjects="
+ processedProjects + '}';
}
}

11
releaser-spring/src/main/java/releaser/internal/spring/VersionsToBumpFactory.java
View File

@@ -65,9 +65,11 @@ class VersionsToBumpFactory implements Closeable {
ProjectVersion originalVersion = new ProjectVersion(project);
Projects fixedVersions = this.releaser.fixedVersions();
log.info("Got the following fixed versions [{}]", fixedVersions);
String fixedVersionForProject = fixedVersions.containsProject(originalVersion.projectName)
? fixedVersions.forName(originalVersion.projectName).version : "";
log.info("Found fixed version for this project [{}] is [{}]", originalVersion.projectName, fixedVersionForProject);
String fixedVersionForProject = fixedVersions
.containsProject(originalVersion.projectName)
? fixedVersions.forName(originalVersion.projectName).version : "";
log.info("Found fixed version for this project [{}] is [{}]",
originalVersion.projectName, fixedVersionForProject);
ProjectVersion versionFromBom = StringUtils.hasText(fixedVersionForProject)
? new ProjectVersion(originalVersion.projectName, fixedVersionForProject)
: new ProjectVersion(project);
@@ -85,7 +87,8 @@ class VersionsToBumpFactory implements Closeable {
return cachedProjectsFromBom(versionFromBom, projectsToUpdate);
}
private ProjectsFromBom cachedProjectsFromBom(ProjectVersion versionFromBom, Projects projectsToUpdate) {
private ProjectsFromBom cachedProjectsFromBom(ProjectVersion versionFromBom,
Projects projectsToUpdate) {
return new ProjectsFromBom(projectsToUpdate, versionFromBom);
}