[maven] branch maven-3.8.x updated: [MNG-7180] Make --color option behave more like BSD/GNU grep's --color option

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.8.x by this push:
     new 7b355f7  [MNG-7180] Make --color option behave more like BSD/GNU 
grep's --color option
7b355f7 is described below

commit 7b355f72235c0bd26b872601b38a493ed1cc518b
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Jul 3 18:28:31 2021 +0200

    [MNG-7180] Make --color option behave more like BSD/GNU grep's --color 
option
---
 .../src/main/java/org/apache/maven/cli/CLIManager.java         |  2 +-
 .../src/main/java/org/apache/maven/cli/MavenCli.java           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 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 edd60c9..2ad5424 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
@@ -152,7 +152,7 @@ public class CLIManager
         options.addOption( Option.builder( "up" ).longOpt( "update-plugins" 
).desc( "Ineffective, only kept for backward compatibility" ).build() );
         options.addOption( Option.builder( "npu" ).longOpt( 
"no-plugin-updates" ).desc( "Ineffective, only kept for backward compatibility" 
).build() );
 
-        options.addOption( Option.builder().longOpt( COLOR ).hasArg().desc( 
"Defines the color mode of the output. Available options are auto/always/never" 
).build() );
+        options.addOption( Option.builder().longOpt( COLOR 
).hasArg().optionalArg( true ).desc( "Defines the color mode of the output. 
Supported are 'auto', 'always', 'never'." ).build() );
     }
 
     public CommandLine parse( String[] args )
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index e8e2f74..feed905 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -506,18 +506,18 @@ public class MavenCli
         // LOG COLOR
         String styleColor = cliRequest.getUserProperties().getProperty( 
STYLE_COLOR_PROPERTY, "auto" );
         styleColor = cliRequest.commandLine.getOptionValue( COLOR, styleColor 
);
-        if ( "always".equals( styleColor ) )
+        if ( "always".equals( styleColor ) || "yes".equals( styleColor ) || 
"force".equals( styleColor ) )
         {
             MessageUtils.setColorEnabled( true );
         }
-        else if ( "never".equals( styleColor ) )
+        else if ( "never".equals( styleColor ) || "no".equals( styleColor ) || 
"none".equals( styleColor ) )
         {
             MessageUtils.setColorEnabled( false );
         }
-        else if ( !"auto".equals( styleColor ) )
+        else if ( !"auto".equals( styleColor ) && !"tty".equals( styleColor ) 
&& !"if-tty".equals( styleColor ) )
         {
-            throw new IllegalArgumentException( "Invalid color configuration 
option [" + styleColor
-                + "]. Supported values are (auto|always|never)." );
+            throw new IllegalArgumentException( "Invalid color configuration 
value '" + styleColor
+                + "'. Supported are 'auto', 'always', 'never'." );
         }
         else if ( cliRequest.commandLine.hasOption( CLIManager.BATCH_MODE )
             || cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )