fix logback configuration in UTs to drastically reduce build verbosity

diff --git a/server/sonar-db-core/pom.xml b/server/sonar-db-core/pom.xml
index 5383b1bbec62e336a369f32a79ad6321ef4cb24a..435c2c271a01f897716da8901ce4310ae951be7f 100644 (file)
--- a/server/sonar-db-core/pom.xml
+++ b/server/sonar-db-core/pom.xml
@@ -134,6 +134,11 @@
             <goals>
               <goal>test-jar</goal>
             </goals>
+            <configuration>
+              <excludes>
+                <exclude>logback-test.xml</exclude>
+              </excludes>
+            </configuration>
           </execution>
         </executions>
       </plugin>

diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/CoreTestDb.java b/server/sonar-db-core/src/test/java/org/sonar/db/CoreTestDb.java
index 8476c8ef8c9447f3d644cad7c8dbb59dd9ba738b..3cfdedd55ce315964cc817e7ca02d1f2e8167bbe 100644 (file)
--- a/server/sonar-db-core/src/test/java/org/sonar/db/CoreTestDb.java
+++ b/server/sonar-db-core/src/test/java/org/sonar/db/CoreTestDb.java
@@ -94,7 +94,7 @@ class CoreTestDb {
         }
       }
       isDefault = (schemaPath == null);
-      LOG.info("Test Database: " + db);
+      LOG.debug("Test Database: " + db);
 
       commands = DatabaseCommands.forDialect(db.getDialect());
       tester = new DataSourceDatabaseTester(db.getDataSource(), commands.useLoginAsSchema() ? login : null);

diff --git a/server/sonar-db-dao/pom.xml b/server/sonar-db-dao/pom.xml
index f76bb60e10bda3483644c63bd315e60959d959a8..1653910359f5d67254985a9e756b7efd1cd14380 100644 (file)
--- a/server/sonar-db-dao/pom.xml
+++ b/server/sonar-db-dao/pom.xml
@@ -93,6 +93,11 @@
             <goals>
               <goal>test-jar</goal>
             </goals>
+            <configuration>
+              <excludes>
+                <exclude>logback-test.xml</exclude>
+              </excludes>
+            </configuration>
           </execution>
         </executions>
       </plugin>

diff --git a/server/sonar-db-dao/src/test/resources/logback-test.xml b/server/sonar-db-dao/src/test/resources/logback-test.xml
new file mode 100644 (file)
index 0000000..4b0ff6d
--- /dev/null
+++ b/server/sonar-db-dao/src/test/resources/logback-test.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration>
+
+  <appender name="STDOUT"
+            class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>
+        %d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.dbunit">
+    <level value="WARN"/>
+  </logger>
+
+  <!-- set to level DEBUG to log SQL requests executed by MyBatis -->
+  <logger name="java.sql">
+    <level value="WARN"/>
+  </logger>
+
+  <!-- required for DryRunDatabaseFactoryTest -->
+  <logger name="org.elasticsearch">
+    <level value="WARN"/>
+  </logger>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="STDOUT"/>
+  </root>
+
+</configuration>

diff --git a/server/sonar-process/src/test/java/org/sonar/process/LoggingRule.java b/server/sonar-process/src/test/java/org/sonar/process/LoggingRule.java
index 3246e0c45276c7b1d39a3f3fda4c5446b38e66c1..1b2289db4090e854caecd9d92014da8883fb0df8 100644 (file)
--- a/server/sonar-process/src/test/java/org/sonar/process/LoggingRule.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/LoggingRule.java
@@ -21,6 +21,7 @@ package org.sonar.process;
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.LoggingEvent;
+import ch.qos.logback.core.joran.spi.JoranException;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.junit.rules.ExternalResource;
@@ -47,6 +48,11 @@ public class LoggingRule extends ExternalResource {
   protected void after() {
     TestLogbackAppender.events.clear();
     setLevel(Level.INFO);
+    try {
+      new LogbackHelper().resetFromXml("/logback-test.xml");
+    } catch (JoranException e) {
+      e.printStackTrace();
+    }
   }
 
   public LoggingRule setLevel(Level level) {

diff --git a/server/sonar-process/src/test/resources/logback-test.xml b/server/sonar-process/src/test/resources/logback-test.xml
new file mode 100644 (file)
index 0000000..7cfba29
--- /dev/null
+++ b/server/sonar-process/src/test/resources/logback-test.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+</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 72521000babfaf6065606d0c968d309fac7263b0..abef1709f75189f6399abcb18f237cca24c61a2d 100644 (file)
--- 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
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<configuration debug="true">
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
 
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
       <pattern>%d{HH:mm:ss.SSS} %-5level - %msg%n</pattern>
     </encoder>
@@ -13,8 +14,13 @@
     </encoder>
   </appender>
 
-  <root level="INFO">
-    <appender-ref ref="STDOUD" />
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE" />
     <appender-ref ref="TESTING" />
   </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
 </configuration>

diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index 35f54740f22cac9d6a2dd434ce1d8485bd4f348a..530cfc2f1ece9cfde748604138f1c1cf6c1f44a1 100644 (file)
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -303,6 +303,11 @@
             <goals>
               <goal>test-jar</goal>
             </goals>
+            <configuration>
+              <excludes>
+                <exclude>logback-test.xml</exclude>
+              </excludes>
+            </configuration>
           </execution>
         </executions>
         <configuration>

diff --git a/server/sonar-server/src/test/resources/logback-test.xml b/server/sonar-server/src/test/resources/logback-test.xml
new file mode 100644 (file)
index 0000000..3e34b0f
--- /dev/null
+++ b/server/sonar-server/src/test/resources/logback-test.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="okhttp3.mockwebserver">
+    <level value="WARN"/>
+  </logger>
+
+</configuration>

diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index bb2965c9caff36f0e2beab9ebd821a4eb830b8ee..a49ee6b5e0f682576a47de2db0967d2d01521c0f 100644 (file)
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -227,6 +227,11 @@
             <goals>
               <goal>test-jar</goal>
             </goals>
+            <configuration>
+              <excludes>
+                <exclude>logback-test.xml</exclude>
+              </excludes>
+            </configuration>
           </execution>
         </executions>
       </plugin>

diff --git a/sonar-plugin-api/src/test/resources/logback-test.xml b/sonar-plugin-api/src/test/resources/logback-test.xml
new file mode 100644 (file)
index 0000000..7cfba29
--- /dev/null
+++ b/sonar-plugin-api/src/test/resources/logback-test.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration debug="false">
+  <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
+
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+      <pattern>
+        %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <level value="INFO"/>
+    <appender-ref ref="CONSOLE"/>
+  </root>
+
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+</configuration>

diff --git a/sonar-scanner-engine/src/test/resources/logback-test.xml b/sonar-scanner-engine/src/test/resources/logback-test.xml
index da6be3344a29d417201d5ec2ee8522c9890222c8..0693729e99c18f2a096a8b54d772d4c3734f9ca2 100644 (file)
--- a/sonar-scanner-engine/src/test/resources/logback-test.xml
+++ b/sonar-scanner-engine/src/test/resources/logback-test.xml
@@ -33,6 +33,9 @@
   <logger name="PERSISTIT">
     <level value="WARN"/>
   </logger>
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
 
   <root>
     <level value="INFO"/>

diff --git a/tests/src/test/resources/logback-test.xml b/tests/src/test/resources/logback-test.xml
index 599faa969f0a836134b849487479afe50d30ed2d..88bfffc9f14dbfcc7dfee0538434b35b7fbe1e12 100644 (file)
--- a/tests/src/test/resources/logback-test.xml
+++ b/tests/src/test/resources/logback-test.xml
@@ -16,4 +16,12 @@
     <appender-ref ref="CONSOLE"/>
   </root>
 
+  <logger name="ch.qos.logback">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="okhttp3.mockwebserver">
+    <level value="WARN"/>
+  </logger>
+
 </configuration>