This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch MNG-7354 in repository https://gitbox.apache.org/repos/asf/maven.git
commit c6e1a736a9e683832cbf0865504508d0bbbcb5e8 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Dec 13 13:26:46 2021 +0100 Make CLIManager usable outside the o.a..m.cli package --- maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 7 ++++++- .../java/org/apache/maven/cli/CLIManagerDocumentationTest.java | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index 49bf9db..7da7b3a 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -115,7 +115,7 @@ public class CLIManager @Deprecated public static final String DEBUG = "debug"; - protected Options options; + protected final Options options; @SuppressWarnings( "checkstyle:linelength" ) public CLIManager() @@ -163,6 +163,11 @@ public class CLIManager options.addOption( Option.builder().longOpt( DEBUG ).desc( "Produce execution verbose output (deprecated; only kept for backward compatibility)" ).build() ); } + public Options getOptions() + { + return options; + } + public CommandLine parse( String[] args ) throws ParseException { diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java index a652eda..a98cf17 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java @@ -53,7 +53,7 @@ public class CLIManagerDocumentationTest private static class CLIManagerExtension extends CLIManager { - public Collection<Option> getOptions() + public List<Option> getOptionList() { List<Option> optList = new ArrayList<>( options.getOptions() ); Collections.sort( optList, new OptionComparator() ); @@ -66,7 +66,7 @@ public class CLIManagerDocumentationTest StringBuilder sb = new StringBuilder( 512 ); boolean a = true; sb.append( "<table border='1' class='zebra-striped'><tr class='a'><th><b>Options</b></th><th><b>Description</b></th></tr>" ); - for ( Option option : new CLIManagerExtension().getOptions() ) + for ( Option option : new CLIManagerExtension().getOptionList() ) { a = !a; sb.append( "<tr class='" ).append( a ? 'a' : 'b' ).append( "'><td><code>-<a name='" );
