From 9f32851fb703279ad37153e52e6faa370919da40 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 3 Mar 2020 18:34:27 +0100 Subject: [PATCH] Fixing the unnecessary artifact for stream --- .../releaser/reactor/GenerateReleaseNotesTask.java | 3 ++- .../cloud/buildsystem/SpringCloudBomConstants.java | 2 +- .../SpringCloudBuildsystemConfiguration.java | 4 ++-- ...arser.java => SpringCloudStreamMavenBomParser.java} | 10 ++++------ 4 files changed, 9 insertions(+), 10 deletions(-) rename projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/{SpringCloudMavenBomParser.java => SpringCloudStreamMavenBomParser.java} (97%) diff --git a/projects/reactor/src/main/java/releaser/reactor/GenerateReleaseNotesTask.java b/projects/reactor/src/main/java/releaser/reactor/GenerateReleaseNotesTask.java index d82547b4..d58c1ad8 100644 --- a/projects/reactor/src/main/java/releaser/reactor/GenerateReleaseNotesTask.java +++ b/projects/reactor/src/main/java/releaser/reactor/GenerateReleaseNotesTask.java @@ -418,7 +418,8 @@ public class GenerateReleaseNotesTask .getJsonObject("author").getString("name"); } } - // in case unexpected json, output the "sha", "commit", "author" and "committer" + // in case unexpected json, output the "sha", "commit", "author" and + // "committer" return "@RAW{\"sha\", " + commitJson.get("sha") + ", \"author\", \"" + commitJson.get("author") + ", \"committer\", \"" + commitJson.get("committer") + ", \"commit\", \"" 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 b9b02633..a3698d1e 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 @@ -40,11 +40,11 @@ final class SpringCloudBomConstants { 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"; + static final String STREAM_DOCS_ARTIFACT_ID = "spring-cloud-stream-docs"; private SpringCloudBomConstants() { throw new IllegalStateException("Don't instantiate a utility class"); diff --git a/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java b/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java index a2696d50..1715aad4 100644 --- a/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java +++ b/projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java @@ -23,8 +23,8 @@ import org.springframework.context.annotation.Configuration; class SpringCloudBuildsystemConfiguration { @Bean - SpringCloudMavenBomParser springCloudMavenBomParser() { - return new SpringCloudMavenBomParser(); + SpringCloudStreamMavenBomParser springCloudMavenBomParser() { + return new SpringCloudStreamMavenBomParser(); } } 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/SpringCloudStreamMavenBomParser.java similarity index 97% rename from projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java rename to projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudStreamMavenBomParser.java index 9430b3de..629448ad 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/SpringCloudStreamMavenBomParser.java @@ -43,16 +43,16 @@ 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_DOCS_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 { +class SpringCloudStreamMavenBomParser implements CustomBomParser { private static final Logger log = LoggerFactory - .getLogger(SpringCloudMavenBomParser.class); + .getLogger(SpringCloudStreamMavenBomParser.class); @Override public VersionsFromBom parseBom(File root, ReleaserProperties properties) { @@ -161,11 +161,11 @@ 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: + case STREAM_DOCS_ARTIFACT_ID: updateStreamVersions(newProjects, version); break; } @@ -204,12 +204,10 @@ class SpringCloudMavenBomParser implements CustomBomParser { } 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);