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

Fixed setting of docs url for old trains

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-11-18 14:19:37 +01:00
parent 988e4f3b8a
commit eca8bb013f
8 changed files with 373 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ class Args {
final ProjectVersion originalVersion;
final ProjectVersion versionFromScRelease;
final ProjectVersion versionFromBom;
final ReleaserProperties properties;
@@ -59,31 +59,31 @@ class Args {
final ApplicationEventPublisher applicationEventPublisher;
Args(Releaser releaser, File project, Projects projects,
ProjectVersion originalVersion, ProjectVersion versionFromScRelease,
ProjectVersion originalVersion, ProjectVersion versionFromBom,
ReleaserProperties properties, boolean interactive, TaskType taskType,
ApplicationEventPublisher applicationEventPublisher) {
this.releaser = releaser;
this.project = project;
this.projects = projects;
this.originalVersion = originalVersion;
this.versionFromScRelease = versionFromScRelease;
this.versionFromBom = versionFromBom;
this.properties = properties;
this.processedProjects = Collections
.singletonList(new ProcessedProject(properties, versionFromScRelease));
.singletonList(new ProcessedProject(properties, versionFromBom));
this.interactive = interactive;
this.taskType = taskType;
this.applicationEventPublisher = applicationEventPublisher;
}
// Used by meta-release task
Args(Releaser releaser, Projects projects, ProjectVersion versionFromScRelease,
Args(Releaser releaser, Projects projects, ProjectVersion versionFromBom,
ReleaserProperties properties, List<ProcessedProject> processedProjects,
boolean interactive, ApplicationEventPublisher applicationEventPublisher) {
this.releaser = releaser;
this.project = null;
this.projects = projects;
this.originalVersion = null;
this.versionFromScRelease = versionFromScRelease;
this.versionFromBom = versionFromBom;
this.properties = properties;
this.processedProjects = processedProjects;
this.interactive = interactive;
@@ -97,7 +97,7 @@ class Args {
this.project = null;
this.projects = null;
this.originalVersion = null;
this.versionFromScRelease = null;
this.versionFromBom = null;
this.properties = null;
this.processedProjects = Collections.emptyList();
this.interactive = false;
@@ -121,7 +121,7 @@ class Args {
public String toString() {
return "Args{" + "releaser=" + this.releaser + ", project=" + this.project
+ ", projects=" + this.projects + ", originalVersion="
+ this.originalVersion + ", versionFromBom=" + this.versionFromScRelease
+ this.originalVersion + ", versionFromBom=" + this.versionFromBom
+ ", properties=" + this.properties + ", interactive=" + this.interactive
+ ", taskType=" + this.taskType + '}';
}

5
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java
View File

@@ -275,9 +275,8 @@ class OptionsProcessor {
private Args args(Args defaultArgs, boolean interactive) {
return new Args(this.releaser, defaultArgs.project, defaultArgs.projects,
defaultArgs.originalVersion, defaultArgs.versionFromScRelease,
this.properties, interactive, defaultArgs.taskType,
this.applicationEventPublisher);
defaultArgs.originalVersion, defaultArgs.versionFromBom, this.properties,
interactive, defaultArgs.taskType, this.applicationEventPublisher);
}
String chosenOption() {

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

@@ -36,54 +36,52 @@ final class Tasks {
static Task UPDATING_POMS = task("updatePoms", "u", "UPDATING VERSIONS",
"Update versions from the BOM",
args -> args.releaser.updateProjectFromBom(args.project, args.projects,
args.versionFromScRelease));
args.versionFromBom));
static Task BUILD_PROJECT = task("build", "b", "BUILD PROJECT", "Build the project",
args -> args.releaser.buildProject(args.versionFromScRelease));
args -> args.releaser.buildProject(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.versionFromScRelease));
"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.versionFromScRelease));
"Deploy the artifacts", args -> args.releaser.deploy(args.versionFromBom));
static Task PUBLISH_DOCS = task("docs", "o", "PUBLISHING DOCS", "Publish the docs",
args -> args.releaser.publishDocs(args.versionFromScRelease));
args -> args.releaser.publishDocs(args.versionFromBom));
static Task SNAPSHOTS = task("snapshots", "s",
"REVERTING CHANGES & BUMPING VERSION (RELEASE ONLY)",
"Go back to snapshots and bump originalVersion by patch",
args -> args.releaser.rollbackReleaseVersion(args.project, args.projects,
args.versionFromScRelease));
args.versionFromBom));
static Task PUSH = task("push", "p", "PUSHING CHANGES", "Push the commits",
args -> args.releaser.pushCurrentBranch(args.project));
static Task CLOSE_MILESTONE = task("closeMilestone", "m", "CLOSING MILESTONE",
"Close the milestone at Github",
args -> args.releaser.closeMilestone(args.versionFromScRelease));
args -> args.releaser.closeMilestone(args.versionFromBom));
static Task CREATE_TEMPLATES = task("createTemplates", "t", "CREATING TEMPLATES",
"Create email / blog / tweet etc. templates", args -> {
args.releaser.createEmail(args.versionFromScRelease, args.projects);
args.releaser.createBlog(args.versionFromScRelease, args.projects);
args.releaser.createTweet(args.versionFromScRelease, args.projects);
args.releaser.createReleaseNotes(args.versionFromScRelease,
args.projects);
args.releaser.createEmail(args.versionFromBom, args.projects);
args.releaser.createBlog(args.versionFromBom, args.projects);
args.releaser.createTweet(args.versionFromBom, args.projects);
args.releaser.createReleaseNotes(args.versionFromBom, args.projects);
}, TaskType.POST_RELEASE);
static Task UPDATE_GUIDES = task("updateGuides", "ug", "UPDATE GUIDES",
"Updating Spring Guides", args -> {
args.releaser.updateSpringGuides(args.versionFromScRelease, args.projects,
args.releaser.updateSpringGuides(args.versionFromBom, args.projects,
args.processedProjects);
}, TaskType.POST_RELEASE);
static Task UPDATE_START_SPRING_IO = task("updateStartSpringIo", "us",
"UPDATE START.SPRING.IO", "Updating start.spring.io", args -> {
args.releaser.updateStartSpringIo(args.versionFromScRelease,
args.projects);
args.releaser.updateStartSpringIo(args.versionFromBom, args.projects);
}, TaskType.POST_RELEASE);
static Task UPDATE_SAGAN = task("updateSagan", "g", "UPDATE SAGAN",
"Updating Sagan with release info", args -> {
args.releaser.updateSagan(args.project, args.versionFromScRelease);
args.releaser.updateSagan(args.project, args.versionFromBom,
args.projects);
});
static Task UPDATE_DOCUMENTATION = task("updateDocumentation", "ud",
"UPDATE DOCUMENTATION", "Updating documentation repository", args -> {
args.releaser.updateDocumentationRepository(args.properties,
args.projects, args.versionFromScRelease);
args.projects, args.versionFromBom);
}, TaskType.POST_RELEASE);
static Task RUN_UPDATED_SAMPLES = task("runUpdatedSample", "ru",

2
spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java
View File

@@ -345,7 +345,7 @@ public class AcceptanceTests {
BDDMockito.then(this.saganUpdater).should(BDDMockito.atLeastOnce()).updateSagan(
BDDMockito.any(File.class), BDDMockito.anyString(),
BDDMockito.any(ProjectVersion.class),
BDDMockito.any(ProjectVersion.class));
BDDMockito.any(ProjectVersion.class), BDDMockito.any(Projects.class));
}
private void thenSaganWasNotCalled() {