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 2022/12/19 10:21:24 UTC
[logging-log4j2] 18/33: LOG4J2-3628 Order changelog entries by filepath in `AsciiDocExporter`.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch mvn-site-simplified
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 7cafdd62868ce64a61be489c0c06a27723a06b89
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Nov 24 09:18:46 2022 +0100
LOG4J2-3628 Order changelog entries by filepath in `AsciiDocExporter`.
---
.../util/changelog/exporter/AsciiDocExporter.java | 15 +--
src/site/asciidoc/changelog/2.0-alpha2.adoc | 6 +-
src/site/asciidoc/changelog/2.0-beta1.adoc | 22 ++--
src/site/asciidoc/changelog/2.0-beta2.adoc | 24 ++--
src/site/asciidoc/changelog/2.0-beta3.adoc | 28 ++---
src/site/asciidoc/changelog/2.0-beta4.adoc | 46 ++++----
src/site/asciidoc/changelog/2.0-beta5.adoc | 46 ++++----
src/site/asciidoc/changelog/2.0-beta6.adoc | 24 ++--
src/site/asciidoc/changelog/2.0-beta7.adoc | 32 +++---
src/site/asciidoc/changelog/2.0-beta8.adoc | 30 ++---
src/site/asciidoc/changelog/2.0-beta9.adoc | 80 ++++++-------
src/site/asciidoc/changelog/2.0-rc1.adoc | 106 +++++++++---------
src/site/asciidoc/changelog/2.0-rc2.adoc | 96 ++++++++--------
src/site/asciidoc/changelog/2.0.1.adoc | 22 ++--
src/site/asciidoc/changelog/2.0.2.adoc | 14 +--
src/site/asciidoc/changelog/2.0.adoc | 26 ++---
src/site/asciidoc/changelog/2.1.adoc | 64 +++++------
src/site/asciidoc/changelog/2.10.0.adoc | 34 +++---
src/site/asciidoc/changelog/2.11.0.adoc | 74 ++++++------
src/site/asciidoc/changelog/2.11.1.adoc | 58 +++++-----
src/site/asciidoc/changelog/2.11.2.adoc | 54 ++++-----
src/site/asciidoc/changelog/2.12.0.adoc | 44 ++++----
src/site/asciidoc/changelog/2.12.1.adoc | 10 +-
src/site/asciidoc/changelog/2.13.0.adoc | 24 ++--
src/site/asciidoc/changelog/2.13.1.adoc | 42 +++----
src/site/asciidoc/changelog/2.13.2.adoc | 22 ++--
src/site/asciidoc/changelog/2.14.0.adoc | 54 ++++-----
src/site/asciidoc/changelog/2.14.1.adoc | 82 +++++++-------
src/site/asciidoc/changelog/2.15.0.adoc | 84 +++++++-------
src/site/asciidoc/changelog/2.17.0.adoc | 10 +-
src/site/asciidoc/changelog/2.17.1.adoc | 16 +--
src/site/asciidoc/changelog/2.17.2.adoc | 114 +++++++++----------
src/site/asciidoc/changelog/2.18.0.adoc | 52 ++++-----
src/site/asciidoc/changelog/2.19.0.adoc | 28 ++---
src/site/asciidoc/changelog/2.2.adoc | 36 +++---
src/site/asciidoc/changelog/2.3.adoc | 30 ++---
src/site/asciidoc/changelog/2.4.1.adoc | 20 ++--
src/site/asciidoc/changelog/2.4.adoc | 86 +++++++-------
src/site/asciidoc/changelog/2.5.adoc | 36 +++---
src/site/asciidoc/changelog/2.6.1.adoc | 10 +-
src/site/asciidoc/changelog/2.6.2.adoc | 16 +--
src/site/asciidoc/changelog/2.6.adoc | 120 ++++++++++----------
src/site/asciidoc/changelog/2.7.adoc | 124 ++++++++++-----------
src/site/asciidoc/changelog/2.8.1.adoc | 16 +--
src/site/asciidoc/changelog/2.8.2.adoc | 16 +--
src/site/asciidoc/changelog/2.8.adoc | 120 ++++++++++----------
src/site/asciidoc/changelog/2.9.0.adoc | 110 +++++++++---------
src/site/asciidoc/changelog/2.9.1.adoc | 14 +--
src/site/asciidoc/changelog/unreleased.adoc | 2 +-
49 files changed, 1114 insertions(+), 1125 deletions(-)
diff --git a/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/exporter/AsciiDocExporter.java b/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/exporter/AsciiDocExporter.java
index 57feb8ee25..68cb4931e3 100644
--- a/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/exporter/AsciiDocExporter.java
+++ b/log4j-internal-util/src/main/java/org/apache/logging/log4j/internal/util/changelog/exporter/AsciiDocExporter.java
@@ -22,8 +22,6 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
-import java.nio.file.attribute.FileTime;
-import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -39,16 +37,6 @@ public final class AsciiDocExporter {
private static final String TARGET_RELATIVE_DIRECTORY = "src/site/asciidoc/changelog";
- private static final Comparator<Path> FILE_MODIFICATION_TIME_COMPARATOR = Comparator.comparing(path -> {
- try {
- final FileTime fileTime = Files.getLastModifiedTime(path);
- return fileTime.toMillis();
- } catch (final IOException error) {
- final String message = String.format("failed reading the last-modified time: `%s`", path);
- throw new UncheckedIOException(message, error);
- }
- });
-
private static final String AUTO_GENERATION_WARNING_ASCIIDOC = "////\n" +
"*DO NOT EDIT THIS FILE!!*\n" +
"This file is automatically generated from the release changelog directory!\n" +
@@ -198,7 +186,8 @@ public final class AsciiDocExporter {
private static List<ChangelogEntry> readChangelogEntries(final Path releaseDirectory) {
return findAdjacentFiles(releaseDirectory)
- .sorted(FILE_MODIFICATION_TIME_COMPARATOR)
+ // Sorting is needed to generate the same output between different runs.
+ .sorted()
.map(ChangelogEntry::readFromXmlFile)
.collect(Collectors.toList());
}
diff --git a/src/site/asciidoc/changelog/2.0-alpha2.adoc b/src/site/asciidoc/changelog/2.0-alpha2.adoc
index c61590fbc2..02759b9751 100644
--- a/src/site/asciidoc/changelog/2.0-alpha2.adoc
+++ b/src/site/asciidoc/changelog/2.0-alpha2.adoc
@@ -26,13 +26,13 @@ This file is automatically generated from the release changelog directory!
=== Added
-* Add support for formatting using String.format(). (for https://issues.apache.org/jira/browse/LOG4J2-68[LOG4J2-68] by `rgoers`)
-* Add getLogger(Class) to LogManager. (for https://issues.apache.org/jira/browse/LOG4J2-70[LOG4J2-70] by `rgoers`)
* Allow components besides core to create a PluginMap for faster plugin loading and not
having to specify the plugin package in the configuration. (for https://issues.apache.org/jira/browse/LOG4J2-67[LOG4J2-67] by `rgoers`)
+* Add support for formatting using String.format(). (for https://issues.apache.org/jira/browse/LOG4J2-68[LOG4J2-68] by `rgoers`)
* Allow Flume agents to be embedded into the Flume Appender. (for https://issues.apache.org/jira/browse/LOG4J2-69[LOG4J2-69] by `rgoers`)
+* Add getLogger(Class) to LogManager. (for https://issues.apache.org/jira/browse/LOG4J2-70[LOG4J2-70] by `rgoers`)
=== Fixed
-* Allow variable substitution on the configuration attributes and on the root log level. (for https://issues.apache.org/jira/browse/LOG4J2-65[LOG4J2-65] by `rgoers`)
* Fix compilation problems in Java 7. (for https://issues.apache.org/jira/browse/LOG4J2-64[LOG4J2-64] by `rgoers`)
+* Allow variable substitution on the configuration attributes and on the root log level. (for https://issues.apache.org/jira/browse/LOG4J2-65[LOG4J2-65] by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.0-beta1.adoc b/src/site/asciidoc/changelog/2.0-beta1.adoc
index 9afd8ed3ce..82aca71ac0 100644
--- a/src/site/asciidoc/changelog/2.0-beta1.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta1.adoc
@@ -34,25 +34,25 @@ This file is automatically generated from the release changelog directory!
=== Fixed
-* FileRenameAction did not create the parent directories of the archive files causing the rollover to fail. (for https://issues.apache.org/jira/browse/LOG4J2-71[LOG4J2-71] by `rgoers`)
* Created web module to allow web applications to include the Log4j context listener in WEB-INF/lib even if
Log4j is in the container's class path. Allow locating the LoggerContext to include the ClassLoader. Updated
the Loader utility to always choose the child ClassLoader. Verified in Jboss 5 and Tomcat. (by `rgoers`)
+* FileRenameAction did not create the parent directories of the archive files causing the rollover to fail. (for https://issues.apache.org/jira/browse/LOG4J2-71[LOG4J2-71] by `rgoers`)
+* NullPointerException in RollingFileManager when filePattern does not cause the file to be compressed. (for https://issues.apache.org/jira/browse/LOG4J2-72[LOG4J2-72] by `rgoers`)
* Logger.error(Marker, Message, Throwable) was internally using Level.TRACE. (for https://issues.apache.org/jira/browse/LOG4J2-74[LOG4J2-74] by `rgoers`)
-* LogFactoryImpl.setAttribute in the Commons Logging bridge got a NullPointerException when passed a null value.
- It will now remove the attribute. (for https://issues.apache.org/jira/browse/LOG4J2-78[LOG4J2-78] by `rgoers`)
-* PatternLayout was not honoring format modifiers. (for https://issues.apache.org/jira/browse/LOG4J2-81[LOG4J2-81] by `rgoers`)
+* Enhanced Log4jContextListener to accept a configuration file location. Modified FileConfigurationMonitor
+ to monitor files configured that way. Fixed other reconfiguration related bugs. Tested in JBoss and
+ Tomcat. (for https://issues.apache.org/jira/browse/LOG4J2-75[LOG4J2-75] by `rgoers`)
* RewriteAppender was calling the stop method of the referenced appender causing the referenced appender's
manager to have its use count decremented too many times. (for https://issues.apache.org/jira/browse/LOG4J2-76[LOG4J2-76] by `rgoers`)
-* NullPointerException in RollingFileManager when filePattern does not cause the file to be compressed. (for https://issues.apache.org/jira/browse/LOG4J2-72[LOG4J2-72] by `rgoers`)
-* MarkerFilter called MarkerManager.getMarker causing the Marker to be created during the processing of the
- configuration. This prevents the application from creating the Marker with any parents. MarkerWrapper in
- SLF4J-impl was getting a ClassCastException in instanceOf because the Marker isn't a MarkerWrapper. (for https://issues.apache.org/jira/browse/LOG4J2-82[LOG4J2-82] by `rgoers`)
* RoutingAppender was calling the stop method for each of its referenced Appenders and was calling
the stop method of the default Appender a second time. It will now only call the stop method of
Appenders it creates. (for https://issues.apache.org/jira/browse/LOG4J2-77[LOG4J2-77] by `rgoers`)
-* Enhanced Log4jContextListener to accept a configuration file location. Modified FileConfigurationMonitor
- to monitor files configured that way. Fixed other reconfiguration related bugs. Tested in JBoss and
- Tomcat. (for https://issues.apache.org/jira/browse/LOG4J2-75[LOG4J2-75] by `rgoers`)
+* LogFactoryImpl.setAttribute in the Commons Logging bridge got a NullPointerException when passed a null value.
+ It will now remove the attribute. (for https://issues.apache.org/jira/browse/LOG4J2-78[LOG4J2-78] by `rgoers`)
* Allow Log4j 2 to be used as the implementation with SLF4J and SLF4J's jcl-over-slf4j by adding filtering
to the log method in SLF4JLogger. (for https://issues.apache.org/jira/browse/LOG4J2-80[LOG4J2-80] by `rgoers`, Oliver Lamy)
+* PatternLayout was not honoring format modifiers. (for https://issues.apache.org/jira/browse/LOG4J2-81[LOG4J2-81] by `rgoers`)
+* MarkerFilter called MarkerManager.getMarker causing the Marker to be created during the processing of the
+ configuration. This prevents the application from creating the Marker with any parents. MarkerWrapper in
+ SLF4J-impl was getting a ClassCastException in instanceOf because the Marker isn't a MarkerWrapper. (for https://issues.apache.org/jira/browse/LOG4J2-82[LOG4J2-82] by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.0-beta2.adoc b/src/site/asciidoc/changelog/2.0-beta2.adoc
index 8516c27f92..f85079795b 100644
--- a/src/site/asciidoc/changelog/2.0-beta2.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta2.adoc
@@ -26,17 +26,17 @@ This file is automatically generated from the release changelog directory!
=== Added
-* If system property "disableThreadContextStack" is set pushes to the ThreadContext will be ignored. If
- system property "disableThreadContext" is set both puts and pushes will be ignored. (for https://issues.apache.org/jira/browse/LOG4J2-84[LOG4J2-84] by `rgoers`)
-* Add interval and modulate options to TimeBasedTriggeringPolicy to allow more fine-grained control of
- when file rolling should occur. (for https://issues.apache.org/jira/browse/LOG4J2-35[LOG4J2-35] by `rgoers`)
-* If system property "disableThreadContextMap" is set puts to the ThreadContext will be ignored. If
- system property "disableThreadContext" is set both puts and pushes will be ignored. (for https://issues.apache.org/jira/browse/LOG4J2-83[LOG4J2-83] by `rgoers`)
+* Add getFormats to MultiformatMessage and allow StructuredDataMessage to format as XML. (by `rgoers`)
* Add support for ANSI colors by adding the highlight and style pattern converters. Fix pattern
parsing to allow nested patterns. (by `rgoers`)
-* Add getFormats to MultiformatMessage and allow StructuredDataMessage to format as XML. (by `rgoers`)
* Allow the status logging to be directed to stderr or to a file. (by `rgoers`)
+* Add interval and modulate options to TimeBasedTriggeringPolicy to allow more fine-grained control of
+ when file rolling should occur. (for https://issues.apache.org/jira/browse/LOG4J2-35[LOG4J2-35] by `rgoers`)
* Add support for filtering packages from stack traces. (for https://issues.apache.org/jira/browse/LOG4J2-58[LOG4J2-58] by `rgoers`)
+* If system property "disableThreadContextMap" is set puts to the ThreadContext will be ignored. If
+ system property "disableThreadContext" is set both puts and pushes will be ignored. (for https://issues.apache.org/jira/browse/LOG4J2-83[LOG4J2-83] by `rgoers`)
+* If system property "disableThreadContextStack" is set pushes to the ThreadContext will be ignored. If
+ system property "disableThreadContext" is set both puts and pushes will be ignored. (for https://issues.apache.org/jira/browse/LOG4J2-84[LOG4J2-84] by `rgoers`)
=== Changed
@@ -45,17 +45,17 @@ This file is automatically generated from the release changelog directory!
=== Fixed
+* DefaultConfiguration was not starting the Console Appender. (by `rgoers`)
+* If the ThreadContext map is empty the LogEvent will contain a null value to reduce the overhead of creating
+ log events and in the size of the serialized object. (for https://issues.apache.org/jira/browse/LOG4J2-83[LOG4J2-83] by `rgoers`)
* If the ThreadContext stack is empty the LogEvent will contain a null value to reduce the overhead of
creating log events and in the size of the serialized object. Changed the ThreadContext stack to use
a custom stack interface instead of java.util.Stack as that class is overly heavy. This change will
cause an API incompatibility. (for https://issues.apache.org/jira/browse/LOG4J2-84[LOG4J2-84] by `rgoers`)
-* Log4j 1.2 adapter's Category class was missing 3 log methods. (for https://issues.apache.org/jira/browse/LOG4J2-91[LOG4J2-91] by `rgoers`)
-* DefaultConfiguration was not starting the Console Appender. (by `rgoers`)
-* If the ThreadContext map is empty the LogEvent will contain a null value to reduce the overhead of creating
- log events and in the size of the serialized object. (for https://issues.apache.org/jira/browse/LOG4J2-83[LOG4J2-83] by `rgoers`)
* Many logging methods in AbstractLogger were set to an incorrect logging level. catching was
using the THROWING marker and was set to debug instead of error. (for https://issues.apache.org/jira/browse/LOG4J2-88[LOG4J2-88] by `rgoers`)
* Add documentation on client vs server mode to performance page. (for https://issues.apache.org/jira/browse/LOG4J2-90[LOG4J2-90] by `rgoers`)
-* Move variable substitution from PatternLayout to appropriate converters to improve performance. (by `rgoers`)
+* Log4j 1.2 adapter's Category class was missing 3 log methods. (for https://issues.apache.org/jira/browse/LOG4J2-91[LOG4J2-91] by `rgoers`)
* Converted DynamicThresholdFilter to use KeyValuePair. Fixed bugs in the Map-based filters
to allow declaration of multiple values for a key to match the documentation. (for https://issues.apache.org/jira/browse/LOG4J2-92[LOG4J2-92] by `rgoers`)
+* Move variable substitution from PatternLayout to appropriate converters to improve performance. (by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.0-beta3.adoc b/src/site/asciidoc/changelog/2.0-beta3.adoc
index cf70f9870a..9f30f5feea 100644
--- a/src/site/asciidoc/changelog/2.0-beta3.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta3.adoc
@@ -31,27 +31,27 @@ This file is automatically generated from the release changelog directory!
=== Changed
-* Add ThreadContext.push(String format, Object... args) (for https://issues.apache.org/jira/browse/LOG4J2-85[LOG4J2-85] by `rgoers`)
-* Build pdf of user's guide. (for https://issues.apache.org/jira/browse/LOG4J2-87[LOG4J2-87] by `rgoers`)
* Created combined jar to combine API and Core contents for users who only want the Log4j implementation. (by `rgoers`)
-* Added font and fontSize parameters to HTMLLayout. Replace newlines in message with br tag. (for https://issues.apache.org/jira/browse/LOG4J2-29[LOG4J2-29] by `rgoers`)
* Add ability to customize the names of the Levels in the LevelPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-105[LOG4J2-105] by `rgoers`)
+* Added font and fontSize parameters to HTMLLayout. Replace newlines in message with br tag. (for https://issues.apache.org/jira/browse/LOG4J2-29[LOG4J2-29] by `rgoers`)
+* Add ThreadContext.push(String format, Object... args) (for https://issues.apache.org/jira/browse/LOG4J2-85[LOG4J2-85] by `rgoers`)
+* Build pdf of user's guide. (for https://issues.apache.org/jira/browse/LOG4J2-87[LOG4J2-87] by `rgoers`)
=== Fixed
-* Log4j 1.2 Category.forcedLog was wrapping the message with an ObjectMessage even if the parameter was an
- ObjectMessage. (by `rgoers`)
+* Avoid NPE when duplicate LoggerContextFactorys are present. Allow factories to specify a weight to allow
+ real implementations to outrank test implementations. Provide a simple default LoggerContextFactory. (by `rgoers`)
+* A NullPointerException would occur if no format value was passed to the SyslogAppender. (for https://issues.apache.org/jira/browse/LOG4J2-101[LOG4J2-101] by `rgoers`, Emanuele Colombo)
+* The Facility value was being improperly calculated. (for https://issues.apache.org/jira/browse/LOG4J2-102[LOG4J2-102] by `rgoers`, Emanuele Colombo)
+* The LogEvent was wrapping a ThrowableProxy with another ThrowableProxy when deserializing. (for https://issues.apache.org/jira/browse/LOG4J2-103[LOG4J2-103] by `rgoers`, Das Archive)
+* Convert LogManager binding to use "regular" java properties instead of XML properties to work around a
+ bug in Oracle's xmlparserv2 jar. (for https://issues.apache.org/jira/browse/LOG4J2-104[LOG4J2-104] by `rgoers`)
+* PatternParser was not properly handling adjacent nested options (for https://issues.apache.org/jira/browse/LOG4J2-107[LOG4J2-107] by `rgoers`)
* Fix NullPointerException in ClassLoaderContextSelector when no class is returned from
the SecurityManager. (for https://issues.apache.org/jira/browse/LOG4J2-108[LOG4J2-108] by `rgoers`)
-* PatternParser was not properly handling adjacent nested options (for https://issues.apache.org/jira/browse/LOG4J2-107[LOG4J2-107] by `rgoers`)
+* Interpolator was not stripping Lookup key separator when trying to locate the default value for a variable. (for https://issues.apache.org/jira/browse/LOG4J2-94[LOG4J2-94] by `rgoers`, Denis Treskunov)
* Add support for loading plugins inside the OSGi bundle. (for https://issues.apache.org/jira/browse/LOG4J2-95[LOG4J2-95] by `rgoers`)
* Added several missing classes and methods for Log4j 1.x compatibility. (for https://issues.apache.org/jira/browse/LOG4J2-97[LOG4J2-97] by `rgoers`)
-* Convert LogManager binding to use "regular" java properties instead of XML properties to work around a
- bug in Oracle's xmlparserv2 jar. (for https://issues.apache.org/jira/browse/LOG4J2-104[LOG4J2-104] by `rgoers`)
-* Avoid NPE when duplicate LoggerContextFactorys are present. Allow factories to specify a weight to allow
- real implementations to outrank test implementations. Provide a simple default LoggerContextFactory. (by `rgoers`)
-* Interpolator was not stripping Lookup key separator when trying to locate the default value for a variable. (for https://issues.apache.org/jira/browse/LOG4J2-94[LOG4J2-94] by `rgoers`, Denis Treskunov)
-* The Facility value was being improperly calculated. (for https://issues.apache.org/jira/browse/LOG4J2-102[LOG4J2-102] by `rgoers`, Emanuele Colombo)
-* A NullPointerException would occur if no format value was passed to the SyslogAppender. (for https://issues.apache.org/jira/browse/LOG4J2-101[LOG4J2-101] by `rgoers`, Emanuele Colombo)
* MapRewritePolicy had an extra call to putAll that caused updates to behave like adds. (for https://issues.apache.org/jira/browse/LOG4J2-99[LOG4J2-99] by `rgoers`, Das Archive)
-* The LogEvent was wrapping a ThrowableProxy with another ThrowableProxy when deserializing. (for https://issues.apache.org/jira/browse/LOG4J2-103[LOG4J2-103] by `rgoers`, Das Archive)
+* Log4j 1.2 Category.forcedLog was wrapping the message with an ObjectMessage even if the parameter was an
+ ObjectMessage. (by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.0-beta4.adoc b/src/site/asciidoc/changelog/2.0-beta4.adoc
index 0e450d0ede..4dd467eb17 100644
--- a/src/site/asciidoc/changelog/2.0-beta4.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta4.adoc
@@ -27,54 +27,54 @@ This file is automatically generated from the release changelog directory!
=== Added
* Add MessageFormatMessage and FormattedMessage. (by `rgoers`)
-* Added hostName and contextName to property map. (by `rgoers`)
* Added Flume Appender samples. (by `rgoers`)
* Added Log4j 2 to SLF4J adapter. (by `rgoers`)
-* Use %red, %white, %blue, and so on in the console appender. (for https://issues.apache.org/jira/browse/LOG4J2-134[LOG4J2-134] by `ggregory`)
-* Allow custom message creation via a message factory. (for https://issues.apache.org/jira/browse/LOG4J2-133[LOG4J2-133] by `ggregory`)
+* Added hostName and contextName to property map. (by `rgoers`)
* Add SMTPAppender. (for https://issues.apache.org/jira/browse/LOG4J2-131[LOG4J2-131] by `rgoers`, Scott Severtson)
+* Allow custom message creation via a message factory. (for https://issues.apache.org/jira/browse/LOG4J2-133[LOG4J2-133] by `ggregory`)
+* Use %red, %white, %blue, and so on in the console appender. (for https://issues.apache.org/jira/browse/LOG4J2-134[LOG4J2-134] by `ggregory`)
=== Changed
-* Add follow attribute to Console Appender. (for https://issues.apache.org/jira/browse/LOG4J2-128[LOG4J2-128] by `rgoers`)
* Renamed log4j12-api to log4j-1.2-api. (for https://issues.apache.org/jira/browse/LOG4J2-110[LOG4J2-110] by `rgoers`)
* Add unit test to verify exceptions are thrown when the socket connection fails. (for https://issues.apache.org/jira/browse/LOG4J2-122[LOG4J2-122] by `rgoers`)
+* Add follow attribute to Console Appender. (for https://issues.apache.org/jira/browse/LOG4J2-128[LOG4J2-128] by `rgoers`)
* Allow newlines to be escaped in Syslog and RFC5424 layouts. Allow Throwables to be included in
the output from RFC5424Layout. (for https://issues.apache.org/jira/browse/LOG4J2-136[LOG4J2-136] by `rgoers`, Scott Severtson)
=== Fixed
-* AbstractLogger.catching(Throwable) checks for DEBUG level but logs at ERROR level. (for https://issues.apache.org/jira/browse/LOG4J2-132[LOG4J2-132] by `ggregory`)
+* Allow FlumeAvroManager to initialize even if it cannot connect to an agent. (by `rgoers`)
+* Enhanced javadoc copyright statement. (for https://issues.apache.org/jira/browse/LOG4J2-111[LOG4J2-111] by `rgoers`)
* StructuredDataFilter createFilter was annotated with PluginAttr instead of PluginElement for the
KeyValuePairs. (for https://issues.apache.org/jira/browse/LOG4J2-113[LOG4J2-113] by `rgoers`)
-* PatternLayout should format throwables without requiring a converter. (for https://issues.apache.org/jira/browse/LOG4J2-130[LOG4J2-130] by `rgoers`)
-* File renaming was using the wrong date value. Enhanced DefaultRolloverStrategy to store newest files in
- highest index as well as lowest. (for https://issues.apache.org/jira/browse/LOG4J2-116[LOG4J2-116] by `rgoers`)
-* Allow FlumeAvroManager to initialize even if it cannot connect to an agent. (by `rgoers`)
-* Allow JMS appenders to recover if the queue or topic is unavailable. (for https://issues.apache.org/jira/browse/LOG4J2-126[LOG4J2-126] by `rgoers`)
-* RoutingAppender was only creating a single appender for the default Route. (for https://issues.apache.org/jira/browse/LOG4J2-129[LOG4J2-129] by `rgoers`)
+* StructuredDataMessage was validating the length of the values in the event Map instead of the lengths
+ of the keys. (for https://issues.apache.org/jira/browse/LOG4J2-114[LOG4J2-114] by `rgoers`, Arkin Yetis)
* ThreadContext Map elements with null values are now ignored when constructing a Flume event and in the
RFC5424 Layout. (for https://issues.apache.org/jira/browse/LOG4J2-115[LOG4J2-115] by `rgoers`)
+* File renaming was using the wrong date value. Enhanced DefaultRolloverStrategy to store newest files in
+ highest index as well as lowest. (for https://issues.apache.org/jira/browse/LOG4J2-116[LOG4J2-116] by `rgoers`)
* A broken socket connection would cause the TCPSocketManager to continuously reconnect. (for https://issues.apache.org/jira/browse/LOG4J2-119[LOG4J2-119] by `rgoers`)
+* TCPSocketManager would fail if the initial connection could not be established. (for https://issues.apache.org/jira/browse/LOG4J2-120[LOG4J2-120] by `rgoers`)
+* The example for ThreadContextMapFilter was incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-123[LOG4J2-123] by `rgoers`, Olivier Lamy)
* JMSQueue and JMSTopic Appenders did not allow name to be specified. (for https://issues.apache.org/jira/browse/LOG4J2-125[LOG4J2-125] by `rgoers`)
-* Enhanced javadoc copyright statement. (for https://issues.apache.org/jira/browse/LOG4J2-111[LOG4J2-111] by `rgoers`)
+* Allow JMS appenders to recover if the queue or topic is unavailable. (for https://issues.apache.org/jira/browse/LOG4J2-126[LOG4J2-126] by `rgoers`)
* AbstractLogger methods were not passing Markers to the isEnabled methods. (for https://issues.apache.org/jira/browse/LOG4J2-127[LOG4J2-127] by `rgoers`)
-* TCPSocketManager would fail if the initial connection could not be established. (for https://issues.apache.org/jira/browse/LOG4J2-120[LOG4J2-120] by `rgoers`)
-* Serialized LogEvents were not reset in the output stream causing them to deserialize incorrectly. (for https://issues.apache.org/jira/browse/LOG4J2-142[LOG4J2-142] by `rgoers`)
+* RoutingAppender was only creating a single appender for the default Route. (for https://issues.apache.org/jira/browse/LOG4J2-129[LOG4J2-129] by `rgoers`)
+* PatternLayout should format throwables without requiring a converter. (for https://issues.apache.org/jira/browse/LOG4J2-130[LOG4J2-130] by `rgoers`)
+* AbstractLogger.catching(Throwable) checks for DEBUG level but logs at ERROR level. (for https://issues.apache.org/jira/browse/LOG4J2-132[LOG4J2-132] by `ggregory`)
+* BaseConfiguration does not close the first appender. (for https://issues.apache.org/jira/browse/LOG4J2-135[LOG4J2-135] by `ggregory`, Ingo Feltes)
+* Fix hang in Dumbster SMTP test server. (for https://issues.apache.org/jira/browse/LOG4J2-137[LOG4J2-137] by `rgoers`)
* Fix null pointer exception in SocketAppender if no protocol is specified. The protocol will default
to TCP for the SocketAppender and UDP for the SyslogAppender. (for https://issues.apache.org/jira/browse/LOG4J2-139[LOG4J2-139] by `rgoers`)
-* NullPointerException in RFC5424Layout. (for https://issues.apache.org/jira/browse/LOG4J2-144[LOG4J2-144] by `ggregory`)
-* Fix hang in Dumbster SMTP test server. (for https://issues.apache.org/jira/browse/LOG4J2-137[LOG4J2-137] by `rgoers`)
-* Convert all System.getProperty calls to use PropertiesUtil to suppress SecurityExceptions. (for https://issues.apache.org/jira/browse/LOG4J2-150[LOG4J2-150] by `rgoers`)
+* Typo in documentation of SocketAppender. (for https://issues.apache.org/jira/browse/LOG4J2-140[LOG4J2-140] by `ggregory`, Joern Huxhorn)
+* Serialized LogEvents were not reset in the output stream causing them to deserialize incorrectly. (for https://issues.apache.org/jira/browse/LOG4J2-142[LOG4J2-142] by `rgoers`)
* MessagePatternConverter now returns "null" if the log message is null. (for https://issues.apache.org/jira/browse/LOG4J2-143[LOG4J2-143] by `rgoers`)
+* NullPointerException in RFC5424Layout. (for https://issues.apache.org/jira/browse/LOG4J2-144[LOG4J2-144] by `ggregory`)
* Add missing serial version IDs. (for https://issues.apache.org/jira/browse/LOG4J2-145[LOG4J2-145] by `ggregory`)
* ThreadContextMapFilter was matching on the key instead of the value of the key. (for https://issues.apache.org/jira/browse/LOG4J2-147[LOG4J2-147] by `rgoers`, William Burns)
* SMTPAppender will only cache filtered events. (for https://issues.apache.org/jira/browse/LOG4J2-149[LOG4J2-149] by `rgoers`, Scott Severtson)
-* LocalizedMessageTest fails on linux system. (for https://issues.apache.org/jira/browse/LOG4J2-156[LOG4J2-156] by `ggregory`, Andreas Born)
-* Typo in documentation of SocketAppender. (for https://issues.apache.org/jira/browse/LOG4J2-140[LOG4J2-140] by `ggregory`, Joern Huxhorn)
-* StructuredDataMessage was validating the length of the values in the event Map instead of the lengths
- of the keys. (for https://issues.apache.org/jira/browse/LOG4J2-114[LOG4J2-114] by `rgoers`, Arkin Yetis)
+* Convert all System.getProperty calls to use PropertiesUtil to suppress SecurityExceptions. (for https://issues.apache.org/jira/browse/LOG4J2-150[LOG4J2-150] by `rgoers`)
* RollingFileAppender's FileRenameAction was throwing a NullPointerException if no directory was specified
on the target file name. (for https://issues.apache.org/jira/browse/LOG4J2-152[LOG4J2-152] by `rgoers`, `rpopma`)
-* The example for ThreadContextMapFilter was incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-123[LOG4J2-123] by `rgoers`, Olivier Lamy)
-* BaseConfiguration does not close the first appender. (for https://issues.apache.org/jira/browse/LOG4J2-135[LOG4J2-135] by `ggregory`, Ingo Feltes)
+* LocalizedMessageTest fails on linux system. (for https://issues.apache.org/jira/browse/LOG4J2-156[LOG4J2-156] by `ggregory`, Andreas Born)
diff --git a/src/site/asciidoc/changelog/2.0-beta5.adoc b/src/site/asciidoc/changelog/2.0-beta5.adoc
index 64d4a46879..cb4e66ba3f 100644
--- a/src/site/asciidoc/changelog/2.0-beta5.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta5.adoc
@@ -26,48 +26,48 @@ This file is automatically generated from the release changelog directory!
=== Added
-* Expose file appender configuration details via an advertisement mechanism. (for https://issues.apache.org/jira/browse/LOG4J2-155[LOG4J2-155] by `sdeboy`)
* Added FlumePersistentManager which writes to BerkeleyDB and then writes to Flume asynchronously. (by `rgoers`)
-* Add Logger interface APIs to log at given levels. (for https://issues.apache.org/jira/browse/LOG4J2-179[LOG4J2-179] by `ggregory`)
+* Expose file appender configuration details via an advertisement mechanism. (for https://issues.apache.org/jira/browse/LOG4J2-155[LOG4J2-155] by `sdeboy`)
* Add support for asynchronous loggers. (for https://issues.apache.org/jira/browse/LOG4J2-163[LOG4J2-163] by `rgoers`, `rpopma`)
-* Add JMX support. (for https://issues.apache.org/jira/browse/LOG4J2-207[LOG4J2-207] by `rgoers`, `rpopma`)
* Add methods is/setEndOfBatch to LogEvent. (for https://issues.apache.org/jira/browse/LOG4J2-164[LOG4J2-164] by `rgoers`, `rpopma`)
+* Add Logger interface APIs to log at given levels. (for https://issues.apache.org/jira/browse/LOG4J2-179[LOG4J2-179] by `ggregory`)
* Add tag library. (for https://issues.apache.org/jira/browse/LOG4J2-187[LOG4J2-187] by `rgoers`, Nick Williams)
+* Add JMX support. (for https://issues.apache.org/jira/browse/LOG4J2-207[LOG4J2-207] by `rgoers`, `rpopma`)
=== Changed
-* Allowed Loggers access to the properties in the LoggerConfig. (for https://issues.apache.org/jira/browse/LOG4J2-157[LOG4J2-157] by `rgoers`, `rpopma`)
-* Added ability to include or exclude location information. (for https://issues.apache.org/jira/browse/LOG4J2-153[LOG4J2-153] by `rgoers`, `rpopma`)
* Allow Logger and LoggerContext to be subclassed. (for https://issues.apache.org/jira/browse/LOG4J2-151[LOG4J2-151] by `rgoers`, `rpopma`)
-* Move Throwable pattern converter options processing to ThrowableFormatOptions class. (for https://issues.apache.org/jira/browse/LOG4J2-160[LOG4J2-160] by `rgoers`, Joanne Polsky)
+* Added ability to include or exclude location information. (for https://issues.apache.org/jira/browse/LOG4J2-153[LOG4J2-153] by `rgoers`, `rpopma`)
+* Allowed Loggers access to the properties in the LoggerConfig. (for https://issues.apache.org/jira/browse/LOG4J2-157[LOG4J2-157] by `rgoers`, `rpopma`)
* Add RFC 5424 compliant escaping rules to RFC5424Layout. (for https://issues.apache.org/jira/browse/LOG4J2-158[LOG4J2-158] by `rgoers`, Scott Severtson)
-* Async documentation update. (for https://issues.apache.org/jira/browse/LOG4J2-214[LOG4J2-214] by `rgoers`, `rpopma`)
+* Move Throwable pattern converter options processing to ThrowableFormatOptions class. (for https://issues.apache.org/jira/browse/LOG4J2-160[LOG4J2-160] by `rgoers`, Joanne Polsky)
* Move async subproject into core. (for https://issues.apache.org/jira/browse/LOG4J2-208[LOG4J2-208] by `rgoers`, `rpopma`)
+* Async documentation update. (for https://issues.apache.org/jira/browse/LOG4J2-214[LOG4J2-214] by `rgoers`, `rpopma`)
=== Fixed
+* Add Fragment-Host to MANIFEST.MF for log4j-core. (for https://issues.apache.org/jira/browse/LOG4J2-159[LOG4J2-159] by `rgoers`, Jan Winter)
* Modify ClassLoaderContextSelector to use the first ClassLoader in the child parent hierarchy that
has a Context with a configuration to allow JSPs to use the WebApp's context and configuration. (for https://issues.apache.org/jira/browse/LOG4J2-161[LOG4J2-161] by `rgoers`)
-* Plugin cache should be reset when addPackages is called. (for https://issues.apache.org/jira/browse/LOG4J2-175[LOG4J2-175] by `sdeboy`)
* Configurator throws a ClassCastException if LogManager returns a SimpleLoggerContext. (for https://issues.apache.org/jira/browse/LOG4J2-167[LOG4J2-167] by `rgoers`)
* ConfigurationFactory was adding factories on every call. (for https://issues.apache.org/jira/browse/LOG4J2-169[LOG4J2-169] by `rgoers`)
-* FlumeAvroManager now uses Flume RPCClient. (for https://issues.apache.org/jira/browse/LOG4J2-196[LOG4J2-196] by `rgoers`)
-* Call LoggerContext.stop when the application is shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-212[LOG4J2-212] by `rgoers`)
-* Fix deadlock in SocketAppender. Added option to not wait for socket reconnect. (for https://issues.apache.org/jira/browse/LOG4J2-205[LOG4J2-205] by `rgoers`)
-* Loggers without a "." had no parent logger. (for https://issues.apache.org/jira/browse/LOG4J2-212[LOG4J2-212] by `rgoers`)
+* Plugin cache should be reset when addPackages is called. (for https://issues.apache.org/jira/browse/LOG4J2-175[LOG4J2-175] by `sdeboy`)
+* Avoid IllegalArgumentException in AsynchAppender. (for https://issues.apache.org/jira/browse/LOG4J2-176[LOG4J2-176] by `rgoers`, `rpopma`)
+* Fix NullPointerException in DatagramOutputStream when flush is called from multiple threads. (for https://issues.apache.org/jira/browse/LOG4J2-177[LOG4J2-177] by `rgoers`, `rpopma`)
* OutputStreamManager now adds the layout header whenever the OutputStream is set. (for https://issues.apache.org/jira/browse/LOG4J2-181[LOG4J2-181] by `rgoers`)
-* FlumeAvroManager now uses Flume RPCClient. (for https://issues.apache.org/jira/browse/LOG4J2-198[LOG4J2-198] by `rgoers`)
-* Use the Maven group ID org.apache.logging.log4j for all artifacts. (for https://issues.apache.org/jira/browse/LOG4J2-207[LOG4J2-207] by `ggregory`)
-* ThrowableFormatOptionsTest failed on Windows due to CR/LF issue. (for https://issues.apache.org/jira/browse/LOG4J2-194[LOG4J2-194] by `rgoers`, `rpopma`)
-* BaseConfiguration addLoggerAppender saved appender using the Logger name. (for https://issues.apache.org/jira/browse/LOG4J2-190[LOG4J2-190] by `rgoers`, Werner)
+* AppenderRefs on AsynchAppender didn't support the level and filter elements. (for https://issues.apache.org/jira/browse/LOG4J2-188[LOG4J2-188] by `rgoers`, Werner)
* The blocking parameter did not work properly on AsynchAppender. (for https://issues.apache.org/jira/browse/LOG4J2-189[LOG4J2-189] by `rgoers`, Werner)
-* LoggerContext method renamed to removeFilter from removeFiler. (for https://issues.apache.org/jira/browse/LOG4J2-200[LOG4J2-200] by `rgoers`, `rpopma`)
+* BaseConfiguration addLoggerAppender saved appender using the Logger name. (for https://issues.apache.org/jira/browse/LOG4J2-190[LOG4J2-190] by `rgoers`, Werner)
+* RollingFastFileAppender (in log4j-async) did not roll over. (for https://issues.apache.org/jira/browse/LOG4J2-193[LOG4J2-193] by `rgoers`, `rpopma`)
+* ThrowableFormatOptionsTest failed on Windows due to CR/LF issue. (for https://issues.apache.org/jira/browse/LOG4J2-194[LOG4J2-194] by `rgoers`, `rpopma`)
* Unit tests now create files in the target directory. (for https://issues.apache.org/jira/browse/LOG4J2-195[LOG4J2-195] by `rgoers`, `rpopma`)
-* Fix NullPointerException in DatagramOutputStream when flush is called from multiple threads. (for https://issues.apache.org/jira/browse/LOG4J2-177[LOG4J2-177] by `rgoers`, `rpopma`)
-* Add Fragment-Host to MANIFEST.MF for log4j-core. (for https://issues.apache.org/jira/browse/LOG4J2-159[LOG4J2-159] by `rgoers`, Jan Winter)
-* Removing extra spaces in entry and exit method output. (for https://issues.apache.org/jira/browse/LOG4J2-211[LOG4J2-211] by `rgoers`, Nick Williams)
+* FlumeAvroManager now uses Flume RPCClient. (for https://issues.apache.org/jira/browse/LOG4J2-196[LOG4J2-196] by `rgoers`)
+* FlumeAvroManager now uses Flume RPCClient. (for https://issues.apache.org/jira/browse/LOG4J2-198[LOG4J2-198] by `rgoers`)
* Highlight subprojects in sub-navigation. (for https://issues.apache.org/jira/browse/LOG4J2-199[LOG4J2-199] by `rgoers`, `rpopma`)
-* RollingFastFileAppender (in log4j-async) did not roll over. (for https://issues.apache.org/jira/browse/LOG4J2-193[LOG4J2-193] by `rgoers`, `rpopma`)
-* Avoid IllegalArgumentException in AsynchAppender. (for https://issues.apache.org/jira/browse/LOG4J2-176[LOG4J2-176] by `rgoers`, `rpopma`)
+* LoggerContext method renamed to removeFilter from removeFiler. (for https://issues.apache.org/jira/browse/LOG4J2-200[LOG4J2-200] by `rgoers`, `rpopma`)
+* Fix deadlock in SocketAppender. Added option to not wait for socket reconnect. (for https://issues.apache.org/jira/browse/LOG4J2-205[LOG4J2-205] by `rgoers`)
+* Use the Maven group ID org.apache.logging.log4j for all artifacts. (for https://issues.apache.org/jira/browse/LOG4J2-207[LOG4J2-207] by `ggregory`)
* MapMessage was not enclosing key value in quotes when generating XML. (for https://issues.apache.org/jira/browse/LOG4J2-210[LOG4J2-210] by `rgoers`, Arkin Yetis)
-* AppenderRefs on AsynchAppender didn't support the level and filter elements. (for https://issues.apache.org/jira/browse/LOG4J2-188[LOG4J2-188] by `rgoers`, Werner)
+* Removing extra spaces in entry and exit method output. (for https://issues.apache.org/jira/browse/LOG4J2-211[LOG4J2-211] by `rgoers`, Nick Williams)
+* Call LoggerContext.stop when the application is shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-212[LOG4J2-212] by `rgoers`)
+* Loggers without a "." had no parent logger. (for https://issues.apache.org/jira/browse/LOG4J2-212[LOG4J2-212] by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.0-beta6.adoc b/src/site/asciidoc/changelog/2.0-beta6.adoc
index 51e1383a7a..9c9dd6b7b7 100644
--- a/src/site/asciidoc/changelog/2.0-beta6.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta6.adoc
@@ -26,27 +26,27 @@ This file is automatically generated from the release changelog directory!
=== Changed
-* Moved Clock interface to package org.apache.logging.log4j.core.helpers. (by `rpopma`)
* Documentation updates to clarify use and impact of location in pattern layouts. (for https://issues.apache.org/jira/browse/LOG4J2-225[LOG4J2-225] by `rpopma`)
+* Improved error reporting when misconfigured. (for https://issues.apache.org/jira/browse/LOG4J2-230[LOG4J2-230] by `rpopma`, Wojciech Zaręba)
* Moved JMX Client GUI classes into separate jmx-gui submodule. (for https://issues.apache.org/jira/browse/LOG4J2-237[LOG4J2-237] by `rpopma`)
-* Renamed AsynchAppender to AsyncAppender. Plugin name became Async (was Asynch). (by `rpopma`)
+* Moved Clock interface to package org.apache.logging.log4j.core.helpers. (by `rpopma`)
* Removed CheckStyle false positives for NewlineAtEndOfFile and whitespace following '*' at end of line in javadoc. (by `rpopma`)
-* Improved error reporting when misconfigured. (for https://issues.apache.org/jira/browse/LOG4J2-230[LOG4J2-230] by `rpopma`, Wojciech Zaręba)
+* Renamed AsynchAppender to AsyncAppender. Plugin name became Async (was Asynch). (by `rpopma`)
=== Fixed
-* Various small documentation fixes. (for https://issues.apache.org/jira/browse/LOG4J2-215[LOG4J2-215] by `rpopma`)
-* Add support for interpolating Environment variables when processing the configuration. (for https://issues.apache.org/jira/browse/LOG4J2-192[LOG4J2-192] by `rgoers`)
* Use OSGi version format in Fragment-Host (for https://issues.apache.org/jira/browse/LOG4J2-159[LOG4J2-159] by `rgoers`)
+* Add support for interpolating Environment variables when processing the configuration. (for https://issues.apache.org/jira/browse/LOG4J2-192[LOG4J2-192] by `rgoers`)
* Renamed Plugin annotation attribute from "type" to "category". (for https://issues.apache.org/jira/browse/LOG4J2-201[LOG4J2-201] by `rgoers`)
-* RegexFilter threw a NullPointerException when used as a context-wide filter. (for https://issues.apache.org/jira/browse/LOG4J2-234[LOG4J2-234] by `rgoers`)
+* Various small documentation fixes. (for https://issues.apache.org/jira/browse/LOG4J2-215[LOG4J2-215] by `rpopma`)
+* Ensure PluginManager streams are always closed. (for https://issues.apache.org/jira/browse/LOG4J2-217[LOG4J2-217] by `rpopma`, Fabien Sanglard)
+* Fix: install default root logger if not configured (this is unchanged),
+ but make sure to include configured named loggers. Clarified documentation. (for https://issues.apache.org/jira/browse/LOG4J2-219[LOG4J2-219] by `rpopma`, Peter DePasquale)
+* Remove hundreds of compiler warnings. (for https://issues.apache.org/jira/browse/LOG4J2-221[LOG4J2-221] by `rgoers`, Nick Williams)
+* Disruptor will now shut down during Tomcat shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-222[LOG4J2-222] by `rgoers`, Steven Yang)
* Fix LoggerContext start and stop to eliminate IllegalStateException and NoClassDefFound errors. (for https://issues.apache.org/jira/browse/LOG4J2-223[LOG4J2-223] by `rgoers`)
* The FlumeAppender failed to start if the Flume RPCClient could not connect to any Flume agents. (for https://issues.apache.org/jira/browse/LOG4J2-224[LOG4J2-224] by `rgoers`)
-* Fixed link to log4j-user mailing list. (for https://issues.apache.org/jira/browse/LOG4J2-233[LOG4J2-233] by `rpopma`)
* Logger.getParent() was not returning the correct Logger. (for https://issues.apache.org/jira/browse/LOG4J2-231[LOG4J2-231] by `rgoers`)
-* Disruptor will now shut down during Tomcat shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-222[LOG4J2-222] by `rgoers`, Steven Yang)
+* Fixed link to log4j-user mailing list. (for https://issues.apache.org/jira/browse/LOG4J2-233[LOG4J2-233] by `rpopma`)
+* RegexFilter threw a NullPointerException when used as a context-wide filter. (for https://issues.apache.org/jira/browse/LOG4J2-234[LOG4J2-234] by `rgoers`)
* Removed dependency on tools jar from core module, made jconsole dependency optional. (for https://issues.apache.org/jira/browse/LOG4J2-235[LOG4J2-235] by `rpopma`, Sebastian Oerding)
-* Ensure PluginManager streams are always closed. (for https://issues.apache.org/jira/browse/LOG4J2-217[LOG4J2-217] by `rpopma`, Fabien Sanglard)
-* Remove hundreds of compiler warnings. (for https://issues.apache.org/jira/browse/LOG4J2-221[LOG4J2-221] by `rgoers`, Nick Williams)
-* Fix: install default root logger if not configured (this is unchanged),
- but make sure to include configured named loggers. Clarified documentation. (for https://issues.apache.org/jira/browse/LOG4J2-219[LOG4J2-219] by `rpopma`, Peter DePasquale)
diff --git a/src/site/asciidoc/changelog/2.0-beta7.adoc b/src/site/asciidoc/changelog/2.0-beta7.adoc
index 250c50ede7..74e0e72730 100644
--- a/src/site/asciidoc/changelog/2.0-beta7.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta7.adoc
@@ -26,36 +26,36 @@ This file is automatically generated from the release changelog directory!
=== Added
-* Provide configuration information (location, content type, content if possible) via a registered Advertiser. (for https://issues.apache.org/jira/browse/LOG4J2-251[LOG4J2-251] by `sdeboy`)
-* New JDBC, JPA, and NoSQL database Appenders. (for https://issues.apache.org/jira/browse/LOG4J2-229[LOG4J2-229] by `ggregory`, Nick Williams)
* Break up core into multiple osgi jars. (for https://issues.apache.org/jira/browse/LOG4J2-10[LOG4J2-10] by `rgoers`, Timothy Ward)
+* New JDBC, JPA, and NoSQL database Appenders. (for https://issues.apache.org/jira/browse/LOG4J2-229[LOG4J2-229] by `ggregory`, Nick Williams)
+* Provide configuration information (location, content type, content if possible) via a registered Advertiser. (for https://issues.apache.org/jira/browse/LOG4J2-251[LOG4J2-251] by `sdeboy`)
=== Changed
-* Allow custom LogEventFactories. (for https://issues.apache.org/jira/browse/LOG4J2-243[LOG4J2-243] by `rgoers`)
* Improve ThreadContext performance with copy-on-write map and stack. (for https://issues.apache.org/jira/browse/LOG4J2-154[LOG4J2-154] by `rpopma`)
-* Method name changes in interface org.apache.logging.log4j.spi.ThreadContextMap:
- getContext() to getCopy(), get() to getImmutableMapOrNull(). (by `rpopma`)
+* Allow custom LogEventFactories. (for https://issues.apache.org/jira/browse/LOG4J2-243[LOG4J2-243] by `rgoers`)
* Allow context parameters in Log4jContextListener to include properties. (for https://issues.apache.org/jira/browse/LOG4J2-249[LOG4J2-249] by `rgoers`)
* Add support for interceptors in the embedded Flume Appender. (for https://issues.apache.org/jira/browse/LOG4J2-262[LOG4J2-262] by `rgoers`, Edward Sargisson)
+* Method name changes in interface org.apache.logging.log4j.spi.ThreadContextMap:
+ getContext() to getCopy(), get() to getImmutableMapOrNull(). (by `rpopma`)
=== Fixed
-* Rewrite Appender was ignoring filters on referenced appenders. (for https://issues.apache.org/jira/browse/LOG4J2-244[LOG4J2-244] by `rgoers`)
-* StringFormattedMessage and MessageFormatMessage now will accept a Throwable as their last argument and
- pass it on. (for https://issues.apache.org/jira/browse/LOG4J2-242[LOG4J2-242] by `rgoers`)
* Remove LoggerContext when LoggerContext is stopped. (for https://issues.apache.org/jira/browse/LOG4J2-223[LOG4J2-223] by `rgoers`)
* UDP now sends one event per packet. (for https://issues.apache.org/jira/browse/LOG4J2-228[LOG4J2-228] by `rgoers`)
+* StringFormattedMessage and MessageFormatMessage now will accept a Throwable as their last argument and
+ pass it on. (for https://issues.apache.org/jira/browse/LOG4J2-242[LOG4J2-242] by `rgoers`)
+* Rewrite Appender was ignoring filters on referenced appenders. (for https://issues.apache.org/jira/browse/LOG4J2-244[LOG4J2-244] by `rgoers`)
* Avoid EmptyStack exception if getCallerClass and SecurityManager are not available. (for https://issues.apache.org/jira/browse/LOG4J2-245[LOG4J2-245] by `rgoers`)
+* Data buffer is reset in finally clause. (for https://issues.apache.org/jira/browse/LOG4J2-246[LOG4J2-246] by `rgoers`)
+* SocketServer.isActive should be volatile because it is accessed from different threads. (for https://issues.apache.org/jira/browse/LOG4J2-247[LOG4J2-247] by `ggregory`)
+* Mark OutputStream in OutputStreamManager as volatile. Mark header and footer as final. (for https://issues.apache.org/jira/browse/LOG4J2-254[LOG4J2-254] by `rgoers`)
* Multi-byte character strings are now assumed to be in the platform default encoding, not UTF-8. (for https://issues.apache.org/jira/browse/LOG4J2-255[LOG4J2-255] by `rpopma`)
-* Use transaction when batch size is 1. (for https://issues.apache.org/jira/browse/LOG4J2-269[LOG4J2-269] by `rgoers`)
+* XML layout ignores charset for the XML processing instruction's encoding attribute. (for https://issues.apache.org/jira/browse/LOG4J2-257[LOG4J2-257] by `ggregory`)
+* HTML layout does not output meta element for charset. (for https://issues.apache.org/jira/browse/LOG4J2-258[LOG4J2-258] by `ggregory`)
* HTML layout does not specify charset in content type. (for https://issues.apache.org/jira/browse/LOG4J2-259[LOG4J2-259] by `ggregory`)
* XML layout does not specify charset in content type. (for https://issues.apache.org/jira/browse/LOG4J2-260[LOG4J2-260] by `ggregory`)
-* Add guid to FlumeEvent headers for non-Map Messages. (for https://issues.apache.org/jira/browse/LOG4J2-268[LOG4J2-268] by `rgoers`)
-* Mark OutputStream in OutputStreamManager as volatile. Mark header and footer as final. (for https://issues.apache.org/jira/browse/LOG4J2-254[LOG4J2-254] by `rgoers`)
-* HTML layout does not output meta element for charset. (for https://issues.apache.org/jira/browse/LOG4J2-258[LOG4J2-258] by `ggregory`)
-* XML layout ignores charset for the XML processing instruction's encoding attribute. (for https://issues.apache.org/jira/browse/LOG4J2-257[LOG4J2-257] by `ggregory`)
-* Data buffer is reset in finally clause. (for https://issues.apache.org/jira/browse/LOG4J2-246[LOG4J2-246] by `rgoers`)
-* Do not allow a charset on RFC5424Layout - use UTF-8. (for https://issues.apache.org/jira/browse/LOG4J2-263[LOG4J2-263] by `rgoers`)
-* SocketServer.isActive should be volatile because it is accessed from different threads. (for https://issues.apache.org/jira/browse/LOG4J2-247[LOG4J2-247] by `ggregory`)
* Add missing "not" to error message. (for https://issues.apache.org/jira/browse/LOG4J2-261[LOG4J2-261] by `rgoers`, Edward Sargisson)
+* Do not allow a charset on RFC5424Layout - use UTF-8. (for https://issues.apache.org/jira/browse/LOG4J2-263[LOG4J2-263] by `rgoers`)
+* Add guid to FlumeEvent headers for non-Map Messages. (for https://issues.apache.org/jira/browse/LOG4J2-268[LOG4J2-268] by `rgoers`)
+* Use transaction when batch size is 1. (for https://issues.apache.org/jira/browse/LOG4J2-269[LOG4J2-269] by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.0-beta8.adoc b/src/site/asciidoc/changelog/2.0-beta8.adoc
index bfb9033365..9008b8c6ee 100644
--- a/src/site/asciidoc/changelog/2.0-beta8.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta8.adoc
@@ -26,36 +26,36 @@ This file is automatically generated from the release changelog directory!
=== Changed
-* Wasted work in UUIDUtil initialization. (for https://issues.apache.org/jira/browse/LOG4J2-274[LOG4J2-274] by `ggregory`)
+* Include arbitrary message fields in RFC-5424 structured data. (for https://issues.apache.org/jira/browse/LOG4J2-168[LOG4J2-168] by `rgoers`, Scott Severtson)
* Improved logging initialization in Servlet containers, especially Servlet 3.0 and newer where Log4j now
initializes and deinitializes automatically with no deployment descriptor configuration. (for https://issues.apache.org/jira/browse/LOG4J2-270[LOG4J2-270] by `nickwilliams`)
* Wasted work in XMLLayout.toSerializable(). (for https://issues.apache.org/jira/browse/LOG4J2-273[LOG4J2-273] by `ggregory`)
-* LogManager.getLogger can now be called without a logger name or with a null logger name. (for https://issues.apache.org/jira/browse/LOG4J2-294[LOG4J2-294] by `rgoers`)
-* Add printf methods to Logger API. (for https://issues.apache.org/jira/browse/LOG4J2-301[LOG4J2-301] by `rgoers`)
+* Wasted work in UUIDUtil initialization. (for https://issues.apache.org/jira/browse/LOG4J2-274[LOG4J2-274] by `ggregory`)
+* Wasted work in RollingAppenderSizeTest.testAppender() and others. (for https://issues.apache.org/jira/browse/LOG4J2-277[LOG4J2-277] by `ggregory`)
* Allow the default status level to be specified as a system property. (for https://issues.apache.org/jira/browse/LOG4J2-282[LOG4J2-282] by `rgoers`)
-* Update Jansi jar to 1.11 from 1.9. (for https://issues.apache.org/jira/browse/LOG4J2-285[LOG4J2-285] by `ggregory`)
-* Update test H2 JDBC driver to 1.172 from 1.171. (for https://issues.apache.org/jira/browse/LOG4J2-286[LOG4J2-286] by `ggregory`)
* Remove dependency on Apache ORO jar. (for https://issues.apache.org/jira/browse/LOG4J2-283[LOG4J2-283] by `ggregory`)
-* Include arbitrary message fields in RFC-5424 structured data. (for https://issues.apache.org/jira/browse/LOG4J2-168[LOG4J2-168] by `rgoers`, Scott Severtson)
* Update Log4j 1 dependency to 1.2.17 from 1.2.16. (for https://issues.apache.org/jira/browse/LOG4J2-284[LOG4J2-284] by `ggregory`)
-* Wasted work in RollingAppenderSizeTest.testAppender() and others. (for https://issues.apache.org/jira/browse/LOG4J2-277[LOG4J2-277] by `ggregory`)
+* Update Jansi jar to 1.11 from 1.9. (for https://issues.apache.org/jira/browse/LOG4J2-285[LOG4J2-285] by `ggregory`)
+* Update test H2 JDBC driver to 1.172 from 1.171. (for https://issues.apache.org/jira/browse/LOG4J2-286[LOG4J2-286] by `ggregory`)
* Update JUnit to 4.11 from 4.7. (for https://issues.apache.org/jira/browse/LOG4J2-288[LOG4J2-288] by `ggregory`)
+* LogManager.getLogger can now be called without a logger name or with a null logger name. (for https://issues.apache.org/jira/browse/LOG4J2-294[LOG4J2-294] by `rgoers`)
+* Add printf methods to Logger API. (for https://issues.apache.org/jira/browse/LOG4J2-301[LOG4J2-301] by `rgoers`)
* Update NoSQL dependencies: lightcouch 0.0.6 from 0.0.5, mongodb 2.11.2 from 2.11.1. (for https://issues.apache.org/jira/browse/LOG4J2-386[LOG4J2-386] by `ggregory`)
=== Fixed
-* FlumeAvroManager fails to notify client of failing event if Flume RPCClient cannot be created. (for https://issues.apache.org/jira/browse/LOG4J2-275[LOG4J2-275] by `rgoers`)
+* Fix NullPointerException (regression due to fix for LOG4J2-228) (for https://issues.apache.org/jira/browse/LOG4J2-139[LOG4J2-139] by `rgoers`)
* FastRollingFileAppender with TimeBasedTriggeringPolicy now works correctly if append=false. (for https://issues.apache.org/jira/browse/LOG4J2-267[LOG4J2-267] by `rpopma`)
* FastRollingFileAppender with TimeBasedTriggeringPolicy now works correctly if append=false. (for https://issues.apache.org/jira/browse/LOG4J2-271[LOG4J2-271] by `rpopma`)
-* Fix NullPointerException (regression due to fix for LOG4J2-228) (for https://issues.apache.org/jira/browse/LOG4J2-139[LOG4J2-139] by `rgoers`)
+* FlumeAvroManager fails to notify client of failing event if Flume RPCClient cannot be created. (for https://issues.apache.org/jira/browse/LOG4J2-275[LOG4J2-275] by `rgoers`)
* Filter calls from Avro or Flume to be ignored by the FlumeAppender. (for https://issues.apache.org/jira/browse/LOG4J2-278[LOG4J2-278] by `rgoers`)
-* WriterThread was ending when no agents are available which caused an OutOfMemoryError. (for https://issues.apache.org/jira/browse/LOG4J2-300[LOG4J2-300] by `rgoers`)
-* Wasted work in TestConfigurator.testEnvironment. (for https://issues.apache.org/jira/browse/LOG4J2-297[LOG4J2-297] by `ggregory`)
* FlumePersistentManager now calls Berkeley DB from threads to avoid encountering interrupts in the application. (for https://issues.apache.org/jira/browse/LOG4J2-279[LOG4J2-279] by `rgoers`)
-* Wasted work in FlumePersistentManager.createManager. (for https://issues.apache.org/jira/browse/LOG4J2-296[LOG4J2-296] by `ggregory`)
-* Fast(Rolling)FileAppender now correctly appends to (does not overwrite) existing file. (for https://issues.apache.org/jira/browse/LOG4J2-292[LOG4J2-292] by `rpopma`)
* AsyncLogger threads are now daemon threads and won't prevent the JVM from shutting down anymore. (for https://issues.apache.org/jira/browse/LOG4J2-280[LOG4J2-280] by `rpopma`)
-* Added toString methods to ThreadContextStack/Map implementation classes. (for https://issues.apache.org/jira/browse/LOG4J2-302[LOG4J2-302] by `rpopma`)
+* Upgrade javadoc plugin to 2.9.1 to fix javadoc security issue. (for https://issues.apache.org/jira/browse/LOG4J2-289[LOG4J2-289] by `rgoers`)
+* Fast(Rolling)FileAppender now correctly appends to (does not overwrite) existing file. (for https://issues.apache.org/jira/browse/LOG4J2-292[LOG4J2-292] by `rpopma`)
* Fast(Rolling)FileAppender now correctly handles messages exceeding the buffer size. (for https://issues.apache.org/jira/browse/LOG4J2-295[LOG4J2-295] by `rpopma`)
+* Wasted work in FlumePersistentManager.createManager. (for https://issues.apache.org/jira/browse/LOG4J2-296[LOG4J2-296] by `ggregory`)
+* Wasted work in TestConfigurator.testEnvironment. (for https://issues.apache.org/jira/browse/LOG4J2-297[LOG4J2-297] by `ggregory`)
* Wasted work in StyleConverterTest.setupClass. (for https://issues.apache.org/jira/browse/LOG4J2-298[LOG4J2-298] by `ggregory`)
-* Upgrade javadoc plugin to 2.9.1 to fix javadoc security issue. (for https://issues.apache.org/jira/browse/LOG4J2-289[LOG4J2-289] by `rgoers`)
+* WriterThread was ending when no agents are available which caused an OutOfMemoryError. (for https://issues.apache.org/jira/browse/LOG4J2-300[LOG4J2-300] by `rgoers`)
+* Added toString methods to ThreadContextStack/Map implementation classes. (for https://issues.apache.org/jira/browse/LOG4J2-302[LOG4J2-302] by `rpopma`)
diff --git a/src/site/asciidoc/changelog/2.0-beta9.adoc b/src/site/asciidoc/changelog/2.0-beta9.adoc
index e9dc5866cd..f9fc923dec 100644
--- a/src/site/asciidoc/changelog/2.0-beta9.adoc
+++ b/src/site/asciidoc/changelog/2.0-beta9.adoc
@@ -28,23 +28,20 @@ This file is automatically generated from the release changelog directory!
* Added FAQ page to the site. (for https://issues.apache.org/jira/browse/LOG4J2-253[LOG4J2-253] by `rpopma`)
* Ease porting from 1.x Logger.getRootLogger(): add LogManager.getRootLogger(). (for https://issues.apache.org/jira/browse/LOG4J2-305[LOG4J2-305] by `ggregory`)
+* Add JNDILookup plugin. (for https://issues.apache.org/jira/browse/LOG4J2-313[LOG4J2-313] by `rgoers`, Woonsan Ko)
+* Add TLSAppender. Also added missing license headers to several files. (for https://issues.apache.org/jira/browse/LOG4J2-338[LOG4J2-338] by `rgoers`, Tibor Benke)
* Enable XInclude for XML configurations. (for https://issues.apache.org/jira/browse/LOG4J2-341[LOG4J2-341] by `ggregory`)
+* Create a JSON Layout. (for https://issues.apache.org/jira/browse/LOG4J2-356[LOG4J2-356] by `ggregory`)
* Allow Plugins to have aliases. (for https://issues.apache.org/jira/browse/LOG4J2-360[LOG4J2-360] by `rgoers`)
* Add a diagram to the site (FAQ page) that explains when to use which jar. (for https://issues.apache.org/jira/browse/LOG4J2-362[LOG4J2-362] by `rpopma`)
+* Add WebLookup to retrieve information from the ServletContext. (for https://issues.apache.org/jira/browse/LOG4J2-364[LOG4J2-364] by `rgoers`, David Nault)
+* Add more options to PatternLayout to display more detailed information about a Throwable. (for https://issues.apache.org/jira/browse/LOG4J2-374[LOG4J2-374] by `ggregory`, Tibor Benke)
* [Pattern Layout] Customize level names by length. (for https://issues.apache.org/jira/browse/LOG4J2-383[LOG4J2-383] by `ggregory`)
* [Pattern Layout] Customize level names to lower-case. (for https://issues.apache.org/jira/browse/LOG4J2-384[LOG4J2-384] by `ggregory`)
-* Create a JSON Layout. (for https://issues.apache.org/jira/browse/LOG4J2-356[LOG4J2-356] by `ggregory`)
* Allow the default file rollover strategy to define the compression level. (for https://issues.apache.org/jira/browse/LOG4J2-399[LOG4J2-399] by `ggregory`)
-* Add JNDILookup plugin. (for https://issues.apache.org/jira/browse/LOG4J2-313[LOG4J2-313] by `rgoers`, Woonsan Ko)
-* Add more options to PatternLayout to display more detailed information about a Throwable. (for https://issues.apache.org/jira/browse/LOG4J2-374[LOG4J2-374] by `ggregory`, Tibor Benke)
-* Add TLSAppender. Also added missing license headers to several files. (for https://issues.apache.org/jira/browse/LOG4J2-338[LOG4J2-338] by `rgoers`, Tibor Benke)
-* Add WebLookup to retrieve information from the ServletContext. (for https://issues.apache.org/jira/browse/LOG4J2-364[LOG4J2-364] by `rgoers`, David Nault)
=== Changed
-* Improved site by adding quick jump-off page and menu for Javadoc links for all components. (by `nickwilliams`)
-* Cleaned up tests and cleared up documentation for the JPA appender following the resolution of EclipseLink
- issue #412454. (by `nickwilliams`)
* Changed the (relatively new) PatternLayout configuration attribute "suppressExceptions" to
"alwaysWriteExceptions" to more correctly indicate what it does. As such, the meaning of this attribute has
reversed (previous "true"s should become "false"s, and vice versa). Since this was an undocumented attribute up
@@ -55,61 +52,64 @@ This file is automatically generated from the release changelog directory!
exceptions encountered while logging. Setting "ignoreExceptions" to "false" on an Appender causes it to allow
exceptions to propagate to the caller. You must set "ignoreExceptions" to "false" for Appenders you are wrapping
in the Failover Appender. (by `nickwilliams`)
-* Allow shutdown hook to be disabled in the configuration. (for https://issues.apache.org/jira/browse/LOG4J2-318[LOG4J2-318] by `rgoers`)
+* Cleaned up tests and cleared up documentation for the JPA appender following the resolution of EclipseLink
+ issue #412454. (by `nickwilliams`)
+* Improved site by adding quick jump-off page and menu for Javadoc links for all components. (by `nickwilliams`)
* Update JSON Jackson library to 2.2.2 from 2.2.1. (for https://issues.apache.org/jira/browse/LOG4J2-306[LOG4J2-306] by `ggregory`)
+* Updated Async Loggers' LMAX Disruptor library from 3.0.1 to 3.2.0. (for https://issues.apache.org/jira/browse/LOG4J2-307[LOG4J2-307] by `rpopma`)
+* Clarified which library versions were used in Async Loggers performance test. (for https://issues.apache.org/jira/browse/LOG4J2-308[LOG4J2-308] by `rpopma`)
* XML layout improvements (compact vs. pretty, namespace, namespace prefix, root element). (for https://issues.apache.org/jira/browse/LOG4J2-312[LOG4J2-312] by `ggregory`)
* Renamed FastFileAppender and FastRollingFileAppender to RandomAccessFileAppender
and RollingRandomAccessFileAppender. Configurations using the Fast(Rolling)File element
no longer work and should be modified to use the (Rolling)RandomAccessFile element. (for https://issues.apache.org/jira/browse/LOG4J2-317[LOG4J2-317] by `ggregory`)
+* Allow shutdown hook to be disabled in the configuration. (for https://issues.apache.org/jira/browse/LOG4J2-318[LOG4J2-318] by `rgoers`)
* Update JDBC tests to use H2 database 1.3.173 from 1.3.172. (for https://issues.apache.org/jira/browse/LOG4J2-325[LOG4J2-325] by `ggregory`)
-* Updated Async Loggers' LMAX Disruptor library from 3.0.1 to 3.2.0. (for https://issues.apache.org/jira/browse/LOG4J2-307[LOG4J2-307] by `rpopma`)
-* Clarified which library versions were used in Async Loggers performance test. (for https://issues.apache.org/jira/browse/LOG4J2-308[LOG4J2-308] by `rpopma`)
+* Add support for multiple SD-ELEMENTs in an RFC 5424 syslog message. (for https://issues.apache.org/jira/browse/LOG4J2-355[LOG4J2-355] by `ggregory`, Tibor Benke)
* Update commons-logging to 1.1.3 from 1.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-366[LOG4J2-366] by `ggregory`)
-* Update HSQLDB dependency to 2.3.0 from 2.2.9. (for https://issues.apache.org/jira/browse/LOG4J2-390[LOG4J2-390] by `ggregory`)
-* Update Java Mail dependency to 1.5.0 from 1.4.7. (for https://issues.apache.org/jira/browse/LOG4J2-388[LOG4J2-388] by `ggregory`)
* Update Jackson dependency to 1.9.13 from 1.9.11. (for https://issues.apache.org/jira/browse/LOG4J2-387[LOG4J2-387] by `ggregory`)
-* Add support for multiple SD-ELEMENTs in an RFC 5424 syslog message. (for https://issues.apache.org/jira/browse/LOG4J2-355[LOG4J2-355] by `ggregory`, Tibor Benke)
+* Update Java Mail dependency to 1.5.0 from 1.4.7. (for https://issues.apache.org/jira/browse/LOG4J2-388[LOG4J2-388] by `ggregory`)
+* Update HSQLDB dependency to 2.3.0 from 2.2.9. (for https://issues.apache.org/jira/browse/LOG4J2-390[LOG4J2-390] by `ggregory`)
=== Fixed
-* Double stack trace logging when using %throwable in %style and %highlight. (for https://issues.apache.org/jira/browse/LOG4J2-319[LOG4J2-319] by `ggregory`)
+* The slf4j-ext jar is now an optional dependency of the SLF4J bridge. (for https://issues.apache.org/jira/browse/LOG4J2-165[LOG4J2-165] by `rgoers`)
+* RoutingAppender's default Route can now be an appender reference. (for https://issues.apache.org/jira/browse/LOG4J2-166[LOG4J2-166] by `rgoers`)
* ThrowableProxy no longer extends Throwable. (for https://issues.apache.org/jira/browse/LOG4J2-216[LOG4J2-216] by `rgoers`)
-* Centralized reflective use of Reflection#getCallerClass and properly handled its instability in various versions
- of Java. (for https://issues.apache.org/jira/browse/LOG4J2-322[LOG4J2-322] by `nickwilliams`)
+* Fix table of contents generation in pdf. (for https://issues.apache.org/jira/browse/LOG4J2-226[LOG4J2-226] by `rgoers`)
+* Additional fix to make AsyncAppender threads daemon threads and improve their thread name. (for https://issues.apache.org/jira/browse/LOG4J2-280[LOG4J2-280] by `rpopma`)
+* Fixed JDBC, JPA, and NoSQL appenders so that the failover appender properly fails over on error. (for https://issues.apache.org/jira/browse/LOG4J2-291[LOG4J2-291] by `nickwilliams`)
+* Changed the ConfigurationFactory to recognize and properly use the classpath: URI scheme in addition to the
+ classloader: URI scheme. (for https://issues.apache.org/jira/browse/LOG4J2-293[LOG4J2-293] by `nickwilliams`, Abhinav Shah)
* Reset the Configuration if the ClassLoaderContextSelector creates a LoggerContext without a configuration
location and then is later provided one. (for https://issues.apache.org/jira/browse/LOG4J2-293[LOG4J2-293] by `rgoers`)
-* FlumePersistentManager was calling Berkeley DB's count method too frequently. (for https://issues.apache.org/jira/browse/LOG4J2-328[LOG4J2-328] by `rgoers`)
-* Fixed Async Loggers memory leak. (for https://issues.apache.org/jira/browse/LOG4J2-304[LOG4J2-304] by `rpopma`)
* Add getThrowable method to ThrowableProxy. (for https://issues.apache.org/jira/browse/LOG4J2-299[LOG4J2-299] by `rgoers`)
-* Additional fix to make AsyncAppender threads daemon threads and improve their thread name. (for https://issues.apache.org/jira/browse/LOG4J2-280[LOG4J2-280] by `rpopma`)
-* JPAAppender stops logging because META-INF/log4j-provider.properties is left open. (for https://issues.apache.org/jira/browse/LOG4J2-320[LOG4J2-320] by `ggregory`)
+* Fixed Async Loggers memory leak. (for https://issues.apache.org/jira/browse/LOG4J2-304[LOG4J2-304] by `rpopma`)
* Insure jars and distributions only have a single License and Notice file. (for https://issues.apache.org/jira/browse/LOG4J2-309[LOG4J2-309] by `rgoers`)
-* RoutingAppender's default Route can now be an appender reference. (for https://issues.apache.org/jira/browse/LOG4J2-166[LOG4J2-166] by `rgoers`)
-* Fixed JDBC, JPA, and NoSQL appenders so that the failover appender properly fails over on error. (for https://issues.apache.org/jira/browse/LOG4J2-291[LOG4J2-291] by `nickwilliams`)
-* Fix table of contents generation in pdf. (for https://issues.apache.org/jira/browse/LOG4J2-226[LOG4J2-226] by `rgoers`)
-* The slf4j-ext jar is now an optional dependency of the SLF4J bridge. (for https://issues.apache.org/jira/browse/LOG4J2-165[LOG4J2-165] by `rgoers`)
+* Fixed issue where SMTPAppender did not send mails with error or fatal level without prior info event. (for https://issues.apache.org/jira/browse/LOG4J2-310[LOG4J2-310] by `rpopma`, Olivier Lemasle)
* Synchronized flush() and close() methods in the XxxFileManager and OutputStreamManager classes. (for https://issues.apache.org/jira/browse/LOG4J2-311[LOG4J2-311] by `rpopma`)
-* Add PatternLayout constructor to Log4j 1.2 bridge for Velocity. (for https://issues.apache.org/jira/browse/LOG4J2-368[LOG4J2-368] by `rgoers`)
-* NoSQLAppender using MongoDB provider ignores username and password attributes (for https://issues.apache.org/jira/browse/LOG4J2-358[LOG4J2-358] by `nickwilliams`)
-* Initialize PluginManager once during configuration. Move advertisement setup into BaseConfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-393[LOG4J2-393] by `rgoers`)
-* Ignore xml:base attributes. (for https://issues.apache.org/jira/browse/LOG4J2-342[LOG4J2-342] by `rgoers`)
-* FlumePersistentManager's writer thread had high CPU usage. (for https://issues.apache.org/jira/browse/LOG4J2-335[LOG4J2-335] by `rgoers`)
+* Double stack trace logging when using %throwable in %style and %highlight. (for https://issues.apache.org/jira/browse/LOG4J2-319[LOG4J2-319] by `ggregory`)
+* JPAAppender stops logging because META-INF/log4j-provider.properties is left open. (for https://issues.apache.org/jira/browse/LOG4J2-320[LOG4J2-320] by `ggregory`)
+* Centralized reflective use of Reflection#getCallerClass and properly handled its instability in various versions
+ of Java. (for https://issues.apache.org/jira/browse/LOG4J2-322[LOG4J2-322] by `nickwilliams`)
+* FlumePersistentManager was calling Berkeley DB's count method too frequently. (for https://issues.apache.org/jira/browse/LOG4J2-328[LOG4J2-328] by `rgoers`)
* StatusLogger now only creates StatusData objects if they are the appropriate logging level. (for https://issues.apache.org/jira/browse/LOG4J2-329[LOG4J2-329] by `rgoers`)
-* Removed erroneous check for affected MongoDB records, which always returns zero on inserts. (for https://issues.apache.org/jira/browse/LOG4J2-331[LOG4J2-331] by `nickwilliams`)
-* Use rollover date when substituting ${date} in the filePattern. (for https://issues.apache.org/jira/browse/LOG4J2-380[LOG4J2-380] by `rgoers`)
* Added a BSON Transformer so that MongoDB can persist Log4j events. (for https://issues.apache.org/jira/browse/LOG4J2-330[LOG4J2-330] by `nickwilliams`)
-* Changed the ConfigurationFactory to recognize and properly use the classpath: URI scheme in addition to the
- classloader: URI scheme. (for https://issues.apache.org/jira/browse/LOG4J2-293[LOG4J2-293] by `nickwilliams`, Abhinav Shah)
-* Fixed issue where SMTPAppender did not send mails with error or fatal level without prior info event. (for https://issues.apache.org/jira/browse/LOG4J2-310[LOG4J2-310] by `rpopma`, Olivier Lemasle)
+* Removed erroneous check for affected MongoDB records, which always returns zero on inserts. (for https://issues.apache.org/jira/browse/LOG4J2-331[LOG4J2-331] by `nickwilliams`)
* Modified documentation to refer to SLF4J Binding instead of SLF4J Bridge. (for https://issues.apache.org/jira/browse/LOG4J2-332[LOG4J2-332] by `rgoers`, Hervé Boutemy)
+* Match artifact ids with Maven module names. (for https://issues.apache.org/jira/browse/LOG4J2-333[LOG4J2-333] by `ggregory`, Hervé Boutemy)
+* FlumePersistentManager's writer thread had high CPU usage. (for https://issues.apache.org/jira/browse/LOG4J2-335[LOG4J2-335] by `rgoers`)
+* AsyncLogger errors after multiple calls to LoggerContext.reconfigure(). (for https://issues.apache.org/jira/browse/LOG4J2-336[LOG4J2-336] by `rpopma`, Andre Bogus)
+* Ignore xml:base attributes. (for https://issues.apache.org/jira/browse/LOG4J2-342[LOG4J2-342] by `rgoers`)
+* Removed unnecessary generics from Appender interface and implementing classes. (for https://issues.apache.org/jira/browse/LOG4J2-343[LOG4J2-343] by `rpopma`, Henning Schmiedehausen)
+* Give the AsyncAppender thread a more descriptive name for easier debugging/profiling. (for https://issues.apache.org/jira/browse/LOG4J2-347[LOG4J2-347] by `rpopma`, David Phillips)
+* [OSGi] wrong Fragment-Host in manifest files. (for https://issues.apache.org/jira/browse/LOG4J2-351[LOG4J2-351] by `rpopma`, Roland Weiglhofer)
+* NoSQLAppender using MongoDB provider ignores username and password attributes (for https://issues.apache.org/jira/browse/LOG4J2-358[LOG4J2-358] by `nickwilliams`)
* Changed the Servlet 3.0 auto-initializer so that it does nothing in a Servlet 2.5 or older application. This
ensures behavioral consistency across containers. (for https://issues.apache.org/jira/browse/LOG4J2-359[LOG4J2-359] by `nickwilliams`, Abhinav Shah)
-* Match artifact ids with Maven module names. (for https://issues.apache.org/jira/browse/LOG4J2-333[LOG4J2-333] by `ggregory`, Hervé Boutemy)
* JMS appenders send two messages for one append. (for https://issues.apache.org/jira/browse/LOG4J2-367[LOG4J2-367] by `ggregory`, David Parry)
-* [OSGi] wrong Fragment-Host in manifest files. (for https://issues.apache.org/jira/browse/LOG4J2-351[LOG4J2-351] by `rpopma`, Roland Weiglhofer)
+* Add PatternLayout constructor to Log4j 1.2 bridge for Velocity. (for https://issues.apache.org/jira/browse/LOG4J2-368[LOG4J2-368] by `rgoers`)
+* Use rollover date when substituting ${date} in the filePattern. (for https://issues.apache.org/jira/browse/LOG4J2-380[LOG4J2-380] by `rgoers`)
* FlumePersistentManager now handles LockConflictExceptions in Berkeley Db. (for https://issues.apache.org/jira/browse/LOG4J2-391[LOG4J2-391] by `rgoers`, Kamal Bahadur)
-* Give the AsyncAppender thread a more descriptive name for easier debugging/profiling. (for https://issues.apache.org/jira/browse/LOG4J2-347[LOG4J2-347] by `rpopma`, David Phillips)
+* Initialize PluginManager once during configuration. Move advertisement setup into BaseConfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-393[LOG4J2-393] by `rgoers`)
* Allow classpath scheme when specifying configuration file location as a system property. (for https://issues.apache.org/jira/browse/LOG4J2-395[LOG4J2-395] by `rgoers`, Abhinav Shah)
-* AsyncLogger errors after multiple calls to LoggerContext.reconfigure(). (for https://issues.apache.org/jira/browse/LOG4J2-336[LOG4J2-336] by `rpopma`, Andre Bogus)
* Logger.info(Message) Javadoc is incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-397[LOG4J2-397] by `ggregory`, Yonatan Graber)
-* Removed unnecessary generics from Appender interface and implementing classes. (for https://issues.apache.org/jira/browse/LOG4J2-343[LOG4J2-343] by `rpopma`, Henning Schmiedehausen)
diff --git a/src/site/asciidoc/changelog/2.0-rc1.adoc b/src/site/asciidoc/changelog/2.0-rc1.adoc
index 22bc77cf88..28ec3cc30f 100644
--- a/src/site/asciidoc/changelog/2.0-rc1.adoc
+++ b/src/site/asciidoc/changelog/2.0-rc1.adoc
@@ -26,31 +26,31 @@ This file is automatically generated from the release changelog directory!
=== Added
-* Configure RandomAccessFileAppender buffer size. (for https://issues.apache.org/jira/browse/LOG4J2-402[LOG4J2-402] by `ggregory`)
* Configure FileAppender buffer size. (for https://issues.apache.org/jira/browse/LOG4J2-401[LOG4J2-401] by `ggregory`)
+* Configure RandomAccessFileAppender buffer size. (for https://issues.apache.org/jira/browse/LOG4J2-402[LOG4J2-402] by `ggregory`)
+* Format log event time as UNIX time (seconds or milliseconds). (for https://issues.apache.org/jira/browse/LOG4J2-415[LOG4J2-415] by `ggregory`)
+* Create a lookup for resource bundle substitution. (for https://issues.apache.org/jira/browse/LOG4J2-420[LOG4J2-420] by `ggregory`)
* (JMX) Added MBeans for instrumenting AsyncAppenders and AsyncLogger RingBuffers,
exposing queue size, remaining capacity and other attributes. (for https://issues.apache.org/jira/browse/LOG4J2-423[LOG4J2-423] by `rpopma`)
-* Create a lookup for resource bundle substitution. (for https://issues.apache.org/jira/browse/LOG4J2-420[LOG4J2-420] by `ggregory`)
-* Format log event time as UNIX time (seconds or milliseconds). (for https://issues.apache.org/jira/browse/LOG4J2-415[LOG4J2-415] by `ggregory`)
-* (JMX) JMX Client GUI should dynamically update when LoggerContext MBeans are registered/unregistered in MBean
- server. (for https://issues.apache.org/jira/browse/LOG4J2-530[LOG4J2-530] by `rpopma`)
-* Add Stream interface to Loggers. (for https://issues.apache.org/jira/browse/LOG4J2-481[LOG4J2-481] by `rgoers`, `mattsicker`)
* Added option to toggle Thread name caching in AsyncLogger. (for https://issues.apache.org/jira/browse/LOG4J2-467[LOG4J2-467] by `rpopma`, Anthony Baldocchi)
* ThreadContext now uses plain ThreadLocal by default, unless system property
isThreadContextMapInheritable has value "true". (for https://issues.apache.org/jira/browse/LOG4J2-479[LOG4J2-479] by `rpopma`, MK)
+* Add Stream interface to Loggers. (for https://issues.apache.org/jira/browse/LOG4J2-481[LOG4J2-481] by `rgoers`, `mattsicker`)
* Documentation fix: The attribute of Route to refer to an appender is "ref" not "AppenderRef". (for https://issues.apache.org/jira/browse/LOG4J2-482[LOG4J2-482] by `rpopma`, Hongdi Ren)
+* (JMX) JMX Client GUI should dynamically update when LoggerContext MBeans are registered/unregistered in MBean
+ server. (for https://issues.apache.org/jira/browse/LOG4J2-530[LOG4J2-530] by `rpopma`)
=== Changed
* PatternLayout option to not output ANSI escape codes if no Console is available. (for https://issues.apache.org/jira/browse/LOG4J2-413[LOG4J2-413] by `ggregory`)
-* Space Level numbers by 100 instead of 1. (for https://issues.apache.org/jira/browse/LOG4J2-507[LOG4J2-507] by `ggregory`)
+* Add support for custom logging levels. (for https://issues.apache.org/jira/browse/LOG4J2-41[LOG4J2-41] by `rgoers`, Nick Williams)
* Update Flume Appender to use Flume 1.4.0. (for https://issues.apache.org/jira/browse/LOG4J2-453[LOG4J2-453] by `rgoers`)
-* Resource leak in Flume appender when it cannot create a BerkeleyDB db. (for https://issues.apache.org/jira/browse/LOG4J2-532[LOG4J2-532] by `ggregory`)
+* Update EasyMock to version 3.2. (for https://issues.apache.org/jira/browse/LOG4J2-490[LOG4J2-490] by `rgoers`, `mattsicker`)
+* Space Level numbers by 100 instead of 1. (for https://issues.apache.org/jira/browse/LOG4J2-507[LOG4J2-507] by `ggregory`)
* Rename package org.apache.logging.log4j.core.appender.rolling.helper to org.apache.logging.log4j.core.appender.rolling.action. (for https://issues.apache.org/jira/browse/LOG4J2-528[LOG4J2-528] by `ggregory`)
+* Resource leak in Flume appender when it cannot create a BerkeleyDB db. (for https://issues.apache.org/jira/browse/LOG4J2-532[LOG4J2-532] by `ggregory`)
* Renamed the org.apache.logging.log4j.core.appender.db.nosql.couch package to
org.apache.logging.log4j.core.appender.db.nosql.couchdb. (by `grobmeier`)
-* Add support for custom logging levels. (for https://issues.apache.org/jira/browse/LOG4J2-41[LOG4J2-41] by `rgoers`, Nick Williams)
-* Update EasyMock to version 3.2. (for https://issues.apache.org/jira/browse/LOG4J2-490[LOG4J2-490] by `rgoers`, `mattsicker`)
=== Removed
@@ -59,68 +59,68 @@ This file is automatically generated from the release changelog directory!
=== Fixed
-* Configuration was being processed twice at startup. (for https://issues.apache.org/jira/browse/LOG4J2-405[LOG4J2-405] by `rgoers`)
-* Fixed issue that prevented Log4J from working in Google App Engine. (for https://issues.apache.org/jira/browse/LOG4J2-379[LOG4J2-379] by `rpopma`)
-* Configure properties and setup Interpolator before processing rest of configuration. (for https://issues.apache.org/jira/browse/LOG4J2-398[LOG4J2-398] by `rgoers`)
* Resolved memory leak by releasing reference to ThreadLocal when
AsyncLogger is stopped. (for https://issues.apache.org/jira/browse/LOG4J2-323[LOG4J2-323] by `rpopma`)
+* Changed the Servlet 3.0 auto-initializer to add the filter by class to get around a WebLogic bug. (for https://issues.apache.org/jira/browse/LOG4J2-344[LOG4J2-344] by `nickwilliams`, Keir Lawson, Tomasz Wladzinski)
+* (OSGi) logging.log4j-1.2-api doesn't export the log4j API 1.2. Dependent bundles can not be resolved. (for https://issues.apache.org/jira/browse/LOG4J2-345[LOG4J2-345] by `rpopma`, `mattsicker`, Roland Weiglhofer)
+* Changed the Servlet 3.0 auto-initializer so that it does nothing in a Servlet 2.5 or older application. This
+ ensures behavioral consistency across containers. This includes additional fixes to abort initialization if a
+ duplicate filter already exists and to check the actual Servlet EFFECTIVE version. (for https://issues.apache.org/jira/browse/LOG4J2-359[LOG4J2-359] by `nickwilliams`, Abhinav Shah)
+* (OSGi) Fix NPE during shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-377[LOG4J2-377] by `rpopma`, `mattsicker`, Roland Weiglhofer)
+* Fixed issue that prevented Log4J from working in Google App Engine. (for https://issues.apache.org/jira/browse/LOG4J2-379[LOG4J2-379] by `rpopma`)
+* Fixed issues with time-based file rollover (monthly, weekly, hourly and every minute). (for https://issues.apache.org/jira/browse/LOG4J2-385[LOG4J2-385] by `rpopma`, Ace Funk, Porfirio Partida)
+* Stop AsyncLoggerConfig Disruptor thread(s), then AsyncAppender thread(s) first
+ before stopping other appenders. (for https://issues.apache.org/jira/browse/LOG4J2-392[LOG4J2-392] by `rpopma`, ilynaf, Andre Bogus)
+* Configure properties and setup Interpolator before processing rest of configuration. (for https://issues.apache.org/jira/browse/LOG4J2-398[LOG4J2-398] by `rgoers`)
+* @EnterpriseNumber" was missing in the ID of structured data when RFC5424Layout is used (for https://issues.apache.org/jira/browse/LOG4J2-404[LOG4J2-404] by `rgoers`, Kamal Bahadur)
+* Configuration was being processed twice at startup. (for https://issues.apache.org/jira/browse/LOG4J2-405[LOG4J2-405] by `rgoers`)
+* (JMX) Unregister all log4j JMX MBeans when the LoggerContext is stopped
+ to allow web application classes to be GC-ed on undeploy. (for https://issues.apache.org/jira/browse/LOG4J2-406[LOG4J2-406] by `rpopma`, Kerrigan Joseph)
* Fixed inability to recover from lost database connection in database appenders by connecting (borrowing from
pool) on new write internal or on flush. (for https://issues.apache.org/jira/browse/LOG4J2-407[LOG4J2-407] by `nickwilliams`)
+* Fixed error in documentation code example in manual/eventlogging.html (for https://issues.apache.org/jira/browse/LOG4J2-408[LOG4J2-408] by `rpopma`, `mattsicker`, Dongqing Hu)
+* Created a utility to properly escape backslashes before creating URIs, and changed URI creation to use the
+ utility instead of instantiating URI directly. (for https://issues.apache.org/jira/browse/LOG4J2-409[LOG4J2-409] by `nickwilliams`, Frank Steinmann, Thomas Neidhart)
* Fix Event Level / LoggerConfig Level table at the architecture documentation page. (for https://issues.apache.org/jira/browse/LOG4J2-417[LOG4J2-417] by `ggregory`)
* Resolved memory leak by populating AsyncLoggerConfigHelper ring buffer
via EventTranslatorTwoArg, eliminating the need for a ThreadLocal. (for https://issues.apache.org/jira/browse/LOG4J2-425[LOG4J2-425] by `rpopma`)
-* Switch in log4j-1.2-api Category.getEffectiveLevel has no cases for FATAL, OFF. (for https://issues.apache.org/jira/browse/LOG4J2-517[LOG4J2-517] by `rpopma`)
-* hostName property was not being set until after the first configuration element. (for https://issues.apache.org/jira/browse/LOG4J2-470[LOG4J2-470] by `rgoers`)
+* Use the formatted Message in RFC5424Layout for non-StructuredDataMessages. (for https://issues.apache.org/jira/browse/LOG4J2-430[LOG4J2-430] by `rgoers`, David Gstir)
+* Ensured the JDBCAppender commits transactions after a single write or a flush of multiple writes. (for https://issues.apache.org/jira/browse/LOG4J2-438[LOG4J2-438] by `nickwilliams`)
* Fixed problem with JDBC and JPA appender connectivity in WebSphere by connecting (borrowing from pool) on new
write internal or on flush. (for https://issues.apache.org/jira/browse/LOG4J2-442[LOG4J2-442] by `nickwilliams`)
-* Fixed the JPAAppender's overuse of transactions by connecting (borrowing from pool) on new write internal or on
- flush. (for https://issues.apache.org/jira/browse/LOG4J2-489[LOG4J2-489] by `nickwilliams`)
-* Fixed issue where toString methods that perform logging could deadlock AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-485[LOG4J2-485] by `rpopma`)
-* (JMX - ObjectNames changed!) Unloading one web application unloads JMX MBeans for all web applications. (for https://issues.apache.org/jira/browse/LOG4J2-500[LOG4J2-500] by `rpopma`)
-* Ensured the JDBCAppender commits transactions after a single write or a flush of multiple writes. (for https://issues.apache.org/jira/browse/LOG4J2-438[LOG4J2-438] by `nickwilliams`)
+* (JMX) Fixed issue where log4j2 LoggerContext did not show up in JMX GUI or JConsole. (for https://issues.apache.org/jira/browse/LOG4J2-443[LOG4J2-443] by `rpopma`, Colin Froggatt, Tudor Har)
+* ResolverUtil cannot find packages in file URLs which include the '+' character. (for https://issues.apache.org/jira/browse/LOG4J2-445[LOG4J2-445] by `rpopma`, Anthony Baldocchi)
+* XMLLayout does not include marker name. (for https://issues.apache.org/jira/browse/LOG4J2-447[LOG4J2-447] by `ggregory`, `sdeboy`, Jeff Hudren, Mark Paluch)
+* Fixed typo in documentation: system property should be log4j2.loggerContextFactory (for https://issues.apache.org/jira/browse/LOG4J2-451[LOG4J2-451] by `rpopma`, `mattsicker`, Vinay Pothnis)
* Added a ServletContext attribute that, when set to "true", disables Log4j's auto-initialization in
Servlet 3.0+ web applications. (for https://issues.apache.org/jira/browse/LOG4J2-452[LOG4J2-452] by `nickwilliams`)
-* LocalizedMessage serialization is broken. (for https://issues.apache.org/jira/browse/LOG4J2-523[LOG4J2-523] by `ggregory`)
-* Support arrays as sub-elements of a JSON configuration. (for https://issues.apache.org/jira/browse/LOG4J2-464[LOG4J2-464] by `rgoers`)
+* TimeBasedTriggeringPolicy should use event time millis. (for https://issues.apache.org/jira/browse/LOG4J2-454[LOG4J2-454] by `rpopma`, Robin Zhang Tao)
+* RingBufferLogEvent should return Message timestamp for TimestampMessage messages. (for https://issues.apache.org/jira/browse/LOG4J2-455[LOG4J2-455] by `rpopma`, Robin Zhang Tao)
* Fixed failure of JDBC and JPA appender to properly release database connections by connecting (borrowing from
pool) on new write internal or on flush. (for https://issues.apache.org/jira/browse/LOG4J2-457[LOG4J2-457] by `nickwilliams`)
* Set external context when constructing the LoggerContext. (for https://issues.apache.org/jira/browse/LOG4J2-459[LOG4J2-459] by `rgoers`)
-* Changed the Servlet 3.0 auto-initializer so that it does nothing in a Servlet 2.5 or older application. This
- ensures behavioral consistency across containers. This includes additional fixes to abort initialization if a
- duplicate filter already exists and to check the actual Servlet EFFECTIVE version. (for https://issues.apache.org/jira/browse/LOG4J2-359[LOG4J2-359] by `nickwilliams`, Abhinav Shah)
-* (JMX) Unregister all log4j JMX MBeans when the LoggerContext is stopped
- to allow web application classes to be GC-ed on undeploy. (for https://issues.apache.org/jira/browse/LOG4J2-406[LOG4J2-406] by `rpopma`, Kerrigan Joseph)
-* @EnterpriseNumber" was missing in the ID of structured data when RFC5424Layout is used (for https://issues.apache.org/jira/browse/LOG4J2-404[LOG4J2-404] by `rgoers`, Kamal Bahadur)
-* Stop AsyncLoggerConfig Disruptor thread(s), then AsyncAppender thread(s) first
- before stopping other appenders. (for https://issues.apache.org/jira/browse/LOG4J2-392[LOG4J2-392] by `rpopma`, ilynaf, Andre Bogus)
-* (OSGi) logging.log4j-1.2-api doesn't export the log4j API 1.2. Dependent bundles can not be resolved. (for https://issues.apache.org/jira/browse/LOG4J2-345[LOG4J2-345] by `rpopma`, `mattsicker`, Roland Weiglhofer)
-* Changed the Servlet 3.0 auto-initializer to add the filter by class to get around a WebLogic bug. (for https://issues.apache.org/jira/browse/LOG4J2-344[LOG4J2-344] by `nickwilliams`, Keir Lawson, Tomasz Wladzinski)
-* Fixed error in documentation code example in manual/eventlogging.html (for https://issues.apache.org/jira/browse/LOG4J2-408[LOG4J2-408] by `rpopma`, `mattsicker`, Dongqing Hu)
-* Fixed issues with time-based file rollover (monthly, weekly, hourly and every minute). (for https://issues.apache.org/jira/browse/LOG4J2-385[LOG4J2-385] by `rpopma`, Ace Funk, Porfirio Partida)
-* (OSGi) Fix NPE during shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-377[LOG4J2-377] by `rpopma`, `mattsicker`, Roland Weiglhofer)
-* Fixed issue where toString methods that perform logging could deadlock AsyncLogger. (for https://issues.apache.org/jira/browse/LOG4J2-471[LOG4J2-471] by `rpopma`, Anthony Baldocchi)
-* RingBufferLogEvent should return Message timestamp for TimestampMessage messages. (for https://issues.apache.org/jira/browse/LOG4J2-455[LOG4J2-455] by `rpopma`, Robin Zhang Tao)
-* TimeBasedTriggeringPolicy should use event time millis. (for https://issues.apache.org/jira/browse/LOG4J2-454[LOG4J2-454] by `rpopma`, Robin Zhang Tao)
-* Fixed typo in documentation: system property should be log4j2.loggerContextFactory (for https://issues.apache.org/jira/browse/LOG4J2-451[LOG4J2-451] by `rpopma`, `mattsicker`, Vinay Pothnis)
-* ResolverUtil cannot find packages in file URLs which include the '+' character. (for https://issues.apache.org/jira/browse/LOG4J2-445[LOG4J2-445] by `rpopma`, Anthony Baldocchi)
-* NPE in ClassLoaderContextSelector. (for https://issues.apache.org/jira/browse/LOG4J2-477[LOG4J2-477] by `rpopma`, Tal Liron)
-* Created a utility to properly escape backslashes before creating URIs, and changed URI creation to use the
- utility instead of instantiating URI directly. (for https://issues.apache.org/jira/browse/LOG4J2-409[LOG4J2-409] by `nickwilliams`, Frank Steinmann, Thomas Neidhart)
-* BaseConfiguration class does not properly implement Configuration interface. (for https://issues.apache.org/jira/browse/LOG4J2-472[LOG4J2-472] by `rpopma`, Tal Liron)
* Fix LogEvent to never return null Level, fixes LevelPatternConverter.format may throw NPE. (for https://issues.apache.org/jira/browse/LOG4J2-462[LOG4J2-462] by `rpopma`, Daisuke Baba)
-* XMLLayout does not include marker name. (for https://issues.apache.org/jira/browse/LOG4J2-447[LOG4J2-447] by `ggregory`, `sdeboy`, Jeff Hudren, Mark Paluch)
-* Cannot load log4j2 config file if path contains plus '+' characters. (for https://issues.apache.org/jira/browse/LOG4J2-466[LOG4J2-466] by `rpopma`, Jan Tepke)
-* The message and ndc fields are not JavaScript escaped in JSONLayout. (for https://issues.apache.org/jira/browse/LOG4J2-478[LOG4J2-478] by `ggregory`, Michael Friedmann)
-* Use the formatted Message in RFC5424Layout for non-StructuredDataMessages. (for https://issues.apache.org/jira/browse/LOG4J2-430[LOG4J2-430] by `rgoers`, David Gstir)
+* Fixed documentation for MyApp example application in the Automatic Configuration section (for https://issues.apache.org/jira/browse/LOG4J2-463[LOG4J2-463] by `rpopma`, `mattsicker`, Michael Diamond)
+* Support arrays as sub-elements of a JSON configuration. (for https://issues.apache.org/jira/browse/LOG4J2-464[LOG4J2-464] by `rgoers`)
* Fix LogEvent to never return null Level, fixes ThresholdFilter throws NPE. (for https://issues.apache.org/jira/browse/LOG4J2-465[LOG4J2-465] by `rpopma`, Daisuke Baba)
+* Cannot load log4j2 config file if path contains plus '+' characters. (for https://issues.apache.org/jira/browse/LOG4J2-466[LOG4J2-466] by `rpopma`, Jan Tepke)
+* hostName property was not being set until after the first configuration element. (for https://issues.apache.org/jira/browse/LOG4J2-470[LOG4J2-470] by `rgoers`)
+* Fixed issue where toString methods that perform logging could deadlock AsyncLogger. (for https://issues.apache.org/jira/browse/LOG4J2-471[LOG4J2-471] by `rpopma`, Anthony Baldocchi)
+* BaseConfiguration class does not properly implement Configuration interface. (for https://issues.apache.org/jira/browse/LOG4J2-472[LOG4J2-472] by `rpopma`, Tal Liron)
* Changed the MongoDBConnection to add a MongoDB encoding hook instead of a decoding hook. (for https://issues.apache.org/jira/browse/LOG4J2-475[LOG4J2-475] by `nickwilliams`, `mattsicker`)
-* Fixed documentation for MyApp example application in the Automatic Configuration section (for https://issues.apache.org/jira/browse/LOG4J2-463[LOG4J2-463] by `rpopma`, `mattsicker`, Michael Diamond)
-* (JMX) Fixed issue where log4j2 LoggerContext did not show up in JMX GUI or JConsole. (for https://issues.apache.org/jira/browse/LOG4J2-443[LOG4J2-443] by `rpopma`, Colin Froggatt, Tudor Har)
+* NPE in ClassLoaderContextSelector. (for https://issues.apache.org/jira/browse/LOG4J2-477[LOG4J2-477] by `rpopma`, Tal Liron)
+* The message and ndc fields are not JavaScript escaped in JSONLayout. (for https://issues.apache.org/jira/browse/LOG4J2-478[LOG4J2-478] by `ggregory`, Michael Friedmann)
+* Fixed issue where toString methods that perform logging could deadlock AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-485[LOG4J2-485] by `rpopma`)
+* Fixed the JPAAppender's overuse of transactions by connecting (borrowing from pool) on new write internal or on
+ flush. (for https://issues.apache.org/jira/browse/LOG4J2-489[LOG4J2-489] by `nickwilliams`)
+* (JMX) Fixed MalformedObjectNameException if context name contains '=' or newline characters. (for https://issues.apache.org/jira/browse/LOG4J2-492[LOG4J2-492] by `rpopma`, Shaddy Baddah, Herlani Junior)
+* (JMX - ObjectNames changed!) Unloading one web application unloads JMX MBeans for all web applications. (for https://issues.apache.org/jira/browse/LOG4J2-500[LOG4J2-500] by `rpopma`)
+* Stop AsyncLoggerConfig Disruptor thread(s), then AsyncAppender thread(s) first
+ before stopping other appenders. (for https://issues.apache.org/jira/browse/LOG4J2-511[LOG4J2-511] by `rpopma`, James Pretorius)
* Exposed Log4j web support interface and methods and the LoggerContext through ServletContext attributes
so that threads not affected by filters (such as asynchronous threads) can utilize the LoggerContext. Also
updated the Log4j filter so that it supports async. (for https://issues.apache.org/jira/browse/LOG4J2-512[LOG4J2-512] by `nickwilliams`, `mattsicker`, Chandra Sekhar Kakarla)
+* Switch in log4j-1.2-api Category.getEffectiveLevel has no cases for FATAL, OFF. (for https://issues.apache.org/jira/browse/LOG4J2-517[LOG4J2-517] by `rpopma`)
+* LocalizedMessage serialization is broken. (for https://issues.apache.org/jira/browse/LOG4J2-523[LOG4J2-523] by `ggregory`)
* Fixed bugs where rolled log files were overwritten by RollingFile appender with
composite time and size based policies. (for https://issues.apache.org/jira/browse/LOG4J2-531[LOG4J2-531] by `rpopma`, Geoff Ballinger)
-* (JMX) Fixed MalformedObjectNameException if context name contains '=' or newline characters. (for https://issues.apache.org/jira/browse/LOG4J2-492[LOG4J2-492] by `rpopma`, Shaddy Baddah, Herlani Junior)
-* Stop AsyncLoggerConfig Disruptor thread(s), then AsyncAppender thread(s) first
- before stopping other appenders. (for https://issues.apache.org/jira/browse/LOG4J2-511[LOG4J2-511] by `rpopma`, James Pretorius)
diff --git a/src/site/asciidoc/changelog/2.0-rc2.adoc b/src/site/asciidoc/changelog/2.0-rc2.adoc
index 9d59b46498..1be9c9d62f 100644
--- a/src/site/asciidoc/changelog/2.0-rc2.adoc
+++ b/src/site/asciidoc/changelog/2.0-rc2.adoc
@@ -26,85 +26,85 @@ This file is automatically generated from the release changelog directory!
=== Added
+* Add support for configuration via YAML. (for https://issues.apache.org/jira/browse/LOG4J2-427[LOG4J2-427] by `rgoers`, Alexander Reelsen)
* Create an appender to route log events to the ServletContext log. (for https://issues.apache.org/jira/browse/LOG4J2-42[LOG4J2-42] by `rgoers`)
-* Add support for types other than String for plugin factory values/attributes. (for https://issues.apache.org/jira/browse/LOG4J2-598[LOG4J2-598] by `mattsicker`)
+* Add EncodingPatternConverter to escape newlines and HTML special characters. (for https://issues.apache.org/jira/browse/LOG4J2-439[LOG4J2-439] by `rgoers`, `bbrouwer`)
+* Add org.apache.logging.log4j.Logger.getLevel(). (for https://issues.apache.org/jira/browse/LOG4J2-576[LOG4J2-576] by `ggregory`)
* Introduce Java annotation processor as the new plugin pre-caching mechanism. This is available in log4j-core.
All custom plugins created before this should be re-built against the current log4j-core. (for https://issues.apache.org/jira/browse/LOG4J2-595[LOG4J2-595] by `mattsicker`)
-* Add org.apache.logging.log4j.Logger.getLevel(). (for https://issues.apache.org/jira/browse/LOG4J2-576[LOG4J2-576] by `ggregory`)
+* Add support for types other than String for plugin factory values/attributes. (for https://issues.apache.org/jira/browse/LOG4J2-598[LOG4J2-598] by `mattsicker`)
* Document the system properties used in Log4J 2. (for https://issues.apache.org/jira/browse/LOG4J2-629[LOG4J2-629] by `rpopma`)
-* Add support for default plugin values and attributes. (for https://issues.apache.org/jira/browse/LOG4J2-652[LOG4J2-652] by `mattsicker`)
-* Made RollingFileAppender buffer size configurable. (for https://issues.apache.org/jira/browse/LOG4J2-674[LOG4J2-674] by `rpopma`)
* Implement a SecureSocketAppender and secure server (SSL/TLS). (for https://issues.apache.org/jira/browse/LOG4J2-644[LOG4J2-644] by `ggregory`)
-* RollingFile and RollingRandomAccessFile now write the layout footer before rollover. (for https://issues.apache.org/jira/browse/LOG4J2-675[LOG4J2-675] by `rpopma`)
+* Add support for default plugin values and attributes. (for https://issues.apache.org/jira/browse/LOG4J2-652[LOG4J2-652] by `mattsicker`)
* Add log4j-perf module to provide a home for all log4j performance tests.
Add support for JMH microbenchmark performance tests. (for https://issues.apache.org/jira/browse/LOG4J2-654[LOG4J2-654] by `rpopma`)
* Add Vagrantfile for testing in GNU+Linux. (for https://issues.apache.org/jira/browse/LOG4J2-655[LOG4J2-655] by `mattsicker`)
-* Add support for configuration via YAML. (for https://issues.apache.org/jira/browse/LOG4J2-427[LOG4J2-427] by `rgoers`, Alexander Reelsen)
-* Add EncodingPatternConverter to escape newlines and HTML special characters. (for https://issues.apache.org/jira/browse/LOG4J2-439[LOG4J2-439] by `rgoers`, `bbrouwer`)
+* Made RollingFileAppender buffer size configurable. (for https://issues.apache.org/jira/browse/LOG4J2-674[LOG4J2-674] by `rpopma`)
+* RollingFile and RollingRandomAccessFile now write the layout footer before rollover. (for https://issues.apache.org/jira/browse/LOG4J2-675[LOG4J2-675] by `rpopma`)
=== Changed
-* Allow header and footer to be specified as lookup patterns in PatternLayout. (for https://issues.apache.org/jira/browse/LOG4J2-496[LOG4J2-496] by `rgoers`)
-* Add support to add a LoggerConfig. Document two ways to modify the configuration. (for https://issues.apache.org/jira/browse/LOG4J2-468[LOG4J2-468] by `rgoers`)
* Refactor Log4jLogEvent to lazily create ThrowableProxy. (for https://issues.apache.org/jira/browse/LOG4J2-250[LOG4J2-250] by `rpopma`)
+* SLf4JLogger is now Serializable. (for https://issues.apache.org/jira/browse/LOG4J2-410[LOG4J2-410] by `rgoers`, Ivlin Zeng)
+* Support default value for missing key in look-ups with fallback to looking in the properties map. (for https://issues.apache.org/jira/browse/LOG4J2-419[LOG4J2-419] by `rgoers`, Woonsan Ko)
+* Add support to add a LoggerConfig. Document two ways to modify the configuration. (for https://issues.apache.org/jira/browse/LOG4J2-468[LOG4J2-468] by `rgoers`)
+* Allow header and footer to be specified as lookup patterns in PatternLayout. (for https://issues.apache.org/jira/browse/LOG4J2-496[LOG4J2-496] by `rgoers`)
+* Have Logger API expose a PrintWriter instead of custom LoggerStream. (for https://issues.apache.org/jira/browse/LOG4J2-547[LOG4J2-547] by `rgoers`, `bbrouwer`)
* Allow configuration files to be located as Servlet Context resources. (for https://issues.apache.org/jira/browse/LOG4J2-554[LOG4J2-554] by `rgoers`)
+* Introduce ExtendedLogger interface to facilitate implementing and extending Loggers. (for https://issues.apache.org/jira/browse/LOG4J2-555[LOG4J2-555] by `rpopma`, `bbrouwer`)
+* Allow spaces around commas in Configuration's package attribute. (for https://issues.apache.org/jira/browse/LOG4J2-561[LOG4J2-561] by `ggregory`, vibin)
+* Made RollingRandomAccessFileAppender buffer size configurable. (for https://issues.apache.org/jira/browse/LOG4J2-566[LOG4J2-566] by `rpopma`, Luigi Alice)
* Make Blocking the default WaitStrategy for Async Loggers. (for https://issues.apache.org/jira/browse/LOG4J2-574[LOG4J2-574] by `rpopma`)
* Rename org.apache.logging.log4j.core.net.SocketServer to TCPSocketServer and refactor with UDP. (for https://issues.apache.org/jira/browse/LOG4J2-582[LOG4J2-582] by `ggregory`)
+* Add support for multiple parents to Markers. (for https://issues.apache.org/jira/browse/LOG4J2-585[LOG4J2-585] by `rgoers`, `bbrouwer`)
* Update Jackson to 2.3.2 from 2.2.2. (for https://issues.apache.org/jira/browse/LOG4J2-592[LOG4J2-592] by `ggregory`)
-* Merge the TLS Syslog appender into the Syslog appender. (for https://issues.apache.org/jira/browse/LOG4J2-646[LOG4J2-646] by `ggregory`)
-* Upgrade to Flume 1.5.0. (for https://issues.apache.org/jira/browse/LOG4J2-647[LOG4J2-647] by `ggregory`)
+* Update Jackson to 2.3.3. (for https://issues.apache.org/jira/browse/LOG4J2-616[LOG4J2-616] by `mattsicker`)
+* Update SLF4J to 1.7.7. (for https://issues.apache.org/jira/browse/LOG4J2-617[LOG4J2-617] by `mattsicker`)
* Use Clock to generate all log event timestamps, not just for Async Loggers. (for https://issues.apache.org/jira/browse/LOG4J2-628[LOG4J2-628] by `rpopma`)
* Override commons-logging dependency version in tests. (for https://issues.apache.org/jira/browse/LOG4J2-641[LOG4J2-641] by `mattsicker`)
-* Update SLF4J to 1.7.7. (for https://issues.apache.org/jira/browse/LOG4J2-617[LOG4J2-617] by `mattsicker`)
-* Update Jackson to 2.3.3. (for https://issues.apache.org/jira/browse/LOG4J2-616[LOG4J2-616] by `mattsicker`)
-* SLf4JLogger is now Serializable. (for https://issues.apache.org/jira/browse/LOG4J2-410[LOG4J2-410] by `rgoers`, Ivlin Zeng)
-* Allow spaces around commas in Configuration's package attribute. (for https://issues.apache.org/jira/browse/LOG4J2-561[LOG4J2-561] by `ggregory`, vibin)
-* Have Logger API expose a PrintWriter instead of custom LoggerStream. (for https://issues.apache.org/jira/browse/LOG4J2-547[LOG4J2-547] by `rgoers`, `bbrouwer`)
-* Support default value for missing key in look-ups with fallback to looking in the properties map. (for https://issues.apache.org/jira/browse/LOG4J2-419[LOG4J2-419] by `rgoers`, Woonsan Ko)
-* Introduce ExtendedLogger interface to facilitate implementing and extending Loggers. (for https://issues.apache.org/jira/browse/LOG4J2-555[LOG4J2-555] by `rpopma`, `bbrouwer`)
-* Made RollingRandomAccessFileAppender buffer size configurable. (for https://issues.apache.org/jira/browse/LOG4J2-566[LOG4J2-566] by `rpopma`, Luigi Alice)
-* Add support for multiple parents to Markers. (for https://issues.apache.org/jira/browse/LOG4J2-585[LOG4J2-585] by `rgoers`, `bbrouwer`)
+* Merge the TLS Syslog appender into the Syslog appender. (for https://issues.apache.org/jira/browse/LOG4J2-646[LOG4J2-646] by `ggregory`)
+* Upgrade to Flume 1.5.0. (for https://issues.apache.org/jira/browse/LOG4J2-647[LOG4J2-647] by `ggregory`)
=== Fixed
-* FailoverAppender was not resetting its status after the primary appender recovered. (for https://issues.apache.org/jira/browse/LOG4J2-469[LOG4J2-469] by `rgoers`)
-* Add equals and hashcode to Log4jLogEvent. (for https://issues.apache.org/jira/browse/LOG4J2-499[LOG4J2-499] by `rgoers`)
+* Improved documentation regarding log4j status logger. (for https://issues.apache.org/jira/browse/LOG4J2-141[LOG4J2-141] by `rpopma`, Joern Huxhorn)
* The log4j-1.2-api module didn't export any packages to OSGi. (for https://issues.apache.org/jira/browse/LOG4J2-345[LOG4J2-345] by `mattsicker`)
+* Cyclic dependency with log4j-slf4j-impl in OSGi. (for https://issues.apache.org/jira/browse/LOG4J2-346[LOG4J2-346] by `mattsicker`)
* Add DateLookup and ThreadContextLookup to default lookups. (for https://issues.apache.org/jira/browse/LOG4J2-378[LOG4J2-378] by `rgoers`)
+* Resolved a problem with the previous solution for LOG4J2-392 that resulted in dropped events
+ when using AsyncLoggerConfig with slow appenders when application is stopped. (for https://issues.apache.org/jira/browse/LOG4J2-392[LOG4J2-392] by `rpopma`, Andre Bogus)
* During shutdown, a NullPointerException could be thrown due to the NullConfiguration class no longer being
available to the ClassLoader. (for https://issues.apache.org/jira/browse/LOG4J2-440[LOG4J2-440] by `mattsicker`)
-* Cyclic dependency with log4j-slf4j-impl in OSGi. (for https://issues.apache.org/jira/browse/LOG4J2-346[LOG4J2-346] by `mattsicker`)
-* StatusLogger was not skipping multiple instances of the FQCN class, causing messages from classes in
- the Verbose list to be printed. (for https://issues.apache.org/jira/browse/LOG4J2-597[LOG4J2-597] by `rgoers`)
-* Make Throwable transient in ThrowableProxy. (for https://issues.apache.org/jira/browse/LOG4J2-542[LOG4J2-542] by `rgoers`)
-* Password data from the NoSQL plugins no longer shows up in cleartext in debug logging. (for https://issues.apache.org/jira/browse/LOG4J2-605[LOG4J2-605] by `mattsicker`)
-* Unit tests are now less verbose during the build process. (for https://issues.apache.org/jira/browse/LOG4J2-602[LOG4J2-602] by `rgoers`)
-* Renamed SLF4J logger class to Log4jLogger. (for https://issues.apache.org/jira/browse/LOG4J2-564[LOG4J2-564] by `mattsicker`)
-* SyslogAppenderTest and RFC5424LayoutTest were failing in Java 8. (for https://issues.apache.org/jira/browse/LOG4J2-560[LOG4J2-560] by `rgoers`)
+* A StringIndexOutOfBounds exception could occur during property substitution. (for https://issues.apache.org/jira/browse/LOG4J2-448[LOG4J2-448] by `rgoers`, X86core)
+* FailoverAppender was not resetting its status after the primary appender recovered. (for https://issues.apache.org/jira/browse/LOG4J2-469[LOG4J2-469] by `rgoers`)
+* Add equals and hashcode to Log4jLogEvent. (for https://issues.apache.org/jira/browse/LOG4J2-499[LOG4J2-499] by `rgoers`)
+* Resolved issue where AsyncAppender dropped events if queue still contained
+ events when application is stopped. (for https://issues.apache.org/jira/browse/LOG4J2-520[LOG4J2-520] by `rpopma`, JavaTech, Andre Bogus)
* Reset rollover time when size rollover is triggered. (for https://issues.apache.org/jira/browse/LOG4J2-535[LOG4J2-535] by `rgoers`)
-* Fix shutdown thread memory leak in servlet containers. (for https://issues.apache.org/jira/browse/LOG4J2-570[LOG4J2-570] by `mattsicker`)
-* Rework Level comparison APIs. (for https://issues.apache.org/jira/browse/LOG4J2-579[LOG4J2-579] by `ggregory`)
-* Moved plugin cache file to META-INF for OSGi compatibility. (for https://issues.apache.org/jira/browse/LOG4J2-664[LOG4J2-664] by `mattsicker`)
-* Generate MDC properties as a JSON map in JSONLayout. (for https://issues.apache.org/jira/browse/LOG4J2-623[LOG4J2-623] by `rgoers`)
-* Correctly process log events when combining AsyncLoggers with AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-668[LOG4J2-668] by `rpopma`)
-* Prevent NPE when combining AsyncLoggers with AsyncLoggerConfigs. (for https://issues.apache.org/jira/browse/LOG4J2-669[LOG4J2-669] by `rpopma`)
-* Log4j 2 throws ArrayIndexOutOfBoundsException. (for https://issues.apache.org/jira/browse/LOG4J2-651[LOG4J2-651] by `ggregory`)
-* Perform reconfiguration in a separate thread to prevent deadlocks. (for https://issues.apache.org/jira/browse/LOG4J2-620[LOG4J2-620] by `rgoers`)
-* The OSGi version of log4j-web imports Servlet 2.5 at minimum instead of 3.0. (for https://issues.apache.org/jira/browse/LOG4J2-613[LOG4J2-613] by `mattsicker`)
-* Fix NPE that can be caused by a null ThreadContextClassLoader. (for https://issues.apache.org/jira/browse/LOG4J2-640[LOG4J2-640] by `mattsicker`)
* Fixed issue with "Reconfigure using XML below" function in JMX Client GUI.
ConfigurationSource is now a top-level class and can be obtained with Configuration.getConfigurationSource().
LoggerContext.getConfiguration().getConfigurationSource()
provides a reliable public method for obtaining a logger context's configuration location and content. (for https://issues.apache.org/jira/browse/LOG4J2-539[LOG4J2-539] by `rpopma`, Colin Froggatt)
-* Resolved issue where AsyncAppender dropped events if queue still contained
- events when application is stopped. (for https://issues.apache.org/jira/browse/LOG4J2-520[LOG4J2-520] by `rpopma`, JavaTech, Andre Bogus)
+* Make Throwable transient in ThrowableProxy. (for https://issues.apache.org/jira/browse/LOG4J2-542[LOG4J2-542] by `rgoers`)
+* SyslogAppenderTest and RFC5424LayoutTest were failing in Java 8. (for https://issues.apache.org/jira/browse/LOG4J2-560[LOG4J2-560] by `rgoers`)
* FlumeAvroManager now always uses a client type of default_failover. (for https://issues.apache.org/jira/browse/LOG4J2-563[LOG4J2-563] by `rgoers`, Michael Friedmann)
-* A StringIndexOutOfBounds exception could occur during property substitution. (for https://issues.apache.org/jira/browse/LOG4J2-448[LOG4J2-448] by `rgoers`, X86core)
-* Improved documentation regarding log4j status logger. (for https://issues.apache.org/jira/browse/LOG4J2-141[LOG4J2-141] by `rpopma`, Joern Huxhorn)
-* Resolved a problem with the previous solution for LOG4J2-392 that resulted in dropped events
- when using AsyncLoggerConfig with slow appenders when application is stopped. (for https://issues.apache.org/jira/browse/LOG4J2-392[LOG4J2-392] by `rpopma`, Andre Bogus)
-* JMX: Updating a Logger's level via jConsole now correctly takes effect. (for https://issues.apache.org/jira/browse/LOG4J2-637[LOG4J2-637] by `rpopma`, Mansoor Sajjad, Jon Wilmoth)
+* Renamed SLF4J logger class to Log4jLogger. (for https://issues.apache.org/jira/browse/LOG4J2-564[LOG4J2-564] by `mattsicker`)
+* Fix shutdown thread memory leak in servlet containers. (for https://issues.apache.org/jira/browse/LOG4J2-570[LOG4J2-570] by `mattsicker`)
+* Rework Level comparison APIs. (for https://issues.apache.org/jira/browse/LOG4J2-579[LOG4J2-579] by `ggregory`)
* RollingRandomAccessFile now writes the layout header after rollover. (for https://issues.apache.org/jira/browse/LOG4J2-581[LOG4J2-581] by `rpopma`, Alexander Khokhlov)
+* StatusLogger was not skipping multiple instances of the FQCN class, causing messages from classes in
+ the Verbose list to be printed. (for https://issues.apache.org/jira/browse/LOG4J2-597[LOG4J2-597] by `rgoers`)
+* Unit tests are now less verbose during the build process. (for https://issues.apache.org/jira/browse/LOG4J2-602[LOG4J2-602] by `rgoers`)
+* Password data from the NoSQL plugins no longer shows up in cleartext in debug logging. (for https://issues.apache.org/jira/browse/LOG4J2-605[LOG4J2-605] by `mattsicker`)
+* The OSGi version of log4j-web imports Servlet 2.5 at minimum instead of 3.0. (for https://issues.apache.org/jira/browse/LOG4J2-613[LOG4J2-613] by `mattsicker`)
+* Invalid XML configuration files do not prevent the config file from being checked again. (for https://issues.apache.org/jira/browse/LOG4J2-619[LOG4J2-619] by `rgoers`, Scott Harrington)
+* Perform reconfiguration in a separate thread to prevent deadlocks. (for https://issues.apache.org/jira/browse/LOG4J2-620[LOG4J2-620] by `rgoers`)
* RollingFileManager now correctly honours the bufferedIO configuration after rollover. (for https://issues.apache.org/jira/browse/LOG4J2-622[LOG4J2-622] by `rpopma`, Farooq Khan)
+* Generate MDC properties as a JSON map in JSONLayout. (for https://issues.apache.org/jira/browse/LOG4J2-623[LOG4J2-623] by `rgoers`)
+* JMX: Updating a Logger's level via jConsole now correctly takes effect. (for https://issues.apache.org/jira/browse/LOG4J2-637[LOG4J2-637] by `rpopma`, Mansoor Sajjad, Jon Wilmoth)
* Prevent NPE in AsyncLogger and AsyncLoggerConfig if logger is used after log4j has been shut down. (for https://issues.apache.org/jira/browse/LOG4J2-639[LOG4J2-639] by `rpopma`, Mck SembWever)
-* Invalid XML configuration files do not prevent the config file from being checked again. (for https://issues.apache.org/jira/browse/LOG4J2-619[LOG4J2-619] by `rgoers`, Scott Harrington)
+* Fix NPE that can be caused by a null ThreadContextClassLoader. (for https://issues.apache.org/jira/browse/LOG4J2-640[LOG4J2-640] by `mattsicker`)
+* Log4j 2 throws ArrayIndexOutOfBoundsException. (for https://issues.apache.org/jira/browse/LOG4J2-651[LOG4J2-651] by `ggregory`)
+* Moved plugin cache file to META-INF for OSGi compatibility. (for https://issues.apache.org/jira/browse/LOG4J2-664[LOG4J2-664] by `mattsicker`)
+* Correctly process log events when combining AsyncLoggers with AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-668[LOG4J2-668] by `rpopma`)
+* Prevent NPE when combining AsyncLoggers with AsyncLoggerConfigs. (for https://issues.apache.org/jira/browse/LOG4J2-669[LOG4J2-669] by `rpopma`)
diff --git a/src/site/asciidoc/changelog/2.0.1.adoc b/src/site/asciidoc/changelog/2.0.1.adoc
index 09124be496..571f89a1e9 100644
--- a/src/site/asciidoc/changelog/2.0.1.adoc
+++ b/src/site/asciidoc/changelog/2.0.1.adoc
@@ -51,21 +51,21 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
-* Updated documentation regarding extensions to LoggerContextFactory and Log4j 2 providers. (for https://issues.apache.org/jira/browse/LOG4J2-731[LOG4J2-731] by `mattsicker`)
-* Correctly handle NetworkOnMainThreadException thrown on Android during Log4j2 initialization. (for https://issues.apache.org/jira/browse/LOG4J2-719[LOG4J2-719] by `rpopma`)
+* Fixed ClassLoader issues in loading Log4j providers in an OSGi environment. (for https://issues.apache.org/jira/browse/LOG4J2-373[LOG4J2-373] by `mattsicker`)
+* Fixed AbstractDatabaseManager to close connection on writeInternal error. (for https://issues.apache.org/jira/browse/LOG4J2-657[LOG4J2-657] by `rpopma`, Stefan Wehner)
* DatePatternConverter ISO8601_PATTERN now conforms to ISO8601. (for https://issues.apache.org/jira/browse/LOG4J2-670[LOG4J2-670] by `rpopma`)
-* Automatically disable log4j JMX when detecting we are running on Android. (for https://issues.apache.org/jira/browse/LOG4J2-716[LOG4J2-716] by `rpopma`)
+* Android: Could not find class 'javax.naming.InitialContext', referenced from method org.apache.logging.log4j.core.lookup.JndiLookup.lookup. (for https://issues.apache.org/jira/browse/LOG4J2-703[LOG4J2-703] by `ggregory`, Nelson Melina)
* Improved error message if configuration file not found. (for https://issues.apache.org/jira/browse/LOG4J2-704[LOG4J2-704] by `rpopma`)
+* Android: java.lang.VerifyError: org/apache/logging/log4j/core/util/Closer (for https://issues.apache.org/jira/browse/LOG4J2-713[LOG4J2-713] by `ggregory`, Nelson Melina)
+* Automatically disable log4j JMX when detecting we are running on Android. (for https://issues.apache.org/jira/browse/LOG4J2-716[LOG4J2-716] by `rpopma`)
+* Correctly handle NetworkOnMainThreadException thrown on Android during Log4j2 initialization. (for https://issues.apache.org/jira/browse/LOG4J2-719[LOG4J2-719] by `rpopma`)
+* Updated documentation regarding extensions to LoggerContextFactory and Log4j 2 providers. (for https://issues.apache.org/jira/browse/LOG4J2-731[LOG4J2-731] by `mattsicker`)
* Fixed log4j-bom so that it won't interfere with spring-bom and others. (for https://issues.apache.org/jira/browse/LOG4J2-735[LOG4J2-735] by `mattsicker`)
-* Fixed ClassLoader issues in loading Log4j providers in an OSGi environment. (for https://issues.apache.org/jira/browse/LOG4J2-373[LOG4J2-373] by `mattsicker`)
* Fixed log4j-bom so that it won't specify a default scope on any third party dependencies. (for https://issues.apache.org/jira/browse/LOG4J2-736[LOG4J2-736] by `mattsicker`)
-* Reinstate the package configuration attribute for discovering custom plugins. (for https://issues.apache.org/jira/browse/LOG4J2-741[LOG4J2-741] by `rpopma`)
-* Webapp configuration page has incorrect class name. (for https://issues.apache.org/jira/browse/LOG4J2-750[LOG4J2-750] by `ggregory`, Mike Calmus)
* RollingFileManager deadlock if async action thread fails to start. (for https://issues.apache.org/jira/browse/LOG4J2-738[LOG4J2-738] by `ggregory`, Timothy Stack)
* Fixed typo in webapp manual regarding sample web.xml file. (for https://issues.apache.org/jira/browse/LOG4J2-740[LOG4J2-740] by `mattsicker`, Kosta Krauth)
-* Fixed AbstractDatabaseManager to close connection on writeInternal error. (for https://issues.apache.org/jira/browse/LOG4J2-657[LOG4J2-657] by `rpopma`, Stefan Wehner)
-* Retain the default date pattern after fixing the ISO8601 pattern. (for https://issues.apache.org/jira/browse/LOG4J2-749[LOG4J2-749] by `rpopma`, Scott Harrington)
-* Avoid unnecessary Clock calls when TimestampMessage is logged. (for https://issues.apache.org/jira/browse/LOG4J2-744[LOG4J2-744] by `rpopma`, Scott Harrington)
-* Android: java.lang.VerifyError: org/apache/logging/log4j/core/util/Closer (for https://issues.apache.org/jira/browse/LOG4J2-713[LOG4J2-713] by `ggregory`, Nelson Melina)
-* Android: Could not find class 'javax.naming.InitialContext', referenced from method org.apache.logging.log4j.core.lookup.JndiLookup.lookup. (for https://issues.apache.org/jira/browse/LOG4J2-703[LOG4J2-703] by `ggregory`, Nelson Melina)
+* Reinstate the package configuration attribute for discovering custom plugins. (for https://issues.apache.org/jira/browse/LOG4J2-741[LOG4J2-741] by `rpopma`)
* XInclude not working with relative path. (for https://issues.apache.org/jira/browse/LOG4J2-742[LOG4J2-742] by `ggregory`, Pascal Chollet)
+* Avoid unnecessary Clock calls when TimestampMessage is logged. (for https://issues.apache.org/jira/browse/LOG4J2-744[LOG4J2-744] by `rpopma`, Scott Harrington)
+* Retain the default date pattern after fixing the ISO8601 pattern. (for https://issues.apache.org/jira/browse/LOG4J2-749[LOG4J2-749] by `rpopma`, Scott Harrington)
+* Webapp configuration page has incorrect class name. (for https://issues.apache.org/jira/browse/LOG4J2-750[LOG4J2-750] by `ggregory`, Mike Calmus)
diff --git a/src/site/asciidoc/changelog/2.0.2.adoc b/src/site/asciidoc/changelog/2.0.2.adoc
index 30ddf218e1..3c688e4530 100644
--- a/src/site/asciidoc/changelog/2.0.2.adoc
+++ b/src/site/asciidoc/changelog/2.0.2.adoc
@@ -45,18 +45,18 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
+* Resolved race condition that caused log file rotation to fail with error: "Unable to create directory ..." (for https://issues.apache.org/jira/browse/LOG4J2-679[LOG4J2-679] by `rpopma`)
+* Clarified in documentation that Commons Logging jar is required when using log4j-jcl. (for https://issues.apache.org/jira/browse/LOG4J2-722[LOG4J2-722] by `rpopma`)
* Clarified in documentation that SLF4J API jar is required when using log4j-slf4j-impl. (for https://issues.apache.org/jira/browse/LOG4J2-723[LOG4J2-723] by `rpopma`)
-* Fixed various minor site/documentation issues, mostly versioning related. (for https://issues.apache.org/jira/browse/LOG4J2-759[LOG4J2-759] by `rpopma`)
* Prevent application from hanging when PatternLayout configuration has opening '{' but no closing '}'. (for https://issues.apache.org/jira/browse/LOG4J2-726[LOG4J2-726] by `rpopma`)
* Emit warning message to console if no configuration file found. (for https://issues.apache.org/jira/browse/LOG4J2-729[LOG4J2-729] by `rpopma`)
+* Prevent JUnit test from creating unnecessary Log4j2Plugins.dat during build. (for https://issues.apache.org/jira/browse/LOG4J2-756[LOG4J2-756] by `rpopma`, Scott Harrington)
+* Fixed various minor site/documentation issues, mostly versioning related. (for https://issues.apache.org/jira/browse/LOG4J2-759[LOG4J2-759] by `rpopma`)
* Documentation improvement: link to dependency tree from log4j-core component page,
link to log4j-core component page from FAQ page. (for https://issues.apache.org/jira/browse/LOG4J2-760[LOG4J2-760] by `rpopma`)
-* Clarified in documentation that Commons Logging jar is required when using log4j-jcl. (for https://issues.apache.org/jira/browse/LOG4J2-722[LOG4J2-722] by `rpopma`)
-* Improve warning message when missing log4j-core in the classpath. (for https://issues.apache.org/jira/browse/LOG4J2-765[LOG4J2-765] by `rpopma`)
-* Resolved race condition that caused log file rotation to fail with error: "Unable to create directory ..." (for https://issues.apache.org/jira/browse/LOG4J2-679[LOG4J2-679] by `rpopma`)
-* Site: log4j-core component pages were still using the old logo. (for https://issues.apache.org/jira/browse/LOG4J2-773[LOG4J2-773] by `rpopma`)
-* Prevent JUnit test from creating unnecessary Log4j2Plugins.dat during build. (for https://issues.apache.org/jira/browse/LOG4J2-756[LOG4J2-756] by `rpopma`, Scott Harrington)
-* Startup takes a long time if you have empty packages attribute. (for https://issues.apache.org/jira/browse/LOG4J2-769[LOG4J2-769] by `rpopma`, Scott Harrington)
* Improved asynchronous loggers and appenders to ensure the formatted message does not change even if
parameters are modified by the application. (ParameterizedMessage was already safe.)
Improved documentation. (for https://issues.apache.org/jira/browse/LOG4J2-763[LOG4J2-763] by `rpopma`, Stephen Connolly)
+* Improve warning message when missing log4j-core in the classpath. (for https://issues.apache.org/jira/browse/LOG4J2-765[LOG4J2-765] by `rpopma`)
+* Startup takes a long time if you have empty packages attribute. (for https://issues.apache.org/jira/browse/LOG4J2-769[LOG4J2-769] by `rpopma`, Scott Harrington)
+* Site: log4j-core component pages were still using the old logo. (for https://issues.apache.org/jira/browse/LOG4J2-773[LOG4J2-773] by `rpopma`)
diff --git a/src/site/asciidoc/changelog/2.0.adoc b/src/site/asciidoc/changelog/2.0.adoc
index e1b4e7ffcf..f4fab54c13 100644
--- a/src/site/asciidoc/changelog/2.0.adoc
+++ b/src/site/asciidoc/changelog/2.0.adoc
@@ -47,28 +47,28 @@ patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x
=== Changed
-* Update Jackson to 2.4.1. (for https://issues.apache.org/jira/browse/LOG4J2-689[LOG4J2-689] by `ggregory`)
* Make org.apache.logging.log4j.core.layout.AbstractLayout immutable. (for https://issues.apache.org/jira/browse/LOG4J2-685[LOG4J2-685] by `ggregory`)
+* Update Jackson to 2.4.1. (for https://issues.apache.org/jira/browse/LOG4J2-689[LOG4J2-689] by `ggregory`)
* Update Apache Commons Logging to 1.2 from 1.1.3. (for https://issues.apache.org/jira/browse/LOG4J2-709[LOG4J2-709] by `ggregory`)
=== Fixed
-* Update documentation to specify only Maven 3 is supported. (for https://issues.apache.org/jira/browse/LOG4J2-692[LOG4J2-692] by `rgoers`)
-* Make org.apache.logging.log4j.core.layout.PatternLayout immutable. (for https://issues.apache.org/jira/browse/LOG4J2-688[LOG4J2-688] by `ggregory`)
* LoggerConfigs with no Level now inherit the Level from their parent. (for https://issues.apache.org/jira/browse/LOG4J2-441[LOG4J2-441] by `rgoers`)
-* Update docs to clarify how to use formatter logger and standard logger together. (for https://issues.apache.org/jira/browse/LOG4J2-631[LOG4J2-631] by `rpopma`)
-* PatternLayout manual page missing documentation on header/footer. (for https://issues.apache.org/jira/browse/LOG4J2-699[LOG4J2-699] by `rpopma`)
-* Fix strange compilation error that popped up in a test class. (for https://issues.apache.org/jira/browse/LOG4J2-694[LOG4J2-694] by `mattsicker`)
-* Core's OptionConverter support for \b is broken (affects PatternLayout). (for https://issues.apache.org/jira/browse/LOG4J2-686[LOG4J2-686] by `ggregory`)
* JMX GUI: fixed occasional ArrayIndexOutOfBoundsException after pressing "reconfigure with XML below".
(Fixed in RC2, but wasn't included in release notes.) (for https://issues.apache.org/jira/browse/LOG4J2-538[LOG4J2-538] by `rpopma`)
-* AsyncLoggerContextSelector should ensure that different AsyncLoggerContext objects created by web app classloaders have unique names. (for https://issues.apache.org/jira/browse/LOG4J2-666[LOG4J2-666] by `rpopma`)
-* Fixed issue where Async Logger does not log thread context stack data.
- API change: added method getImmutableStackOrNull() to ThreadContext.ContextStack interface. (for https://issues.apache.org/jira/browse/LOG4J2-705[LOG4J2-705] by `rpopma`)
-* Rename org.apache.logging.log4j.core.util.Closer.closeSilent() to closeSilently(). (for https://issues.apache.org/jira/browse/LOG4J2-687[LOG4J2-687] by `ggregory`)
* Fixed Serialization error with SocketAppender and Async Loggers.
(Fixed in RC2, but wasn't included in release notes.) (for https://issues.apache.org/jira/browse/LOG4J2-625[LOG4J2-625] by `rpopma`)
-* Some exceptions are not logged when configuration problems are detected. (for https://issues.apache.org/jira/browse/LOG4J2-707[LOG4J2-707] by `ggregory`)
+* Update docs to clarify how to use formatter logger and standard logger together. (for https://issues.apache.org/jira/browse/LOG4J2-631[LOG4J2-631] by `rpopma`)
+* AsyncLoggerContextSelector should ensure that different AsyncLoggerContext objects created by web app classloaders have unique names. (for https://issues.apache.org/jira/browse/LOG4J2-666[LOG4J2-666] by `rpopma`)
* Special characters (tab and so on) in PatternLayout do not work. (for https://issues.apache.org/jira/browse/LOG4J2-682[LOG4J2-682] by `ggregory`, Scott Harrington)
-* Log4j Web test dependencies should be in scope "test" in the pom. (for https://issues.apache.org/jira/browse/LOG4J2-690[LOG4J2-690] by `rgoers`, Philip Helger)
* Fix annotation processor warnings on JDK 1.7+. (for https://issues.apache.org/jira/browse/LOG4J2-683[LOG4J2-683] by `mattsicker`, Jurriaan Mous)
+* Core's OptionConverter support for \b is broken (affects PatternLayout). (for https://issues.apache.org/jira/browse/LOG4J2-686[LOG4J2-686] by `ggregory`)
+* Rename org.apache.logging.log4j.core.util.Closer.closeSilent() to closeSilently(). (for https://issues.apache.org/jira/browse/LOG4J2-687[LOG4J2-687] by `ggregory`)
+* Make org.apache.logging.log4j.core.layout.PatternLayout immutable. (for https://issues.apache.org/jira/browse/LOG4J2-688[LOG4J2-688] by `ggregory`)
+* Log4j Web test dependencies should be in scope "test" in the pom. (for https://issues.apache.org/jira/browse/LOG4J2-690[LOG4J2-690] by `rgoers`, Philip Helger)
+* Update documentation to specify only Maven 3 is supported. (for https://issues.apache.org/jira/browse/LOG4J2-692[LOG4J2-692] by `rgoers`)
+* Fix strange compilation error that popped up in a test class. (for https://issues.apache.org/jira/browse/LOG4J2-694[LOG4J2-694] by `mattsicker`)
+* PatternLayout manual page missing documentation on header/footer. (for https://issues.apache.org/jira/browse/LOG4J2-699[LOG4J2-699] by `rpopma`)
+* Fixed issue where Async Logger does not log thread context stack data.
+ API change: added method getImmutableStackOrNull() to ThreadContext.ContextStack interface. (for https://issues.apache.org/jira/browse/LOG4J2-705[LOG4J2-705] by `rpopma`)
+* Some exceptions are not logged when configuration problems are detected. (for https://issues.apache.org/jira/browse/LOG4J2-707[LOG4J2-707] by `ggregory`)
diff --git a/src/site/asciidoc/changelog/2.1.adoc b/src/site/asciidoc/changelog/2.1.adoc
index a110b2188b..0e9f37a8d1 100644
--- a/src/site/asciidoc/changelog/2.1.adoc
+++ b/src/site/asciidoc/changelog/2.1.adoc
@@ -42,72 +42,72 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Add java.util.logging implementation based on log4j-api. See log4j-jul documentation for more details. (for https://issues.apache.org/jira/browse/LOG4J2-608[LOG4J2-608] by `mattsicker`)
-* Add lookup for application main arguments. (for https://issues.apache.org/jira/browse/LOG4J2-771[LOG4J2-771] by `ggregory`)
+* Implement a GELF layout. (for https://issues.apache.org/jira/browse/LOG4J2-428[LOG4J2-428] by `ggregory`, `mikes`, Mark Paluch)
+* Added Memory-Mapped File Appender. (for https://issues.apache.org/jira/browse/LOG4J2-431[LOG4J2-431] by `rpopma`, Claude Mamo)
* Add the Log4j IOStreams component. (for https://issues.apache.org/jira/browse/LOG4J2-547[LOG4J2-547] by `mattsicker`)
* Supported filtering on custom log levels in configuration. (for https://issues.apache.org/jira/browse/LOG4J2-589[LOG4J2-589] by `rpopma`)
+* Add java.util.logging implementation based on log4j-api. See log4j-jul documentation for more details. (for https://issues.apache.org/jira/browse/LOG4J2-608[LOG4J2-608] by `mattsicker`)
+* Add lookup for application main arguments. (for https://issues.apache.org/jira/browse/LOG4J2-771[LOG4J2-771] by `ggregory`)
+* Add lookup for JVM arguments. (for https://issues.apache.org/jira/browse/LOG4J2-787[LOG4J2-787] by `ggregory`)
* Add support for custom SLF4J Markers in log4j-slf4j-impl module. (for https://issues.apache.org/jira/browse/LOG4J2-793[LOG4J2-793] by `mattsicker`)
* Move reflection utility class to API's private utility classes. (for https://issues.apache.org/jira/browse/LOG4J2-809[LOG4J2-809] by `mattsicker`)
-* Add lookup for JVM arguments. (for https://issues.apache.org/jira/browse/LOG4J2-787[LOG4J2-787] by `ggregory`)
* Documentation: added section on XInclude to user manual Configuration page. (for https://issues.apache.org/jira/browse/LOG4J2-816[LOG4J2-816] by `rpopma`)
-* Documentation: added Runtime Dependencies link to left nav-bar on site. (for https://issues.apache.org/jira/browse/LOG4J2-833[LOG4J2-833] by `rpopma`)
* Add simple validation constraint annotations for the Plugin system. (for https://issues.apache.org/jira/browse/LOG4J2-825[LOG4J2-825] by `mattsicker`)
* Support use of TypeConverter classes through the standard Plugin system. (for https://issues.apache.org/jira/browse/LOG4J2-827[LOG4J2-827] by `mattsicker`)
+* Documentation: added Runtime Dependencies link to left nav-bar on site. (for https://issues.apache.org/jira/browse/LOG4J2-833[LOG4J2-833] by `rpopma`)
* Add a Java lookup to provide nicely formatted runtime version information. (for https://issues.apache.org/jira/browse/LOG4J2-848[LOG4J2-848] by `ggregory`)
* Documentation: add sections on the JUL Adapter, IO Streams and NoSQL Appenders to the Maven and Ivy page. (for https://issues.apache.org/jira/browse/LOG4J2-856[LOG4J2-856] by `rpopma`)
* Add ShutdownCallbackRegistry interface for customizable shutdown callback handling. This is particularly
useful for application servers that wish to integrate with Log4j 2. (for https://issues.apache.org/jira/browse/LOG4J2-868[LOG4J2-868] by `mattsicker`)
-* Added Memory-Mapped File Appender. (for https://issues.apache.org/jira/browse/LOG4J2-431[LOG4J2-431] by `rpopma`, Claude Mamo)
-* Implement a GELF layout. (for https://issues.apache.org/jira/browse/LOG4J2-428[LOG4J2-428] by `ggregory`, `mikes`, Mark Paluch)
=== Changed
+* Incomplete documentation for JSONLayout. (for https://issues.apache.org/jira/browse/LOG4J2-766[LOG4J2-766] by `ggregory`, Bruno P. Kinoshita)
* Update Spring Framework to 3.2.11.RELEASE from 3.2.8.RELEASE. (for https://issues.apache.org/jira/browse/LOG4J2-780[LOG4J2-780] by `mattsicker`)
* Update Jackson to 2.4.2 from 2.4.1 (for XML and JSON processing). (for https://issues.apache.org/jira/browse/LOG4J2-790[LOG4J2-790] by `ggregory`)
+* All life cycle implementations should be serializable.
+ This is still work in progress. (for https://issues.apache.org/jira/browse/LOG4J2-800[LOG4J2-800] by `ggregory`)
* org.apache.logging.log4j.core.Logger should be serializable.
This is still work in progress. (for https://issues.apache.org/jira/browse/LOG4J2-801[LOG4J2-801] by `ggregory`)
-* Unify the two JMS appenders into a single appender. Configurations written for 2.0 will still work in 2.1+. (for https://issues.apache.org/jira/browse/LOG4J2-815[LOG4J2-815] by `mattsicker`)
* Update javax.mail to 1.5.2 from 1.5.0. (for https://issues.apache.org/jira/browse/LOG4J2-810[LOG4J2-810] by `ggregory`)
-* All life cycle implementations should be serializable.
- This is still work in progress. (for https://issues.apache.org/jira/browse/LOG4J2-800[LOG4J2-800] by `ggregory`)
+* Unify the two JMS appenders into a single appender. Configurations written for 2.0 will still work in 2.1+. (for https://issues.apache.org/jira/browse/LOG4J2-815[LOG4J2-815] by `mattsicker`)
* Update org.eclipse.persistence.jpa to 2.5.2 from 2.5.1. (for https://issues.apache.org/jira/browse/LOG4J2-822[LOG4J2-822] by `ggregory`)
* Documentation: updated FAQ "which jars" diagrams for JUL bridge and 2.1 version. (for https://issues.apache.org/jira/browse/LOG4J2-831[LOG4J2-831] by `rpopma`)
* Update JMH to 1.1 from 0.7.2. (for https://issues.apache.org/jira/browse/LOG4J2-844[LOG4J2-844] by `rpopma`)
+* Add 2.1.0 to compatible versions in Log4j API ProviderUtil and update Log4jAPIVersion to 2.1.0 in
+ core META-INF/log4j-provider.properties. (for https://issues.apache.org/jira/browse/LOG4J2-845[LOG4J2-845] by `mattsicker`)
* FlumeAppender: maxDelay not in seconds, but milliseconds.
Add time scale to some settings, for example maxDelayMillis instead of maxDelay.
The old names are aliased for compatibility. (for https://issues.apache.org/jira/browse/LOG4J2-867[LOG4J2-867] by `ggregory`)
-* Add 2.1.0 to compatible versions in Log4j API ProviderUtil and update Log4jAPIVersion to 2.1.0 in
- core META-INF/log4j-provider.properties. (for https://issues.apache.org/jira/browse/LOG4J2-845[LOG4J2-845] by `mattsicker`)
-* Incomplete documentation for JSONLayout. (for https://issues.apache.org/jira/browse/LOG4J2-766[LOG4J2-766] by `ggregory`, Bruno P. Kinoshita)
=== Fixed
-* Remove invalid Oracle Maven repository. (for https://issues.apache.org/jira/browse/LOG4J2-782[LOG4J2-782] by `mattsicker`)
+* FlumePersistentManager now handles LockConflictExceptions in Berkeley Db when sending a batch. (for https://issues.apache.org/jira/browse/LOG4J2-391[LOG4J2-391] by `rgoers`, Kamal Bahadur)
+* Fix OSGi Import-Package problem with the JMS API. (for https://issues.apache.org/jira/browse/LOG4J2-663[LOG4J2-663] by `mattsicker`, Florian Brunner)
+* Some typo fixes and enhancements for the site. (for https://issues.apache.org/jira/browse/LOG4J2-676[LOG4J2-676] by `rgoers`, Stefan Bodewig)
+* Documentation: fixed minor issues with Log4j2 website/documentation. (for https://issues.apache.org/jira/browse/LOG4J2-678[LOG4J2-678] by `rpopma`, `mattsicker`)
+* Avoid ConverterKey plugin clashes by using a more predictable plugin loading infrastructure.
+ Plugins have been segmented into three parts: class path, user-specified packages, and OSGi bundles. (for https://issues.apache.org/jira/browse/LOG4J2-745[LOG4J2-745] by `mattsicker`, Scott Harrington)
* Reduced CachedClock thread contention. (for https://issues.apache.org/jira/browse/LOG4J2-753[LOG4J2-753] by `rpopma`)
+* Remove invalid Oracle Maven repository. (for https://issues.apache.org/jira/browse/LOG4J2-782[LOG4J2-782] by `mattsicker`)
+* PatternLayout should use platform character encoding by default, not UTF-8. (for https://issues.apache.org/jira/browse/LOG4J2-783[LOG4J2-783] by `rpopma`, Minglei Lee)
* Documentation: fixed capitalization inconsistency in user manual example config. (for https://issues.apache.org/jira/browse/LOG4J2-785[LOG4J2-785] by `rpopma`)
-* Prevent NPE when configuration with AsyncLogger/AsyncRoot is reloaded. (for https://issues.apache.org/jira/browse/LOG4J2-807[LOG4J2-807] by `rpopma`)
* Fixed issue where log4j-to-slf4j did not work correctly with SLF4J Simple Logger. (for https://issues.apache.org/jira/browse/LOG4J2-796[LOG4J2-796] by `rpopma`)
+* Documentation: clarified why log4j-core is a compile-time dependency in Maven and Ivy page. (for https://issues.apache.org/jira/browse/LOG4J2-797[LOG4J2-797] by `rpopma`, Andreas Rytina)
+* Fixed plugin scanning redundancy causing massive slowdowns in certain environments. (for https://issues.apache.org/jira/browse/LOG4J2-798[LOG4J2-798] by `mattsicker`, Scott Harrington)
+* Prevent NPE when configuration with AsyncLogger/AsyncRoot is reloaded. (for https://issues.apache.org/jira/browse/LOG4J2-807[LOG4J2-807] by `rpopma`)
+* SimpleLogger throws ArrayIndexOutOfBoundsException for an empty array. (for https://issues.apache.org/jira/browse/LOG4J2-811[LOG4J2-811] by `ggregory`, Yogesh Rao)
+* MarkerManager Log4jMarker.hasParents() returns opposite of correct result. (for https://issues.apache.org/jira/browse/LOG4J2-813[LOG4J2-813] by `ggregory`, David Erichsen, Brandon Barry)
+* Fixed memory leak in Tomcat 6 caused by clock background threads unintentionally
+ started by Tomcat after web application stop. (for https://issues.apache.org/jira/browse/LOG4J2-819[LOG4J2-819] by `mattsicker`, `ggregory`)
+* Fixed issue in RollingFile filePattern: backslashes are path separators, not escape characters. (for https://issues.apache.org/jira/browse/LOG4J2-829[LOG4J2-829] by `rpopma`)
+* Respect external interrupt signal to allow application shutdown after joining AsyncAppender thread. (for https://issues.apache.org/jira/browse/LOG4J2-830[LOG4J2-830] by `rpopma`)
+* ThrowableProxy fails if a class in logged stack trace throws java.lang.Error from initializer (for https://issues.apache.org/jira/browse/LOG4J2-832[LOG4J2-832] by `ggregory`, Seth Leger)
* Migrate JdbcH2AppenderTest JUnit performance test to log4j-perf. (for https://issues.apache.org/jira/browse/LOG4J2-840[LOG4J2-840] by `rpopma`)
* Migrate JdbcHyperSqlAppenderTest JUnit performance test to log4j-perf. (for https://issues.apache.org/jira/browse/LOG4J2-841[LOG4J2-841] by `rpopma`)
-* Fixed issue in RollingFile filePattern: backslashes are path separators, not escape characters. (for https://issues.apache.org/jira/browse/LOG4J2-829[LOG4J2-829] by `rpopma`)
* Migrate JpaH2AppenderTest JUnit performance test to log4j-perf. (for https://issues.apache.org/jira/browse/LOG4J2-842[LOG4J2-842] by `rpopma`)
-* Respect external interrupt signal to allow application shutdown after joining AsyncAppender thread. (for https://issues.apache.org/jira/browse/LOG4J2-830[LOG4J2-830] by `rpopma`)
+* Migrate JpaHyperSqlAppenderTest JUnit performance test to log4j-perf. (for https://issues.apache.org/jira/browse/LOG4J2-843[LOG4J2-843] by `rpopma`)
* Documentation: fix broken links on Appenders manual page. (for https://issues.apache.org/jira/browse/LOG4J2-855[LOG4J2-855] by `rpopma`)
* Documentation: fix broken links on left navigation Extending Log4j Configuration sub-menu. (for https://issues.apache.org/jira/browse/LOG4J2-861[LOG4J2-861] by `rpopma`)
-* Migrate JpaHyperSqlAppenderTest JUnit performance test to log4j-perf. (for https://issues.apache.org/jira/browse/LOG4J2-843[LOG4J2-843] by `rpopma`)
-* PatternLayout should use platform character encoding by default, not UTF-8. (for https://issues.apache.org/jira/browse/LOG4J2-783[LOG4J2-783] by `rpopma`, Minglei Lee)
-* Fixed memory leak in Tomcat 6 caused by clock background threads unintentionally
- started by Tomcat after web application stop. (for https://issues.apache.org/jira/browse/LOG4J2-819[LOG4J2-819] by `mattsicker`, `ggregory`)
-* Documentation: fixed missing closing parenthesis in code example. (for https://issues.apache.org/jira/browse/LOG4J2-866[LOG4J2-866] by `rpopma`, Gerard Weatherby)
-* Documentation: clarified why log4j-core is a compile-time dependency in Maven and Ivy page. (for https://issues.apache.org/jira/browse/LOG4J2-797[LOG4J2-797] by `rpopma`, Andreas Rytina)
-* FlumePersistentManager now handles LockConflictExceptions in Berkeley Db when sending a batch. (for https://issues.apache.org/jira/browse/LOG4J2-391[LOG4J2-391] by `rgoers`, Kamal Bahadur)
-* MarkerManager Log4jMarker.hasParents() returns opposite of correct result. (for https://issues.apache.org/jira/browse/LOG4J2-813[LOG4J2-813] by `ggregory`, David Erichsen, Brandon Barry)
-* Avoid ConverterKey plugin clashes by using a more predictable plugin loading infrastructure.
- Plugins have been segmented into three parts: class path, user-specified packages, and OSGi bundles. (for https://issues.apache.org/jira/browse/LOG4J2-745[LOG4J2-745] by `mattsicker`, Scott Harrington)
-* SimpleLogger throws ArrayIndexOutOfBoundsException for an empty array. (for https://issues.apache.org/jira/browse/LOG4J2-811[LOG4J2-811] by `ggregory`, Yogesh Rao)
* Fixed classloader issue that prevented Log4j from finding the implementation when used in a custom Ant task. (for https://issues.apache.org/jira/browse/LOG4J2-862[LOG4J2-862] by `mattsicker`, Michael Sutherland)
-* Fixed plugin scanning redundancy causing massive slowdowns in certain environments. (for https://issues.apache.org/jira/browse/LOG4J2-798[LOG4J2-798] by `mattsicker`, Scott Harrington)
-* Some typo fixes and enhancements for the site. (for https://issues.apache.org/jira/browse/LOG4J2-676[LOG4J2-676] by `rgoers`, Stefan Bodewig)
-* Documentation: fixed minor issues with Log4j2 website/documentation. (for https://issues.apache.org/jira/browse/LOG4J2-678[LOG4J2-678] by `rpopma`, `mattsicker`)
-* ThrowableProxy fails if a class in logged stack trace throws java.lang.Error from initializer (for https://issues.apache.org/jira/browse/LOG4J2-832[LOG4J2-832] by `ggregory`, Seth Leger)
-* Fix OSGi Import-Package problem with the JMS API. (for https://issues.apache.org/jira/browse/LOG4J2-663[LOG4J2-663] by `mattsicker`, Florian Brunner)
+* Documentation: fixed missing closing parenthesis in code example. (for https://issues.apache.org/jira/browse/LOG4J2-866[LOG4J2-866] by `rpopma`, Gerard Weatherby)
diff --git a/src/site/asciidoc/changelog/2.10.0.adoc b/src/site/asciidoc/changelog/2.10.0.adoc
index 8a49e2a3a5..189b57f977 100644
--- a/src/site/asciidoc/changelog/2.10.0.adoc
+++ b/src/site/asciidoc/changelog/2.10.0.adoc
@@ -100,21 +100,21 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
+* Allow filtering of line breaks in layout pattern. (for https://issues.apache.org/jira/browse/LOG4J2-1203[LOG4J2-1203] by `mikes`, Robert Turner)
* Simplify log4j system property naming scheme. (for https://issues.apache.org/jira/browse/LOG4J2-1431[LOG4J2-1431] by `mattsicker`)
+* Add fields with fixed values to JSON/XML/YAML layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1694[LOG4J2-1694] by `mikes`, Michal Dvořák)
* Add global configuration environment SPI. (for https://issues.apache.org/jira/browse/LOG4J2-1809[LOG4J2-1809] by `mattsicker`)
* Provide ways to configure SSL that avoid plain-text passwords in the log4j configuration. The configuration may
now specify a system environment variable that holds the password, or the path to a file that holds the password. (for https://issues.apache.org/jira/browse/LOG4J2-2054[LOG4J2-2054] by `rpopma`)
* Modularize Log4j-api and make most other log4j jars automatic modules. (for https://issues.apache.org/jira/browse/LOG4J2-2056[LOG4J2-2056] by `rgoers`)
-* Provide a native Log4j 2 implementation of Eclipse Jetty's org.eclipse.jetty.util.log.Logger. (for https://issues.apache.org/jira/browse/LOG4J2-2114[LOG4J2-2114] by `ggregory`)
+* Add possibility of sending the key of a message to Kafka using KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2062[LOG4J2-2062] by `mikes`, Jorge Sanchez)
+* Add org.apache.logging.log4j.core.config.composite.CompositeConfiguration#toString(). (for https://issues.apache.org/jira/browse/LOG4J2-2071[LOG4J2-2071] by `ggregory`, Carter Kozak)
* Add a noop AppenderSkeleton for applications still using Log4j 1.x. (for https://issues.apache.org/jira/browse/LOG4J2-2098[LOG4J2-2098] by `rgoers`)
* XML encoding for PatternLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2103[LOG4J2-2103] by `mikes`)
-* Add fields with fixed values to JSON/XML/YAML layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1694[LOG4J2-1694] by `mikes`, Michal Dvořák)
-* Allow filtering of line breaks in layout pattern. (for https://issues.apache.org/jira/browse/LOG4J2-1203[LOG4J2-1203] by `mikes`, Robert Turner)
-* Add org.apache.logging.log4j.core.config.composite.CompositeConfiguration#toString(). (for https://issues.apache.org/jira/browse/LOG4J2-2071[LOG4J2-2071] by `ggregory`, Carter Kozak)
-* Add possibility of sending the key of a message to Kafka using KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2062[LOG4J2-2062] by `mikes`, Jorge Sanchez)
+* Add property to disable message pattern converter lookups. (for https://issues.apache.org/jira/browse/LOG4J2-2109[LOG4J2-2109] by `mikes`, Carter Douglas Kozak)
* MapMessage should use deep toString for values. (for https://issues.apache.org/jira/browse/LOG4J2-2112[LOG4J2-2112] by `mikes`, Carter Douglas Kozak)
+* Provide a native Log4j 2 implementation of Eclipse Jetty's org.eclipse.jetty.util.log.Logger. (for https://issues.apache.org/jira/browse/LOG4J2-2114[LOG4J2-2114] by `ggregory`)
* Properly escape newlines and other control characters in JSON. (for https://issues.apache.org/jira/browse/LOG4J2-2120[LOG4J2-2120] by `mikes`, Carter Douglas Kozak)
-* Add property to disable message pattern converter lookups. (for https://issues.apache.org/jira/browse/LOG4J2-2109[LOG4J2-2109] by `mikes`, Carter Douglas Kozak)
=== Changed
@@ -124,32 +124,32 @@ For complete information on Apache Log4j 2, including instructions on how to sub
* Disable thread name caching by default when running on Java 8u102 or later. (for https://issues.apache.org/jira/browse/LOG4J2-2052[LOG4J2-2052] by `rpopma`)
* Support new SLF4J binding mechanism introduced in SLF4J 1.8. (for https://issues.apache.org/jira/browse/LOG4J2-2057[LOG4J2-2057] by `rgoers`)
* Split up log4j-nosql into one module per appender. (for https://issues.apache.org/jira/browse/LOG4J2-2076[LOG4J2-2076] by `mikes`)
-* Update LMAX disruptor from 3.3.6 to 3.3.7. (for https://issues.apache.org/jira/browse/LOG4J2-2078[LOG4J2-2078] by `ggregory`)
* Update from Jackson 2.9.1 to 2.9.2. (for https://issues.apache.org/jira/browse/LOG4J2-2077[LOG4J2-2077] by `ggregory`)
-* Update Apache Kafka kafka-clients from 0.11.0.1 to 1.0.0. (for https://issues.apache.org/jira/browse/LOG4J2-2096[LOG4J2-2096] by `ggregory`)
-* Jackson dependencies for 2.9.2 incorrectly bring in jackson-annotations 2.9.0 instead of 2.9.2. (for https://issues.apache.org/jira/browse/LOG4J2-2117[LOG4J2-2117] by `ggregory`)
+* Update LMAX disruptor from 3.3.6 to 3.3.7. (for https://issues.apache.org/jira/browse/LOG4J2-2078[LOG4J2-2078] by `ggregory`)
* Update Apache Commons Compress from 1.14 to 1.15. (for https://issues.apache.org/jira/browse/LOG4J2-2081[LOG4J2-2081] by `ggregory`)
* Upgrade picocli to 2.0.3 from 0.9.8. (for https://issues.apache.org/jira/browse/LOG4J2-2088[LOG4J2-2088] by `rpopma`)
* [TagLib] Update servlet-api provided dependency from 2.5 to 3.0.1. (for https://issues.apache.org/jira/browse/LOG4J2-2089[LOG4J2-2089] by `ggregory`)
+* Update Apache Kafka kafka-clients from 0.11.0.1 to 1.0.0. (for https://issues.apache.org/jira/browse/LOG4J2-2096[LOG4J2-2096] by `ggregory`)
+* Jackson dependencies for 2.9.2 incorrectly bring in jackson-annotations 2.9.0 instead of 2.9.2. (for https://issues.apache.org/jira/browse/LOG4J2-2117[LOG4J2-2117] by `ggregory`)
=== Fixed
+* Nested pattern layout options broken. (for https://issues.apache.org/jira/browse/LOG4J2-1216[LOG4J2-1216] by `ggregory`, Barna Zsombor Klara, GFriedrichThies Wellpott)
* Until this change, messages appeared out of order in log file any time when the async logging queue was full.
With this change, messages are only logged out of order to prevent deadlock when Log4j2 detects recursive
logging while the queue is full. (for https://issues.apache.org/jira/browse/LOG4J2-2031[LOG4J2-2031] by `rpopma`)
-* If Log4j is used as the Tomcat logging implementation startup might fail if an application also uses Log4j. (for https://issues.apache.org/jira/browse/LOG4J2-2055[LOG4J2-2055] by `rgoers`)
+* CompositeConfiguration supports Reconfiguration. PR #115. (for https://issues.apache.org/jira/browse/LOG4J2-2036[LOG4J2-2036] by `ggregory`, Robert Haycock)
* Exception java.nio.charset.UnsupportedCharsetException: cp65001 in 2.9.0. (for https://issues.apache.org/jira/browse/LOG4J2-2053[LOG4J2-2053] by `ggregory`)
+* If Log4j is used as the Tomcat logging implementation startup might fail if an application also uses Log4j. (for https://issues.apache.org/jira/browse/LOG4J2-2055[LOG4J2-2055] by `rgoers`)
* AbstractDatabaseManager should make a copy of LogEvents before holding references to them: AsyncLogger log events are mutable. (for https://issues.apache.org/jira/browse/LOG4J2-2060[LOG4J2-2060] by `rpopma`)
+* Log4j1XmlLayout does not provide the entire stack trace, it is missing the caused by information. (for https://issues.apache.org/jira/browse/LOG4J2-2070[LOG4J2-2070] by `ggregory`, Doug Hughes)
+* Log4j-config.xsd should make AppenderRef optional for each Logger element. (for https://issues.apache.org/jira/browse/LOG4J2-2073[LOG4J2-2073] by `ggregory`, Patrick Lucas)
* The console appender should say why it cannot load JAnsi. (for https://issues.apache.org/jira/browse/LOG4J2-2074[LOG4J2-2074] by `ggregory`)
-* LevelMixIn class for Jackson is coded incorrectly (for https://issues.apache.org/jira/browse/LOG4J2-2100[LOG4J2-2100] by `ggregory`)
-* Jansi now needs to be enabled explicitly (by setting system property `log4j.skipJansi` to `false`). To avoid causing problems for web applications, Log4j will no longer automatically try to load Jansi without explicit configuration. (for https://issues.apache.org/jira/browse/LOG4J2-2087[LOG4J2-2087] by `rpopma`, Andy Gumbrecht)
-* CompositeConfiguration supports Reconfiguration. PR #115. (for https://issues.apache.org/jira/browse/LOG4J2-2036[LOG4J2-2036] by `ggregory`, Robert Haycock)
* Wrong Apache Commons CSV version referenced in the Javadoc of CsvParameterLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2085[LOG4J2-2085] by `ggregory`, István Neuwirth)
-* Log4j-config.xsd should make AppenderRef optional for each Logger element. (for https://issues.apache.org/jira/browse/LOG4J2-2073[LOG4J2-2073] by `ggregory`, Patrick Lucas)
-* Log4j1XmlLayout does not provide the entire stack trace, it is missing the caused by information. (for https://issues.apache.org/jira/browse/LOG4J2-2070[LOG4J2-2070] by `ggregory`, Doug Hughes)
+* Jansi now needs to be enabled explicitly (by setting system property `log4j.skipJansi` to `false`). To avoid causing problems for web applications, Log4j will no longer automatically try to load Jansi without explicit configuration. (for https://issues.apache.org/jira/browse/LOG4J2-2087[LOG4J2-2087] by `rpopma`, Andy Gumbrecht)
* Log4j respects the configured "log4j2.is.webapp" property (for https://issues.apache.org/jira/browse/LOG4J2-2091[LOG4J2-2091] by `mikes`, Carter Douglas Kozak)
+* LevelMixIn class for Jackson is coded incorrectly (for https://issues.apache.org/jira/browse/LOG4J2-2100[LOG4J2-2100] by `ggregory`)
* Non-string value in MapMessage caused ClassCastException. (for https://issues.apache.org/jira/browse/LOG4J2-2101[LOG4J2-2101] by `mikes`, Carter Douglas Kozak)
-* Nested pattern layout options broken. (for https://issues.apache.org/jira/browse/LOG4J2-1216[LOG4J2-1216] by `ggregory`, Barna Zsombor Klara, GFriedrichThies Wellpott)
* MapMessage JSON encoding will escape keys and values. (for https://issues.apache.org/jira/browse/LOG4J2-2102[LOG4J2-2102] by `mikes`, Carter Douglas Kozak)
-* XML Schema for DynamicFilterThreshold does not accept multiple KeyValuePairs. (for https://issues.apache.org/jira/browse/LOG4J2-2289[LOG4J2-2289] by `ggregory`, Hari Menon)
* MapMessage supports both StringBuilderFormattable and MultiFormatMessage. (for https://issues.apache.org/jira/browse/LOG4J2-2107[LOG4J2-2107] by `mikes`, Carter Douglas Kozak)
+* XML Schema for DynamicFilterThreshold does not accept multiple KeyValuePairs. (for https://issues.apache.org/jira/browse/LOG4J2-2289[LOG4J2-2289] by `ggregory`, Hari Menon)
diff --git a/src/site/asciidoc/changelog/2.11.0.adoc b/src/site/asciidoc/changelog/2.11.0.adoc
index a7c91c684c..629c4c8475 100644
--- a/src/site/asciidoc/changelog/2.11.0.adoc
+++ b/src/site/asciidoc/changelog/2.11.0.adoc
@@ -123,74 +123,74 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
+* Added support for precise (micro and nanosecond) timestamps when running on Java 9. A limited number of precise %d date formats are supported with PatternLayout. POTENTIAL BREAKING CHANGE: The XML, JSON and YAML formats have changed: they no longer have the "timeMillis" attribute and instead have an "Instant" element with "epochSecond" and "nanoOfSecond" attributes. (for https://issues.apache.org/jira/browse/LOG4J2-1883[LOG4J2-1883] by `rpopma`, Anthony Maire)
* Add missing converters to PatternLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2143[LOG4J2-2143] by `mikes`)
+* Add API org.apache.logging.log4j.core.lookup.Interpolator.getStrLookupMap(). (for https://issues.apache.org/jira/browse/LOG4J2-2160[LOG4J2-2160] by `ggregory`)
* The MongoDB Appender should use a keys and values for a Log4j MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-2179[LOG4J2-2179] by `ggregory`)
* Add a MongoDbProvider builder for and deprecate org.apache.logging.log4j.mongodb.MongoDbProvider.createNoSqlProvider(). (for https://issues.apache.org/jira/browse/LOG4J2-2180[LOG4J2-2180] by `ggregory`)
-* Add API org.apache.logging.log4j.core.lookup.Interpolator.getStrLookupMap(). (for https://issues.apache.org/jira/browse/LOG4J2-2160[LOG4J2-2160] by `ggregory`)
* The JDBC Appender should use keys and values from a Log4j MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-2181[LOG4J2-2181] by `ggregory`)
-* Add method org.apache.logging.log4j.core.util.WatchManager.reset(File) and reset(). (for https://issues.apache.org/jira/browse/LOG4J2-2206[LOG4J2-2206] by `ggregory`)
* Add a simple JDBC DriverManager-based ConnectionSource that uses JDBC's DriverManager#getConnection(String, String, String). (for https://issues.apache.org/jira/browse/LOG4J2-2185[LOG4J2-2185] by `ggregory`)
* Add a JDBC ConnectionSource that provides pooling through Apache Commons DBCP 2. (for https://issues.apache.org/jira/browse/LOG4J2-2186[LOG4J2-2186] by `ggregory`)
-* Made log4j-core a multi-release ("multi-version") jar, added log4j-core-java9 module. (for https://issues.apache.org/jira/browse/LOG4J2-2191[LOG4J2-2191] by `rpopma`)
* Add a hook for a Connection Source for a JDBC Appender to release its resources. (for https://issues.apache.org/jira/browse/LOG4J2-2187[LOG4J2-2187] by `ggregory`)
-* Add debug logging to org.apache.logging.log4j.mongodb.MongoDbConnection. (for https://issues.apache.org/jira/browse/LOG4J2-2208[LOG4J2-2208] by `ggregory`)
-* Add org.apache.logging.log4j.core.util.WatchManager#unwatch(File). (for https://issues.apache.org/jira/browse/LOG4J2-2203[LOG4J2-2203] by `ggregory`)
-* Added support for precise (micro and nanosecond) timestamps when running on Java 9. A limited number of precise %d date formats are supported with PatternLayout. POTENTIAL BREAKING CHANGE: The XML, JSON and YAML formats have changed: they no longer have the "timeMillis" attribute and instead have an "Instant" element with "epochSecond" and "nanoOfSecond" attributes. (for https://issues.apache.org/jira/browse/LOG4J2-1883[LOG4J2-1883] by `rpopma`, Anthony Maire)
* Output JSON object for ObjectMessage in JsonLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2190[LOG4J2-2190] by `mikes`, Franz Wong)
+* Made log4j-core a multi-release ("multi-version") jar, added log4j-core-java9 module. (for https://issues.apache.org/jira/browse/LOG4J2-2191[LOG4J2-2191] by `rpopma`)
+* Add org.apache.logging.log4j.core.util.WatchManager#unwatch(File). (for https://issues.apache.org/jira/browse/LOG4J2-2203[LOG4J2-2203] by `ggregory`)
+* Add method org.apache.logging.log4j.core.util.WatchManager.reset(File) and reset(). (for https://issues.apache.org/jira/browse/LOG4J2-2206[LOG4J2-2206] by `ggregory`)
+* Add debug logging to org.apache.logging.log4j.mongodb.MongoDbConnection. (for https://issues.apache.org/jira/browse/LOG4J2-2208[LOG4J2-2208] by `ggregory`)
* Add API to enable iterating over message parameters without creating temporary objects. (for https://issues.apache.org/jira/browse/LOG4J2-2253[LOG4J2-2253] by `rpopma`, Carter Kozak)
=== Changed
-* Update Jackson from 2.9.2 to 2.9.3. (for https://issues.apache.org/jira/browse/LOG4J2-2165[LOG4J2-2165] by `ggregory`)
+* Removed unnecessary threadlocal StringBuilder field from MdcPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-2127[LOG4J2-2127] by `rpopma`, Carter Kozak)
* Update ZeroMQ's jeromq from 0.4.2 to 0.4.3. (for https://issues.apache.org/jira/browse/LOG4J2-2132[LOG4J2-2132] by `ggregory`)
* Update version of maven bundle plugin to 3.4.0. Convert bundle plugin error to a warning. (for https://issues.apache.org/jira/browse/LOG4J2-2146[LOG4J2-2146] by `rgoers`)
-* Require Java 9 to compile the log4j-perf module to allow benchmarking with Java 9 APIs. (for https://issues.apache.org/jira/browse/LOG4J2-2194[LOG4J2-2194] by `rpopma`)
-* org.apache.logging.log4j.core.util.WatchManager.getWatchers() should pre-allocate its new Map. (for https://issues.apache.org/jira/browse/LOG4J2-2204[LOG4J2-2204] by `ggregory`)
-* Update JMH to version 1.19 from 1.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-2193[LOG4J2-2193] by `rpopma`)
-* Rename existing MongoDb plugin and related artifacts from MongoDb to MongoDb2. (for https://issues.apache.org/jira/browse/LOG4J2-2209[LOG4J2-2209] by `ggregory`)
+* Update Jackson from 2.9.2 to 2.9.3. (for https://issues.apache.org/jira/browse/LOG4J2-2165[LOG4J2-2165] by `ggregory`)
+* NullPointerException at org.apache.logging.log4j.util.Activator.loadProvider(Activator.java:81) in log4j 2.10.0. (for https://issues.apache.org/jira/browse/LOG4J2-2182[LOG4J2-2182] by `ggregory`, Gary Gregoryliwenxian2017)
* Update MongoDB driver from 3.0.4 to 3.6.1. (for https://issues.apache.org/jira/browse/LOG4J2-2184[LOG4J2-2184] by `ggregory`)
+* Split off JPA support into a new module log4j-jpa. (for https://issues.apache.org/jira/browse/LOG4J2-2188[LOG4J2-2188] by `ggregory`, Gary Gregory)
+* Update JMH to version 1.19 from 1.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-2193[LOG4J2-2193] by `rpopma`)
+* Require Java 9 to compile the log4j-perf module to allow benchmarking with Java 9 APIs. (for https://issues.apache.org/jira/browse/LOG4J2-2194[LOG4J2-2194] by `rpopma`)
+* Document default property value support. (for https://issues.apache.org/jira/browse/LOG4J2-2197[LOG4J2-2197] by `ggregory`, Fabrice Daugan)
* Update MongoDB dependencies from classic to modern. (for https://issues.apache.org/jira/browse/LOG4J2-2198[LOG4J2-2198] by `ggregory`)
-* The internal status logger timestamp format is now configurable with system property `log4j2.StatusLogger.DateFormat`. (for https://issues.apache.org/jira/browse/LOG4J2-2250[LOG4J2-2250] by `rpopma`)
-* Update MongoDB 3 module from driver 3.6.1 to 3.6.3. (for https://issues.apache.org/jira/browse/LOG4J2-2259[LOG4J2-2259] by `ggregory`)
-* Update JAnsi from 1.16 to 1.17. (for https://issues.apache.org/jira/browse/LOG4J2-2264[LOG4J2-2264] by `ggregory`)
-* Removed unnecessary dependency on jcommander since Log4j uses embedded picocli since 2.9. (for https://issues.apache.org/jira/browse/LOG4J2-2236[LOG4J2-2236] by `rpopma`)
-* Reduce compiler warnings in log4j-api. (for https://issues.apache.org/jira/browse/LOG4J2-2215[LOG4J2-2215] by `rpopma`)
-* [SMTP] Update javax.mail from 1.6.0 to 1.6.1. (for https://issues.apache.org/jira/browse/LOG4J2-2260[LOG4J2-2260] by `ggregory`)
-* NullPointerException at org.apache.logging.log4j.util.Activator.loadProvider(Activator.java:81) in log4j 2.10.0. (for https://issues.apache.org/jira/browse/LOG4J2-2182[LOG4J2-2182] by `ggregory`, Gary Gregoryliwenxian2017)
-* Removed unnecessary threadlocal StringBuilder field from MdcPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-2127[LOG4J2-2127] by `rpopma`, Carter Kozak)
-* Unnecessary contention in DefaultThreadContextMap. (for https://issues.apache.org/jira/browse/LOG4J2-2214[LOG4J2-2214] by `ggregory`, Gary GregoryDaniel Feist)
-* Update Jackson from 2.9.3 to 2.9.4. (for https://issues.apache.org/jira/browse/LOG4J2-2229[LOG4J2-2229] by `ggregory`, Gary Gregory)
-* Unnecessary contention in GarbageFreeSortedArrayThreadContextMap. (for https://issues.apache.org/jira/browse/LOG4J2-2213[LOG4J2-2213] by `ggregory`, Gary GregoryDaniel Feist)
-* New module log4j-mongodb3: Remove use of deprecated MongoDB APIs and code to the Java driver version 3 API. (for https://issues.apache.org/jira/browse/LOG4J2-2205[LOG4J2-2205] by `ggregory`, Gary Gregory)
* MarkerFilter onMismatch invalid attribute in .properties. (for https://issues.apache.org/jira/browse/LOG4J2-2202[LOG4J2-2202] by `ggregory`, Gary GregoryKilian)
-* Split off JPA support into a new module log4j-jpa. (for https://issues.apache.org/jira/browse/LOG4J2-2188[LOG4J2-2188] by `ggregory`, Gary Gregory)
-* Configuration builder classes should look for "onMismatch", not "onMisMatch". (for https://issues.apache.org/jira/browse/LOG4J2-2219[LOG4J2-2219] by `ggregory`, Gary GregoryKilian)
+* org.apache.logging.log4j.core.util.WatchManager.getWatchers() should pre-allocate its new Map. (for https://issues.apache.org/jira/browse/LOG4J2-2204[LOG4J2-2204] by `ggregory`)
+* New module log4j-mongodb3: Remove use of deprecated MongoDB APIs and code to the Java driver version 3 API. (for https://issues.apache.org/jira/browse/LOG4J2-2205[LOG4J2-2205] by `ggregory`, Gary Gregory)
+* Rename existing MongoDb plugin and related artifacts from MongoDb to MongoDb2. (for https://issues.apache.org/jira/browse/LOG4J2-2209[LOG4J2-2209] by `ggregory`)
* Fix error log message for Script which says ScriptFile instead. (for https://issues.apache.org/jira/browse/LOG4J2-2210[LOG4J2-2210] by `ggregory`, Björn Kautler)
-* Update Apache Commons Compress from 1.15 to 1.16.1. (for https://issues.apache.org/jira/browse/LOG4J2-2245[LOG4J2-2245] by `ggregory`, Gary Gregory)
* Unnecessary contention in CopyOnWriteSortedArrayThreadContextMap. (for https://issues.apache.org/jira/browse/LOG4J2-2212[LOG4J2-2212] by `ggregory`, Gary GregoryDaniel Feist)
-* Document default property value support. (for https://issues.apache.org/jira/browse/LOG4J2-2197[LOG4J2-2197] by `ggregory`, Fabrice Daugan)
+* Unnecessary contention in GarbageFreeSortedArrayThreadContextMap. (for https://issues.apache.org/jira/browse/LOG4J2-2213[LOG4J2-2213] by `ggregory`, Gary GregoryDaniel Feist)
+* Unnecessary contention in DefaultThreadContextMap. (for https://issues.apache.org/jira/browse/LOG4J2-2214[LOG4J2-2214] by `ggregory`, Gary GregoryDaniel Feist)
+* Reduce compiler warnings in log4j-api. (for https://issues.apache.org/jira/browse/LOG4J2-2215[LOG4J2-2215] by `rpopma`)
+* Configuration builder classes should look for "onMismatch", not "onMisMatch". (for https://issues.apache.org/jira/browse/LOG4J2-2219[LOG4J2-2219] by `ggregory`, Gary GregoryKilian)
+* Update Jackson from 2.9.3 to 2.9.4. (for https://issues.apache.org/jira/browse/LOG4J2-2229[LOG4J2-2229] by `ggregory`, Gary Gregory)
+* Removed unnecessary dependency on jcommander since Log4j uses embedded picocli since 2.9. (for https://issues.apache.org/jira/browse/LOG4J2-2236[LOG4J2-2236] by `rpopma`)
* Cannot see or copy all of certain JAnsi exception messages on Windows due to NUL characters. (for https://issues.apache.org/jira/browse/LOG4J2-2243[LOG4J2-2243] by `ggregory`, Gary Gregory)
+* Update Apache Commons Compress from 1.15 to 1.16.1. (for https://issues.apache.org/jira/browse/LOG4J2-2245[LOG4J2-2245] by `ggregory`, Gary Gregory)
+* The internal status logger timestamp format is now configurable with system property `log4j2.StatusLogger.DateFormat`. (for https://issues.apache.org/jira/browse/LOG4J2-2250[LOG4J2-2250] by `rpopma`)
* Reusable LogEvents now pass the original format string to downstream components like layouts and filters. (for https://issues.apache.org/jira/browse/LOG4J2-2252[LOG4J2-2252] by `rpopma`, Carter Kozak)
+* Update MongoDB 3 module from driver 3.6.1 to 3.6.3. (for https://issues.apache.org/jira/browse/LOG4J2-2259[LOG4J2-2259] by `ggregory`)
+* [SMTP] Update javax.mail from 1.6.0 to 1.6.1. (for https://issues.apache.org/jira/browse/LOG4J2-2260[LOG4J2-2260] by `ggregory`)
+* Update JAnsi from 1.16 to 1.17. (for https://issues.apache.org/jira/browse/LOG4J2-2264[LOG4J2-2264] by `ggregory`)
* Documentation fix in manual page for custom configurations. (for https://issues.apache.org/jira/browse/LOG4J2-2273[LOG4J2-2273] by `rpopma`, Bruno P. Kinoshita)
=== Fixed
* Revert OSGi API version to 4.3.1. (for https://issues.apache.org/jira/browse/LOG4J2-1976[LOG4J2-1976] by `rgoers`)
+* Avoid null attribute values in DefaultConfigurationBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-2002[LOG4J2-2002] by `mikes`, Paul Burrowes)
+* LoaderUtil was not looping properly over class loaders. (for https://issues.apache.org/jira/browse/LOG4J2-2104[LOG4J2-2104] by `rgoers`)
+* DefaultMergeStrategy did not merge filters on loggers correctly. (for https://issues.apache.org/jira/browse/LOG4J2-2123[LOG4J2-2123] by `rgoers`, Jacob Tolar)
+* Removed compile-time dependency on Java Management APIs from Log4J API module to improve compatibility with Android Platform which does not support JMX extensions. (for https://issues.apache.org/jira/browse/LOG4J2-2126[LOG4J2-2126] by `rpopma`, Oleg Kalnichevski)
+* Log4j2 throws NoClassDefFoundError in Java 9 in java.util.ServiceLoader. (for https://issues.apache.org/jira/browse/LOG4J2-2129[LOG4J2-2129] by `rgoers`, Blazej Bucko)
+* Don't create exit message in traceExit(R) when logging is disabled. (for https://issues.apache.org/jira/browse/LOG4J2-2157[LOG4J2-2157] by `ggregory`, Malte Skoruppa)
+* Fixed bug where ThreadContext map was cleared, resulting in entries being only available for one log event. (for https://issues.apache.org/jira/browse/LOG4J2-2158[LOG4J2-2158] by `rpopma`, Björn Kautler)
* Allow SortedArrayStringMap to be filtered upon deserialization. Fix build error in Java 9 when
compiling log4j-core test classes. (for https://issues.apache.org/jira/browse/LOG4J2-2163[LOG4J2-2163] by `rgoers`)
-* LoaderUtil was not looping properly over class loaders. (for https://issues.apache.org/jira/browse/LOG4J2-2104[LOG4J2-2104] by `rgoers`)
+* Fix typo in Property Substitution docs. (for https://issues.apache.org/jira/browse/LOG4J2-2175[LOG4J2-2175] by `mikes`, Behrang Saeedzadeh)
* NullPointerException would occur when header was provided to a Layout on RollingRandingAccessFileAppender
with DirectWriteRolloverStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2247[LOG4J2-2247] by `rgoers`)
* Incorrect automatics module name header was being included in manifests. (for https://issues.apache.org/jira/browse/LOG4J2-2254[LOG4J2-2254] by `rgoers`)
-* Move module-info.class to META-INF/versions/9 directory. (for https://issues.apache.org/jira/browse/LOG4J2-2271[LOG4J2-2271] by `rgoers`)
-* Avoid null attribute values in DefaultConfigurationBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-2002[LOG4J2-2002] by `mikes`, Paul Burrowes)
-* Fix typo in Property Substitution docs. (for https://issues.apache.org/jira/browse/LOG4J2-2175[LOG4J2-2175] by `mikes`, Behrang Saeedzadeh)
-* Log4j2 throws NoClassDefFoundError in Java 9 in java.util.ServiceLoader. (for https://issues.apache.org/jira/browse/LOG4J2-2129[LOG4J2-2129] by `rgoers`, Blazej Bucko)
-* Don't create exit message in traceExit(R) when logging is disabled. (for https://issues.apache.org/jira/browse/LOG4J2-2157[LOG4J2-2157] by `ggregory`, Malte Skoruppa)
-* Removed compile-time dependency on Java Management APIs from Log4J API module to improve compatibility with Android Platform which does not support JMX extensions. (for https://issues.apache.org/jira/browse/LOG4J2-2126[LOG4J2-2126] by `rpopma`, Oleg Kalnichevski)
-* Fixed bug where ThreadContext map was cleared, resulting in entries being only available for one log event. (for https://issues.apache.org/jira/browse/LOG4J2-2158[LOG4J2-2158] by `rpopma`, Björn Kautler)
-* DefaultMergeStrategy did not merge filters on loggers correctly. (for https://issues.apache.org/jira/browse/LOG4J2-2123[LOG4J2-2123] by `rgoers`, Jacob Tolar)
* Strings::join, when called with [null] returns "null" instead of EMPTY. (for https://issues.apache.org/jira/browse/LOG4J2-2270[LOG4J2-2270] by `ggregory`, Cyril Martin)
-* ConcurrentModificationException from org.apache.logging.log4j.status.StatusLogger.<clinit>(StatusLogger.java:71). (for https://issues.apache.org/jira/browse/LOG4J2-2276[LOG4J2-2276] by `ggregory`, Sean Baxter)
+* Move module-info.class to META-INF/versions/9 directory. (for https://issues.apache.org/jira/browse/LOG4J2-2271[LOG4J2-2271] by `rgoers`)
* Allow EnvironmentPropertySource to run with a SecurityManager that rejects environment variable access. (for https://issues.apache.org/jira/browse/LOG4J2-2274[LOG4J2-2274] by `ggregory`, Sebastien Lannez)
+* ConcurrentModificationException from org.apache.logging.log4j.status.StatusLogger.<clinit>(StatusLogger.java:71). (for https://issues.apache.org/jira/browse/LOG4J2-2276[LOG4J2-2276] by `ggregory`, Sean Baxter)
* Allow SystemPropertiesPropertySource to run with a SecurityManager that rejects system property access. (for https://issues.apache.org/jira/browse/LOG4J2-2279[LOG4J2-2279] by `ggregory`, Gary Gregory)
diff --git a/src/site/asciidoc/changelog/2.11.1.adoc b/src/site/asciidoc/changelog/2.11.1.adoc
index 076c76384c..891ecf07b0 100644
--- a/src/site/asciidoc/changelog/2.11.1.adoc
+++ b/src/site/asciidoc/changelog/2.11.1.adoc
@@ -92,60 +92,60 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Changed
+* Allow composite configuration for context parameter. (for https://issues.apache.org/jira/browse/LOG4J2-1721[LOG4J2-1721] by `rgoers`, Phokham Nonava)
* Status logger should show the Log4j name and version when initializing itself. (for https://issues.apache.org/jira/browse/LOG4J2-2302[LOG4J2-2302] by `ggregory`)
+* Log4j2 2.8.2 JMX unregister NullPointerException. (for https://issues.apache.org/jira/browse/LOG4J2-2304[LOG4J2-2304] by `ggregory`, wumengsheng)
* Update Jackson from 2.9.4 to 2.9.5. (for https://issues.apache.org/jira/browse/LOG4J2-2311[LOG4J2-2311] by `ggregory`)
* Update LMAX Disruptor from 3.3.7 to 3.4.2. (for https://issues.apache.org/jira/browse/LOG4J2-2313[LOG4J2-2313] by `ggregory`)
* Update JAnsi from 1.17 to 1.17.1. (for https://issues.apache.org/jira/browse/LOG4J2-2328[LOG4J2-2328] by `ggregory`)
-* Update optional Apache Commons DBCP from 2.2.0 to 2.4.0. (for https://issues.apache.org/jira/browse/LOG4J2-2386[LOG4J2-2386] by `ggregory`)
-* Update Kafka client from 1.1.0 to 1.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-2384[LOG4J2-2384] by `ggregory`)
-* Update Groovy from 2.4.13 to 2.5.1. (for https://issues.apache.org/jira/browse/LOG4J2-2385[LOG4J2-2385] by `ggregory`)
+* Added AbstractLogEvent.getMutableInstant to allow the MutableInstant instance to be modified by classes extending AbstractLogEvent. (for https://issues.apache.org/jira/browse/LOG4J2-2351[LOG4J2-2351] by `ckozak`)
* Update Jackson from 2.9.5 to 2.9.6. (for https://issues.apache.org/jira/browse/LOG4J2-2357[LOG4J2-2357] by `ggregory`)
* Update Kafka client from 1.0.0 to 1.1.0. (for https://issues.apache.org/jira/browse/LOG4J2-2358[LOG4J2-2358] by `ggregory`)
-* Added AbstractLogEvent.getMutableInstant to allow the MutableInstant instance to be modified by classes extending AbstractLogEvent. (for https://issues.apache.org/jira/browse/LOG4J2-2351[LOG4J2-2351] by `ckozak`)
-* Log4j2 2.8.2 JMX unregister NullPointerException. (for https://issues.apache.org/jira/browse/LOG4J2-2304[LOG4J2-2304] by `ggregory`, wumengsheng)
-* Allow composite configuration for context parameter. (for https://issues.apache.org/jira/browse/LOG4J2-1721[LOG4J2-1721] by `rgoers`, Phokham Nonava)
+* Update Kafka client from 1.1.0 to 1.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-2384[LOG4J2-2384] by `ggregory`)
+* Update Groovy from 2.4.13 to 2.5.1. (for https://issues.apache.org/jira/browse/LOG4J2-2385[LOG4J2-2385] by `ggregory`)
+* Update optional Apache Commons DBCP from 2.2.0 to 2.4.0. (for https://issues.apache.org/jira/browse/LOG4J2-2386[LOG4J2-2386] by `ggregory`)
* Log4j 2.0 ERROR "Could not search jar" with JBoss EAP 6.2. (for https://issues.apache.org/jira/browse/LOG4J2-548[LOG4J2-548] by `ggregory`, Shehata, Paresh Varke, Eric Victorson, Martin Laforet)
=== Fixed
-* Mixed async loggers no longer forget parameter values, providing some appenders with an array of nulls. (for https://issues.apache.org/jira/browse/LOG4J2-2301[LOG4J2-2301] by `ckozak`)
-* Split the SLF4J binding into 2 implementations - one for SLF4J 1.7.x and one for SLF4J 1.8+. (for https://issues.apache.org/jira/browse/LOG4J2-2305[LOG4J2-2305] by `rgoers`)
+* Curly braces in parameters are not treated as placeholders. (for https://issues.apache.org/jira/browse/LOG4J2-2032[LOG4J2-2032] by `ckozak`, Kostiantyn Shchepanovskyi)
+* Improve plugin error message when elements are missing. (for https://issues.apache.org/jira/browse/LOG4J2-2268[LOG4J2-2268] by `rgoers`, Tilman Hausherr)
* MutableLogEvent references to other objects are cleared after each use.
Fix a memory leak causing references to parameters to be held after synchronous logging with thread locals enabled. (for https://issues.apache.org/jira/browse/LOG4J2-2269[LOG4J2-2269] by `ckozak`)
-* MutableLogEvent and RingBufferLogEvent message mementos retain the original format string. (for https://issues.apache.org/jira/browse/LOG4J2-2307[LOG4J2-2307] by `ckozak`)
+* ParserConfigurationException when using Log4j with oracle.xml.jaxp.JXDocumentBuilderFactory. (for https://issues.apache.org/jira/browse/LOG4J2-2283[LOG4J2-2283] by `ggregory`, Vishnu Priya Matha)
* PoolingDriverConnectionSource does not take into account properties, user name, and password. (for https://issues.apache.org/jira/browse/LOG4J2-2300[LOG4J2-2300] by `ggregory`)
-* Fix NPE in AbstractLogger when another exception is thrown, masking the root cause. (for https://issues.apache.org/jira/browse/LOG4J2-2320[LOG4J2-2320] by `ckozak`)
+* Mixed async loggers no longer forget parameter values, providing some appenders with an array of nulls. (for https://issues.apache.org/jira/browse/LOG4J2-2301[LOG4J2-2301] by `ckozak`)
+* Make java.util.ServiceLoader properly work in OSGi by using the Service Loader Mediator Specification. (for https://issues.apache.org/jira/browse/LOG4J2-2305[LOG4J2-2305] by `rgoers`, Björn Kautler)
+* Split the SLF4J binding into 2 implementations - one for SLF4J 1.7.x and one for SLF4J 1.8+. (for https://issues.apache.org/jira/browse/LOG4J2-2305[LOG4J2-2305] by `rgoers`)
+* MutableLogEvent and RingBufferLogEvent message mementos retain the original format string. (for https://issues.apache.org/jira/browse/LOG4J2-2307[LOG4J2-2307] by `ckozak`)
+* Jackson layouts used with AsyncLoggerContextSelector output the expected format rather than only a JSON string of the message text. (for https://issues.apache.org/jira/browse/LOG4J2-2312[LOG4J2-2312] by `ckozak`)
+* If root LoggerConfig does not have a Level return ERROR. (for https://issues.apache.org/jira/browse/LOG4J2-2316[LOG4J2-2316] by `rgoers`)
+* MutableLogEvent.getNonNullImmutableMessage and Log4jLogEvent.makeMessageImmutable retain format and parameters. (for https://issues.apache.org/jira/browse/LOG4J2-2317[LOG4J2-2317] by `ckozak`)
* Messages are no longer mutated when the asynchronous queue is full. A warning is logged to the status logger instead. (for https://issues.apache.org/jira/browse/LOG4J2-2318[LOG4J2-2318] by `ckozak`)
+* Fix NPE in AbstractLogger when another exception is thrown, masking the root cause. (for https://issues.apache.org/jira/browse/LOG4J2-2320[LOG4J2-2320] by `ckozak`)
* AsyncLogger uses the correct level when unspecified. This provides parity between AsyncLogger and Logger. (for https://issues.apache.org/jira/browse/LOG4J2-2321[LOG4J2-2321] by `ckozak`)
* Custom ContextSelector implementations which select an AsyncLoggerContext disable LoggerConfig.includeLocation
by default for parity with AsyncLoggerContextSelector. (for https://issues.apache.org/jira/browse/LOG4J2-2322[LOG4J2-2322] by `ckozak`)
-* Add API org.apache.logging.log4j.core.appender.AsyncAppender.getQueueSize(). (for https://issues.apache.org/jira/browse/LOG4J2-2334[LOG4J2-2334] by `ggregory`)
-* Update Apache Commons Compress from 1.16.1 to 1.17. (for https://issues.apache.org/jira/browse/LOG4J2-2347[LOG4J2-2347] by `ggregory`)
-* Jackson layouts used with AsyncLoggerContextSelector output the expected format rather than only a JSON string of the message text. (for https://issues.apache.org/jira/browse/LOG4J2-2312[LOG4J2-2312] by `ckozak`)
+* RollingFileManager debug logging avoids string concatenation and errant braces in favor of parameterized logging. (for https://issues.apache.org/jira/browse/LOG4J2-2331[LOG4J2-2331] by `ckozak`, Mike Baranski)
* Handle errors thrown in default disruptor ExceptionHandler implementations to avoid killing background threads. (for https://issues.apache.org/jira/browse/LOG4J2-2333[LOG4J2-2333] by `ckozak`)
+* Add API org.apache.logging.log4j.core.appender.AsyncAppender.getQueueSize(). (for https://issues.apache.org/jira/browse/LOG4J2-2334[LOG4J2-2334] by `ggregory`)
* Remove duplicate hyphen from the AsyncLoggerConfig background thread name. (for https://issues.apache.org/jira/browse/LOG4J2-2336[LOG4J2-2336] by `ckozak`)
-* MutableLogEvent.getNonNullImmutableMessage and Log4jLogEvent.makeMessageImmutable retain format and parameters. (for https://issues.apache.org/jira/browse/LOG4J2-2317[LOG4J2-2317] by `ckozak`)
-* If root LoggerConfig does not have a Level return ERROR. (for https://issues.apache.org/jira/browse/LOG4J2-2316[LOG4J2-2316] by `rgoers`)
-* Fixed a memory leak in which ReusableParameterizedMessage would hold a reference to the most recently
- logged throwable and provided varargs array. (for https://issues.apache.org/jira/browse/LOG4J2-2364[LOG4J2-2364] by `ckozak`)
-* Nested logging doesn't clobber AbstractStringLayout cached StringBuilders (for https://issues.apache.org/jira/browse/LOG4J2-2368[LOG4J2-2368] by `ckozak`)
-* Update Mongodb 3 driver from 3.6.3 to 3.8.0. (for https://issues.apache.org/jira/browse/LOG4J2-2382[LOG4J2-2382] by `ggregory`)
+* The OSGi Activator specified an incorrect version. (for https://issues.apache.org/jira/browse/LOG4J2-2343[LOG4J2-2343] by `rgoers`, Raymond Augé)
+* Update Apache Commons Compress from 1.16.1 to 1.17. (for https://issues.apache.org/jira/browse/LOG4J2-2347[LOG4J2-2347] by `ggregory`)
* RingBufferLogEvent memento messages provide the expected format string, and no longer attempt to substitute parameters into curly braces in parameter toString values.
Both RingBufferLogEvent and MutableLogEvent memento implementations memoize results to avoid rebuilding formatted string values. (for https://issues.apache.org/jira/browse/LOG4J2-2352[LOG4J2-2352] by `ckozak`)
-* Fixed a memory leak in which ReusableObjectMessage would hold a reference to the most recently logged object. (for https://issues.apache.org/jira/browse/LOG4J2-2362[LOG4J2-2362] by `ckozak`)
-* Make java.util.ServiceLoader properly work in OSGi by using the Service Loader Mediator Specification. (for https://issues.apache.org/jira/browse/LOG4J2-2305[LOG4J2-2305] by `rgoers`, Björn Kautler)
-* The OSGi Activator specified an incorrect version. (for https://issues.apache.org/jira/browse/LOG4J2-2343[LOG4J2-2343] by `rgoers`, Raymond Augé)
-* ParserConfigurationException when using Log4j with oracle.xml.jaxp.JXDocumentBuilderFactory. (for https://issues.apache.org/jira/browse/LOG4J2-2283[LOG4J2-2283] by `ggregory`, Vishnu Priya Matha)
-* RollingFileManager debug logging avoids string concatenation and errant braces in favor of parameterized logging. (for https://issues.apache.org/jira/browse/LOG4J2-2331[LOG4J2-2331] by `ckozak`, Mike Baranski)
-* Improve plugin error message when elements are missing. (for https://issues.apache.org/jira/browse/LOG4J2-2268[LOG4J2-2268] by `rgoers`, Tilman Hausherr)
-* Curly braces in parameters are not treated as placeholders. (for https://issues.apache.org/jira/browse/LOG4J2-2032[LOG4J2-2032] by `ckozak`, Kostiantyn Shchepanovskyi)
* PropertiesUtil ignores non-string system properties. Fixes a NoClassDefFoundError initializing StatusLogger
caused by an NPE while initializing the static PropertiesUtil field. (for https://issues.apache.org/jira/browse/LOG4J2-2355[LOG4J2-2355] by `ckozak`, Henrik Brautaset Aronsen)
+* Fixed a memory leak in which ReusableObjectMessage would hold a reference to the most recently logged object. (for https://issues.apache.org/jira/browse/LOG4J2-2362[LOG4J2-2362] by `ckozak`)
+* Fixed a memory leak in which ReusableParameterizedMessage would hold a reference to the most recently
+ logged throwable and provided varargs array. (for https://issues.apache.org/jira/browse/LOG4J2-2364[LOG4J2-2364] by `ckozak`)
+* Nested logging doesn't clobber AbstractStringLayout cached StringBuilders (for https://issues.apache.org/jira/browse/LOG4J2-2368[LOG4J2-2368] by `ckozak`)
* StringBuilders.escapeJson implementation runs in linear time. Escaping large JSON strings
in EncodingPatternConverter and MapMessage will perform significantly better. (for https://issues.apache.org/jira/browse/LOG4J2-2373[LOG4J2-2373] by `ckozak`, Kevin Meurer)
-* ThrowableProxy was saving and retrieving cache entries using different keys. (for https://issues.apache.org/jira/browse/LOG4J2-2389[LOG4J2-2389] by `rgoers`, Liu Wen)
-* NullPointerException in org.apache.logging.log4j.util.LoaderUtil.getClassLoaders() when using Bootstrap class loader. (for https://issues.apache.org/jira/browse/LOG4J2-2377[LOG4J2-2377] by `ggregory`, Gary GregoryMirko Rzehak)
-* Fix broken links in log4j web documentation. (for https://issues.apache.org/jira/browse/LOG4J2-2390[LOG4J2-2390] by `rgoers`, anton-balaniuc)
* StringBuilders.escapeXml implementation runs in linear time. Escaping large XML strings
in EncodingPatternConverter and MapMessage will perform significantly better. (for https://issues.apache.org/jira/browse/LOG4J2-2376[LOG4J2-2376] by `ckozak`, Kevin Meurer)
+* NullPointerException in org.apache.logging.log4j.util.LoaderUtil.getClassLoaders() when using Bootstrap class loader. (for https://issues.apache.org/jira/browse/LOG4J2-2377[LOG4J2-2377] by `ggregory`, Gary GregoryMirko Rzehak)
+* Update Mongodb 3 driver from 3.6.3 to 3.8.0. (for https://issues.apache.org/jira/browse/LOG4J2-2382[LOG4J2-2382] by `ggregory`)
* Thread indefinitely blocked when logging a message in an interrupted thread. (for https://issues.apache.org/jira/browse/LOG4J2-2388[LOG4J2-2388] by `ggregory`, Failled)
+* ThrowableProxy was saving and retrieving cache entries using different keys. (for https://issues.apache.org/jira/browse/LOG4J2-2389[LOG4J2-2389] by `rgoers`, Liu Wen)
+* Fix broken links in log4j web documentation. (for https://issues.apache.org/jira/browse/LOG4J2-2390[LOG4J2-2390] by `rgoers`, anton-balaniuc)
diff --git a/src/site/asciidoc/changelog/2.11.2.adoc b/src/site/asciidoc/changelog/2.11.2.adoc
index 00936d502a..671bb2230b 100644
--- a/src/site/asciidoc/changelog/2.11.2.adoc
+++ b/src/site/asciidoc/changelog/2.11.2.adoc
@@ -100,8 +100,8 @@ For complete information on Apache Log4j 2, including instructions on how to sub
* PatternLayout %date conversion pattern should render time zone designator for ISO-ISO8601. (for https://issues.apache.org/jira/browse/LOG4J2-1246[LOG4J2-1246] by `ggregory`)
* JDBC Appender should reconnect to the database when a connection goes stale. (for https://issues.apache.org/jira/browse/LOG4J2-2496[LOG4J2-2496] by `ggregory`)
-* Allow a JDBC Appender to truncate strings to match a table's metadata column length limit. (for https://issues.apache.org/jira/browse/LOG4J2-2509[LOG4J2-2509] by `ggregory`)
* Let JDBC PoolingDriverConnectionSource with Apache Commons DBCP configure a PoolableConnectionFactory. (for https://issues.apache.org/jira/browse/LOG4J2-2505[LOG4J2-2505] by `ggregory`)
+* Allow a JDBC Appender to truncate strings to match a table's metadata column length limit. (for https://issues.apache.org/jira/browse/LOG4J2-2509[LOG4J2-2509] by `ggregory`)
=== Changed
@@ -110,54 +110,54 @@ For complete information on Apache Log4j 2, including instructions on how to sub
method to discover the current stack trace. ThrowablePatternConverter and
ExtendedThrowablePatternConverter default configurations no longer allocate
an additional buffer for stack trace contents. (for https://issues.apache.org/jira/browse/LOG4J2-2391[LOG4J2-2391] by `ckozak`)
-* Update javax.mail from 1.6.1 to 1.6.2. (for https://issues.apache.org/jira/browse/LOG4J2-2471[LOG4J2-2471] by `ggregory`)
-* Allow all Appenders to optionally carry a Property array. (for https://issues.apache.org/jira/browse/LOG4J2-2491[LOG4J2-2491] by `ggregory`)
+* Better handling of %highlight pattern when using jul-bridge. (for https://issues.apache.org/jira/browse/LOG4J2-2405[LOG4J2-2405] by `ggregory`, Marco Herrn)
* Let the NullAppender default its name to "null". (for https://issues.apache.org/jira/browse/LOG4J2-2447[LOG4J2-2447] by `ggregory`)
+* Update Jackson from 2.9.6 to 2.9.7. (for https://issues.apache.org/jira/browse/LOG4J2-2468[LOG4J2-2468] by `ggregory`)
* Update Apache Commons Compress from 1.17 to 1.18. (for https://issues.apache.org/jira/browse/LOG4J2-2469[LOG4J2-2469] by `ggregory`)
+* Update Apache Commons CSV from 1.5 to 1.6. (for https://issues.apache.org/jira/browse/LOG4J2-2470[LOG4J2-2470] by `ggregory`)
+* Update javax.mail from 1.6.1 to 1.6.2. (for https://issues.apache.org/jira/browse/LOG4J2-2471[LOG4J2-2471] by `ggregory`)
* Update mongo-java-driver 3 from 3.8.0 to 3.8.2. (for https://issues.apache.org/jira/browse/LOG4J2-2472[LOG4J2-2472] by `ggregory`)
* JDBC Appender should release parameter resources ASAP. (for https://issues.apache.org/jira/browse/LOG4J2-2489[LOG4J2-2489] by `ggregory`)
-* Update Jackson from 2.9.6 to 2.9.7. (for https://issues.apache.org/jira/browse/LOG4J2-2468[LOG4J2-2468] by `ggregory`)
-* Update Apache Commons CSV from 1.5 to 1.6. (for https://issues.apache.org/jira/browse/LOG4J2-2470[LOG4J2-2470] by `ggregory`)
+* Allow all Appenders to optionally carry a Property array. (for https://issues.apache.org/jira/browse/LOG4J2-2491[LOG4J2-2491] by `ggregory`)
* Update MongoDB driver from 3.8.2 to 3.9.0 for log4j-mongodb3 module. (for https://issues.apache.org/jira/browse/LOG4J2-2503[LOG4J2-2503] by `ggregory`)
-* Better handling of %highlight pattern when using jul-bridge. (for https://issues.apache.org/jira/browse/LOG4J2-2405[LOG4J2-2405] by `ggregory`, Marco Herrn)
=== Fixed
-* Fix memory leak in ReusableParameterizedMessage. (for https://issues.apache.org/jira/browse/LOG4J2-2201[LOG4J2-2201] by `ckozak`)
+* Logging with a lambda expression with a method call that also logs would cause logs within method call to reference line num and method name of the parent method. (for https://issues.apache.org/jira/browse/LOG4J2-1570[LOG4J2-1570] by `rgoers`)
+* Fixed Appenders section in Extending Log4j. (for https://issues.apache.org/jira/browse/LOG4J2-1571[LOG4J2-1571] by `rgoers`, torbenmoeller)
* Direct write was creating files with the wrong date/time. (for https://issues.apache.org/jira/browse/LOG4J2-1906[LOG4J2-1906] by `rgoers`)
* Expose LoggerContext.setConfiguration as a public method. (for https://issues.apache.org/jira/browse/LOG4J2-2009[LOG4J2-2009] by `rgoers`)
* Use the file pattern as the FileManager "name" when no filename is present. (for https://issues.apache.org/jira/browse/LOG4J2-2061[LOG4J2-2061] by `rgoers`)
-* Logging with a lambda expression with a method call that also logs would cause logs within method call to reference line num and method name of the parent method. (for https://issues.apache.org/jira/browse/LOG4J2-1570[LOG4J2-1570] by `rgoers`)
+* StackOverflowError at AwaitCompletionReliabilityStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2134[LOG4J2-2134] by `ggregory`, Gary GregoryDavid del Amo Mateos)
+* Fix memory leak in ReusableParameterizedMessage. (for https://issues.apache.org/jira/browse/LOG4J2-2201[LOG4J2-2201] by `ckozak`)
* Load PropertySources from any accessible ClassLoader. Hide any exceptions that may occur accessing a PropertySource. (for https://issues.apache.org/jira/browse/LOG4J2-2266[LOG4J2-2266] by `rgoers`)
-* Avoid NullPointerExceptions in org.apache.logging.log4j.core.config.AbstractConfiguration for null arguments. (for https://issues.apache.org/jira/browse/LOG4J2-2481[LOG4J2-2481] by `ggregory`)
-* Setting a null ErrorHandler on AbstractAppender is not allowed and will no-op as expected. (for https://issues.apache.org/jira/browse/LOG4J2-2441[LOG4J2-2441] by `ckozak`)
-* ErrorHandler is invoked with a LogEvent and Throwable when possible, where previously only a string was used. (for https://issues.apache.org/jira/browse/LOG4J2-2444[LOG4J2-2444] by `ckozak`)
-* CronTriggeringPolicy was not rolling properly, especially when used with the SizeBasedTriggeringPolicy. (for https://issues.apache.org/jira/browse/LOG4J2-2542[LOG4J2-2542] by `rgoers`)
-* JDBC Appender fails when using both parameter, source, and literal ColumnMapping elements. (for https://issues.apache.org/jira/browse/LOG4J2-2508[LOG4J2-2508] by `ggregory`)
-* JmsAppender reconnectIntervalMillis cannot be set from a configuration file. (for https://issues.apache.org/jira/browse/LOG4J2-2497[LOG4J2-2497] by `ggregory`)
-* Prevent ConcurrentModificationException while iterating over ListAppender events. (for https://issues.apache.org/jira/browse/LOG4J2-2527[LOG4J2-2527] by `ckozak`)
-* Document that Properties element must be the first configuration element. (for https://issues.apache.org/jira/browse/LOG4J2-2500[LOG4J2-2500] by `rgoers`)
-* JMS Appender may throw a NullPointerException when JMS is not up while the Appender is starting. (for https://issues.apache.org/jira/browse/LOG4J2-2499[LOG4J2-2499] by `ggregory`)
-* Exceptions are added to all columns when a JDBC Appender's ColumnMapping uses a Pattern. (for https://issues.apache.org/jira/browse/LOG4J2-2413[LOG4J2-2413] by `ggregory`, Gary GregoryAndres Luuk)
+* ReusableObjectMessage parameter is properly passed to appenders (#203). (for https://issues.apache.org/jira/browse/LOG4J2-2363[LOG4J2-2363] by `ckozak`, Brian Laub)
* NameAbbreviator correctly abbreviates first fragments (#188). (for https://issues.apache.org/jira/browse/LOG4J2-2365[LOG4J2-2365] by `ckozak`, Eugene Zimichev)
* Pre-deployment of PersistenceUnit that using Log4j as session logger failed (#198). (for https://issues.apache.org/jira/browse/LOG4J2-2397[LOG4J2-2397] by `ggregory`, EckelDong)
-* ReusableObjectMessage parameter is properly passed to appenders (#203). (for https://issues.apache.org/jira/browse/LOG4J2-2363[LOG4J2-2363] by `ckozak`, Brian Laub)
-* ColumnMapping literal not working. (for https://issues.apache.org/jira/browse/LOG4J2-2466[LOG4J2-2466] by `ggregory`, Gary GregoryPaolo Bonanomi)
-* Handle some unchecked exceptions while loading plugins. (for https://issues.apache.org/jira/browse/LOG4J2-2422[LOG4J2-2422] by `ggregory`, Gary Gregoryrswart)
+* Exceptions are added to all columns when a JDBC Appender's ColumnMapping uses a Pattern. (for https://issues.apache.org/jira/browse/LOG4J2-2413[LOG4J2-2413] by `ggregory`, Gary GregoryAndres Luuk)
* NullPointerException when closing never used RollingRandomAccessFileAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2418[LOG4J2-2418] by `ggregory`, Jonas Rutishauser)
-* RollingRandomAccessFileManager ignores new file patterns from programmatic reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-2457[LOG4J2-2457] by `ggregory`, Gary GregoryHeiko Schwanke)
-* Fixed Appenders section in Extending Log4j. (for https://issues.apache.org/jira/browse/LOG4J2-1571[LOG4J2-1571] by `rgoers`, torbenmoeller)
-* StackOverflowError at AwaitCompletionReliabilityStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2134[LOG4J2-2134] by `ggregory`, Gary GregoryDavid del Amo Mateos)
+* Handle some unchecked exceptions while loading plugins. (for https://issues.apache.org/jira/browse/LOG4J2-2422[LOG4J2-2422] by `ggregory`, Gary Gregoryrswart)
+* Setting a null ErrorHandler on AbstractAppender is not allowed and will no-op as expected. (for https://issues.apache.org/jira/browse/LOG4J2-2441[LOG4J2-2441] by `ckozak`)
+* ErrorHandler is invoked with a LogEvent and Throwable when possible, where previously only a string was used. (for https://issues.apache.org/jira/browse/LOG4J2-2444[LOG4J2-2444] by `ckozak`)
* Add Log4j-slf4j18-impl dependency to BOM POM. (for https://issues.apache.org/jira/browse/LOG4J2-2453[LOG4J2-2453] by `rgoers`, theit)
+* RollingRandomAccessFileManager ignores new file patterns from programmatic reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-2457[LOG4J2-2457] by `ggregory`, Gary GregoryHeiko Schwanke)
+* ColumnMapping literal not working. (for https://issues.apache.org/jira/browse/LOG4J2-2466[LOG4J2-2466] by `ggregory`, Gary GregoryPaolo Bonanomi)
* org.apache.log4j.SimpleLayout and ConsoleAppender missing in log4j-1.2-api. (for https://issues.apache.org/jira/browse/LOG4J2-2476[LOG4J2-2476] by `ggregory`, Al Bundy)
+* AbstractStringLayoutStringEncodingBenchmark returns the computed variables on each benchmark to avoid DCE. (for https://issues.apache.org/jira/browse/LOG4J2-2478[LOG4J2-2478] by `ckozak`, Diego Elias Costa)
+* Avoid NullPointerExceptions in org.apache.logging.log4j.core.config.AbstractConfiguration for null arguments. (for https://issues.apache.org/jira/browse/LOG4J2-2481[LOG4J2-2481] by `ggregory`)
* BasicContextSelector cannot be used in a OSGI application. (for https://issues.apache.org/jira/browse/LOG4J2-2482[LOG4J2-2482] by `ggregory`, Rob Gansevles)
+* SizeBasedTriggeringPolicy was not honored when using the DirectWriteRolloverStrategy if the machine restarts. (for https://issues.apache.org/jira/browse/LOG4J2-2485[LOG4J2-2485] by `rgoers`, Giovanni Matteo Fumarola)
+* JmsAppender reconnectIntervalMillis cannot be set from a configuration file. (for https://issues.apache.org/jira/browse/LOG4J2-2497[LOG4J2-2497] by `ggregory`)
+* JMS Appender may throw a NullPointerException when JMS is not up while the Appender is starting. (for https://issues.apache.org/jira/browse/LOG4J2-2499[LOG4J2-2499] by `ggregory`)
+* Document that Properties element must be the first configuration element. (for https://issues.apache.org/jira/browse/LOG4J2-2500[LOG4J2-2500] by `rgoers`)
+* JDBC Appender fails when using both parameter, source, and literal ColumnMapping elements. (for https://issues.apache.org/jira/browse/LOG4J2-2508[LOG4J2-2508] by `ggregory`)
+* Make Strings.toRootUpperCase a static method so it can be accessed. (for https://issues.apache.org/jira/browse/LOG4J2-2514[LOG4J2-2514] by `rgoers`, smilebrian0515)
* Configuration documentation referenced incorrect method name. (for https://issues.apache.org/jira/browse/LOG4J2-2515[LOG4J2-2515] by `rgoers`, MakarovS)
* Fix regression using MapMessageLookup.lookup with MapMessages that do not implement StringMapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-2522[LOG4J2-2522] by `ckozak`, Adam Lesiak)
+* Prevent ConcurrentModificationException while iterating over ListAppender events. (for https://issues.apache.org/jira/browse/LOG4J2-2527[LOG4J2-2527] by `ckozak`)
* Generalize checks using MapMessage implementations with do not extend StringMapMessage.
Introduce new JAVA_UNQUOTED MapMessage format type based on the JAVA formatting, but without
quoted values. (for https://issues.apache.org/jira/browse/LOG4J2-2530[LOG4J2-2530] by `ckozak`, Travis Spencer)
* Fix a regression introduced by LOG4J2-2301 in 2.11.1 allowing allocation to occur in AsyncLoggerConfig. (for https://issues.apache.org/jira/browse/LOG4J2-2533[LOG4J2-2533] by `ckozak`, Michail Prusakov)
-* AbstractStringLayoutStringEncodingBenchmark returns the computed variables on each benchmark to avoid DCE. (for https://issues.apache.org/jira/browse/LOG4J2-2478[LOG4J2-2478] by `ckozak`, Diego Elias Costa)
-* SizeBasedTriggeringPolicy was not honored when using the DirectWriteRolloverStrategy if the machine restarts. (for https://issues.apache.org/jira/browse/LOG4J2-2485[LOG4J2-2485] by `rgoers`, Giovanni Matteo Fumarola)
-* Make Strings.toRootUpperCase a static method so it can be accessed. (for https://issues.apache.org/jira/browse/LOG4J2-2514[LOG4J2-2514] by `rgoers`, smilebrian0515)
+* CronTriggeringPolicy was not rolling properly, especially when used with the SizeBasedTriggeringPolicy. (for https://issues.apache.org/jira/browse/LOG4J2-2542[LOG4J2-2542] by `rgoers`)
* Add Log4j-to-SLF4J to BOM pom.xml. (for https://issues.apache.org/jira/browse/LOG4J2-2543[LOG4J2-2543] by `rgoers`, Dermot Hardy)
diff --git a/src/site/asciidoc/changelog/2.12.0.adoc b/src/site/asciidoc/changelog/2.12.0.adoc
index c5f399bfd0..1a1b2e0890 100644
--- a/src/site/asciidoc/changelog/2.12.0.adoc
+++ b/src/site/asciidoc/changelog/2.12.0.adoc
@@ -57,47 +57,47 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
+* Allow custom end-of-line with JsonLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2337[LOG4J2-2337] by `ggregory`, Patrice FerrotArvind Sahare)
+* Allow zero padding the counter of a RollingFileAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2403[LOG4J2-2403] by `rgoers`, hupfdule)
* Add reconfiguration methods to Configurator. (for https://issues.apache.org/jira/browse/LOG4J2-2406[LOG4J2-2406] by `rgoers`)
+* Add filter that will match events when no marker is present. (for https://issues.apache.org/jira/browse/LOG4J2-2427[LOG4J2-2427] by `rgoers`, Rimaljit Kaur)
* TCP Appender should support a host name resolving to multiple IP addresses. (for https://issues.apache.org/jira/browse/LOG4J2-2586[LOG4J2-2586] by `rgoers`)
+* GZIP compression on rollover supports configurable compression levels. (for https://issues.apache.org/jira/browse/LOG4J2-2598[LOG4J2-2598] by `ckozak`, Carter Kozak)
* AsyncQueueFullPolicy configuration short values "Default" and "Discard" are case-insensitive to avoid confusion. (for https://issues.apache.org/jira/browse/LOG4J2-2611[LOG4J2-2611] by `ckozak`)
* Add and use method org.apache.logging.log4j.message.MapMessage.toKey(String) for simpler subclasses. (for https://issues.apache.org/jira/browse/LOG4J2-2634[LOG4J2-2634] by `ggregory`)
* Add support for reconfiguration via HTTP(S), Docker, and Spring Cloud Configuration. (for https://issues.apache.org/jira/browse/LOG4J2-913[LOG4J2-913] by `rgoers`)
-* Allow zero padding the counter of a RollingFileAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2403[LOG4J2-2403] by `rgoers`, hupfdule)
-* Allow custom end-of-line with JsonLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2337[LOG4J2-2337] by `ggregory`, Patrice FerrotArvind Sahare)
-* Add filter that will match events when no marker is present. (for https://issues.apache.org/jira/browse/LOG4J2-2427[LOG4J2-2427] by `rgoers`, Rimaljit Kaur)
-* GZIP compression on rollover supports configurable compression levels. (for https://issues.apache.org/jira/browse/LOG4J2-2598[LOG4J2-2598] by `ckozak`, Carter Kozak)
=== Changed
-* Update tests from H2 1.4.197 to 1.4.199. (by `ggregory`)
+* Update Jackson from 2.9.7 to 2.9.8. (for https://issues.apache.org/jira/browse/LOG4J2-2570[LOG4J2-2570] by `ggregory`, Gary Gregory)
+* Update MongoDB 3 module driver from 3.9.0 to 3.10.1. (for https://issues.apache.org/jira/browse/LOG4J2-2574[LOG4J2-2574] by `ggregory`, Gary Gregory)
* Update Jackson from 2.9.8 to 2.9.9. (for https://issues.apache.org/jira/browse/LOG4J2-2619[LOG4J2-2619] by `ggregory`)
* Refactor several AsyncLogger methods below the 35 byte threshold for inlining. (for https://issues.apache.org/jira/browse/LOG4J2-2634[LOG4J2-2634] by `ckozak`)
-* Update MongoDB 3 module driver from 3.9.0 to 3.10.1. (for https://issues.apache.org/jira/browse/LOG4J2-2574[LOG4J2-2574] by `ggregory`, Gary Gregory)
-* Update Jackson from 2.9.7 to 2.9.8. (for https://issues.apache.org/jira/browse/LOG4J2-2570[LOG4J2-2570] by `ggregory`, Gary Gregory)
+* Update tests from H2 1.4.197 to 1.4.199. (by `ggregory`)
=== Fixed
-* NullPointerException at org.apache.logging.log4j.core.appender.db.jdbc.JdbcDatabaseManager.writeInternal(JdbcDatabaseManager.java:803). (for https://issues.apache.org/jira/browse/LOG4J2-2612[LOG4J2-2612] by `ggregory`)
-* Update file time when size based triggering policy is used without a time-based triggering policy. (for https://issues.apache.org/jira/browse/LOG4J2-2602[LOG4J2-2602] by `rgoers`)
-* Asynchronous logging when the queue is full no longer results in heavy CPU utilization and low throughput. (for https://issues.apache.org/jira/browse/LOG4J2-2606[LOG4J2-2606] by `ckozak`)
-* Restore constructor to ThrowablePatternConverter that was removed in 2.8.2. (for https://issues.apache.org/jira/browse/LOG4J2-2616[LOG4J2-2616] by `rgoers`)
+* FailoverAppender was failing with ERROR appender Failover has no parameter that matches element Failovers. (for https://issues.apache.org/jira/browse/LOG4J2-1103[LOG4J2-1103] by `rgoers`, Seán Dunne)
+* Lookups were not found if the plugin key was not lower case. (for https://issues.apache.org/jira/browse/LOG4J2-1143[LOG4J2-1143] by `rgoers`, Pascal Heinrich)
+* Locate plugins within a Jar using a URL Connection. (for https://issues.apache.org/jira/browse/LOG4J2-1852[LOG4J2-1852] by `rgoers`, Tanner Altares)
+* RollingRandomAccessFileAppender error message referenced incorrect class name. (for https://issues.apache.org/jira/browse/LOG4J2-2547[LOG4J2-2547] by `rgoers`)
+* NullPointerException in JdbcAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-2559[LOG4J2-2559] by `ggregory`, Gary GregoryLi Lei)
+* JEP223 version detection fix for JDK 9 and up. (for https://issues.apache.org/jira/browse/LOG4J2-2561[LOG4J2-2561] by `rgoers`, Ulrich Enslin)
* MapPatternConverter is properly created from the '%K', '%map', and '%MAP' patterns.
PatternConverter instanceOf methods with unknown parameter types no longer elide those with known parameters. (for https://issues.apache.org/jira/browse/LOG4J2-2564[LOG4J2-2564] by `ckozak`)
+* StackOverflowException when server not reachable with SocketAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2592[LOG4J2-2592] by `ggregory`, Gary GregoryDávid Kaya)
* Throw better exception message when both log4j-slf4j-impl and log4j-to-slf4j are present. (for https://issues.apache.org/jira/browse/LOG4J2-2597[LOG4J2-2597] by `rgoers`)
-* Possible ClassCastException in org.apache.logging.log4j.core.script.ScriptManager.ScriptManager(Configuration, WatchManager) (for https://issues.apache.org/jira/browse/LOG4J2-2618[LOG4J2-2618] by `ggregory`)
+* java.lang.StackOverflowError at org.apache.logging.log4j.junit.AbstractExternalFileCleaner.println(AbstractExternalFileCleaner.java:169). (for https://issues.apache.org/jira/browse/LOG4J2-2598[LOG4J2-2598] by `ggregory`, Gary Gregory)
+* Update file time when size based triggering policy is used without a time-based triggering policy. (for https://issues.apache.org/jira/browse/LOG4J2-2602[LOG4J2-2602] by `rgoers`)
+* Asynchronous logging when the queue is full no longer results in heavy CPU utilization and low throughput. (for https://issues.apache.org/jira/browse/LOG4J2-2606[LOG4J2-2606] by `ckozak`)
* Explicitly set file creation time. (for https://issues.apache.org/jira/browse/LOG4J2-2610[LOG4J2-2610] by `rgoers`)
-* RollingRandomAccessFileAppender error message referenced incorrect class name. (for https://issues.apache.org/jira/browse/LOG4J2-2547[LOG4J2-2547] by `rgoers`)
+* NullPointerException at org.apache.logging.log4j.core.appender.db.jdbc.JdbcDatabaseManager.writeInternal(JdbcDatabaseManager.java:803). (for https://issues.apache.org/jira/browse/LOG4J2-2612[LOG4J2-2612] by `ggregory`)
+* Restore constructor to ThrowablePatternConverter that was removed in 2.8.2. (for https://issues.apache.org/jira/browse/LOG4J2-2616[LOG4J2-2616] by `rgoers`)
+* Possible ClassCastException in org.apache.logging.log4j.core.script.ScriptManager.ScriptManager(Configuration, WatchManager) (for https://issues.apache.org/jira/browse/LOG4J2-2618[LOG4J2-2618] by `ggregory`)
* StructuredDataId was ignoring maxLength attribute. (for https://issues.apache.org/jira/browse/LOG4J2-2622[LOG4J2-2622] by `rgoers`)
+* Fix a race allowing events not to be recorded when a RoutingAppender purge policy attempts to delete an idle
+ appender at exactly the same time as a new event is recorded. (for https://issues.apache.org/jira/browse/LOG4J2-2629[LOG4J2-2629] by `ckozak`)
* RoutingAppender PurgePolicy implementations no longer stop appenders referenced from the logger configuration,
only those that have been created by the RoutingAppender. Note that RoutingAppender.getAppenders no longer
includes entries for referenced appenders, only those which it has created. (for https://issues.apache.org/jira/browse/LOG4J2-2631[LOG4J2-2631] by `ckozak`)
* RFC5424Layout was not properly setting default Structured Element id for the MDC (for https://issues.apache.org/jira/browse/LOG4J2-2636[LOG4J2-2636] by `rgoers`)
-* Fix a race allowing events not to be recorded when a RoutingAppender purge policy attempts to delete an idle
- appender at exactly the same time as a new event is recorded. (for https://issues.apache.org/jira/browse/LOG4J2-2629[LOG4J2-2629] by `ckozak`)
-* Lookups were not found if the plugin key was not lower case. (for https://issues.apache.org/jira/browse/LOG4J2-1143[LOG4J2-1143] by `rgoers`, Pascal Heinrich)
-* Locate plugins within a Jar using a URL Connection. (for https://issues.apache.org/jira/browse/LOG4J2-1852[LOG4J2-1852] by `rgoers`, Tanner Altares)
-* FailoverAppender was failing with ERROR appender Failover has no parameter that matches element Failovers. (for https://issues.apache.org/jira/browse/LOG4J2-1103[LOG4J2-1103] by `rgoers`, Seán Dunne)
-* NullPointerException in JdbcAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-2559[LOG4J2-2559] by `ggregory`, Gary GregoryLi Lei)
-* StackOverflowException when server not reachable with SocketAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2592[LOG4J2-2592] by `ggregory`, Gary GregoryDávid Kaya)
-* JEP223 version detection fix for JDK 9 and up. (for https://issues.apache.org/jira/browse/LOG4J2-2561[LOG4J2-2561] by `rgoers`, Ulrich Enslin)
-* java.lang.StackOverflowError at org.apache.logging.log4j.junit.AbstractExternalFileCleaner.println(AbstractExternalFileCleaner.java:169). (for https://issues.apache.org/jira/browse/LOG4J2-2598[LOG4J2-2598] by `ggregory`, Gary Gregory)
diff --git a/src/site/asciidoc/changelog/2.12.1.adoc b/src/site/asciidoc/changelog/2.12.1.adoc
index 03a673fa56..caa51f7d4a 100644
--- a/src/site/asciidoc/changelog/2.12.1.adoc
+++ b/src/site/asciidoc/changelog/2.12.1.adoc
@@ -57,17 +57,17 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Changed
* Make Log4j Core optional for Log4j 1.2 API. (for https://issues.apache.org/jira/browse/LOG4J2-2556[LOG4J2-2556] by `rgoers`)
-* Retry when JDBC throws a java.sql.SQLTransactionRollbackException in commitAndClose(). (for https://issues.apache.org/jira/browse/LOG4J2-2660[LOG4J2-2660] by `ggregory`)
* Update MongoDB 3 driver from 3.10.1 to 3.10.2. (for https://issues.apache.org/jira/browse/LOG4J2-2646[LOG4J2-2646] by `ggregory`)
* Improve exception messages in the JDBC appender. (for https://issues.apache.org/jira/browse/LOG4J2-2657[LOG4J2-2657] by `ggregory`)
+* Retry when JDBC throws a java.sql.SQLTransactionRollbackException in commitAndClose(). (for https://issues.apache.org/jira/browse/LOG4J2-2660[LOG4J2-2660] by `ggregory`)
=== Fixed
-* Improve the performance of capturing location information. (for https://issues.apache.org/jira/browse/LOG4J2-2644[LOG4J2-2644] by `rgoers`)
+* Allow file renames to work when files are missing from the sequence. (for https://issues.apache.org/jira/browse/LOG4J2-1946[LOG4J2-1946] by `rgoers`, Igor Perelyotov)
* Remove references to LoggerContext when it is shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-2366[LOG4J2-2366] by `rgoers`)
-* AbstractAction handles and records unchecked RuntimeException and Error in addition to IOException. (for https://issues.apache.org/jira/browse/LOG4J2-2659[LOG4J2-2659] by `ckozak`)
+* Improve the performance of capturing location information. (for https://issues.apache.org/jira/browse/LOG4J2-2644[LOG4J2-2644] by `rgoers`)
+* Support emulating a MAC address when using ipv6. (for https://issues.apache.org/jira/browse/LOG4J2-2650[LOG4J2-2650] by `rgoers`, Mattia Bertorello)
* AbstractAction.reportException records a warning to the status logger, providing more information when file
based appenders fail to compress rolled data asynchronously. (for https://issues.apache.org/jira/browse/LOG4J2-2658[LOG4J2-2658] by `ckozak`)
-* Allow file renames to work when files are missing from the sequence. (for https://issues.apache.org/jira/browse/LOG4J2-1946[LOG4J2-1946] by `rgoers`, Igor Perelyotov)
+* AbstractAction handles and records unchecked RuntimeException and Error in addition to IOException. (for https://issues.apache.org/jira/browse/LOG4J2-2659[LOG4J2-2659] by `ckozak`)
* "Values not bound to statement" when using JDBC appender, appender does not respect bufferSize="0". (for https://issues.apache.org/jira/browse/LOG4J2-2667[LOG4J2-2667] by `ggregory`, Edith ChuiGary Gregory)
-* Support emulating a MAC address when using ipv6. (for https://issues.apache.org/jira/browse/LOG4J2-2650[LOG4J2-2650] by `rgoers`, Mattia Bertorello)
diff --git a/src/site/asciidoc/changelog/2.13.0.adoc b/src/site/asciidoc/changelog/2.13.0.adoc
index aa54fc89bb..a8116d4f43 100644
--- a/src/site/asciidoc/changelog/2.13.0.adoc
+++ b/src/site/asciidoc/changelog/2.13.0.adoc
@@ -63,13 +63,13 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
* Add builder pattern to Logger interface. (for https://issues.apache.org/jira/browse/LOG4J2-2639[LOG4J2-2639] by `rgoers`)
-* Add a Level Pattern Selector. (for https://issues.apache.org/jira/browse/LOG4J2-2731[LOG4J2-2731] by `rgoers`)
-* Add experimental support for Log4j 1 configuration files. (for https://issues.apache.org/jira/browse/LOG4J2-63[LOG4J2-63] by `rgoers`)
-* Add the ability to lookup Kubernetes attributes in the Log4j configuration. Allow Log4j properties to
- be retrieved from the Spring environment if it is available. (for https://issues.apache.org/jira/browse/LOG4J2-2716[LOG4J2-2716] by `rgoers`)
* Allow Spring Boot application properties to be accessed in the Log4j 2 configuration. Add
lower and upper case Lookups. (for https://issues.apache.org/jira/browse/LOG4J2-2710[LOG4J2-2710] by `rgoers`)
+* Add the ability to lookup Kubernetes attributes in the Log4j configuration. Allow Log4j properties to
+ be retrieved from the Spring environment if it is available. (for https://issues.apache.org/jira/browse/LOG4J2-2716[LOG4J2-2716] by `rgoers`)
+* Add a Level Pattern Selector. (for https://issues.apache.org/jira/browse/LOG4J2-2731[LOG4J2-2731] by `rgoers`)
* Add ThreadContext.putIfNotNull method. (for https://issues.apache.org/jira/browse/LOG4J2-2732[LOG4J2-2732] by `rgoers`, Matt Pavlovich)
+* Add experimental support for Log4j 1 configuration files. (for https://issues.apache.org/jira/browse/LOG4J2-63[LOG4J2-63] by `rgoers`)
=== Changed
@@ -79,18 +79,18 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
-* @PluginValue does not support attribute names besides "value". (for https://issues.apache.org/jira/browse/LOG4J2-2693[LOG4J2-2693] by `mattsicker`)
* Prevent recursive calls to java.util.LogManager.getLogger(). (for https://issues.apache.org/jira/browse/LOG4J2-2058[LOG4J2-2058] by `rgoers`)
+* Wrong java version check in ThreadNameCachingStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2635[LOG4J2-2635] by `rgoers`, Filipp Gunbin)
* Validation blocks definition of script in properties configuration. (for https://issues.apache.org/jira/browse/LOG4J2-2647[LOG4J2-2647] by `mattsicker`)
-* The rolling file appenders would fail to compress the file after rollover if the file name matched the
- file pattern. (for https://issues.apache.org/jira/browse/LOG4J2-2712[LOG4J2-2712] by `rgoers`)
-* Use a less confusing name for the CompositeConfiguration source. (for https://issues.apache.org/jira/browse/LOG4J2-2674[LOG4J2-2674] by `rgoers`, Anton Korenkov)
+* Add automatic module names where missing. (for https://issues.apache.org/jira/browse/LOG4J2-2672[LOG4J2-2672] by `rgoers`, Stephen Colebourne)
* OutputStreamAppender.Builder ignores setFilter(). (for https://issues.apache.org/jira/browse/LOG4J2-2673[LOG4J2-2673] by `ggregory`, Yuichi Sugimura)
+* Use a less confusing name for the CompositeConfiguration source. (for https://issues.apache.org/jira/browse/LOG4J2-2674[LOG4J2-2674] by `rgoers`, Anton Korenkov)
* Set result of rename action to true if file was copied. (for https://issues.apache.org/jira/browse/LOG4J2-2680[LOG4J2-2680] by `rgoers`, Guillermo Xavier Hurtado Garcia)
-* Wrong java version check in ThreadNameCachingStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2635[LOG4J2-2635] by `rgoers`, Filipp Gunbin)
-* Add automatic module names where missing. (for https://issues.apache.org/jira/browse/LOG4J2-2672[LOG4J2-2672] by `rgoers`, Stephen Colebourne)
-* Prevent a memory leak when async loggers throw errors. (for https://issues.apache.org/jira/browse/LOG4J2-2725[LOG4J2-2725] by `ckozak`, Dzmitry Anikechanka)
+* @PluginValue does not support attribute names besides "value". (for https://issues.apache.org/jira/browse/LOG4J2-2693[LOG4J2-2693] by `mattsicker`)
* ArrayIndexOutOfBoundsException could occur with MAC address longer than 6 bytes. (for https://issues.apache.org/jira/browse/LOG4J2-2707[LOG4J2-2707] by `rgoers`, Christian Frank)
-* Add setKey method to Kafka Appender Builder. (for https://issues.apache.org/jira/browse/LOG4J2-2727[LOG4J2-2727] by `rgoers`, Clément Mathieu)
+* The rolling file appenders would fail to compress the file after rollover if the file name matched the
+ file pattern. (for https://issues.apache.org/jira/browse/LOG4J2-2712[LOG4J2-2712] by `rgoers`)
* LOG4J2-2725 - Added try/finally around event.execute() for RingBufferLogEventHandler to clear memory
correctly in case of exception/error (for https://issues.apache.org/jira/browse/LOG4J2-2725[LOG4J2-2725] by `ckozak`, Dzmitry Anikechanka)
+* Prevent a memory leak when async loggers throw errors. (for https://issues.apache.org/jira/browse/LOG4J2-2725[LOG4J2-2725] by `ckozak`, Dzmitry Anikechanka)
+* Add setKey method to Kafka Appender Builder. (for https://issues.apache.org/jira/browse/LOG4J2-2727[LOG4J2-2727] by `rgoers`, Clément Mathieu)
diff --git a/src/site/asciidoc/changelog/2.13.1.adoc b/src/site/asciidoc/changelog/2.13.1.adoc
index 131b90ff4f..edc2a9ff0c 100644
--- a/src/site/asciidoc/changelog/2.13.1.adoc
+++ b/src/site/asciidoc/changelog/2.13.1.adoc
@@ -55,41 +55,41 @@ For complete information on Apache Log4j 2, including instructions on how to sub
* Update log4j-slf4j18-impl slf4j version to 1.8.0-beta4 from 1.8.0-alpha2. (for https://issues.apache.org/jira/browse/LOG4J2-2745[LOG4J2-2745] by `ckozak`)
* Update dependencies. (for https://issues.apache.org/jira/browse/LOG4J2-2763[LOG4J2-2763] by `ggregory`)
+* Add a retry count attribute to the KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2777[LOG4J2-2777] by `rgoers`, joongs4)
* Use LinkedBlockingQueue instead of synchronized collection in StatusConfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-2782[LOG4J2-2782] by `rgoers`)
* Conditionally perform status logging calculations in PluginRegistry. (for https://issues.apache.org/jira/browse/LOG4J2-2789[LOG4J2-2789] by `rgoers`, Marius Volkhart)
-* Add a retry count attribute to the KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2777[LOG4J2-2777] by `rgoers`, joongs4)
=== Fixed
-* Allow Lookup keys with leading dashes by using a slash as an escape character. (for https://issues.apache.org/jira/browse/LOG4J2-2211[LOG4J2-2211] by `rgoers`)
-* ClassLoaderContextSelector was not locating the LoggerContext during shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-2746[LOG4J2-2746] by `rgoers`)
-* Remove unnecessary EventLogger references from log4j-slf4j18-impl due to removal from slf4j. (for https://issues.apache.org/jira/browse/LOG4J2-2744[LOG4J2-2744] by `ckozak`)
-* Rollover handles parallel file deletion gracefully. (for https://issues.apache.org/jira/browse/LOG4J2-2677[LOG4J2-2677] by `ckozak`)
* Rollover fails when file matches pattern but index is too large. (for https://issues.apache.org/jira/browse/LOG4J2-2039[LOG4J2-2039] by `rgoers`)
-* Fix a memory leak using fully asynchronous logging when the queue is full using the 'discard' asynchronous queue full strategy. (for https://issues.apache.org/jira/browse/LOG4J2-2747[LOG4J2-2747] by `ckozak`)
+* Allow Lookup keys with leading dashes by using a slash as an escape character. (for https://issues.apache.org/jira/browse/LOG4J2-2211[LOG4J2-2211] by `rgoers`)
+* Fix lock contention in the classloader using new versions of slf4j without EventData on slf4j logger creation. (for https://issues.apache.org/jira/browse/LOG4J2-2415[LOG4J2-2415] by `ckozak`, Andrey Turbanov)
+* CronExpression.getBeforeTime() would sometimes return incorrect result. (for https://issues.apache.org/jira/browse/LOG4J2-2575[LOG4J2-2575] by `rgoers`, Nathan Friess)
* GraalVM does not allow use of MethodHandles. (for https://issues.apache.org/jira/browse/LOG4J2-2649[LOG4J2-2649] by `rgoers`)
+* JSON output wrong when using additional fields. (for https://issues.apache.org/jira/browse/LOG4J2-2652[LOG4J2-2652] by `rgoers`)
+* PluginProcessor should use Messager instead of System.out. (for https://issues.apache.org/jira/browse/LOG4J2-2676[LOG4J2-2676] by `rgoers`, Gregg Donovan)
+* Rollover handles parallel file deletion gracefully. (for https://issues.apache.org/jira/browse/LOG4J2-2677[LOG4J2-2677] by `ckozak`)
+* MapMessage.getFormattedMessage() would incorrectly format objects. (for https://issues.apache.org/jira/browse/LOG4J2-2703[LOG4J2-2703] by `rgoers`, Volkan Yazici)
* Slow initialization on Windows due to accessing network interfaces. (for https://issues.apache.org/jira/browse/LOG4J2-2717[LOG4J2-2717] by `rgoers`)
+* PluginCache output is reproducible allowing the annotation processor to produce deterministic results. (for https://issues.apache.org/jira/browse/LOG4J2-2735[LOG4J2-2735] by `ckozak`, Andy Wilkinson)
* Fix erroneous log4j-jul recursive logger detection resulting in some no-op JUL loggers and 'WARN Recursive call to getLogger' being reported by the status logger. (for https://issues.apache.org/jira/browse/LOG4J2-2739[LOG4J2-2739] by `ckozak`)
-* JSON output wrong when using additional fields. (for https://issues.apache.org/jira/browse/LOG4J2-2652[LOG4J2-2652] by `rgoers`)
-* [JDBC] MS-SQL Server JDBC driver throws SQLServerException when inserting a null value for a VARBINARY column. (for https://issues.apache.org/jira/browse/LOG4J2-2762[LOG4J2-2762] by `ggregory`)
-* RollingFileAppender was not rolling on startup if createOnDemand was set to true. (for https://issues.apache.org/jira/browse/LOG4J2-2759[LOG4J2-2759] by `rgoers`)
-* Warn if pattern is missing on Routes element. Use default route. (for https://issues.apache.org/jira/browse/LOG4J2-2767[LOG4J2-2767] by `rgoers`)
+* Remove unnecessary EventLogger references from log4j-slf4j18-impl due to removal from slf4j. (for https://issues.apache.org/jira/browse/LOG4J2-2744[LOG4J2-2744] by `ckozak`)
+* ClassLoaderContextSelector was not locating the LoggerContext during shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-2746[LOG4J2-2746] by `rgoers`)
+* Fix a memory leak using fully asynchronous logging when the queue is full using the 'discard' asynchronous queue full strategy. (for https://issues.apache.org/jira/browse/LOG4J2-2747[LOG4J2-2747] by `ckozak`)
* Fix StackLocator.getCallerClass performance in cases where Reflection.getCallerClass is not accessible. (for https://issues.apache.org/jira/browse/LOG4J2-2751[LOG4J2-2751] by `ckozak`)
* MutableLogEvent and RingBufferLogEvent avoid StringBuffer and parameter array allocation unless reusable messages are used. (for https://issues.apache.org/jira/browse/LOG4J2-2752[LOG4J2-2752] by `ckozak`)
-* Do not log an error if Files.move does not work. (for https://issues.apache.org/jira/browse/LOG4J2-2769[LOG4J2-2769] by `rgoers`)
* LoaderUtil.getClassLoaders may discover additional loaders and no longer erroneously returns a result with a null element in some environments. (for https://issues.apache.org/jira/browse/LOG4J2-2754[LOG4J2-2754] by `ckozak`)
* Prevent LoggerContext from being garbage collected while being created. (for https://issues.apache.org/jira/browse/LOG4J2-2756[LOG4J2-2756] by `rgoers`)
-* Counter stuck at 10 and overwriting files when leading zeros used in the file pattern count. (for https://issues.apache.org/jira/browse/LOG4J2-2784[LOG4J2-2784] by `rgoers`)
-* Fixed NullPointerException after reconfiguring via JMX. (for https://issues.apache.org/jira/browse/LOG4J2-2770[LOG4J2-2770] by `rgoers`, Bill Kuker)
-* PluginCache output is reproducible allowing the annotation processor to produce deterministic results. (for https://issues.apache.org/jira/browse/LOG4J2-2735[LOG4J2-2735] by `ckozak`, Andy Wilkinson)
-* MapMessage.getFormattedMessage() would incorrectly format objects. (for https://issues.apache.org/jira/browse/LOG4J2-2703[LOG4J2-2703] by `rgoers`, Volkan Yazici)
-* PluginProcessor should use Messager instead of System.out. (for https://issues.apache.org/jira/browse/LOG4J2-2676[LOG4J2-2676] by `rgoers`, Gregg Donovan)
-* Add multi-parameter overloads to LogBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-2768[LOG4J2-2768] by `rgoers`, Marius Volkhart)
-* CronExpression.getBeforeTime() would sometimes return incorrect result. (for https://issues.apache.org/jira/browse/LOG4J2-2575[LOG4J2-2575] by `rgoers`, Nathan Friess)
-* Fix lock contention in the classloader using new versions of slf4j without EventData on slf4j logger creation. (for https://issues.apache.org/jira/browse/LOG4J2-2415[LOG4J2-2415] by `ckozak`, Andrey Turbanov)
-* Always write header on a new OutputStream. (for https://issues.apache.org/jira/browse/LOG4J2-2760[LOG4J2-2760] by `rgoers`, Christoph Kaser)
* NullPointerException when using a custom DirectFileRolloverStrategy without a file name. (for https://issues.apache.org/jira/browse/LOG4J2-2758[LOG4J2-2758] by `rgoers`, Christoph Kaser)
+* RollingFileAppender was not rolling on startup if createOnDemand was set to true. (for https://issues.apache.org/jira/browse/LOG4J2-2759[LOG4J2-2759] by `rgoers`)
+* Always write header on a new OutputStream. (for https://issues.apache.org/jira/browse/LOG4J2-2760[LOG4J2-2760] by `rgoers`, Christoph Kaser)
+* [JDBC] MS-SQL Server JDBC driver throws SQLServerException when inserting a null value for a VARBINARY column. (for https://issues.apache.org/jira/browse/LOG4J2-2762[LOG4J2-2762] by `ggregory`)
+* Warn if pattern is missing on Routes element. Use default route. (for https://issues.apache.org/jira/browse/LOG4J2-2767[LOG4J2-2767] by `rgoers`)
+* Add multi-parameter overloads to LogBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-2768[LOG4J2-2768] by `rgoers`, Marius Volkhart)
+* Do not log an error if Files.move does not work. (for https://issues.apache.org/jira/browse/LOG4J2-2769[LOG4J2-2769] by `rgoers`)
+* Fixed NullPointerException after reconfiguring via JMX. (for https://issues.apache.org/jira/browse/LOG4J2-2770[LOG4J2-2770] by `rgoers`, Bill Kuker)
* NullPointerException after reconfiguring via JMX. (for https://issues.apache.org/jira/browse/LOG4J2-2770[LOG4J2-2770] by `ggregory`, Bill Kuker)
-* ServletContainerInitializer was obtaining the StatusLogger too soon. (for https://issues.apache.org/jira/browse/LOG4J2-2781[LOG4J2-2781] by `rgoers`, qxo)
* An error message in RollingFileAppender uses a placeholder for the name but does not specify the name
argument in the logging call (for https://issues.apache.org/jira/browse/LOG4J2-2776[LOG4J2-2776] by `rgoers`, Christoph Kaser)
+* ServletContainerInitializer was obtaining the StatusLogger too soon. (for https://issues.apache.org/jira/browse/LOG4J2-2781[LOG4J2-2781] by `rgoers`, qxo)
+* Counter stuck at 10 and overwriting files when leading zeros used in the file pattern count. (for https://issues.apache.org/jira/browse/LOG4J2-2784[LOG4J2-2784] by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.13.2.adoc b/src/site/asciidoc/changelog/2.13.2.adoc
index 7a08c2a9d6..e70992141c 100644
--- a/src/site/asciidoc/changelog/2.13.2.adoc
+++ b/src/site/asciidoc/changelog/2.13.2.adoc
@@ -49,33 +49,33 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Added EventLookup to retrieve fields from the log event. (for https://issues.apache.org/jira/browse/LOG4J2-2807[LOG4J2-2807] by `rgoers`)
* Provide a Log4j implementation of System.Logger. (for https://issues.apache.org/jira/browse/LOG4J2-1360[LOG4J2-1360] by `rgoers`, Kevin Leturc)
+* Added EventLookup to retrieve fields from the log event. (for https://issues.apache.org/jira/browse/LOG4J2-2807[LOG4J2-2807] by `rgoers`)
=== Changed
-* Add ContextDataProviders as an alternative to having to implement a ContextDataInjector. (for https://issues.apache.org/jira/browse/LOG4J2-2779[LOG4J2-2779] by `rgoers`)
* Allow the file extension in the file pattern to be modified during reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-2457[LOG4J2-2457] by `rgoers`)
* Allow servlet context path to be retrieved without "/". (for https://issues.apache.org/jira/browse/LOG4J2-2520[LOG4J2-2520] by `rgoers`)
-* Add support for specifying an SSL configuration for SmtpAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2819[LOG4J2-2819] by `mattsicker`)
-* Allow Spring Lookup to return default and active profiles. (for https://issues.apache.org/jira/browse/LOG4J2-2818[LOG4J2-2818] by `rgoers`)
+* Add ContextDataProviders as an alternative to having to implement a ContextDataInjector. (for https://issues.apache.org/jira/browse/LOG4J2-2779[LOG4J2-2779] by `rgoers`)
* [JDBC] Throw a AppenderLoggingException instead of an NPE in the JDBC database manager. (for https://issues.apache.org/jira/browse/LOG4J2-2812[LOG4J2-2812] by `ggregory`)
* Allow Spring Boot applications to use composite configurations. (for https://issues.apache.org/jira/browse/LOG4J2-2815[LOG4J2-2815] by `rgoers`)
+* Allow Spring Lookup to return default and active profiles. (for https://issues.apache.org/jira/browse/LOG4J2-2818[LOG4J2-2818] by `rgoers`)
+* Add support for specifying an SSL configuration for SmtpAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2819[LOG4J2-2819] by `mattsicker`)
=== Fixed
* Add option to restore printing timeMillis in the JsonLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2588[LOG4J2-2588] by `rgoers`)
+* Fix Exceptions when whitespace is in the file path and Java security manager is used. (for https://issues.apache.org/jira/browse/LOG4J2-2761[LOG4J2-2761] by `rgoers`, Uwe Schindler)
* Initialize pattern processor before triggering policy during reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-2766[LOG4J2-2766] by `rgoers`)
-* Add information about using a url in log4j.configurationFile. (for https://issues.apache.org/jira/browse/LOG4J2-2810[LOG4J2-2810] by `rgoers`)
-* TimeFilter did not handle daylight saving time transitions and did not support a range over 2 days. (for https://issues.apache.org/jira/browse/LOG4J2-2805[LOG4J2-2805] by `rgoers`)
-* Fix Javadoc for ScriptPatternSelector. (for https://issues.apache.org/jira/browse/LOG4J2-2814[LOG4J2-2814] by `rgoers`)
+* Conditionally allocate PluginEntry during PluginCache loading. (for https://issues.apache.org/jira/browse/LOG4J2-2790[LOG4J2-2790] by `rgoers`, Marius Volkhart)
+* Correct JsonLayout timestamp sorting issue. (for https://issues.apache.org/jira/browse/LOG4J2-2791[LOG4J2-2791] by `rgoers`, Johan Karlberg)
* Allow trailing and leading spaces in log level. (for https://issues.apache.org/jira/browse/LOG4J2-2793[LOG4J2-2793] by `rgoers`, Renukaprasad C)
* Make YamlLayoutTest more resilient to environmental differences. (for https://issues.apache.org/jira/browse/LOG4J2-2794[LOG4J2-2794] by `rgoers`, Johan Karlberg)
-* Correct JsonLayout timestamp sorting issue. (for https://issues.apache.org/jira/browse/LOG4J2-2791[LOG4J2-2791] by `rgoers`, Johan Karlberg)
-* Add missing includeLocation parameter when creating AsyncLogger. (for https://issues.apache.org/jira/browse/LOG4J2-2811[LOG4J2-2811] by `rgoers`, Kuojian21)
-* Conditionally allocate PluginEntry during PluginCache loading. (for https://issues.apache.org/jira/browse/LOG4J2-2790[LOG4J2-2790] by `rgoers`, Marius Volkhart)
+* TimeFilter did not handle daylight saving time transitions and did not support a range over 2 days. (for https://issues.apache.org/jira/browse/LOG4J2-2805[LOG4J2-2805] by `rgoers`)
* Avoid NullPointerException when StackWalker returns null. (for https://issues.apache.org/jira/browse/LOG4J2-2809[LOG4J2-2809] by `rgoers`, Romain Manni-Bucau)
-* Fix Exceptions when whitespace is in the file path and Java security manager is used. (for https://issues.apache.org/jira/browse/LOG4J2-2761[LOG4J2-2761] by `rgoers`, Uwe Schindler)
+* Add information about using a url in log4j.configurationFile. (for https://issues.apache.org/jira/browse/LOG4J2-2810[LOG4J2-2810] by `rgoers`)
+* Add missing includeLocation parameter when creating AsyncLogger. (for https://issues.apache.org/jira/browse/LOG4J2-2811[LOG4J2-2811] by `rgoers`, Kuojian21)
* serializeToBytes was checking wrong variable for null. (for https://issues.apache.org/jira/browse/LOG4J2-2813[LOG4J2-2813] by `rgoers`, Keith D Gregory)
+* Fix Javadoc for ScriptPatternSelector. (for https://issues.apache.org/jira/browse/LOG4J2-2814[LOG4J2-2814] by `rgoers`)
* Allow the file size action to parse the value without being sensitive to the current locale. (for https://issues.apache.org/jira/browse/LOG4J2-2817[LOG4J2-2817] by `rgoers`, Trejkaz)
* Implement requiresLocation in GelfLayout to reflect whether location information is used in the message Pattern. (for https://issues.apache.org/jira/browse/LOG4J2-2824[LOG4J2-2824] by `rgoers`, CrazyBills)
diff --git a/src/site/asciidoc/changelog/2.14.0.adoc b/src/site/asciidoc/changelog/2.14.0.adoc
index df2816a492..8410f062ac 100644
--- a/src/site/asciidoc/changelog/2.14.0.adoc
+++ b/src/site/asciidoc/changelog/2.14.0.adoc
@@ -54,25 +54,25 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
* Create module log4j-mongodb4 to use new major version 4 MongoDB driver. (for https://issues.apache.org/jira/browse/LOG4J2-2848[LOG4J2-2848] by `ggregory`)
-* Add JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2957[LOG4J2-2957] by `vy`)
* More flexible configuration of the Disruptor WaitStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2858[LOG4J2-2858] by `ckozak`, Stepan Gorban)
+* Add JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2957[LOG4J2-2957] by `vy`)
=== Changed
-* Update org.apache.activemq:activemq-broker 5.15.11 -> 5.16.0. (by `ggregory`)
-* Update org.apache.commons:commons-lang3 3.9 -> 3.10. (by `ggregory`)
+* Add date pattern support for HTML layout. (for https://issues.apache.org/jira/browse/LOG4J2-2889[LOG4J2-2889] by `mattsicker`, Geng Yuanzhe)
+* Allow GelfLayout to produce newline delimited events. (for https://issues.apache.org/jira/browse/LOG4J2-2892[LOG4J2-2892] by `rgoers`, Jakub Lukes)
* Update MongoDB tests to require Java 8 unconditionally now that Log4j requires Java 8. (by `ggregory`)
-* Update org.apache.commons:commons-csv 1.7 -> 1.8. (by `ggregory`)
-* Update org.codehaus.groovy:* 2.5.6 -> 3.0.5. (by `ggregory`)
* Update com.fasterxml.jackson.* 2.10.2 -> 2.11.0. (by `ggregory`)
* Update jackson 2.11.0 -> 2.11.2. (by `ggregory`)
-* Update tests commons-io:commons-io 2.6 -> 2.7. (by `ggregory`)
-* Update org.apache.commons:commons-compress 1.19 -> 1.20. (by `ggregory`)
* Update mongodb3.version from 3.12.1 to 3.12.6. (by `ggregory`)
-* Update tests junit:junit 4.12 -> 4.13. (by `ggregory`)
+* Update org.apache.activemq:activemq-broker 5.15.11 -> 5.16.0. (by `ggregory`)
+* Update org.apache.commons:commons-compress 1.19 -> 1.20. (by `ggregory`)
+* Update org.apache.commons:commons-csv 1.7 -> 1.8. (by `ggregory`)
+* Update org.apache.commons:commons-lang3 3.9 -> 3.10. (by `ggregory`)
+* Update org.codehaus.groovy:* 2.5.6 -> 3.0.5. (by `ggregory`)
+* Update tests commons-io:commons-io 2.6 -> 2.7. (by `ggregory`)
* Update tests hsqldb 2.5.0 -> 2.5.1. (by `ggregory`)
-* Allow GelfLayout to produce newline delimited events. (for https://issues.apache.org/jira/browse/LOG4J2-2892[LOG4J2-2892] by `rgoers`, Jakub Lukes)
-* Add date pattern support for HTML layout. (for https://issues.apache.org/jira/browse/LOG4J2-2889[LOG4J2-2889] by `mattsicker`, Geng Yuanzhe)
+* Update tests junit:junit 4.12 -> 4.13. (by `ggregory`)
=== Removed
@@ -81,30 +81,30 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
* Javadoc link in ThreadContext description was incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-2822[LOG4J2-2822] by `rgoers`)
-* Rollover was failing to create directories when using a DirectFileRolloverStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2875[LOG4J2-2875] by `rgoers`)
-* Null pointer exception when no network interfaces are available. (for https://issues.apache.org/jira/browse/LOG4J2-2844[LOG4J2-2844] by `ggregory`)
+* Correct class name printed in error message in RollingFileAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2832[LOG4J2-2832] by `rgoers`, Benjamin Asbach)
* Disruptor and JUL no longer recursively start the AsyncLoggerDisruptor
resulting in an extra disruptor background thread constantly waiting. (for https://issues.apache.org/jira/browse/LOG4J2-2837[LOG4J2-2837] by `ckozak`)
+* Null pointer exception when no network interfaces are available. (for https://issues.apache.org/jira/browse/LOG4J2-2844[LOG4J2-2844] by `ggregory`)
+* Fixed typos where mergeFactory should be mergeStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2859[LOG4J2-2859] by `rgoers`, Yanming Zhou)
+* Obtain ContextDataProviders asynchronously. (for https://issues.apache.org/jira/browse/LOG4J2-2867[LOG4J2-2867] by `rgoers`)
* RingBufferLogEventTranslator uses a static ContextDataInjector instead of initializing a new object
on each thread. (for https://issues.apache.org/jira/browse/LOG4J2-2867[LOG4J2-2867] by `ckozak`)
-* Obtain ContextDataProviders asynchronously. (for https://issues.apache.org/jira/browse/LOG4J2-2867[LOG4J2-2867] by `rgoers`)
-* Fix potential deadlock in asynchronous logging by avoiding blocking for queue space on Log4jThreads (for https://issues.apache.org/jira/browse/LOG4J2-2895[LOG4J2-2895] by `ckozak`)
-* Log4j-web should now store the servlet context as a map entry instead of in the single external context field. (for https://issues.apache.org/jira/browse/LOG4J2-2910[LOG4J2-2910] by `rgoers`)
-* Log4j2EventListener in spring.cloud.config.client listens for wrong event. (for https://issues.apache.org/jira/browse/LOG4J2-2911[LOG4J2-2911] by `rgoers`)
-* Move Spring Lookup and Spring PropertySource to its own module. (for https://issues.apache.org/jira/browse/LOG4J2-2908[LOG4J2-2908] by `rgoers`)
-* Missing configuration files should be ignored when creating a composite configuration. (for https://issues.apache.org/jira/browse/LOG4J2-2901[LOG4J2-2901] by `rgoers`)
-* Fix log4j-1.2-api LogEventWrapper threadId and priority accessors when called multiple times. (for https://issues.apache.org/jira/browse/LOG4J2-2899[LOG4J2-2899] by `ckozak`)
-* Fix spelling error in log message. (for https://issues.apache.org/jira/browse/LOG4J2-2894[LOG4J2-2894] by `rgoers`)
+* Rollover was failing to create directories when using a DirectFileRolloverStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2875[LOG4J2-2875] by `rgoers`)
* Determine the container id to obtain container and image information. (for https://issues.apache.org/jira/browse/LOG4J2-2877[LOG4J2-2877] by `rgoers`)
* Create StackWalker benchmark. Revert back to StackWalker.walk based on benchmark results. (for https://issues.apache.org/jira/browse/LOG4J2-2880[LOG4J2-2880] by `rgoers`)
-* Fix broken link in FAQ. (for https://issues.apache.org/jira/browse/LOG4J2-2925[LOG4J2-2925] by `rgoers`)
+* Support java.util.logging filters when using that API. (for https://issues.apache.org/jira/browse/LOG4J2-2882[LOG4J2-2882] by `rgoers`, Emmanuel Bourg)
* When using DirectFileRolloverStrategy the file pattern was not being recalculated on
size based rollover after a time based rollover had occurred. (for https://issues.apache.org/jira/browse/LOG4J2-2883[LOG4J2-2883] by `rgoers`)
-* Call ReliabilityStrategy's beforeStopAppenders() method before stopping AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2919[LOG4J2-2919] by `mattsicker`, Geng Yuanzhe)
-* Fix UnsupportedOperationException when initializing the Log4j2CloudConfigLoggingSystem. (for https://issues.apache.org/jira/browse/LOG4J2-2906[LOG4J2-2906] by `rgoers`, Stephen Joyner)
+* Fix spelling error in log message. (for https://issues.apache.org/jira/browse/LOG4J2-2894[LOG4J2-2894] by `rgoers`)
+* Fix potential deadlock in asynchronous logging by avoiding blocking for queue space on Log4jThreads (for https://issues.apache.org/jira/browse/LOG4J2-2895[LOG4J2-2895] by `ckozak`)
* Avoid initializing volatile fields with default values. (for https://issues.apache.org/jira/browse/LOG4J2-2898[LOG4J2-2898] by `ckozak`, Turbanov Andrey)
-* Fixed typos where mergeFactory should be mergeStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-2859[LOG4J2-2859] by `rgoers`, Yanming Zhou)
-* Prevent premature garbage collection of shutdown hooks in DefaultShutdownCallbackRegistry. (for https://issues.apache.org/jira/browse/LOG4J2-2954[LOG4J2-2954] by `ckozak`, Henry Tung)
-* Correct class name printed in error message in RollingFileAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2832[LOG4J2-2832] by `rgoers`, Benjamin Asbach)
-* Support java.util.logging filters when using that API. (for https://issues.apache.org/jira/browse/LOG4J2-2882[LOG4J2-2882] by `rgoers`, Emmanuel Bourg)
+* Fix log4j-1.2-api LogEventWrapper threadId and priority accessors when called multiple times. (for https://issues.apache.org/jira/browse/LOG4J2-2899[LOG4J2-2899] by `ckozak`)
+* Missing configuration files should be ignored when creating a composite configuration. (for https://issues.apache.org/jira/browse/LOG4J2-2901[LOG4J2-2901] by `rgoers`)
+* Fix UnsupportedOperationException when initializing the Log4j2CloudConfigLoggingSystem. (for https://issues.apache.org/jira/browse/LOG4J2-2906[LOG4J2-2906] by `rgoers`, Stephen Joyner)
+* Move Spring Lookup and Spring PropertySource to its own module. (for https://issues.apache.org/jira/browse/LOG4J2-2908[LOG4J2-2908] by `rgoers`)
+* Log4j-web should now store the servlet context as a map entry instead of in the single external context field. (for https://issues.apache.org/jira/browse/LOG4J2-2910[LOG4J2-2910] by `rgoers`)
+* Log4j2EventListener in spring.cloud.config.client listens for wrong event. (for https://issues.apache.org/jira/browse/LOG4J2-2911[LOG4J2-2911] by `rgoers`)
+* Call ReliabilityStrategy's beforeStopAppenders() method before stopping AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2919[LOG4J2-2919] by `mattsicker`, Geng Yuanzhe)
+* Fix broken link in FAQ. (for https://issues.apache.org/jira/browse/LOG4J2-2925[LOG4J2-2925] by `rgoers`)
* Fix NPE in MDCContextMap on 'contains' and 'isEmpty' invocations. (for https://issues.apache.org/jira/browse/LOG4J2-2939[LOG4J2-2939] by `ckozak`, Constantin Hirsch)
+* Prevent premature garbage collection of shutdown hooks in DefaultShutdownCallbackRegistry. (for https://issues.apache.org/jira/browse/LOG4J2-2954[LOG4J2-2954] by `ckozak`, Henry Tung)
diff --git a/src/site/asciidoc/changelog/2.14.1.adoc b/src/site/asciidoc/changelog/2.14.1.adoc
index 25fa27dbaf..bfefd2cbcd 100644
--- a/src/site/asciidoc/changelog/2.14.1.adoc
+++ b/src/site/asciidoc/changelog/2.14.1.adoc
@@ -49,44 +49,46 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
* Enrich "map" resolver by unifying its backend with "mdc" resolver. (for https://issues.apache.org/jira/browse/LOG4J2-2962[LOG4J2-2962] by `vy`)
-* Replace JsonTemplateLayout resolver configurations table in docs with sections. (for https://issues.apache.org/jira/browse/LOG4J2-2999[LOG4J2-2999] by `vy`)
* Support stack trace truncation in JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2993[LOG4J2-2993] by `vy`)
+* Replace JsonTemplateLayout resolver configurations table in docs with sections. (for https://issues.apache.org/jira/browse/LOG4J2-2999[LOG4J2-2999] by `vy`)
=== Changed
-* Add Rollover Listener to aid in unit test validation. (for https://issues.apache.org/jira/browse/LOG4J2-2923[LOG4J2-2923] by `rgoers`)
* Allow reconfiguration when Log4j 1 configuration files are updated. (for https://issues.apache.org/jira/browse/LOG4J2-2893[LOG4J2-2893] by `rgoers`)
-* Update mongodb4.version 4.1.1 -> 4.2.0. (by `ggregory`)
-* Update commons-io:commons-io 2.7 -> 2.8.0. (by `ggregory`)
-* Update net.javacrumbs.json-unit:json-unit 1.31.1 -> 2.22.0. (by `ggregory`)
-* Update Spring dependencies to 5.3.2, Spring Boot to 2.3.6, and Spring Cloud to Hoxton.SR9 (by `rgoers`)
-* Update MongoDB 3 plugin: org.mongodb:mongodb-driver 3.12.6 -> 3.12.7. (by `ggregory`)
-* Update junit:junit 4.13 -> 4.13.1. (by `ggregory`)
+* Add Rollover Listener to aid in unit test validation. (for https://issues.apache.org/jira/browse/LOG4J2-2923[LOG4J2-2923] by `rgoers`)
+* Replace outdated PatternLayout.createLayout() calls in docs with createDefaultLayout(). (for https://issues.apache.org/jira/browse/LOG4J2-2977[LOG4J2-2977] by `vy`, Ron Grabowski)
+* Update JSON Unit 2.21.0 -> 2.22.0. (by `ggregory`)
* Update JaCoCo 0.8.3 -> 0.8.6. (by `ggregory`)
-* Update XML Unit 2.8.0 -> 2.8.2. (by `ggregory`)
+* Update Mockito 3.6.0 -> 3.7.0. (by `ggregory`)
+* Update MongoDB 3 plugin: org.mongodb:mongodb-driver 3.12.6 -> 3.12.7. (by `ggregory`)
+* Update MongoDB 4 plugin: org.mongodb:* 4.1.0 -> 4.1.1. (by `ggregory`)
+* Update Spring dependencies to 5.3.2, Spring Boot to 2.3.6, and Spring Cloud to Hoxton.SR9 (by `rgoers`)
* Update Woodstox 5.0.3 -> 6.2.3 to match Jackson 2.12.1. (by `ggregory`)
-* Update JSON Unit 2.21.0 -> 2.22.0. (by `ggregory`)
+* Update XML Unit 2.8.0 -> 2.8.2. (by `ggregory`)
+* Update com.fasterxml.jackson.*:* 2.11.2 - 2.11.3. (by `ggregory`)
* Update commons-codec:commons-codec 1.14 -> 1.15. (by `ggregory`)
+* Update commons-io:commons-io 2.7 -> 2.8.0. (by `ggregory`)
* Update de.flapdoodle.embed:de.flapdoodle.embed.mongo 2.2.0 -> 3.0.0. (by `ggregory`)
-* Update MongoDB 4 plugin: org.mongodb:* 4.1.0 -> 4.1.1. (by `ggregory`)
-* Update com.fasterxml.jackson.*:* 2.11.2 - 2.11.3. (by `ggregory`)
-* Update Mockito 3.6.0 -> 3.7.0. (by `ggregory`)
+* Update junit:junit 4.13 -> 4.13.1. (by `ggregory`)
+* Update mongodb4.version 4.1.1 -> 4.2.0. (by `ggregory`)
+* Update net.javacrumbs.json-unit:json-unit 1.31.1 -> 2.22.0. (by `ggregory`)
* Update net.javacrumbs.json-unit:json-unit 2.22.0 -> 2.23.0. (by `ggregory`)
-* Update org.apache.commons:commons-dbcp2 2.4.0 -> 2.8.0. (by `ggregory`)
-* Update org.codehaus.plexus:plexus-utils 3.2.0 -> 3.3.0. (by `ggregory`)
-* Update org.fusesource.jansi:jansi 1.18 -> 2.3.1. (by `ggregory`)
* Update org.apache.activemq:* 5.16.0 -> 5.16.1. (by `ggregory`)
-* Update org.fusesource.jansi:jansi 1.18 -> 2.2.0. (by `ggregory`)
-* Update org.codehaus.groovy:* 3.0.5 -> 3.0.6. (by `ggregory`)
+* Update org.apache.commons:commons-dbcp2 2.4.0 -> 2.8.0. (by `ggregory`)
+* Update org.apache.commons:commons-lang3 3.10 -> 3.11. (by `ggregory`)
* Update org.apache.commons:commons-pool2 2.8.1 -> 2.9.0. (by `ggregory`)
-* Update org.mockito:mockito-* 3.7.0 -> 3.7.7. (by `ggregory`)
-* Update org.assertj:assertj-core 3.18.1 -> 3.19.0. (by `ggregory`)
* Update org.assertj:assertj-core 3.14.0 -> 3.18.1. (by `ggregory`)
-* Update org.springframework:* 5.2.8.RELEASE -> 5.3.1. (by `ggregory`)
-* Update org.apache.commons:commons-lang3 3.10 -> 3.11. (by `ggregory`)
+* Update org.assertj:assertj-core 3.18.1 -> 3.19.0. (by `ggregory`)
* Update org.awaitility:awaitility 4.0.2 -> 4.0.3. (by `ggregory`)
+* Update org.codehaus.groovy:* 3.0.5 -> 3.0.6. (by `ggregory`)
+* Update org.codehaus.plexus:plexus-utils 3.2.0 -> 3.3.0. (by `ggregory`)
* Update org.eclipse.tycho:org.eclipse.osgi 3.12.1.v20170821-1548 -> 3.13.0.v20180226-1711. (by `ggregory`)
* Update org.fusesource.jansi:jansi 1.17.1 -> 2.0.1. (by `ggregory`)
+* Update org.fusesource.jansi:jansi 1.18 -> 2.2.0. (by `ggregory`)
+* Update org.fusesource.jansi:jansi 1.18 -> 2.3.1. (by `ggregory`)
+* Update org.mockito:mockito-* 3.7.0 -> 3.7.7. (by `ggregory`)
+* Update org.springframework:* 5.2.8.RELEASE -> 5.3.1. (by `ggregory`)
+* Update org.springframework:* 5.3.2 -> 5.3.3. (by `ggregory`)
* Update org.xmlunit:* 2.7.0 -> 2.8.0. (by `ggregory`)
* - com.fasterxml.jackson.core:jackson-annotations ................. 2.12.1 -> 2.12.2
- com.fasterxml.jackson.core:jackson-core ........................ 2.12.1 -> 2.12.2
@@ -103,35 +105,33 @@ For complete information on Apache Log4j 2, including instructions on how to sub
- org.mockito:mockito-junit-jupiter .............................. 3.7.7 -> 3.8.0
- org.mongodb:bson ............................................... 4.2.0 -> 4.2.2
- org.mongodb:mongodb-driver-sync ................................ 4.2.0 -> 4.2.2 (by `ggregory`)
-* Update org.springframework:* 5.3.2 -> 5.3.3. (by `ggregory`)
-* Replace outdated PatternLayout.createLayout() calls in docs with createDefaultLayout(). (for https://issues.apache.org/jira/browse/LOG4J2-2977[LOG4J2-2977] by `vy`, Ron Grabowski)
=== Fixed
+* Allow auto-shutdown of log4j in log4j-web to be turned off and provide a
+ ServletContextListener "Log4jShutdownOnContextDestroyedListener" to stop log4j.
+ Register the listener at the top of web.xml to ensure the shutdown happens last. (for https://issues.apache.org/jira/browse/LOG4J2-1606[LOG4J2-1606] by `mattsicker`, Tim Perry)
+* Allow auto-shutdown of log4j in log4j-web to be turned off and provide a
+ ServletContextListener "Log4jShutdownOnContextDestroyedListener" to stop log4j.
+ Register the listener at the top of web.xml to ensure the shutdown happens last. (for https://issues.apache.org/jira/browse/LOG4J2-2624[LOG4J2-2624] by `mattsicker`, Tim Perry)
+* Avoid redundant Kafka producer instantiation causing thread leaks. (for https://issues.apache.org/jira/browse/LOG4J2-2916[LOG4J2-2916] by `vy`, wuqian0808)
+* Document that LogBuilder default methods do nothing. (for https://issues.apache.org/jira/browse/LOG4J2-2947[LOG4J2-2947] by `rgoers`)
* Replace HashSet with IdentityHashMap in ParameterFormatter to detect cycles. (for https://issues.apache.org/jira/browse/LOG4J2-2948[LOG4J2-2948] by `vy`)
* Fix reading of JsonTemplateLayout event additional fields from config. (for https://issues.apache.org/jira/browse/LOG4J2-2961[LOG4J2-2961] by `vy`)
-* Document that LogBuilder default methods do nothing. (for https://issues.apache.org/jira/browse/LOG4J2-2947[LOG4J2-2947] by `rgoers`)
+* Merge packages from several Configurations in Composite Configuration. (for https://issues.apache.org/jira/browse/LOG4J2-2964[LOG4J2-2964] by `vy`, Valery Yatsynovich)
* Fix JsonTemplateLayout index based parameter resolution when messages contain too few parameters. (for https://issues.apache.org/jira/browse/LOG4J2-2967[LOG4J2-2967] by `ckozak`)
+* Refactor AsyncAppender and AppenderControl for handling of Throwables. (for https://issues.apache.org/jira/browse/LOG4J2-2972[LOG4J2-2972] by `vy`)
+* Rename EventTemplateAdditionalField#type (conflicting with properties file parser) to "format". (for https://issues.apache.org/jira/browse/LOG4J2-2973[LOG4J2-2973] by `vy`, Fabio Ricchiuti)
* Log4j would fail to initialize in Java 8 with log4j-spring-boot. (for https://issues.apache.org/jira/browse/LOG4J2-2974[LOG4J2-2974] by `rgoers`)
* JdbcAppender composes an incorrect INSERT statement without a ColumnMapping element. (for https://issues.apache.org/jira/browse/LOG4J2-2976[LOG4J2-2976] by `ckozak`)
-* Refactor AsyncAppender and AppenderControl for handling of Throwables. (for https://issues.apache.org/jira/browse/LOG4J2-2972[LOG4J2-2972] by `vy`)
-* Add eventTemplateRootObjectKey parameter to JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2985[LOG4J2-2985] by `vy`)
-* Add log method with no parameters - i.e. it has an empty message. (for https://issues.apache.org/jira/browse/LOG4J2-3033[LOG4J2-3033] by `rgoers`)
-* Fix truncation of excessive strings ending with a high surrogate in JsonWriter. (for https://issues.apache.org/jira/browse/LOG4J2-2998[LOG4J2-2998] by `vy`)
* OnStartupTriggeringPolicy would fail to cause the file to roll over with DirectWriteTriggeringPolicy
unless minSize was set to 0. (for https://issues.apache.org/jira/browse/LOG4J2-2981[LOG4J2-2981] by `rgoers`)
-* Directly create a thread instead of using the common ForkJoin pool when initializing ThreadContextDataInjector" (for https://issues.apache.org/jira/browse/LOG4J2-3006[LOG4J2-3006] by `rgoers`)
-* Allow auto-shutdown of log4j in log4j-web to be turned off and provide a
- ServletContextListener "Log4jShutdownOnContextDestroyedListener" to stop log4j.
- Register the listener at the top of web.xml to ensure the shutdown happens last. (for https://issues.apache.org/jira/browse/LOG4J2-2624[LOG4J2-2624] by `mattsicker`, Tim Perry)
-* Avoid redundant Kafka producer instantiation causing thread leaks. (for https://issues.apache.org/jira/browse/LOG4J2-2916[LOG4J2-2916] by `vy`, wuqian0808)
-* Allow auto-shutdown of log4j in log4j-web to be turned off and provide a
- ServletContextListener "Log4jShutdownOnContextDestroyedListener" to stop log4j.
- Register the listener at the top of web.xml to ensure the shutdown happens last. (for https://issues.apache.org/jira/browse/LOG4J2-1606[LOG4J2-1606] by `mattsicker`, Tim Perry)
-* NoGcLayout allocates empty bytes arrays for its header and footer. (for https://issues.apache.org/jira/browse/LOG4J2-3131[LOG4J2-3131] by `ggregory`, Gary Gregory)
-* OutputStreamManager.flushBuffer always resets the buffer, previously the buffer was not reset after an exception. (for https://issues.apache.org/jira/browse/LOG4J2-3028[LOG4J2-3028] by `ckozak`, Jakub Kozlowski)
+* Add eventTemplateRootObjectKey parameter to JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-2985[LOG4J2-2985] by `vy`)
* Reduce garbage by using putAll when copying the ThreadContext for SLF4J. (for https://issues.apache.org/jira/browse/LOG4J2-2990[LOG4J2-2990] by `rgoers`, Diogo Monteiro)
-* Merge packages from several Configurations in Composite Configuration. (for https://issues.apache.org/jira/browse/LOG4J2-2964[LOG4J2-2964] by `vy`, Valery Yatsynovich)
+* Fix truncation of excessive strings ending with a high surrogate in JsonWriter. (for https://issues.apache.org/jira/browse/LOG4J2-2998[LOG4J2-2998] by `vy`)
+* Directly create a thread instead of using the common ForkJoin pool when initializing ThreadContextDataInjector" (for https://issues.apache.org/jira/browse/LOG4J2-3006[LOG4J2-3006] by `rgoers`)
* Log4j1ConfigurationConverter on Windows produces "
" at end of every line. (for https://issues.apache.org/jira/browse/LOG4J2-3014[LOG4J2-3014] by `ggregory`, Gary GregoryLee Breisacher)
+* OutputStreamManager.flushBuffer always resets the buffer, previously the buffer was not reset after an exception. (for https://issues.apache.org/jira/browse/LOG4J2-3028[LOG4J2-3028] by `ckozak`, Jakub Kozlowski)
+* Add log method with no parameters - i.e. it has an empty message. (for https://issues.apache.org/jira/browse/LOG4J2-3033[LOG4J2-3033] by `rgoers`)
* Attempting to call getExtendedStackTraceAsString() after deserializing JSON LogEvent results in a NPE. (for https://issues.apache.org/jira/browse/LOG4J2-3131[LOG4J2-3131] by `ggregory`, Gary GregoryAdam Long)
-* Rename EventTemplateAdditionalField#type (conflicting with properties file parser) to "format". (for https://issues.apache.org/jira/browse/LOG4J2-2973[LOG4J2-2973] by `vy`, Fabio Ricchiuti)
+* NoGcLayout allocates empty bytes arrays for its header and footer. (for https://issues.apache.org/jira/browse/LOG4J2-3131[LOG4J2-3131] by `ggregory`, Gary Gregory)
diff --git a/src/site/asciidoc/changelog/2.15.0.adoc b/src/site/asciidoc/changelog/2.15.0.adoc
index 497b4d689a..b38c7f8308 100644
--- a/src/site/asciidoc/changelog/2.15.0.adoc
+++ b/src/site/asciidoc/changelog/2.15.0.adoc
@@ -82,51 +82,53 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
+* Add support for US-style date patterns and micro/nano seconds to FixedDateTime. (for https://issues.apache.org/jira/browse/LOG4J2-2885[LOG4J2-2885] by `vy`, Markus Spann)
* Add BasicAsyncLoggerContextSelector equivalent to AsyncLoggerContextSelector for
applications with a single LoggerContext. This selector avoids classloader lookup
overhead incurred by the existing AsyncLoggerContextSelector. (for https://issues.apache.org/jira/browse/LOG4J2-2940[LOG4J2-2940] by `ckozak`)
* Context selectors are aware of their dependence upon the callers ClassLoader, allowing
basic context selectors to avoid the unnecessary overhead of walking the stack to
determine the caller's ClassLoader. (for https://issues.apache.org/jira/browse/LOG4J2-2940[LOG4J2-2940] by `ckozak`)
-* Add CaseConverterResolver to JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3051[LOG4J2-3051] by `vy`)
-* Allow MapMessage and ThreadContext attributes to be prefixed. (for https://issues.apache.org/jira/browse/LOG4J2-3049[LOG4J2-3049] by `rgoers`)
-* Add Arbiters and SpringProfile plugin. (for https://issues.apache.org/jira/browse/LOG4J2-3064[LOG4J2-3064] by `rgoers`)
-* Add replacement parameter to ReadOnlyStringMapResolver. (for https://issues.apache.org/jira/browse/LOG4J2-3074[LOG4J2-3074] by `vy`)
+* Add support for Jakarta EE 9 (Tomcat 10 / Jetty 11) (for https://issues.apache.org/jira/browse/LOG4J2-2978[LOG4J2-2978] by `rgoers`, Michael Seele)
* Add plugin support to JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3004[LOG4J2-3004] by `vy`)
-* Add CounterResolver to JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3067[LOG4J2-3067] by `vy`)
-* Add RepeatPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-3044[LOG4J2-3044] by `rgoers`)
-* Allow AdditionalFields to be ignored if their value is null or a zero-length String. (for https://issues.apache.org/jira/browse/LOG4J2-3050[LOG4J2-3050] by `rgoers`)
* Allow a PatternSelector to be specified on GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3041[LOG4J2-3041] by `rgoers`)
+* Add RepeatPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-3044[LOG4J2-3044] by `rgoers`)
* Add improved MapMessage support to GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3048[LOG4J2-3048] by `rgoers`)
+* Allow MapMessage and ThreadContext attributes to be prefixed. (for https://issues.apache.org/jira/browse/LOG4J2-3049[LOG4J2-3049] by `rgoers`)
+* Allow AdditionalFields to be ignored if their value is null or a zero-length String. (for https://issues.apache.org/jira/browse/LOG4J2-3050[LOG4J2-3050] by `rgoers`)
+* Add CaseConverterResolver to JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3051[LOG4J2-3051] by `vy`)
+* Refactor MD5 usage for sharing sensitive information. (for https://issues.apache.org/jira/browse/LOG4J2-3056[LOG4J2-3056] by `vy`, Marcono1234)
+* Add Arbiters and SpringProfile plugin. (for https://issues.apache.org/jira/browse/LOG4J2-3064[LOG4J2-3064] by `rgoers`)
+* Add CounterResolver to JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3067[LOG4J2-3067] by `vy`)
+* Add replacement parameter to ReadOnlyStringMapResolver. (for https://issues.apache.org/jira/browse/LOG4J2-3074[LOG4J2-3074] by `vy`)
+* Add JsonTemplateLayout for Google Cloud Platform structured logging layout. (for https://issues.apache.org/jira/browse/LOG4J2-3116[LOG4J2-3116] by `rgupta`)
* Add missing slf4j-api singleton accessors to log4j-slf4j-impl (1.7) StaticMarkerBinder and StaticMDCBinder.
This doesn't impact behavior or correctness, but avoids throwing and catching NoSuchMethodErrors when slf4j
is initialized and avoids linkage linting warnings. (for https://issues.apache.org/jira/browse/LOG4J2-3133[LOG4J2-3133] by `ckozak`)
* Avoid ThreadLocal overhead in RandomAccessFileAppender, RollingRandomAccessFileManager,
and MemoryMappedFileManager due to the unused setEndOfBatch and isEndOfBatch methods.
The methods on LogEvent are preferred. (for https://issues.apache.org/jira/browse/LOG4J2-3141[LOG4J2-3141] by `ckozak`)
-* Add JsonTemplateLayout for Google Cloud Platform structured logging layout. (for https://issues.apache.org/jira/browse/LOG4J2-3116[LOG4J2-3116] by `rgupta`)
* Prefer string.getBytes(Charset) over string.getBytes(String)
based on performance improvements in modern Java releases. (for https://issues.apache.org/jira/browse/LOG4J2-3144[LOG4J2-3144] by `ckozak`)
+* Make CRLF/HTML encoding run in O(n) worst-case time, rather than O(n^2). (for https://issues.apache.org/jira/browse/LOG4J2-3170[LOG4J2-3170] by `vy`, Gareth Smith)
+* Improve PatternLayout performance by reducing unnecessary indirection and branching. (for https://issues.apache.org/jira/browse/LOG4J2-3171[LOG4J2-3171] by `ckozak`)
* Improve NameAbbreviator worst-case performance. (for https://issues.apache.org/jira/browse/LOG4J2-3189[LOG4J2-3189] by `ckozak`)
+* Allow fractional attributes for size attribute of SizeBasedTriggeringPolicy. (for https://issues.apache.org/jira/browse/LOG4J2-3194[LOG4J2-3194] by `rgoers`, markuss)
* Pattern layout no longer enables lookups within message text by default for cleaner API boundaries and reduced
formatting overhead. The old 'log4j2.formatMsgNoLookups' which enabled this behavior has been removed as well
as the 'nolookups' message pattern converter option. The old behavior can be enabled on a per-pattern basis
using '%m{lookups}'. (for https://issues.apache.org/jira/browse/LOG4J2-3198[LOG4J2-3198] by `ckozak`)
-* Improve PatternLayout performance by reducing unnecessary indirection and branching. (for https://issues.apache.org/jira/browse/LOG4J2-3171[LOG4J2-3171] by `ckozak`)
-* Refactor MD5 usage for sharing sensitive information. (for https://issues.apache.org/jira/browse/LOG4J2-3056[LOG4J2-3056] by `vy`, Marcono1234)
-* Add support for Jakarta EE 9 (Tomcat 10 / Jetty 11) (for https://issues.apache.org/jira/browse/LOG4J2-2978[LOG4J2-2978] by `rgoers`, Michael Seele)
-* Add support for US-style date patterns and micro/nano seconds to FixedDateTime. (for https://issues.apache.org/jira/browse/LOG4J2-2885[LOG4J2-2885] by `vy`, Markus Spann)
-* Allow fractional attributes for size attribute of SizeBasedTriggeringPolicy. (for https://issues.apache.org/jira/browse/LOG4J2-3194[LOG4J2-3194] by `rgoers`, markuss)
-* Make CRLF/HTML encoding run in O(n) worst-case time, rather than O(n^2). (for https://issues.apache.org/jira/browse/LOG4J2-3170[LOG4J2-3170] by `vy`, Gareth Smith)
=== Changed
-* Log4j 1.x properties were not being substituted. (for https://issues.apache.org/jira/browse/LOG4J2-2951[LOG4J2-2951] by `rgoers`)
+* Handle interrupted exceptions that occur during rollover. (for https://issues.apache.org/jira/browse/LOG4J2-1798[LOG4J2-1798] by `rgoers`, Viacheslav Zhivaev)
* Provide support for overriding the Tomcat Log class in Tomcat 8.5+. (for https://issues.apache.org/jira/browse/LOG4J2-2025[LOG4J2-2025] by `rgoers`)
-* Correct documentation for SyslogAppender when using TLS. (for https://issues.apache.org/jira/browse/LOG4J2-2553[LOG4J2-2553] by `rgoers`)
* Minor documentation corrections regarding log levels. (for https://issues.apache.org/jira/browse/LOG4J2-2540[LOG4J2-2540] by `rgoers`)
-* Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4. (by `rgoers`)
+* Minor documentation corrections in the configuration section. (for https://issues.apache.org/jira/browse/LOG4J2-2541[LOG4J2-2541] by `rgoers`, Gerold Broser)
+* Correct documentation for SyslogAppender when using TLS. (for https://issues.apache.org/jira/browse/LOG4J2-2553[LOG4J2-2553] by `rgoers`)
+* Log4j 1.x properties were not being substituted. (for https://issues.apache.org/jira/browse/LOG4J2-2951[LOG4J2-2951] by `rgoers`)
* Fix Log Event Level vs Logger Config Level table. (for https://issues.apache.org/jira/browse/LOG4J2-3166[LOG4J2-3166] by `rgoers`)
+* Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4. (by `rgoers`)
* Updated dependencies.
- com.fasterxml.jackson.core:jackson-annotations ................. 2.12.2 -> 2.12.4
@@ -176,47 +178,45 @@ For complete information on Apache Log4j 2, including instructions on how to sub
- org.springframework:spring-web ................................. 5.3.3 -> 5.3.9
- org.springframework:spring-webmvc .............................. 5.3.3 -> 5.3.9
- org.tukaani:xz ................................................. 1.8 -> 1.9 (by `ggregory`)
-* Handle interrupted exceptions that occur during rollover. (for https://issues.apache.org/jira/browse/LOG4J2-1798[LOG4J2-1798] by `rgoers`, Viacheslav Zhivaev)
-* Minor documentation corrections in the configuration section. (for https://issues.apache.org/jira/browse/LOG4J2-2541[LOG4J2-2541] by `rgoers`, Gerold Broser)
=== Fixed
+* LoggerContext skips resolving localhost when hostName is configured. (for https://issues.apache.org/jira/browse/LOG4J2-2808[LOG4J2-2808] by `ckozak`, Asapha Halifa)
+* Handle Disruptor event translation exceptions. (for https://issues.apache.org/jira/browse/LOG4J2-2816[LOG4J2-2816] by `vy`, Jacob Shields)
* SocketAppender should propagate failures when reconnection fails. (for https://issues.apache.org/jira/browse/LOG4J2-2829[LOG4J2-2829] by `vy`)
* Slf4j implementations walk the stack at most once rather than twice to determine the caller's class loader. (for https://issues.apache.org/jira/browse/LOG4J2-2940[LOG4J2-2940] by `ckozak`)
* Fixed a deadlock between the AsyncLoggerContextSelector and java.util.logging.LogManager by updating Disruptor to 3.4.4. (for https://issues.apache.org/jira/browse/LOG4J2-2965[LOG4J2-2965] by `ckozak`)
* BasicContextSelector hasContext and shutdown take the default context into account (for https://issues.apache.org/jira/browse/LOG4J2-3054[LOG4J2-3054] by `ckozak`)
+* Fix thread-safety issues in DefaultErrorHandler. (for https://issues.apache.org/jira/browse/LOG4J2-3060[LOG4J2-3060] by `vy`, Nikita Mikhailov)
+* Ensure EncodingPatternConverter#handlesThrowable is implemented. (for https://issues.apache.org/jira/browse/LOG4J2-3070[LOG4J2-3070] by `vy`, Romain Manni-Bucau)
* Fix formatting of nanoseconds in JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3075[LOG4J2-3075] by `vy`)
-* Fix a regression in 2.14.1 which allowed the AsyncAppender background thread to keep the JVM alive because
- the daemon flag was not set. (for https://issues.apache.org/jira/browse/LOG4J2-3102[LOG4J2-3102] by `ckozak`)
* Use SimpleMessage in Log4j 1 Category whenever possible. (for https://issues.apache.org/jira/browse/LOG4J2-3080[LOG4J2-3080] by `vy`)
* log4j-slf4j-impl and log4j-slf4j18-impl correctly detect the calling class using both LoggerFactory.getLogger
methods as well as LoggerFactory.getILoggerFactory().getLogger. (for https://issues.apache.org/jira/browse/LOG4J2-3083[LOG4J2-3083] by `ckozak`)
-* DatePatternConverter performance is not impacted by microsecond-precision clocks when such precision isn't
- required. (for https://issues.apache.org/jira/browse/LOG4J2-3153[LOG4J2-3153] by `ckozak`)
-* RandomAccessFile appender uses the correct default buffer size of 256 kB
- rather than the default appender buffer size of 8 kB. (for https://issues.apache.org/jira/browse/LOG4J2-3150[LOG4J2-3150] by `ckozak`)
-* Limit the protocols JNDI can use by default. Limit the servers and classes that can be accessed via LDAP. (for https://issues.apache.org/jira/browse/LOG4J2-3201[LOG4J2-3201] by `rgoers`)
-* Avoid using MutableInstant of the event as a cache key in JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3183[LOG4J2-3183] by `vy`)
-* Fixed an unlikely race condition in Log4jMarker.getParents() volatile access. (for https://issues.apache.org/jira/browse/LOG4J2-3159[LOG4J2-3159] by `ckozak`)
-* Fix thread-safety issues in DefaultErrorHandler. (for https://issues.apache.org/jira/browse/LOG4J2-3060[LOG4J2-3060] by `vy`, Nikita Mikhailov)
-* LoggerContext skips resolving localhost when hostName is configured. (for https://issues.apache.org/jira/browse/LOG4J2-2808[LOG4J2-2808] by `ckozak`, Asapha Halifa)
-* Handle Disruptor event translation exceptions. (for https://issues.apache.org/jira/browse/LOG4J2-2816[LOG4J2-2816] by `vy`, Jacob Shields)
-* Enable immediate flush on RollingFileAppender when buffered i/o is not enabled. (for https://issues.apache.org/jira/browse/LOG4J2-3114[LOG4J2-3114] by `rgoers`, Barnabas Bodnar)
-* Fix documentation on how to toggle log4j2.debug system property. (for https://issues.apache.org/jira/browse/LOG4J2-3160[LOG4J2-3160] by `vy`, Lars Bohl)
+* Fix race in JsonTemplateLayout where a timestamp could end up unquoted. (for https://issues.apache.org/jira/browse/LOG4J2-3087[LOG4J2-3087] by `vy`, Anton Klarén)
+* Fix sporadic JsonTemplateLayoutNullEventDelimiterTest failures on Windows. (for https://issues.apache.org/jira/browse/LOG4J2-3089[LOG4J2-3089] by `vy`, Tim Perry)
* Fix JsonWriter memory leaks due to retained excessive buffer growth. (for https://issues.apache.org/jira/browse/LOG4J2-3092[LOG4J2-3092] by `vy`, xmh51)
+* Category.setLevel should accept null value. (for https://issues.apache.org/jira/browse/LOG4J2-3095[LOG4J2-3095] by `ggregory`, Gary GregoryKenny MacLeod)
+* Fix a regression in 2.14.1 which allowed the AsyncAppender background thread to keep the JVM alive because
+ the daemon flag was not set. (for https://issues.apache.org/jira/browse/LOG4J2-3102[LOG4J2-3102] by `ckozak`)
+* Fix race condition which can result in ConcurrentModificationException on context.stop. (for https://issues.apache.org/jira/browse/LOG4J2-3103[LOG4J2-3103] by `ckozak`, Mike Glazer)
+* SmtpManager.createManagerName ignores port. (for https://issues.apache.org/jira/browse/LOG4J2-3107[LOG4J2-3107] by `vy`, Markus Spann)
* Fix the number of {}-placeholders in the string literal argument does not match the number of other arguments
to the logging call. (for https://issues.apache.org/jira/browse/LOG4J2-3110[LOG4J2-3110] by `rgoers`, Arturo Bernal)
+* Enable immediate flush on RollingFileAppender when buffered i/o is not enabled. (for https://issues.apache.org/jira/browse/LOG4J2-3114[LOG4J2-3114] by `rgoers`, Barnabas Bodnar)
* log4j2 config modified at run-time may trigger incomplete MBean re-initialization due to InstanceAlreadyExistsException. (for https://issues.apache.org/jira/browse/LOG4J2-3121[LOG4J2-3121] by `ggregory`, Markus Spann)
-* Ensure EncodingPatternConverter#handlesThrowable is implemented. (for https://issues.apache.org/jira/browse/LOG4J2-3070[LOG4J2-3070] by `vy`, Romain Manni-Bucau)
-* Fix sporadic JsonTemplateLayoutNullEventDelimiterTest failures on Windows. (for https://issues.apache.org/jira/browse/LOG4J2-3089[LOG4J2-3089] by `vy`, Tim Perry)
-* Fix race in JsonTemplateLayout where a timestamp could end up unquoted. (for https://issues.apache.org/jira/browse/LOG4J2-3087[LOG4J2-3087] by `vy`, Anton Klarén)
* log4j-1.2-api implements LogEventAdapter.getTimestamp() based on the original event timestamp
instead of returning zero. (for https://issues.apache.org/jira/browse/LOG4J2-3142[LOG4J2-3142] by `ckozak`, John Meikle)
-* Fix race condition which can result in ConcurrentModificationException on context.stop. (for https://issues.apache.org/jira/browse/LOG4J2-3103[LOG4J2-3103] by `ckozak`, Mike Glazer)
-* SmtpManager.createManagerName ignores port. (for https://issues.apache.org/jira/browse/LOG4J2-3107[LOG4J2-3107] by `vy`, Markus Spann)
-* Category.setLevel should accept null value. (for https://issues.apache.org/jira/browse/LOG4J2-3095[LOG4J2-3095] by `ggregory`, Gary GregoryKenny MacLeod)
+* RandomAccessFile appender uses the correct default buffer size of 256 kB
+ rather than the default appender buffer size of 8 kB. (for https://issues.apache.org/jira/browse/LOG4J2-3150[LOG4J2-3150] by `ckozak`)
+* DatePatternConverter performance is not impacted by microsecond-precision clocks when such precision isn't
+ required. (for https://issues.apache.org/jira/browse/LOG4J2-3153[LOG4J2-3153] by `ckozak`)
+* Fixed an unlikely race condition in Log4jMarker.getParents() volatile access. (for https://issues.apache.org/jira/browse/LOG4J2-3159[LOG4J2-3159] by `ckozak`)
+* Fix documentation on how to toggle log4j2.debug system property. (for https://issues.apache.org/jira/browse/LOG4J2-3160[LOG4J2-3160] by `vy`, Lars Bohl)
+* Fix bug when file names contain regex characters. (for https://issues.apache.org/jira/browse/LOG4J2-3168[LOG4J2-3168] by `rgoers`, Benjamin Wöster)
+* Buffer immutable log events in the SmtpManager. (for https://issues.apache.org/jira/browse/LOG4J2-3172[LOG4J2-3172] by `vy`, Barry Fleming)
+* Wrong subject on mail when it depends on the LogEvent (for https://issues.apache.org/jira/browse/LOG4J2-3174[LOG4J2-3174] by `vy`, romainmoreau)
* Avoid KafkaManager override when topics differ. (for https://issues.apache.org/jira/browse/LOG4J2-3175[LOG4J2-3175] by `vy`, wuqian0808)
+* Avoid using MutableInstant of the event as a cache key in JsonTemplateLayout. (for https://issues.apache.org/jira/browse/LOG4J2-3183[LOG4J2-3183] by `vy`)
* Fix thread-safety issues in DefaultErrorHandler. (for https://issues.apache.org/jira/browse/LOG4J2-3185[LOG4J2-3185] by `vy`, mzbonnt)
-* Wrong subject on mail when it depends on the LogEvent (for https://issues.apache.org/jira/browse/LOG4J2-3174[LOG4J2-3174] by `vy`, romainmoreau)
-* Buffer immutable log events in the SmtpManager. (for https://issues.apache.org/jira/browse/LOG4J2-3172[LOG4J2-3172] by `vy`, Barry Fleming)
-* Fix bug when file names contain regex characters. (for https://issues.apache.org/jira/browse/LOG4J2-3168[LOG4J2-3168] by `rgoers`, Benjamin Wöster)
+* Limit the protocols JNDI can use by default. Limit the servers and classes that can be accessed via LDAP. (for https://issues.apache.org/jira/browse/LOG4J2-3201[LOG4J2-3201] by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.17.0.adoc b/src/site/asciidoc/changelog/2.17.0.adoc
index 3c9a87dcab..8f10db7841 100644
--- a/src/site/asciidoc/changelog/2.17.0.adoc
+++ b/src/site/asciidoc/changelog/2.17.0.adoc
@@ -52,11 +52,11 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
-* Limit JNDI to the java protocol only. JNDI will remain disabled by default. Rename JNDI enablement property from
- 'log4j2.enableJndi' to 'log4j2.enableJndiLookup', 'log4j2.enableJndiJms', and 'log4j2.enableJndiContextSelector'. (for https://issues.apache.org/jira/browse/LOG4J2-3242[LOG4J2-3242] by `rgoers`)
-* Log4j 1.2 bridge for Syslog Appender defaults to port 512 instead of 514. (for https://issues.apache.org/jira/browse/LOG4J2-3249[LOG4J2-3249] by `ggregory`)
+* Fix string substitution recursion. (for https://issues.apache.org/jira/browse/LOG4J2-3230[LOG4J2-3230] by `ckozak`)
+* Log4j 1.2 bridge API hard codes the Syslog protocol to TCP. (for https://issues.apache.org/jira/browse/LOG4J2-3237[LOG4J2-3237] by `ggregory`)
* Do not declare log4j-api-java9 and log4j-core-java9 as dependencies as it causes problems with the
Maven enforcer plugin. (for https://issues.apache.org/jira/browse/LOG4J2-3241[LOG4J2-3241] by `rgoers`)
+* Limit JNDI to the java protocol only. JNDI will remain disabled by default. Rename JNDI enablement property from
+ 'log4j2.enableJndi' to 'log4j2.enableJndiLookup', 'log4j2.enableJndiJms', and 'log4j2.enableJndiContextSelector'. (for https://issues.apache.org/jira/browse/LOG4J2-3242[LOG4J2-3242] by `rgoers`)
* PropertiesConfiguration.parseAppenderFilters NPE when parsing properties file filters. (for https://issues.apache.org/jira/browse/LOG4J2-3247[LOG4J2-3247] by `ggregory`)
-* Fix string substitution recursion. (for https://issues.apache.org/jira/browse/LOG4J2-3230[LOG4J2-3230] by `ckozak`)
-* Log4j 1.2 bridge API hard codes the Syslog protocol to TCP. (for https://issues.apache.org/jira/browse/LOG4J2-3237[LOG4J2-3237] by `ggregory`)
+* Log4j 1.2 bridge for Syslog Appender defaults to port 512 instead of 514. (for https://issues.apache.org/jira/browse/LOG4J2-3249[LOG4J2-3249] by `ggregory`)
diff --git a/src/site/asciidoc/changelog/2.17.1.adoc b/src/site/asciidoc/changelog/2.17.1.adoc
index 6464c83cd6..46f4460829 100644
--- a/src/site/asciidoc/changelog/2.17.1.adoc
+++ b/src/site/asciidoc/changelog/2.17.1.adoc
@@ -51,14 +51,14 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
* Fix NPE when input is null in StrSubstitutor.replace(String, Properties). (by `ggregory`)
-* Lookups with no prefix only read values from the configuration properties as expected. (for https://issues.apache.org/jira/browse/LOG4J2-3270[LOG4J2-3270] by `ckozak`)
-* JdbcAppender now uses JndiManager to access JNDI resources. JNDI is only enabled when system property
- log4j2.enableJndiJdbc is set to true. (for https://issues.apache.org/jira/browse/LOG4J2-3293[LOG4J2-3293] by `ggregory`)
-* ExtendedLoggerWrapper.logMessage no longer double-logs when location is requested. (for https://issues.apache.org/jira/browse/LOG4J2-3292[LOG4J2-3292] by `ckozak`)
-* log4j-to-slf4j no longer re-interpolates formatted message contents. (for https://issues.apache.org/jira/browse/LOG4J2-3289[LOG4J2-3289] by `ckozak`)
-* Reduce ignored package scope of KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-3256[LOG4J2-3256] by `ggregory`, Lee Dongjin)
-* log4j-to-slf4j takes the provided MessageFactory into account (for https://issues.apache.org/jira/browse/LOG4J2-3284[LOG4J2-3284] by `ckozak`, Michael Vorburger)
-* Remove unused method. (for https://issues.apache.org/jira/browse/LOG4J2-3290[LOG4J2-3290] by `rgoers`)
* Correct SpringLookup package name in Interpolator. (for https://issues.apache.org/jira/browse/LOG4J2-3204[LOG4J2-3204] by `vy`, Francis-FY)
+* Reduce ignored package scope of KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-3256[LOG4J2-3256] by `ggregory`, Lee Dongjin)
* Fix MapLookup to lookup MapMessage before DefaultMap (for https://issues.apache.org/jira/browse/LOG4J2-3264[LOG4J2-3264] by `ckozak`, Yanming Zhou)
+* Lookups with no prefix only read values from the configuration properties as expected. (for https://issues.apache.org/jira/browse/LOG4J2-3270[LOG4J2-3270] by `ckozak`)
* Buffered I/O checked had inverted logic in RollingFileAppenderBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-3274[LOG4J2-3274] by `rgoers`, Faisal Khan Thayub Khan)
+* log4j-to-slf4j takes the provided MessageFactory into account (for https://issues.apache.org/jira/browse/LOG4J2-3284[LOG4J2-3284] by `ckozak`, Michael Vorburger)
+* log4j-to-slf4j no longer re-interpolates formatted message contents. (for https://issues.apache.org/jira/browse/LOG4J2-3289[LOG4J2-3289] by `ckozak`)
+* Remove unused method. (for https://issues.apache.org/jira/browse/LOG4J2-3290[LOG4J2-3290] by `rgoers`)
+* ExtendedLoggerWrapper.logMessage no longer double-logs when location is requested. (for https://issues.apache.org/jira/browse/LOG4J2-3292[LOG4J2-3292] by `ckozak`)
+* JdbcAppender now uses JndiManager to access JNDI resources. JNDI is only enabled when system property
+ log4j2.enableJndiJdbc is set to true. (for https://issues.apache.org/jira/browse/LOG4J2-3293[LOG4J2-3293] by `ggregory`)
diff --git a/src/site/asciidoc/changelog/2.17.2.adoc b/src/site/asciidoc/changelog/2.17.2.adoc
index f3f3106482..42b60bd773 100644
--- a/src/site/asciidoc/changelog/2.17.2.adoc
+++ b/src/site/asciidoc/changelog/2.17.2.adoc
@@ -64,106 +64,106 @@ For complete information on Apache Log4j 2, including instructions on how to sub
* Add Configurator.setLevel(Logger, Level), setLevel(String, String), and setLevel(Class, Level). (by `ggregory`)
* Add org.apache.logging.log4j.core.appender.AsyncAppender.getAppenders() to more easily port from org.apache.log4j.AsyncAppender.getAllAppenders(). (by `ggregory`)
-* Limit loading of configuration via a url to https by default. (for https://issues.apache.org/jira/browse/LOG4J2-3297[LOG4J2-3297] by `rgoers`)
* Require log4j2.Script.enableLanguages to be specified to enable scripting for specific languages. (for https://issues.apache.org/jira/browse/LOG4J2-2486[LOG4J2-2486] by `rgoers`)
-* Add shorthand syntax for properties configuration format for specifying a logger level and appender refs. (for https://issues.apache.org/jira/browse/LOG4J2-3341[LOG4J2-3341] by `rgoers`)
+* Add the log4j-to-jul JDK Logging Bridge (for https://issues.apache.org/jira/browse/LOG4J2-3282[LOG4J2-3282] by `ckozak`, Michael Vorburger)
+* Limit loading of configuration via a url to https by default. (for https://issues.apache.org/jira/browse/LOG4J2-3297[LOG4J2-3297] by `rgoers`)
* Add TB support to FileSize. (for https://issues.apache.org/jira/browse/LOG4J2-3303[LOG4J2-3303] by `vy`, ramananravi)
+* Add shorthand syntax for properties configuration format for specifying a logger level and appender refs. (for https://issues.apache.org/jira/browse/LOG4J2-3341[LOG4J2-3341] by `rgoers`)
* Add optional additional fields to NoSQLAppender. (for https://issues.apache.org/jira/browse/LOG4J2-3391[LOG4J2-3391] by `ggregory`, Gary Gregory)
-* Add the log4j-to-jul JDK Logging Bridge (for https://issues.apache.org/jira/browse/LOG4J2-3282[LOG4J2-3282] by `ckozak`, Michael Vorburger)
=== Changed
+* Bump Jackson from 2.12.4 to 2.13.1. (by `ggregory`)
+* Bump Mockito from 3.11.2 to 4.2.0. (by `ggregory`)
* Bump Woodstox 6.2.6 to 6.2.8. (by `ggregory`)
* Bump awaitility from 4.0.3 to 4.1.1 #663. (by `ggregory`)
* Bump de.flapdoodle.embed:de.flapdoodle.embed.mongo from 3.0.0 to 3.4.1. Update tests for binary incompatibilities in APIs. (by `ggregory`)
-* Bump Jackson from 2.12.4 to 2.13.1. (by `ggregory`)
-* Bump Mockito from 3.11.2 to 4.2.0. (by `ggregory`)
-* Bump org.jacoco:jacoco-maven-plugin from 0.8.6 to 0.8.7. (by `ggregory`)
-* Bump org.apache.activemq:activemq-broker from 5.16.3 to 5.16.4. (by `ggregory`)
-* Bump net.javacrumbs.json-unit:json-unit from 2.27.0 to 2.28.0. (by `ggregory`)
-* Bump org.junit.jupiter:junit-* from 5.7.2 to 5.8.2. (by `ggregory`)
* Bump maven-compiler-plugin from 3.8.1 to 3.9.0. (by `ggregory`)
-* Bump org.springframework:spring-* from 5.3.13 to 5.3.15. (by `ggregory`)
+* Bump mongodb3.version from 3.12.4 to 3.12.10 #605. (by `ggregory`)
+* Bump net.javacrumbs.json-unit:json-unit from 2.27.0 to 2.28.0. (by `ggregory`)
+* Bump org.apache.activemq:activemq-broker from 5.16.3 to 5.16.4. (by `ggregory`)
* Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.3.1 to 3.3.2. (by `ggregory`)
-* Bump org.mongodb:bson from 4.2.2 to 4.5.0. (by `ggregory`)
* Bump org.assertj:assertj-core from 3.20.2 to 3.22.0. (by `ggregory`)
* Bump org.codehaus.groovy:groovy-* from 3.0.8 to 3.0.9. (by `ggregory`)
-* Bump org.junit-pioneer:junit-pioneer from 1.5.0 to 1.6.1. (by `ggregory`)
-* Bump mongodb3.version from 3.12.4 to 3.12.10 #605. (by `ggregory`)
* Bump org.eclipse.persistence:org.eclipse.persistence.jpa from 2.7.9 to 2.7.10. (by `ggregory`)
-* Bump org.mongodb:mongodb-driver-sync from 4.2.2 to 4.5.0. (by `ggregory`)
* Bump org.fusesource.jansi:jansi from 2.3.4 to 2.4.0. (by `ggregory`)
+* Bump org.jacoco:jacoco-maven-plugin from 0.8.6 to 0.8.7. (by `ggregory`)
+* Bump org.junit.jupiter:junit-* from 5.7.2 to 5.8.2. (by `ggregory`)
+* Bump org.junit-pioneer:junit-pioneer from 1.5.0 to 1.6.1. (by `ggregory`)
+* Bump org.mongodb:bson from 4.2.2 to 4.5.0. (by `ggregory`)
+* Bump org.mongodb:mongodb-driver-sync from 4.2.2 to 4.5.0. (by `ggregory`)
+* Bump org.springframework:spring-* from 5.3.13 to 5.3.15. (by `ggregory`)
* Bump org.xmlunit:xmlunit-* from 2.8.3 to 2.8.4. (by `ggregory`)
+* Replace usages of "compile" with "implementation" in the Gradle docs. (for https://issues.apache.org/jira/browse/LOG4J2-3215[LOG4J2-3215] by `vy`, quapka)
* Change modifier of method org.apache.logging.log4j.core.tools.Generate#generate to public (was package private) to facilitate automated code generation. (for https://issues.apache.org/jira/browse/LOG4J2-3267[LOG4J2-3267] by `rpopma`)
* log4j-jpl formats message parameters correctly using MessageFormat. (for https://issues.apache.org/jira/browse/LOG4J2-3345[LOG4J2-3345] by `ckozak`)
* Bump Tomcat from 8.5.20 to 10.0.14 in log4j-appserver along with some dependency clean-up. (for https://issues.apache.org/jira/browse/LOG4J2-3368[LOG4J2-3368] by `vy`)
-* Replace usages of "compile" with "implementation" in the Gradle docs. (for https://issues.apache.org/jira/browse/LOG4J2-3215[LOG4J2-3215] by `vy`, quapka)
=== Fixed
-* OptionConverter could cause a StackOverflowError. (for https://issues.apache.org/jira/browse/LOG4J2-3306[LOG4J2-3306] by `rgoers`)
* Fix DTD error: Add missing ELEMENT for Marker. (by `ggregory`)
-* Log4j 1.2 bridge should ignore case in properties file keys. (for https://issues.apache.org/jira/browse/LOG4J2-3316[LOG4J2-3316] by `ggregory`)
+* Fix log4j-jakarta-web service file #723. (by `ggregory`, `pkarwasz`)
* JndiManager reverts to 2.17.0 behavior: Read the system property for each call. (by `ggregory`)
-* Fix RoutingAppender backward compatibility and disallow recursive evaluation of lookup results outside of configuration properties. (for https://issues.apache.org/jira/browse/LOG4J2-3317[LOG4J2-3317] by `ckozak`)
* Log4j 1.2 bridge PropertiesConfiguration.buildAppender not adding filters to custom appender. (for https://issues.apache.org/jira/browse/LOG4J2-3281[LOG4J2-3281] by `ggregory`)
-* Log4j 1.2 bridge adds org.apache.log4j.helpers.LogLog. (by `ggregory`)
-* Log4j 1.2 bridge adds org.apache.log4j.helpers.Loader. (by `ggregory`)
-* Log4j 1.2 bridge adds org.apache.log4j.component.helpers.Constants. (by `ggregory`)
+* Flag LogManager as initialized if the LoggerFactory is provided as a property. (for https://issues.apache.org/jira/browse/LOG4J2-3304[LOG4J2-3304] by `rgoers`, francis-FY)
+* OptionConverter could cause a StackOverflowError. (for https://issues.apache.org/jira/browse/LOG4J2-3306[LOG4J2-3306] by `rgoers`)
+* Log4j 1.2 bridge should ignore case in properties file keys. (for https://issues.apache.org/jira/browse/LOG4J2-3316[LOG4J2-3316] by `ggregory`)
+* Fix RoutingAppender backward compatibility and disallow recursive evaluation of lookup results outside of configuration properties. (for https://issues.apache.org/jira/browse/LOG4J2-3317[LOG4J2-3317] by `ckozak`)
+* Log4j 1.2 bridge class org.apache.log4j.spi.LoggingEvent missing constructors and public instance variable. (for https://issues.apache.org/jira/browse/LOG4J2-3326[LOG4J2-3326] by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge fixes parsing filters in properties configuration file #680. (for https://issues.apache.org/jira/browse/LOG4J2-3326[LOG4J2-3326] by `ggregory`, Gary GregoryBenjamin Röhl)
+* Log4j 1.2 bridge missing OptionConverter.instantiateByKey(Properties, String, Class, Object). (for https://issues.apache.org/jira/browse/LOG4J2-3326[LOG4J2-3326] by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge does not support system properties in log4j.xml. (for https://issues.apache.org/jira/browse/LOG4J2-3328[LOG4J2-3328] by `ggregory`, Gary Gregory)
+* Configurator.setLevel not fetching the correct LoggerContext. (for https://issues.apache.org/jira/browse/LOG4J2-3330[LOG4J2-3330] by `ggregory`, Gary GregoryMircea Lemnaru)
* Fix ThreadContextDataInjector initialization deadlock (for https://issues.apache.org/jira/browse/LOG4J2-3333[LOG4J2-3333] by `ckozak`)
+* Fix substitutions when programmatic configuration is used (for https://issues.apache.org/jira/browse/LOG4J2-3358[LOG4J2-3358] by `ckozak`)
+* AppenderLoggingException logging any exception to a MongoDB Appender. (for https://issues.apache.org/jira/browse/LOG4J2-3392[LOG4J2-3392] by `ggregory`, Omer UGary Gregory)
+* Possible NullPointerException in MongoDb4DocumentObject, MongoDbDocumentObject, DefaultNoSqlObject. (for https://issues.apache.org/jira/browse/LOG4J2-3392[LOG4J2-3392] by `ggregory`, Gary Gregory)
+* Fix DefaultConfiguration leak in PatternLayout (for https://issues.apache.org/jira/browse/LOG4J2-3404[LOG4J2-3404] by `ckozak`, Piotr P. Karwasz)
* Document that the Spring Boot Lookup requires the log4j-spring-boot dependency. (for https://issues.apache.org/jira/browse/LOG4J2-3405[LOG4J2-3405] by `rgoers`)
+* Log4j 1.2 bridge Check for non-existent appender when parsing properties #761. (for https://issues.apache.org/jira/browse/LOG4J2-3407[LOG4J2-3407] by `ggregory`, Kenny MacLeod)
+* Log4j 1.2 bridge supports global threshold #764. (for https://issues.apache.org/jira/browse/LOG4J2-3407[LOG4J2-3407] by `ggregory`, Piotr P. Karwasz)
+* Log4j 1.2 bridge throws a ClassCastException when logging a Map with non-String keys. (for https://issues.apache.org/jira/browse/LOG4J2-3410[LOG4J2-3410] by `ggregory`, Gary GregoryBarry Sham)
* Log4j 1.2 bridge adds org.apache.log4j.Hierarchy. (by `ggregory`)
-* Fix substitutions when programmatic configuration is used (for https://issues.apache.org/jira/browse/LOG4J2-3358[LOG4J2-3358] by `ckozak`)
+* Log4j 1.2 bridge adds org.apache.log4j.component.helpers.Constants. (by `ggregory`)
+* Log4j 1.2 bridge adds org.apache.log4j.helpers.Loader. (by `ggregory`)
+* Log4j 1.2 bridge adds org.apache.log4j.helpers.LogLog. (by `ggregory`)
* Log4j 1.2 bridge adds org.apache.log4j.spi.DefaultRepositorySelector. (by `ggregory`)
+* Log4j 1.2 bridge adds org.apache.log4j.spi.NOPLoggerRepository and NOPLogger. (by `ggregory`)
* Log4j 1.2 bridge adds org.apache.log4j.spi.RootLogger. (by `ggregory`)
-* Log4j 1.2 bridge interface Configurator doConfigure() methods should use LoggerRepository, not LoggerContext. (by `ggregory`)
-* Log4j 1.2 bridge class PropertyConfigurator should implement Configurator. (by `ggregory`)
+* Log4j 1.2 bridge class Category is missing some protected instance variables. (by `ggregory`)
+* Log4j 1.2 bridge class Category should implement AppenderAttachable. (by `ggregory`)
+* Log4j 1.2 bridge class ConsoleAppender should extend WriterAppender and provide better compatibility with custom appenders. (by `ggregory`)
+* Log4j 1.2 bridge class LogManager default constructor should be public. (by `ggregory`)
* Log4j 1.2 bridge class OptionConverter is missing selectAndConfigure() methods. (by `ggregory`)
* Log4j 1.2 bridge class PatternLayout is missing constants DEFAULT_CONVERSION_PATTERN and TTCC_CONVERSION_PATTERN. (by `ggregory`)
-* Log4j 1.2 bridge class LogManager default constructor should be public. (by `ggregory`)
+* Log4j 1.2 bridge class PropertyConfigurator should implement Configurator. (by `ggregory`)
+* Log4j 1.2 bridge creates a SocketAppender instead of a SyslogAppender. (by `ggregory`, Gary Gregory)
* Log4j 1.2 bridge implements LogManager.getCurrentLoggers() fully. (by `ggregory`)
-* Log4j 1.2 bridge class Category should implement AppenderAttachable. (by `ggregory`)
+* Log4j 1.2 bridge implements most of DOMConfigurator. (by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge interface Configurator doConfigure() methods should use LoggerRepository, not LoggerContext. (by `ggregory`)
* Log4j 1.2 bridge interface org.apache.log4j.spi.RendererSupport was in the wrong package and incomplete. (by `ggregory`)
-* Log4j 1.2 bridge class ConsoleAppender should extend WriterAppender and provide better compatibility with custom appenders. (by `ggregory`)
+* Log4j 1.2 bridge interfaces missing from package org.apache.log4j.spi: ThrowableRenderer, ThrowableRendererSupport, TriggeringEventEvaluator. (by `ggregory`)
+* Log4j 1.2 bridge issues with filters #753. (by `ggregory`, Gary GregoryPiotr P. Karwasz)
* Log4j 1.2 bridge method Category.exists(String) should be static. (by `ggregory`)
-* Log4j 1.2 bridge class Category is missing some protected instance variables. (by `ggregory`)
* Log4j 1.2 bridge method NDC.inherit(Stack) should not use generics to provide source compatibility. (by `ggregory`)
-* Log4j 1.2 bridge adds org.apache.log4j.spi.NOPLoggerRepository and NOPLogger. (by `ggregory`)
-* Log4j 1.2 bridge interfaces missing from package org.apache.log4j.spi: ThrowableRenderer, ThrowableRendererSupport, TriggeringEventEvaluator. (by `ggregory`)
-* Log4j 1.2 bridge missing class org.apache.log4j.or.RendererMap. (by `ggregory`)
* Log4j 1.2 bridge methods Category.getChainedPriority() and getEffectiveLevel() should not be final. (by `ggregory`)
* Log4j 1.2 bridge methods missing in org.apache.log4j.Category: getDefaultHierarchy(), getHierarchy(), getLoggerRepository(). (by `ggregory`)
-* Fix log4j-jakarta-web service file #723. (by `ggregory`, `pkarwasz`)
-* AppenderLoggingException logging any exception to a MongoDB Appender. (for https://issues.apache.org/jira/browse/LOG4J2-3392[LOG4J2-3392] by `ggregory`, Omer UGary Gregory)
-* Flag LogManager as initialized if the LoggerFactory is provided as a property. (for https://issues.apache.org/jira/browse/LOG4J2-3304[LOG4J2-3304] by `rgoers`, francis-FY)
-* Configurator.setLevel not fetching the correct LoggerContext. (for https://issues.apache.org/jira/browse/LOG4J2-3330[LOG4J2-3330] by `ggregory`, Gary GregoryMircea Lemnaru)
-* Log4j 1.2 bridge does not support system properties in log4j.xml. (for https://issues.apache.org/jira/browse/LOG4J2-3328[LOG4J2-3328] by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge class org.apache.log4j.spi.LoggingEvent missing constructors and public instance variable. (for https://issues.apache.org/jira/browse/LOG4J2-3326[LOG4J2-3326] by `ggregory`, Gary Gregory)
-* Possible NullPointerException in MongoDb4DocumentObject, MongoDbDocumentObject, DefaultNoSqlObject. (for https://issues.apache.org/jira/browse/LOG4J2-3392[LOG4J2-3392] by `ggregory`, Gary Gregory)
-* Fix DefaultConfiguration leak in PatternLayout (for https://issues.apache.org/jira/browse/LOG4J2-3404[LOG4J2-3404] by `ckozak`, Piotr P. Karwasz)
-* Log4j 1.2 bridge missing OptionConverter.instantiateByKey(Properties, String, Class, Object). (for https://issues.apache.org/jira/browse/LOG4J2-3326[LOG4J2-3326] by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge supports global threshold #764. (for https://issues.apache.org/jira/browse/LOG4J2-3407[LOG4J2-3407] by `ggregory`, Piotr P. Karwasz)
-* Log4j 1.2 bridge Check for non-existent appender when parsing properties #761. (for https://issues.apache.org/jira/browse/LOG4J2-3407[LOG4J2-3407] by `ggregory`, Kenny MacLeod)
-* Log4j 1.2 bridge fixes parsing filters in properties configuration file #680. (for https://issues.apache.org/jira/browse/LOG4J2-3326[LOG4J2-3326] by `ggregory`, Gary GregoryBenjamin Röhl)
-* Log4j 1.2 bridge missing PatternParser. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge creates a SocketAppender instead of a SyslogAppender. (by `ggregory`, Gary Gregory)
* Log4j 1.2 bridge missed (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge missing UtilLoggingLevel. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge throws a ClassCastException when logging a Map with non-String keys. (for https://issues.apache.org/jira/browse/LOG4J2-3410[LOG4J2-3410] by `ggregory`, Gary GregoryBarry Sham)
-* Log4j 1.2 bridge missing PatternConverter. (by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge missed org.apache.log4j.pattern.FormattingInfo. (by `ggregory`, Gary Gregory)
* Log4j 1.2 bridge missed org.apache.log4j.pattern.NameAbbreviator. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge implements most of DOMConfigurator. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge missing FormattingInfo. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge missing some ThrowableInformation constructors. (by `ggregory`, Gary Gregory)
* Log4j 1.2 bridge missing DefaultThrowableRenderer. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge issues with filters #753. (by `ggregory`, Gary GregoryPiotr P. Karwasz)
+* Log4j 1.2 bridge missing FormattingInfo. (by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge missing PatternConverter. (by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge missing PatternParser. (by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge missing UtilLoggingLevel. (by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge missing class org.apache.log4j.or.RendererMap. (by `ggregory`)
* Log4j 1.2 bridge missing some LocationInfo constructors. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge missed org.apache.log4j.pattern.FormattingInfo. (by `ggregory`, Gary Gregory)
+* Log4j 1.2 bridge missing some ThrowableInformation constructors. (by `ggregory`, Gary Gregory)
* Log4j 1.2 bridge now logs a warning instead of throwing an NullPointerException when building a Syslog appender with a missing "SyslogHost" param. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge uses some incorrect default property values in some appenders. (by `ggregory`, Piotr P. Karwasz)
-* Trim whitespace before parsing a String into an Integer. (by `ggregory`, Gary Gregory)
-* Log4j 1.2 bridge supports the SocketAppender. (by `ggregory`, Gary Gregory)
* Log4j 1.2 bridge should allow property and XML attributes to start with either an upper-case or lower-case letter. (by `ggregory`, Piotr P. KarwaszGary Gregory)
+* Log4j 1.2 bridge supports the SocketAppender. (by `ggregory`, Gary Gregory)
* Log4j 1.2 bridge throws ClassCastException when using SimpleLayout and others #708. (by `ggregory`, Piotr P. KarwaszGary Gregory)
-* Log4j 1.2 bridge uses the wrong file pattern for rolling file appenders #710. (by `ggregory`, Piotr P. KarwaszGary Gregory)
+* Log4j 1.2 bridge uses some incorrect default property values in some appenders. (by `ggregory`, Piotr P. Karwasz)
* Log4j 1.2 bridge uses the wrong default values for a TTCCLayout #709. (by `ggregory`, Piotr P. KarwaszGary Gregory)
+* Log4j 1.2 bridge uses the wrong file pattern for rolling file appenders #710. (by `ggregory`, Piotr P. KarwaszGary Gregory)
+* Trim whitespace before parsing a String into an Integer. (by `ggregory`, Gary Gregory)
diff --git a/src/site/asciidoc/changelog/2.18.0.adoc b/src/site/asciidoc/changelog/2.18.0.adoc
index b08a0a0499..a0f9127d9b 100644
--- a/src/site/asciidoc/changelog/2.18.0.adoc
+++ b/src/site/asciidoc/changelog/2.18.0.adoc
@@ -51,55 +51,55 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Add support for adding and retrieving appenders in Log4j 1.x bridge. (for https://issues.apache.org/jira/browse/LOG4J2-3440[LOG4J2-3440] by `pkarwasz`)
* Add support for Jakarta Mail API in the SMTP appender. (for https://issues.apache.org/jira/browse/LOG4J2-3362[LOG4J2-3362] by `pkarwasz`)
* Add support for custom Log4j 1.x levels. (for https://issues.apache.org/jira/browse/LOG4J2-3419[LOG4J2-3419] by `pkarwasz`)
+* Add support for adding and retrieving appenders in Log4j 1.x bridge. (for https://issues.apache.org/jira/browse/LOG4J2-3440[LOG4J2-3440] by `pkarwasz`)
+* Add support for custom LMAX disruptor WaitStrategy configuration. (for https://issues.apache.org/jira/browse/LOG4J2-3472[LOG4J2-3472] by `rpopma`)
* Add support for Apache Extras' RollingFileAppender in Log4j 1.x bridge. (for https://issues.apache.org/jira/browse/LOG4J2-3483[LOG4J2-3483] by `pkarwasz`)
* Add MutableThreadContextMapFilter. (for https://issues.apache.org/jira/browse/LOG4J2-3495[LOG4J2-3495] by `rgoers`)
-* Add support for custom LMAX disruptor WaitStrategy configuration. (for https://issues.apache.org/jira/browse/LOG4J2-3472[LOG4J2-3472] by `rpopma`)
* Add support for 24 colors in highlighting (for https://issues.apache.org/jira/browse/LOG4J2-3538[LOG4J2-3538] by `pkarwasz`, Pavel_K)
=== Changed
* Improves ServiceLoader support on servlet containers. (for https://issues.apache.org/jira/browse/LOG4J2-3427[LOG4J2-3427] by `pkarwasz`)
-* Move perf tests to log4j-core-its (for https://issues.apache.org/jira/browse/LOG4J2-3516[LOG4J2-3516] by `rgoers`)
* Make the default disruptor WaitStrategy used by Async Loggers garbage-free. (for https://issues.apache.org/jira/browse/LOG4J2-3473[LOG4J2-3473] by `rpopma`)
-* Support Spring 2.6.x. (for https://issues.apache.org/jira/browse/LOG4J2-3506[LOG4J2-3506] by `rgoers`)
* Do not throw UnsupportedOperationException when JUL ApiLogger::setLevel is called. (for https://issues.apache.org/jira/browse/LOG4J2-3476[LOG4J2-3476] by `rpopma`)
+* Support Spring 2.6.x. (for https://issues.apache.org/jira/browse/LOG4J2-3506[LOG4J2-3506] by `rgoers`)
+* Move perf tests to log4j-core-its (for https://issues.apache.org/jira/browse/LOG4J2-3516[LOG4J2-3516] by `rgoers`)
* Upgrade the Flume Appender to Flume 1.10.0 (for https://issues.apache.org/jira/browse/LOG4J2-3536[LOG4J2-3536] by `rgoers`)
=== Fixed
+* Fix minor typo #792. (by `ggregory`, LF-Lin)
* Improve validation and reporting of configuration errors. (by `pkarwasz`)
-* SizeBasedTriggeringPolicy would fail to rename files properly when integer pattern contained a leading zero. (for https://issues.apache.org/jira/browse/LOG4J2-3432[LOG4J2-3432] by `rgoers`)
-* LocalizedMessage logs misleading errors on the console. (for https://issues.apache.org/jira/browse/LOG4J2-3458[LOG4J2-3458] by `ggregory`)
+* Allow enterprise id to be an OID fragment. (for https://issues.apache.org/jira/browse/LOG4J2-1376[LOG4J2-1376] by `pkarwasz`, Mark Niggemann)
+* Fix problem with non-uppercase custom levels. (for https://issues.apache.org/jira/browse/LOG4J2-2872[LOG4J2-2872] by `pkarwasz`, Alla Gofman)
+* Avoid ClassCastException in JeroMqManager with custom LoggerContextFactory #791. (for https://issues.apache.org/jira/browse/LOG4J2-3040[LOG4J2-3040] by `ggregory`, LF-Lin)
* DirectWriteRolloverStrategy should use the current time when creating files. (for https://issues.apache.org/jira/browse/LOG4J2-3339[LOG4J2-3339] by `rgoers`)
+* Fixes the syslog appender in Log4j 1.x bridge, when used with a custom layout. (for https://issues.apache.org/jira/browse/LOG4J2-3359[LOG4J2-3359] by `pkarwasz`, Tukesh)
+* log4j-1.2-api 2.17.2 throws NullPointerException while removing appender with name as null. (for https://issues.apache.org/jira/browse/LOG4J2-3359[LOG4J2-3359] by `ggregory`, Rajesh)
+* Improve JsonTemplateLayout performance. (for https://issues.apache.org/jira/browse/LOG4J2-3393[LOG4J2-3393] by `vy`)
* Fix resolution of non-Log4j properties. (for https://issues.apache.org/jira/browse/LOG4J2-3413[LOG4J2-3413] by `pkarwasz`)
-* Update 3rd party dependencies for 2.18.0. (for https://issues.apache.org/jira/browse/LOG4J2-3428[LOG4J2-3428] by `ggregory`)
* Fixes Spring Boot logging system registration in a multi-application environment. (for https://issues.apache.org/jira/browse/LOG4J2-3418[LOG4J2-3418] by `pkarwasz`)
-* Improve JsonTemplateLayout performance. (for https://issues.apache.org/jira/browse/LOG4J2-3393[LOG4J2-3393] by `vy`)
+* JAR file containing Log4j configuration isn't closed. (for https://issues.apache.org/jira/browse/LOG4J2-3423[LOG4J2-3423] by `ggregory`, Radim Tlusty)
* Properties defined in configuration using a value attribute (as opposed to element) are read correctly. (for https://issues.apache.org/jira/browse/LOG4J2-3424[LOG4J2-3424] by `ckozak`)
+* Syslog appender lacks the SocketOptions setting. (for https://issues.apache.org/jira/browse/LOG4J2-3425[LOG4J2-3425] by `ggregory`, Jiří Smolík)
+* Log4j 1.2 bridge should not wrap components unnecessarily. (for https://issues.apache.org/jira/browse/LOG4J2-3426[LOG4J2-3426] by `pkarwasz`, Pooja Pandey)
+* Update 3rd party dependencies for 2.18.0. (for https://issues.apache.org/jira/browse/LOG4J2-3428[LOG4J2-3428] by `ggregory`)
+* SizeBasedTriggeringPolicy would fail to rename files properly when integer pattern contained a leading zero. (for https://issues.apache.org/jira/browse/LOG4J2-3432[LOG4J2-3432] by `rgoers`)
+* Fixes default SslConfiguration, when a custom keystore is used. (for https://issues.apache.org/jira/browse/LOG4J2-3439[LOG4J2-3439] by `pkarwasz`, Jayesh Netravali)
+* Fixes appender concurrency problems in Log4j 1.x bridge. (for https://issues.apache.org/jira/browse/LOG4J2-3447[LOG4J2-3447] by `pkarwasz`, Pooja Pandey)
+* Fix and test for race condition in FileUtils.mkdir(). (for https://issues.apache.org/jira/browse/LOG4J2-3452[LOG4J2-3452] by `pkarwasz`, Stefan Vodita)
+* LocalizedMessage logs misleading errors on the console. (for https://issues.apache.org/jira/browse/LOG4J2-3458[LOG4J2-3458] by `ggregory`)
+* Add missing message parameterization in RegexFilter. (for https://issues.apache.org/jira/browse/LOG4J2-3475[LOG4J2-3475] by `pkarwasz`, Jeremy Lin)
+* Add the missing context stack to JsonLayout template. (for https://issues.apache.org/jira/browse/LOG4J2-3477[LOG4J2-3477] by `vy`, filipc)
+* HttpWatcher did not pass credentials when polling. (for https://issues.apache.org/jira/browse/LOG4J2-3481[LOG4J2-3481] by `rgoers`)
* UrlConnectionFactory.createConnection now accepts an AuthorizationProvider as a parameter. (for https://issues.apache.org/jira/browse/LOG4J2-3482[LOG4J2-3482] by `rgoers`)
* The DirectWriteRolloverStrategy was not detecting the correct index to use during startup. (for https://issues.apache.org/jira/browse/LOG4J2-3490[LOG4J2-3490] by `rgoers`)
-* HttpWatcher did not pass credentials when polling. (for https://issues.apache.org/jira/browse/LOG4J2-3481[LOG4J2-3481] by `rgoers`)
+* Async Loggers were including the location information by default. (for https://issues.apache.org/jira/browse/LOG4J2-3491[LOG4J2-3491] by `rgoers`, Avihai Marchiano)
+* ClassArbiter's newBuilder method referenced the wrong class. (for https://issues.apache.org/jira/browse/LOG4J2-3493[LOG4J2-3493] by `rgoers`, Dmytro Voloshyn)
* Don't use Paths.get() to avoid circular file systems. (for https://issues.apache.org/jira/browse/LOG4J2-3527[LOG4J2-3527] by `rgoers`)
-* Log4j 1.2 bridge should generate Log4j 2.x messages based on the parameter runtime type. (by `pkarwasz`)
-* Fix problem with non-uppercase custom levels. (for https://issues.apache.org/jira/browse/LOG4J2-2872[LOG4J2-2872] by `pkarwasz`, Alla Gofman)
-* Allow enterprise id to be an OID fragment. (for https://issues.apache.org/jira/browse/LOG4J2-1376[LOG4J2-1376] by `pkarwasz`, Mark Niggemann)
-* Avoid ClassCastException in JeroMqManager with custom LoggerContextFactory #791. (for https://issues.apache.org/jira/browse/LOG4J2-3040[LOG4J2-3040] by `ggregory`, LF-Lin)
-* Fixes the syslog appender in Log4j 1.x bridge, when used with a custom layout. (for https://issues.apache.org/jira/browse/LOG4J2-3359[LOG4J2-3359] by `pkarwasz`, Tukesh)
-* Fix minor typo #792. (by `ggregory`, LF-Lin)
-* Fix and test for race condition in FileUtils.mkdir(). (for https://issues.apache.org/jira/browse/LOG4J2-3452[LOG4J2-3452] by `pkarwasz`, Stefan Vodita)
-* log4j-1.2-api 2.17.2 throws NullPointerException while removing appender with name as null. (for https://issues.apache.org/jira/browse/LOG4J2-3359[LOG4J2-3359] by `ggregory`, Rajesh)
* Fix parsing error, when XInclude is disabled. (for https://issues.apache.org/jira/browse/LOG4J2-3531[LOG4J2-3531] by `pkarwasz`, Simo Nikula)
-* Fixes appender concurrency problems in Log4j 1.x bridge. (for https://issues.apache.org/jira/browse/LOG4J2-3447[LOG4J2-3447] by `pkarwasz`, Pooja Pandey)
* Fix LevelRangeFilterBuilder to align with log4j1's behavior. (for https://issues.apache.org/jira/browse/LOG4J2-3534[LOG4J2-3534] by `pkarwasz`, Yohei Ueki)
-* JAR file containing Log4j configuration isn't closed. (for https://issues.apache.org/jira/browse/LOG4J2-3423[LOG4J2-3423] by `ggregory`, Radim Tlusty)
-* Fixes default SslConfiguration, when a custom keystore is used. (for https://issues.apache.org/jira/browse/LOG4J2-3439[LOG4J2-3439] by `pkarwasz`, Jayesh Netravali)
-* Log4j 1.2 bridge should not wrap components unnecessarily. (for https://issues.apache.org/jira/browse/LOG4J2-3426[LOG4J2-3426] by `pkarwasz`, Pooja Pandey)
-* Async Loggers were including the location information by default. (for https://issues.apache.org/jira/browse/LOG4J2-3491[LOG4J2-3491] by `rgoers`, Avihai Marchiano)
-* Add the missing context stack to JsonLayout template. (for https://issues.apache.org/jira/browse/LOG4J2-3477[LOG4J2-3477] by `vy`, filipc)
-* Add missing message parameterization in RegexFilter. (for https://issues.apache.org/jira/browse/LOG4J2-3475[LOG4J2-3475] by `pkarwasz`, Jeremy Lin)
-* Syslog appender lacks the SocketOptions setting. (for https://issues.apache.org/jira/browse/LOG4J2-3425[LOG4J2-3425] by `ggregory`, Jiří Smolík)
-* ClassArbiter's newBuilder method referenced the wrong class. (for https://issues.apache.org/jira/browse/LOG4J2-3493[LOG4J2-3493] by `rgoers`, Dmytro Voloshyn)
* Fixes problem with wrong ANSI escape code for bright colors (for https://issues.apache.org/jira/browse/LOG4J2-3537[LOG4J2-3537] by `pkarwasz`, Pavel_K)
+* Log4j 1.2 bridge should generate Log4j 2.x messages based on the parameter runtime type. (by `pkarwasz`)
diff --git a/src/site/asciidoc/changelog/2.19.0.adoc b/src/site/asciidoc/changelog/2.19.0.adoc
index 902a934604..11e8058116 100644
--- a/src/site/asciidoc/changelog/2.19.0.adoc
+++ b/src/site/asciidoc/changelog/2.19.0.adoc
@@ -56,30 +56,30 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Changed
-* Allow Plugins to be injected with the LoggerContext reference. (for https://issues.apache.org/jira/browse/LOG4J2-3589[LOG4J2-3589] by `rgoers`)
-* Allow PropertySources to be added. (for https://issues.apache.org/jira/browse/LOG4J2-3588[LOG4J2-3588] by `rgoers`)
* Add getExplicitLevel method to LoggerConfig. (for https://issues.apache.org/jira/browse/LOG4J2-3572[LOG4J2-3572] by `rgoers`)
+* Allow PropertySources to be added. (for https://issues.apache.org/jira/browse/LOG4J2-3588[LOG4J2-3588] by `rgoers`)
+* Allow Plugins to be injected with the LoggerContext reference. (for https://issues.apache.org/jira/browse/LOG4J2-3589[LOG4J2-3589] by `rgoers`)
=== Removed
-* Remove SLF4J 1.8.x binding. (for https://issues.apache.org/jira/browse/LOG4J2-3590[LOG4J2-3590] by `pkarwasz`)
* Removed build page in favor of a single build instructions file. (for https://issues.apache.org/jira/browse/LOG4J2-3573[LOG4J2-3573] by `vy`, Wolff Bock von Wuelfingen)
+* Remove SLF4J 1.8.x binding. (for https://issues.apache.org/jira/browse/LOG4J2-3590[LOG4J2-3590] by `pkarwasz`)
=== Fixed
-* Make StatusConsoleListener use SimpleLogger internally. (for https://issues.apache.org/jira/browse/LOG4J2-3584[LOG4J2-3584] by `vy`)
-* Fix NPE in `log4j-to-jul` in the case the root logger level is null. (for https://issues.apache.org/jira/browse/LOG4J2-3564[LOG4J2-3564] by `pkarwasz`)
-* Generate new SSL certs for testing. (for https://issues.apache.org/jira/browse/LOG4J2-3578[LOG4J2-3578] by `rgoers`)
-* Add async support to `Log4jServletFilter`. (for https://issues.apache.org/jira/browse/LOG4J2-708[LOG4J2-708] by `pkarwasz`)
-* Fix RollingRandomAccessFileAppender with DirectWriteRolloverStrategy can't create the first log file of different directory. (for https://issues.apache.org/jira/browse/LOG4J2-3565[LOG4J2-3565] by `pkarwasz`, Su Pei Tao)
-* Fix ServiceLoaderUtil behavior in the presence of a SecurityManager. (for https://issues.apache.org/jira/browse/LOG4J2-3579[LOG4J2-3579] by `pkarwasz`, Boris Unckel)
-* SystemPropertyArbiter was assigning the value as the name. (for https://issues.apache.org/jira/browse/LOG4J2-3550[LOG4J2-3550] by `rgoers`, DongjianPeng)
-* Fix recursion between Log4j 1.2 LogManager and Category. (for https://issues.apache.org/jira/browse/LOG4J2-3557[LOG4J2-3557] by `pkarwasz`, Andreas Leitgeb)
-* Allows a space separated list of style specifiers in the %style pattern for consistency with %highlight. (for https://issues.apache.org/jira/browse/LOG4J2-3561[LOG4J2-3561] by `pkarwasz`, Robert Papp)
-* Make JsonTemplateLayout stack trace truncation operate for each label block. (for https://issues.apache.org/jira/browse/LOG4J2-3556[LOG4J2-3556] by `vy`, Arthur Gavlyukovskiy)
* Add correct manifest entries for OSGi to log4j-jcl (for https://issues.apache.org/jira/browse/LOG4J2-3545[LOG4J2-3545] by `pkarwasz`, Johan Compagner)
-* Logger$PrivateConfig.filter(Level, Marker, String) was allocating empty varargs array. (for https://issues.apache.org/jira/browse/LOG4J2-3560[LOG4J2-3560] by `ckozak`, David Schlosnagle)
* Improve support for passwordless keystores. (for https://issues.apache.org/jira/browse/LOG4J2-3548[LOG4J2-3548] by `pkarwasz`, Kristof Farkas-Pall)
+* SystemPropertyArbiter was assigning the value as the name. (for https://issues.apache.org/jira/browse/LOG4J2-3550[LOG4J2-3550] by `rgoers`, DongjianPeng)
+* Make JsonTemplateLayout stack trace truncation operate for each label block. (for https://issues.apache.org/jira/browse/LOG4J2-3556[LOG4J2-3556] by `vy`, Arthur Gavlyukovskiy)
+* Fix recursion between Log4j 1.2 LogManager and Category. (for https://issues.apache.org/jira/browse/LOG4J2-3557[LOG4J2-3557] by `pkarwasz`, Andreas Leitgeb)
* Fix resolution of properties not starting with `log4j2.`. (for https://issues.apache.org/jira/browse/LOG4J2-3559[LOG4J2-3559] by `pkarwasz`, Gary Gregory)
+* Logger$PrivateConfig.filter(Level, Marker, String) was allocating empty varargs array. (for https://issues.apache.org/jira/browse/LOG4J2-3560[LOG4J2-3560] by `ckozak`, David Schlosnagle)
+* Allows a space separated list of style specifiers in the %style pattern for consistency with %highlight. (for https://issues.apache.org/jira/browse/LOG4J2-3561[LOG4J2-3561] by `pkarwasz`, Robert Papp)
+* Fix NPE in `log4j-to-jul` in the case the root logger level is null. (for https://issues.apache.org/jira/browse/LOG4J2-3564[LOG4J2-3564] by `pkarwasz`)
+* Fix RollingRandomAccessFileAppender with DirectWriteRolloverStrategy can't create the first log file of different directory. (for https://issues.apache.org/jira/browse/LOG4J2-3565[LOG4J2-3565] by `pkarwasz`, Su Pei Tao)
+* Generate new SSL certs for testing. (for https://issues.apache.org/jira/browse/LOG4J2-3578[LOG4J2-3578] by `rgoers`)
+* Fix ServiceLoaderUtil behavior in the presence of a SecurityManager. (for https://issues.apache.org/jira/browse/LOG4J2-3579[LOG4J2-3579] by `pkarwasz`, Boris Unckel)
+* Make StatusConsoleListener use SimpleLogger internally. (for https://issues.apache.org/jira/browse/LOG4J2-3584[LOG4J2-3584] by `vy`)
* Fix regression in Rfc5424Layout default values. (for https://issues.apache.org/jira/browse/LOG4J2-3587[LOG4J2-3587] by `pkarwasz`, Tomas Micko)
* Harden InstantFormatter against delegate failures. (for https://issues.apache.org/jira/browse/LOG4J2-3614[LOG4J2-3614] by `vy`, strainu)
+* Add async support to `Log4jServletFilter`. (for https://issues.apache.org/jira/browse/LOG4J2-708[LOG4J2-708] by `pkarwasz`)
diff --git a/src/site/asciidoc/changelog/2.2.adoc b/src/site/asciidoc/changelog/2.2.adoc
index 1cc56c0482..220b489474 100644
--- a/src/site/asciidoc/changelog/2.2.adoc
+++ b/src/site/asciidoc/changelog/2.2.adoc
@@ -44,45 +44,45 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Specify the SocketAppender connect timeout value as part of the configuration.
- The SyslogAppender takes a new parameter connectTimeoutMillis. (for https://issues.apache.org/jira/browse/LOG4J2-899[LOG4J2-899] by `ggregory`)
* Specify the SyslogAppender connect timeout value as part of the configuration.
The SyslogAppender takes a new parameter connectTimeoutMillis. (for https://issues.apache.org/jira/browse/LOG4J2-895[LOG4J2-895] by `ggregory`)
-* Allow JSON layout to create one compact log record per line. (for https://issues.apache.org/jira/browse/LOG4J2-941[LOG4J2-941] by `ggregory`, Konstantinos Liakos)
+* Specify the SocketAppender connect timeout value as part of the configuration.
+ The SyslogAppender takes a new parameter connectTimeoutMillis. (for https://issues.apache.org/jira/browse/LOG4J2-899[LOG4J2-899] by `ggregory`)
* HTML layout should not use attribute minimalization for hr noshade. (for https://issues.apache.org/jira/browse/LOG4J2-933[LOG4J2-933] by `ggregory`, ppiman)
+* Allow JSON layout to create one compact log record per line. (for https://issues.apache.org/jira/browse/LOG4J2-941[LOG4J2-941] by `ggregory`, Konstantinos Liakos)
=== Changed
-* Update org.eclipse.osgi from 3.6.0 to 3.7.1. (for https://issues.apache.org/jira/browse/LOG4J2-884[LOG4J2-884] by `ggregory`)
* Update Jackson from 2.4.2 to 2.4.3. (for https://issues.apache.org/jira/browse/LOG4J2-881[LOG4J2-881] by `ggregory`)
-* Update tests from org.apache.felix.framework 4.2.1 to 4.4.1. (for https://issues.apache.org/jira/browse/LOG4J2-883[LOG4J2-883] by `ggregory`)
* Update maven-core from 3.1.0 to 3.2.3. (for https://issues.apache.org/jira/browse/LOG4J2-882[LOG4J2-882] by `ggregory`)
-* Update Jackson from 2.4.3 to 2.4.4. (for https://issues.apache.org/jira/browse/LOG4J2-910[LOG4J2-910] by `ggregory`)
+* Update tests from org.apache.felix.framework 4.2.1 to 4.4.1. (for https://issues.apache.org/jira/browse/LOG4J2-883[LOG4J2-883] by `ggregory`)
+* Update org.eclipse.osgi from 3.6.0 to 3.7.1. (for https://issues.apache.org/jira/browse/LOG4J2-884[LOG4J2-884] by `ggregory`)
* Update Apache Flume from 1.5.0.1 to 1.5.2. (for https://issues.apache.org/jira/browse/LOG4J2-900[LOG4J2-900] by `ggregory`)
+* Update docs for SyslogAppender: "No structured id name was supplied" (for https://issues.apache.org/jira/browse/LOG4J2-901[LOG4J2-901] by `ggregory`, Tihomir Meščić, Siegfried Greisinger)
+* Update Jackson from 2.4.3 to 2.4.4. (for https://issues.apache.org/jira/browse/LOG4J2-910[LOG4J2-910] by `ggregory`)
* Update from Jackson 2.4.4 to 2.5.0. (for https://issues.apache.org/jira/browse/LOG4J2-925[LOG4J2-925] by `ggregory`)
+* Incorrect attribute name in PropertiesRewritePolicy example. (for https://issues.apache.org/jira/browse/LOG4J2-950[LOG4J2-950] by `ggregory`, Joel Edwards)
* Documentation: clarify system properties to control status logger, improve troubleshooting FAQ entry. (for https://issues.apache.org/jira/browse/LOG4J2-955[LOG4J2-955] by `rpopma`)
* Update from Jackson 2.5.0 to 2.5.1. (for https://issues.apache.org/jira/browse/LOG4J2-958[LOG4J2-958] by `ggregory`)
-* Update docs for SyslogAppender: "No structured id name was supplied" (for https://issues.apache.org/jira/browse/LOG4J2-901[LOG4J2-901] by `ggregory`, Tihomir Meščić, Siegfried Greisinger)
-* Incorrect attribute name in PropertiesRewritePolicy example. (for https://issues.apache.org/jira/browse/LOG4J2-950[LOG4J2-950] by `ggregory`, Joel Edwards)
=== Fixed
+* ThrowableProxy throws NoClassDefFoundError. (for https://issues.apache.org/jira/browse/LOG4J2-834[LOG4J2-834] by `ggregory`, Nikita Koval, Leonard Broman, Thiago Kronig)
+* AbstractLifecycle should not implement equals() and hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-881[LOG4J2-881] by `ggregory`, Mariano Gonzalez)
* AbstractLifecycle should not implement equals() and hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-891[LOG4J2-891] by `ggregory`)
-* XML configuration does not report full error message for XInclude parser configuration problems. (for https://issues.apache.org/jira/browse/LOG4J2-912[LOG4J2-912] by `ggregory`)
-* Javadoc for org.apache.log4j.BasicConfigurator.configure() is incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-897[LOG4J2-897] by `ggregory`)
* JUL adapter does not map Log4j'2 FATAL level to a JUL level. (for https://issues.apache.org/jira/browse/LOG4J2-892[LOG4J2-892] by `ggregory`)
* NullPointerException on filter when mapping JUL to Log4j2. (for https://issues.apache.org/jira/browse/LOG4J2-893[LOG4J2-893] by `ggregory`)
-* ThrowableProxy throws NoClassDefFoundError. (for https://issues.apache.org/jira/browse/LOG4J2-834[LOG4J2-834] by `ggregory`, Nikita Koval, Leonard Broman, Thiago Kronig)
+* Javadoc for org.apache.log4j.BasicConfigurator.configure() is incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-897[LOG4J2-897] by `ggregory`)
+* ClassLoaderContextSelector uses ClassLoader.toString() as a key (for https://issues.apache.org/jira/browse/LOG4J2-903[LOG4J2-903] by `ggregory`, Mauro Molinari)
+* XML configuration does not report full error message for XInclude parser configuration problems. (for https://issues.apache.org/jira/browse/LOG4J2-912[LOG4J2-912] by `ggregory`)
+* ThrowableProxy.getExtendedStackTraceAsString causes NullPointerException. (for https://issues.apache.org/jira/browse/LOG4J2-914[LOG4J2-914] by `ggregory`, Kaj Bjurman)
+* Logging system fails to initialize if XInclude API is not available. (for https://issues.apache.org/jira/browse/LOG4J2-919[LOG4J2-919] by `ggregory`, David Johle)
+* Log4j 1.2 Bridge doesn't map level ALL correctly in Category.getEffectiveLevel(). (for https://issues.apache.org/jira/browse/LOG4J2-924[LOG4J2-924] by `ggregory`, Ryan Rupp)
+* ConsoleAppender is missing @PluginFactory annotation at createAppender method. (for https://issues.apache.org/jira/browse/LOG4J2-931[LOG4J2-931] by `ggregory`, Robert Gacki)
* (JMX) To avoid memory leaks when web applications are restarted, JMX notifications are sent from
the caller thread in web applications. For non-web applications notifications are sent from a background thread
as before. (for https://issues.apache.org/jira/browse/LOG4J2-938[LOG4J2-938] by `rpopma`, Mauro Molinari)
+* Log4j Flume appender is not adding millisecond to the event headers when the event is logged at 000 milliseconds. (for https://issues.apache.org/jira/browse/LOG4J2-944[LOG4J2-944] by `ggregory`, Vinayaka Ramachandra)
* [docs] Using Log4j 2 in Web Applications: Update example (Log4jWebLifeCycle is not visible). (for https://issues.apache.org/jira/browse/LOG4J2-946[LOG4J2-946] by `ggregory`, artemonster)
-* AbstractLifecycle should not implement equals() and hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-881[LOG4J2-881] by `ggregory`, Mariano Gonzalez)
-* ConsoleAppender is missing @PluginFactory annotation at createAppender method. (for https://issues.apache.org/jira/browse/LOG4J2-931[LOG4J2-931] by `ggregory`, Robert Gacki)
* Manual refers to Route "AppenderRef" attribute, should be "ref". (for https://issues.apache.org/jira/browse/LOG4J2-956[LOG4J2-956] by `ggregory`, David Kellerman)
-* ThrowableProxy.getExtendedStackTraceAsString causes NullPointerException. (for https://issues.apache.org/jira/browse/LOG4J2-914[LOG4J2-914] by `ggregory`, Kaj Bjurman)
-* Log4j Flume appender is not adding millisecond to the event headers when the event is logged at 000 milliseconds. (for https://issues.apache.org/jira/browse/LOG4J2-944[LOG4J2-944] by `ggregory`, Vinayaka Ramachandra)
-* Log4j 1.2 Bridge doesn't map level ALL correctly in Category.getEffectiveLevel(). (for https://issues.apache.org/jira/browse/LOG4J2-924[LOG4J2-924] by `ggregory`, Ryan Rupp)
-* ClassLoaderContextSelector uses ClassLoader.toString() as a key (for https://issues.apache.org/jira/browse/LOG4J2-903[LOG4J2-903] by `ggregory`, Mauro Molinari)
-* Logging system fails to initialize if XInclude API is not available. (for https://issues.apache.org/jira/browse/LOG4J2-919[LOG4J2-919] by `ggregory`, David Johle)
* Missing toUpperCase(Locale.ENGLISH). (for https://issues.apache.org/jira/browse/LOG4J2-957[LOG4J2-957] by `ggregory`, Fatih Guleryuz)
diff --git a/src/site/asciidoc/changelog/2.3.adoc b/src/site/asciidoc/changelog/2.3.adoc
index 29044ba936..c0f566d6b2 100644
--- a/src/site/asciidoc/changelog/2.3.adoc
+++ b/src/site/asciidoc/changelog/2.3.adoc
@@ -50,32 +50,32 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Changed
-* Update Slf4j from 1.7.7 to 1.7.12. (for https://issues.apache.org/jira/browse/LOG4J2-1005[LOG4J2-1005] by `ggregory`)
* Update Jackson from 2.5.1 to 2.5.3. (for https://issues.apache.org/jira/browse/LOG4J2-1004[LOG4J2-1004] by `ggregory`)
-* Move UTF-8 constant from Charsets to Constants class. Remove Charsets class. (for https://issues.apache.org/jira/browse/LOG4J2-995[LOG4J2-995] by `rgoers`)
-* Update tests to use ActiveMQ from 5.10 to 5.11.1. (for https://issues.apache.org/jira/browse/LOG4J2-988[LOG4J2-988] by `ggregory`)
+* Update Slf4j from 1.7.7 to 1.7.12. (for https://issues.apache.org/jira/browse/LOG4J2-1005[LOG4J2-1005] by `ggregory`)
* Migrate tests from Logback 1.1.2 to 1.1.3. (for https://issues.apache.org/jira/browse/LOG4J2-987[LOG4J2-987] by `ggregory`)
* Update LMAX Disruptor from 3.3.0 to 3.3.2. (for https://issues.apache.org/jira/browse/LOG4J2-988[LOG4J2-988] by `ggregory`)
+* Update tests to use ActiveMQ from 5.10 to 5.11.1. (for https://issues.apache.org/jira/browse/LOG4J2-988[LOG4J2-988] by `ggregory`)
+* Move UTF-8 constant from Charsets to Constants class. Remove Charsets class. (for https://issues.apache.org/jira/browse/LOG4J2-995[LOG4J2-995] by `rgoers`)
* Make org.apache.logging.log4j.core.Logger#updateConfiguration protected. (for https://issues.apache.org/jira/browse/LOG4J2-998[LOG4J2-998] by `ggregory`, Mariano Gonzalez)
=== Fixed
-* KeyStoreConfiguration.createKeyStoreConfiguration() ignores keyManagerFactoryAlgorithm. (for https://issues.apache.org/jira/browse/LOG4J2-966[LOG4J2-966] by `ggregory`)
-* Deadlock would occur if appender thread creates a new Logger during reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-993[LOG4J2-993] by `rgoers`)
-* org.apache.logging.log4j.core.net.ssl.TlsSyslogInputStreamReader does not need to create temp Integer objects. (for https://issues.apache.org/jira/browse/LOG4J2-972[LOG4J2-972] by `ggregory`)
-* Incorrectly defined compressionType parameter to GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1009[LOG4J2-1009] by `ggregory`, `mikes`)
-* org.apache.logging.log4j.core.config.plugins.util.ResolverUtil.extractPath(URL) incorrectly converts '+' characters to spaces. (for https://issues.apache.org/jira/browse/LOG4J2-1008[LOG4J2-1008] by `rgoers`, `ggregory`)
* JUL Logger.throwing is mis-mapped to ERROR when it should be TRACE. (for https://issues.apache.org/jira/browse/LOG4J2-1003[LOG4J2-1003] by `ggregory`, Dan Armbrust)
* org.apache.logging.log4j.core.util#fileFromUri(URI uri) incorrectly converts '+' characters to spaces. (for https://issues.apache.org/jira/browse/LOG4J2-1007[LOG4J2-1007] by `rgoers`, `ggregory`)
-* Another bad priority in Syslog messages. (for https://issues.apache.org/jira/browse/LOG4J2-971[LOG4J2-971] by `ggregory`, Paul D Johe)
-* Using monitorInterval with YAML config file format causes JSONParseException. (for https://issues.apache.org/jira/browse/LOG4J2-976[LOG4J2-976] by `ggregory`, Matt Quinn)
+* org.apache.logging.log4j.core.config.plugins.util.ResolverUtil.extractPath(URL) incorrectly converts '+' characters to spaces. (for https://issues.apache.org/jira/browse/LOG4J2-1008[LOG4J2-1008] by `rgoers`, `ggregory`)
+* Incorrectly defined compressionType parameter to GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1009[LOG4J2-1009] by `ggregory`, `mikes`)
* A new StatusLoggerAdmin listener is added to StatusLogger every time the log is reconfigured. (for https://issues.apache.org/jira/browse/LOG4J2-947[LOG4J2-947] by `ggregory`, Stefan Wehner)
-* AbstractFilter should not implement equals() and hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-985[LOG4J2-985] by `rpopma`, Sean Dawson)
-* Async root logger config should default includeLocation to false. (for https://issues.apache.org/jira/browse/LOG4J2-991[LOG4J2-991] by `rpopma`, Ryan Rupp)
-* Incorrect unlock in ProviderUtil. (for https://issues.apache.org/jira/browse/LOG4J2-981[LOG4J2-981] by `ggregory`, Mikhail Mazurskiy)
-* Typo in EventLogger documentation. (for https://issues.apache.org/jira/browse/LOG4J2-974[LOG4J2-974] by `ggregory`, Daniel Galán y Martins)
* StringFormattedMessage serialization is incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-964[LOG4J2-964] by `ggregory`, Jonne Jyrylä)
-* Numerical overflow in BurstFilter not handled correctly. (for https://issues.apache.org/jira/browse/LOG4J2-980[LOG4J2-980] by `ggregory`, Mikhail Mazurskiy)
* System.out no longer works after the Console appender and JANSI are initialized. (for https://issues.apache.org/jira/browse/LOG4J2-965[LOG4J2-965] by `ggregory`, Khotyn Huang)
+* KeyStoreConfiguration.createKeyStoreConfiguration() ignores keyManagerFactoryAlgorithm. (for https://issues.apache.org/jira/browse/LOG4J2-966[LOG4J2-966] by `ggregory`)
* log4j2.component.properties not read for all properties. (for https://issues.apache.org/jira/browse/LOG4J2-967[LOG4J2-967] by `ggregory`, Stefan Wehner)
* SyslogLayout contains extra space. (for https://issues.apache.org/jira/browse/LOG4J2-968[LOG4J2-968] by `ggregory`, Paul D Johe)
+* Another bad priority in Syslog messages. (for https://issues.apache.org/jira/browse/LOG4J2-971[LOG4J2-971] by `ggregory`, Paul D Johe)
+* org.apache.logging.log4j.core.net.ssl.TlsSyslogInputStreamReader does not need to create temp Integer objects. (for https://issues.apache.org/jira/browse/LOG4J2-972[LOG4J2-972] by `ggregory`)
+* Typo in EventLogger documentation. (for https://issues.apache.org/jira/browse/LOG4J2-974[LOG4J2-974] by `ggregory`, Daniel Galán y Martins)
+* Using monitorInterval with YAML config file format causes JSONParseException. (for https://issues.apache.org/jira/browse/LOG4J2-976[LOG4J2-976] by `ggregory`, Matt Quinn)
+* Numerical overflow in BurstFilter not handled correctly. (for https://issues.apache.org/jira/browse/LOG4J2-980[LOG4J2-980] by `ggregory`, Mikhail Mazurskiy)
+* Incorrect unlock in ProviderUtil. (for https://issues.apache.org/jira/browse/LOG4J2-981[LOG4J2-981] by `ggregory`, Mikhail Mazurskiy)
+* AbstractFilter should not implement equals() and hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-985[LOG4J2-985] by `rpopma`, Sean Dawson)
+* Async root logger config should default includeLocation to false. (for https://issues.apache.org/jira/browse/LOG4J2-991[LOG4J2-991] by `rpopma`, Ryan Rupp)
+* Deadlock would occur if appender thread creates a new Logger during reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-993[LOG4J2-993] by `rgoers`)
diff --git a/src/site/asciidoc/changelog/2.4.1.adoc b/src/site/asciidoc/changelog/2.4.1.adoc
index 38f90d71f9..5de5685f4e 100644
--- a/src/site/asciidoc/changelog/2.4.1.adoc
+++ b/src/site/asciidoc/changelog/2.4.1.adoc
@@ -45,32 +45,32 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Allow PatternLayout to select a pattern to use based on some selection criteria. (for https://issues.apache.org/jira/browse/LOG4J2-1129[LOG4J2-1129] by `rgoers`)
* Add possibility to set shutdown timeout on AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1020[LOG4J2-1020] by `mikes`)
-* Add %equalsIgnoreCase to PatternLayout to test and replace patterns with strings. (for https://issues.apache.org/jira/browse/LOG4J2-1147[LOG4J2-1147] by `ggregory`)
-* Add %notEmpty to PatternLayout to avoid output of patterns where all variables are empty. (for https://issues.apache.org/jira/browse/LOG4J2-1146[LOG4J2-1146] by `ggregory`)
+* Allow PatternLayout to select a pattern to use based on some selection criteria. (for https://issues.apache.org/jira/browse/LOG4J2-1129[LOG4J2-1129] by `rgoers`)
* Add %equals to PatternLayout to test and replace patterns with strings. (for https://issues.apache.org/jira/browse/LOG4J2-1145[LOG4J2-1145] by `ggregory`)
+* Add %notEmpty to PatternLayout to avoid output of patterns where all variables are empty. (for https://issues.apache.org/jira/browse/LOG4J2-1146[LOG4J2-1146] by `ggregory`)
+* Add %equalsIgnoreCase to PatternLayout to test and replace patterns with strings. (for https://issues.apache.org/jira/browse/LOG4J2-1147[LOG4J2-1147] by `ggregory`)
=== Changed
* Update MongoDB driver from 2.13.3 to 3.0.4. (for https://issues.apache.org/jira/browse/LOG4J2-1040[LOG4J2-1040] by `ggregory`)
* Reuse StringBuilder to improve performance for String-based layouts: CSV, GELF, HTML, RFC524, Syslog. (for https://issues.apache.org/jira/browse/LOG4J2-1128[LOG4J2-1128] by `ggregory`)
+* Update mongo-java-driver from 2.13.2 to 2.13.3. (for https://issues.apache.org/jira/browse/LOG4J2-1131[LOG4J2-1131] by `ggregory`)
* Do not use Jackson deprecated methods. (for https://issues.apache.org/jira/browse/LOG4J2-1138[LOG4J2-1138] by `ggregory`)
* Update Jackson from 2.6.1 to 2.6.2. (for https://issues.apache.org/jira/browse/LOG4J2-1139[LOG4J2-1139] by `ggregory`)
-* Performance improvement: backport Java 8 fast ISO-8859-1 String to byte[] encoder to AbstractStringLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1151[LOG4J2-1151] by `rpopma`)
* Update kafka-clients from 0.8.2.1 to 0.8.2.2. (for https://issues.apache.org/jira/browse/LOG4J2-1150[LOG4J2-1150] by `ggregory`)
-* Update mongo-java-driver from 2.13.2 to 2.13.3. (for https://issues.apache.org/jira/browse/LOG4J2-1131[LOG4J2-1131] by `ggregory`)
+* Performance improvement: backport Java 8 fast ISO-8859-1 String to byte[] encoder to AbstractStringLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1151[LOG4J2-1151] by `rpopma`)
* Performance improvement when converting Strings to byte[] arrays. (for https://issues.apache.org/jira/browse/LOG4J2-935[LOG4J2-935] by `rpopma`)
=== Fixed
* Fixed Log4jLookup. (for https://issues.apache.org/jira/browse/LOG4J2-1050[LOG4J2-1050] by `rpopma`)
-* log4j2.xml cannot be parsed on Oracle Weblogic 12c. (for https://issues.apache.org/jira/browse/LOG4J2-1127[LOG4J2-1127] by `ggregory`)
* Web site corrections and updates. (for https://issues.apache.org/jira/browse/LOG4J2-1126[LOG4J2-1126] by `ggregory`)
-* Fixed NullPointerException when only root logger is defined (and no named loggers) in configuration properties file. (for https://issues.apache.org/jira/browse/LOG4J2-1153[LOG4J2-1153] by `rpopma`)
+* log4j2.xml cannot be parsed on Oracle Weblogic 12c. (for https://issues.apache.org/jira/browse/LOG4J2-1127[LOG4J2-1127] by `ggregory`)
* Do not use MongoDB driver 2.13.3 deprecated methods. (for https://issues.apache.org/jira/browse/LOG4J2-1132[LOG4J2-1132] by `ggregory`)
-* Fixed bug where PatternLayout predefined date pattern with time zone always renders default date format. (for https://issues.apache.org/jira/browse/LOG4J2-1149[LOG4J2-1149] by `rpopma`)
+* Compression on rollover was broken: log file was renamed to .zip but not compressed. (for https://issues.apache.org/jira/browse/LOG4J2-1135[LOG4J2-1135] by `rpopma`)
* Fixed bug where headers were not being written to first file with RollingFileAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1140[LOG4J2-1140] by `rpopma`)
-* Add %markerSimpleName in pattern layout should evaluate to marker name (not toString()). (for https://issues.apache.org/jira/browse/LOG4J2-1144[LOG4J2-1144] by `ggregory`)
* Fix potential memory leak in web applications by using a straight ThreadLocal field instead of subclassing ThreadLocal. (for https://issues.apache.org/jira/browse/LOG4J2-1142[LOG4J2-1142] by `rpopma`)
-* Compression on rollover was broken: log file was renamed to .zip but not compressed. (for https://issues.apache.org/jira/browse/LOG4J2-1135[LOG4J2-1135] by `rpopma`)
+* Add %markerSimpleName in pattern layout should evaluate to marker name (not toString()). (for https://issues.apache.org/jira/browse/LOG4J2-1144[LOG4J2-1144] by `ggregory`)
+* Fixed bug where PatternLayout predefined date pattern with time zone always renders default date format. (for https://issues.apache.org/jira/browse/LOG4J2-1149[LOG4J2-1149] by `rpopma`)
+* Fixed NullPointerException when only root logger is defined (and no named loggers) in configuration properties file. (for https://issues.apache.org/jira/browse/LOG4J2-1153[LOG4J2-1153] by `rpopma`)
diff --git a/src/site/asciidoc/changelog/2.4.adoc b/src/site/asciidoc/changelog/2.4.adoc
index 1570922a55..393eab161b 100644
--- a/src/site/asciidoc/changelog/2.4.adoc
+++ b/src/site/asciidoc/changelog/2.4.adoc
@@ -45,55 +45,55 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
+* Add a way to route messages based on the %marker in Layout for RoutingAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1015[LOG4J2-1015] by `ggregory`, Daniel Marcotte)
+* New RewritePolicy for changing level of a log event. (for https://issues.apache.org/jira/browse/LOG4J2-1023[LOG4J2-1023] by `ggregory`, `mikes`)
+* Add a Log4jLookup class to help write log files relative to log4j2.xml. (for https://issues.apache.org/jira/browse/LOG4J2-1050[LOG4J2-1050] by `ggregory`, Adam Retter)
* Add API org.apache.logging.log4j.LogManager.getFormatterLogger(). (for https://issues.apache.org/jira/browse/LOG4J2-1057[LOG4J2-1057] by `ggregory`)
-* Added support for compressing to bzip2 format on file rollover. (for https://issues.apache.org/jira/browse/LOG4J2-1075[LOG4J2-1075] by `rpopma`)
+* Expose Log4jContextFactory's ShutdownCallbackRegistry. (for https://issues.apache.org/jira/browse/LOG4J2-1066[LOG4J2-1066] by `ggregory`, Charles Allen)
* Added support for system nanosecond time in pattern layout. (for https://issues.apache.org/jira/browse/LOG4J2-1074[LOG4J2-1074] by `rpopma`)
+* Added support for compressing to bzip2 format on file rollover. (for https://issues.apache.org/jira/browse/LOG4J2-1075[LOG4J2-1075] by `rpopma`)
* Support additional Apache Commons Compress compression formats on rollover: Deflate, Pack200, XY. (for https://issues.apache.org/jira/browse/LOG4J2-1077[LOG4J2-1077] by `ggregory`)
* Add Comma Separated Value (CSV) layouts for parameter and event logging. (for https://issues.apache.org/jira/browse/LOG4J2-1088[LOG4J2-1088] by `ggregory`)
-* Updated Logger wrapper generator tool to add Java 8 lambda support for custom log levels. (for https://issues.apache.org/jira/browse/LOG4J2-1118[LOG4J2-1118] by `rpopma`)
* Add Core Configurator APIs to change a logger's level. (for https://issues.apache.org/jira/browse/LOG4J2-1090[LOG4J2-1090] by `ggregory`)
-* Add support for configuration via Properties. (for https://issues.apache.org/jira/browse/LOG4J2-635[LOG4J2-635] by `rgoers`)
-* Added support for Java 8 lambda expressions to lazily construct a log message only if
- the requested log level is enabled. (for https://issues.apache.org/jira/browse/LOG4J2-599[LOG4J2-599] by `rpopma`)
-* Add ConfigurationBuilder for programmatic configuration. (for https://issues.apache.org/jira/browse/LOG4J2-952[LOG4J2-952] by `rgoers`)
-* Add a way to route messages based on the %marker in Layout for RoutingAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1015[LOG4J2-1015] by `ggregory`, Daniel Marcotte)
-* New RewritePolicy for changing level of a log event. (for https://issues.apache.org/jira/browse/LOG4J2-1023[LOG4J2-1023] by `ggregory`, `mikes`)
-* New publisher Appender for ZeroMQ (using JeroMQ). (for https://issues.apache.org/jira/browse/LOG4J2-1113[LOG4J2-1113] by `ggregory`, Gary Gregory)
* Add API org.apache.logging.log4j.Level.isInRange(Level, Level). (for https://issues.apache.org/jira/browse/LOG4J2-1105[LOG4J2-1105] by `ggregory`, Gary Gregory)
* Add a LevelRangeFilter class. (for https://issues.apache.org/jira/browse/LOG4J2-1106[LOG4J2-1106] by `ggregory`, Gary Gregory)
-* Add a Log4jLookup class to help write log files relative to log4j2.xml. (for https://issues.apache.org/jira/browse/LOG4J2-1050[LOG4J2-1050] by `ggregory`, Adam Retter)
-* Expose Log4jContextFactory's ShutdownCallbackRegistry. (for https://issues.apache.org/jira/browse/LOG4J2-1066[LOG4J2-1066] by `ggregory`, Charles Allen)
* New Appender for Apache Kafka. (for https://issues.apache.org/jira/browse/LOG4J2-1107[LOG4J2-1107] by `ggregory`, Mikael Ståldal)
+* New publisher Appender for ZeroMQ (using JeroMQ). (for https://issues.apache.org/jira/browse/LOG4J2-1113[LOG4J2-1113] by `ggregory`, Gary Gregory)
+* Updated Logger wrapper generator tool to add Java 8 lambda support for custom log levels. (for https://issues.apache.org/jira/browse/LOG4J2-1118[LOG4J2-1118] by `rpopma`)
+* Added support for Java 8 lambda expressions to lazily construct a log message only if
+ the requested log level is enabled. (for https://issues.apache.org/jira/browse/LOG4J2-599[LOG4J2-599] by `rpopma`)
+* Add support for configuration via Properties. (for https://issues.apache.org/jira/browse/LOG4J2-635[LOG4J2-635] by `rgoers`)
* New module for Liquibase integration. (for https://issues.apache.org/jira/browse/LOG4J2-767[LOG4J2-767] by `ggregory`, `mikes`)
+* Add ConfigurationBuilder for programmatic configuration. (for https://issues.apache.org/jira/browse/LOG4J2-952[LOG4J2-952] by `rgoers`)
=== Changed
-* Allow a list of keys to be specified in the MDC pattern converter. (for https://issues.apache.org/jira/browse/LOG4J2-1022[LOG4J2-1022] by `rgoers`)
* Pass log event when interpolating logger properties. (for https://issues.apache.org/jira/browse/LOG4J2-1010[LOG4J2-1010] by `rgoers`)
+* Update Java platform from Java 6 to 7. From this version onwards, log4j 2 requires Java 7. (for https://issues.apache.org/jira/browse/LOG4J2-1017[LOG4J2-1017] by `ggregory`)
* Update database tests from H2 1.3.175 to 1.3.176. (for https://issues.apache.org/jira/browse/LOG4J2-1018[LOG4J2-1018] by `ggregory`)
-* Update Apache Flume from 1.5.2 to 1.6.0. (for https://issues.apache.org/jira/browse/LOG4J2-1036[LOG4J2-1036] by `ggregory`)
+* Allow a list of keys to be specified in the MDC pattern converter. (for https://issues.apache.org/jira/browse/LOG4J2-1022[LOG4J2-1022] by `rgoers`)
* Log4j2 tries to SystemClassLoader when running on Google AppEngine. (for https://issues.apache.org/jira/browse/LOG4J2-1035[LOG4J2-1035] by `ggregory`)
-* Update Java platform from Java 6 to 7. From this version onwards, log4j 2 requires Java 7. (for https://issues.apache.org/jira/browse/LOG4J2-1017[LOG4J2-1017] by `ggregory`)
-* Avoid creating temporary array object in org.apache.logging.slf4j.Log4jMarker.iterator(). (for https://issues.apache.org/jira/browse/LOG4J2-1063[LOG4J2-1063] by `ggregory`)
+* Update Apache Flume from 1.5.2 to 1.6.0. (for https://issues.apache.org/jira/browse/LOG4J2-1036[LOG4J2-1036] by `ggregory`)
* Update MongoDB driver from 2.11.2 to 2.13.2. (for https://issues.apache.org/jira/browse/LOG4J2-1041[LOG4J2-1041] by `ggregory`)
* Support batchSize in FlumeAvroManager. (for https://issues.apache.org/jira/browse/LOG4J2-1044[LOG4J2-1044] by `rgoers`)
+* Avoid creating temporary array object in org.apache.logging.slf4j.Log4jMarker.iterator(). (for https://issues.apache.org/jira/browse/LOG4J2-1063[LOG4J2-1063] by `ggregory`)
+* Define org.apache.logging.log4j.Marker.equals(Object) and org.apache.logging.log4j.Marker.hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-1065[LOG4J2-1065] by `ggregory`)
* Update Java Mail from 1.5.2 to 1.5.4. (for https://issues.apache.org/jira/browse/LOG4J2-1070[LOG4J2-1070] by `ggregory`)
* Update Jackson from 2.5.3 to 2.5.4. (for https://issues.apache.org/jira/browse/LOG4J2-1079[LOG4J2-1079] by `ggregory`)
-* Define org.apache.logging.log4j.Marker.equals(Object) and org.apache.logging.log4j.Marker.hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-1065[LOG4J2-1065] by `ggregory`)
+* Update Jackson from 2.6.0 to 2.6.1. (for https://issues.apache.org/jira/browse/LOG4J2-1092[LOG4J2-1092] by `ggregory`)
+* Improved performance of ParameterizedMessage::getFormattedMessage by ~2X. (for https://issues.apache.org/jira/browse/LOG4J2-1096[LOG4J2-1096] by `rpopma`)
* PatternLayout timestamp formatting performance improvement: predefined date formats (and variants using
a period '.' millisecond separator instead of ',') are now formatted ~2-10X faster than other date formats. (for https://issues.apache.org/jira/browse/LOG4J2-1097[LOG4J2-1097] by `rpopma`)
-* Update Jackson from 2.6.0 to 2.6.1. (for https://issues.apache.org/jira/browse/LOG4J2-1092[LOG4J2-1092] by `ggregory`)
* Update Apache Commons Compress from 1.9 to 1.10. (for https://issues.apache.org/jira/browse/LOG4J2-1104[LOG4J2-1104] by `ggregory`)
* Add thread name to status logger layout. (for https://issues.apache.org/jira/browse/LOG4J2-1114[LOG4J2-1114] by `ggregory`)
-* Improved performance of ParameterizedMessage::getFormattedMessage by ~2X. (for https://issues.apache.org/jira/browse/LOG4J2-1096[LOG4J2-1096] by `rpopma`)
* LoggerConfig performance improvements: avoid unnecessary lock acquisition, use more efficient data structure. (for https://issues.apache.org/jira/browse/LOG4J2-1120[LOG4J2-1120] by `rpopma`)
-* PatternLayout timestamp formatting performance improvement: replaced synchronized SimpleDateFormat with
- Apache Commons FastDateFormat. This and better caching resulted in a ~3-30X faster timestamp formatting. (for https://issues.apache.org/jira/browse/LOG4J2-812[LOG4J2-812] by `rgoers`)
* PatternLayout performance improvement by caching and reusing a ThreadLocal StringBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-1125[LOG4J2-1125] by `rpopma`)
* Update Jackson from 2.5.4 to 2.6.0. (for https://issues.apache.org/jira/browse/LOG4J2-1879[LOG4J2-1879] by `ggregory`)
-* Fix FindBugs DM_DEFAULT_ENCODING bug in SimpleLogger.logMessage() and simplify code. (for https://issues.apache.org/jira/browse/LOG4J2-959[LOG4J2-959] by `ggregory`)
* MongoDB appender, username and password should be optional. (for https://issues.apache.org/jira/browse/LOG4J2-403[LOG4J2-403] by `ggregory`, Poorna Subhash P, Jeremy Lautman)
+* PatternLayout timestamp formatting performance improvement: replaced synchronized SimpleDateFormat with
+ Apache Commons FastDateFormat. This and better caching resulted in a ~3-30X faster timestamp formatting. (for https://issues.apache.org/jira/browse/LOG4J2-812[LOG4J2-812] by `rgoers`)
* log4j-web-2.1 should work around a bug in JBOSS EAP 6.2. (for https://issues.apache.org/jira/browse/LOG4J2-890[LOG4J2-890] by `ggregory`, `rpopma`, Hassan Kalaldeh, Robert Andersson)
+* Fix FindBugs DM_DEFAULT_ENCODING bug in SimpleLogger.logMessage() and simplify code. (for https://issues.apache.org/jira/browse/LOG4J2-959[LOG4J2-959] by `ggregory`)
=== Removed
@@ -103,36 +103,36 @@ For complete information on Apache Log4j 2, including instructions on how to sub
* ZipCompressAction leaves files open until GC when an IO error takes place. (for https://issues.apache.org/jira/browse/LOG4J2-1019[LOG4J2-1019] by `ggregory`)
* GzCompressAction leaves files open until GC when an IO error takes place. (for https://issues.apache.org/jira/browse/LOG4J2-1020[LOG4J2-1020] by `ggregory`)
+* Custom java.util.logging.Level gives null Log4j Level and causes NPE. (for https://issues.apache.org/jira/browse/LOG4J2-1025[LOG4J2-1025] by `ggregory`, `mikes`)
* HighlightConverter does not obey noConsoleNoAnsi. (for https://issues.apache.org/jira/browse/LOG4J2-1026[LOG4J2-1026] by `ggregory`)
-* Write pending events to Flume when the appender is stopped. (for https://issues.apache.org/jira/browse/LOG4J2-1044[LOG4J2-1044] by `rgoers`)
-* Log4jMarker#remove(Marker) does not respect org.slf4j.Marker contract. (for https://issues.apache.org/jira/browse/LOG4J2-1061[LOG4J2-1061] by `ggregory`)
-* Log4jMarker#contains(Marker) does not respect org.slf4j.Marker contract. (for https://issues.apache.org/jira/browse/LOG4J2-1060[LOG4J2-1060] by `ggregory`)
-* Log4jMarker#add(Marker) does not respect org.slf4j.Marker contract. (for https://issues.apache.org/jira/browse/LOG4J2-1062[LOG4J2-1062] by `ggregory`)
-* org.apache.logging.slf4j.Log4jMarker does not implement org.slf4j.Marker.equals(Object) org.slf4j.Marker.hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-1064[LOG4J2-1064] by `ggregory`)
-* org.apache.logging.log4j.jul.CoreLogger.setLevel() checks for security permission too late. (for https://issues.apache.org/jira/browse/LOG4J2-1110[LOG4J2-1110] by `ggregory`)
-* Fixed potential race condition on reconfiguration. Introduced ReliabilityStrategy to facilitate
- switching between different mechanisms for preventing log events from being dropped on reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-1121[LOG4J2-1121] by `rpopma`)
-* Clarify documentation for combining async with sync loggers. (for https://issues.apache.org/jira/browse/LOG4J2-918[LOG4J2-918] by `rpopma`)
-* Core Configurator.initialize(String, ClassLoader, String) fails to work when config location is a file path. (for https://issues.apache.org/jira/browse/LOG4J2-1123[LOG4J2-1123] by `ggregory`)
* SimpleLogger creates unnecessary Map objects by calling ThreadContext.getContext() instead of getImmutableContext(). (for https://issues.apache.org/jira/browse/LOG4J2-1033[LOG4J2-1033] by `ggregory`, `mikes`)
-* Custom java.util.logging.Level gives null Log4j Level and causes NPE. (for https://issues.apache.org/jira/browse/LOG4J2-1025[LOG4J2-1025] by `ggregory`, `mikes`)
* Backward compatibility issue in log4j-1.2-api NDC pop() and peek(). (for https://issues.apache.org/jira/browse/LOG4J2-1037[LOG4J2-1037] by `ggregory`, Marc Dergacz)
+* Incorrect documentation for layout default charset. (for https://issues.apache.org/jira/browse/LOG4J2-1038[LOG4J2-1038] by `ggregory`, Gili)
+* Socket and Syslog appenders don't take timeout into account at startup. (for https://issues.apache.org/jira/browse/LOG4J2-1042[LOG4J2-1042] by `ggregory`, Guillaume Turri)
+* Write pending events to Flume when the appender is stopped. (for https://issues.apache.org/jira/browse/LOG4J2-1044[LOG4J2-1044] by `rgoers`)
+* Externalize log4j2.xml via URL resource. (for https://issues.apache.org/jira/browse/LOG4J2-1045[LOG4J2-1045] by `ggregory`, Günter Albrecht)
+* Circular Exception cause throws StackOverflowError. (for https://issues.apache.org/jira/browse/LOG4J2-1046[LOG4J2-1046] by `ggregory`, Kenneth Gendron)
+* FileConfigurationMonitor unnecessarily calls System.currentTimeMillis() causing high CPU usage. (for https://issues.apache.org/jira/browse/LOG4J2-1048[LOG4J2-1048] by `rpopma`, Nikhil)
* AsyncAppender now resets the thread interrupted flag after catching InterruptedException. (for https://issues.apache.org/jira/browse/LOG4J2-1049[LOG4J2-1049] by `rpopma`, Robert Schaft)
+* NoClassDefFoundError when starting app on Google App Engine. (for https://issues.apache.org/jira/browse/LOG4J2-1051[LOG4J2-1051] by `ggregory`, Lukasz Lenart)
* Log4jMarker#contains(String) does not respect org.slf4j.Marker contract. (for https://issues.apache.org/jira/browse/LOG4J2-1058[LOG4J2-1058] by `ggregory`, Daniel Branzea)
-* Externalize log4j2.xml via URL resource. (for https://issues.apache.org/jira/browse/LOG4J2-1045[LOG4J2-1045] by `ggregory`, Günter Albrecht)
+* Log4jMarker#contains(Marker) does not respect org.slf4j.Marker contract. (for https://issues.apache.org/jira/browse/LOG4J2-1060[LOG4J2-1060] by `ggregory`)
+* Log4jMarker#remove(Marker) does not respect org.slf4j.Marker contract. (for https://issues.apache.org/jira/browse/LOG4J2-1061[LOG4J2-1061] by `ggregory`)
+* Log4jMarker#add(Marker) does not respect org.slf4j.Marker contract. (for https://issues.apache.org/jira/browse/LOG4J2-1062[LOG4J2-1062] by `ggregory`)
+* org.apache.logging.slf4j.Log4jMarker does not implement org.slf4j.Marker.equals(Object) org.slf4j.Marker.hashCode(). (for https://issues.apache.org/jira/browse/LOG4J2-1064[LOG4J2-1064] by `ggregory`)
+* ThrowableProxy getExtendedStackTraceAsString throws NPE on deserialized nested exceptions. (for https://issues.apache.org/jira/browse/LOG4J2-1067[LOG4J2-1067] by `ggregory`, Sam Braam)
+* Exceptions not logged when using TcpSocketServer + SerializedLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1068[LOG4J2-1068] by `ggregory`, Andy McMullan)
* Improper handling of JSON escape chars when deserializing JSON log events. (for https://issues.apache.org/jira/browse/LOG4J2-1069[LOG4J2-1069] by `ggregory`, Sam Braam)
+* GelfLayout throws exception if some log event fields are null. (for https://issues.apache.org/jira/browse/LOG4J2-1078[LOG4J2-1078] by `ggregory`, `mikes`)
* Misleading StatusLogger WARN event in LogManager with java.util.Map. (for https://issues.apache.org/jira/browse/LOG4J2-1084[LOG4J2-1084] by `ggregory`, Philipp Schneider)
-* Exceptions not logged when using TcpSocketServer + SerializedLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1068[LOG4J2-1068] by `ggregory`, Andy McMullan)
-* ThrowableProxy getExtendedStackTraceAsString throws NPE on deserialized nested exceptions. (for https://issues.apache.org/jira/browse/LOG4J2-1067[LOG4J2-1067] by `ggregory`, Sam Braam)
-* Socket and Syslog appenders don't take timeout into account at startup. (for https://issues.apache.org/jira/browse/LOG4J2-1042[LOG4J2-1042] by `ggregory`, Guillaume Turri)
-* FileConfigurationMonitor unnecessarily calls System.currentTimeMillis() causing high CPU usage. (for https://issues.apache.org/jira/browse/LOG4J2-1048[LOG4J2-1048] by `rpopma`, Nikhil)
* NullPointerException when passing null to java.util.logging.Logger.setLevel(). (for https://issues.apache.org/jira/browse/LOG4J2-1108[LOG4J2-1108] by `ggregory`, Mikael Ståldal)
-* GelfLayout throws exception if some log event fields are null. (for https://issues.apache.org/jira/browse/LOG4J2-1078[LOG4J2-1078] by `ggregory`, `mikes`)
+* org.apache.logging.log4j.jul.CoreLogger.setLevel() checks for security permission too late. (for https://issues.apache.org/jira/browse/LOG4J2-1110[LOG4J2-1110] by `ggregory`)
* OutputStreamManager in ConsoleAppender leaking managers. (for https://issues.apache.org/jira/browse/LOG4J2-1117[LOG4J2-1117] by `ggregory`, Marcus Thiesen)
-* NoClassDefFoundError when starting app on Google App Engine. (for https://issues.apache.org/jira/browse/LOG4J2-1051[LOG4J2-1051] by `ggregory`, Lukasz Lenart)
-* Incorrect documentation for layout default charset. (for https://issues.apache.org/jira/browse/LOG4J2-1038[LOG4J2-1038] by `ggregory`, Gili)
-* Circular Exception cause throws StackOverflowError. (for https://issues.apache.org/jira/browse/LOG4J2-1046[LOG4J2-1046] by `ggregory`, Kenneth Gendron)
-* Header in layout should not be written on application startup if appending to an existing file. Fixes LOG4J2-1030. (for https://issues.apache.org/jira/browse/LOG4J2-889[LOG4J2-889] by `rpopma`, Maciej Karaś, Kenneth Leider)
-* Use System.nanoTime() to measure time intervals. (for https://issues.apache.org/jira/browse/LOG4J2-982[LOG4J2-982] by `ggregory`, Mikhail Mazurskiy)
+* Fixed potential race condition on reconfiguration. Introduced ReliabilityStrategy to facilitate
+ switching between different mechanisms for preventing log events from being dropped on reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-1121[LOG4J2-1121] by `rpopma`)
+* Core Configurator.initialize(String, ClassLoader, String) fails to work when config location is a file path. (for https://issues.apache.org/jira/browse/LOG4J2-1123[LOG4J2-1123] by `ggregory`)
* ExtendedThrowablePatternConverter does not print suppressed exceptions. (for https://issues.apache.org/jira/browse/LOG4J2-684[LOG4J2-684] by `ggregory`, Joern Huxhorn, Mauro Molinari)
+* Header in layout should not be written on application startup if appending to an existing file. Fixes LOG4J2-1030. (for https://issues.apache.org/jira/browse/LOG4J2-889[LOG4J2-889] by `rpopma`, Maciej Karaś, Kenneth Leider)
+* Clarify documentation for combining async with sync loggers. (for https://issues.apache.org/jira/browse/LOG4J2-918[LOG4J2-918] by `rpopma`)
* Circular suppressed Exception throws StackOverflowError. (for https://issues.apache.org/jira/browse/LOG4J2-934[LOG4J2-934] by `ggregory`, Kenneth Gendron)
+* Use System.nanoTime() to measure time intervals. (for https://issues.apache.org/jira/browse/LOG4J2-982[LOG4J2-982] by `ggregory`, Mikhail Mazurskiy)
diff --git a/src/site/asciidoc/changelog/2.5.adoc b/src/site/asciidoc/changelog/2.5.adoc
index 6f88e64f56..31c1044dbb 100644
--- a/src/site/asciidoc/changelog/2.5.adoc
+++ b/src/site/asciidoc/changelog/2.5.adoc
@@ -48,13 +48,13 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
* Add support for JSR 223 scripts in filters and the PatternSelector. (for https://issues.apache.org/jira/browse/LOG4J2-1136[LOG4J2-1136] by `rgoers`)
+* Add getters for source and destination file in file rename action. (for https://issues.apache.org/jira/browse/LOG4J2-1168[LOG4J2-1168] by `ggregory`, Steven Swor)
* Add getters for classes in org.apache.logging.log4j.core.appender.rolling.action. (for https://issues.apache.org/jira/browse/LOG4J2-1175[LOG4J2-1175] by `ggregory`)
* Support use-case for JDBC's CommonDataSource.setLogWriter(PrintWriter) and java.sql.DriverManager.setLogWriter(PrintWriter). (for https://issues.apache.org/jira/browse/LOG4J2-1178[LOG4J2-1178] by `ggregory`)
* Support use case for java.sql.DriverManager.setLogStream(PrintStream). (for https://issues.apache.org/jira/browse/LOG4J2-1187[LOG4J2-1187] by `ggregory`)
-* Allow rollover to occur at any time. Add CronTriggeringPolicy. (for https://issues.apache.org/jira/browse/LOG4J2-89[LOG4J2-89] by `rgoers`)
-* Added system property to allow users to control whether messages should be formatted in the background. (for https://issues.apache.org/jira/browse/LOG4J2-898[LOG4J2-898] by `rpopma`)
* Added support for custom delete actions triggered by a rollover. (for https://issues.apache.org/jira/browse/LOG4J2-435[LOG4J2-435] by `rpopma`, Robert Schaft)
-* Add getters for source and destination file in file rename action. (for https://issues.apache.org/jira/browse/LOG4J2-1168[LOG4J2-1168] by `ggregory`, Steven Swor)
+* Added system property to allow users to control whether messages should be formatted in the background. (for https://issues.apache.org/jira/browse/LOG4J2-898[LOG4J2-898] by `rpopma`)
+* Allow rollover to occur at any time. Add CronTriggeringPolicy. (for https://issues.apache.org/jira/browse/LOG4J2-89[LOG4J2-89] by `rgoers`)
=== Changed
@@ -65,34 +65,34 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
+* Performance improvement when gathering location information. (for https://issues.apache.org/jira/browse/LOG4J2-1029[LOG4J2-1029] by `rpopma`, Stefan Leonhartsberger)
+* Web site corrections and updates. (for https://issues.apache.org/jira/browse/LOG4J2-1156[LOG4J2-1156] by `rpopma`)
+* Fix compilation error for classes annotated with @Plugin. (for https://issues.apache.org/jira/browse/LOG4J2-1157[LOG4J2-1157] by `mattsicker`, Norbert Bartels)
+* Log4J JUL adapter is using MessageFormat on String passed by java.util.function.Supplier<String>. (for https://issues.apache.org/jira/browse/LOG4J2-1158[LOG4J2-1158] by `ggregory`, Gary GregoryMichael Fortin)
* Fixed a ThreadLocal memory leak in Tomcat8 that mentions AsyncLoggers when Async Loggers are not used. (for https://issues.apache.org/jira/browse/LOG4J2-1159[LOG4J2-1159] by `rpopma`)
-* AbstractConfiguration executor should use a DaemonThreadFactory. (for https://issues.apache.org/jira/browse/LOG4J2-1166[LOG4J2-1166] by `rpopma`)
* Improve Log4j initialization status messages. (for https://issues.apache.org/jira/browse/LOG4J2-1165[LOG4J2-1165] by `rpopma`)
-* Fixed ThreadLocal leak [AsyncLogger$Info] on Tomcat when using AsyncLoggerContextSelector. (for https://issues.apache.org/jira/browse/LOG4J2-1172[LOG4J2-1172] by `rpopma`)
-* Web site corrections and updates. (for https://issues.apache.org/jira/browse/LOG4J2-1156[LOG4J2-1156] by `rpopma`)
+* AbstractConfiguration executor should use a DaemonThreadFactory. (for https://issues.apache.org/jira/browse/LOG4J2-1166[LOG4J2-1166] by `rpopma`)
* Use servlet context name for logger context name when available. (for https://issues.apache.org/jira/browse/LOG4J2-1171[LOG4J2-1171] by `rpopma`)
+* Fixed ThreadLocal leak [AsyncLogger$Info] on Tomcat when using AsyncLoggerContextSelector. (for https://issues.apache.org/jira/browse/LOG4J2-1172[LOG4J2-1172] by `rpopma`)
* Fixed rollover error when copying to a directory mapped to a remote Linux host. (for https://issues.apache.org/jira/browse/LOG4J2-1173[LOG4J2-1173] by `rpopma`)
+* Fixed memory leak when log4j jars are in Tomcat's lib folder. (for https://issues.apache.org/jira/browse/LOG4J2-1176[LOG4J2-1176] by `rpopma`)
+* Logger cache does not account for message factory. (for https://issues.apache.org/jira/browse/LOG4J2-1180[LOG4J2-1180] by `ggregory`, Mikael Ståldal)
+* Prefix all thread names Log4j creates with "Log4j2-". (for https://issues.apache.org/jira/browse/LOG4J2-1193[LOG4J2-1193] by `ggregory`)
+* Documentation does not match parameters for LoggerNameLevelRewritePolicy. (for https://issues.apache.org/jira/browse/LOG4J2-1194[LOG4J2-1194] by `ggregory`, Adam Brin)
+* Make KafkaAppender support SerializedLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1195[LOG4J2-1195] by `mikes`, Melvin Du)
+* MongoDbConnection does not close MongoClient. (for https://issues.apache.org/jira/browse/LOG4J2-1196[LOG4J2-1196] by `mattsicker`, René Zanner)
* Better web app support for async loggers: Fixed a memory leak that occurred when the logging jars are placed
in the container's classpath and the configuration file uses AsyncRoot/AsyncLogger.
The problem was that the first web application started the Disruptor background thread [AsyncLoggerConfig-1] but did not stop it until all web apps are stopped.
Each web application now has its own Disruptor which is stopped/started together with the web app. (for https://issues.apache.org/jira/browse/LOG4J2-323[LOG4J2-323] by `rpopma`)
* Reduced memory usage of status messages in bounded queue; support zero-length queue that stores no messages. (for https://issues.apache.org/jira/browse/LOG4J2-324[LOG4J2-324] by `rpopma`)
-* Fixed memory leak when log4j jars are in Tomcat's lib folder. (for https://issues.apache.org/jira/browse/LOG4J2-1176[LOG4J2-1176] by `rpopma`)
-* Prefix all thread names Log4j creates with "Log4j2-". (for https://issues.apache.org/jira/browse/LOG4J2-1193[LOG4J2-1193] by `ggregory`)
-* org.apache.logging.log4j.core.Logger should be serializable. (for https://issues.apache.org/jira/browse/LOG4J2-801[LOG4J2-801] by `mattsicker`)
-* Documentation: fixed minor issues with the site and manual pages. (for https://issues.apache.org/jira/browse/LOG4J2-879[LOG4J2-879] by `rpopma`)
+* Allow triggering policy and rollover strategy to be modified during reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-381[LOG4J2-381] by `rgoers`, Anthony Baldocchi)
* Better web app support for async loggers: it is now possible to place the logging jars in the container's
classpath when making all loggers asynchronous by using AsyncLoggerContextSelector. This fixes a problem where
logging would stop working after stopping and restarting a web application. (for https://issues.apache.org/jira/browse/LOG4J2-493[LOG4J2-493] by `rpopma`)
-* MongoDbConnection does not close MongoClient. (for https://issues.apache.org/jira/browse/LOG4J2-1196[LOG4J2-1196] by `mattsicker`, René Zanner)
-* Documentation does not match parameters for LoggerNameLevelRewritePolicy. (for https://issues.apache.org/jira/browse/LOG4J2-1194[LOG4J2-1194] by `ggregory`, Adam Brin)
-* Log4J JUL adapter is using MessageFormat on String passed by java.util.function.Supplier<String>. (for https://issues.apache.org/jira/browse/LOG4J2-1158[LOG4J2-1158] by `ggregory`, Gary GregoryMichael Fortin)
-* Performance improvement when gathering location information. (for https://issues.apache.org/jira/browse/LOG4J2-1029[LOG4J2-1029] by `rpopma`, Stefan Leonhartsberger)
+* org.apache.logging.log4j.core.Logger should be serializable. (for https://issues.apache.org/jira/browse/LOG4J2-801[LOG4J2-801] by `mattsicker`)
* Fixed bug where omitting the <display-name> element in web.xml caused incorrect log4j initialization,
resulting in memory leaks when the web application was stopped or reloaded. (for https://issues.apache.org/jira/browse/LOG4J2-873[LOG4J2-873] by `rpopma`, Martin Dickins, LC, Luke Woodward)
-* Make KafkaAppender support SerializedLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1195[LOG4J2-1195] by `mikes`, Melvin Du)
-* Logger cache does not account for message factory. (for https://issues.apache.org/jira/browse/LOG4J2-1180[LOG4J2-1180] by `ggregory`, Mikael Ståldal)
+* Documentation: fixed minor issues with the site and manual pages. (for https://issues.apache.org/jira/browse/LOG4J2-879[LOG4J2-879] by `rpopma`)
* Fix plugin documentation error about Converters. (for https://issues.apache.org/jira/browse/LOG4J2-948[LOG4J2-948] by `mattsicker`, Andrew Flower)
-* Allow triggering policy and rollover strategy to be modified during reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-381[LOG4J2-381] by `rgoers`, Anthony Baldocchi)
-* Fix compilation error for classes annotated with @Plugin. (for https://issues.apache.org/jira/browse/LOG4J2-1157[LOG4J2-1157] by `mattsicker`, Norbert Bartels)
* RollingFileAppender should also roll over when log event time is equal to rollover time, not only when later. (for https://issues.apache.org/jira/browse/LOG4J2-999[LOG4J2-999] by `rpopma`, Joan Balagueró)
diff --git a/src/site/asciidoc/changelog/2.6.1.adoc b/src/site/asciidoc/changelog/2.6.1.adoc
index ef6e1d4854..8894cd8b7d 100644
--- a/src/site/asciidoc/changelog/2.6.1.adoc
+++ b/src/site/asciidoc/changelog/2.6.1.adoc
@@ -74,19 +74,19 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Changed
-* Update Apache Commons CSV from 1.3 to 1.4. (for https://issues.apache.org/jira/browse/LOG4J2-1399[LOG4J2-1399] by `ggregory`)
* (GC) CSV layouts should not create a new CSVPrinter for each log event. Requires Apache Commons CSV 1.4. (for https://issues.apache.org/jira/browse/LOG4J2-1385[LOG4J2-1385] by `ggregory`)
* Update liquibase-core from 3.4.2 to 3.5.1. (for https://issues.apache.org/jira/browse/LOG4J2-1398[LOG4J2-1398] by `ggregory`)
+* Update Apache Commons CSV from 1.3 to 1.4. (for https://issues.apache.org/jira/browse/LOG4J2-1399[LOG4J2-1399] by `ggregory`)
=== Fixed
-* Fix regression in properties configuration to support arbitrary component ids. (for https://issues.apache.org/jira/browse/LOG4J2-1402[LOG4J2-1402] by `rgoers`)
* Changed RenameAction to use java.nio to better report rename failures. (for https://issues.apache.org/jira/browse/LOG4J2-1032[LOG4J2-1032] by `rgoers`)
+* Logger cache now accounts for message factory. (for https://issues.apache.org/jira/browse/LOG4J2-1180[LOG4J2-1180] by `ggregory`)
+* Fixed minor issues with the 2.6 website. (for https://issues.apache.org/jira/browse/LOG4J2-1394[LOG4J2-1394] by `mattsicker`, `mikes`)
+* Fix regression in properties configuration to support arbitrary component ids. (for https://issues.apache.org/jira/browse/LOG4J2-1402[LOG4J2-1402] by `rgoers`)
* OnStartupTriggeringPolicy was forcing a rollover of empty files at startup and would append a second footer that was added by the prior shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-1405[LOG4J2-1405] by `rgoers`)
+* Fixed bug in ReusableParameterizedMessage where Throwable was never updated so first error was logged over and over again and subsequent errors were not logged. (for https://issues.apache.org/jira/browse/LOG4J2-1406[LOG4J2-1406] by `rpopma`, Trask Stalnaker)
* Fixed misleading WARN log events from Log4j about message factories and unexpected formatting. (for https://issues.apache.org/jira/browse/LOG4J2-1407[LOG4J2-1407] by `ggregory`)
-* Logger cache now accounts for message factory. (for https://issues.apache.org/jira/browse/LOG4J2-1180[LOG4J2-1180] by `ggregory`)
* Added the module log4j-liquibase to BOM POM. (for https://issues.apache.org/jira/browse/LOG4J2-1408[LOG4J2-1408] by `ggregory`)
-* Fixed bug in ReusableParameterizedMessage where Throwable was never updated so first error was logged over and over again and subsequent errors were not logged. (for https://issues.apache.org/jira/browse/LOG4J2-1406[LOG4J2-1406] by `rpopma`, Trask Stalnaker)
* Fixed ArrayIndexOutOfBoundsException that may occur in ReusableParameterizedMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1409[LOG4J2-1409] by `rpopma`, Shahan)
-* Fixed minor issues with the 2.6 website. (for https://issues.apache.org/jira/browse/LOG4J2-1394[LOG4J2-1394] by `mattsicker`, `mikes`)
* Add filter and remove filter were not working properly in AbstractFilterable. (for https://issues.apache.org/jira/browse/LOG4J2-997[LOG4J2-997] by `rgoers`, Maytee Chinavanichkit)
diff --git a/src/site/asciidoc/changelog/2.6.2.adoc b/src/site/asciidoc/changelog/2.6.2.adoc
index febd0a2243..01ac1ab530 100644
--- a/src/site/asciidoc/changelog/2.6.2.adoc
+++ b/src/site/asciidoc/changelog/2.6.2.adoc
@@ -71,8 +71,8 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Unbox utility's ringbuffer of StringBuilders is now configurable. (for https://issues.apache.org/jira/browse/LOG4J2-1412[LOG4J2-1412] by `rpopma`)
* Add "direct" option to ConsoleAppender for increased performance. (for https://issues.apache.org/jira/browse/LOG4J2-1395[LOG4J2-1395] by `mikes`)
+* Unbox utility's ringbuffer of StringBuilders is now configurable. (for https://issues.apache.org/jira/browse/LOG4J2-1412[LOG4J2-1412] by `rpopma`)
* (GC) ParameterFormatter now avoids calling toString() on auto-boxed primitive message parameters. (for https://issues.apache.org/jira/browse/LOG4J2-1415[LOG4J2-1415] by `rpopma`)
* (GC) ObjectMessage and ReusableObjectMessage now avoid calling toString() on auto-boxed primitive parameters. (for https://issues.apache.org/jira/browse/LOG4J2-1437[LOG4J2-1437] by `rpopma`)
@@ -84,17 +84,17 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
-* RollingRandomAccessFileManager was not properly rolling over on startup and was getting a NullPointerException. (for https://issues.apache.org/jira/browse/LOG4J2-1420[LOG4J2-1420] by `rgoers`)
-* Provide MessageFactory2 to custom Logger implementations. (for https://issues.apache.org/jira/browse/LOG4J2-1418[LOG4J2-1418] by `mikes`)
* CronTriggeringPolicy was not properly setting the prevFileTime value for the PatternProcessor so
file dates and times on rolled files were incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-1250[LOG4J2-1250] by `rgoers`)
-* Fixed issue where AsyncAppenderQueueFullPolicyTest sometimes hangs. (for https://issues.apache.org/jira/browse/LOG4J2-1422[LOG4J2-1422] by `rpopma`)
+* Fixed minor issues with the 2.6.1 website. (for https://issues.apache.org/jira/browse/LOG4J2-1414[LOG4J2-1414] by `rpopma`, Ralph Goers)
* Fixed issue where Unbox utility ignored the value Constants.ENABLE_THREADLOCALS and always stored non-JDK classes in ThreadLocals. (for https://issues.apache.org/jira/browse/LOG4J2-1417[LOG4J2-1417] by `rpopma`)
+* Provide MessageFactory2 to custom Logger implementations. (for https://issues.apache.org/jira/browse/LOG4J2-1418[LOG4J2-1418] by `mikes`)
+* RollingRandomAccessFileManager was not properly rolling over on startup and was getting a NullPointerException. (for https://issues.apache.org/jira/browse/LOG4J2-1420[LOG4J2-1420] by `rgoers`)
+* Fixed issue where AsyncAppenderQueueFullPolicyTest sometimes hangs. (for https://issues.apache.org/jira/browse/LOG4J2-1422[LOG4J2-1422] by `rpopma`)
+* Ensure that the thread-local StringBuilders used by Layouts to format log events to text will not
+ retain excessive memory after a large message was logged. (for https://issues.apache.org/jira/browse/LOG4J2-1434[LOG4J2-1434] by `rpopma`, Luke Butters)
* Fix bug in OnStartupTriggeringPolicy that allowed it to roll over on every reconfiguration. Added
minSize attribute. (for https://issues.apache.org/jira/browse/LOG4J2-1440[LOG4J2-1440] by `rgoers`)
-* Fixed issue where reusable messages broke flow tracing logic. (for https://issues.apache.org/jira/browse/LOG4J2-1452[LOG4J2-1452] by `rpopma`, Mikael Ståldal)
* OnStartupTriggeringPolicyTest fails on Windows saying the file is used by another process. (for https://issues.apache.org/jira/browse/LOG4J2-1445[LOG4J2-1445] by `ggregory`, Ludovic HOCHET)
-* Ensure that the thread-local StringBuilders used by Layouts to format log events to text will not
- retain excessive memory after a large message was logged. (for https://issues.apache.org/jira/browse/LOG4J2-1434[LOG4J2-1434] by `rpopma`, Luke Butters)
+* Fixed issue where reusable messages broke flow tracing logic. (for https://issues.apache.org/jira/browse/LOG4J2-1452[LOG4J2-1452] by `rpopma`, Mikael Ståldal)
* If copy and delete fails in rename action then resort to truncating the source file after copying it. (for https://issues.apache.org/jira/browse/LOG4J2-904[LOG4J2-904] by `rgoers`, Bernhard Mähr)
-* Fixed minor issues with the 2.6.1 website. (for https://issues.apache.org/jira/browse/LOG4J2-1414[LOG4J2-1414] by `rpopma`, Ralph Goers)
diff --git a/src/site/asciidoc/changelog/2.6.adoc b/src/site/asciidoc/changelog/2.6.adoc
index 1310ba4360..e9c3ba5e85 100644
--- a/src/site/asciidoc/changelog/2.6.adoc
+++ b/src/site/asciidoc/changelog/2.6.adoc
@@ -71,122 +71,122 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Add JNDI lookup documentation. (for https://issues.apache.org/jira/browse/LOG4J2-1133[LOG4J2-1133] by `mattsicker`)
+* Document dependencies for layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1011[LOG4J2-1011] by `mikes`)
* Added option to discard events below a certain log level if the async logger ring buffer
or async appender queue is full. (for https://issues.apache.org/jira/browse/LOG4J2-1080[LOG4J2-1080] by `rpopma`)
+* Add JNDI lookup documentation. (for https://issues.apache.org/jira/browse/LOG4J2-1133[LOG4J2-1133] by `mattsicker`)
+* PatternLayout: Possible variable substitution in equals substitution parameter. (for https://issues.apache.org/jira/browse/LOG4J2-1169[LOG4J2-1169] by `mattsicker`, Gerald Kritzinger)
* Documented benchmark results comparing Log4j 2 performance to other logging libraries. (for https://issues.apache.org/jira/browse/LOG4J2-1179[LOG4J2-1179] by `rpopma`)
-* Document dependencies for layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1011[LOG4J2-1011] by `mikes`)
+* Dynamic Subject for SMTP Appender. (for https://issues.apache.org/jira/browse/LOG4J2-1192[LOG4J2-1192] by `ggregory`, Gary GregoryJörg Bretschneider)
+* PatternLayout option to limit length of text. (for https://issues.apache.org/jira/browse/LOG4J2-1217[LOG4J2-1217] by `mattsicker`, Thies Wellpott)
+* Added async logger Timeout wait strategy and made this the default wait strategy for async loggers.
+ This prevents a rare deadlock that may occur on Solaris. (for https://issues.apache.org/jira/browse/LOG4J2-1221[LOG4J2-1221] by `rpopma`, Michael Barker)
+* Make PatternLayout header and footer accept a pattern. (for https://issues.apache.org/jira/browse/LOG4J2-1237[LOG4J2-1237] by `ggregory`, Gary GregoryMike Calmus)
+* Make header and footer values customizable in JSONLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1244[LOG4J2-1244] by `ggregory`, Remko Popma, Gary GregoryAnshu Garg)
+* Make CSV Layout header and footers accept patterns. (for https://issues.apache.org/jira/browse/LOG4J2-1245[LOG4J2-1245] by `ggregory`)
* Add shutdown methods to LogManager. (for https://issues.apache.org/jira/browse/LOG4J2-124[LOG4J2-124] by `rgoers`)
* JeroMqAppender should support layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1252[LOG4J2-1252] by `mattsicker`)
-* Make CSV Layout header and footers accept patterns. (for https://issues.apache.org/jira/browse/LOG4J2-1245[LOG4J2-1245] by `ggregory`)
-* (GC) Added unrolled varargs methods to Logger API, added Unbox utility to avoid auto-boxing when logging primitive values. (for https://issues.apache.org/jira/browse/LOG4J2-1278[LOG4J2-1278] by `rpopma`)
-* (GC) Add encode(LogEvent, ByteBufferDestination) method to Layout API to enable converting LogEvents to bytes without creating temporary objects. (for https://issues.apache.org/jira/browse/LOG4J2-1274[LOG4J2-1274] by `rpopma`)
-* (GC) Add MessageFactory that avoid allocation by reusing a cached ParameterizedMessage instance. (for https://issues.apache.org/jira/browse/LOG4J2-1271[LOG4J2-1271] by `rpopma`)
* (GC) Added support for garbage-free logging in steady state.
This includes Async Loggers and logging synchronously to the console and to a file,
but does not include the AsyncAppender. This release makes the GelfLayout and
the main patterns in the PatternLayout garbage-free. (for https://issues.apache.org/jira/browse/LOG4J2-1270[LOG4J2-1270] by `rpopma`)
-* (GC) Added manual page on garbage-free logging. (for https://issues.apache.org/jira/browse/LOG4J2-1297[LOG4J2-1297] by `rpopma`)
-* Add documentation links to runtime dependencies in each component intro page. (for https://issues.apache.org/jira/browse/LOG4J2-1303[LOG4J2-1303] by `mattsicker`)
+* (GC) Add MessageFactory that avoid allocation by reusing a cached ParameterizedMessage instance. (for https://issues.apache.org/jira/browse/LOG4J2-1271[LOG4J2-1271] by `rpopma`)
+* (GC) Add encode(LogEvent, ByteBufferDestination) method to Layout API to enable converting LogEvents to bytes without creating temporary objects. (for https://issues.apache.org/jira/browse/LOG4J2-1274[LOG4J2-1274] by `rpopma`)
+* FormattedMessage, MessageFormatMessage and StringFormattedMessage should support passing in a Locale to ensure appropriate formatting. (for https://issues.apache.org/jira/browse/LOG4J2-1277[LOG4J2-1277] by `ggregory`, Ludovic HochetGary Gregory)
+* (GC) Added unrolled varargs methods to Logger API, added Unbox utility to avoid auto-boxing when logging primitive values. (for https://issues.apache.org/jira/browse/LOG4J2-1278[LOG4J2-1278] by `rpopma`)
* (GC) Add interface StringBuilderFormattable to enable converting Messages and parameters to text without allocating temporary objects.
ParameterizedMessage, ObjectMessage, SimpleMessage and ThreadDumpMessage now implement StringBuilderFormattable. (for https://issues.apache.org/jira/browse/LOG4J2-1293[LOG4J2-1293] by `rpopma`)
+* (GC) Added manual page on garbage-free logging. (for https://issues.apache.org/jira/browse/LOG4J2-1297[LOG4J2-1297] by `rpopma`)
* Add pattern converter for thread id and priority in PatternLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1299[LOG4J2-1299] by `ggregory`)
+* Add documentation links to runtime dependencies in each component intro page. (for https://issues.apache.org/jira/browse/LOG4J2-1303[LOG4J2-1303] by `mattsicker`)
* (GC) Added methods to the Logger interface for logging CharSequence messages. (for https://issues.apache.org/jira/browse/LOG4J2-1326[LOG4J2-1326] by `rpopma`)
* (GC) FileAppender, RollingFileAppender and MemoryMappedFileAppender are now also garbage-free by default. (for https://issues.apache.org/jira/browse/LOG4J2-1344[LOG4J2-1344] by `rpopma`)
-* (GC) Update Logger wrapper Generator tool to generate methods for the new Logger methods. (for https://issues.apache.org/jira/browse/LOG4J2-1373[LOG4J2-1373] by `rpopma`)
-* Option to not log stack traces for logged Throwables in GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1357[LOG4J2-1357] by `mikes`)
-* PatternLayout option to limit length of text. (for https://issues.apache.org/jira/browse/LOG4J2-1217[LOG4J2-1217] by `mattsicker`, Thies Wellpott)
-* Make header and footer values customizable in JSONLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1244[LOG4J2-1244] by `ggregory`, Remko Popma, Gary GregoryAnshu Garg)
-* Dynamic Subject for SMTP Appender. (for https://issues.apache.org/jira/browse/LOG4J2-1192[LOG4J2-1192] by `ggregory`, Gary GregoryJörg Bretschneider)
-* Added async logger Timeout wait strategy and made this the default wait strategy for async loggers.
- This prevents a rare deadlock that may occur on Solaris. (for https://issues.apache.org/jira/browse/LOG4J2-1221[LOG4J2-1221] by `rpopma`, Michael Barker)
-* PatternLayout: Possible variable substitution in equals substitution parameter. (for https://issues.apache.org/jira/browse/LOG4J2-1169[LOG4J2-1169] by `mattsicker`, Gerald Kritzinger)
-* FormattedMessage, MessageFormatMessage and StringFormattedMessage should support passing in a Locale to ensure appropriate formatting. (for https://issues.apache.org/jira/browse/LOG4J2-1277[LOG4J2-1277] by `ggregory`, Ludovic HochetGary Gregory)
-* Make PatternLayout header and footer accept a pattern. (for https://issues.apache.org/jira/browse/LOG4J2-1237[LOG4J2-1237] by `ggregory`, Gary GregoryMike Calmus)
-* Pattern to drop first N package parts. (for https://issues.apache.org/jira/browse/LOG4J2-621[LOG4J2-621] by `ggregory`, Lee Theobald, Kamal Mettananda)
* Add an AutoCloseable ThreadContext class: CloseableThreadContext. (for https://issues.apache.org/jira/browse/LOG4J2-1348[LOG4J2-1348] by `ggregory`, Gary GregoryGreg Thomas)
-* Support merging configurations to for a composite configuration. (for https://issues.apache.org/jira/browse/LOG4J2-494[LOG4J2-494] by `rgoers`, Philipp Knobel)
+* Option to not log stack traces for logged Throwables in GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1357[LOG4J2-1357] by `mikes`)
* Added a YAML layout. (for https://issues.apache.org/jira/browse/LOG4J2-1362[LOG4J2-1362] by `rpopma`, Gary Gregory)
+* (GC) Update Logger wrapper Generator tool to generate methods for the new Logger methods. (for https://issues.apache.org/jira/browse/LOG4J2-1373[LOG4J2-1373] by `rpopma`)
+* Support merging configurations to for a composite configuration. (for https://issues.apache.org/jira/browse/LOG4J2-494[LOG4J2-494] by `rgoers`, Philipp Knobel)
+* Pattern to drop first N package parts. (for https://issues.apache.org/jira/browse/LOG4J2-621[LOG4J2-621] by `ggregory`, Lee Theobald, Kamal Mettananda)
=== Changed
* org.apache.logging.log4j.core.LoggerContext#updateLoggers should call firePropertyChangeEvent. (for https://issues.apache.org/jira/browse/LOG4J2-1206[LOG4J2-1206] by `mattsicker`)
* Update SLF4J from 1.7.12 to 1.7.13. (for https://issues.apache.org/jira/browse/LOG4J2-1219[LOG4J2-1219] by `ggregory`)
-* Update LMAX Disruptor from 3.3.2 to 3.3.4. (for https://issues.apache.org/jira/browse/LOG4J2-1253[LOG4J2-1253] by `ggregory`)
-* Add enhanced entry and exit methods. (for https://issues.apache.org/jira/browse/LOG4J2-1255[LOG4J2-1255] by `rgoers`)
-* Update Jackson from 2.6.4 to 2.7.0. (for https://issues.apache.org/jira/browse/LOG4J2-1249[LOG4J2-1249] by `ggregory`)
+* Misleading Value In Properties Example. (for https://issues.apache.org/jira/browse/LOG4J2-1233[LOG4J2-1233] by `ggregory`, Bahri Gencsoy)
* Update Jackson from 2.6.3 to 2.6.4. (for https://issues.apache.org/jira/browse/LOG4J2-1239[LOG4J2-1239] by `ggregory`)
* Update Liquibase from 3.3.5 to 3.4.2. (for https://issues.apache.org/jira/browse/LOG4J2-1240[LOG4J2-1240] by `ggregory`)
+* Update Jackson from 2.6.4 to 2.7.0. (for https://issues.apache.org/jira/browse/LOG4J2-1249[LOG4J2-1249] by `ggregory`)
+* Update LMAX Disruptor from 3.3.2 to 3.3.4. (for https://issues.apache.org/jira/browse/LOG4J2-1253[LOG4J2-1253] by `ggregory`)
+* Add enhanced entry and exit methods. (for https://issues.apache.org/jira/browse/LOG4J2-1255[LOG4J2-1255] by `rgoers`)
* (GC) ParameterizedMessage optimizations to avoid or at least postpone allocating temporary objects. (for https://issues.apache.org/jira/browse/LOG4J2-1271[LOG4J2-1271] by `rpopma`)
* (GC) Improve LoggerConfig's data structure for AppenderControl objects to avoid allocating temporary objects during
traversal for each log event. (for https://issues.apache.org/jira/browse/LOG4J2-1272[LOG4J2-1272] by `rpopma`)
* (GC) Provide ThreadLocal-based gc-free caching mechanism in DatePatternConverter for non-webapps. (for https://issues.apache.org/jira/browse/LOG4J2-1283[LOG4J2-1283] by `rpopma`)
-* Update Kafka client from 0.9.0.0 to 0.9.0.1. (for https://issues.apache.org/jira/browse/LOG4J2-1294[LOG4J2-1294] by `ggregory`)
-* JeroMqAppender should use ShutdownCallbackRegistry instead of runtime hooks. (for https://issues.apache.org/jira/browse/LOG4J2-1306[LOG4J2-1306] by `mattsicker`)
-* Update Jackson from 2.7.0 to 2.7.2. (for https://issues.apache.org/jira/browse/LOG4J2-1304[LOG4J2-1304] by `ggregory`)
* (GC) Update PatternLayout to utilize gc-free mechanism for LogEvent processing. (for https://issues.apache.org/jira/browse/LOG4J2-1291[LOG4J2-1291] by `rpopma`)
-* Remove need to pre-specify appender et al. identifiers in property file config format. (for https://issues.apache.org/jira/browse/LOG4J2-1308[LOG4J2-1308] by `mattsicker`)
* (GC) Update RandomAccessFileAppender and RollingRandomAccessFileAppender to utilize gc-free Layout.encode() method. (for https://issues.apache.org/jira/browse/LOG4J2-1292[LOG4J2-1292] by `rpopma`)
+* Update Kafka client from 0.9.0.0 to 0.9.0.1. (for https://issues.apache.org/jira/browse/LOG4J2-1294[LOG4J2-1294] by `ggregory`)
* Remove serializability from classes that don't need it. (for https://issues.apache.org/jira/browse/LOG4J2-1300[LOG4J2-1300] by `mattsicker`)
+* Update Jackson from 2.7.0 to 2.7.2. (for https://issues.apache.org/jira/browse/LOG4J2-1304[LOG4J2-1304] by `ggregory`)
+* JeroMqAppender should use ShutdownCallbackRegistry instead of runtime hooks. (for https://issues.apache.org/jira/browse/LOG4J2-1306[LOG4J2-1306] by `mattsicker`)
+* Remove need to pre-specify appender et al. identifiers in property file config format. (for https://issues.apache.org/jira/browse/LOG4J2-1308[LOG4J2-1308] by `mattsicker`)
* (GC) Avoid allocating unnecessary temporary objects in LoggerContext's getLogger methods. (for https://issues.apache.org/jira/browse/LOG4J2-1318[LOG4J2-1318] by `rpopma`)
-* Update Log4j 1.x migration guide to include information about system property lookup syntax changes. (for https://issues.apache.org/jira/browse/LOG4J2-1322[LOG4J2-1322] by `mattsicker`)
* (GC) Avoid allocating unnecessary temporary objects in PatternLayout's NamePatternConverter and ClassNamePatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1321[LOG4J2-1321] by `rpopma`)
+* Update Log4j 1.x migration guide to include information about system property lookup syntax changes. (for https://issues.apache.org/jira/browse/LOG4J2-1322[LOG4J2-1322] by `mattsicker`)
* (GC) Avoid allocating unnecessary temporary objects in MarkerManager's getMarker methods. (for https://issues.apache.org/jira/browse/LOG4J2-1333[LOG4J2-1333] by `rpopma`)
+* (GC) ConsoleAppender is now garbage-free by default. This logic is reusable for all AbstractOutputStreamAppender subclasses. (for https://issues.apache.org/jira/browse/LOG4J2-1343[LOG4J2-1343] by `rpopma`)
* (Doc) Clarify documentation for properties that control Log4j behaviour. (for https://issues.apache.org/jira/browse/LOG4J2-1345[LOG4J2-1345] by `rpopma`)
* Update Jackson from 2.7.2 to 2.7.3. (for https://issues.apache.org/jira/browse/LOG4J2-1351[LOG4J2-1351] by `ggregory`)
-* (GC) ConsoleAppender is now garbage-free by default. This logic is reusable for all AbstractOutputStreamAppender subclasses. (for https://issues.apache.org/jira/browse/LOG4J2-1343[LOG4J2-1343] by `rpopma`)
-* (Log4j-internal) Provide message text as CharSequence for some message types to optimize some layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1365[LOG4J2-1365] by `mikes`)
* Update javax.mail from 1.5.4 to 1.5.5. (for https://issues.apache.org/jira/browse/LOG4J2-1352[LOG4J2-1352] by `ggregory`)
* (GC) GelfLayout does now support garbage-free logging (with compressionType=OFF). (for https://issues.apache.org/jira/browse/LOG4J2-1356[LOG4J2-1356] by `mikes`)
-* Update SLF4J from 1.7.13 to 1.7.21. (for https://issues.apache.org/jira/browse/LOG4J2-1375[LOG4J2-1375] by `rpopma`)
* Update Apache Commons Compress from 1.10 to 1.11. (for https://issues.apache.org/jira/browse/LOG4J2-1358[LOG4J2-1358] by `ggregory`)
-* Update Apache Commons CSV from 1.2 to 1.3. (for https://issues.apache.org/jira/browse/LOG4J2-1384[LOG4J2-1384] by `ggregory`)
-* Update Jackson from 2.7.3 to 2.7.4. (for https://issues.apache.org/jira/browse/LOG4J2-1380[LOG4J2-1380] by `ggregory`)
+* (Log4j-internal) Provide message text as CharSequence for some message types to optimize some layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1365[LOG4J2-1365] by `mikes`)
* Migrate tests from Logback 1.1.3 to 1.1.7. (for https://issues.apache.org/jira/browse/LOG4J2-1374[LOG4J2-1374] by `rpopma`)
+* Update SLF4J from 1.7.13 to 1.7.21. (for https://issues.apache.org/jira/browse/LOG4J2-1375[LOG4J2-1375] by `rpopma`)
+* Update Jackson from 2.7.3 to 2.7.4. (for https://issues.apache.org/jira/browse/LOG4J2-1380[LOG4J2-1380] by `ggregory`)
+* Update Apache Commons CSV from 1.2 to 1.3. (for https://issues.apache.org/jira/browse/LOG4J2-1384[LOG4J2-1384] by `ggregory`)
* Update Google java-allocation-instrumenter from 3.0 to 3.0.1. (for https://issues.apache.org/jira/browse/LOG4J2-1388[LOG4J2-1388] by `rpopma`)
-* Misleading Value In Properties Example. (for https://issues.apache.org/jira/browse/LOG4J2-1233[LOG4J2-1233] by `ggregory`, Bahri Gencsoy)
=== Fixed
-* Creation of a LoggerContext will fail if shutdown is in progress. LogManager will default to SimpleLogger instead. (for https://issues.apache.org/jira/browse/LOG4J2-1222[LOG4J2-1222] by `rgoers`)
+* Add a Log4jLookup class to help write log files relative to log4j2.xml. (for https://issues.apache.org/jira/browse/LOG4J2-1050[LOG4J2-1050] by `mattsicker`, Adam Retter)
* Fix documentation to specify the correct default wait strategy used by async loggers. (for https://issues.apache.org/jira/browse/LOG4J2-1212[LOG4J2-1212] by `rpopma`)
-* Stop throwing unnecessary exception in Log4jServletContextListener.contextDestroyed(). (for https://issues.apache.org/jira/browse/LOG4J2-1262[LOG4J2-1262] by `mattsicker`)
+* Documentation/XSD inconsistencies. (for https://issues.apache.org/jira/browse/LOG4J2-1215[LOG4J2-1215] by `ggregory`, Erik Kemperman)
+* Creation of a LoggerContext will fail if shutdown is in progress. LogManager will default to SimpleLogger instead. (for https://issues.apache.org/jira/browse/LOG4J2-1222[LOG4J2-1222] by `rgoers`)
+* NullPointerException in MapLookup.lookup if the event is null. (for https://issues.apache.org/jira/browse/LOG4J2-1227[LOG4J2-1227] by `mattsicker`, Olivier Lemasle)
+* Don't concatenate SYSLOG Messages. (for https://issues.apache.org/jira/browse/LOG4J2-1230[LOG4J2-1230] by `ggregory`, Ralph Goers, Gary GregoryVladimir Hudec)
+* Incorrect log rotation in last week of year. (for https://issues.apache.org/jira/browse/LOG4J2-1232[LOG4J2-1232] by `ggregory`, Nikolai)
+* org.apache.logging.log4j.core.net.TcpSocketManager and other classes does not report internal exceptions to the status logger. (for https://issues.apache.org/jira/browse/LOG4J2-1238[LOG4J2-1238] by `ggregory`)
* Fixed broken nanotime in pattern layout. (for https://issues.apache.org/jira/browse/LOG4J2-1248[LOG4J2-1248] by `rpopma`)
+* Fix JUL bridge issue where LogRecord.getParameters() is used when null. (for https://issues.apache.org/jira/browse/LOG4J2-1251[LOG4J2-1251] by `mattsicker`, Romain Manni-Bucau)
+* Fix typo in Flow Tracing documentation. (for https://issues.apache.org/jira/browse/LOG4J2-1254[LOG4J2-1254] by `rpopma`, Josh Trow)
+* Async DynamicThresholdFilter does not use the log event's context map. (for https://issues.apache.org/jira/browse/LOG4J2-1258[LOG4J2-1258] by `ggregory`, Francis Lalonde)
+* TlsSyslogFrame calculates message length incorrectly. (for https://issues.apache.org/jira/browse/LOG4J2-1260[LOG4J2-1260] by `ggregory`, Gary GregoryBlake Day)
+* Stop throwing unnecessary exception in Log4jServletContextListener.contextDestroyed(). (for https://issues.apache.org/jira/browse/LOG4J2-1262[LOG4J2-1262] by `mattsicker`)
* The ConfigurationSource was not saved for BuiltConfigurations so monitor interval had no effect. (for https://issues.apache.org/jira/browse/LOG4J2-1263[LOG4J2-1263] by `rgoers`)
-* org.apache.logging.log4j.core.net.TcpSocketManager and other classes does not report internal exceptions to the status logger. (for https://issues.apache.org/jira/browse/LOG4J2-1238[LOG4J2-1238] by `ggregory`)
-* Logger methods taking Supplier parameters now correctly handle cases where the supplied value is a Message. (for https://issues.apache.org/jira/browse/LOG4J2-1280[LOG4J2-1280] by `rpopma`)
+* FixedDateFormat was incorrect for formats having MMM with the French locale. (for https://issues.apache.org/jira/browse/LOG4J2-1268[LOG4J2-1268] by `rpopma`)
* (GC) AsyncLogger should use thread-local translator by default. (for https://issues.apache.org/jira/browse/LOG4J2-1269[LOG4J2-1269] by `rpopma`)
+* Fix RollingAppenderNoUnconditionalDeleteTest repeat test runs from failing. (for https://issues.apache.org/jira/browse/LOG4J2-1275[LOG4J2-1275] by `mattsicker`, Ludovic Hochet)
+* LoggerMessageSupplierTest and LoggerSupplierTest are Locale sensitive. (for https://issues.apache.org/jira/browse/LOG4J2-1276[LOG4J2-1276] by `ggregory`, Ludovic Hochet)
* Deprecate org.apache.logging.log4j.util.MessageSupplier. (for https://issues.apache.org/jira/browse/LOG4J2-1280[LOG4J2-1280] by `ggregory`)
+* Logger methods taking Supplier parameters now correctly handle cases where the supplied value is a Message. (for https://issues.apache.org/jira/browse/LOG4J2-1280[LOG4J2-1280] by `rpopma`)
* (GC) LoggerConfig.getProperties() should not allocate on each call. (for https://issues.apache.org/jira/browse/LOG4J2-1281[LOG4J2-1281] by `rpopma`)
-* FixedDateFormat was incorrect for formats having MMM with the French locale. (for https://issues.apache.org/jira/browse/LOG4J2-1268[LOG4J2-1268] by `rpopma`)
* Made default MessageFactory configurable. (for https://issues.apache.org/jira/browse/LOG4J2-1284[LOG4J2-1284] by `rpopma`)
-* Configuration file error does not show cause exception. (for https://issues.apache.org/jira/browse/LOG4J2-1309[LOG4J2-1309] by `ggregory`)
* Change flow logging text from "entry' to "Enter" and "exit" to "Exit". (for https://issues.apache.org/jira/browse/LOG4J2-1289[LOG4J2-1289] by `ggregory`)
-* Fix NoClassDefFoundError in ReflectionUtil on Google App Engine. (for https://issues.apache.org/jira/browse/LOG4J2-1330[LOG4J2-1330] by `mattsicker`)
-* Exception from Log4jServletContextListener prevents jetty-maven-plugin run-forked. (for https://issues.apache.org/jira/browse/LOG4J2-1346[LOG4J2-1346] by `ggregory`)
+* Configuration file error does not show cause exception. (for https://issues.apache.org/jira/browse/LOG4J2-1309[LOG4J2-1309] by `ggregory`)
* JndiLookup mindlessly casts to String and should use String.valueOf(). (for https://issues.apache.org/jira/browse/LOG4J2-1310[LOG4J2-1310] by `mattsicker`)
* Improve error handling in the Async Logger background thread: the new default exception handler no longer rethrows the error. (for https://issues.apache.org/jira/browse/LOG4J2-1324[LOG4J2-1324] by `rpopma`)
+* Fix NoClassDefFoundError in ReflectionUtil on Google App Engine. (for https://issues.apache.org/jira/browse/LOG4J2-1330[LOG4J2-1330] by `mattsicker`)
+* LoggerFactory in 1.2 API module is not compatible with 1.2. (for https://issues.apache.org/jira/browse/LOG4J2-1336[LOG4J2-1336] by `ggregory`, Zbynek Vyskovsky)
* (Perf) AsyncLogger performance optimization: avoid calling instanceof TimestampMessage in hot path. (for https://issues.apache.org/jira/browse/LOG4J2-1339[LOG4J2-1339] by `rpopma`)
+* Exception from Log4jServletContextListener prevents jetty-maven-plugin run-forked. (for https://issues.apache.org/jira/browse/LOG4J2-1346[LOG4J2-1346] by `ggregory`)
+* No configuration reload is triggered under Windows when replacing the configuration file with one that has older last modified date. (for https://issues.apache.org/jira/browse/LOG4J2-1354[LOG4J2-1354] by `ggregory`, Arkadiusz Adolph)
+* Properties Configuration did not support includeLocation attribute on Loggers. (for https://issues.apache.org/jira/browse/LOG4J2-1363[LOG4J2-1363] by `rgoers`)
+* (Log4j-internal) StatusLogger dropped exceptions when logging parameterized messages. (for https://issues.apache.org/jira/browse/LOG4J2-1368[LOG4J2-1368] by `rpopma`)
+* "xz" compression results in plaintext, uncompressed files. (for https://issues.apache.org/jira/browse/LOG4J2-1369[LOG4J2-1369] by `ggregory`, Gary GregoryAlex Birch)
+* XMLLayout indents, but not the first child tag (Event). (for https://issues.apache.org/jira/browse/LOG4J2-1372[LOG4J2-1372] by `rgoers`, Gary GregoryKamal Mettananda)
* Copying a MutableLogEvent using Log4jLogEvent.Builder should not unnecessarily obtain caller location information. (for https://issues.apache.org/jira/browse/LOG4J2-1382[LOG4J2-1382] by `rpopma`)
* Fixed memory leak related to shutdown hook. (for https://issues.apache.org/jira/browse/LOG4J2-1387[LOG4J2-1387] by `rpopma`)
-* (Log4j-internal) StatusLogger dropped exceptions when logging parameterized messages. (for https://issues.apache.org/jira/browse/LOG4J2-1368[LOG4J2-1368] by `rpopma`)
-* Properties Configuration did not support includeLocation attribute on Loggers. (for https://issues.apache.org/jira/browse/LOG4J2-1363[LOG4J2-1363] by `rgoers`)
* Log4jWebInitializerImpl: Use Thread instead of Class for fallback classloader. (for https://issues.apache.org/jira/browse/LOG4J2-248[LOG4J2-248] by `mattsicker`)
* Generate MDC properties as a JSON map in JSONLayout, with option to output as list of map entries. (for https://issues.apache.org/jira/browse/LOG4J2-623[LOG4J2-623] by `rpopma`)
-* LoggerMessageSupplierTest and LoggerSupplierTest are Locale sensitive. (for https://issues.apache.org/jira/browse/LOG4J2-1276[LOG4J2-1276] by `ggregory`, Ludovic Hochet)
-* Fix RollingAppenderNoUnconditionalDeleteTest repeat test runs from failing. (for https://issues.apache.org/jira/browse/LOG4J2-1275[LOG4J2-1275] by `mattsicker`, Ludovic Hochet)
-* NullPointerException in MapLookup.lookup if the event is null. (for https://issues.apache.org/jira/browse/LOG4J2-1227[LOG4J2-1227] by `mattsicker`, Olivier Lemasle)
-* Don't concatenate SYSLOG Messages. (for https://issues.apache.org/jira/browse/LOG4J2-1230[LOG4J2-1230] by `ggregory`, Ralph Goers, Gary GregoryVladimir Hudec)
-* Add a Log4jLookup class to help write log files relative to log4j2.xml. (for https://issues.apache.org/jira/browse/LOG4J2-1050[LOG4J2-1050] by `mattsicker`, Adam Retter)
-* Async DynamicThresholdFilter does not use the log event's context map. (for https://issues.apache.org/jira/browse/LOG4J2-1258[LOG4J2-1258] by `ggregory`, Francis Lalonde)
-* TlsSyslogFrame calculates message length incorrectly. (for https://issues.apache.org/jira/browse/LOG4J2-1260[LOG4J2-1260] by `ggregory`, Gary GregoryBlake Day)
-* LoggerFactory in 1.2 API module is not compatible with 1.2. (for https://issues.apache.org/jira/browse/LOG4J2-1336[LOG4J2-1336] by `ggregory`, Zbynek Vyskovsky)
-* Documentation/XSD inconsistencies. (for https://issues.apache.org/jira/browse/LOG4J2-1215[LOG4J2-1215] by `ggregory`, Erik Kemperman)
-* Fix typo in Flow Tracing documentation. (for https://issues.apache.org/jira/browse/LOG4J2-1254[LOG4J2-1254] by `rpopma`, Josh Trow)
-* Incorrect log rotation in last week of year. (for https://issues.apache.org/jira/browse/LOG4J2-1232[LOG4J2-1232] by `ggregory`, Nikolai)
-* Fix JUL bridge issue where LogRecord.getParameters() is used when null. (for https://issues.apache.org/jira/browse/LOG4J2-1251[LOG4J2-1251] by `mattsicker`, Romain Manni-Bucau)
-* XMLLayout indents, but not the first child tag (Event). (for https://issues.apache.org/jira/browse/LOG4J2-1372[LOG4J2-1372] by `rgoers`, Gary GregoryKamal Mettananda)
-* ClassNotFoundException for BundleContextSelector when initialising in an OSGi environment. (for https://issues.apache.org/jira/browse/LOG4J2-920[LOG4J2-920] by `mattsicker`, Ludovic Hochet)
-* No configuration reload is triggered under Windows when replacing the configuration file with one that has older last modified date. (for https://issues.apache.org/jira/browse/LOG4J2-1354[LOG4J2-1354] by `ggregory`, Arkadiusz Adolph)
* JSONLayout doesn't add a comma between log events. (for https://issues.apache.org/jira/browse/LOG4J2-908[LOG4J2-908] by `ggregory`, Konstantinos Liakos, Patrick Flaherty, Robin Coe)
-* "xz" compression results in plaintext, uncompressed files. (for https://issues.apache.org/jira/browse/LOG4J2-1369[LOG4J2-1369] by `ggregory`, Gary GregoryAlex Birch)
+* ClassNotFoundException for BundleContextSelector when initialising in an OSGi environment. (for https://issues.apache.org/jira/browse/LOG4J2-920[LOG4J2-920] by `mattsicker`, Ludovic Hochet)
diff --git a/src/site/asciidoc/changelog/2.7.adoc b/src/site/asciidoc/changelog/2.7.adoc
index c972889a3c..96d504360b 100644
--- a/src/site/asciidoc/changelog/2.7.adoc
+++ b/src/site/asciidoc/changelog/2.7.adoc
@@ -73,111 +73,111 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
+* Users can now inject context data from other sources than ThreadContext. Values can be any Object, not just Strings. (for https://issues.apache.org/jira/browse/LOG4J2-1010[LOG4J2-1010] by `rpopma`, `mikes`)
* Added Logging API for Scala 2.10 and 2.11. (for https://issues.apache.org/jira/browse/LOG4J2-1181[LOG4J2-1181] by `mikes`)
-* org.apache.logging.log4j.core.LoggerContext now implements Closeable. (for https://issues.apache.org/jira/browse/LOG4J2-1472[LOG4J2-1472] by `ggregory`)
-* [PatternLayout] Add an ANSI option to %xThrowable. (for https://issues.apache.org/jira/browse/LOG4J2-1471[LOG4J2-1471] by `ggregory`)
-* (GC) Changed LogEvent's internal data structure for context data to be garbage-free. Added method LogEvent#getContextData(), deprecated method #getContextMap(). (for https://issues.apache.org/jira/browse/LOG4J2-1447[LOG4J2-1447] by `rpopma`)
* (GC) Added support for garbage-free ThreadContext map. Disabled by default, users need to enable this explicitly. (for https://issues.apache.org/jira/browse/LOG4J2-1349[LOG4J2-1349] by `rpopma`)
+* Added optional support for Conversant DisruptorBlockingQueue in AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1430[LOG4J2-1430] by `mattsicker`, John Cairns)
+* Added optional support for JCTools MPSC bounded lock-free queue in AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1439[LOG4J2-1439] by `mattsicker`, Anthony Maire)
+* (GC) Changed LogEvent's internal data structure for context data to be garbage-free. Added method LogEvent#getContextData(), deprecated method #getContextMap(). (for https://issues.apache.org/jira/browse/LOG4J2-1447[LOG4J2-1447] by `rpopma`)
* [PatternLayout] Add an ANSI option to %message. (for https://issues.apache.org/jira/browse/LOG4J2-1458[LOG4J2-1458] by `ggregory`)
-* Allow a Builder to subclass another Builder. (for https://issues.apache.org/jira/browse/LOG4J2-1508[LOG4J2-1508] by `ggregory`)
+* [PatternLayout] Add an ANSI option to %xThrowable. (for https://issues.apache.org/jira/browse/LOG4J2-1471[LOG4J2-1471] by `ggregory`)
+* org.apache.logging.log4j.core.LoggerContext now implements Closeable. (for https://issues.apache.org/jira/browse/LOG4J2-1472[LOG4J2-1472] by `ggregory`)
+* FileAppender is now able to create files on-demand. (for https://issues.apache.org/jira/browse/LOG4J2-1501[LOG4J2-1501] by `ggregory`)
* RollingFileAppender is now able to create files on-demand. (for https://issues.apache.org/jira/browse/LOG4J2-1504[LOG4J2-1504] by `ggregory`)
* Create a Builder for the FileAppender plugin to facilitate adding attributes in the future. (for https://issues.apache.org/jira/browse/LOG4J2-1505[LOG4J2-1505] by `ggregory`)
+* Allow Builders to be completely generic. (for https://issues.apache.org/jira/browse/LOG4J2-1507[LOG4J2-1507] by `ggregory`)
+* Allow a Builder to subclass another Builder. (for https://issues.apache.org/jira/browse/LOG4J2-1508[LOG4J2-1508] by `ggregory`)
+* Added options to exclude stack trace from JSON, XML and YAML layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1512[LOG4J2-1512] by `mikes`)
+* Add ThreadContextMap2 interface supporting method putAll(Map<String, String>). (for https://issues.apache.org/jira/browse/LOG4J2-1516[LOG4J2-1516] by `rpopma`, Gary Gregory)
* Add ThreadContext.putAll(Map<String, String>). (for https://issues.apache.org/jira/browse/LOG4J2-1519[LOG4J2-1519] by `ggregory`)
-* Added ability to generate Log4j 2-style XML configuration file from ConfigurationBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-1528[LOG4J2-1528] by `mikes`)
* Add JUnit Rule implementations to manage the thread context. (for https://issues.apache.org/jira/browse/LOG4J2-1520[LOG4J2-1520] by `ggregory`)
-* Added options to exclude stack trace from JSON, XML and YAML layouts. (for https://issues.apache.org/jira/browse/LOG4J2-1512[LOG4J2-1512] by `mikes`)
-* FileAppender is now able to create files on-demand. (for https://issues.apache.org/jira/browse/LOG4J2-1501[LOG4J2-1501] by `ggregory`)
-* Allow Builders to be completely generic. (for https://issues.apache.org/jira/browse/LOG4J2-1507[LOG4J2-1507] by `ggregory`)
-* The Core AbstractConfiguration now tracks its LoggerContext and add Configuration.getLoggerContext(). (for https://issues.apache.org/jira/browse/LOG4J2-1547[LOG4J2-1547] by `ggregory`)
-* The Core AbstractManager now tracks its LoggerContext. (for https://issues.apache.org/jira/browse/LOG4J2-1540[LOG4J2-1540] by `ggregory`)
+* Added ability to generate Log4j 2-style XML configuration file from ConfigurationBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-1528[LOG4J2-1528] by `mikes`)
* Added Core API Configurator.shutdown(LoggerContext, long, TimeUnit). (for https://issues.apache.org/jira/browse/LOG4J2-1539[LOG4J2-1539] by `ggregory`)
-* Add a Builder for the SocketAppender (deprecates factory method). (for https://issues.apache.org/jira/browse/LOG4J2-1557[LOG4J2-1557] by `ggregory`)
+* The Core AbstractManager now tracks its LoggerContext. (for https://issues.apache.org/jira/browse/LOG4J2-1540[LOG4J2-1540] by `ggregory`)
+* The Core AbstractConfiguration now tracks its LoggerContext and add Configuration.getLoggerContext(). (for https://issues.apache.org/jira/browse/LOG4J2-1547[LOG4J2-1547] by `ggregory`)
* AbstractManager now implements AutoCloseable. (for https://issues.apache.org/jira/browse/LOG4J2-1553[LOG4J2-1553] by `ggregory`)
-* Added support for java.util.concurrent.LinkedTransferQueue to AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1568[LOG4J2-1568] by `mattsicker`)
+* Add a Builder for the SocketAppender (deprecates factory method). (for https://issues.apache.org/jira/browse/LOG4J2-1557[LOG4J2-1557] by `ggregory`)
* SocketAppender now supports IO buffering. (for https://issues.apache.org/jira/browse/LOG4J2-1558[LOG4J2-1558] by `ggregory`)
-* RoutingAppender can be configured with scripts. Add Script in a Routes element. (for https://issues.apache.org/jira/browse/LOG4J2-1578[LOG4J2-1578] by `ggregory`)
+* Added support for java.util.concurrent.LinkedTransferQueue to AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1568[LOG4J2-1568] by `mattsicker`)
* Add a Builder to the RoutingAppender and deprecate factory method. (for https://issues.apache.org/jira/browse/LOG4J2-1577[LOG4J2-1577] by `ggregory`)
+* RoutingAppender can be configured with scripts. Add Script in a Routes element. (for https://issues.apache.org/jira/browse/LOG4J2-1578[LOG4J2-1578] by `ggregory`)
* Add a ScriptAppenderSelector to create an Appender specified by a Script. (for https://issues.apache.org/jira/browse/LOG4J2-1597[LOG4J2-1597] by `ggregory`)
* Add a Builder to ServletAppender and deprecate factory method. (for https://issues.apache.org/jira/browse/LOG4J2-1609[LOG4J2-1609] by `ggregory`)
-* Added optional support for Conversant DisruptorBlockingQueue in AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1430[LOG4J2-1430] by `mattsicker`, John Cairns)
-* Users can now inject context data from other sources than ThreadContext. Values can be any Object, not just Strings. (for https://issues.apache.org/jira/browse/LOG4J2-1010[LOG4J2-1010] by `rpopma`, `mikes`)
-* Added optional support for JCTools MPSC bounded lock-free queue in AsyncAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1439[LOG4J2-1439] by `mattsicker`, Anthony Maire)
-* Add ThreadContextMap2 interface supporting method putAll(Map<String, String>). (for https://issues.apache.org/jira/browse/LOG4J2-1516[LOG4J2-1516] by `rpopma`, Gary Gregory)
=== Changed
-* Updated JMS test from ActiveMQ 5.13.3 to 5.13.4. (for https://issues.apache.org/jira/browse/LOG4J2-1487[LOG4J2-1487] by `ggregory`)
-* Updated LMAX Disruptor from 3.3.4 to 3.3.5. (for https://issues.apache.org/jira/browse/LOG4J2-1495[LOG4J2-1495] by `ggregory`)
* Updated Jackson from 2.7.5 to 2.8.0. (for https://issues.apache.org/jira/browse/LOG4J2-1458[LOG4J2-1458] by `ggregory`)
+* Updated JMS test from ActiveMQ 5.13.3 to 5.13.4. (for https://issues.apache.org/jira/browse/LOG4J2-1487[LOG4J2-1487] by `ggregory`)
* Updated Jackson from 2.8.0 to 2.8.1. (for https://issues.apache.org/jira/browse/LOG4J2-1494[LOG4J2-1494] by `ggregory`)
+* Updated LMAX Disruptor from 3.3.4 to 3.3.5. (for https://issues.apache.org/jira/browse/LOG4J2-1495[LOG4J2-1495] by `ggregory`)
* Updated Kafka client from 0.9.1.0 to 0.10.0.0. (for https://issues.apache.org/jira/browse/LOG4J2-1496[LOG4J2-1496] by `ggregory`)
+* Updated Kafka client from 0.10.0.0 to 0.10.0.1. (for https://issues.apache.org/jira/browse/LOG4J2-1533[LOG4J2-1533] by `ggregory`)
+* Removed deprecated Core API org.apache.logging.log4j.core.util.Constants.UTF_8. (for https://issues.apache.org/jira/browse/LOG4J2-1543[LOG4J2-1543] by `ggregory`)
* Removed deprecated Core API org.apache.logging.log4j.core.util.Assert.requireNonNull(T, String). (for https://issues.apache.org/jira/browse/LOG4J2-1544[LOG4J2-1544] by `ggregory`)
* Removed deprecated Web API org.apache.logging.log4j.web.WebLookup.getServletContext(). (for https://issues.apache.org/jira/browse/LOG4J2-1545[LOG4J2-1545] by `ggregory`)
-* Removed deprecated Core API org.apache.logging.log4j.core.util.Constants.UTF_8. (for https://issues.apache.org/jira/browse/LOG4J2-1543[LOG4J2-1543] by `ggregory`)
-* Updated Kafka client from 0.10.0.0 to 0.10.0.1. (for https://issues.apache.org/jira/browse/LOG4J2-1533[LOG4J2-1533] by `ggregory`)
* Updated JMS test from ActiveMQ 5.13.4 to 5.14.0. (for https://issues.apache.org/jira/browse/LOG4J2-1551[LOG4J2-1551] by `ggregory`)
* Custom Log4j threads now extend Log4jThread. (for https://issues.apache.org/jira/browse/LOG4J2-1556[LOG4J2-1556] by `ggregory`)
* Updated Jackson from 2.8.1 to 2.8.2. (for https://issues.apache.org/jira/browse/LOG4J2-1569[LOG4J2-1569] by `ggregory`)
* Allow the RollingFileAppender to use default pattern layout. (for https://issues.apache.org/jira/browse/LOG4J2-1574[LOG4J2-1574] by `ggregory`)
-* Improve error messages for TcpSocketServer and UdpSocketServer. (for https://issues.apache.org/jira/browse/LOG4J2-1605[LOG4J2-1605] by `ggregory`)
* Updated Jackson from 2.8.2 to 2.8.3. (for https://issues.apache.org/jira/browse/LOG4J2-1598[LOG4J2-1598] by `ggregory`)
-* Update Apache Commons Compress from 1.12 to 1.13. (for https://issues.apache.org/jira/browse/LOG4J2-1757[LOG4J2-1757] by `ggregory`)
* Log4j2 TcpSocketServer in background. (for https://issues.apache.org/jira/browse/LOG4J2-1604[LOG4J2-1604] by `ggregory`, Colin Hillman)
+* Improve error messages for TcpSocketServer and UdpSocketServer. (for https://issues.apache.org/jira/browse/LOG4J2-1605[LOG4J2-1605] by `ggregory`)
+* Update Apache Commons Compress from 1.12 to 1.13. (for https://issues.apache.org/jira/browse/LOG4J2-1757[LOG4J2-1757] by `ggregory`)
=== Fixed
+* When starting on Google App Engine, Interpolator now suppresses the NoClassDefFoundError stack trace for the jvmrunargs lookup. (for https://issues.apache.org/jira/browse/LOG4J2-1051[LOG4J2-1051] by `rpopma`, Lukasz Lenart)
* Documented that JVM Input Arguments Lookup (JMX) is not available on Google App Engine. (for https://issues.apache.org/jira/browse/LOG4J2-1199[LOG4J2-1199] by `rpopma`)
-* (GC) Added method getParameter() to ObjectMessage (and ReusableObjectMessage). (for https://issues.apache.org/jira/browse/LOG4J2-1438[LOG4J2-1438] by `rpopma`)
-* Added support for setting StatusLogger destination in ConfigurationBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-1526[LOG4J2-1526] by `mikes`)
-* Fix file handle resource leak in XmlConfiguration.XmlConfiguration(ConfigurationSource). (for https://issues.apache.org/jira/browse/LOG4J2-1541[LOG4J2-1541] by `ggregory`)
-* Attributes were not merged properly in composite configurations. (for https://issues.apache.org/jira/browse/LOG4J2-1532[LOG4J2-1532] by `ggregory`)
-* Fixed issue where LogEvent.getContextStack() returned null. (for https://issues.apache.org/jira/browse/LOG4J2-1530[LOG4J2-1530] by `mikes`)
-* Prevent SocketAppender memory usage from growing unbounded if it cannot connect to a server. (for https://issues.apache.org/jira/browse/LOG4J2-1562[LOG4J2-1562] by `ggregory`)
-* [CronTriggeringPolicy] ConfigurationScheduler scheduled the task infinitely after first fire. (for https://issues.apache.org/jira/browse/LOG4J2-1548[LOG4J2-1548] by `ggregory`)
-* (GC) LoggerConfig now stores configuration properties in a List, not a Map to prevent creating temporary Iterator objects. Added method LoggerConfig#getPropertyList(), deprecated method #getProperties(). (for https://issues.apache.org/jira/browse/LOG4J2-1575[LOG4J2-1575] by `rpopma`)
-* Prevent potential NPE in org.apache.logging.log4j.core.util.datetime.FormatCache.MultipartKey.equals(Object) when object is null. (for https://issues.apache.org/jira/browse/LOG4J2-1602[LOG4J2-1602] by `ggregory`)
-* Fixed issue with filters extending AbstractFilter that did not override methods with unrolled varargs. (for https://issues.apache.org/jira/browse/LOG4J2-1590[LOG4J2-1590] by `rpopma`)
-* Prevent potential NPE due to org.apache.logging.log4j.core.layout.ScriptPatternSelector.createSelector(AbstractScript, PatternMatch[], String, boolean, boolean, Configuration). (for https://issues.apache.org/jira/browse/LOG4J2-1601[LOG4J2-1601] by `ggregory`)
-* Introduced new interface LifeCycle2 with stop(long,TimeUnit) method to avoid breaking backwards compatibility with new Configurator.shutdown(LoggerContext, long, TimeUnit) API. (for https://issues.apache.org/jira/browse/LOG4J2-1591[LOG4J2-1591] by `rpopma`)
-* Unregistering JMX components no longer prints a stack trace when the MBean has already been unregistered. (for https://issues.apache.org/jira/browse/LOG4J2-1581[LOG4J2-1581] by `rpopma`)
-* Prevent potential NPE in org.apache.logging.log4j.message.ParameterFormatter.formatMessage3(StringBuilder, char[], int, Object[], int, int[]). (for https://issues.apache.org/jira/browse/LOG4J2-1599[LOG4J2-1599] by `ggregory`)
-* ServletAppender does not provide throwable object to ServletContext. (for https://issues.apache.org/jira/browse/LOG4J2-1608[LOG4J2-1608] by `ggregory`)
-* Prevent potential NPE due to org.apache.logging.log4j.core.layout.MarkerPatternSelector.createSelector(PatternMatch[], String, boolean, boolean, Configuration). (for https://issues.apache.org/jira/browse/LOG4J2-1600[LOG4J2-1600] by `ggregory`)
-* When initializing on platforms where JMX is not available, Interpolator component no longer prints stack trace for warning messages. (for https://issues.apache.org/jira/browse/LOG4J2-1582[LOG4J2-1582] by `rpopma`)
-* Redo hashCode() and equals() methods in org.apache.logging.log4j.core.net.ssl classes. (for https://issues.apache.org/jira/browse/LOG4J2-1603[LOG4J2-1603] by `ggregory`)
-* new Log4jLogEvent().toString() throws an NPE. (for https://issues.apache.org/jira/browse/LOG4J2-1619[LOG4J2-1619] by `ggregory`)
-* Improved performance of context data injector for web applications to be on par with standalone applications. (for https://issues.apache.org/jira/browse/LOG4J2-1611[LOG4J2-1611] by `rpopma`)
-* (GC) Fixed %date conversion patterns with a timezone parameter are now garbage free. (for https://issues.apache.org/jira/browse/LOG4J2-1489[LOG4J2-1489] by `rpopma`, Richard Zschech)
+* org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy was not working correctly. (for https://issues.apache.org/jira/browse/LOG4J2-1235[LOG4J2-1235] by `ggregory`, Sascha Scholz, Aleksey ZvolinskyNiranjan Rao)
+* Log4j threads are no longer leaking on Tomcat shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-1259[LOG4J2-1259] by `ggregory`, Steffen OffermannMisagh Moayyed)
* Prevent NullPointerException in FastDateParser$TimeZoneStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-1279[LOG4J2-1279] by `rpopma`, Tony Baines)
-* Merging configurations failed with an NPE when comparing Nodes with different attributes. (for https://issues.apache.org/jira/browse/LOG4J2-1500[LOG4J2-1500] by `ggregory`, Jose Leon)
+* Properties declared in configuration can now have their value either in the element body or in an attribute named "value". (for https://issues.apache.org/jira/browse/LOG4J2-1313[LOG4J2-1313] by `rpopma`, Philipp Knobel)
* Support Property values to be specified in configuration as a value attribute as well as an element. (for https://issues.apache.org/jira/browse/LOG4J2-1313[LOG4J2-1313] by `rpopma`, Leon FinkerPhilipp Knobel)
-* [OSGi] Fixed missing import package. (for https://issues.apache.org/jira/browse/LOG4J2-1467[LOG4J2-1467] by `rpopma`, `ggregory`, Gary GregoryRalf)
+* Support loading custom plugins from jar files and directories whose classpath entries use the "vfs" URL protocol. (for https://issues.apache.org/jira/browse/LOG4J2-1320[LOG4J2-1320] by `ggregory`, Pierrick HymbertParesh Varke)
+* (GC) HighlightConverter and StyleConverter are now GC-free. (for https://issues.apache.org/jira/browse/LOG4J2-1341[LOG4J2-1341] by `rpopma`, Richard Zschech)
+* (GC) Added method getParameter() to ObjectMessage (and ReusableObjectMessage). (for https://issues.apache.org/jira/browse/LOG4J2-1438[LOG4J2-1438] by `rpopma`)
+* Allow comma separated agents, host list to be passed to FlumeAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1448[LOG4J2-1448] by `rpopma`, Keith Laban)
* Fixed class loader deadlock when using async logging and extended stack trace pattern. (for https://issues.apache.org/jira/browse/LOG4J2-1457[LOG4J2-1457] by `mattsicker`, Leon Finker)
-* org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy was not working correctly. (for https://issues.apache.org/jira/browse/LOG4J2-1235[LOG4J2-1235] by `ggregory`, Sascha Scholz, Aleksey ZvolinskyNiranjan Rao)
-* Log4j threads are no longer leaking on Tomcat shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-1259[LOG4J2-1259] by `ggregory`, Steffen OffermannMisagh Moayyed)
+* [OSGi] Fixed missing import package. (for https://issues.apache.org/jira/browse/LOG4J2-1467[LOG4J2-1467] by `rpopma`, `ggregory`, Gary GregoryRalf)
* Fixed improper header in CsvParameterLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1482[LOG4J2-1482] by `ggregory`, Sumit Singhal)
-* When starting on Google App Engine, Interpolator now suppresses the NoClassDefFoundError stack trace for the jvmrunargs lookup. (for https://issues.apache.org/jira/browse/LOG4J2-1051[LOG4J2-1051] by `rpopma`, Lukasz Lenart)
-* (GC) HighlightConverter and StyleConverter are now GC-free. (for https://issues.apache.org/jira/browse/LOG4J2-1341[LOG4J2-1341] by `rpopma`, Richard Zschech)
* (GC) Fixed ISO8601 %date conversion pattern with a period '.' separator for milliseconds is now garbage free. (for https://issues.apache.org/jira/browse/LOG4J2-1488[LOG4J2-1488] by `rpopma`, Richard Zschech)
+* (GC) Fixed %date conversion patterns with a timezone parameter are now garbage free. (for https://issues.apache.org/jira/browse/LOG4J2-1489[LOG4J2-1489] by `rpopma`, Richard Zschech)
* Log4j2 should postpone creating log file until the appender actually receives an event. (for https://issues.apache.org/jira/browse/LOG4J2-1490[LOG4J2-1490] by `ggregory`, Krzysztof Taborski)
-* Support loading custom plugins from jar files and directories whose classpath entries use the "vfs" URL protocol. (for https://issues.apache.org/jira/browse/LOG4J2-1320[LOG4J2-1320] by `ggregory`, Pierrick HymbertParesh Varke)
-* Properties declared in configuration can now have their value either in the element body or in an attribute named "value". (for https://issues.apache.org/jira/browse/LOG4J2-1313[LOG4J2-1313] by `rpopma`, Philipp Knobel)
-* Allow comma separated agents, host list to be passed to FlumeAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1448[LOG4J2-1448] by `rpopma`, Keith Laban)
-* Add targetNamespace to log4j-config.xsd. GitHub #43. (for https://issues.apache.org/jira/browse/LOG4J2-1610[LOG4J2-1610] by `ggregory`, Shubhankar)
+* Merging configurations failed with an NPE when comparing Nodes with different attributes. (for https://issues.apache.org/jira/browse/LOG4J2-1500[LOG4J2-1500] by `ggregory`, Jose Leon)
* Fixed issue where CsvParameterLayout and CsvLogEventLayout inserted NUL characters if data starts with {, (, [ or " (for https://issues.apache.org/jira/browse/LOG4J2-1502[LOG4J2-1502] by `ggregory`, Sumit Singhal)
-* Fixed scrambled log messages triggered by nested logging from toString() method of a logging parameter object. (for https://issues.apache.org/jira/browse/LOG4J2-1583[LOG4J2-1583] by `rpopma`, Larry West)
* Log4j should not unregister JMX MBeans when log4j2.disable.jmx property is true. (for https://issues.apache.org/jira/browse/LOG4J2-1506[LOG4J2-1506] by `ggregory`, Johannes Schleger)
-* Prevent deadlock in Async Loggers when queue is full and logged Object's toString() logs another message. (for https://issues.apache.org/jira/browse/LOG4J2-1518[LOG4J2-1518] by `rpopma`, Leon Finker)
* DynamicThresholdFilter filtered incorrectly when params were passed as individual arguments instead of varargs. (for https://issues.apache.org/jira/browse/LOG4J2-1511[LOG4J2-1511] by `ggregory`, Srikanth Surukuntu)
-* 2.7-rc1: RollingFileAppender immediateFlush default value should be true, not false. (for https://issues.apache.org/jira/browse/LOG4J2-1620[LOG4J2-1620] by `ggregory`, Sascha Scholz)
+* Prevent deadlock in Async Loggers when queue is full and logged Object's toString() logs another message. (for https://issues.apache.org/jira/browse/LOG4J2-1518[LOG4J2-1518] by `rpopma`, Leon Finker)
+* Added support for setting StatusLogger destination in ConfigurationBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-1526[LOG4J2-1526] by `mikes`)
* Prevent NPE in RingBufferLogEvent.getFormattedMessage() when used in web applications. (for https://issues.apache.org/jira/browse/LOG4J2-1527[LOG4J2-1527] by `rpopma`, Jose Leon)
-* Fixed ClassCastException when using JUL logging during shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-1618[LOG4J2-1618] by `rpopma`, Raman Gupta)
+* Attributes were not merged properly in composite configurations. (for https://issues.apache.org/jira/browse/LOG4J2-1529[LOG4J2-1529] by `mattsicker`, Sridevi Narra)
+* Fixed issue where LogEvent.getContextStack() returned null. (for https://issues.apache.org/jira/browse/LOG4J2-1530[LOG4J2-1530] by `mikes`)
+* Attributes were not merged properly in composite configurations. (for https://issues.apache.org/jira/browse/LOG4J2-1532[LOG4J2-1532] by `ggregory`)
+* Prevent NPE when dynamically removing filters. (for https://issues.apache.org/jira/browse/LOG4J2-1538[LOG4J2-1538] by `ggregory`, Igor Karpov)
+* Fix file handle resource leak in XmlConfiguration.XmlConfiguration(ConfigurationSource). (for https://issues.apache.org/jira/browse/LOG4J2-1541[LOG4J2-1541] by `ggregory`)
* Prevent ArrayIndexOutOfBoundsException in ParameterizedMessage.formatTo for single-char or empty messages. (for https://issues.apache.org/jira/browse/LOG4J2-1542[LOG4J2-1542] by `rpopma`, Rogério Lecarião Leite)
-* Layout is no longer optional. (for https://issues.apache.org/jira/browse/LOG4J2-1573[LOG4J2-1573] by `ggregory`, Steffen Offermann)
+* [CronTriggeringPolicy] ConfigurationScheduler scheduled the task infinitely after first fire. (for https://issues.apache.org/jira/browse/LOG4J2-1548[LOG4J2-1548] by `ggregory`)
* Fixed issue where AsyncLoggerContextSelector+PropertiesConfigurationBuilder defaulted to includeLocation=true. (for https://issues.apache.org/jira/browse/LOG4J2-1549[LOG4J2-1549] by `mikes`, Jason Bedard)
-* Fix to prevent Log4j 2.6.2 and higher from losing exceptions when a security manager is present. (for https://issues.apache.org/jira/browse/LOG4J2-1563[LOG4J2-1563] by `ggregory`, Jason Tedor)
-* Attributes were not merged properly in composite configurations. (for https://issues.apache.org/jira/browse/LOG4J2-1529[LOG4J2-1529] by `mattsicker`, Sridevi Narra)
* Prevent NPE in Level.isInRange. (for https://issues.apache.org/jira/browse/LOG4J2-1559[LOG4J2-1559] by `ggregory`, Andrey Plotkin)
-* Prevent NPE when dynamically removing filters. (for https://issues.apache.org/jira/browse/LOG4J2-1538[LOG4J2-1538] by `ggregory`, Igor Karpov)
+* Prevent SocketAppender memory usage from growing unbounded if it cannot connect to a server. (for https://issues.apache.org/jira/browse/LOG4J2-1562[LOG4J2-1562] by `ggregory`)
+* Fix to prevent Log4j 2.6.2 and higher from losing exceptions when a security manager is present. (for https://issues.apache.org/jira/browse/LOG4J2-1563[LOG4J2-1563] by `ggregory`, Jason Tedor)
+* Layout is no longer optional. (for https://issues.apache.org/jira/browse/LOG4J2-1573[LOG4J2-1573] by `ggregory`, Steffen Offermann)
+* (GC) LoggerConfig now stores configuration properties in a List, not a Map to prevent creating temporary Iterator objects. Added method LoggerConfig#getPropertyList(), deprecated method #getProperties(). (for https://issues.apache.org/jira/browse/LOG4J2-1575[LOG4J2-1575] by `rpopma`)
+* Unregistering JMX components no longer prints a stack trace when the MBean has already been unregistered. (for https://issues.apache.org/jira/browse/LOG4J2-1581[LOG4J2-1581] by `rpopma`)
+* When initializing on platforms where JMX is not available, Interpolator component no longer prints stack trace for warning messages. (for https://issues.apache.org/jira/browse/LOG4J2-1582[LOG4J2-1582] by `rpopma`)
+* Fixed scrambled log messages triggered by nested logging from toString() method of a logging parameter object. (for https://issues.apache.org/jira/browse/LOG4J2-1583[LOG4J2-1583] by `rpopma`, Larry West)
+* Fixed issue with filters extending AbstractFilter that did not override methods with unrolled varargs. (for https://issues.apache.org/jira/browse/LOG4J2-1590[LOG4J2-1590] by `rpopma`)
+* Introduced new interface LifeCycle2 with stop(long,TimeUnit) method to avoid breaking backwards compatibility with new Configurator.shutdown(LoggerContext, long, TimeUnit) API. (for https://issues.apache.org/jira/browse/LOG4J2-1591[LOG4J2-1591] by `rpopma`)
+* Prevent potential NPE in org.apache.logging.log4j.message.ParameterFormatter.formatMessage3(StringBuilder, char[], int, Object[], int, int[]). (for https://issues.apache.org/jira/browse/LOG4J2-1599[LOG4J2-1599] by `ggregory`)
+* Prevent potential NPE due to org.apache.logging.log4j.core.layout.MarkerPatternSelector.createSelector(PatternMatch[], String, boolean, boolean, Configuration). (for https://issues.apache.org/jira/browse/LOG4J2-1600[LOG4J2-1600] by `ggregory`)
+* Prevent potential NPE due to org.apache.logging.log4j.core.layout.ScriptPatternSelector.createSelector(AbstractScript, PatternMatch[], String, boolean, boolean, Configuration). (for https://issues.apache.org/jira/browse/LOG4J2-1601[LOG4J2-1601] by `ggregory`)
+* Prevent potential NPE in org.apache.logging.log4j.core.util.datetime.FormatCache.MultipartKey.equals(Object) when object is null. (for https://issues.apache.org/jira/browse/LOG4J2-1602[LOG4J2-1602] by `ggregory`)
+* Redo hashCode() and equals() methods in org.apache.logging.log4j.core.net.ssl classes. (for https://issues.apache.org/jira/browse/LOG4J2-1603[LOG4J2-1603] by `ggregory`)
+* ServletAppender does not provide throwable object to ServletContext. (for https://issues.apache.org/jira/browse/LOG4J2-1608[LOG4J2-1608] by `ggregory`)
+* Add targetNamespace to log4j-config.xsd. GitHub #43. (for https://issues.apache.org/jira/browse/LOG4J2-1610[LOG4J2-1610] by `ggregory`, Shubhankar)
+* Improved performance of context data injector for web applications to be on par with standalone applications. (for https://issues.apache.org/jira/browse/LOG4J2-1611[LOG4J2-1611] by `rpopma`)
+* Fixed ClassCastException when using JUL logging during shutdown. (for https://issues.apache.org/jira/browse/LOG4J2-1618[LOG4J2-1618] by `rpopma`, Raman Gupta)
+* new Log4jLogEvent().toString() throws an NPE. (for https://issues.apache.org/jira/browse/LOG4J2-1619[LOG4J2-1619] by `ggregory`)
+* 2.7-rc1: RollingFileAppender immediateFlush default value should be true, not false. (for https://issues.apache.org/jira/browse/LOG4J2-1620[LOG4J2-1620] by `ggregory`, Sascha Scholz)
* [OSGi] Fixed wrong Fragment-Host in manifest files. (for https://issues.apache.org/jira/browse/LOG4J2-351[LOG4J2-351] by `rpopma`, `ggregory`, Roland Weiglhofer)
* Added ability to disable (date) lookup completely for compatibility with other libraries like Camel. (for https://issues.apache.org/jira/browse/LOG4J2-905[LOG4J2-905] by `ggregory`, Moritz Löser)
diff --git a/src/site/asciidoc/changelog/2.8.1.adoc b/src/site/asciidoc/changelog/2.8.1.adoc
index ca95591b18..39198211de 100644
--- a/src/site/asciidoc/changelog/2.8.1.adoc
+++ b/src/site/asciidoc/changelog/2.8.1.adoc
@@ -75,19 +75,19 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Changed
-* Improved error message when log4j 2 configuration file not found. (for https://issues.apache.org/jira/browse/LOG4J2-1812[LOG4J2-1812] by `rpopma`)
* Update to use Logback 1.1.10 and then Logback 1.2 for tests. (for https://issues.apache.org/jira/browse/LOG4J2-1810[LOG4J2-1810] by `rgoers`)
-* Update SLF4J to 1.7.24. (for https://issues.apache.org/jira/browse/LOG4J2-1822[LOG4J2-1822] by `rgoers`)
+* Improved error message when log4j 2 configuration file not found. (for https://issues.apache.org/jira/browse/LOG4J2-1812[LOG4J2-1812] by `rpopma`)
* Update Jackson from 2.8.5 to 2.8.6. (for https://issues.apache.org/jira/browse/LOG4J2-1819[LOG4J2-1819] by `ggregory`)
+* Update SLF4J to 1.7.24. (for https://issues.apache.org/jira/browse/LOG4J2-1822[LOG4J2-1822] by `rgoers`)
=== Fixed
-* Fixed rare race condition in FixedDateFormat, made FixedDateFormat::millisSinceMidnight method public. (for https://issues.apache.org/jira/browse/LOG4J2-1805[LOG4J2-1805] by `rpopma`)
+* Fix ClassNotFoundException org.apache.logging.log4j.core.util.ExecutorServices in OSGi tests. (for https://issues.apache.org/jira/browse/LOG4J2-1753[LOG4J2-1753] by `ggregory`, Ludovic Hochet)
+* Fixed bug in PropertiesUtil::getCharsetProperty that caused UnsupportedCharsetException for ConsoleAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1799[LOG4J2-1799] by `rpopma`, Eduard Gizatullin)
+* Report errors when sending to Kafka when using syncSend=false. (for https://issues.apache.org/jira/browse/LOG4J2-1800[LOG4J2-1800] by `mikes`, Vincent Tieleman)
* Fix Maven POM to ensure JMH generated classes in log4j-perf are included in benchmarks jar. (for https://issues.apache.org/jira/browse/LOG4J2-1803[LOG4J2-1803] by `rgoers`)
* Allow %i in file pattern to be preceded with characters other than just '-'. (for https://issues.apache.org/jira/browse/LOG4J2-1804[LOG4J2-1804] by `rgoers`, Pierrick Hymbert)
-* Fix rollover to work when filePattern contains no directory components. (for https://issues.apache.org/jira/browse/LOG4J2-1818[LOG4J2-1818] by `ggregory`, xkr47)
-* Report errors when sending to Kafka when using syncSend=false. (for https://issues.apache.org/jira/browse/LOG4J2-1800[LOG4J2-1800] by `mikes`, Vincent Tieleman)
-* Fixed bug in PropertiesUtil::getCharsetProperty that caused UnsupportedCharsetException for ConsoleAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1799[LOG4J2-1799] by `rpopma`, Eduard Gizatullin)
-* Change minOccur to minOccurs in Log4j-config.xsd. (for https://issues.apache.org/jira/browse/LOG4J2-1816[LOG4J2-1816] by `rpopma`, shubhankar1100)
+* Fixed rare race condition in FixedDateFormat, made FixedDateFormat::millisSinceMidnight method public. (for https://issues.apache.org/jira/browse/LOG4J2-1805[LOG4J2-1805] by `rpopma`)
* Fix Javadoc for DefaultRolloverStrategy::purgeAscending (for https://issues.apache.org/jira/browse/LOG4J2-1806[LOG4J2-1806] by `rpopma`, challarao)
-* Fix ClassNotFoundException org.apache.logging.log4j.core.util.ExecutorServices in OSGi tests. (for https://issues.apache.org/jira/browse/LOG4J2-1753[LOG4J2-1753] by `ggregory`, Ludovic Hochet)
+* Change minOccur to minOccurs in Log4j-config.xsd. (for https://issues.apache.org/jira/browse/LOG4J2-1816[LOG4J2-1816] by `rpopma`, shubhankar1100)
+* Fix rollover to work when filePattern contains no directory components. (for https://issues.apache.org/jira/browse/LOG4J2-1818[LOG4J2-1818] by `ggregory`, xkr47)
diff --git a/src/site/asciidoc/changelog/2.8.2.adoc b/src/site/asciidoc/changelog/2.8.2.adoc
index 6cc790d177..a481e6581b 100644
--- a/src/site/asciidoc/changelog/2.8.2.adoc
+++ b/src/site/asciidoc/changelog/2.8.2.adoc
@@ -70,10 +70,10 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Add JSON encoding support to EncodingPatternConverter %encode{}. (for https://issues.apache.org/jira/browse/LOG4J2-1848[LOG4J2-1848] by `mattsicker`)
-* Add support for filtering input in TcpSocketServer and UdpSocketServer. (for https://issues.apache.org/jira/browse/LOG4J2-1863[LOG4J2-1863] by `mattsicker`)
* Add support for appending common suffix to each line of extended and root throwable stack trace. (for https://issues.apache.org/jira/browse/LOG4J2-1838[LOG4J2-1838] by `mattsicker`, Zilong Song)
* Add support for appending common suffix to each line of throwable stack trace. (for https://issues.apache.org/jira/browse/LOG4J2-1843[LOG4J2-1843] by `mattsicker`, Zilong Song)
+* Add JSON encoding support to EncodingPatternConverter %encode{}. (for https://issues.apache.org/jira/browse/LOG4J2-1848[LOG4J2-1848] by `mattsicker`)
+* Add support for filtering input in TcpSocketServer and UdpSocketServer. (for https://issues.apache.org/jira/browse/LOG4J2-1863[LOG4J2-1863] by `mattsicker`)
=== Changed
@@ -82,15 +82,15 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Fixed
-* Fixed daylight savings time (DST) issue with FixedDateFormat. (for https://issues.apache.org/jira/browse/LOG4J2-1849[LOG4J2-1849] by `rpopma`)
-* Fix JavaDoc on org.apache.logging.log4j.ThreadContext about inheritance. (for https://issues.apache.org/jira/browse/LOG4J2-1861[LOG4J2-1861] by `mattsicker`)
+* Log4j 2.8 can lose exceptions when a security manager is present. (for https://issues.apache.org/jira/browse/LOG4J2-1820[LOG4J2-1820] by `ggregory`, Jason Tedor)
+* NullPointerException in HtmlLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1831[LOG4J2-1831] by `ggregory`, Edward Serebrinskiy)
+* Fix documentation about the licensing for JeroMQ. (for https://issues.apache.org/jira/browse/LOG4J2-1835[LOG4J2-1835] by `mattsicker`)
* Update the API version to 2.6.0. (for https://issues.apache.org/jira/browse/LOG4J2-1836[LOG4J2-1836] by `rgoers`)
+* Fix typo in %replace converter documentation. (for https://issues.apache.org/jira/browse/LOG4J2-1840[LOG4J2-1840] by `mattsicker`, Pradeep Balasundaram)
* Handle when LogEvent.getLoggerName() returns null in KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1845[LOG4J2-1845] by `mikes`)
* Handle when LogEvent.getLoggerName() returns null in LoggerNameLevelRewritePolicy. (for https://issues.apache.org/jira/browse/LOG4J2-1846[LOG4J2-1846] by `mikes`)
-* Fix documentation about the licensing for JeroMQ. (for https://issues.apache.org/jira/browse/LOG4J2-1835[LOG4J2-1835] by `mattsicker`)
-* NullPointerException in HtmlLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1831[LOG4J2-1831] by `ggregory`, Edward Serebrinskiy)
-* Fix typo in %replace converter documentation. (for https://issues.apache.org/jira/browse/LOG4J2-1840[LOG4J2-1840] by `mattsicker`, Pradeep Balasundaram)
-* Log4j 2.8 can lose exceptions when a security manager is present. (for https://issues.apache.org/jira/browse/LOG4J2-1820[LOG4J2-1820] by `ggregory`, Jason Tedor)
+* Fixed daylight savings time (DST) issue with FixedDateFormat. (for https://issues.apache.org/jira/browse/LOG4J2-1849[LOG4J2-1849] by `rpopma`)
* Fix CassandraRule and unit tests on Windows. (for https://issues.apache.org/jira/browse/LOG4J2-1850[LOG4J2-1850] by `mattsicker`, Ludovic Hochet)
* The default value of RandomAccessFileAppender.Builder append field is wrong. (for https://issues.apache.org/jira/browse/LOG4J2-1853[LOG4J2-1853] by `ggregory`, wangyuntao)
+* Fix JavaDoc on org.apache.logging.log4j.ThreadContext about inheritance. (for https://issues.apache.org/jira/browse/LOG4J2-1861[LOG4J2-1861] by `mattsicker`)
* Fix JavaDoc about @Order and OrderComparator ordering. (for https://issues.apache.org/jira/browse/LOG4J2-1862[LOG4J2-1862] by `mattsicker`, wangyuntao)
diff --git a/src/site/asciidoc/changelog/2.8.adoc b/src/site/asciidoc/changelog/2.8.adoc
index 4200df00a5..67f0a2cb37 100644
--- a/src/site/asciidoc/changelog/2.8.adoc
+++ b/src/site/asciidoc/changelog/2.8.adoc
@@ -71,116 +71,116 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Allow default value in property to be a Lookup. (for https://issues.apache.org/jira/browse/LOG4J2-1243[LOG4J2-1243] by `rgoers`)
-* Add documentation regarding YAML configuration format. (for https://issues.apache.org/jira/browse/LOG4J2-1379[LOG4J2-1379] by `mattsicker`)
* Make DefaultRolloverStrategy more efficient when renaming files. Add nomax option to the fileIndex attribute. (for https://issues.apache.org/jira/browse/LOG4J2-1032[LOG4J2-1032] by `rgoers`)
* RollingFileAppender now supports omitting the file name and writing directly to the archive files. (for https://issues.apache.org/jira/browse/LOG4J2-1101[LOG4J2-1101] by `rgoers`)
+* Allow default value in property to be a Lookup. (for https://issues.apache.org/jira/browse/LOG4J2-1243[LOG4J2-1243] by `rgoers`)
+* Add documentation regarding YAML configuration format. (for https://issues.apache.org/jira/browse/LOG4J2-1379[LOG4J2-1379] by `mattsicker`)
* Added public method ThreadContext::getThreadContextMap; removed class ThreadContextAccess. (for https://issues.apache.org/jira/browse/LOG4J2-1660[LOG4J2-1660] by `rpopma`)
* Introduce interfaces IndexedStringMap and IndexedReadOnlyStringMap, supporting garbage-free iteration over sorted map. (for https://issues.apache.org/jira/browse/LOG4J2-1681[LOG4J2-1681] by `rpopma`)
* Add a Builder to ScriptPatternSelector and deprecate ScriptPatternSelector.createSelector(). (for https://issues.apache.org/jira/browse/LOG4J2-1695[LOG4J2-1695] by `ggregory`)
-* Add a Builder to RollingRandomAccessFileAppender and deprecate RollingRandomAccessFileAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1704[LOG4J2-1704] by `ggregory`)
-* Add a Builder to RandomAccessFileAppender and deprecate RandomAccessFileAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1701[LOG4J2-1701] by `ggregory`)
* Add a Builder to MarkerPatternSelector and deprecate MarkerPatternSelector.createSelector(). (for https://issues.apache.org/jira/browse/LOG4J2-1696[LOG4J2-1696] by `ggregory`)
-* Add a Builder to MemoryMappedFileAppender and deprecate MemoryMappedFileAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1703[LOG4J2-1703] by `ggregory`)
* Add a SerializerBuilder to PatternLayout and deprecate PatternLayout.createSerializer(). (for https://issues.apache.org/jira/browse/LOG4J2-1697[LOG4J2-1697] by `ggregory`)
-* Introduce marker interface AsynchronouslyFormattable. (for https://issues.apache.org/jira/browse/LOG4J2-1718[LOG4J2-1718] by `rpopma`)
+* Add a Builder to RandomAccessFileAppender and deprecate RandomAccessFileAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1701[LOG4J2-1701] by `ggregory`)
+* Add a Builder to MemoryMappedFileAppender and deprecate MemoryMappedFileAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1703[LOG4J2-1703] by `ggregory`)
+* Add a Builder to RollingRandomAccessFileAppender and deprecate RollingRandomAccessFileAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1704[LOG4J2-1704] by `ggregory`)
* Allow TCP Socket Appender to set socket options. (for https://issues.apache.org/jira/browse/LOG4J2-1707[LOG4J2-1707] by `ggregory`)
-* Add Apache Cassandra appender and ColumnMapping plugin. (for https://issues.apache.org/jira/browse/LOG4J2-1730[LOG4J2-1730] by `mattsicker`)
* Allow Secure Socket Appender to set socket options. (for https://issues.apache.org/jira/browse/LOG4J2-1708[LOG4J2-1708] by `ggregory`)
* Add a Builder to SyslogAppender and deprecate SyslogAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1709[LOG4J2-1709] by `ggregory`)
+* Introduce marker interface AsynchronouslyFormattable. (for https://issues.apache.org/jira/browse/LOG4J2-1718[LOG4J2-1718] by `rpopma`)
+* Add Apache Cassandra appender and ColumnMapping plugin. (for https://issues.apache.org/jira/browse/LOG4J2-1730[LOG4J2-1730] by `mattsicker`)
+* Add SyncSend attribute to KafkaAppender (as in KafkaLog4jAppender). (for https://issues.apache.org/jira/browse/LOG4J2-1733[LOG4J2-1733] by `ggregory`, Vincent Tieleman)
+* Add a Builder to SyslogLayout and deprecate SyslogLayout.createLayout(Facility, boolean, String, Charset). (for https://issues.apache.org/jira/browse/LOG4J2-1737[LOG4J2-1737] by `ggregory`)
* Add a Builder to JsonLayout and deprecate org.apache.logging.log4j.core.layout.JsonLayout.createLayout(Configuration, boolean, boolean, boolean, boolean, boolean, boolean, String, String, Charset, boolean). (for https://issues.apache.org/jira/browse/LOG4J2-1738[LOG4J2-1738] by `ggregory`)
-* Add TypeConverter for java.nio.file.Path. (for https://issues.apache.org/jira/browse/LOG4J2-1758[LOG4J2-1758] by `mattsicker`)
+* Add Builder to KafkaAppender and deprecate KafkaAppender.createAppender(Layout, Filter, String, boolean, String, Property[], Configuration). (for https://issues.apache.org/jira/browse/LOG4J2-1739[LOG4J2-1739] by `ggregory`)
* Add TypeConverter and constraint validators for java.net.InetAddress and port numbers. (for https://issues.apache.org/jira/browse/LOG4J2-1755[LOG4J2-1755] by `mattsicker`)
+* Add TypeConverter for java.nio.file.Path. (for https://issues.apache.org/jira/browse/LOG4J2-1758[LOG4J2-1758] by `mattsicker`)
* Add TypeConverter for java.util.UUID. (for https://issues.apache.org/jira/browse/LOG4J2-1759[LOG4J2-1759] by `mattsicker`)
-* Add a Builder to SyslogLayout and deprecate SyslogLayout.createLayout(Facility, boolean, String, Charset). (for https://issues.apache.org/jira/browse/LOG4J2-1737[LOG4J2-1737] by `ggregory`)
-* Add Builder to KafkaAppender and deprecate KafkaAppender.createAppender(Layout, Filter, String, boolean, String, Property[], Configuration). (for https://issues.apache.org/jira/browse/LOG4J2-1739[LOG4J2-1739] by `ggregory`)
+* Use MethodHandle in ContextDataFactory cached constructor. (for https://issues.apache.org/jira/browse/LOG4J2-1764[LOG4J2-1764] by `mattsicker`)
+* Add a Builder to JdbcAppender and deprecate JdbcAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1770[LOG4J2-1770] by `mattsicker`)
+* Add a Builder to ColumnConfig and deprecate ColumnConfig.createColumnConfig(). (for https://issues.apache.org/jira/browse/LOG4J2-1771[LOG4J2-1771] by `mattsicker`)
+* Add StatusLoggerRule to allow unit tests to set a status level. (for https://issues.apache.org/jira/browse/LOG4J2-1773[LOG4J2-1773] by `mattsicker`)
* Document how to exclude transitive conflicting dependencies in Maven and Gradle. (for https://issues.apache.org/jira/browse/LOG4J2-1787[LOG4J2-1787] by `mattsicker`)
* Add non-string data type support to JdbcAppender via new ColumnMapping plugin. (for https://issues.apache.org/jira/browse/LOG4J2-424[LOG4J2-424] by `mattsicker`)
* Refactor SyslogAppender so that Layout is a Plugin element. (for https://issues.apache.org/jira/browse/LOG4J2-969[LOG4J2-969] by `ggregory`)
-* Add a Builder to JdbcAppender and deprecate JdbcAppender.createAppender(). (for https://issues.apache.org/jira/browse/LOG4J2-1770[LOG4J2-1770] by `mattsicker`)
-* Use MethodHandle in ContextDataFactory cached constructor. (for https://issues.apache.org/jira/browse/LOG4J2-1764[LOG4J2-1764] by `mattsicker`)
-* Add StatusLoggerRule to allow unit tests to set a status level. (for https://issues.apache.org/jira/browse/LOG4J2-1773[LOG4J2-1773] by `mattsicker`)
-* Add a Builder to ColumnConfig and deprecate ColumnConfig.createColumnConfig(). (for https://issues.apache.org/jira/browse/LOG4J2-1771[LOG4J2-1771] by `mattsicker`)
-* Add SyncSend attribute to KafkaAppender (as in KafkaLog4jAppender). (for https://issues.apache.org/jira/browse/LOG4J2-1733[LOG4J2-1733] by `ggregory`, Vincent Tieleman)
=== Changed
* The log4j-slf4j-impl module now declares a runtime dependency on log4j-core. While not technically required, this makes the log4j-slf4j-impl module behave similarly to slf4j-log4j12, and facilitates migration to Log4j 2. (for https://issues.apache.org/jira/browse/LOG4J2-1302[LOG4J2-1302] by `rpopma`)
-* Update Apache Flume from 1.6.0 to 1.7.0. (for https://issues.apache.org/jira/browse/LOG4J2-1656[LOG4J2-1656] by `ggregory`)
+* Update JeroMQ from 0.3.5 to 0.3.6. (for https://issues.apache.org/jira/browse/LOG4J2-1641[LOG4J2-1641] by `ggregory`)
+* Inefficient locking in AbstractLoggerAdapter. (for https://issues.apache.org/jira/browse/LOG4J2-1644[LOG4J2-1644] by `ggregory`, Pavel SivolobtchikTim Gokcen)
* Migrate to Mockito 2.x in unit tests. (for https://issues.apache.org/jira/browse/LOG4J2-1646[LOG4J2-1646] by `mattsicker`)
* Update Commons Lang from 3.4 to 3.5. (for https://issues.apache.org/jira/browse/LOG4J2-1647[LOG4J2-1647] by `mattsicker`)
-* Update JeroMQ from 0.3.5 to 0.3.6. (for https://issues.apache.org/jira/browse/LOG4J2-1641[LOG4J2-1641] by `ggregory`)
* Update Jackson from 2.8.3 to 2.8.4. (for https://issues.apache.org/jira/browse/LOG4J2-1655[LOG4J2-1655] by `ggregory`)
-* Update Jansi from 1.13 to 1.14. (for https://issues.apache.org/jira/browse/LOG4J2-1700[LOG4J2-1700] by `ggregory`)
+* Update Apache Flume from 1.6.0 to 1.7.0. (for https://issues.apache.org/jira/browse/LOG4J2-1656[LOG4J2-1656] by `ggregory`)
* Update LMAX Disruptor from 3.3.5 to 3.3.6. (for https://issues.apache.org/jira/browse/LOG4J2-1698[LOG4J2-1698] by `ggregory`)
-* Update Kafka from 0.10.0.1 to 0.10.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-1750[LOG4J2-1750] by `ggregory`)
+* Update Jansi from 1.13 to 1.14. (for https://issues.apache.org/jira/browse/LOG4J2-1700[LOG4J2-1700] by `ggregory`)
* Update Jackson from 2.8.4 to 2.8.5. (for https://issues.apache.org/jira/browse/LOG4J2-1735[LOG4J2-1735] by `ggregory`)
+* Update Kafka from 0.10.0.1 to 0.10.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-1750[LOG4J2-1750] by `ggregory`)
* Update liquibase-core from 3.5.1 to 3.5.3. (for https://issues.apache.org/jira/browse/LOG4J2-1751[LOG4J2-1751] by `ggregory`)
-* Update Conversant Disruptor from 1.2.7 to 1.2.10 (for https://issues.apache.org/jira/browse/LOG4J2-1781[LOG4J2-1781] by `mattsicker`)
* Replace MockEJB dependency in unit tests with Spring Test and Mockito. (for https://issues.apache.org/jira/browse/LOG4J2-1774[LOG4J2-1774] by `mattsicker`)
-* Inefficient locking in AbstractLoggerAdapter. (for https://issues.apache.org/jira/browse/LOG4J2-1644[LOG4J2-1644] by `ggregory`, Pavel SivolobtchikTim Gokcen)
+* Update Conversant Disruptor from 1.2.7 to 1.2.10 (for https://issues.apache.org/jira/browse/LOG4J2-1781[LOG4J2-1781] by `mattsicker`)
=== Fixed
+* Improve LogEvent serialization to handle non-serializable Messages and deserializing when required classes are missing. (for https://issues.apache.org/jira/browse/LOG4J2-1226[LOG4J2-1226] by `rpopma`)
+* CronTriggeringPolicy raise exception and fail to rollover log file when evaluateOnStartup is true. (for https://issues.apache.org/jira/browse/LOG4J2-1474[LOG4J2-1474] by `ggregory`, Neonyin mingjun)
* Configurable JVM shutdown hook timeout. (for https://issues.apache.org/jira/browse/LOG4J2-1623[LOG4J2-1623] by `mikes`)
* Fixed file locking regression in FileAppender introduced in 2.6. (for https://issues.apache.org/jira/browse/LOG4J2-1628[LOG4J2-1628] by `rpopma`)
-* Improve LogEvent serialization to handle non-serializable Messages and deserializing when required classes are missing. (for https://issues.apache.org/jira/browse/LOG4J2-1226[LOG4J2-1226] by `rpopma`)
+* Console Appender does not pick up Oracle Java 8's sun.stdout.encoding and sun.stderr.encoding. (for https://issues.apache.org/jira/browse/LOG4J2-1636[LOG4J2-1636] by `ggregory`, Eldar Gabdullin)
* Fixed problems when used in OSGi containers (IllegalAccessError, NoClassDefFoundError). (for https://issues.apache.org/jira/browse/LOG4J2-1637[LOG4J2-1637] by `rpopma`)
+* Fix MemoryMappedFileAppender.createAppender() Javadoc for immediateFlush. (for https://issues.apache.org/jira/browse/LOG4J2-1639[LOG4J2-1639] by `ggregory`, Sridhar Gopinath)
+* DefaultShutdownCallbackRegistry can throw a NoClassDefFoundError. (for https://issues.apache.org/jira/browse/LOG4J2-1642[LOG4J2-1642] by `ggregory`, Johno Crawford)
+* Immutable empty StringMap. (for https://issues.apache.org/jira/browse/LOG4J2-1645[LOG4J2-1645] by `mikes`)
+* Insure the ConfigurationScheduler shuts down without blocking. (for https://issues.apache.org/jira/browse/LOG4J2-1649[LOG4J2-1649] by `rgoers`, Georg Friedrich)
+* CronTriggeringPolicy would use the wrong date/time when rolling over and create multiple triggering policies on reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-1653[LOG4J2-1653] by `rgoers`, Georg Friedrich)
* Prevent NPE in ThreadContextMapFactory::createThreadContextMap when initializing Log4j with Configurator::initialize and the BasicContextSelector is used. (for https://issues.apache.org/jira/browse/LOG4J2-1658[LOG4J2-1658] by `rpopma`)
* Ensure SortedArrayStringMap can be serialized and deserialized without errors regardless of content. (for https://issues.apache.org/jira/browse/LOG4J2-1663[LOG4J2-1663] by `rpopma`)
-* Immutable empty StringMap. (for https://issues.apache.org/jira/browse/LOG4J2-1645[LOG4J2-1645] by `mikes`)
-* (GC) Avoid allocating temporary objects in ThreadContextMapFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1678[LOG4J2-1678] by `rpopma`)
-* (GC) Avoid allocating temporary objects in TimeFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1680[LOG4J2-1680] by `rpopma`)
-* (GC) Avoid allocating temporary objects in MarkerFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1673[LOG4J2-1673] by `rpopma`)
-* (GC) Avoid allocating temporary objects in MaxLengthConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1669[LOG4J2-1669] by `rpopma`)
+* Improve OSGi unit tests. (for https://issues.apache.org/jira/browse/LOG4J2-1664[LOG4J2-1664] by `ggregory`, Ludovic HOCHET)
* (GC) Avoid allocating temporary objects in IntegerPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1665[LOG4J2-1665] by `rpopma`)
-* (GC) Avoid allocating temporary objects in LevelRangeFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1672[LOG4J2-1672] by `rpopma`)
-* (GC) Avoid allocating temporary objects in MarkerPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1668[LOG4J2-1668] by `rpopma`)
-* (GC) Avoid allocating temporary objects in MapFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1677[LOG4J2-1677] by `rpopma`)
-* (GC) Avoid allocating temporary objects in EqualsIgnoreCaseReplacementConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1671[LOG4J2-1671] by `rpopma`)
-* (GC) Avoid allocating temporary objects in StructuredDataFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1679[LOG4J2-1679] by `rpopma`)
* (GC) Avoid allocating temporary objects in RelativeTimePatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1666[LOG4J2-1666] by `rpopma`)
* (GC) Avoid allocating temporary objects in SequenceNumberPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1667[LOG4J2-1667] by `rpopma`)
-* (GC) Avoid allocating temporary objects in ThresholdFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1674[LOG4J2-1674] by `rpopma`)
+* (GC) Avoid allocating temporary objects in MarkerPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1668[LOG4J2-1668] by `rpopma`)
+* (GC) Avoid allocating temporary objects in MaxLengthConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1669[LOG4J2-1669] by `rpopma`)
* (GC) Avoid allocating temporary objects in EqualsReplacementConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1670[LOG4J2-1670] by `rpopma`)
+* (GC) Avoid allocating temporary objects in EqualsIgnoreCaseReplacementConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1671[LOG4J2-1671] by `rpopma`)
+* (GC) Avoid allocating temporary objects in LevelRangeFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1672[LOG4J2-1672] by `rpopma`)
+* (GC) Avoid allocating temporary objects in MarkerFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1673[LOG4J2-1673] by `rpopma`)
+* (GC) Avoid allocating temporary objects in ThresholdFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1674[LOG4J2-1674] by `rpopma`)
+* Some LogEvents may not carry a Throwable (Use Message.getThrowable() in log(Message) methods.) (for https://issues.apache.org/jira/browse/LOG4J2-1676[LOG4J2-1676] by `ggregory`, Joern Huxhorn)
+* (GC) Avoid allocating temporary objects in MapFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1677[LOG4J2-1677] by `rpopma`)
+* (GC) Avoid allocating temporary objects in ThreadContextMapFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1678[LOG4J2-1678] by `rpopma`)
+* (GC) Avoid allocating temporary objects in StructuredDataFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1679[LOG4J2-1679] by `rpopma`)
+* (GC) Avoid allocating temporary objects in TimeFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1680[LOG4J2-1680] by `rpopma`)
+* Logger using LocalizedMessageFactory prints key instead of message. (for https://issues.apache.org/jira/browse/LOG4J2-1682[LOG4J2-1682] by `ggregory`, Markus Waidhofer)
+* (GC) Avoid allocating temporary objects in MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1683[LOG4J2-1683] by `rpopma`)
+* Option 'disableAnsi' in PatternLayout to unconditionally disable ANSI escape codes. (for https://issues.apache.org/jira/browse/LOG4J2-1685[LOG4J2-1685] by `mikes`, Raman Gupta)
+* NPE in ThrowableProxy when resolving stack in Java EE/OSGi environment. (for https://issues.apache.org/jira/browse/LOG4J2-1687[LOG4J2-1687] by `ggregory`, Robert Christiansen)
* Fixed bug where elements of a log message parameter array were nulled out in garbage-free mode. (for https://issues.apache.org/jira/browse/LOG4J2-1688[LOG4J2-1688] by `rpopma`)
* Add CleanableThreadContextMap interface supporting method removeAll(Iterable<String>). (for https://issues.apache.org/jira/browse/LOG4J2-1689[LOG4J2-1689] by `mikes`)
-* (GC) Avoid allocating temporary objects in MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1683[LOG4J2-1683] by `rpopma`)
+* Add putAll() method to CloseableThreadContext. (for https://issues.apache.org/jira/browse/LOG4J2-1692[LOG4J2-1692] by `mikes`, Greg Thomas)
* Make TimeFilter usable as global filter and as logger filter. (for https://issues.apache.org/jira/browse/LOG4J2-1706[LOG4J2-1706] by `rpopma`)
-* Fixed race condition in ObjectMessage and SimpleMessage, ensuring that the log message contains the value the object has during the logging call. (for https://issues.apache.org/jira/browse/LOG4J2-1719[LOG4J2-1719] by `rpopma`)
-* (GC) Avoid allocating temporary objects in VariablesNotEmptyReplacementConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1722[LOG4J2-1722] by `rpopma`)
-* (GC) Avoid allocating temporary objects in EncodingPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1717[LOG4J2-1717] by `rpopma`)
-* (GC) Avoid allocating temporary objects in NdcPatternConverter. (Note that use of the ThreadContext stack is not garbage-free.) (for https://issues.apache.org/jira/browse/LOG4J2-1715[LOG4J2-1715] by `rpopma`)
* Pick up bug fixes from Apache Commons Lang's org.apache.commons.lang3.time package. (for https://issues.apache.org/jira/browse/LOG4J2-1712[LOG4J2-1712] by `ggregory`)
-* Make GelfLayout independent of Jackson. (for https://issues.apache.org/jira/browse/LOG4J2-1720[LOG4J2-1720] by `mikes`)
-* (GC) Avoid allocating temporary objects in MapPatternConverter. (Note that constructing a MapMessage is not garbage-free.) (for https://issues.apache.org/jira/browse/LOG4J2-1716[LOG4J2-1716] by `rpopma`)
* (GC) Avoid allocating temporary objects in AbstractStyleNameConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1714[LOG4J2-1714] by `rpopma`)
+* (GC) Avoid allocating temporary objects in NdcPatternConverter. (Note that use of the ThreadContext stack is not garbage-free.) (for https://issues.apache.org/jira/browse/LOG4J2-1715[LOG4J2-1715] by `rpopma`)
+* (GC) Avoid allocating temporary objects in MapPatternConverter. (Note that constructing a MapMessage is not garbage-free.) (for https://issues.apache.org/jira/browse/LOG4J2-1716[LOG4J2-1716] by `rpopma`)
+* (GC) Avoid allocating temporary objects in EncodingPatternConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1717[LOG4J2-1717] by `rpopma`)
+* Fixed race condition in ObjectMessage and SimpleMessage, ensuring that the log message contains the value the object has during the logging call. (for https://issues.apache.org/jira/browse/LOG4J2-1719[LOG4J2-1719] by `rpopma`)
+* Make GelfLayout independent of Jackson. (for https://issues.apache.org/jira/browse/LOG4J2-1720[LOG4J2-1720] by `mikes`)
+* (GC) Avoid allocating temporary objects in VariablesNotEmptyReplacementConverter. (for https://issues.apache.org/jira/browse/LOG4J2-1722[LOG4J2-1722] by `rpopma`)
+* Unwanted transitive dependency on geronimo-jms_1.1_spec causes OSGi tests to fail. (for https://issues.apache.org/jira/browse/LOG4J2-1723[LOG4J2-1723] by `ggregory`, Ludovic HOCHET)
+* Using variables in GelfLayout's additional fields at runtime. (for https://issues.apache.org/jira/browse/LOG4J2-1724[LOG4J2-1724] by `mikes`, Alexander Krasnostavsky)
+* SslSocketManager now respects connectTimeoutMillis. (for https://issues.apache.org/jira/browse/LOG4J2-1731[LOG4J2-1731] by `rpopma`, Chris Ribble)
* SslSocketManagerFactory might leak Sockets when certain startup errors occur. (for https://issues.apache.org/jira/browse/LOG4J2-1734[LOG4J2-1734] by `ggregory`)
+* TcpSocketManagerFactory might leak Sockets when certain startup errors occur. (for https://issues.apache.org/jira/browse/LOG4J2-1736[LOG4J2-1736] by `ggregory`)
* Add CronTriggeringPolicy programmatically leads to NPE. (for https://issues.apache.org/jira/browse/LOG4J2-1740[LOG4J2-1740] by `ggregory`)
+* CompositeConfiguration does not add filters to appenderRefs. (for https://issues.apache.org/jira/browse/LOG4J2-1743[LOG4J2-1743] by `ggregory`, Toby Shepheard)
* The custom logger Generate tool no longer requires the log4j-api module on the classpath. (for https://issues.apache.org/jira/browse/LOG4J2-1744[LOG4J2-1744] by `rpopma`)
* Do not use non-daemon thread pool for rollover tasks. (for https://issues.apache.org/jira/browse/LOG4J2-1748[LOG4J2-1748] by `mikes`)
-* TcpSocketManagerFactory might leak Sockets when certain startup errors occur. (for https://issues.apache.org/jira/browse/LOG4J2-1736[LOG4J2-1736] by `ggregory`)
+* Adds xmlns in schema and some other tags. (for https://issues.apache.org/jira/browse/LOG4J2-1756[LOG4J2-1756] by `ggregory`, shubhankar1100)
* Add Builder to GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1762[LOG4J2-1762] by `mikes`)
-* ConfigurationScheduler now preserves interrupt flag during stop. (for https://issues.apache.org/jira/browse/LOG4J2-1786[LOG4J2-1786] by `rpopma`)
+* Fixed concurrency issue affecting all layouts except PatternLayout and GelfLayout, which caused scrambled output and exceptions when logging synchronously from multiple threads. (for https://issues.apache.org/jira/browse/LOG4J2-1769[LOG4J2-1769] by `rpopma`, Brandon Goodin)
* Fixed bug where AsyncLogger did not resolve configuration properties. (for https://issues.apache.org/jira/browse/LOG4J2-1779[LOG4J2-1779] by `rpopma`)
* Eliminate the use of the ExecutorServices in the LoggerContext. (for https://issues.apache.org/jira/browse/LOG4J2-1780[LOG4J2-1780] by `mikes`)
-* Unwanted transitive dependency on geronimo-jms_1.1_spec causes OSGi tests to fail. (for https://issues.apache.org/jira/browse/LOG4J2-1723[LOG4J2-1723] by `ggregory`, Ludovic HOCHET)
-* DefaultShutdownCallbackRegistry can throw a NoClassDefFoundError. (for https://issues.apache.org/jira/browse/LOG4J2-1642[LOG4J2-1642] by `ggregory`, Johno Crawford)
-* Logger using LocalizedMessageFactory prints key instead of message. (for https://issues.apache.org/jira/browse/LOG4J2-1682[LOG4J2-1682] by `ggregory`, Markus Waidhofer)
-* Add putAll() method to CloseableThreadContext. (for https://issues.apache.org/jira/browse/LOG4J2-1692[LOG4J2-1692] by `mikes`, Greg Thomas)
-* Option 'disableAnsi' in PatternLayout to unconditionally disable ANSI escape codes. (for https://issues.apache.org/jira/browse/LOG4J2-1685[LOG4J2-1685] by `mikes`, Raman Gupta)
-* Insure the ConfigurationScheduler shuts down without blocking. (for https://issues.apache.org/jira/browse/LOG4J2-1649[LOG4J2-1649] by `rgoers`, Georg Friedrich)
-* Using variables in GelfLayout's additional fields at runtime. (for https://issues.apache.org/jira/browse/LOG4J2-1724[LOG4J2-1724] by `mikes`, Alexander Krasnostavsky)
-* SslSocketManager now respects connectTimeoutMillis. (for https://issues.apache.org/jira/browse/LOG4J2-1731[LOG4J2-1731] by `rpopma`, Chris Ribble)
-* Fix MemoryMappedFileAppender.createAppender() Javadoc for immediateFlush. (for https://issues.apache.org/jira/browse/LOG4J2-1639[LOG4J2-1639] by `ggregory`, Sridhar Gopinath)
-* NPE in ThrowableProxy when resolving stack in Java EE/OSGi environment. (for https://issues.apache.org/jira/browse/LOG4J2-1687[LOG4J2-1687] by `ggregory`, Robert Christiansen)
-* Some LogEvents may not carry a Throwable (Use Message.getThrowable() in log(Message) methods.) (for https://issues.apache.org/jira/browse/LOG4J2-1676[LOG4J2-1676] by `ggregory`, Joern Huxhorn)
-* Improve OSGi unit tests. (for https://issues.apache.org/jira/browse/LOG4J2-1664[LOG4J2-1664] by `ggregory`, Ludovic HOCHET)
-* Console Appender does not pick up Oracle Java 8's sun.stdout.encoding and sun.stderr.encoding. (for https://issues.apache.org/jira/browse/LOG4J2-1636[LOG4J2-1636] by `ggregory`, Eldar Gabdullin)
-* CronTriggeringPolicy raise exception and fail to rollover log file when evaluateOnStartup is true. (for https://issues.apache.org/jira/browse/LOG4J2-1474[LOG4J2-1474] by `ggregory`, Neonyin mingjun)
-* CronTriggeringPolicy would use the wrong date/time when rolling over and create multiple triggering policies on reconfiguration. (for https://issues.apache.org/jira/browse/LOG4J2-1653[LOG4J2-1653] by `rgoers`, Georg Friedrich)
-* Adds xmlns in schema and some other tags. (for https://issues.apache.org/jira/browse/LOG4J2-1756[LOG4J2-1756] by `ggregory`, shubhankar1100)
+* ConfigurationScheduler now preserves interrupt flag during stop. (for https://issues.apache.org/jira/browse/LOG4J2-1786[LOG4J2-1786] by `rpopma`)
* Cannot define both `filters` and `separator` for PatternLayout %xEx. (for https://issues.apache.org/jira/browse/LOG4J2-2195[LOG4J2-2195] by `ggregory`, Gary GregoryRaman Gupta)
-* CompositeConfiguration does not add filters to appenderRefs. (for https://issues.apache.org/jira/browse/LOG4J2-1743[LOG4J2-1743] by `ggregory`, Toby Shepheard)
-* Fixed concurrency issue affecting all layouts except PatternLayout and GelfLayout, which caused scrambled output and exceptions when logging synchronously from multiple threads. (for https://issues.apache.org/jira/browse/LOG4J2-1769[LOG4J2-1769] by `rpopma`, Brandon Goodin)
* RootThrowablePatternConverter does not use TextRenderer or line separator options. (for https://issues.apache.org/jira/browse/LOG4J2-2221[LOG4J2-2221] by `ggregory`, Gary GregoryRaman Gupta)
diff --git a/src/site/asciidoc/changelog/2.9.0.adoc b/src/site/asciidoc/changelog/2.9.0.adoc
index e5bcd240b7..64f7a3dfb0 100644
--- a/src/site/asciidoc/changelog/2.9.0.adoc
+++ b/src/site/asciidoc/changelog/2.9.0.adoc
@@ -86,102 +86,102 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Generic HTTP appender. (for https://issues.apache.org/jira/browse/LOG4J2-1442[LOG4J2-1442] by `mikes`)
-* Add support for Java 9 StackWalker. (for https://issues.apache.org/jira/browse/LOG4J2-1359[LOG4J2-1359] by `rgoers`)
* The JMS Appender should use a JMS MapMessage for a Log4j MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1294[LOG4J2-1294] by `ggregory`)
-* Shortcut to add Property and KeyValuePair component in ConfigurationBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-1860[LOG4J2-1860] by `mikes`)
+* Add support for Java 9 StackWalker. (for https://issues.apache.org/jira/browse/LOG4J2-1359[LOG4J2-1359] by `rgoers`)
+* Generic HTTP appender. (for https://issues.apache.org/jira/browse/LOG4J2-1442[LOG4J2-1442] by `mikes`)
+* Configurable Log File Permissions with PosixFilePermission. (for https://issues.apache.org/jira/browse/LOG4J2-1699[LOG4J2-1699] by `ggregory`, Pierrick HYMBERTDemetrios Dimatos)
+* Temporary compress directory during rollover (#88). (for https://issues.apache.org/jira/browse/LOG4J2-1766[LOG4J2-1766] by `ggregory`, Pierrick HYMBERT)
* Log4j2 will now print all internal logging to the console if system property `log4j2.debug` is defined with any value (or no value). (for https://issues.apache.org/jira/browse/LOG4J2-1813[LOG4J2-1813] by `rpopma`)
* Added wrapper classes CustomLoggerGenerator and ExtendedLoggerGenerator to avoid class name with a dollar ($) character which has special meaning in many *nix command line environments. (for https://issues.apache.org/jira/browse/LOG4J2-1814[LOG4J2-1814] by `rpopma`)
-* Added process ID (pid) pattern converter. (for https://issues.apache.org/jira/browse/LOG4J2-1884[LOG4J2-1884] by `rpopma`)
+* Support null byte delimiter in GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1854[LOG4J2-1854] by `mikes`, Xavier Jodoin)
+* Add an optional random delay in TimeBasedTriggeringPolicy (for https://issues.apache.org/jira/browse/LOG4J2-1855[LOG4J2-1855] by `mattsicker`, Anthony Maire)
+* Shortcut to add Property and KeyValuePair component in ConfigurationBuilder. (for https://issues.apache.org/jira/browse/LOG4J2-1860[LOG4J2-1860] by `mikes`)
+* Support capped collections for MongoDb appender. (for https://issues.apache.org/jira/browse/LOG4J2-1864[LOG4J2-1864] by `mattsicker`, Matthias Kappeller)
+* Added methods ::writeBytes(ByteBuffer) and ::writeBytes(byte[], int, int) to ByteBufferDestination interface and use these methods in TextEncoderHelper where possible to prepare for future enhancements to reduce lock contention. (for https://issues.apache.org/jira/browse/LOG4J2-1874[LOG4J2-1874] by `rpopma`, Roman Leventov)
* Warn when a configuration file for an inactive ConfigurationFactory is found. (for https://issues.apache.org/jira/browse/LOG4J2-1880[LOG4J2-1880] by `mikes`)
-* Add containsKey() methods to org.apache.logging.log4j.message.MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1932[LOG4J2-1932] by `ggregory`)
+* Added process ID (pid) pattern converter. (for https://issues.apache.org/jira/browse/LOG4J2-1884[LOG4J2-1884] by `rpopma`)
* Add forEach() methods to org.apache.logging.log4j.message.MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1930[LOG4J2-1930] by `ggregory`)
+* Add containsKey() methods to org.apache.logging.log4j.message.MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1932[LOG4J2-1932] by `ggregory`)
* JMS Appender does not know how to recover from a broken connection. (for https://issues.apache.org/jira/browse/LOG4J2-1934[LOG4J2-1934] by `ggregory`)
* Add with(String, primitive) methods to org.apache.logging.log4j.message.MapMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1935[LOG4J2-1935] by `ggregory`)
* Generate source jas for all test jars. (for https://issues.apache.org/jira/browse/LOG4J2-1945[LOG4J2-1945] by `ggregory`)
* JMS Appender should be able to connect to a broker (later) even it is not present at configuration time. (for https://issues.apache.org/jira/browse/LOG4J2-1955[LOG4J2-1955] by `ggregory`)
-* Support printing multiple StructuredData elements in RFC5424Layout. (for https://issues.apache.org/jira/browse/LOG4J2-2008[LOG4J2-2008] by `rgoers`)
* JsonLayout, XmlLayout and YamlLayout support 0-byte termination of log events. (for https://issues.apache.org/jira/browse/LOG4J2-1981[LOG4J2-1981] by `mikes`)
* Public API for parsing the output from JsonLayout/XmlLayout/YamlLayout into a LogEvent. (for https://issues.apache.org/jira/browse/LOG4J2-1986[LOG4J2-1986] by `mikes`)
-* Support capped collections for MongoDb appender. (for https://issues.apache.org/jira/browse/LOG4J2-1864[LOG4J2-1864] by `mattsicker`, Matthias Kappeller)
-* Added methods ::writeBytes(ByteBuffer) and ::writeBytes(byte[], int, int) to ByteBufferDestination interface and use these methods in TextEncoderHelper where possible to prepare for future enhancements to reduce lock contention. (for https://issues.apache.org/jira/browse/LOG4J2-1874[LOG4J2-1874] by `rpopma`, Roman Leventov)
-* Temporary compress directory during rollover (#88). (for https://issues.apache.org/jira/browse/LOG4J2-1766[LOG4J2-1766] by `ggregory`, Pierrick HYMBERT)
-* Add an optional random delay in TimeBasedTriggeringPolicy (for https://issues.apache.org/jira/browse/LOG4J2-1855[LOG4J2-1855] by `mattsicker`, Anthony Maire)
-* Configurable Log File Permissions with PosixFilePermission. (for https://issues.apache.org/jira/browse/LOG4J2-1699[LOG4J2-1699] by `ggregory`, Pierrick HYMBERTDemetrios Dimatos)
-* Support null byte delimiter in GelfLayout. (for https://issues.apache.org/jira/browse/LOG4J2-1854[LOG4J2-1854] by `mikes`, Xavier Jodoin)
+* Support printing multiple StructuredData elements in RFC5424Layout. (for https://issues.apache.org/jira/browse/LOG4J2-2008[LOG4J2-2008] by `rgoers`)
=== Changed
-* Move server components from log4j-core to new log4-server module. (for https://issues.apache.org/jira/browse/LOG4J2-1851[LOG4J2-1851] by `mikes`)
-* Add more detail to WARN "Ignoring log event" messages printed to the console after log4j was shut down. (for https://issues.apache.org/jira/browse/LOG4J2-1801[LOG4J2-1801] by `rpopma`)
+* Allow for bufferSize=0 in SMTP appender. (for https://issues.apache.org/jira/browse/LOG4J2-1071[LOG4J2-1071] by `ggregory`, Ben Ludkiewicz, Benjamin Jaton)
* Async Loggers no longer use deprecated LMAX Disruptor APIs. (Disruptor-3.3.3 or higher is now required.) (for https://issues.apache.org/jira/browse/LOG4J2-1261[LOG4J2-1261] by `rpopma`)
-* Update JAnsi from 1.15 to 1.16. (for https://issues.apache.org/jira/browse/LOG4J2-1900[LOG4J2-1900] by `ggregory`)
-* Improved error message when misconfigured with multiple incompatible appenders targeting same file. (for https://issues.apache.org/jira/browse/LOG4J2-1908[LOG4J2-1908] by `rpopma`)
-* Add missing getters to classes in package org.apache.logging.log4j.core.net.ssl. (for https://issues.apache.org/jira/browse/LOG4J2-1899[LOG4J2-1899] by `ggregory`)
+* Add more detail to WARN "Ignoring log event" messages printed to the console after log4j was shut down. (for https://issues.apache.org/jira/browse/LOG4J2-1801[LOG4J2-1801] by `rpopma`)
+* Move server components from log4j-core to new log4-server module. (for https://issues.apache.org/jira/browse/LOG4J2-1851[LOG4J2-1851] by `mikes`)
* Update ZeroMQ's JeroMQ from 0.3.6 to 0.4.0. (for https://issues.apache.org/jira/browse/LOG4J2-1868[LOG4J2-1868] by `ggregory`)
+* Update Kafka client from 0.10.1.1 to 0.10.2.0 (for https://issues.apache.org/jira/browse/LOG4J2-1869[LOG4J2-1869] by `ggregory`)
* Update JavaMail from 1.5.5 to 1.5.6. (for https://issues.apache.org/jira/browse/LOG4J2-1872[LOG4J2-1872] by `ggregory`)
+* Missing documentation for Max index limit in DefaultRolloverStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-1877[LOG4J2-1877] by `ggregory`, Chandra Tungathurthi)
* Update JAnsi from 1.14 to 1.15. (for https://issues.apache.org/jira/browse/LOG4J2-1879[LOG4J2-1879] by `ggregory`)
-* Update Kafka client from 0.10.1.1 to 0.10.2.0 (for https://issues.apache.org/jira/browse/LOG4J2-1869[LOG4J2-1869] by `ggregory`)
+* Add missing getters to classes in package org.apache.logging.log4j.core.net.ssl. (for https://issues.apache.org/jira/browse/LOG4J2-1899[LOG4J2-1899] by `ggregory`)
+* Update JAnsi from 1.15 to 1.16. (for https://issues.apache.org/jira/browse/LOG4J2-1900[LOG4J2-1900] by `ggregory`)
+* Improved error message when misconfigured with multiple incompatible appenders targeting same file. (for https://issues.apache.org/jira/browse/LOG4J2-1908[LOG4J2-1908] by `rpopma`)
+* Support using java.util.ServiceLoader to locate Log4j 2 API providers. (for https://issues.apache.org/jira/browse/LOG4J2-1917[LOG4J2-1917] by `rgoers`)
* Facilitate log4j use in Android applications: remove dependency on RMI and Management APIs from log4j-api. (for https://issues.apache.org/jira/browse/LOG4J2-1926[LOG4J2-1926] by `rpopma`)
* Add support for DirectWriteRolloverStrategy to RollingRandomAccessFileAppender. (for https://issues.apache.org/jira/browse/LOG4J2-1928[LOG4J2-1928] by `rgoers`)
* Update Jackson from 2.8.7 to 2.8.9. (for https://issues.apache.org/jira/browse/LOG4J2-1938[LOG4J2-1938] by `ggregory`)
-* Support using java.util.ServiceLoader to locate Log4j 2 API providers. (for https://issues.apache.org/jira/browse/LOG4J2-1917[LOG4J2-1917] by `rgoers`)
+* Fix docker build with jdk9 requirements (#84). (for https://issues.apache.org/jira/browse/LOG4J2-1950[LOG4J2-1950] by `ggregory`, Pierrick HYMBERT)
+* Configurations with multiple root loggers now fail loudly. (for https://issues.apache.org/jira/browse/LOG4J2-1954[LOG4J2-1954] by `rpopma`)
* JMS Appender broker password should be a char[], not a String. (for https://issues.apache.org/jira/browse/LOG4J2-1956[LOG4J2-1956] by `ggregory`)
-* Update javax.persistence from 2.1.0 to 2.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-1975[LOG4J2-1975] by `ggregory`)
-* Update HdrHistogram from 2.1.8 to 2.1.9. (for https://issues.apache.org/jira/browse/LOG4J2-1970[LOG4J2-1970] by `rpopma`)
-* Update Kafka client from 0.10.2.0 to 0.11.0.0 (for https://issues.apache.org/jira/browse/LOG4J2-1962[LOG4J2-1962] by `ggregory`)
* Deprecate SerializedLayout and remove it as default. (for https://issues.apache.org/jira/browse/LOG4J2-1958[LOG4J2-1958] by `mikes`)
* Disable DTD processing in XML configuration files. (for https://issues.apache.org/jira/browse/LOG4J2-1959[LOG4J2-1959] by `mikes`)
-* Update ZeroMQ's JeroMQ from 0.4.1 to 0.4.2. (for https://issues.apache.org/jira/browse/LOG4J2-1974[LOG4J2-1974] by `ggregory`)
* Update ZeroMQ's JeroMQ from 0.4.0 to 0.4.1. (for https://issues.apache.org/jira/browse/LOG4J2-1960[LOG4J2-1960] by `ggregory`)
-* Configurations with multiple root loggers now fail loudly. (for https://issues.apache.org/jira/browse/LOG4J2-1954[LOG4J2-1954] by `rpopma`)
+* Update Kafka client from 0.10.2.0 to 0.11.0.0 (for https://issues.apache.org/jira/browse/LOG4J2-1962[LOG4J2-1962] by `ggregory`)
+* Include separator option of PatternLayout in manual (and other updates). (for https://issues.apache.org/jira/browse/LOG4J2-1966[LOG4J2-1966] by `ggregory`, M Sazzadul Hoque)
+* Update HdrHistogram from 2.1.8 to 2.1.9. (for https://issues.apache.org/jira/browse/LOG4J2-1970[LOG4J2-1970] by `rpopma`)
+* Update ZeroMQ's JeroMQ from 0.4.1 to 0.4.2. (for https://issues.apache.org/jira/browse/LOG4J2-1974[LOG4J2-1974] by `ggregory`)
+* Update javax.persistence from 2.1.0 to 2.1.1. (for https://issues.apache.org/jira/browse/LOG4J2-1975[LOG4J2-1975] by `ggregory`)
* Update org.osgi.core from 4.3.1 to 6.0.0. (for https://issues.apache.org/jira/browse/LOG4J2-1976[LOG4J2-1976] by `ggregory`)
-* Refactor SimpleMessage to be concise and clear (#100) (for https://issues.apache.org/jira/browse/LOG4J2-1991[LOG4J2-1991] by `ggregory`)
-* Allow KeyStoreConfiguration and TrustStoreConfiguration to find files as resources. (for https://issues.apache.org/jira/browse/LOG4J2-2015[LOG4J2-2015] by `ggregory`)
* Allow maxLength of StructuredData to be specified by the user. (for https://issues.apache.org/jira/browse/LOG4J2-1984[LOG4J2-1984] by `rgoers`)
+* Refactor SimpleMessage to be concise and clear (#100) (for https://issues.apache.org/jira/browse/LOG4J2-1991[LOG4J2-1991] by `ggregory`)
* Replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency. (for https://issues.apache.org/jira/browse/LOG4J2-2011[LOG4J2-2011] by `rpopma`)
-* Remove default layout from KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2020[LOG4J2-2020] by `mikes`)
-* Update SLF4J from 1.7.24 to 1.7.25. (by `ggregory`)
+* Allow KeyStoreConfiguration and TrustStoreConfiguration to find files as resources. (for https://issues.apache.org/jira/browse/LOG4J2-2015[LOG4J2-2015] by `ggregory`)
* Update Jackson from 2.8.9 to 2.9.0. (for https://issues.apache.org/jira/browse/LOG4J2-2017[LOG4J2-2017] by `ggregory`)
-* Use a class' canonical name instead of name to create its logger name. (for https://issues.apache.org/jira/browse/LOG4J2-2023[LOG4J2-2023] by `ggregory`)
+* Remove default layout from KafkaAppender. (for https://issues.apache.org/jira/browse/LOG4J2-2020[LOG4J2-2020] by `mikes`)
* RFC5424Layout now prints the process id. (for https://issues.apache.org/jira/browse/LOG4J2-2022[LOG4J2-2022] by `rgoers`)
-* Allow for bufferSize=0 in SMTP appender. (for https://issues.apache.org/jira/browse/LOG4J2-1071[LOG4J2-1071] by `ggregory`, Ben Ludkiewicz, Benjamin Jaton)
-* Fix docker build with jdk9 requirements (#84). (for https://issues.apache.org/jira/browse/LOG4J2-1950[LOG4J2-1950] by `ggregory`, Pierrick HYMBERT)
-* Missing documentation for Max index limit in DefaultRolloverStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-1877[LOG4J2-1877] by `ggregory`, Chandra Tungathurthi)
-* Include separator option of PatternLayout in manual (and other updates). (for https://issues.apache.org/jira/browse/LOG4J2-1966[LOG4J2-1966] by `ggregory`, M Sazzadul Hoque)
+* Use a class' canonical name instead of name to create its logger name. (for https://issues.apache.org/jira/browse/LOG4J2-2023[LOG4J2-2023] by `ggregory`)
+* Update SLF4J from 1.7.24 to 1.7.25. (by `ggregory`)
=== Fixed
-* Ensure the ThreadLocal StringBuilder in ParameterizedMessage won't hold excessively much memory after logging a long message. (for https://issues.apache.org/jira/browse/LOG4J2-1858[LOG4J2-1858] by `rpopma`)
+* SocketAppender will lose several events after re-connection to server. (for https://issues.apache.org/jira/browse/LOG4J2-1311[LOG4J2-1311] by `ggregory`, Xibing Liang)
* Prevent NullPointerException when a file name is specified with the DirectWriteRolloverStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-1833[LOG4J2-1833] by `rgoers`)
-* Fix documentation about default additivity value for loggers. (for https://issues.apache.org/jira/browse/LOG4J2-1885[LOG4J2-1885] by `mattsicker`)
-* More reliable checking for runtime dependencies. (for https://issues.apache.org/jira/browse/LOG4J2-1876[LOG4J2-1876] by `mikes`)
+* Ensure the ThreadLocal StringBuilder in ParameterizedMessage won't hold excessively much memory after logging a long message. (for https://issues.apache.org/jira/browse/LOG4J2-1858[LOG4J2-1858] by `rpopma`)
* Fix configuration documentation. (for https://issues.apache.org/jira/browse/LOG4J2-1867[LOG4J2-1867] by `mikes`)
+* More reliable checking for runtime dependencies. (for https://issues.apache.org/jira/browse/LOG4J2-1876[LOG4J2-1876] by `mikes`)
+* Fix documentation about default additivity value for loggers. (for https://issues.apache.org/jira/browse/LOG4J2-1885[LOG4J2-1885] by `mattsicker`)
+* Log4j throws a java.nio.charset.UnsupportedCharsetException: cp65001. (for https://issues.apache.org/jira/browse/LOG4J2-1888[LOG4J2-1888] by `ggregory`, Misagh Moayyed)
* Improve the documentation of the DynamicThresholdFilter. (for https://issues.apache.org/jira/browse/LOG4J2-1911[LOG4J2-1911] by `rgoers`)
+* CompositeConfiguration logs warning "Unable to determine URI for configuration." However, the reconfiguration is completed. (for https://issues.apache.org/jira/browse/LOG4J2-1912[LOG4J2-1912] by `ggregory`, R Ri)
+* ScriptEngineManager is not available in Android and causes a NoClassDefFoundError. (for https://issues.apache.org/jira/browse/LOG4J2-1920[LOG4J2-1920] by `ggregory`, Ajitha)
+* EOFException with FormattedMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1929[LOG4J2-1929] by `ggregory`, Borys Sokolov)
* The eventPrefix attribute was being ignored in the RFC5424Layout. (for https://issues.apache.org/jira/browse/LOG4J2-1943[LOG4J2-1943] by `rgoers`)
-* Register log4j-core as an OSGi service. Skip tests for LOG4J2-1766 on macOS. Use group "staff" for LOG4J2-1699 test on macOS. (for https://issues.apache.org/jira/browse/LOG4J2-1971[LOG4J2-1971] by `rgoers`)
+* Trim levels read from properties file to remove trailing spaces. (for https://issues.apache.org/jira/browse/LOG4J2-1948[LOG4J2-1948] by `ggregory`, Michael Lück)
* JndiManager is not released when the JmsAppender builder catches an exception trying to build itself. (for https://issues.apache.org/jira/browse/LOG4J2-1953[LOG4J2-1953] by `ggregory`)
+* Reconfigure breaks DirectWriteRolloverStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-1961[LOG4J2-1961] by `ggregory`, Christian Vent)
+* Dynamic reconfiguration does not work for filePattern of RollingFile. (for https://issues.apache.org/jira/browse/LOG4J2-1964[LOG4J2-1964] by `ggregory`, Pierrick HYMBERT)
+* ClassCastException: org.eclipse.osgi.internal.loader.SystemBundleLoader$1 cannot be cast to java.lang.ClassLoader. (for https://issues.apache.org/jira/browse/LOG4J2-1971[LOG4J2-1971] by `ggregory`, liwenxian2017)
+* Register log4j-core as an OSGi service. Skip tests for LOG4J2-1766 on macOS. Use group "staff" for LOG4J2-1699 test on macOS. (for https://issues.apache.org/jira/browse/LOG4J2-1971[LOG4J2-1971] by `rgoers`)
+* Consider the StringBuilder's capacity instead of content length when trimming. (for https://issues.apache.org/jira/browse/LOG4J2-1977[LOG4J2-1977] by `ggregory`, Jerry xnslong)
+* Log4j-config.xsd only allows one AppenderRef element for each Logger element. (for https://issues.apache.org/jira/browse/LOG4J2-1982[LOG4J2-1982] by `ggregory`, Christoph Lembeck)
+* Fix default buffer size to match documentation (from 8102 to 8192 a.k.a. 8KB.) (for https://issues.apache.org/jira/browse/LOG4J2-1985[LOG4J2-1985] by `ggregory`, Kenneth McFarland)
+* Log4J JUL Bridge and RMI Security Manager causes access denied ("java.util.logging.LoggingPermission" "control") (for https://issues.apache.org/jira/browse/LOG4J2-1987[LOG4J2-1987] by `ggregory`, Andreas Felder)
+* Clarify Javadoc for AbstractTriggeringPolicy. (for https://issues.apache.org/jira/browse/LOG4J2-1989[LOG4J2-1989] by `ggregory`, Kenneth McFarland)
+* ConcurrentModificationException logging a parameter of type Map. (for https://issues.apache.org/jira/browse/LOG4J2-1990[LOG4J2-1990] by `ggregory`, Philippe Mouawad)
+* Fix compiler warnings in LoggerConfigTest. (for https://issues.apache.org/jira/browse/LOG4J2-1993[LOG4J2-1993] by `ggregory`, Kenneth McFarland)
* TcpSocketServer does not close accepted Sockets. (for https://issues.apache.org/jira/browse/LOG4J2-1994[LOG4J2-1994] by `ggregory`)
-* Fix incorrect documentation for LoggerNameLevelRewritePolicy. (for https://issues.apache.org/jira/browse/LOG4J2-2018[LOG4J2-2018] by `rpopma`)
-* EOFException with FormattedMessage. (for https://issues.apache.org/jira/browse/LOG4J2-1929[LOG4J2-1929] by `ggregory`, Borys Sokolov)
-* ScriptEngineManager is not available in Android and causes a NoClassDefFoundError. (for https://issues.apache.org/jira/browse/LOG4J2-1920[LOG4J2-1920] by `ggregory`, Ajitha)
-* Log4j throws a java.nio.charset.UnsupportedCharsetException: cp65001. (for https://issues.apache.org/jira/browse/LOG4J2-1888[LOG4J2-1888] by `ggregory`, Misagh Moayyed)
-* Trim levels read from properties file to remove trailing spaces. (for https://issues.apache.org/jira/browse/LOG4J2-1948[LOG4J2-1948] by `ggregory`, Michael Lück)
-* SocketAppender will lose several events after re-connection to server. (for https://issues.apache.org/jira/browse/LOG4J2-1311[LOG4J2-1311] by `ggregory`, Xibing Liang)
-* CompositeConfiguration logs warning "Unable to determine URI for configuration." However, the reconfiguration is completed. (for https://issues.apache.org/jira/browse/LOG4J2-1912[LOG4J2-1912] by `ggregory`, R Ri)
* HighlightConverter converts all unrecognized levels to DEBUG. (for https://issues.apache.org/jira/browse/LOG4J2-1999[LOG4J2-1999] by `ggregory`, Paul Burrowes)
* StyleConverter.newInstance argument validation is incorrect. (for https://issues.apache.org/jira/browse/LOG4J2-2001[LOG4J2-2001] by `ggregory`, Paul Burrowes)
-* ConcurrentModificationException logging a parameter of type Map. (for https://issues.apache.org/jira/browse/LOG4J2-1990[LOG4J2-1990] by `ggregory`, Philippe Mouawad)
-* Clarify Javadoc for AbstractTriggeringPolicy. (for https://issues.apache.org/jira/browse/LOG4J2-1989[LOG4J2-1989] by `ggregory`, Kenneth McFarland)
+* No compression when using a separate drive in Linux. (for https://issues.apache.org/jira/browse/LOG4J2-2012[LOG4J2-2012] by `ggregory`, Benjamin Jaton)
* SslSocketManager does not apply SSLContext on TCP reconnect. (for https://issues.apache.org/jira/browse/LOG4J2-2013[LOG4J2-2013] by `ggregory`, Gary GregoryTaylor Patton)
-* Log4J JUL Bridge and RMI Security Manager causes access denied ("java.util.logging.LoggingPermission" "control") (for https://issues.apache.org/jira/browse/LOG4J2-1987[LOG4J2-1987] by `ggregory`, Andreas Felder)
-* Log4j-config.xsd only allows one AppenderRef element for each Logger element. (for https://issues.apache.org/jira/browse/LOG4J2-1982[LOG4J2-1982] by `ggregory`, Christoph Lembeck)
-* ClassCastException: org.eclipse.osgi.internal.loader.SystemBundleLoader$1 cannot be cast to java.lang.ClassLoader. (for https://issues.apache.org/jira/browse/LOG4J2-1971[LOG4J2-1971] by `ggregory`, liwenxian2017)
* Mark FileRenameAction as successful when using alternative ways to move files. (for https://issues.apache.org/jira/browse/LOG4J2-2016[LOG4J2-2016] by `ggregory`, Benjamin Jaton)
-* Fix default buffer size to match documentation (from 8102 to 8192 a.k.a. 8KB.) (for https://issues.apache.org/jira/browse/LOG4J2-1985[LOG4J2-1985] by `ggregory`, Kenneth McFarland)
-* Dynamic reconfiguration does not work for filePattern of RollingFile. (for https://issues.apache.org/jira/browse/LOG4J2-1964[LOG4J2-1964] by `ggregory`, Pierrick HYMBERT)
-* Fix compiler warnings in LoggerConfigTest. (for https://issues.apache.org/jira/browse/LOG4J2-1993[LOG4J2-1993] by `ggregory`, Kenneth McFarland)
-* Consider the StringBuilder's capacity instead of content length when trimming. (for https://issues.apache.org/jira/browse/LOG4J2-1977[LOG4J2-1977] by `ggregory`, Jerry xnslong)
-* Reconfigure breaks DirectWriteRolloverStrategy. (for https://issues.apache.org/jira/browse/LOG4J2-1961[LOG4J2-1961] by `ggregory`, Christian Vent)
-* No compression when using a separate drive in Linux. (for https://issues.apache.org/jira/browse/LOG4J2-2012[LOG4J2-2012] by `ggregory`, Benjamin Jaton)
+* Fix incorrect documentation for LoggerNameLevelRewritePolicy. (for https://issues.apache.org/jira/browse/LOG4J2-2018[LOG4J2-2018] by `rpopma`)
* Parameter of mdcId in SyslogAppender has no default value. (for https://issues.apache.org/jira/browse/LOG4J2-922[LOG4J2-922] by `ggregory`, angus.aqlu, Paul Burrowes)
diff --git a/src/site/asciidoc/changelog/2.9.1.adoc b/src/site/asciidoc/changelog/2.9.1.adoc
index 08cd656a1e..06dc5f2a59 100644
--- a/src/site/asciidoc/changelog/2.9.1.adoc
+++ b/src/site/asciidoc/changelog/2.9.1.adoc
@@ -88,21 +88,21 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Changed
* Use a class' canonical name instead of name to create its logger name. (for https://issues.apache.org/jira/browse/LOG4J2-2023[LOG4J2-2023] by `ggregory`)
-* Update Apache Commons Compress from 1.13 to 1.14. (for https://issues.apache.org/jira/browse/LOG4J2-2046[LOG4J2-2046] by `ggregory`)
* Update Jackson from 2.9.0 to 2.9.1 (fix for Java 9.) (for https://issues.apache.org/jira/browse/LOG4J2-2043[LOG4J2-2043] by `ggregory`)
+* Update Apache Commons CSV from 1.4 to 1.5. (for https://issues.apache.org/jira/browse/LOG4J2-2044[LOG4J2-2044] by `ggregory`)
* Update javax.mail from 1.5.6 to 1.6.0. (for https://issues.apache.org/jira/browse/LOG4J2-2045[LOG4J2-2045] by `ggregory`)
+* Update Apache Commons Compress from 1.13 to 1.14. (for https://issues.apache.org/jira/browse/LOG4J2-2046[LOG4J2-2046] by `ggregory`)
* Update Cassandra driver from 3.1.0 to 3.1.4. (for https://issues.apache.org/jira/browse/LOG4J2-2047[LOG4J2-2047] by `ggregory`)
-* Update Apache Commons CSV from 1.4 to 1.5. (for https://issues.apache.org/jira/browse/LOG4J2-2044[LOG4J2-2044] by `ggregory`)
* Update Apache Kafka Client from 0.11.0.0 to 0.11.0.1. (for https://issues.apache.org/jira/browse/LOG4J2-2049[LOG4J2-2049] by `ggregory`)
=== Fixed
-* Inspect all known ClassLoaders to locate the service provider. (for https://issues.apache.org/jira/browse/LOG4J2-2030[LOG4J2-2030] by `rgoers`)
-* Prevent ConcurrentModificationException with AsyncLoggerConfig. (for https://issues.apache.org/jira/browse/LOG4J2-1988[LOG4J2-1988] by `rpopma`)
* Prevent ConcurrentModificationException with AsyncLoggerConfig. (for https://issues.apache.org/jira/browse/LOG4J2-1914[LOG4J2-1914] by `rpopma`)
-* Increase default queue size for AsyncAppender from 128 to 1024. (for https://issues.apache.org/jira/browse/LOG4J2-2048[LOG4J2-2048] by `rpopma`)
-* Fix documentation to clarify disruptor-3.3.4 is now required for async loggers (previously the docs referred to disruptor-3.3.3 which was never released). (for https://issues.apache.org/jira/browse/LOG4J2-2035[LOG4J2-2035] by `rpopma`)
+* ClassNotFoundException when making all loggers asynchronous under OSGi environment. (for https://issues.apache.org/jira/browse/LOG4J2-1936[LOG4J2-1936] by `ggregory`, Helber Belmiro)
+* Prevent ConcurrentModificationException with AsyncLoggerConfig. (for https://issues.apache.org/jira/browse/LOG4J2-1988[LOG4J2-1988] by `rpopma`)
* java.lang.AbstractMethodError: javax.xml.parsers.DocumentBuilderFactory.setFeature(). (for https://issues.apache.org/jira/browse/LOG4J2-2026[LOG4J2-2026] by `ggregory`, Leon Finker)
* Java 9 StackLocator was not properly skipping the initial stack frames. (for https://issues.apache.org/jira/browse/LOG4J2-2028[LOG4J2-2028] by `rgoers`, Jason Tedor)
* Marker examples should not use deprecated flow APIs. (for https://issues.apache.org/jira/browse/LOG4J2-2029[LOG4J2-2029] by `ggregory`, Fabrizio Cucci)
-* ClassNotFoundException when making all loggers asynchronous under OSGi environment. (for https://issues.apache.org/jira/browse/LOG4J2-1936[LOG4J2-1936] by `ggregory`, Helber Belmiro)
+* Inspect all known ClassLoaders to locate the service provider. (for https://issues.apache.org/jira/browse/LOG4J2-2030[LOG4J2-2030] by `rgoers`)
+* Fix documentation to clarify disruptor-3.3.4 is now required for async loggers (previously the docs referred to disruptor-3.3.3 which was never released). (for https://issues.apache.org/jira/browse/LOG4J2-2035[LOG4J2-2035] by `rpopma`)
+* Increase default queue size for AsyncAppender from 128 to 1024. (for https://issues.apache.org/jira/browse/LOG4J2-2048[LOG4J2-2048] by `rpopma`)
diff --git a/src/site/asciidoc/changelog/unreleased.adoc b/src/site/asciidoc/changelog/unreleased.adoc
index 6e201d8e16..dd33eb6dae 100644
--- a/src/site/asciidoc/changelog/unreleased.adoc
+++ b/src/site/asciidoc/changelog/unreleased.adoc
@@ -33,5 +33,5 @@ Changes staged for the next version that is yet to be released.
=== Fixed
-* Fix level propagation in `Log4jBridgeHandler`. (for https://issues.apache.org/jira/browse/LOG4J2-3634[LOG4J2-3634] by `pkarwasz`, Marcel Koch)
* Fix `Configurator#setLevel` for internal classes. (for https://issues.apache.org/jira/browse/LOG4J2-3631[LOG4J2-3631] by `pkarwasz`, Jeff Thomas)
+* Fix level propagation in `Log4jBridgeHandler`. (for https://issues.apache.org/jira/browse/LOG4J2-3634[LOG4J2-3634] by `pkarwasz`, Marcel Koch)