You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2023/01/14 23:18:44 UTC
[logging-log4j2] branch master updated (573a30a702 -> c3276a6d74)
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 573a30a702 Sync .asf.yaml from release-2.x
new f397538492 LOG4J2-3228 - Remove support for java.io.Serializable
new 7bc0a20c56 Merge branch 'master' into dev-master-LOG4J2-3228
new 693bfebab2 Remove Serializable from remaining classes
new dc68c85858 Revert removal of Serializable from log4j-1.2-api
new c3276a6d74 Merge pull request #1199 from jvz/dev-master-LOG4J2-3228
The 12459 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:
.../org/apache/log4j/bridge/AppenderAdapter.java | 4 +-
.../org/apache/log4j/bridge/LayoutAdapter.java | 6 +-
.../org/apache/log4j/bridge/LayoutWrapper.java | 10 +-
.../builders/appender/ConsoleAppenderBuilder.java | 10 +-
.../appender/DailyRollingFileAppenderBuilder.java | 12 +-
.../builders/appender/FileAppenderBuilder.java | 12 +-
.../appender/RollingFileAppenderBuilder.java | 12 +-
.../builders/appender/SocketAppenderBuilder.java | 12 +-
.../builders/appender/SyslogAppenderBuilder.java | 14 +-
.../apache/log4j/layout/Log4j1SyslogLayout.java | 7 +-
.../test/java/org/apache/log4j/CategoryTest.java | 2 +-
.../log4j/builders/Log4j2ListAppenderBuilder.java | 176 +++++------
.../config/AbstractLog4j1ConfigurationTest.java | 24 +-
.../config/Log4j1ConfigurationFactoryTest.java | 21 +-
.../log4j/config/PropertiesConfigurationTest.java | 15 +-
.../log4j/test/AbstractSerializationTest.java | 49 ---
.../logging/log4j/test/SerializableMatchers.java | 58 ----
.../logging/log4j/test/junit/SerialUtil.java | 65 ----
.../apache/logging/log4j/AbstractLoggerTest.java | 16 +-
.../log4j/message/FormattedMessageTest.java | 23 --
.../apache/logging/log4j/message/JsonMessage.java | 1 -
.../log4j/message/LocalizedMessageTest.java | 30 +-
.../MessageFormatMessageSerializationTest.java | 37 ---
.../logging/log4j/message/ObjectMapMessage.java | 4 -
.../logging/log4j/message/ObjectMessageTest.java | 36 +--
.../log4j/message/StringFormattedMessageTest.java | 27 +-
.../status/StatusLoggerSerializationTest.java | 31 --
.../log4j/util/SortedArrayStringMapTest.java | 135 +-------
.../main/java/org/apache/logging/log4j/Level.java | 19 +-
.../main/java/org/apache/logging/log4j/Marker.java | 22 +-
.../org/apache/logging/log4j/MarkerManager.java | 2 -
.../org/apache/logging/log4j/ThreadContext.java | 9 +-
.../log4j/message/AbstractMessageFactory.java | 6 +-
.../apache/logging/log4j/message/Clearable.java | 5 +-
.../log4j/message/DefaultFlowMessageFactory.java | 10 +-
.../logging/log4j/message/FormattedMessage.java | 78 +----
.../log4j/message/FormattedMessageFactory.java | 6 +-
.../logging/log4j/message/LocalizedMessage.java | 59 +---
.../log4j/message/LocalizedMessageFactory.java | 9 +-
.../apache/logging/log4j/message/MapMessage.java | 39 +--
.../org/apache/logging/log4j/message/Message.java | 19 +-
.../log4j/message/MessageFormatMessage.java | 83 +----
.../log4j/message/MessageFormatMessageFactory.java | 5 +-
.../logging/log4j/message/ObjectArrayMessage.java | 254 +++++++--------
.../logging/log4j/message/ObjectMessage.java | 29 +-
.../log4j/message/ParameterizedMessage.java | 29 +-
.../log4j/message/ParameterizedMessageFactory.java | 6 +-
.../ParameterizedNoReferenceMessageFactory.java | 6 +-
.../logging/log4j/message/ReusableMessage.java | 9 +
.../log4j/message/ReusableMessageFactory.java | 12 +-
.../log4j/message/ReusableObjectMessage.java | 3 +-
.../message/ReusableParameterizedMessage.java | 13 +-
.../log4j/message/ReusableSimpleMessage.java | 3 +-
.../logging/log4j/message/SimpleMessage.java | 18 +-
.../log4j/message/SimpleMessageFactory.java | 7 +-
.../log4j/message/StringFormattedMessage.java | 75 +----
.../message/StringFormatterMessageFactory.java | 5 +-
.../logging/log4j/message/StringMapMessage.java | 2 -
.../message/StructuredDataCollectionMessage.java | 1 -
.../logging/log4j/message/StructuredDataId.java | 5 +-
.../log4j/message/StructuredDataMessage.java | 1 -
.../logging/log4j/message/ThreadDumpMessage.java | 51 +--
.../apache/logging/log4j/spi/AbstractLogger.java | 24 +-
.../logging/log4j/spi/DefaultThreadContextMap.java | 1 -
.../log4j/spi/DefaultThreadContextStack.java | 5 +-
.../log4j/spi/MutableThreadContextStack.java | 4 +-
.../apache/logging/log4j/status/StatusData.java | 9 +-
.../apache/logging/log4j/status/StatusLogger.java | 6 -
.../apache/logging/log4j/util/PropertySource.java | 6 +-
.../logging/log4j/util/ReadOnlyStringMap.java | 5 +-
.../logging/log4j/util/SortedArrayStringMap.java | 192 +-----------
.../java/org/apache/logging/log4j/util/Timer.java | 11 +-
.../logging/log4j/cassandra/CassandraManager.java | 22 +-
.../core/test/appender/EncodingListAppender.java | 5 +-
.../log4j/core/test/appender/InMemoryAppender.java | 5 +-
.../log4j/core/test/appender/ListAppender.java | 35 +--
.../apache/logging/log4j/core/LogEventTest.java | 102 +-----
.../log4j/core/LoggerSerializationTest.java | 35 ---
.../org/apache/logging/log4j/core/LookupTest.java | 4 +-
.../logging/log4j/core/TimestampMessageTest.java | 5 +-
.../org/apache/logging/log4j/core/XmlEvents.java | 9 +-
.../log4j/core/appender/ConsoleAppenderTest.java | 8 +-
.../core/appender/FileAppenderPermissionsTest.java | 22 +-
.../log4j/core/appender/FileAppenderTest.java | 34 +-
.../log4j/core/appender/HangingAppender.java | 7 +-
.../log4j/core/appender/InMemoryAppenderTest.java | 4 +-
.../core/appender/SyslogAppenderTestBase.java | 7 +-
.../appender/db/AbstractDatabaseAppenderTest.java | 24 +-
.../appender/db/AbstractDatabaseManagerTest.java | 69 ++---
.../appender/nosql/NoSqlDatabaseManagerTest.java | 28 +-
.../async/AsyncLoggerTimestampMessageTest.java | 7 +-
.../logging/log4j/core/async/BlockingAppender.java | 16 +-
.../log4j/core/async/RingBufferLogEventTest.java | 59 +---
.../log4j/core/config/CustomConfigurationTest.java | 3 +-
.../core/config/ReconfigurationDeadlockTest.java | 24 +-
.../log4j/core/config/TestConfigurator.java | 36 ++-
.../log4j/core/impl/FactoryTestStringMap.java | 1 -
.../FactoryTestStringMapWithoutIntConstructor.java | 1 -
.../core/impl/JdkMapAdapterStringMapTest.java | 40 +--
.../logging/log4j/core/impl/Log4jLogEventTest.java | 139 +--------
.../log4j/core/impl/MutableLogEventTest.java | 124 +-------
.../log4j/core/impl/ThrowableProxyTest.java | 201 +++---------
.../logging/log4j/core/layout/HtmlLayoutTest.java | 11 +-
.../log4j/core/layout/Log4j2_2195_Test.java | 11 +-
.../log4j/core/layout/PatternLayoutTest.java | 2 +-
.../log4j/core/layout/PatternSelectorTest.java | 2 +-
.../core/pattern/DatePatternConverterTest.java | 1 -
.../time/internal/format/FastDateParserTest.java | 25 +-
.../logging/log4j/core/AbstractLogEvent.java | 2 -
.../org/apache/logging/log4j/core/Appender.java | 6 +-
.../java/org/apache/logging/log4j/core/Layout.java | 43 ++-
.../org/apache/logging/log4j/core/LogEvent.java | 31 +-
.../java/org/apache/logging/log4j/core/Logger.java | 34 --
.../apache/logging/log4j/core/StringLayout.java | 66 ++--
.../log4j/core/appender/AbstractAppender.java | 38 +--
.../log4j/core/appender/AbstractFileAppender.java | 9 +-
.../appender/AbstractOutputStreamAppender.java | 5 +-
.../logging/log4j/core/appender/AsyncAppender.java | 20 +-
.../log4j/core/appender/ConsoleAppender.java | 19 +-
.../log4j/core/appender/CountingNoOpAppender.java | 8 +-
.../logging/log4j/core/appender/FileAppender.java | 17 +-
.../logging/log4j/core/appender/FileManager.java | 9 +-
.../logging/log4j/core/appender/HttpAppender.java | 12 +-
.../logging/log4j/core/appender/HttpManager.java | 3 +-
.../core/appender/HttpURLConnectionManager.java | 4 +-
.../core/appender/MemoryMappedFileAppender.java | 13 +-
.../core/appender/MemoryMappedFileManager.java | 23 +-
.../log4j/core/appender/OutputStreamAppender.java | 345 ++++++++++-----------
.../log4j/core/appender/OutputStreamManager.java | 13 +-
.../core/appender/RandomAccessFileAppender.java | 13 +-
.../core/appender/RandomAccessFileManager.java | 15 +-
.../log4j/core/appender/RollingFileAppender.java | 19 +-
.../appender/RollingRandomAccessFileAppender.java | 15 +-
.../log4j/core/appender/SocketAppender.java | 19 +-
.../log4j/core/appender/SyslogAppender.java | 5 +-
.../core/appender/db/AbstractDatabaseAppender.java | 7 +-
.../core/appender/db/AbstractDatabaseManager.java | 31 +-
.../log4j/core/appender/db/ColumnMapping.java | 10 +-
.../log4j/core/appender/nosql/NoSqlAppender.java | 4 +-
.../core/appender/nosql/NoSqlDatabaseManager.java | 12 +-
.../core/appender/rolling/RollingFileManager.java | 35 +--
.../rolling/RollingRandomAccessFileManager.java | 15 +-
.../core/appender/rolling/action/Duration.java | 5 +-
.../rolling/action/PathSortByModificationTime.java | 7 +-
.../core/async/AsyncLoggerConfigDisruptor.java | 4 +-
.../log4j/core/async/RingBufferLogEvent.java | 22 +-
.../log4j/core/config/AbstractConfiguration.java | 3 +-
.../logging/log4j/core/config/OrderComparator.java | 4 +-
.../logging/log4j/core/impl/ExtendedClassInfo.java | 6 +-
.../log4j/core/impl/ExtendedStackTraceElement.java | 6 +-
.../log4j/core/impl/JdkMapAdapterStringMap.java | 1 -
.../logging/log4j/core/impl/Log4jLogEvent.java | 220 +------------
.../logging/log4j/core/impl/MementoLogEvent.java | 272 ++++++++++++++++
.../logging/log4j/core/impl/MementoMessage.java | 6 +-
.../logging/log4j/core/impl/MutableLogEvent.java | 31 +-
.../logging/log4j/core/impl/ThrowableProxy.java | 16 +-
.../logging/log4j/core/layout/AbstractLayout.java | 16 +-
.../log4j/core/layout/AbstractStringLayout.java | 4 +-
.../logging/log4j/core/layout/MessageLayout.java | 67 ----
.../logging/log4j/core/layout/PatternMatch.java | 12 +-
.../log4j/core/net/AbstractSocketManager.java | 5 +-
.../log4j/core/net/DatagramSocketManager.java | 9 +-
.../logging/log4j/core/net/SslSocketManager.java | 16 +-
.../logging/log4j/core/net/TcpSocketManager.java | 13 +-
.../logging/log4j/core/time/MutableInstant.java | 16 +-
.../core/time/internal/format/FastDateFormat.java | 8 -
.../core/time/internal/format/FastDateParser.java | 26 +-
.../core/time/internal/format/FastDatePrinter.java | 29 +-
.../apache/logging/log4j/core/tools/Generate.java | 5 +-
.../log4j/core/util/StringBuilderWriter.java | 334 ++++++++++----------
.../log4j/flume/appender/FlumeAppender.java | 5 +-
.../logging/log4j/flume/appender/FlumeEvent.java | 19 +-
.../log4j/web/appender/ServletAppender.java | 63 ++--
.../org/apache/logging/log4j/jcl/Log4jLog.java | 5 +-
.../logging/log4j/jdbc/appender/JdbcAppender.java | 9 +-
.../log4j/jdbc/appender/JdbcDatabaseManager.java | 59 ++--
.../log4j/jeromq/appender/JeroMqAppender.java | 16 +-
.../logging/log4j/jms/appender/JmsAppender.java | 18 +-
.../logging/log4j/jms/appender/JmsManager.java | 44 +--
.../log4j/jms/appender/JmsAppenderTest.java | 41 ++-
log4j-jms/src/test/resources/JmsAppenderTest.xml | 4 +-
.../jndi/lookup/JndiRestrictedLookupTest.java | 38 ++-
.../appender/AbstractLogEventWrapperEntity.java | 9 +-
.../log4j/jpa/appender/BasicLogEventEntity.java | 11 +-
.../log4j/jpa/appender/JpaDatabaseManager.java | 4 +-
.../log4j/jpa/appender/LogEventEntityTest.java | 3 -
.../logging/log4j/jpa/appender/TestBaseEntity.java | 10 +-
.../log4j/jpa/appender/TestBasicEntity.java | 1 -
.../logging/log4j/jpl/Log4jSystemLoggerTest.java | 25 +-
.../logging/log4j/jul/DefaultLevelConverter.java | 5 +-
.../logging/log4j/jul/test/AbstractLoggerTest.java | 5 +-
.../logging/log4j/jul/test/ListAppender.java | 23 +-
.../log4j/kafka/appender/KafkaAppender.java | 9 +-
.../jackson/xml/AbstractLogEventXmlMixIn.java | 2 -
.../xml/LogEventWithContextListXmlMixIn.java | 2 -
.../logging/log4j/jackson/xml/MarkerXmlMixIn.java | 1 -
.../log4j/jackson/AbstractJacksonLayout.java | 9 +-
.../log4j/jackson/AbstractLogEventMixIn.java | 2 -
.../jackson/ExtendedStackTraceElementMixIn.java | 7 +-
.../logging/log4j/jackson/LogEventJsonMixIn.java | 2 -
.../jackson/LogEventWithContextListMixIn.java | 2 -
.../apache/logging/log4j/jackson/MarkerMixIn.java | 1 -
.../jackson/layout/AbstractJacksonLayout.java | 27 +-
.../log4j/layout/template/json/EcsLayoutTest.java | 15 +-
.../log4j/layout/template/json/LogstashIT.java | 39 +--
.../log4j/layout/template/json/TestHelpers.java | 14 +-
.../template/json/JsonTemplateLayoutBenchmark.java | 10 +-
.../json/JsonTemplateLayoutBenchmarkState.java | 37 +--
.../log4j/perf/jmh/Log4jLogEventBenchmark.java | 45 ---
.../log4j/perf/jmh/jpa/TestBasicEntity.java | 5 -
.../logging/log4j/perf/nogc/AbstractLogger.java | 2 +-
.../logging/log4j/perf/nogc/DemoAppender.java | 4 +-
.../apache/logging/log4j/perf/nogc/NoGcLayout.java | 11 +-
.../apache/logging/log4j/perf/nogc/NoGcLogger.java | 6 +-
.../logging/log4j/perf/nogc/OpenHashStringMap.java | 1 -
.../log4j/perf/nogc/ParameterizedMessage.java | 2 -
.../logging/log4j/perf/util/DemoAppender.java | 6 +-
.../log4j/configuration/CustomConfiguration.java | 4 +-
.../logging/log4j/lookup/CustomMapMessage.java | 5 +-
.../script/appender/ScriptAppenderSelector.java | 7 +-
.../java/org/apache/logging/slf4j/Log4jLogger.java | 32 +-
.../org/apache/logging/slf4j/SerializeTest.java | 46 ---
.../java/org/apache/logging/slf4j/Log4jLogger.java | 33 +-
.../org/apache/logging/slf4j/SerializeTest.java | 46 ---
.../logging/log4j/smtp/appender/SmtpAppender.java | 9 +-
.../logging/log4j/smtp/appender/SmtpManager.java | 12 +-
.../log4j/web/appender/ServletAppender.java | 55 ++--
src/site/asciidoc/manual/appenders.adoc | 3 +-
src/site/asciidoc/manual/extending.adoc | 8 +-
src/site/asciidoc/manual/messages.adoc | 9 +-
230 files changed, 2035 insertions(+), 4135 deletions(-)
delete mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/AbstractSerializationTest.java
delete mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/SerializableMatchers.java
delete mode 100644 log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SerialUtil.java
delete mode 100644 log4j-api-test/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageSerializationTest.java
delete mode 100644 log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusLoggerSerializationTest.java
delete mode 100644 log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerSerializationTest.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MementoLogEvent.java
delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MessageLayout.java
delete mode 100644 log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java
delete mode 100644 log4j-slf4j2-impl/src/test/java/org/apache/logging/slf4j/SerializeTest.java