[maven-mvnd] branch master updated: Prompter prompt should not prepend the projectId when there's only one project, fixes #816

[gnodet]

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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git


The following commit(s) were added to refs/heads/master by this push:
     new 4d24010f Prompter prompt should not prepend the projectId when there's 
only one project, fixes #816
4d24010f is described below

commit 4d24010f558500f929f1d947c72eaecd5af25027
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Mar 14 10:02:12 2023 +0100

    Prompter prompt should not prepend the projectId when there's only one 
project, fixes #816
    
    Also make sure the daemon prompter log only goes to the daemon log
---
 .../main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java  | 5 ++++-
 dist/src/main/distro/mvn/conf/logging/logback-daemon.xml             | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java 
b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
index 4e1ddc32..5ca059d8 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
@@ -350,7 +350,10 @@ public class TerminalOutput implements ClientOutput {
                 readInput.writeLock().lock();
                 try {
                     clearDisplay();
-                    terminal.writer().printf("[%s] %s", prompt.getProjectId(), 
prompt.getMessage());
+                    String msg = (maxThreads > 1)
+                            ? String.format("[%s] %s", prompt.getProjectId(), 
prompt.getMessage())
+                            : prompt.getMessage();
+                    terminal.writer().print(msg);
                     terminal.flush();
                     StringBuilder sb = new StringBuilder();
                     while (true) {
diff --git a/dist/src/main/distro/mvn/conf/logging/logback-daemon.xml 
b/dist/src/main/distro/mvn/conf/logging/logback-daemon.xml
index 3fa5f26d..97a6053b 100644
--- a/dist/src/main/distro/mvn/conf/logging/logback-daemon.xml
+++ b/dist/src/main/distro/mvn/conf/logging/logback-daemon.xml
@@ -36,6 +36,10 @@
     <appender-ref ref="DAEMON" />
   </logger>
 
+  <logger name="org.mvndaemon.mvnd.interactivity" level="DEBUG" 
additivity="false">
+    <appender-ref ref="DAEMON" />
+  </logger>
+
   <logger name="Sisu" level="INFO" />
 
   <!-- suppress annoying @threadSafe and checksum failure warning messages -->