Index: pom.xml =================================================================== --- pom.xml (revision 1470252) +++ pom.xml (working copy) @@ -116,7 +116,7 @@ 2.0-beta5 seventh 1.9.2 - 3.0.0 + 3.0.1 org.apache.logging.${project.artifactId} org.apache.logging.log4j.*;version=${project.version};-noimport:=true Index: jcl-bridge/src/site/xdoc/index.xml =================================================================== --- jcl-bridge/src/site/xdoc/index.xml (revision 1470252) +++ jcl-bridge/src/site/xdoc/index.xml (working copy) @@ -34,7 +34,7 @@

- The Commons Logging Bridge requires at least Java 5 and is dependent on the Log4j 2 API. + The Commons Logging Bridge requires at least Java 6 and is dependent on the Log4j 2 API.

Index: log4j-to-slf4j/src/site/xdoc/index.xml =================================================================== --- log4j-to-slf4j/src/site/xdoc/index.xml (revision 1470252) +++ log4j-to-slf4j/src/site/xdoc/index.xml (working copy) @@ -36,9 +36,7 @@

- The Log4j 2 to SLF4J adapter requires at least Java 5. Use of this adapter together with the - SLF4J bridge should never be attempted as it will cause a events to endlessly be routed between - SLF4J and Log4j 2. + The Log4j 2 to SLF4J adapter requires at least Java 6.

@@ -47,6 +45,12 @@ Include this jar, the SLF4J jar(s) and an SLF4J logging implementation jar together. Configure the logging implementation as required.

+

+ Use of the SLF4J adapter (log4j-to-slf4j-2.0.jar) together with + the SLF4J bridge (log4j-slf4j-impl-2.0.jar) should + never be attempted as it will cause events to endlessly be routed between + SLF4J and Log4j 2. +

Index: log4j12-api/src/site/xdoc/index.xml =================================================================== --- log4j12-api/src/site/xdoc/index.xml (revision 1470252) +++ log4j12-api/src/site/xdoc/index.xml (working copy) @@ -34,7 +34,7 @@

- The Log4j 1.2 bridge requires at least Java 5 and is dependent on the Log4j 2 API and implementation. + The Log4j 1.2 bridge requires at least Java 6 and is dependent on the Log4j 2 API and implementation.

Index: slf4j-impl/src/site/xdoc/index.xml =================================================================== --- slf4j-impl/src/site/xdoc/index.xml (revision 1470252) +++ slf4j-impl/src/site/xdoc/index.xml (working copy) @@ -34,7 +34,8 @@

- The SLF4J bridge requires at least Java 5 and has a dependency on the Log4j 2 API. + The SLF4J bridge requires at least Java 6 and has a dependency + on the Log4j 2 API.

@@ -44,6 +45,12 @@ include the SLF4J Bindings jar along with the Log4j 2 jars to cause all SLF4J logging to be handled by Log4j 2.

+

+ Use of the SLF4J bridge (log4j-slf4j-impl-2.0.jar) together with + the SLF4J adapter (log4j-to-slf4j-2.0.jar) should + never be attempted as it will cause events to endlessly be routed between + SLF4J and Log4j 2. +

Index: src/site/pdf.xml =================================================================== --- src/site/pdf.xml (revision 1470252) +++ src/site/pdf.xml (working copy) @@ -37,7 +37,7 @@ - + Index: src/site/xdoc/manual/async.xml =================================================================== --- src/site/xdoc/manual/async.xml (revision 1470252) +++ src/site/xdoc/manual/async.xml (working copy) @@ -126,7 +126,7 @@

This is simplest to configure and gives the best performance. To make all loggers asynchronous, - add disruptor-3.0.0.jar to the classpath + add disruptor-3.0.0.jar or higher to the classpath and set the system property Log4jContextSelector to org.apache.logging.log4j.core.async.AsyncLoggerContextSelector. @@ -302,7 +302,7 @@ -

Requires disruptor-3.0.0.jar on the classpath.

+

Requires disruptor-3.0.0.jar or higher on the classpath.

Synchronous and asynchronous loggers can be combined in configuration. This gives you more flexibility at the cost