From 97859ff6e9fb75a9dff8c9781006deea4550af4c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 31 Jul 2018 22:26:37 +0200 Subject: [PATCH] Should fix task name parsing --- .../cloud/release/internal/spring/OptionsParser.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsParser.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsParser.java index 05cbc592..d7864b3c 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsParser.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsParser.java @@ -74,8 +74,9 @@ class OptionsParser implements Parser { List 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 taskNames = allTaskNames.stream() .filter(providedTaskNames::contains)