Merge branch '1.0.x'

projects/spring-cloud/src/main/resources/application.yml

@@ -18,7 +18,7 @@ releaser:
     documentation-url: https://github.com/spring-cloud/spring-cloud-static
     spring-project-url: https://github.com/spring-projects/spring-cloud
     test-samples-project-url: https://github.com/spring-cloud/spring-cloud-core-tests
-    release-train-docs-url: https://github.com/spring-cloud-samples/scripts
+    release-train-docs-url: https://github.com/spring-cloud/spring-cloud-release
     release-train-wiki-url: https://github.com/spring-projects/spring-cloud.wiki
     documentation-branch: gh-pages
     spring-project-branch: gh-pages
@@ -64,8 +64,8 @@ releaser:
     deploy-command: "./mvnw deploy -DskipTests -B -Pfast,deploy {{systemProps}}"
     deploy-guides-command: "./mvnw clean verify deploy -B -Pguides,integration -pl guides {{systemProps}}"
     publish-docs-commands:
-      - "./mvnw deploy -DskipTests -B -Pfast,deploy,docs {{systemProps}}"
-    generate-release-train-docs-command: "bash release_train.sh --retrieveversions --version {{version}} --ghpages --auto"
+      - "./mvnw deploy -DskipTests -B -Pfast,deploy,docs -pl docs {{systemProps}}"
+    generate-release-train-docs-command: "./mvnw clean deploy -Pdocs,train-docs -pl train-docs"
     system-properties: ""
     wait-time-in-minutes: 20
   bash:

releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java

@@ -119,6 +119,11 @@ public class ProjectGitHandler implements Closeable {
 				this.properties.getGit().getReleaseTrainDocsBranch());
 	}
 
+	public File cloneReleaseTrainDocumentationProject(String branch) {
+		return cloneAndCheckOut(this.properties.getGit().getReleaseTrainDocsUrl(),
+				branch);
+	}
+
 	public File cloneDocumentationProject() {
 		return cloneAndCheckOut(this.properties.getGit().getDocumentationUrl(),
 				this.properties.getGit().getDocumentationBranch());

releaser-core/src/main/java/releaser/internal/postrelease/PostReleaseActions.java

@@ -316,13 +316,12 @@ public class PostReleaseActions implements Closeable {
 							+ "is off. Set [releaser.git.update-release-train-docs] to [true] to change that");
 			return ExecutionResult.skipped();
 		}
-		File file = this.projectGitHandler.cloneReleaseTrainDocumentationProject();
+		ProjectVersion releaseTrain = projects.releaseTrain(this.properties);
+		File file = this.projectGitHandler
+				.cloneReleaseTrainDocumentationProject(releaseTrain.releaseTagName());
 		ReleaserProperties projectProps = projectProps(file);
-		ProjectVersion projectVersion = newProjectVersion(file);
-		String releaseTrainVersion = projects.releaseTrain(this.properties).version;
-		Projects newProjects = addVersionForTestsProject(projects, projectVersion,
-				releaseTrainVersion);
-		updateWithVersions(file, newProjects);
+		String releaseTrainVersion = releaseTrain.version;
+		updateWithVersions(file, projects);
 		this.projectCommandExecutor.generateReleaseTrainDocs(projectProps,
 				releaseTrainVersion, file.getAbsolutePath());
 		return ExecutionResult.success();