SONAR-2719 support Maven 3

diff --git a/sonar-batch/src/main/resources/org/sonar/batch/logback-base.xml b/sonar-batch/src/main/resources/org/sonar/batch/logback-base.xml
deleted file mode 100644 (file)
index 618c62a..0000000
--- a/sonar-batch/src/main/resources/org/sonar/batch/logback-base.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<included>
-  <logger name="org.hibernate">
-    <level value="WARN"/>
-  </logger>
-
-  <!-- set DEBUG to activate SQL logs. NOT RECOMMENDED  -->
-  <logger name="org.hibernate.SQL">
-    <level value="ERROR"/>
-  </logger>
-
-  <!-- set INFO to activate SQL statistics. NOT RECOMMENDED  -->
-  <logger name="org.sonar.DBSTATISTICS">
-    <level value="ERROR"/>
-  </logger>
-
-  <logger name="net.sf.ehcache">
-    <level value="WARN"/>
-  </logger>
-
-  <logger name="org.hibernate.cache.ReadWriteCache">
-    <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
-    <level value="ERROR"/>
-  </logger>
-  <logger name="org.hibernate.cache.EhCacheProvider">
-    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
-    <level value="ERROR"/>
-  </logger>
-
-  <root>
-    <level value="${ROOT_LOGGER_LEVEL}"/>
-    <appender-ref ref="STDOUT"/>
-  </root>
-</included>
\ No newline at end of file

diff --git a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml b/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
index 2e65d27a617721492bdc8338922791d32519603b..702b1381ce33c3b4c0e82ee80427be8bcaee4a85 100644 (file)
--- a/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
+++ b/sonar-batch/src/main/resources/org/sonar/batch/logback.xml
@@ -3,8 +3,6 @@
 
   <!--
   This file is directly loaded by Sonar Ant Task 1.1 and Sonar Runner 1.1.
-  Inclusion of logback-base.xml is not supported by these 2 versions, so loggers must
-  be duplicated.
   -->
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

diff --git a/sonar-maven-plugin/src/main/resources/org/sonar/maven/logback.xml b/sonar-maven-plugin/src/main/resources/org/sonar/maven/logback.xml
index 585dc31806ea74c3a29ba8d5bac701426a571638..ee7555ad3eeb7097aadfc7a5e00054d67a4846bf 100644 (file)
--- a/sonar-maven-plugin/src/main/resources/org/sonar/maven/logback.xml
+++ b/sonar-maven-plugin/src/main/resources/org/sonar/maven/logback.xml
@@ -7,8 +7,36 @@
     </encoder>
   </appender>
 
-  <!-- Include definition of loggers. The appender STDOUT is not shared in sonar-batch because
-   format is slightly different between Maven and Ant logs -->
-  <include resource="/org/sonar/batch/logback-base.xml"/>
+  <logger name="org.hibernate">
+    <level value="WARN"/>
+  </logger>
+
+  <!-- set DEBUG to activate SQL logs. NOT RECOMMENDED  -->
+  <logger name="org.hibernate.SQL">
+    <level value="ERROR"/>
+  </logger>
+
+  <!-- set INFO to activate SQL statistics. NOT RECOMMENDED  -->
+  <logger name="org.sonar.DBSTATISTICS">
+    <level value="ERROR"/>
+  </logger>
+
+  <logger name="net.sf.ehcache">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="org.hibernate.cache.ReadWriteCache">
+    <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
+    <level value="ERROR"/>
+  </logger>
+  <logger name="org.hibernate.cache.EhCacheProvider">
+    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
+    <level value="ERROR"/>
+  </logger>
+
+  <root>
+    <level value="${ROOT_LOGGER_LEVEL}"/>
+    <appender-ref ref="STDOUT"/>
+  </root>
 
 </configuration>
\ No newline at end of file

diff --git a/sonar-maven3-plugin/src/main/resources/org/sonar/maven3/logback.xml b/sonar-maven3-plugin/src/main/resources/org/sonar/maven3/logback.xml
index 585dc31806ea74c3a29ba8d5bac701426a571638..ee7555ad3eeb7097aadfc7a5e00054d67a4846bf 100644 (file)
--- a/sonar-maven3-plugin/src/main/resources/org/sonar/maven3/logback.xml
+++ b/sonar-maven3-plugin/src/main/resources/org/sonar/maven3/logback.xml
@@ -7,8 +7,36 @@
     </encoder>
   </appender>
 
-  <!-- Include definition of loggers. The appender STDOUT is not shared in sonar-batch because
-   format is slightly different between Maven and Ant logs -->
-  <include resource="/org/sonar/batch/logback-base.xml"/>
+  <logger name="org.hibernate">
+    <level value="WARN"/>
+  </logger>
+
+  <!-- set DEBUG to activate SQL logs. NOT RECOMMENDED  -->
+  <logger name="org.hibernate.SQL">
+    <level value="ERROR"/>
+  </logger>
+
+  <!-- set INFO to activate SQL statistics. NOT RECOMMENDED  -->
+  <logger name="org.sonar.DBSTATISTICS">
+    <level value="ERROR"/>
+  </logger>
+
+  <logger name="net.sf.ehcache">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="org.hibernate.cache.ReadWriteCache">
+    <!-- removing "An item was expired by the cache while it was locked (increase your cache timeout)" msg -->
+    <level value="ERROR"/>
+  </logger>
+  <logger name="org.hibernate.cache.EhCacheProvider">
+    <!-- removing "org.hibernate.cache.EhCacheProvider - Could not find configuratio)" message -->
+    <level value="ERROR"/>
+  </logger>
+
+  <root>
+    <level value="${ROOT_LOGGER_LEVEL}"/>
+    <appender-ref ref="STDOUT"/>
+  </root>
 
 </configuration>
\ No newline at end of file