You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2025/01/11 15:53:35 UTC
(cxf) branch 4.0.x-fixes updated (49d71b57f2 -> e1418b4300)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 49d71b57f2 Recording .gitmergeinfo Changes
new 42f5b96c2d CXF-9094: Hard coded org.slf4j.impl.StaticLoggerBinder of slf4j 1.x in LogUtils (#2220)
new e1418b4300 Recording .gitmergeinfo Changes
The 2 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:
.gitmergeinfo | 2 ++
core/src/main/java/org/apache/cxf/common/logging/LogUtils.java | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
(cxf) 01/02: CXF-9094: Hard coded org.slf4j.impl.StaticLoggerBinder of slf4j 1.x in LogUtils (#2220)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 42f5b96c2dcec0f17640fbb940d2ecb36ea7766f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jan 11 09:01:46 2025 -0500
CXF-9094: Hard coded org.slf4j.impl.StaticLoggerBinder of slf4j 1.x in LogUtils (#2220)
(cherry picked from commit a52e4bcf3be3fbf1862d738d5498ad6e74839872)
---
core/src/main/java/org/apache/cxf/common/logging/LogUtils.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
index 09727e68a3..3bf3cd64c7 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
@@ -98,7 +98,14 @@ public final class LogUtils {
// as we'll just use j.u.l and pax-logging will pick it up fine
// If we don't call this and there isn't a slf4j impl avail,
// you get warnings printed to stderr about NOPLoggers and such
- Class.forName("org.slf4j.impl.StaticLoggerBinder");
+ try {
+ // SLF4J 2.x
+ Class.forName("org.slf4j.spi.SLF4JServiceProvider");
+ } catch (final ClassNotFoundException ex) {
+ // SLF4J 1.x
+ Class.forName("org.slf4j.impl.StaticLoggerBinder");
+ }
+
Class<?> cls = Class.forName("org.slf4j.LoggerFactory");
Class<?> fcls = cls.getMethod("getILoggerFactory").invoke(null).getClass();
String clsName = fcls.getName();
(cxf) 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e1418b43002b622a5e2979e8068b64c8073c5eb0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Jan 11 10:49:08 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 81e41e6dab..6753a53fea 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -57,6 +57,7 @@ M 2d7a1d2b158f13efd87b75d7b4959730d4968f91
M 2d9434b4d1cf8579d6c5d57afef307b8ea1b9393
M 2e61db4b5014fe6d7e8309301788585936375476
M 2ed3a54a39244463e11ef8831efe8913e033d85e
+M 2f79660306ce75e9d9df6ddeaf013f213a98ea57
M 30d54b937e1f039e991e0a0887d47352976849df
M 311390c4451d947c3ef8f773c6325ba13c699552
M 3130506b4c8b6ff820905dab7c8def6b22ace2ba
@@ -90,6 +91,7 @@ M 436721d94079bf5b91a18e37bdcbf3fb7560d270
M 446a06489e4a8d9e1f84157abb4c0ff4e0dd93dc
M 4490c7cfd23b4afebc65ecf3e423bbae9abc2ed3
M 44ea6efe6c32f5539e560763c61f208f22fa6147
+M 45d81ef6fe8709ac19effee9c5ebef9792e85732
M 477aa5572cec985bbc8ac8e19316eb1890d2b8fd
M 481eb81a604a4875f0e672b28908f292a07fe9a5
M 483fe3b17c3d9b83c18fb8540b69ddc6ae88b2b2