From d57e0fc36c1412c079b1f1fc70acfef8d331c248 Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Mon, 7 Dec 2020 14:11:10 +0100
Subject: [PATCH] mvnd --help produces no output #238

---
 .../main/java/org/apache/maven/cli/DaemonMavenCli.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index a531d7edc..e6244da83 100644
--- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@ -19,10 +19,12 @@
 package org.apache.maven.cli;
 
 import com.google.inject.AbstractModule;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -267,7 +269,11 @@ void cli(CliRequest cliRequest)
         }
 
         if (cliRequest.commandLine.hasOption(CLIManager.HELP)) {
-            cliManager.displayHelp(System.out);
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try (PrintStream out = new PrintStream(baos, false, StandardCharsets.UTF_8.name())) {
+                cliManager.displayHelp(out);
+            }
+            AbstractLoggingSpy.instance().append(null, new String(baos.toByteArray(), StandardCharsets.UTF_8));
             throw new ExitException(0);
         }