JAMES-2472 upgrade commons-cli
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3a800d2f Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3a800d2f Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3a800d2f Branch: refs/heads/master Commit: 3a800d2f3d95ec1eb0fab1ee6e754b889dcf82e4 Parents: 9c3aa9f Author: Matthieu Baechler <[email protected]> Authored: Tue Jul 17 15:27:19 2018 +0200 Committer: Matthieu Baechler <[email protected]> Committed: Fri Jul 20 10:03:52 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/james/mpt/app/Main.java | 74 ++++++++++---------- pom.xml | 2 +- .../java/org/apache/james/cli/ServerCmd.java | 4 +- 3 files changed, 40 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3a800d2f/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java ---------------------------------------------------------------------- diff --git a/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java b/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java index 4e3f3ea..ef7cbaa 100644 --- a/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java +++ b/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java @@ -23,9 +23,9 @@ import java.io.File; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.james.util.Port; @@ -46,18 +46,18 @@ public class Main { private static final int FILE_NOT_FOUND = 1; private static final int PORT_NOT_A_NUMBER = 2; - private static final char FILE_OPTION = 'f'; - private static final char PORT_OPTION = 'p'; - private static final char HOST_OPTION = 'h'; - private static final char SHABANG_OPTION = 's'; - private static final char VERBOSE_OPTION = 'v'; + private static final String FILE_OPTION = "f"; + private static final String PORT_OPTION = "p"; + private static final String HOST_OPTION = "h"; + private static final String SHABANG_OPTION = "s"; + private static final String VERBOSE_OPTION = "v"; public static final void main(String[] args) throws Exception { Options options = buildOptions(); try { - CommandLineParser parser = new GnuParser(); + CommandLineParser parser = new DefaultParser(); CommandLine cmd = parser.parse(options, args); runCommand(cmd); @@ -101,44 +101,44 @@ public class Main { @SuppressWarnings("static-access") private static void addRunScriptOptions(Options options) { // -f <file> runs this script - options.addOption(OptionBuilder - .withArgName("file") + options.addOption(Option.builder(FILE_OPTION) + .argName("file") .hasArg() - .withDescription("run this script") - .withLongOpt("file") - .isRequired() - .create(FILE_OPTION)); + .desc("run this script") + .longOpt("file") + .required() + .build()); // -p <port> runs against this port - options.addOption(OptionBuilder - .withArgName("port") + options.addOption(Option.builder(PORT_OPTION) + .argName("port") .hasArg() - .withDescription("runs against this port") - .withLongOpt("port") - .isRequired() - .create(PORT_OPTION)); + .desc("runs against this port") + .longOpt("port") + .required() + .build()); // -h <host> runs against this host - options.addOption(OptionBuilder - .withArgName("host") + options.addOption(Option.builder(HOST_OPTION) + .argName("host") .hasArg() - .withDescription("runs against this host (defaults to localhost)") - .withLongOpt("host") - .isRequired(false) - .create(HOST_OPTION)); + .desc("runs against this host (defaults to localhost)") + .longOpt("host") + .required(false) + .build()); // -s <shabang> sets shabang - options.addOption(OptionBuilder - .withArgName("shabang") + options.addOption(Option.builder(SHABANG_OPTION) + .argName("shabang") .hasArg() - .withDescription("sets shabang (defaults to empty)") - .withLongOpt("shabang") - .isRequired(false) - .create(SHABANG_OPTION)); + .desc("sets shabang (defaults to empty)") + .longOpt("shabang") + .required(false) + .build()); // -v sets logging to verbose - options.addOption(OptionBuilder - .withDescription("prints lots of logging") - .withLongOpt("verbose") - .isRequired(false) - .create(VERBOSE_OPTION)); + options.addOption(Option.builder(VERBOSE_OPTION) + .desc("prints lots of logging") + .longOpt("verbose") + .required(false) + .build()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/3a800d2f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 807d99c..8a0997d 100644 --- a/pom.xml +++ b/pom.xml @@ -607,7 +607,7 @@ <commons-collections.version>3.2.2</commons-collections.version> <commons-lang.version>2.6</commons-lang.version> <commons-codec.version>1.7</commons-codec.version> - <commons-cli.version>1.2</commons-cli.version> + <commons-cli.version>1.4</commons-cli.version> <commons-pool.version>1.6</commons-pool.version> <commons-configuration.version>1.9</commons-configuration.version> <commons-dbcp.version>1.4</commons-dbcp.version> http://git-wip-us.apache.org/repos/asf/james-project/blob/3a800d2f/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java ---------------------------------------------------------------------- diff --git a/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java b/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java index f705bc1..60e9c04 100644 --- a/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java +++ b/server/container/cli/src/main/java/org/apache/james/cli/ServerCmd.java @@ -29,10 +29,10 @@ import java.util.function.Function; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.cli.PosixParser; import org.apache.commons.lang.time.StopWatch; import org.apache.james.cli.exceptions.InvalidArgumentNumberException; import org.apache.james.cli.exceptions.JamesCliException; @@ -142,7 +142,7 @@ public class ServerCmd { @VisibleForTesting static CommandLine parseCommandLine(String[] args) throws ParseException { - CommandLineParser parser = new PosixParser(); + CommandLineParser parser = new DefaultParser(); CommandLine commandLine = parser.parse(createOptions(), args); if (commandLine.getArgs().length < 1) { throw new MissingCommandException(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
