From b574158d9290395c2a6244d93afc87508ea4af3e Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Fri, 19 Feb 2016 08:25:14 -0500
Subject: [PATCH] Update logback layout to new format.

---
 .../src/main/resources/logback.xml                   | 10 +++++-----
 .../src/main/resources/logback.xml                   | 10 +++++-----
 .../src/test/resources/logback.xml                   | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml b/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
index 8ff79629..42815ef6 100644
--- a/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
+++ b/MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml
@@ -1,15 +1,15 @@
 <configuration scan="false">
 
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%-8relative %22c{0} [%-5level] %msg%n</Pattern>
-        </layout>
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%-8relative %22c{0} [%-5level] %msg%n</pattern>
+        </encoder>
     </appender>
 
     <logger name="com.lyndir" level="${mp.log.level:-INFO}" />
 
     <root level="INFO">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="stdout" />
     </root>
 
 </configuration>
diff --git a/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml b/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
index 8ff79629..42815ef6 100644
--- a/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
+++ b/MasterPassword/Java/masterpassword-gui/src/main/resources/logback.xml
@@ -1,15 +1,15 @@
 <configuration scan="false">
 
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%-8relative %22c{0} [%-5level] %msg%n</Pattern>
-        </layout>
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%-8relative %22c{0} [%-5level] %msg%n</pattern>
+        </encoder>
     </appender>
 
     <logger name="com.lyndir" level="${mp.log.level:-INFO}" />
 
     <root level="INFO">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="stdout" />
     </root>
 
 </configuration>
diff --git a/MasterPassword/Java/masterpassword-tests/src/test/resources/logback.xml b/MasterPassword/Java/masterpassword-tests/src/test/resources/logback.xml
index 3d4d25c6..42815ef6 100644
--- a/MasterPassword/Java/masterpassword-tests/src/test/resources/logback.xml
+++ b/MasterPassword/Java/masterpassword-tests/src/test/resources/logback.xml
@@ -1,15 +1,15 @@
 <configuration scan="false">
 
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%-8relative %22c{0} [%-5level] %msg%n</Pattern>
-        </layout>
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%-8relative %22c{0} [%-5level] %msg%n</pattern>
+        </encoder>
     </appender>
 
-    <logger name="com.lyndir.masterpassword" level="${mp.log.level:-TRACE}" />
+    <logger name="com.lyndir" level="${mp.log.level:-INFO}" />
 
     <root level="INFO">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="stdout" />
     </root>
 
 </configuration>