From 3bb5f2ea2a18f9e3891e88ae1fb4df4c8ec02f7a Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Tue, 7 Feb 2023 14:03:32 +0100
Subject: [PATCH] Upgrade logback conf to new canonical format

---
 src/core/src/test/resources/logback-test.xml  | 35 +++++++++++--------
 .../src/test/resources/logback-test.xml       | 35 +++++++++++--------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/src/core/src/test/resources/logback-test.xml b/src/core/src/test/resources/logback-test.xml
index 76412aaa..0d298542 100644
--- a/src/core/src/test/resources/logback-test.xml
+++ b/src/core/src/test/resources/logback-test.xml
@@ -1,26 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+   Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
+-->
+
+<!DOCTYPE configuration>
+
 <configuration>
+  <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
+  <import class="ch.qos.logback.core.ConsoleAppender"/>
 
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
+  <appender name="STDOUT" class="ConsoleAppender">
+    <encoder class="PatternLayoutEncoder">
       <pattern>%highlight(%-5level) %logger{15} - %message%n%xException{10}</pattern>
     </encoder>
   </appender>
 
-  <logger name="play" level="INFO" />
-  <logger name="application" level="DEBUG" />
-
-  <logger name="play.api.db.slick" level="WARN" />
+  <logger name="play" level="INFO"/>
+  <logger name="application" level="DEBUG"/>
+  <logger name="play.api.db.slick" level="WARN"/>
 
   <root level="WARN">
-    <appender-ref ref="STDOUT" />
+    <appender-ref ref="STDOUT"/>
   </root>
-  
+
   <!-- Off these ones as they are annoying, and anyway we manage configuration ourself -->
-  <logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF" />
-  <logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF" />
-  <logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF" />
-  <logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF" />
-  <logger name="slick" level="OFF" />
-  
+  <logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF"/>
+  <logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF"/>
+  <logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF"/>
+  <logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF"/>
+  <logger name="slick" level="OFF"/>
 
 </configuration>
diff --git a/src/evolutions/src/test/resources/logback-test.xml b/src/evolutions/src/test/resources/logback-test.xml
index 76412aaa..0d298542 100644
--- a/src/evolutions/src/test/resources/logback-test.xml
+++ b/src/evolutions/src/test/resources/logback-test.xml
@@ -1,26 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+   Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
+-->
+
+<!DOCTYPE configuration>
+
 <configuration>
+  <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
+  <import class="ch.qos.logback.core.ConsoleAppender"/>
 
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
+  <appender name="STDOUT" class="ConsoleAppender">
+    <encoder class="PatternLayoutEncoder">
       <pattern>%highlight(%-5level) %logger{15} - %message%n%xException{10}</pattern>
     </encoder>
   </appender>
 
-  <logger name="play" level="INFO" />
-  <logger name="application" level="DEBUG" />
-
-  <logger name="play.api.db.slick" level="WARN" />
+  <logger name="play" level="INFO"/>
+  <logger name="application" level="DEBUG"/>
+  <logger name="play.api.db.slick" level="WARN"/>
 
   <root level="WARN">
-    <appender-ref ref="STDOUT" />
+    <appender-ref ref="STDOUT"/>
   </root>
-  
+
   <!-- Off these ones as they are annoying, and anyway we manage configuration ourself -->
-  <logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF" />
-  <logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF" />
-  <logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF" />
-  <logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF" />
-  <logger name="slick" level="OFF" />
-  
+  <logger name="com.avaje.ebean.config.PropertyMapLoader" level="OFF"/>
+  <logger name="com.avaje.ebeaninternal.server.core.XmlConfigLoader" level="OFF"/>
+  <logger name="com.avaje.ebeaninternal.server.lib.BackgroundThread" level="OFF"/>
+  <logger name="com.gargoylesoftware.htmlunit.javascript" level="OFF"/>
+  <logger name="slick" level="OFF"/>
 
 </configuration>