svn commit: r1764582 - in /sling/trunk/bundles/commons: log-webconsole/pom.xml log/pom.xml log/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java

[chetanm]

Author: chetanm
Date: Thu Oct 13 04:59:31 2016
New Revision: 1764582

URL: http://svn.apache.org/viewvc?rev=1764582&view=rev
Log:
SLING-6144 - Update logback dependency to 1.1.7

Modified:
    sling/trunk/bundles/commons/log-webconsole/pom.xml
    sling/trunk/bundles/commons/log/pom.xml
    
sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java

Modified: sling/trunk/bundles/commons/log-webconsole/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log-webconsole/pom.xml?rev=1764582&r1=1764581&r2=1764582&view=diff
==============================================================================
--- sling/trunk/bundles/commons/log-webconsole/pom.xml (original)
+++ sling/trunk/bundles/commons/log-webconsole/pom.xml Thu Oct 13 04:59:31 2016
@@ -43,7 +43,7 @@
   </scm>
 
   <properties>
-    <slf4j.version>1.6.4</slf4j.version>
+    <slf4j.version>1.7.21</slf4j.version>
     <logback.version>1.1.2</logback.version>
     <pax-exam.version>3.5.0</pax-exam.version>
 

Modified: sling/trunk/bundles/commons/log/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/pom.xml?rev=1764582&r1=1764581&r2=1764582&view=diff
==============================================================================
--- sling/trunk/bundles/commons/log/pom.xml (original)
+++ sling/trunk/bundles/commons/log/pom.xml Thu Oct 13 04:59:31 2016
@@ -45,8 +45,8 @@
   </scm>
 
   <properties>
-    <slf4j.version>1.6.4</slf4j.version>
-    <logback.version>1.1.2</logback.version>
+    <slf4j.version>1.7.21</slf4j.version>
+    <logback.version>1.1.7</logback.version>
     <pax-exam.version>3.5.0</pax-exam.version>
 
     <bundle.build.dir>

Modified: 
sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java?rev=1764582&r1=1764581&r2=1764582&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java
 (original)
+++ 
sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java
 Thu Oct 13 04:59:31 2016
@@ -566,7 +566,7 @@ public class LogbackManager extends Logg
                         
GenericConfigurator.informContextOfURLUsedForConfiguration(context, mainURL);
                         configurator.doConfigure(eventList);
                         addInfo("Re-registering previous fallback 
configuration once more as a fallback configuration point");
-                        configurator.registerSafeConfiguration();
+                        configurator.registerSafeConfiguration(eventList);
                     } catch (JoranException e) {
                         addError("Unexpected exception thrown by a 
configuration considered safe.", e);
                     }