This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/commons-logging.git
commit f87a5f3292c8d8abceb8142c7ffe11e437aaeaa9
Merge: e29c111 d67eefa
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat May 11 17:28:37 2024 +0000
Merge branch 'master' into release
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/logging/LogFactory.java | 8 +++-----
src/main/java/org/apache/commons/logging/LogSource.java | 16 ++++++++--------
.../apache/commons/logging/impl/Log4jApiLogFactory.java | 7 +++++++
.../commons/logging/impl/ServletContextCleaner.java | 7 +++++++
.../org/apache/commons/logging/impl/Slf4jLogFactory.java | 8 ++++++++
.../ServiceLoaderTestCase.java => LogSourceTest.java} | 15 ++++++---------
.../commons/logging/avalon/AvalonLoggerTestCase.java | 6 +++---
.../logging/config/FirstPriorityConfigTestCase.java | 6 +++---
.../commons/logging/config/PriorityConfigTestCase.java | 6 +++---
.../commons/logging/jdk14/CustomConfigAPITestCase.java | 4 ++--
.../commons/logging/jdk14/CustomConfigFullTestCase.java | 4 ++--
.../commons/logging/jdk14/CustomConfigTestCase.java | 4 ++--
.../commons/logging/jdk14/DefaultConfigTestCase.java | 6 +++---
.../org/apache/commons/logging/log4j/StandardTests.java | 4 ++--
.../log4j/log4j12/ApiClasspathStandardTestCase.java | 6 +++---
.../log4j/log4j12/AppClasspathStandardTestCase.java | 6 +++---
.../log4j/log4j12/ChildClasspathStandardTestCase.java | 6 +++---
.../log4j/log4j12/ParentClasspathStandardTestCase.java | 6 +++---
.../logging/log4j2/CallerInformationTestCase.java | 8 +++-----
.../apache/commons/logging/logkit/StandardTestCase.java | 4 ++--
.../commons/logging/pathable/ChildFirstTestCase.java | 6 +++---
.../apache/commons/logging/pathable/GeneralTestCase.java | 6 +++---
.../commons/logging/pathable/ParentFirstTestCase.java | 6 +++---
.../logging/security/SecurityAllowedTestCase.java | 6 +++---
.../logging/security/SecurityForbiddenTestCase.java | 6 +++---
.../logging/serviceloader/ServiceLoaderTestCase.java | 4 ++--
.../commons/logging/servlet/BasicServletTestCase.java | 6 +++---
.../commons/logging/simple/CustomConfigTestCase.java | 4 ++--
.../logging/simple/DateTimeCustomConfigTestCase.java | 4 ++--
.../commons/logging/simple/DefaultConfigTestCase.java | 6 +++---
.../commons/logging/slf4j/CallerInformationTestCase.java | 13 +++++--------
.../org/apache/commons/logging/tccl/BadTCCLTestCase.java | 6 +++---
.../apache/commons/logging/tccl/NullTCCLTestCase.java | 6 +++---
.../commons/logging/tccl/log/TcclDisabledTestCase.java | 6 +++---
.../commons/logging/tccl/log/TcclEnabledTestCase.java | 6 +++---
.../logging/tccl/logfactory/TcclDisabledTestCase.java | 6 +++---
.../logging/tccl/logfactory/TcclEnabledTestCase.java | 6 +++---
38 files changed, 127 insertions(+), 114 deletions(-)
