diff --git a/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBomConstants.java b/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBomConstants.java index c6039a42..b9b02633 100644 --- a/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBomConstants.java +++ b/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBomConstants.java @@ -39,6 +39,13 @@ final class SpringCloudBomConstants { static final String CLOUD_STARTER_ARTIFACT_ID = "spring-cloud-starter"; static final String CLOUD_STARTER_PARENT_ARTIFACT_ID = "spring-cloud-starter-parent"; + // sc-stream + static final String STREAM_ARTIFACT_ID = "spring-cloud-stream"; + static final String STREAM_DEPS_ARTIFACT_ID = "spring-cloud-stream-dependencies"; + static final String STREAM_STARTER_ARTIFACT_ID = "spring-cloud-stream-starter"; + static final String STREAM_STARTER_BUILD_ARTIFACT_ID = "spring-cloud-stream-starter-build"; + static final String STREAM_STARTER_PARENT_ARTIFACT_ID = "spring-cloud-stream-starter-parent"; + private SpringCloudBomConstants() { throw new IllegalStateException("Don't instantiate a utility class"); } diff --git a/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java b/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java index f5cedf64..9430b3de 100644 --- a/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java +++ b/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java @@ -43,6 +43,11 @@ import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_RELEASE_A import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_STARTER_ARTIFACT_ID; import static releaser.cloud.buildsystem.SpringCloudBomConstants.CLOUD_STARTER_PARENT_ARTIFACT_ID; import static releaser.cloud.buildsystem.SpringCloudBomConstants.SPRING_BOOT; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.STREAM_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.STREAM_DEPS_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.STREAM_STARTER_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.STREAM_STARTER_BUILD_ARTIFACT_ID; +import static releaser.cloud.buildsystem.SpringCloudBomConstants.STREAM_STARTER_PARENT_ARTIFACT_ID; class SpringCloudMavenBomParser implements CustomBomParser { @@ -156,6 +161,13 @@ class SpringCloudMavenBomParser implements CustomBomParser { case CLOUD_STARTER_PARENT_ARTIFACT_ID: updateSpringCloudVersions(newProjects, version); break; + case STREAM_ARTIFACT_ID: + case STREAM_DEPS_ARTIFACT_ID: + case STREAM_STARTER_ARTIFACT_ID: + case STREAM_STARTER_BUILD_ARTIFACT_ID: + case STREAM_STARTER_PARENT_ARTIFACT_ID: + updateStreamVersions(newProjects, version); + break; } return newProjects; } @@ -191,6 +203,19 @@ class SpringCloudMavenBomParser implements CustomBomParser { add(newProjects, CLOUD_STARTER_PARENT_ARTIFACT_ID, version); } + private void updateStreamVersions(Set newProjects, String version) { + remove(newProjects, STREAM_ARTIFACT_ID); + remove(newProjects, STREAM_DEPS_ARTIFACT_ID); + remove(newProjects, STREAM_STARTER_ARTIFACT_ID); + remove(newProjects, STREAM_STARTER_BUILD_ARTIFACT_ID); + remove(newProjects, STREAM_STARTER_PARENT_ARTIFACT_ID); + add(newProjects, STREAM_ARTIFACT_ID, version); + add(newProjects, STREAM_DEPS_ARTIFACT_ID, version); + add(newProjects, STREAM_STARTER_ARTIFACT_ID, version); + add(newProjects, STREAM_STARTER_BUILD_ARTIFACT_ID, version); + add(newProjects, STREAM_STARTER_PARENT_ARTIFACT_ID, version); + } + private void add(Set projects, String key, String value) { projects.add(new Project(key, value)); } diff --git a/projects/spring-cloud-stream/src/main/resources/application.yml b/projects/spring-cloud-stream/src/main/resources/application.yml index 2fde2647..829c1235 100644 --- a/projects/spring-cloud-stream/src/main/resources/application.yml +++ b/projects/spring-cloud-stream/src/main/resources/application.yml @@ -36,6 +36,7 @@ releaser: release-train-project-name: spring-cloud-stream-starters release-train-dependency-names: - spring-cloud-stream-dependencies + - spring-cloud-stream-starter-build git-org-url: https://github.com/spring-cloud projects-to-skip: - spring-boot