Merge branch 'LOG4J2-1431' and fix version numbers # Conflicts: # log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java # src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/06dcce45 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/06dcce45 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/06dcce45 Branch: refs/heads/master Commit: 06dcce455c0409f47e808fbf837a136f140e18de Parents: 1357d4c d1a9ecf Author: Matt Sicker <[email protected]> Authored: Sat Oct 14 12:09:29 2017 -0500 Committer: Matt Sicker <[email protected]> Committed: Sat Oct 14 12:09:29 2017 -0500 ---------------------------------------------------------------------- .../log4j/util/EnvironmentPropertySource.java | 55 +++++ .../log4j/util/PropertiesPropertySource.java | 54 +++++ .../logging/log4j/util/PropertiesUtil.java | 215 ++++++++++++------- .../log4j/util/PropertyFilePropertySource.java | 52 +++++ .../logging/log4j/util/PropertySource.java | 131 +++++++++++ .../util/SystemPropertiesPropertySource.java | 48 +++++ ...org.apache.logging.log4j.util.PropertySource | 16 ++ .../util/EnvironmentPropertySourceTest.java | 58 +++++ .../util/LegacyPropertiesCompatibilityTest.java | 103 +++++++++ .../util/PropertiesPropertySourceTest.java | 59 +++++ .../log4j/util/PropertySourceCamelCaseTest.java | 57 +++++ .../log4j/util/PropertySourceTokenizerTest.java | 69 ++++++ .../db/jpa/AbstractJpaAppenderTest.java | 3 + .../AbstractAsyncThreadContextTestBase.java | 2 + .../async/AsyncQueueFullPolicyFactoryTest.java | 14 +- .../log4j/core/util/ClockFactoryTest.java | 12 +- src/changes/changes.xml | 8 +- src/site/xdoc/manual/async.xml | 46 ++-- src/site/xdoc/manual/configuration.xml.vm | 187 ++++++++++++++-- src/site/xdoc/manual/customconfig.xml | 2 +- src/site/xdoc/manual/eventlogging.xml | 4 +- src/site/xdoc/manual/extending.xml | 8 +- src/site/xdoc/manual/flowtracing.xml | 4 +- src/site/xdoc/manual/garbagefree.xml | 13 +- src/site/xdoc/manual/jmx.xml.vm | 2 +- src/site/xdoc/manual/logsep.xml | 6 +- src/site/xdoc/manual/thread-context.xml | 2 +- 27 files changed, 1081 insertions(+), 149 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/06dcce45/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java ---------------------------------------------------------------------- diff --cc log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java index 85ee9d6,45438d2..d5918c0 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java @@@ -25,7 -25,9 +26,10 @@@ import java.util.Collections import java.util.List; import java.util.Map; import java.util.Properties; + import java.util.ServiceLoader; + import java.util.Set; + import java.util.TreeSet; +import java.util.ResourceBundle; import java.util.concurrent.ConcurrentHashMap; /** @@@ -174,13 -161,10 +163,11 @@@ public final class PropertiesUtil } /** - * Gets the named property as a Charset value. + * Gets the named property as a Charset value. If we cannot find the named Charset, see if it is mapped in + * file {@code Log4j-charsets.properties} on the class path. * - * @param name - * the name of the property to look up - * @param defaultValue - * the default value to use if the property is undefined + * @param name the name of the property to look up + * @param defaultValue the default value to use if the property is undefined * @return the Charset value of the property or {@code defaultValue} if undefined. */ public Charset getCharsetProperty(final String name, final Charset defaultValue) { @@@ -375,7 -413,6 +430,7 @@@ /** * Returns true if system properties tell us we are running on Windows. - * ++ * * @return true if system properties tell us we are running on Windows. */ public boolean isOsWindows() { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/06dcce45/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/06dcce45/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index fee081e,b20527f..e77e9c8 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -30,106 -30,13 +30,112 @@@ - "update" - Change - "remove" - Removed --> - <release version="2.9.1" date="2017-??-??" description="GA Release 2.9.1"> + <release version="2.10.0" date="2017-MM-DD" description="GA Release 2.10.0"> + <action issue="LOG4J2-1431" dev="mattsicker" type="add"> + Simplify log4j system property naming scheme. + </action> + <action issue="LOG4J2-1809" dev="mattsicker" type="add"> + Add global configuration environment SPI. + </action> + <action issue="LOG4J2-2025" dev="rgoers" type="update"> + Provide support for overriding the Tomcat Log class in Tomcat 8.5+. + </action> + <action issue="LOG4J2-1694" dev="mikes" type="add" due-to="Michal DvoÅák"> + Add fields with fixed values to JSON/XML/YAML layouts. + </action> + <action issue="LOG4J2-2054" dev="rpopma" type="add"> + 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. + </action> + <action issue="LOG4J2-2057" dev="rgoers" type="update"> + Support new SLF4J binding mechanism introduced in SLF4J 1.8. + </action> + <action issue="LOG4J2-2052" dev="rpopma" type="update"> + Disable thread name caching by default when running on Java 8u102 or later. + </action> + <action issue="LOG4J2-2055" dev="rgoers" type="fix"> + If Log4j is used as the Tomcat logging implementation startup might fail if an application also uses Log4j. + </action> + <action issue="LOG4J2-1896" dev="rpopma" type="update"> + Update classes in org.apache.logging.log4j.core.net.ssl in APIs from String to a PasswordProvider producing + char[] for passwords. + </action> + <action issue="LOG4J2-2031" dev="rpopma" type="fix"> + 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. + </action> + <action issue="LOG4J2-2053" dev="ggregory" type="fix"> + Exception java.nio.charset.UnsupportedCharsetException: cp65001 in 2.9.0. + </action> + <action issue="LOG4J2-1216" dev="ggregory" type="fix" due-to="Thies Wellpott, Barna Zsombor Klara, GFriedrich"> + Nested pattern layout options broken. + </action> + <action issue="LOG4J2-2070" dev="ggregory" type="fix" due-to="Doug Hughes"> + Log4j1XmlLayout does not provide the entire stack trace, it is missing the caused by information. + </action> + <action issue="LOG4J2-2036" dev="ggregory" type="fix" due-to="Robert Haycock"> + CompositeConfiguration supports Reconfiguration. PR #115. + </action> + <action issue="LOG4J2-2071" dev="ggregory" type="add" due-to="Carter Kozak"> + Add org.apache.logging.log4j.core.config.composite.CompositeConfiguration#toString(). + </action> + <action issue="LOG4J2-2073" dev="ggregory" type="fix" due-to="Patrick Lucas"> + Log4j-config.xsd should make AppenderRef optional for each Logger element. + </action> + <action issue="LOG4J2-2074" dev="ggregory" type="fix"> + The console appender should say why it cannot load JAnsi. + </action> + </release> + <release version="2.9.1" date="2017-09-17" description="GA Release 2.9.1"> + <action issue="LOG4J2-1988" dev="rpopma" type="fix"> + Prevent ConcurrentModificationException with AsyncLoggerConfig. + </action> + <action issue="LOG4J2-1914" dev="rpopma" type="fix"> + Prevent ConcurrentModificationException with AsyncLoggerConfig. + </action> + <action issue="LOG4J2-2048" dev="rpopma" type="fix"> + Increase default queue size for AsyncAppender from 128 to 1024. + </action> + <action issue="LOG4J2-2035" dev="rpopma" type="fix"> + 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). + </action> + <action issue="LOG4J2-2030" dev="rgoers" type="fix"> + Inspect all known ClassLoaders to locate the service provider. + </action> + <action issue="LOG4J2-2028" dev="rgoers" type="fix" due-to="Jason Tedor"> + Java 9 StackLocator was not properly skipping the initial stack frames. + </action> + <action issue="LOG4J2-2023" dev="ggregory" type="update"> + Use a class' canonical name instead of name to create its logger name. + </action> + <action issue="LOG4J2-2026" dev="ggregory" type="fix" due-to="Leon Finker"> + java.lang.AbstractMethodError: javax.xml.parsers.DocumentBuilderFactory.setFeature(). + </action> + <action issue="LOG4J2-2029" dev="ggregory" type="fix" due-to="Fabrizio Cucci"> + Marker examples should not use deprecated flow APIs. + </action> + <action issue="LOG4J2-1936" dev="ggregory" type="fix" due-to="Helber Belmiro"> + ClassNotFoundException when making all loggers asynchronous under OSGi environment. + </action> + <action issue="LOG4J2-2043" dev="ggregory" type="update"> + Update Jackson from 2.9.0 to 2.9.1 (fix for Java 9.) + </action> + <action issue="LOG4J2-2044" dev="ggregory" type="update"> + Update Apache Commons CSV from 1.4 to 1.5. + </action> + <action issue="LOG4J2-2045" dev="ggregory" type="update"> + Update javax.mail from 1.5.6 to 1.6.0. + </action> + <action issue="LOG4J2-2046" dev="ggregory" type="update"> + Update Apache Commons Compress from 1.13 to 1.14. + </action> + <action issue="LOG4J2-2047" dev="ggregory" type="update"> + Update Cassandra driver from 3.1.0 to 3.1.4. + </action> + <action issue="LOG4J2-2049" dev="ggregory" type="update"> + Update Apache Kafka Client from 0.11.0.0 to 0.11.0.1. + </action> </release> <release version="2.9.0" date="2017-08-26" description="GA Release 2.9.0"> <action issue="LOG4J2-1928" dev="rgoers" type="update"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/06dcce45/src/site/xdoc/manual/async.xml ----------------------------------------------------------------------
