diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java index f69b1020..815c4593 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SpringCloudConstants.java @@ -29,6 +29,7 @@ final class SpringCloudConstants { static final String BUILD_ARTIFACT_ID = "spring-cloud-build"; static final String SPRING_CLOUD_RELEASE = "spring-cloud-release"; static final String SPRING_CLOUD = "spring-cloud"; + static final String SPRING_CLOUD_STARTER = "spring-cloud-starter"; private SpringCloudConstants() { throw new IllegalStateException("Don't instantiate a utility class"); diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java index 84d5bd2c..9e37c2f5 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Versions.java @@ -16,7 +16,6 @@ package org.springframework.cloud.release.internal.pom; import java.util.HashSet; -import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.stream.Collectors; @@ -24,10 +23,11 @@ import java.util.stream.Collectors; import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.BOOT_DEPENDENCIES_ARTIFACT_ID; import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.BOOT_STARTER_PARENT_ARTIFACT_ID; import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.BUILD_ARTIFACT_ID; -import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.CLOUD_DEPENDENCIES_PARENT_ARTIFACT_ID; import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.CLOUD_DEPENDENCIES_ARTIFACT_ID; +import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.CLOUD_DEPENDENCIES_PARENT_ARTIFACT_ID; import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.SPRING_CLOUD; import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.SPRING_CLOUD_RELEASE; +import static org.springframework.cloud.release.internal.pom.SpringCloudConstants.SPRING_CLOUD_STARTER; /** * Represents versions taken out from Spring Cloud Release pom @@ -145,10 +145,13 @@ class Versions { break; case SPRING_CLOUD_RELEASE: case SPRING_CLOUD: + case SPRING_CLOUD_STARTER: remove(SPRING_CLOUD_RELEASE); remove(SPRING_CLOUD); + remove(SPRING_CLOUD_STARTER); this.projects.add(new Project(SPRING_CLOUD_RELEASE, version)); this.projects.add(new Project(SPRING_CLOUD, version)); + this.projects.add(new Project(SPRING_CLOUD_STARTER, version)); break; default: remove(projectName); diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java index d4ba917e..57c15810 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/VersionsTests.java @@ -123,11 +123,13 @@ public class VersionsTests { then(versions.versionForProject("spring-cloud")).isEqualTo("3.0.0"); then(versions.versionForProject("spring-cloud-release")).isEqualTo("3.0.0"); + then(versions.versionForProject("spring-cloud-starter")).isEqualTo("3.0.0"); versions = mixedVersions().setVersion("spring-cloud-release", "3.0.0"); then(versions.versionForProject("spring-cloud")).isEqualTo("3.0.0"); then(versions.versionForProject("spring-cloud-release")).isEqualTo("3.0.0"); + then(versions.versionForProject("spring-cloud-starter")).isEqualTo("3.0.0"); } @Test