[maven] branch maven-3.8.x updated: [MNG-7181] Make --version support -q

[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 7a8acdd  [MNG-7181] Make --version support -q
7a8acdd is described below

commit 7a8acdd8e66de81b4f7f918905976191837bf147
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Jul 3 19:17:19 2021 +0200

    [MNG-7181] Make --version support -q
---
 .../src/main/java/org/apache/maven/cli/CLIReportingUtils.java    | 7 +++++++
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 97a2db6..57be196 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -75,6 +75,13 @@ public final class CLIReportingUtils
         return version.toString();
     }
 
+    public static String showVersionMinimal()
+    {
+        Properties properties = getBuildProperties();
+        String version = reduce( properties.getProperty( 
BUILD_VERSION_PROPERTY ) );
+        return ( version != null ? version : "<version unknown>" );
+    }
+
     /**
      * Create a human readable string containing the Maven version, 
buildnumber, and time of build
      *
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 feed905..fbcb05f 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
@@ -433,7 +433,14 @@ public class MavenCli
 
         if ( cliRequest.commandLine.hasOption( CLIManager.VERSION ) )
         {
-            System.out.println( CLIReportingUtils.showVersion() );
+            if ( cliRequest.commandLine.hasOption( CLIManager.QUIET ) )
+            {
+                System.out.println( CLIReportingUtils.showVersionMinimal() );
+            }
+            else
+            {
+                System.out.println( CLIReportingUtils.showVersion() );
+            }
             throw new ExitException( 0 );
         }
     }