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

Bumped versions and fixed wrong version passing to docs publishing

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-07-20 16:16:52 +02:00
parent a50cc2d951
commit 4cf6bd853d
10 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -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>

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-release/docs/pom.xml
View File

@@ -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>

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-release/pom.xml
View File

@@ -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>

2
projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-dependencies/pom.xml
View File

@@ -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>

4
projects/spring-cloud/src/test/resources/projects/spring-cloud-release/spring-cloud-starter-parent/pom.xml
View File

@@ -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>

5
releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java
View File

@@ -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) {

4
releaser-core/src/main/java/releaser/internal/project/ProjectVersion.java
View File

@@ -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();
}

2
spring-cloud-info/src/test/java/org/springframework/cloud/info/InitializrSpringCloudInfoServiceTests.java
View File

@@ -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);

2
spring-cloud-info/src/test/resources/spring-cloud-dependencies-pom.xml
View File

@@ -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>

4
spring-cloud-info/src/test/resources/spring-cloud-starter-parent-pom.xml
View File

@@ -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>