SONAR-22036 Fix logback initialization for old bootstrappers

Because of https://jira.qos.ch/browse/LOGBACK-1537 it is not possible to use an include + configuring Logback
manually via classpath loading without having very verbose logs appearing at startup.

Duplicated the shared content in each log config file to fix the issue.

diff --git a/sonar-scanner-engine/src/main/resources/logback-shared.xml b/sonar-scanner-engine/src/main/resources/logback-shared.xml
deleted file mode 100644 (file)
index 83d4902..0000000
--- a/sonar-scanner-engine/src/main/resources/logback-shared.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- This file is shared between the old bootstrapping entry point and new bootstrapping -->
-<included>
-  <!-- BeanUtils generate too many DEBUG logs when sonar.verbose is set -->
-  <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="INFO"/>
-
-  <!-- Spring generates too many DEBUG logs when sonar.verbose is set -->
-  <logger name="org.springframework" level="INFO"/>
-
-  <!-- AbstractApplicationContext generate too verbose warning if warn is Enabled -->
-  <logger name="org.springframework.context.annotation.AnnotationConfigApplicationContext" level="ERROR"/>
-
-  <logger name="org.sonar.core.platform.PriorityBeanFactory" level="INFO"/>
-</included>

diff --git a/sonar-scanner-engine/src/main/resources/logback.xml b/sonar-scanner-engine/src/main/resources/logback.xml
index 4080ae54558300d2b2b3da2b379efd770549f4c3..c64f28abec76c4025db2e91f7354cfab27b939b7 100644 (file)
--- a/sonar-scanner-engine/src/main/resources/logback.xml
+++ b/sonar-scanner-engine/src/main/resources/logback.xml
@@ -2,9 +2,8 @@
 <!DOCTYPE configuration>
 <!-- This logback configuration is used when the scanner engine is bootstrapped using the SonarScannerCli class. -->
 
-<configuration>
+<configuration scan="false">
   <import class="ch.qos.logback.core.ConsoleAppender"/>
-  <include resource="logback-shared.xml"/>
 
   <appender name="STDOUT" class="ConsoleAppender">
     <encoder class="org.sonar.scanner.bootstrap.ScannerLogbackEncoder"/>
@@ -13,4 +12,18 @@
   <root level="info">
     <appender-ref ref="STDOUT"/>
   </root>
+
+  <!-- BeanUtils generate too many DEBUG logs when sonar.verbose is set -->
+  <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="INFO"/>
+
+  <!-- Spring generates too many DEBUG logs when sonar.verbose is set -->
+  <logger name="org.springframework" level="INFO"/>
+
+  <!-- AbstractApplicationContext generate too verbose warning if warn is Enabled -->
+  <logger name="org.springframework.context.annotation.AnnotationConfigApplicationContext" level="ERROR"/>
+
+  <logger name="org.sonar.core.platform.PriorityBeanFactory" level="INFO"/>
 </configuration>
\ No newline at end of file

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 65b12b2ed24bfeab07afb642dfcbf86f4c5faa71..ccf804462b6d8b702ed65d3a7a459ae4365da4b8 100644 (file)
--- 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
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration debug="false">
-  <include resource="logback-shared.xml"/>
-
   <!--
   
   This file is loaded by bootstrappers like Ant Task and Java Runner.
@@ -24,4 +22,18 @@
     <appender-ref ref="STDOUT"/>
   </root>
 
+  <!-- BeanUtils generate too many DEBUG logs when sonar.verbose is set -->
+  <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="INFO"/>
+
+  <!-- Spring generates too many DEBUG logs when sonar.verbose is set -->
+  <logger name="org.springframework" level="INFO"/>
+
+  <!-- AbstractApplicationContext generate too verbose warning if warn is Enabled -->
+  <logger name="org.springframework.context.annotation.AnnotationConfigApplicationContext" level="ERROR"/>
+
+  <logger name="org.sonar.core.platform.PriorityBeanFactory" level="INFO"/>
+
 </configuration>