Skip to content

Commit f482577

Browse files
Bump commons-cli:commons-cli from 1.9.0 to 1.10.0 (#294)
Bumps [commons-cli:commons-cli](https://github.com/apache/commons-cli) from 1.9.0 to 1.10.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/apache/commons-cli/blob/master/RELEASE-NOTES.txt">commons-cli:commons-cli's changelog</a>.</em></p> <blockquote> <h2>Apache Commons CLI 1.10.0 Release Notes</h2> <p>The Apache Commons CLI team is pleased to announce the release of Apache Commons CLI 1.10.0.</p> <p>Apache Commons CLI provides a simple API for presenting, processing, and validating a Command Line Interface.</p> <p>This is a feature and maintenance release. Java 8 or later is required.</p> <h2>New Features</h2> <ul> <li>CLI-339: Help formatter extension in the new package <a href="https://redirect.github.com/apache/commons-cli/issues/314">#314</a>. Thanks to Claude Warren, Gary Gregory.</li> <li> <pre><code> CommandLine.Builder implements Supplier&lt;CommandLine&gt;. Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> DefaultParser.Builder implements Supplier&lt;DefaultParser&gt;. Thanks to Gary Gregory. </code></pre> </li> <li>CLI-340: Add CommandLine.getParsedOptionValues() <a href="https://redirect.github.com/apache/commons-cli/issues/334">#334</a>. Thanks to Claude Warren, Gary Gregory.</li> <li>CLI-333: org.apache.commons.cli.Option.Builder implements Supplier<!-- raw HTML omitted -->. Thanks to Claude Warren, Gary Gregory.</li> </ul> <h2>Fixed Bugs</h2> <ul> <li> <pre><code> Deprecate CommandLine.Builder() in favor of CommandLine.builder(). Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> Deprecate DeprecatedAttributes.Builder() in favor of DeprecatedAttributes.builder(). Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> Refactor default parser test [#294](apache/commons-cli#294). Thanks to Dávid Szigecsán. </code></pre> </li> <li> <pre><code> Port to JUnit 5. Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> Generics for Converter should use Exception not Throwable. Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> Pick up maven-antrun-plugin version from parent POM org.apache:apache. Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> Javadoc is missing its Overview page. Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> Get mockito version from parent pom ([#351](apache/commons-cli#351)). Thanks to Arnout Engelen. </code></pre> </li> <li> <pre><code> Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80). Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> Deprecate PatternOptionBuilder.PatternOptionBuilder(). Thanks to Arnout Engelen. </code></pre> </li> <li>CLI-341: HelpFormatter infinite loop with 0 width input. Thanks to Ruiqi Dong, Gary Gregory.</li> <li>CLI-349: Fail faster with a more precise NullPointerException: Option.processValue() throws NullPointerException when passed null value with value separator configured. Thanks to Leo Fernandes, Gary Gregory.</li> <li>CLI-344: Fail faster with a more precise NullPointerException: DefaultParser.parse() throws NullPointerException when options parameter is null. Thanks to Ruiqi Dong, Gary Gregory.</li> <li>CLI-347: Options.addOptionGroup(OptionGroup) does not remove required options from requiredOpts list. Thanks to Ruiqi Dong, Gary Gregory.</li> <li> <pre><code> org.apache.commons.cli.Option.Builder.get() should throw IllegalStateException instead of IllegalArgumentException. Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> org.apache.commons.cli.Option.processValue(String) should throw IllegalStateException instead of IllegalArgumentException. Thanks to Gary Gregory. </code></pre> </li> <li> <pre><code> org.apache.commons.cli.OptionBuilder.create() should throw IllegalStateException instead of IllegalArgumentException. Thanks to Gary Gregory. </code></pre> </li> </ul> <h2>Updates</h2> <ul> <li> <pre><code> Bump org.apache.commons:commons-parent from 72 to 85 [#302](apache/commons-cli#302), [#304](apache/commons-cli#304), [#310](apache/commons-cli#310), [#315](apache/commons-cli#315), [#320](apache/commons-cli#320), [#327](apache/commons-cli#327), [#371](apache/commons-cli#371). Thanks to Gary Gregory, Dependabot. </code></pre> </li> <li> <pre><code> [test] Bump commons-io:commons-io from 2.16.1 to 2.20.0 [#309](apache/commons-cli#309), [#337](apache/commons-cli#337). Thanks to Gary Gregory, Dependabot. </code></pre> </li> <li> <pre><code> [test] Bump org.apache.commons:commons-text from 1.12.0 to 1.14.0 [#344](apache/commons-cli#344). Thanks to Gary Gregory, Dependabot. </code></pre> </li> <li> <pre><code> Update site documentation to https://maven.apache.org/xsd/xdoc-2.0.xsd. Thanks to Gary Gregory. </code></pre> </li> </ul> <p>Historical list of changes: <a href="https://commons.apache.org/proper/commons-cli/changes.html">https://commons.apache.org/proper/commons-cli/changes.html</a></p> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/apache/commons-cli/commit/04581158dbebe688518a6d384cf7b611a074ef7a"><code>0458115</code></a> Prepare for the release candidate 1.10.0 RC1</li> <li><a href="https://github.com/apache/commons-cli/commit/6667053aa734dceb19c510e0d33fbe9bba9e4901"><code>6667053</code></a> Prepare for the next release candidate</li> <li><a href="https://github.com/apache/commons-cli/commit/d9e46ab348f3dc213094625f8964543edf1d8320"><code>d9e46ab</code></a> Prepare for the next release candidate</li> <li><a href="https://github.com/apache/commons-cli/commit/045ffbb390b7f904b770672ed3bbc7e1954c0be7"><code>045ffbb</code></a> Use JUnit convention</li> <li><a href="https://github.com/apache/commons-cli/commit/0ab5c5c5f0b1e2994e604237a31a59591a3bd285"><code>0ab5c5c</code></a> Add <a href="https://github.com/Override"><code>@​Override</code></a></li> <li><a href="https://github.com/apache/commons-cli/commit/859d5e5e749c1ec6a4c7f7ead88a587f316d8065"><code>859d5e5</code></a> [CLI-343] OptionFormatter.getBothOpt() lacks validation for Options</li> <li><a href="https://github.com/apache/commons-cli/commit/ea9e408813e0cdf10d3e35fadfe4de19da74f4b0"><code>ea9e408</code></a> Better parameter names</li> <li><a href="https://github.com/apache/commons-cli/commit/7835c1cd5cfd2d201277d01f354aaf3b75763619"><code>7835c1c</code></a> Fix Javadoc for Java 11</li> <li><a href="https://github.com/apache/commons-cli/commit/13563d031a39176b446dcaea5fdc30f2f2940b29"><code>13563d0</code></a> Force sync with Apache GitBox</li> <li><a href="https://github.com/apache/commons-cli/commit/d93119547097041f3f0fb036ec0791f5a697beb2"><code>d931195</code></a> Fix HTML markup</li> <li>Additional commits viewable in <a href="https://github.com/apache/commons-cli/compare/rel/commons-cli-1.9.0...rel/commons-cli-1.10.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=commons-cli:commons-cli&package-manager=maven&previous-version=1.9.0&new-version=1.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Raffi Khatchadourian <[email protected]>
1 parent cba0ba9 commit f482577

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

com.ibm.wala.cast.python.ml/source/com/ibm/wala/cast/python/ml/driver/Ariadne.java

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
import org.apache.commons.cli.CommandLine;
3232
import org.apache.commons.cli.CommandLineParser;
3333
import org.apache.commons.cli.DefaultParser;
34-
import org.apache.commons.cli.HelpFormatter;
3534
import org.apache.commons.cli.Option;
3635
import org.apache.commons.cli.Options;
3736
import org.apache.commons.cli.ParseException;
37+
import org.apache.commons.cli.help.HelpFormatter;
38+
import org.apache.commons.cli.help.HelpFormatter.Builder;
3839
import org.eclipse.lsp4j.Diagnostic;
3940
import org.eclipse.lsp4j.DiagnosticSeverity;
4041

@@ -77,7 +78,7 @@ public static void main(String args[])
7778
+ default_mode
7879
+ ".")
7980
.required(false)
80-
.build();
81+
.get();
8182
options.addOption(modeOpt);
8283

8384
final EnumSet<MODE> portOptModes = EnumSet.of(MODE.server, MODE.daemon, MODE.client);
@@ -91,7 +92,7 @@ public static void main(String args[])
9192
+ collToString(portOptModes)
9293
+ "].")
9394
.required(false)
94-
.build();
95+
.get();
9596
options.addOption(portOpt);
9697
optModes.put(portOpt.getLongOpt(), portOptModes);
9798

@@ -110,7 +111,7 @@ public static void main(String args[])
110111
+ collToString(portOptModes)
111112
+ "]")
112113
.required(false)
113-
.build();
114+
.get();
114115
options.addOption(formatOption);
115116
optModes.put(formatOption.getLongOpt(), formatOptModes);
116117

@@ -130,7 +131,7 @@ public static void main(String args[])
130131
+ collToString(severityOptModes)
131132
+ "]")
132133
.required(false)
133-
.build();
134+
.get();
134135
options.addOption(severityOption);
135136
optModes.put(severityOption.getLongOpt(), severityOptModes);
136137

@@ -146,7 +147,7 @@ public static void main(String args[])
146147
+ collToString(relatedOptModes)
147148
+ "]")
148149
.required(false)
149-
.build();
150+
.get();
150151
options.addOption(relatedOption);
151152
optModes.put(relatedOption.getLongOpt(), relatedOptModes);
152153

@@ -156,7 +157,7 @@ public static void main(String args[])
156157
.argName("help")
157158
.desc("Print usage information")
158159
.required(false)
159-
.build();
160+
.get();
160161
options.addOption(helpOpt);
161162

162163
MODE mode = default_mode;
@@ -381,9 +382,13 @@ public static void main(String args[])
381382
private static final String APP_NAME = "Ariadne";
382383
private static final String APP_DESCRIPTION =
383384
"Ariadne: A Language Server Protocol server and linter for WALA Python/ML analysis";
384-
385-
private static void printUsage(final Options options) {
386-
final HelpFormatter formatter = new HelpFormatter();
387-
formatter.printHelp(APP_NAME + " [arguments] [filenames]", APP_DESCRIPTION, options, null);
385+
private static final String APP_FOOTER =
386+
"Please report issues at http://github.com/wala/ML/issues";
387+
388+
private static void printUsage(final Options options) throws IOException {
389+
Builder builder = HelpFormatter.builder();
390+
final HelpFormatter formatter = builder.get();
391+
formatter.printHelp(
392+
APP_NAME + " [arguments] [filenames]", APP_DESCRIPTION, options, APP_FOOTER, false);
388393
}
389394
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>commons-cli</groupId>
7474
<artifactId>commons-cli</artifactId>
75-
<version>1.9.0</version>
75+
<version>1.10.0</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>org.json</groupId>

0 commit comments

Comments
 (0)