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

Fixing the unnecessary artifact for stream

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-03-03 18:34:27 +01:00
parent 1a0fb5f204
commit 9f32851fb7
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/reactor/src/main/java/releaser/reactor/GenerateReleaseNotesTask.java
View File

@@ -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\", \""

2
projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBomConstants.java
View File

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

4
projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudBuildsystemConfiguration.java
View File

@@ -23,8 +23,8 @@ import org.springframework.context.annotation.Configuration;
class SpringCloudBuildsystemConfiguration {
@Bean
SpringCloudMavenBomParser springCloudMavenBomParser() {
return new SpringCloudMavenBomParser();
SpringCloudStreamMavenBomParser springCloudMavenBomParser() {
return new SpringCloudStreamMavenBomParser();
}
}

10
projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudMavenBomParser.java → projects/spring-cloud-stream/src/main/java/releaser/cloud/buildsystem/SpringCloudStreamMavenBomParser.java
View File

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