This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-site-pro in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4cccb820ec400167e654074e81f5ee2d3555f5af Merge: db8f1f2c63 028e9fad03 Author: Volkan Yazıcı <[email protected]> AuthorDate: Tue Dec 16 16:16:51 2025 +0100 Merge tag 'rel/2.25.3' into 2.x-site-pro 2.25.3 .github/dependabot.yaml | 3 - .../org/apache/log4j/DefaultThrowableRenderer.java | 2 +- .../main/java/org/apache/log4j/FileAppender.java | 2 +- .../src/main/java/org/apache/log4j/Hierarchy.java | 2 +- .../org/apache/log4j/PropertyConfigurator.java | 2 +- .../java/org/apache/log4j/RollingFileAppender.java | 2 +- .../org/apache/log4j/helpers/FileWatchdog.java | 2 +- .../org/apache/log4j/helpers/UtilLoggingLevel.java | 2 +- .../org/apache/log4j/helpers/package-info.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 21 ++-- .../org/apache/log4j/layout/Log4j1XmlLayout.java | 2 +- .../main/java/org/apache/log4j/package-info.java | 2 +- .../java/org/apache/log4j/xml/DOMConfigurator.java | 2 +- .../org/apache/log4j/xml/XmlConfiguration.java | 2 +- .../java/org/apache/log4j/xml/package-info.java | 2 +- .../org/apache/logging/log4j/test/TestLogger.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 21 ++-- .../logging/log4j/test/junit/DirectoryCleaner.java | 2 +- .../logging/log4j/test/junit/FileCleaner.java | 2 +- .../logging/log4j/test/junit/SerialUtil.java | 2 +- .../logging/log4j/test/junit/package-info.java | 2 +- .../apache/logging/log4j/test/package-info.java | 2 +- .../log4j/spi/DefaultThreadContextMapTest.java | 122 +++++++++++++++++++ .../logging/log4j/status/StatusLoggerDateTest.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 21 ++-- .../apache/logging/log4j/simple/SimpleLogger.java | 2 +- .../logging/log4j/simple/SimpleLoggerContext.java | 2 +- .../apache/logging/log4j/simple/package-info.java | 2 +- .../logging/log4j/spi/DefaultThreadContextMap.java | 26 +++- .../log4j/status/StatusConsoleListener.java | 2 +- .../apache/logging/log4j/status/StatusData.java | 4 +- .../apache/logging/log4j/status/StatusLogger.java | 4 +- .../apache/logging/log4j/status/package-info.java | 2 +- .../log4j/util/PropertyFilePropertySource.java | 2 +- .../apache/logging/log4j/util/ProviderUtil.java | 2 +- .../log4j/util/internal/SerializationUtil.java | 2 +- .../apache/logging/log4j/util/package-info.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 21 ++-- .../log4j/appserver/jetty/Log4j2Logger.java | 2 +- .../log4j/appserver/jetty/package-info.java | 2 +- .../log4j/appserver/tomcat/TomcatLogger.java | 2 +- .../log4j/appserver/tomcat/package-info.java | 2 +- .../log4j/core/test/AvailablePortFinder.java | 2 +- .../log4j/core/test/GcFreeLoggingTestUtil.java | 2 +- .../test/appender/db/jdbc/JdbcH2TestHelper.java | 2 +- .../core/test/appender/db/jdbc/package-info.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 21 ++-- .../test/junit/AbstractExternalFileCleaner.java | 2 +- .../logging/log4j/core/test/junit/JdbcRule.java | 2 +- .../log4j/core/test/junit/package-info.java | 2 +- .../core/test/net/mock/MockTcpSyslogServer.java | 2 +- .../log4j/core/test/net/mock/package-info.java | 2 +- .../log4j/core/test/net/ssl/TlsSyslogTestUtil.java | 2 +- .../log4j/core/test/net/ssl/package-info.java | 2 +- .../logging/log4j/core/test/package-info.java | 2 +- .../log4j/core/test/smtp/SimpleSmtpServer.java | 2 +- .../logging/log4j/core/test/smtp/package-info.java | 2 +- .../core/appender/SocketAppenderReconnectTest.java | 2 +- .../log4j/core/appender/TlsSyslogAppenderTest.java | 4 +- .../plugins/processor/GraalVmProcessorTest.java | 8 +- .../core/config/xml/XmlConfigurationPropsTest.java | 2 +- .../log4j/core/net/SslSocketManagerTest.java | 131 +++++++++++++++++++++ .../GraalVmProcessorTest/java/FakePlugin.java | 11 +- .../apache/logging/log4j/core/LoggerContext.java | 2 +- .../logging/log4j/core/appender/FileManager.java | 2 +- .../core/appender/HttpURLConnectionManager.java | 12 +- .../core/appender/MemoryMappedFileManager.java | 2 +- .../core/appender/RandomAccessFileManager.java | 2 +- .../core/appender/db/jdbc/JdbcDatabaseManager.java | 2 +- .../log4j/core/appender/db/jdbc/package-info.java | 2 +- .../logging/log4j/core/appender/package-info.java | 2 +- .../appender/rolling/AbstractRolloverStrategy.java | 2 +- .../appender/rolling/DefaultRolloverStrategy.java | 2 +- .../rolling/DirectWriteRolloverStrategy.java | 2 +- .../log4j/core/appender/rolling/FileExtension.java | 2 +- .../core/appender/rolling/RollingFileManager.java | 2 +- .../rolling/RollingRandomAccessFileManager.java | 2 +- .../rolling/TimeBasedTriggeringPolicy.java | 2 +- .../rolling/action/AbstractPathAction.java | 2 +- .../appender/rolling/action/FileRenameAction.java | 2 +- .../rolling/action/PosixViewAttributeAction.java | 2 +- .../core/appender/rolling/action/package-info.java | 2 +- .../log4j/core/appender/rolling/package-info.java | 2 +- .../log4j/core/async/AsyncLoggerConfig.java | 2 +- .../logging/log4j/core/async/package-info.java | 2 +- .../log4j/core/config/ConfigurationSource.java | 2 +- .../builder/impl/DefaultConfigurationBuilder.java | 2 +- .../core/config/builder/impl/package-info.java | 2 +- .../config/plugins/convert/TypeConverters.java | 2 +- .../core/config/plugins/convert/package-info.java | 2 +- .../config/plugins/processor/GraalVmProcessor.java | 32 +---- .../core/config/plugins/util/ResolverUtil.java | 2 +- .../core/config/plugins/util/package-info.java | 2 +- .../core/config/status/StatusConfiguration.java | 2 +- .../log4j/core/config/status/package-info.java | 2 +- .../log4j/core/config/xml/XmlConfiguration.java | 2 +- .../log4j/core/config/xml/package-info.java | 2 +- .../core/filter/MutableThreadContextMapFilter.java | 2 +- .../logging/log4j/core/filter/package-info.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 21 ++-- .../logging/log4j/core/jmx/LoggerContextAdmin.java | 2 +- .../logging/log4j/core/jmx/package-info.java | 2 +- .../logging/log4j/core/layout/GelfLayout.java | 2 +- .../logging/log4j/core/layout/HtmlLayout.java | 2 +- .../logging/log4j/core/lookup/MainMapLookup.java | 2 +- .../logging/log4j/core/lookup/package-info.java | 2 +- .../apache/logging/log4j/core/net/JndiManager.java | 2 +- .../apache/logging/log4j/core/net/SmtpManager.java | 11 +- .../logging/log4j/core/net/SslSocketManager.java | 113 ++++++++++++++---- .../logging/log4j/core/net/TcpSocketManager.java | 2 +- .../log4j/core/net/UrlConnectionFactory.java | 12 +- .../logging/log4j/core/net/package-info.java | 2 +- .../log4j/core/net/ssl/FilePasswordProvider.java | 2 +- .../log4j/core/net/ssl/LaxHostnameVerifier.java | 2 +- .../log4j/core/net/ssl/SslConfiguration.java | 24 +++- .../logging/log4j/core/net/ssl/package-info.java | 2 +- .../apache/logging/log4j/core/package-info.java | 2 +- .../logging/log4j/core/script/ScriptFile.java | 2 +- .../logging/log4j/core/script/package-info.java | 2 +- .../apache/logging/log4j/core/tools/Generate.java | 2 +- .../logging/log4j/core/tools/package-info.java | 2 +- .../log4j/core/tools/picocli/CommandLine.java | 2 +- .../apache/logging/log4j/core/util/FileUtils.java | 2 +- .../apache/logging/log4j/core/util/NameUtil.java | 2 +- .../apache/logging/log4j/core/util/NetUtils.java | 2 +- .../org/apache/logging/log4j/core/util/Source.java | 2 +- .../apache/logging/log4j/core/util/Throwables.java | 2 +- .../logging/log4j/core/util/package-info.java | 2 +- .../org/apache/logging/log4j/smtp/SmtpManager.java | 9 +- .../org/apache/logging/log4j/jul/ApiLogger.java | 2 +- .../logging/log4j/jul/Log4jBridgeHandler.java | 2 +- .../internal/annotation/SuppressFBWarnings.java | 21 ++-- .../org/apache/logging/log4j/jul/package-info.java | 2 +- .../annotation/SuppressFBWarnings.java} | 21 ++-- .../log4j/layout/template/json/util/Uris.java | 2 +- .../layout/template/json/util/package-info.java | 2 +- log4j-parent/pom.xml | 15 --- .../internal/annotation/SuppressFBWarnings.java | 21 ++-- .../log4j/perf/jmh/JdbcAppenderBenchmark.java | 2 +- .../log4j/perf/jmh/JpaAppenderBenchmark.java | 2 +- .../log4j/perf/jmh/ThreadContextBenchmark.java | 5 + pom.xml | 12 +- src/changelog/2.25.3/.release-notes.adoc.ftl | 27 +++++ src/changelog/2.25.3/.release.xml | 21 ++++ src/changelog/2.25.3/3871_graalvm_binary_name.xml | 13 ++ ...35_optimize_DefaultThreadContextMap_getCopy.xml | 13 ++ .../3947_fix_SslSocketManager_null_keystore.xml | 13 ++ .../2.25.3/3985_remove_spotbugs_annotations.xml | 13 ++ .../4002_fix_SslSocketAppender_verifyHostName.xml | 12 ++ .../ROOT/pages/manual/appenders/network.adoc | 3 + 150 files changed, 809 insertions(+), 281 deletions(-)
