From ec4e728bc9773bf11b69fe8f72aef47db218268f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 31 Jul 2018 19:56:55 +0200 Subject: [PATCH] Should fix task name parsing --- .../cloud/release/internal/spring/OptionsParser.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 c78dbf5d..05cbc592 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 @@ -1,15 +1,14 @@ package org.springframework.cloud.release.internal.spring; -import joptsimple.ArgumentAcceptingOptionSpec; -import joptsimple.OptionParser; -import joptsimple.OptionSet; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import joptsimple.ArgumentAcceptingOptionSpec; +import joptsimple.OptionParser; +import joptsimple.OptionSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.release.internal.options.Options; @@ -75,7 +74,7 @@ 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()) { + if (providedTaskNames.isEmpty() && !metaRelease) { providedTaskNames.addAll(tasksFromOptions.isEmpty() ? allTaskNames : tasksFromOptions); } List taskNames = allTaskNames.stream()