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

Should fix task name parsing

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-07-31 22:26:37 +02:00
parent eef87e70ac
commit 97859ff6e9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsParser.java
View File

@@ -74,8 +74,9 @@ class OptionsParser implements Parser {
List<String> tasksFromOptions = Tasks.NON_COMPOSITE_TASKS.stream()
.filter(task -> options.has(task.name) || options.has(task.shortName))
.map(task -> task.name).collect(Collectors.toList());
if (providedTaskNames.isEmpty() && !metaRelease) {
providedTaskNames.addAll(tasksFromOptions.isEmpty() ? allTaskNames : tasksFromOptions);
if (providedTaskNames.isEmpty()) {
providedTaskNames.addAll(tasksFromOptions.isEmpty() && !metaRelease ?
allTaskNames : tasksFromOptions);
}
List<String> taskNames = allTaskNames.stream()
.filter(providedTaskNames::contains)