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

Added option to resolve {{nextVersion}} {{version}} and {{oldVersion}} in all commands

Browse Source 
fixes gh-171
This commit is contained in:
Marcin Grzejszczak
2019-11-19 13:55:14 +01:00
parent b8610c5aef
commit 9b26b40371
10 changed files with 166 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,8 +68,8 @@ class Args {
this.originalVersion = originalVersion;
this.versionFromBom = versionFromBom;
this.properties = properties;
this.processedProjects = Collections
.singletonList(new ProcessedProject(properties, versionFromBom));
this.processedProjects = Collections.singletonList(
new ProcessedProject(properties, versionFromBom, originalVersion));
this.interactive = interactive;
this.taskType = taskType;
this.applicationEventPublisher = applicationEventPublisher;

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

@@ -108,7 +108,8 @@ public class SpringReleaser {
log.info("Successfully cloned the project [{}] to [{}]", project,
clonedProjectFromOrg);
ProjectsAndVersion projects = projects(clonedProjectFromOrg);
return new ProcessedProject(properties, projects.versionFromBom);
ProjectVersion original = new ProjectVersion(clonedProjectFromOrg);
return new ProcessedProject(properties, projects.versionFromBom, original);
}).collect(Collectors.toList());
}
@@ -155,9 +156,11 @@ public class SpringReleaser {
clonedProjectFromOrg);
ProjectsAndVersion projectsAndVersion;
try {
ProjectVersion original = new ProjectVersion(clonedProjectFromOrg);
projectsAndVersion = processProject(options, clonedProjectFromOrg,
TaskType.RELEASE);
return new ProcessedProject(copy, projectsAndVersion.versionFromBom);
return new ProcessedProject(copy, projectsAndVersion.versionFromBom,
original);
}
catch (Exception e) {
log.error("\n\n\nBUILD FAILED!!!\n\nException occurred for project <"

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

@@ -38,15 +38,17 @@ final class Tasks {
args -> args.releaser.updateProjectFromBom(args.project, args.projects,
args.versionFromBom));
static Task BUILD_PROJECT = task("build", "b", "BUILD PROJECT", "Build the project",
args -> args.releaser.buildProject(args.versionFromBom));
args -> args.releaser.buildProject(args.originalVersion,
args.versionFromBom));
static Task COMMIT = task("commit", "c",
"COMMITTING (ALL) AND PUSHING TAGS (NON-SNAPSHOTS)",
"Commit, tag and push the tag",
args -> args.releaser.commitAndPushTags(args.project, args.versionFromBom));
static Task DEPLOY = task("deploy", "d", "ARTIFACT DEPLOYMENT",
"Deploy the artifacts", args -> args.releaser.deploy(args.versionFromBom));
"Deploy the artifacts",
args -> args.releaser.deploy(args.originalVersion, args.versionFromBom));
static Task PUBLISH_DOCS = task("docs", "o", "PUBLISHING DOCS", "Publish the docs",
args -> args.releaser.publishDocs(args.versionFromBom));
args -> args.releaser.publishDocs(args.originalVersion, args.versionFromBom));
static Task SNAPSHOTS = task("snapshots", "s",
"REVERTING CHANGES & BUMPING VERSION (RELEASE ONLY)",
"Go back to snapshots and bump originalVersion by patch",