From d4d322f8ce3231c0d426249b421c7f3d75e30509 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Thu, 14 Jan 2021 15:17:33 +0100
Subject: [PATCH] Fix logging configuration and references to renamed property
 mvnd.uid

---
 dist/src/main/distro/conf/logback.xml                |  2 +-
 dist/src/main/distro/conf/mvnd.properties            |  2 +-
 .../src/test/resources/logback/logback.xml           | 12 +-----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/dist/src/main/distro/conf/logback.xml b/dist/src/main/distro/conf/logback.xml
index 6b6deb56..3fa5f26d 100644
--- a/dist/src/main/distro/conf/logback.xml
+++ b/dist/src/main/distro/conf/logback.xml
@@ -26,7 +26,7 @@
   <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator" />
 
   <appender name="DAEMON" class="ch.qos.logback.core.FileAppender">
-    <file>${mvnd.daemonStorage}/daemon-${mvnd.uid}.log</file>
+    <file>${mvnd.daemonStorage}/daemon-${mvnd.id}.log</file>
     <encoder>
       <pattern>%d{HH:mm:ss.SSS} %.-1level %msg%n</pattern>
     </encoder>
diff --git a/dist/src/main/distro/conf/mvnd.properties b/dist/src/main/distro/conf/mvnd.properties
index 16173538..8c94e561 100644
--- a/dist/src/main/distro/conf/mvnd.properties
+++ b/dist/src/main/distro/conf/mvnd.properties
@@ -33,7 +33,7 @@
 #   - mvnd.daemonStorage: this property defines the location where mvnd stores its
 #        files (registry and daemon logs).  This property can only be defined as
 #        a system property on the command line
-#   - mvnd.uid: this property is used internally to identify the daemon being created
+#   - mvnd.id: this property is used internally to identify the daemon being created
 #   - mvnd.extClasspath: internal option to specify the maven extension classpath
 #   - mvnd.coreExtensions: internal option to specify the list of maven extension to register
 #
diff --git a/integration-tests/src/test/resources/logback/logback.xml b/integration-tests/src/test/resources/logback/logback.xml
index 69c7fd84..1878ed1d 100644
--- a/integration-tests/src/test/resources/logback/logback.xml
+++ b/integration-tests/src/test/resources/logback/logback.xml
@@ -25,15 +25,8 @@
 <configuration>
   <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator" />
 
-  <!--
-    | write project-specific build log messages to ${project.build.directory}/build.log files
-   -->
-  <appender name="MEM" class="org.mvndaemon.mvnd.logging.smart.ProjectBuildLogAppender">
-    <pattern>[%level] %msg%n</pattern>
-  </appender>
-
   <appender name="DAEMON" class="ch.qos.logback.core.FileAppender">
-    <file>${mvnd.daemonStorage}/daemon-${mvnd.uid}.log</file>
+    <file>${mvnd.daemonStorage}/daemon-${mvnd.id}.log</file>
     <encoder>
       <pattern>%d{HH:mm:ss.SSS} %.-1level %msg%n</pattern>
     </encoder>
@@ -51,7 +44,4 @@
   <logger name="org.apache.maven.lifecycle.internal.builder.BuilderCommon" level="ERROR" />
   <logger name="org.eclipse.aether.internal.impl.WarnChecksumPolicy" level="ERROR" />
 
-  <root level="${consoleLevel:-info}">
-    <appender-ref ref="MEM" />
-  </root>
 </configuration>