(sling-org-apache-sling-commons-log) branch master updated: SLING-13067 Bump logback to 1.5.32 (#30)

[enorman]

This is an automated email from the ASF dual-hosted git repository.

enorman pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-log.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e290ed  SLING-13067 Bump logback to 1.5.32 (#30)
9e290ed is described below

commit 9e290edfb42527d71c4011a0f2ca4318e1489e80
Author: Eric Norman <enor...@apache.org>
AuthorDate: Mon Feb 23 13:31:20 2026 -0800

    SLING-13067 Bump logback to 1.5.32 (#30)
---
 pom.xml                                                        |  2 +-
 .../sling/commons/log/logback/internal/LogConfigManager.java   | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 150b85e..ffe7fa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
     </scm>
 
     <properties>
-        <logback.version>1.5.26</logback.version>
+        <logback.version>1.5.32</logback.version>
         <!-- Higher versions of pax exam cause class loading errors -->
         <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
         
<project.build.outputTimestamp>1763081338</project.build.outputTimestamp>
diff --git 
a/src/main/java/org/apache/sling/commons/log/logback/internal/LogConfigManager.java
 
b/src/main/java/org/apache/sling/commons/log/logback/internal/LogConfigManager.java
index bb43478..5131513 100644
--- 
a/src/main/java/org/apache/sling/commons/log/logback/internal/LogConfigManager.java
+++ 
b/src/main/java/org/apache/sling/commons/log/logback/internal/LogConfigManager.java
@@ -52,7 +52,6 @@ import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.ConsoleAppender;
 import ch.qos.logback.core.Layout;
 import ch.qos.logback.core.OutputStreamAppender;
-import ch.qos.logback.core.joran.spi.ConfigurationWatchList;
 import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil;
 import ch.qos.logback.core.model.Model;
 import ch.qos.logback.core.model.ModelUtil;
@@ -1459,6 +1458,7 @@ public class LogConfigManager extends 
LoggerContextAwareBase
             JoranConfigurator configurator = new 
JoranConfiguratorWrapper(this);
             configurator.setContext(loggerContext);
             final Model failsafeTop = configurator.recallSafeConfiguration();
+            URL topURL = 
ConfigurationWatchListUtil.getMainWatchURL(loggerContext);
 
             loggerContext.reset();
 
@@ -1485,7 +1485,7 @@ public class LogConfigManager extends 
LoggerContextAwareBase
                 addError("Error occurred while configuring Logback", t);
             } finally {
                 if (!success) {
-                    fallbackConfiguration(loggerContext, failsafeTop);
+                    fallbackConfiguration(loggerContext, failsafeTop, topURL);
                 }
                 getStatusManager().remove(statusListener);
                 
SlingStatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext, resetStartTime, 
startTime, success);
@@ -1501,11 +1501,10 @@ public class LogConfigManager extends 
LoggerContextAwareBase
     /**
      * Logic based on ch.qos.logback.classic.joran.ReconfigureOnChangeTask
      */
-    private void fallbackConfiguration(LoggerContext lc, Model failsafeTop) {
+    private void fallbackConfiguration(LoggerContext lc, Model failsafeTop, 
URL topUrl) {
         JoranConfigurator joranConfigurator = new 
JoranConfiguratorWrapper(this);
         joranConfigurator.setContext(context);
-        ConfigurationWatchList oldCWL = 
ConfigurationWatchListUtil.getConfigurationWatchList(context);
-        ConfigurationWatchList newCWL = oldCWL.buildClone();
+        joranConfigurator.setTopURL(topUrl);
 
         if (failsafeTop == null) {
             addWarn("No previous configuration to fall back on.");
@@ -1514,7 +1513,6 @@ public class LogConfigManager extends 
LoggerContextAwareBase
             addInfo("Safe model " + failsafeTop);
             try {
                 lc.reset();
-                
ConfigurationWatchListUtil.registerConfigurationWatchList(context, newCWL);
                 ModelUtil.resetForReuse(failsafeTop);
                 joranConfigurator.processModel(failsafeTop);
                 addInfo("Re-registering previous fallback configuration once 
more as a fallback configuration point");