From c19d461e408743c0e02b31f6a8b1686826049410 Mon Sep 17 00:00:00 2001 From: Nicolas MASSART Date: Wed, 14 Nov 2018 17:35:54 +0100 Subject: [PATCH] Fix NC-1707 pantheon CLI default values infinite loop Picocli latest release 3.8.0 fixes the issue. --- gradle/versions.gradle | 2 +- .../main/java/tech/pegasys/pantheon/cli/PantheonCommand.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 664cdc5d7b..65e10aae2f 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -45,7 +45,7 @@ dependencyManagement { dependency('com.github.docker-java:docker-java:3.0.14') - dependency('info.picocli:picocli:3.6.1') + dependency('info.picocli:picocli:3.8.0') dependency('net.consensys.cava:cava-toml:0.3.1') dependency('org.openjdk.jmh:jmh-core:1.21') diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java index 4a7671f80c..f950c9e6dd 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java @@ -142,15 +142,14 @@ public static class RpcApisConversionException extends Exception { @Option( names = {"--datadir"}, paramLabel = MANDATORY_PATH_FORMAT_HELP, - description = "the path to Pantheon data directory" + description = "the path to Pantheon data directory (default: ${DEFAULT-VALUE})" ) private final Path dataDir = getDefaultPantheonDataDir(); @Option( names = {"--node-private-key"}, paramLabel = MANDATORY_PATH_FORMAT_HELP, - description = - "the path to the node's private key file. (default: a file named \"key\" in the Pantheon data folder.)" + description = "the path to the node's private key file. (default: ${DEFAULT-VALUE})" ) private final File nodePrivateKeyFile = KeyPairUtil.getDefaultKeyFile(dataDir);