Merge branch 'master' into LOG4J2-1442 # Conflicts: # 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/42dcb458 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/42dcb458 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/42dcb458 Branch: refs/heads/LOG4J2-1442 Commit: 42dcb4588d79016b7906737ab66603ce9c27f968 Parents: 2959f19 92e4b87 Author: Mikael Ståldal <[email protected]> Authored: Mon May 22 13:47:58 2017 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Mon May 22 13:47:58 2017 +0200 ---------------------------------------------------------------------- log4j-api/pom.xml | 23 ++++-- .../org/apache/logging/log4j/spi/Provider.java | 73 +++++++++++++++++--- .../apache/logging/log4j/util/Activator.java | 4 +- .../logging/log4j/util/ClassNamePredicate.java | 45 ------------ .../logging/log4j/util/ClassPredicate.java | 46 ------------ .../apache/logging/log4j/util/ProviderUtil.java | 11 +++ .../log4j/util/StackWalkerStackLocator.java | 63 ----------------- .../logging/log4j/util/ClassNamePredicate.java | 45 ++++++++++++ .../logging/log4j/util/ClassPredicate.java | 46 ++++++++++++ .../log4j/util/StackWalkerStackLocator.java | 63 +++++++++++++++++ .../org/apache/logging/log4j/TestProvider.java | 28 ++++++++ .../META-INF/log4j-provider.properties | 3 - .../org.apache.logging.log4j.spi.Provider | 1 + .../logging/log4j/core/impl/Log4jProvider.java | 28 ++++++++ .../META-INF/log4j-provider.properties | 18 ----- .../org.apache.logging.log4j.spi.Provider | 1 + .../appender/AsyncAppenderNoLocationTest.java | 20 +++++- .../org/apache/logging/slf4j/SLF4JProvider.java | 28 ++++++++ .../META-INF/log4j-provider.properties | 19 ----- .../org.apache.logging.log4j.spi.Provider | 1 + pom.xml | 2 +- src/changes/changes.xml | 3 + src/site/xdoc/manual/extending.xml | 37 ++++++---- 23 files changed, 379 insertions(+), 229 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/42dcb458/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/42dcb458/src/changes/changes.xml ---------------------------------------------------------------------- diff --cc src/changes/changes.xml index 8dc14f1,db263d1..063b229 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@@ -31,9 -31,9 +31,12 @@@ - "remove" - Removed --> <release version="2.9.0" date="2017-MM-DD" description="GA Release 2.9.0"> + <action issue="LOG4J2-1442" dev="mikes" type="add"> + Generic HTTP appender. + </action> + <action issue="LOG4J2-1917" dev="rgoers" type="update"> + Support using java.util.ServiceLoader to locate Log4j 2 API providers. + </action> <action issue="LOG4J2-1854" dev="mikes" type="add" due-to="Xavier Jodoin"> Support null byte delimiter in GelfLayout. </action>
