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

Fixed wrong tagging

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-10-16 14:11:12 +02:00
parent 38d206149c
commit e407255565
5 changed files with 136 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Args.java
View File

@@ -60,4 +60,18 @@ class Args {
this.interactive = false;
this.taskType = taskType;
}
@Override
public String toString() {
return "Args{" +
"releaser=" + this.releaser +
", project=" + this.project +
", projects=" + this.projects +
", originalVersion=" + this.originalVersion +
", versionFromScRelease=" + this.versionFromScRelease +
", properties=" + this.properties +
", interactive=" + this.interactive +
", taskType=" + this.taskType +
'}';
}
}

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

@@ -160,7 +160,7 @@ public class SpringReleaser {
} else {
ProjectVersion originalVersion = new ProjectVersion(project);
String fixedVersionForProject = this.properties.getFixedVersions()
.get(this.properties.getMetaRelease().getReleaseTrainProjectName());
.get(project.getName());
versionFromScRelease = StringUtils.hasText(fixedVersionForProject) ?
new ProjectVersion(originalVersion.projectName, fixedVersionForProject) :
new ProjectVersion(project);
@@ -189,6 +189,7 @@ public class SpringReleaser {
final Args defaultArgs = new Args(this.releaser, project, projectsAndVersion.projectVersions,
originalVersion, projectsAndVersion.versionFromScRelease, this.properties,
options.interactive, taskType);
log.debug("Processing project [{}] with args [{}]", project, defaultArgs);
this.optionsProcessor.processOptions(options, defaultArgs);
return projectsAndVersion;
}