From 4cf6bd853d9bcf10b5b3a1c4eab963345b2a4358 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Mon, 20 Jul 2020 16:16:52 +0200
Subject: [PATCH] Bumped versions and fixed wrong version passing to docs
 publishing

---
 pom.xml                                                      | 2 +-
 .../resources/projects/spring-cloud-release/docs/pom.xml     | 2 +-
 .../src/test/resources/projects/spring-cloud-release/pom.xml | 2 +-
 .../spring-cloud-release/spring-cloud-dependencies/pom.xml   | 2 +-
 .../spring-cloud-release/spring-cloud-starter-parent/pom.xml | 4 ++--
 .../releaser/internal/project/ProjectCommandExecutor.java    | 5 +++--
 .../main/java/releaser/internal/project/ProjectVersion.java  | 4 ++--
 .../cloud/info/InitializrSpringCloudInfoServiceTests.java    | 2 +-
 .../src/test/resources/spring-cloud-dependencies-pom.xml     | 2 +-
 .../src/test/resources/spring-cloud-starter-parent-pom.xml   | 4 ++--
 10 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 82253497..28a14a78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 
-		<spring-cloud-bom.version>Hoxton.BUILD-SNAPSHOT</spring-cloud-bom.version>
+		<spring-cloud-bom.version>2020.0.0-SNAPSHOT</spring-cloud-bom.version>
 		<jcabi-github.version>1.0</jcabi-github.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
 		<hibernate-validator.version>5.4.1.Final</hibernate-validator.version>
diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/pom.xml
index be73df0f..8d5ac69e 100644
--- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/pom.xml
+++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-starter-build</artifactId>
-		<version>Hoxton.BUILD-SNAPSHOT</version>
+		<version>2020.0.0-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Starter Docs</name>
diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/pom.xml
index dfdf8f96..b7a94365 100644
--- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/pom.xml
+++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/pom.xml
@@ -6,7 +6,7 @@
 	<packaging>pom</packaging>
 	<name>Spring Cloud Starter Build</name>
 	<description>Spring Cloud Starter Build</description>
-	<version>Hoxton.BUILD-SNAPSHOT</version>
+	<version>2020.0.0-SNAPSHOT</version>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml
index 90a84f65..26adbe23 100644
--- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml
+++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml
@@ -9,7 +9,7 @@
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-dependencies</artifactId>
-	<version>Hoxton.BUILD-SNAPSHOT</version>
+	<version>2020.0.0-SNAPSHOT</version>
 	<name>spring-cloud-dependencies</name>
 	<description>Spring Cloud Dependencies</description>
 	<packaging>pom</packaging>
diff --git a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml
index 4207e3f1..f968eabb 100644
--- a/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml
+++ b/projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-starter-parent</artifactId>
-	<version>Hoxton.BUILD-SNAPSHOT</version>
+	<version>2020.0.0-SNAPSHOT</version>
 	<name>spring-cloud-starter-parent</name>
 	<description>Spring Cloud Starter Parent</description>
 	<packaging>pom</packaging>
@@ -20,7 +20,7 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud.version>2020.0.0-SNAPSHOT</spring-cloud.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java
index fbc3f01f..ea19aa2b 100644
--- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java
+++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java
@@ -190,8 +190,9 @@ public class ProjectCommandExecutor {
 			ProjectVersion changedVersion) {
 		try {
 			String providedCommand = new CommandPicker(properties)
-					.publishDocsCommand(originalVersion);
-			log.info("Executing command(s) for publishing docs " + providedCommand + " / " + properties);
+					.publishDocsCommand(changedVersion);
+			log.info("Executing command(s) for publishing docs " + providedCommand + " / "
+					+ properties);
 			String[] providedCommands = StringUtils
 					.delimitedListToStringArray(providedCommand, "&&");
 			for (String command : providedCommands) {
diff --git a/releaser-core/src/main/java/releaser/internal/project/ProjectVersion.java b/releaser-core/src/main/java/releaser/internal/project/ProjectVersion.java
index bf621e76..092e9c84 100644
--- a/releaser-core/src/main/java/releaser/internal/project/ProjectVersion.java
+++ b/releaser-core/src/main/java/releaser/internal/project/ProjectVersion.java
@@ -252,7 +252,7 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
 	}
 
 	private SplitVersion dotSeparatedReleaseTrainsAndVersions(String version) {
-		// Hoxton.BUILD-SNAPSHOT or 1.0.0.BUILD-SNAPSHOT
+		// 2020.0.0-SNAPSHOT or 1.0.0.BUILD-SNAPSHOT
 		String[] splitVersion = version.split("\\.");
 		return SplitVersion.dot(splitVersion);
 	}
@@ -690,7 +690,7 @@ public class ProjectVersion implements Comparable<ProjectVersion>, Serializable
 			return wrongDelimiter() || tooFewElements();
 		}
 
-		// Hoxton.BUILD-SNAPSHOT or Hoxton-BUILD-SNAPSHOT or 2020.x.x
+		// 2020.0.0-SNAPSHOT or Hoxton-BUILD-SNAPSHOT or 2020.x.x
 		private boolean isReleaseTrain() {
 			return isOldReleaseTrain() || calverReleaseTrain();
 		}
diff --git a/spring-cloud-info/src/test/java/org/springframework/cloud/info/InitializrSpringCloudInfoServiceTests.java b/spring-cloud-info/src/test/java/org/springframework/cloud/info/InitializrSpringCloudInfoServiceTests.java
index 600ca878..a69d706c 100644
--- a/spring-cloud-info/src/test/java/org/springframework/cloud/info/InitializrSpringCloudInfoServiceTests.java
+++ b/spring-cloud-info/src/test/java/org/springframework/cloud/info/InitializrSpringCloudInfoServiceTests.java
@@ -107,7 +107,7 @@ public class InitializrSpringCloudInfoServiceTests {
 
 	@Test
 	public void getSpringCloudReleaseVersionTest() throws Exception {
-		String bomVersion = "vHoxton.BUILD-SNAPSHOT";
+		String bomVersion = "v2020.0.0-SNAPSHOT";
 		RestTemplate rest = mock(RestTemplate.class);
 		Github github = mock(Github.class);
 		GithubPomReader githubPomReader = mock(GithubPomReader.class);
diff --git a/spring-cloud-info/src/test/resources/spring-cloud-dependencies-pom.xml b/spring-cloud-info/src/test/resources/spring-cloud-dependencies-pom.xml
index e38fc4d4..e7b4286a 100644
--- a/spring-cloud-info/src/test/resources/spring-cloud-dependencies-pom.xml
+++ b/spring-cloud-info/src/test/resources/spring-cloud-dependencies-pom.xml
@@ -9,7 +9,7 @@
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-dependencies</artifactId>
-	<version>Hoxton.BUILD-SNAPSHOT</version>
+	<version>2020.0.0-SNAPSHOT</version>
 	<name>spring-cloud-dependencies</name>
 	<description>Spring Cloud Dependencies</description>
 	<packaging>pom</packaging>
diff --git a/spring-cloud-info/src/test/resources/spring-cloud-starter-parent-pom.xml b/spring-cloud-info/src/test/resources/spring-cloud-starter-parent-pom.xml
index b17b67e3..c1a08588 100644
--- a/spring-cloud-info/src/test/resources/spring-cloud-starter-parent-pom.xml
+++ b/spring-cloud-info/src/test/resources/spring-cloud-starter-parent-pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-starter-parent</artifactId>
-	<version>Hoxton.BUILD-SNAPSHOT</version>
+	<version>2020.0.0-SNAPSHOT</version>
 	<name>spring-cloud-starter-parent</name>
 	<description>Spring Cloud Starter Parent</description>
 	<packaging>pom</packaging>
@@ -20,7 +20,7 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud.version>2020.0.0-SNAPSHOT</spring-cloud.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>