You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/10/06 07:57:38 UTC
[logging-log4j2] 03/13: Restored `Log4jMarker` visibility in SLF4J adapters (#1414)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/2.21.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b8d08c40bf39ace58c02b39ea397793e0361985f
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Oct 5 14:45:53 2023 +0200
Restored `Log4jMarker` visibility in SLF4J adapters (#1414)
---
.../java/org/apache/logging/slf4j/Log4jMarker.java | 2 +-
.../java/org/apache/logging/slf4j/Log4jMarker.java | 2 +-
.../1414_restore_SLF4J_Log4jMarker_visibility.xml | 26 ++++++++++++++++++++++
src/site/_release-notes/_2.x.x.adoc | 1 +
4 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
index 64e5fe1993..8379780e52 100644
--- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
+++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
@@ -29,7 +29,7 @@ import org.slf4j.Marker;
/**
* Log4j/SLF4J {@link Marker} type bridge.
*/
-class Log4jMarker implements Marker {
+public class Log4jMarker implements Marker {
public static final long serialVersionUID = 1590472L;
diff --git a/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
index 64e5fe1993..8379780e52 100644
--- a/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
+++ b/log4j-slf4j2-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
@@ -29,7 +29,7 @@ import org.slf4j.Marker;
/**
* Log4j/SLF4J {@link Marker} type bridge.
*/
-class Log4jMarker implements Marker {
+public class Log4jMarker implements Marker {
public static final long serialVersionUID = 1590472L;
diff --git a/src/changelog/.2.x.x/1414_restore_SLF4J_Log4jMarker_visibility.xml b/src/changelog/.2.x.x/1414_restore_SLF4J_Log4jMarker_visibility.xml
new file mode 100644
index 0000000000..4bc5517ddc
--- /dev/null
+++ b/src/changelog/.2.x.x/1414_restore_SLF4J_Log4jMarker_visibility.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to you under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://logging.apache.org/log4j/changelog"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ type="fixed">
+ <issue id="1414" link="https://github.com/apache/logging-log4j2/issues/1414"/>
+ <author id="github:ppkarwasz"/>
+ <author id="github:vy"/>
+ <description format="asciidoc">Restored `Log4jMarker` visibility in SLF4J adapters</description>
+</entry>
diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc
index bcc9f57543..df3a23e76d 100644
--- a/src/site/_release-notes/_2.x.x.adoc
+++ b/src/site/_release-notes/_2.x.x.adoc
@@ -78,6 +78,7 @@ For complete information on Apache Log4j 2, including instructions on how to sub
* Avoided using released objects in `StackTraceStringResolver` of `JsonTemplateLayout` (https://github.com/apache/logging-log4j2/pull/1380[1380])
* Added missing setter for `connectionStringSource` in `MongoDb4Provider` builder (https://github.com/apache/logging-log4j2/issues/1389[1389])
* Fixed NPE in `PluginElementVisitor` (https://github.com/apache/logging-log4j2/issues/1391[1391])
+* Restored `Log4jMarker` visibility in SLF4J adapters (https://github.com/apache/logging-log4j2/issues/1414[1414])
* Fixed buffer size in `Log4jFixedFormatter` date time formatter (https://github.com/apache/logging-log4j2/pull/1418[1418])
* Replaced the usage of `System.out` in `StackLocator` for warnings with `System.err` (https://github.com/apache/logging-log4j2/issues/1484[1484])
* Fixed concurrent date-time formatting issue in `PatternLayout` (https://github.com/apache/logging-log4j2/issues/1485[1485])