This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch jee-deletion in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit eff464eeb480b1e81bc66d3d659dd99168d77994 Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Nov 20 12:20:18 2023 +0100 Minor fixes (#1966) --- .../org/apache/logging/log4j/core/test/categories/Appenders.java | 1 - log4j-core-test/src/main/resources/Log4j-config.xsd | 9 --------- .../src/main/java/org/apache/logging/log4j/core/Layout.java | 7 +++++++ log4j-core/src/main/resources/Log4j-config.xsd | 9 --------- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java index a8aaee98b4..dd97f5bcfb 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java @@ -27,6 +27,5 @@ public interface Appenders { interface Jpa {} interface Kafka {} interface MongoDb {} - interface Smtp {} interface ZeroMq {} } diff --git a/log4j-core-test/src/main/resources/Log4j-config.xsd b/log4j-core-test/src/main/resources/Log4j-config.xsd index 8f6687459e..c8b3853090 100644 --- a/log4j-core-test/src/main/resources/Log4j-config.xsd +++ b/log4j-core-test/src/main/resources/Log4j-config.xsd @@ -650,7 +650,6 @@ <element name="Kafka" type="tns:KafkaAppenderType" minOccurs="0" /> <element name="Rewrite" type="tns:RewriteAppenderType" minOccurs="0" /> <element name="Routing" type="tns:RoutingAppenderType" minOccurs="0" /> - <element name="SMTP" type="tns:SMTPAppenderType" minOccurs="0" /> <element name="File" type="tns:FileAppenderType" minOccurs="0" /> <element name="MemoryMappedFile" type="tns:MemoryMappedFileAppenderType" minOccurs="0" /> <element name="RandomAccessFile" type="tns:RandomAccessFileAppenderType" minOccurs="0" /> @@ -918,14 +917,6 @@ </complexContent> </complexType> - <complexType name="SMTPAppenderType"> - <complexContent> - <extension base="tns:AbstractAppenderType"> - <anyAttribute processContents="lax" /> - </extension> - </complexContent> - </complexType> - <complexType name="AbstractFileAppenderType" abstract="true"> <complexContent> <extension base="tns:AbstractAppenderType"> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java index 70e2f57fd1..9c7a81dc31 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java @@ -60,6 +60,13 @@ public interface Layout extends Encoder<LogEvent> { */ byte[] toByteArray(LogEvent event); + /** + * Returns the character set used for encoding log events. + */ + default Charset getCharset() { + return StandardCharsets.UTF_8; + } + /** * Serializes the log event into a String. * diff --git a/log4j-core/src/main/resources/Log4j-config.xsd b/log4j-core/src/main/resources/Log4j-config.xsd index 8f6687459e..c8b3853090 100644 --- a/log4j-core/src/main/resources/Log4j-config.xsd +++ b/log4j-core/src/main/resources/Log4j-config.xsd @@ -650,7 +650,6 @@ <element name="Kafka" type="tns:KafkaAppenderType" minOccurs="0" /> <element name="Rewrite" type="tns:RewriteAppenderType" minOccurs="0" /> <element name="Routing" type="tns:RoutingAppenderType" minOccurs="0" /> - <element name="SMTP" type="tns:SMTPAppenderType" minOccurs="0" /> <element name="File" type="tns:FileAppenderType" minOccurs="0" /> <element name="MemoryMappedFile" type="tns:MemoryMappedFileAppenderType" minOccurs="0" /> <element name="RandomAccessFile" type="tns:RandomAccessFileAppenderType" minOccurs="0" /> @@ -918,14 +917,6 @@ </complexContent> </complexType> - <complexType name="SMTPAppenderType"> - <complexContent> - <extension base="tns:AbstractAppenderType"> - <anyAttribute processContents="lax" /> - </extension> - </complexContent> - </complexType> - <complexType name="AbstractFileAppenderType" abstract="true"> <complexContent> <extension base="tns:AbstractAppenderType">
