This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-log.git
from 1652447 SLING-12711 - ITPackagingData fails on Windows (#22)
add 77d78bf SLING-11906 Migrate to slf4j 2.x and logback 1.5.x
add c4dd11b SLING-11906 ensure eventadmin and jul-to-slf4j are optional
add 12ff14f SLING-11906 temporary limit builds to linux
add b3fac8b SLING-11906 fix tests for windows and re-enable the default
jenkins operatingSystems
add 416b212 SLING-11906 fix tests for windows
add 3bb8b48 SLING-11906 temporarily disable jdk 21
add 34c0576 SLING-11906 fix tests for windows
add 5c22764 SLING-11906 reduce the code copied from logback-* and shade
to avoid conflicts
add 6e31e01 SLING-11906 suppress sonar warnings
add e4016fb SLING-11906 re-enable the default jdks
add a4f6d24 SLING-11906 improve code coverage and temporarily disable jdk
21
add c7388cf SLING-11906 cleanup
add 374cbae Merge branch 'apache:master' into issue/SLING-11906
add 1392722 bump logback to 1.5.13 and remove PatternLayout workarounds
add 2b70fac bump logback to 5.1.13 and remove PatternLayout workarounds
add 3bbd2e0 Merge branch 'issue/SLING-11906' of
https://github.com/enapps-enorman/sling-org-apache-sling-commons-log into
issue/SLING-11906
add 97fbbbe Merge branch 'master' into issue/SLING-11906
new f03ee52 Merge pull request #18 from enapps-enorman/issue/SLING-11906
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.sling-module.json | 5 +
bnd.bnd | 39 +-
pom.xml | 407 ++---
src/main/appended-resources/META-INF/LICENSE | 25 -
src/main/appended-resources/META-INF/NOTICE | 3 -
.../sling/commons/log/logback/ConfigProvider.java | 9 +-
.../sling/commons/log/logback/OsgiAction.java | 105 +-
.../commons/log/logback/OsgiAppenderRefAction.java | 55 +-
.../commons/log/logback/internal/Activator.java | 128 +-
...gbackResetListener.java => AppenderOrigin.java} | 16 +-
.../log/logback/internal/AppenderTracker.java | 229 ++-
.../internal/ConfigResetRequestHandler.java | 21 +-
.../log/logback/internal/ConfigSourceTracker.java | 135 +-
.../log/logback/internal/FilterTracker.java | 256 ++-
.../log/logback/internal/FilteringListener.java | 30 +-
.../internal/LevelChangePropagatorChecker.java | 76 +
.../commons/log/logback/internal/LogConfig.java | 40 +-
.../log/logback/internal/LogConfigManager.java | 1740 ++++++++++++++----
.../commons/log/logback/internal/LogConstants.java | 212 +++
.../commons/log/logback/internal/LogWriter.java | 96 +-
.../log/logback/internal/LogbackManager.java | 821 ---------
.../log/logback/internal/LogbackResetListener.java | 24 +-
.../log/logback/internal/MaskingMessageUtil.java | 82 +-
.../internal/OsgiAppenderRefInternalAction.java | 93 -
.../logback/internal/OsgiIntegrationListener.java | 101 +
.../log/logback/internal/OsgiInternalAction.java | 179 --
.../log/logback/internal/RootLoggerListener.java | 46 +
.../internal/SLF4JServiceProviderTracker.java | 127 ++
.../internal/SlingConfigurationPrinter.java | 149 +-
.../log/logback/internal/SlingLogPanel.java | 242 +--
.../log/logback/internal/StringConfigProvider.java | 38 +
.../sling/commons/log/logback/internal/Tailer.java | 14 +-
.../log/logback/internal/TurboFilterTracker.java | 113 +-
.../internal/config/ConfigAdminSupport.java | 53 +-
.../internal/config/ConfigurationException.java | 50 +-
.../config/ConfigurationServiceFactory.java | 62 +-
.../internal/config/GlobalConfigurator.java | 20 +-
.../logback/internal/config/LogConfigurator.java | 18 +-
.../config/LogWriterManagedServiceFactory.java | 5 +-
.../config/LoggerManagedServiceFactory.java | 47 +-
.../joran/AppenderRefModelHandlerWrapper.java | 83 +
.../internal/joran/JoranConfiguratorWrapper.java | 80 +
.../internal/joran/ModelHandlerWrapperFactory.java | 69 +
.../internal/joran/OsgiAppenderRefModel.java | 107 ++
.../joran/OsgiAppenderRefModelHandler.java | 75 +
.../log/logback/internal/joran/OsgiModel.java | 39 +
.../logback/internal/joran/OsgiModelHandler.java | 61 +
.../stacktrace/OSGiAwareExceptionHandling.java | 22 +-
.../internal/stacktrace/PackageInfoCollector.java | 58 +-
.../internal/util/LoggerSpecificEncoder.java | 63 +-
.../logback/internal/util/SlingContextUtil.java | 21 +-
.../internal/util/SlingRollingFileAppender.java | 26 +-
.../logback/internal/util/SlingStatusPrinter.java | 40 +-
.../commons/log/logback/internal/util/Util.java | 130 +-
.../commons/log/logback/internal/util/XmlUtil.java | 49 +-
.../sling/commons/log/logback/package-info.java | 4 +-
.../log/logback/spi/DefaultConfigurator.java | 68 +
.../commons/log/logback/webconsole/LogPanel.java | 36 +
.../log/logback/webconsole/LoggerConfig.java | 51 +-
.../log/logback/webconsole/TailerOptions.java | 31 +
.../log/logback/webconsole/package-info.java | 4 +-
.../ch.qos.logback.classic.spi.Configurator | 16 +
src/main/resources/logback-empty.xml | 5 -
src/test/java/SimpleOrigin.java | 30 +
.../sling/commons/log/helpers/LogCapture.java | 91 +
.../sling/commons/log/helpers/ReflectionTools.java | 98 +
.../sling/commons/log/logback/OsgiActionTest.java | 259 +++
.../log/logback/OsgiAppenderRefActionTest.java | 79 +
.../logback/integration/ITAppenderServices.java | 21 +-
.../logback/integration/ITConfigAdminSupport.java | 84 +-
.../log/logback/integration/ITConfigFragments.java | 14 +-
.../log/logback/integration/ITConfigPrinter.java | 39 +-
.../ITConfigRaceCondition_SLING_7239.java | 13 +-
.../log/logback/integration/ITDefaultConfig.java | 3 +-
.../log/logback/integration/ITFilterSupport.java | 17 +-
.../log/logback/integration/ITJULIntegration.java | 5 +-
.../log/logback/integration/ITPackagingData.java | 63 +-
.../log/logback/integration/LogTestBase.java | 44 +-
.../logback/integration/PackagingDataTestUtil.java | 18 +-
.../integration/bundle/PackageDataActivator.java | 2 +-
.../log/logback/internal/ActivatorTest.java | 76 +
.../log/logback/internal/AppenderTrackerTest.java | 254 +++
.../log/logback/internal/BaseTryLoggingTest.java | 65 +
.../internal/ConfigResetRequestHandlerTest.java | 65 +
.../logback/internal/ConfigSourceTrackerTest.java | 179 ++
.../log/logback/internal/FilterTrackerTest.java | 413 +++++
.../logback/internal/FilteringListenerTest.java | 88 +-
.../internal/LevelChangePropagatorCheckerTest.java | 91 +
.../log/logback/internal/LogConfigManagerTest.java | 1925 ++++++++++++++++++++
.../log/logback/internal/LogConfigTest.java | 259 +++
.../log/logback/internal/LogWriterTest.java | 307 ++++
.../logback/internal/LogbackResetListenerTest.java | 52 +
.../logback/internal/LoggerStateContextTest.java | 169 ++
.../MaskingEnsureExceptionHandlingTest.java | 86 +
...MaskingExtendedThrowableProxyConverterTest.java | 43 +
.../logback/internal/MaskingMessageUtilTest.java | 66 +
.../internal/MaskingPatternLayoutEncoderTest.java | 45 +
...gRootCauseFirstThrowableProxyConverterTest.java | 43 +
.../internal/MaskingThrowableProxyTest.java | 171 ++
.../internal/OsgiIntegrationListenerTest.java | 108 ++
.../logback/internal/RootLoggerListenerTest.java | 85 +
.../internal/SLF4JServiceProviderTrackerTest.java | 188 ++
.../internal/SlingConfigurationPrinterTest.java | 439 +++++
.../log/logback/internal/SlingLogPanelTest.java | 784 ++++++++
.../logback/internal/StringConfigProviderTest.java | 41 +
.../commons/log/logback/internal/TailerTest.java | 263 +++
.../log/logback/internal/TestLogConfig.java | 100 -
.../log/logback/internal/TestLogWriter.java | 108 --
.../commons/log/logback/internal/TestTailer.java | 124 --
.../internal/TryApacheCommonsLoggingTest.java | 43 +
.../log/logback/internal/TryJulLoggingTest.java | 65 +
.../log/logback/internal/TryLog4jLoggingTest.java | 42 +
.../logback/internal/TryLogbackLoggingTest.java | 43 +
.../logback/internal/TurboFilterTrackerTest.java | 164 ++
.../internal/config/ConfigAdminSupportTest.java | 90 +
.../config/ConfigurationExceptionTest.java | 68 +
.../config/ConfigurationServiceFactoryTest.java | 101 +
.../internal/config/GlobalConfiguratorTest.java | 150 ++
.../internal/config/LogConfiguratorTest.java | 65 +
.../config/LogWriterManagedServiceFactoryTest.java | 179 ++
.../config/LoggerManagedServiceFactoryTest.java | 278 +++
.../config/TestLoggerManagedServiceFactory.java | 74 -
.../joran/AppenderRefModelHandlerWrapperTest.java | 130 ++
.../joran/JoranConfiguratorWrapperTest.java | 87 +
.../joran/ModelHandlerWrapperFactoryTest.java | 63 +
.../joran/OsgiAppenderRefModelHandlerTest.java | 169 ++
.../internal/joran/OsgiAppenderRefModelTest.java | 113 ++
.../internal/joran/OsgiModelHandlerTest.java | 93 +
.../log/logback/internal/joran/OsgiModelTest.java | 41 +
.../logback/internal/mock/MockLoggerFactory.java | 33 +
.../internal/mock/MockSLF4JServiceProvider.java | 59 +
.../stacktrace/OSGiAwareConverterTest.java | 83 +
.../stacktrace/OSGiAwareExceptionHandlingTest.java | 78 +
.../stacktrace/PackageInfoCollectorTest.java | 145 +-
.../util/AbstractPatternLayoutWrapper.java | 13 +-
.../internal/util/LoggerSpecificEncoderTest.java | 206 ++-
.../internal/util/SlingContextUtilTest.java | 42 +
.../util/SlingRollingFileAppenderTest.java | 62 +
.../internal/util/SlingStatusPrinterTest.java | 102 ++
.../log/logback/internal/util/TestUtils.java | 174 ++
.../log/logback/internal/util/UtilTest.java | 59 +
.../log/logback/internal/util/XmlUtilTest.java | 103 ++
.../internal/webconsole/LoggerConfigTest.java | 85 +
.../internal/webconsole/TailerOptionsTest.java | 65 +
.../log/logback/spi/DefaultConfiguratorTest.java | 66 +
src/test/resources/exam.properties | 21 -
src/test/resources/logback-invalid.txt | 21 +
src/test/resources/logback-invalid.xml | 22 +
src/test/resources/logback-test.xml | 1 -
src/test/resources/logback-test2.xml | 31 +
.../resources/test-osg-appender-ref-config.xml | 4 -
151 files changed, 14688 insertions(+), 3411 deletions(-)
create mode 100644 .sling-module.json
copy
src/main/java/org/apache/sling/commons/log/logback/internal/{LogbackResetListener.java
=> AppenderOrigin.java} (72%)
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/LevelChangePropagatorChecker.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/LogConstants.java
delete mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java
delete mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/OsgiAppenderRefInternalAction.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/OsgiIntegrationListener.java
delete mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/OsgiInternalAction.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/RootLoggerListener.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/SLF4JServiceProviderTracker.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/StringConfigProvider.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/joran/AppenderRefModelHandlerWrapper.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/joran/JoranConfiguratorWrapper.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/joran/ModelHandlerWrapperFactory.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/joran/OsgiAppenderRefModel.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/joran/OsgiAppenderRefModelHandler.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/joran/OsgiModel.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/internal/joran/OsgiModelHandler.java
create mode 100644
src/main/java/org/apache/sling/commons/log/logback/spi/DefaultConfigurator.java
create mode 100644
src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator
create mode 100644 src/test/java/SimpleOrigin.java
create mode 100644
src/test/java/org/apache/sling/commons/log/helpers/LogCapture.java
create mode 100644
src/test/java/org/apache/sling/commons/log/helpers/ReflectionTools.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/OsgiActionTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/OsgiAppenderRefActionTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/ActivatorTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/AppenderTrackerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/BaseTryLoggingTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/ConfigResetRequestHandlerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/ConfigSourceTrackerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/FilterTrackerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/LevelChangePropagatorCheckerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/LogConfigManagerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/LogConfigTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/LogWriterTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/LogbackResetListenerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/LoggerStateContextTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/MaskingEnsureExceptionHandlingTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/MaskingExtendedThrowableProxyConverterTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/MaskingMessageUtilTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/MaskingPatternLayoutEncoderTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/MaskingRootCauseFirstThrowableProxyConverterTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/MaskingThrowableProxyTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/OsgiIntegrationListenerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/RootLoggerListenerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/SLF4JServiceProviderTrackerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/SlingConfigurationPrinterTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/SlingLogPanelTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/StringConfigProviderTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TailerTest.java
delete mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TestLogConfig.java
delete mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TestLogWriter.java
delete mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TestTailer.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TryApacheCommonsLoggingTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TryJulLoggingTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TryLog4jLoggingTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TryLogbackLoggingTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/TurboFilterTrackerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/config/ConfigAdminSupportTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/config/ConfigurationExceptionTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/config/ConfigurationServiceFactoryTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/config/GlobalConfiguratorTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/config/LogConfiguratorTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/config/LogWriterManagedServiceFactoryTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/config/LoggerManagedServiceFactoryTest.java
delete mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/config/TestLoggerManagedServiceFactory.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/joran/AppenderRefModelHandlerWrapperTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/joran/JoranConfiguratorWrapperTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/joran/ModelHandlerWrapperFactoryTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/joran/OsgiAppenderRefModelHandlerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/joran/OsgiAppenderRefModelTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/joran/OsgiModelHandlerTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/joran/OsgiModelTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/mock/MockLoggerFactory.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/mock/MockSLF4JServiceProvider.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/stacktrace/OSGiAwareConverterTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/stacktrace/OSGiAwareExceptionHandlingTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/util/SlingContextUtilTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/util/SlingRollingFileAppenderTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/util/SlingStatusPrinterTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/util/TestUtils.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/util/UtilTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/util/XmlUtilTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/webconsole/LoggerConfigTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/internal/webconsole/TailerOptionsTest.java
create mode 100644
src/test/java/org/apache/sling/commons/log/logback/spi/DefaultConfiguratorTest.java
delete mode 100644 src/test/resources/exam.properties
create mode 100644 src/test/resources/logback-invalid.txt
create mode 100644 src/test/resources/logback-invalid.xml
mode change 100755 => 100644 src/test/resources/logback-test.xml
create mode 100644 src/test/resources/logback-test2.xml
