Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#45 - --target is now an optional argument to git backport changelog.

Browse Source
This commit is contained in:
Oliver Gierke
2017-04-03 17:05:21 +02:00
parent 672549c734
commit 2f49588bc6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
release-tools/src/main/java/org/springframework/data/release/git/GitCommands.java
View File

@@ -18,6 +18,7 @@ package org.springframework.data.release.git;
import lombok.NonNull; import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -115,11 +116,12 @@ class GitCommands extends TimedCommand {
@CliCommand("git backport changelog") @CliCommand("git backport changelog")
public void backportChangelogs(@CliOption(key = "", mandatory = true) TrainIteration iteration, // public void backportChangelogs(@CliOption(key = "", mandatory = true) TrainIteration iteration, //
@CliOption(key = "target", mandatory = true) String trains) { @CliOption(key = "target") String trains) {
List<Train> targets = Stream.of(trains.split(",")).// List<Train> targets = trains == null ? Collections.emptyList()
map(it -> ReleaseTrains.getTrainByName(it)).// : Stream.of(trains.split(",")).//
collect(Collectors.toList()); map(it -> ReleaseTrains.getTrainByName(it)).//
collect(Collectors.toList());
git.backportChangelogs(iteration, targets); git.backportChangelogs(iteration, targets);
} }