From 889c6d3432d0c37b9f1effedd5e2d59f17b88734 Mon Sep 17 00:00:00 2001
From: Zipeng WU <zipeng.wu@sonarsource.com>
Date: Thu, 2 Feb 2023 15:44:33 +0100
Subject: [PATCH] Fix logback config

---
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       |  7 +---
 .../src/test/resources/logback-test.xml       | 15 ++-----
 .../src/test/resources/logback-test.xml       | 15 ++-----
 .../src/test/resources/logback-test.xml       |  3 +-
 .../src/test/resources/logback-test.xml       |  7 +---
 .../org/sonar/process/logback-test.xml        |  7 +---
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../src/test/resources/logback-test.xml       | 11 ++----
 .../org/sonar/batch/bootstrapper/logback.xml  | 39 +++++--------------
 .../resources/org/sonar/batch/logback.xml     |  7 +---
 .../src/test/resources/logback-test.xml       | 39 +++++++------------
 .../src/test/resources/logback-test.xml       |  7 +---
 20 files changed, 74 insertions(+), 182 deletions(-)

diff --git a/server/sonar-auth-ldap/src/test/resources/logback-test.xml b/server/sonar-auth-ldap/src/test/resources/logback-test.xml
index cc9519d939a..c553f2a2911 100644
--- a/server/sonar-auth-ldap/src/test/resources/logback-test.xml
+++ b/server/sonar-auth-ldap/src/test/resources/logback-test.xml
@@ -29,16 +29,11 @@
     </encoder>
   </appender>
 
-  <logger name="org.sonar">
-    <level value="DEBUG"/>
-  </logger>
+  <logger name="org.sonar" level="DEBUG"/>
 
-  <logger name="org.apache.directory">
-    <level value="ERROR"/>
-  </logger>
+  <logger name="org.apache.directory" level="ERROR"/>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
 
diff --git a/server/sonar-ce-task/src/test/resources/logback-test.xml b/server/sonar-ce-task/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-ce-task/src/test/resources/logback-test.xml
+++ b/server/sonar-ce-task/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-ce/src/test/resources/logback-test.xml b/server/sonar-ce/src/test/resources/logback-test.xml
index e6a726d8d0b..6ea7f1a9ce4 100644
--- a/server/sonar-ce/src/test/resources/logback-test.xml
+++ b/server/sonar-ce/src/test/resources/logback-test.xml
@@ -10,13 +10,10 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-db-core/src/test/resources/logback-test.xml b/server/sonar-db-core/src/test/resources/logback-test.xml
index 4b0ff6da04b..64f64754fcd 100644
--- a/server/sonar-db-core/src/test/resources/logback-test.xml
+++ b/server/sonar-db-core/src/test/resources/logback-test.xml
@@ -11,22 +11,15 @@
     </encoder>
   </appender>
 
-  <logger name="org.dbunit">
-    <level value="WARN"/>
-  </logger>
+  <logger name="org.dbunit" level="WARN"/>
 
   <!-- set to level DEBUG to log SQL requests executed by MyBatis -->
-  <logger name="java.sql">
-    <level value="WARN"/>
-  </logger>
+  <logger name="java.sql" level="WARN"/>
 
   <!-- required for DryRunDatabaseFactoryTest -->
-  <logger name="org.elasticsearch">
-    <level value="WARN"/>
-  </logger>
+  <logger name="org.elasticsearch" level="WARN"/>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
 
diff --git a/server/sonar-db-dao/src/test/resources/logback-test.xml b/server/sonar-db-dao/src/test/resources/logback-test.xml
index 4b0ff6da04b..64f64754fcd 100644
--- a/server/sonar-db-dao/src/test/resources/logback-test.xml
+++ b/server/sonar-db-dao/src/test/resources/logback-test.xml
@@ -11,22 +11,15 @@
     </encoder>
   </appender>
 
-  <logger name="org.dbunit">
-    <level value="WARN"/>
-  </logger>
+  <logger name="org.dbunit" level="WARN"/>
 
   <!-- set to level DEBUG to log SQL requests executed by MyBatis -->
-  <logger name="java.sql">
-    <level value="WARN"/>
-  </logger>
+  <logger name="java.sql" level="WARN"/>
 
   <!-- required for DryRunDatabaseFactoryTest -->
-  <logger name="org.elasticsearch">
-    <level value="WARN"/>
-  </logger>
+  <logger name="org.elasticsearch" level="WARN"/>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
 
diff --git a/server/sonar-main/src/test/resources/logback-test.xml b/server/sonar-main/src/test/resources/logback-test.xml
index 4d2e4c8b01f..49ea30482cc 100644
--- a/server/sonar-main/src/test/resources/logback-test.xml
+++ b/server/sonar-main/src/test/resources/logback-test.xml
@@ -10,8 +10,7 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
diff --git a/server/sonar-process/src/test/resources/logback-test.xml b/server/sonar-process/src/test/resources/logback-test.xml
index e6a726d8d0b..6ea7f1a9ce4 100644
--- a/server/sonar-process/src/test/resources/logback-test.xml
+++ b/server/sonar-process/src/test/resources/logback-test.xml
@@ -10,13 +10,10 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-process/src/test/resources/org/sonar/process/logback-test.xml b/server/sonar-process/src/test/resources/org/sonar/process/logback-test.xml
index abef1709f75..16318cbd448 100644
--- a/server/sonar-process/src/test/resources/org/sonar/process/logback-test.xml
+++ b/server/sonar-process/src/test/resources/org/sonar/process/logback-test.xml
@@ -14,13 +14,10 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE" />
     <appender-ref ref="TESTING" />
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 </configuration>
diff --git a/server/sonar-server-common/src/test/resources/logback-test.xml b/server/sonar-server-common/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-server-common/src/test/resources/logback-test.xml
+++ b/server/sonar-server-common/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-webserver-api/src/test/resources/logback-test.xml b/server/sonar-webserver-api/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-webserver-api/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver-api/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-webserver-auth/src/test/resources/logback-test.xml b/server/sonar-webserver-auth/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-webserver-auth/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver-auth/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-webserver-core/src/test/resources/logback-test.xml b/server/sonar-webserver-core/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-webserver-core/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver-core/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-webserver-es/src/test/resources/logback-test.xml b/server/sonar-webserver-es/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-webserver-es/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver-es/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-webserver-webapi/src/test/resources/logback-test.xml b/server/sonar-webserver-webapi/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-webserver-webapi/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver-webapi/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-webserver-ws/src/test/resources/logback-test.xml b/server/sonar-webserver-ws/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-webserver-ws/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver-ws/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/server/sonar-webserver/src/test/resources/logback-test.xml b/server/sonar-webserver/src/test/resources/logback-test.xml
index 0737f7d0161..19099b03f49 100644
--- a/server/sonar-webserver/src/test/resources/logback-test.xml
+++ b/server/sonar-webserver/src/test/resources/logback-test.xml
@@ -10,17 +10,12 @@
     </encoder>
   </appender>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="CONSOLE"/>
   </root>
 
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
+  <logger name="ch.qos.logback" level="WARN"/>
 
-  <logger name="okhttp3.mockwebserver">
-    <level value="WARN"/>
-  </logger>
+  <logger name="okhttp3.mockwebserver" level="WARN"/>
 
 </configuration>
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml b/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
index bf933c3fc8a..52120f96acf 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/bootstrapper/logback.xml
@@ -19,47 +19,28 @@
   </appender>
 
   <!-- BeanUtils generate too many DEBUG logs when sonar.verbose is set -->
-  <logger name="org.apache.commons.beanutils.converters">
-    <level value="WARN"/>
-  </logger>
+  <logger name="org.apache.commons.beanutils.converters" level="WARN"/>
 
   <!-- FileSnapshot generate too many DEBUG logs when sonar.verbose is set -->
-  <logger name="org.eclipse.jgit.internal.storage.file">
-    <level value="INFO"/>
-  </logger>
+  <logger name="org.eclipse.jgit.internal.storage.file" level="INFO"/>
 
   <!-- Spring generates too many DEBUG logs when sonar.verbose is set -->
-  <logger name="org.springframework">
-    <level value="INFO"/>
-  </logger>
+  <logger name="org.springframework" level="INFO"/>
 
   <!-- AbstractApplicationContext generate too verbose warning if warn is Enabled -->
-  <logger name="org.springframework.context.annotation.AnnotationConfigApplicationContext">
-    <level value="ERROR"/>
-  </logger>
+  <logger name="org.springframework.context.annotation.AnnotationConfigApplicationContext" level="ERROR"/>
 
-  <logger name="org.sonar.core.platform.PriorityBeanFactory">
-    <level value="INFO"/>
-  </logger>
+  <logger name="org.sonar.core.platform.PriorityBeanFactory" level="INFO"/>
 
   <!-- sonar.showSql -->
   <!-- see also org.sonar.db.MyBatis#configureLogback() -->
-  <logger name="org.mybatis">
-    <level value="${SQL_LOGGER_LEVEL:-WARN}"/>
-  </logger>
-  <logger name="org.apache.ibatis">
-    <level value="${SQL_LOGGER_LEVEL:-WARN}"/>
-  </logger>
-  <logger name="java.sql">
-    <level value="${SQL_LOGGER_LEVEL:-WARN}"/>
-  </logger>
-  <logger name="java.sql.ResultSet">
-    <level value="WARN"/>
-  </logger>
+  <logger name="org.mybatis" level="${SQL_LOGGER_LEVEL:-WARN}"/>
+  <logger name="org.apache.ibatis" level="${SQL_LOGGER_LEVEL:-WARN}"/>
+  <logger name="java.sql" level="${SQL_LOGGER_LEVEL:-WARN}"/>
+  <logger name="java.sql.ResultSet" level="WARN"/>
 
-  <root>
+  <root level="${ROOT_LOGGER_LEVEL}">
     <!-- sonar.verbose -->
-    <level value="${ROOT_LOGGER_LEVEL}"/>
     <appender-ref ref="STDOUT"/>
   </root>
 
diff --git a/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml b/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml
index 4763605d094..462caaf66cf 100644
--- a/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml
+++ b/sonar-scanner-engine/src/main/resources/org/sonar/batch/logback.xml
@@ -15,13 +15,10 @@
   </appender>
 
   <!-- BeanUtils generate to many DEBUG logs when sonar.verbose is set -->
-  <logger name="org.apache.commons.beanutils.converters">
-    <level value="WARN"/>
-  </logger>
+  <logger name="org.apache.commons.beanutils.converters" level="WARN"/>
 
-  <root>
+  <root level="${ROOT_LOGGER_LEVEL}">
     <!-- sonar.verbose -->
-    <level value="${ROOT_LOGGER_LEVEL}"/>
     <appender-ref ref="STDOUT"/>
   </root>
 
diff --git a/sonar-scanner-engine/src/test/resources/logback-test.xml b/sonar-scanner-engine/src/test/resources/logback-test.xml
index 0693729e99c..d118e00aa3f 100644
--- a/sonar-scanner-engine/src/test/resources/logback-test.xml
+++ b/sonar-scanner-engine/src/test/resources/logback-test.xml
@@ -12,33 +12,24 @@
   </appender>
 
   <!-- BeanUtils generate to many DEBUG logs when sonar.verbose is set -->
-  <logger name="org.apache.commons.beanutils.converters">
-    <level value="WARN"/>
-  </logger>
+  <logger name="org.apache.commons.beanutils.converters" level="WARN"/>
 
   <!-- sonar.showSql -->
   <!-- see also org.sonar.db.MyBatis#configureLogback() -->
-  <logger name="org.mybatis">
-    <level value="WARN"/>
-  </logger>
-  <logger name="org.apache.ibatis">
-    <level value="WARN"/>
-  </logger>
-  <logger name="java.sql">
-    <level value="WARN"/>
-  </logger>
-  <logger name="java.sql.ResultSet">
-    <level value="WARN"/>
-  </logger>
-  <logger name="PERSISTIT">
-    <level value="WARN"/>
-  </logger>
-  <logger name="ch.qos.logback">
-    <level value="WARN"/>
-  </logger>
-
-  <root>
-    <level value="INFO"/>
+  <logger name="org.mybatis" level="WARN"/>
+
+  <logger name="org.apache.ibatis" level="WARN"/>
+
+  <logger name="java.sql" level="WARN"/>
+
+  <logger name="java.sql.ResultSet" level="WARN"/>
+
+  <logger name="PERSISTIT" level="WARN"/>
+
+  <logger name="ch.qos.logback" level="WARN"/>
+
+
+  <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
 
diff --git a/sonar-testing-ldap/src/test/resources/logback-test.xml b/sonar-testing-ldap/src/test/resources/logback-test.xml
index f0b4f642ca5..0963f5009f2 100644
--- a/sonar-testing-ldap/src/test/resources/logback-test.xml
+++ b/sonar-testing-ldap/src/test/resources/logback-test.xml
@@ -29,12 +29,9 @@
     </encoder>
   </appender>
 
-  <logger name="org.apache">
-    <level value="ERROR"/>
-  </logger>
+  <logger name="org.apache" level="ERROR"/>
 
-  <root>
-    <level value="INFO"/>
+  <root level="INFO">
     <appender-ref ref="STDOUT"/>
   </root>
 
-- 
2.39.5