Repository: logging-log4j2 Updated Branches: refs/heads/master 37ef86b09 -> ba6105768
LOG4J2-1303 - Add dependency info link to component pages. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ba610576 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ba610576 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ba610576 Branch: refs/heads/master Commit: ba6105768bf982b4c42403930b09d7d486d43262 Parents: 37ef86b Author: Matt Sicker <[email protected]> Authored: Wed Mar 2 19:44:56 2016 -0600 Committer: Matt Sicker <[email protected]> Committed: Wed Mar 2 19:47:17 2016 -0600 ---------------------------------------------------------------------- log4j-1.2-api/src/site/xdoc/index.xml | 3 ++- log4j-flume-ng/src/site/xdoc/index.xml.vm | 1 + log4j-iostreams/src/site/xdoc/index.xml | 1 + log4j-jcl/src/site/xdoc/index.xml | 3 ++- log4j-jmx-gui/src/site/xdoc/index.xml | 3 ++- log4j-jul/src/site/xdoc/index.xml | 1 + log4j-liquibase/src/site/xdoc/index.xml | 3 ++- log4j-nosql/src/site/xdoc/index.xml.vm | 1 + log4j-slf4j-impl/src/site/xdoc/index.xml | 3 ++- log4j-taglib/src/site/xdoc/index.xml | 3 ++- log4j-to-slf4j/src/site/xdoc/index.xml | 7 ++++--- log4j-web/src/site/xdoc/index.xml | 3 ++- src/changes/changes.xml | 3 +++ 13 files changed, 25 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-1.2-api/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-1.2-api/src/site/xdoc/index.xml b/log4j-1.2-api/src/site/xdoc/index.xml index 036ebba..2ae33bf 100644 --- a/log4j-1.2-api/src/site/xdoc/index.xml +++ b/log4j-1.2-api/src/site/xdoc/index.xml @@ -35,6 +35,7 @@ <section name="Requirements"> <p> The Log4j 1.2 bridge is dependent on the Log4j 2 API and implementation. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> @@ -48,4 +49,4 @@ </section> </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-flume-ng/src/site/xdoc/index.xml.vm ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/site/xdoc/index.xml.vm b/log4j-flume-ng/src/site/xdoc/index.xml.vm index 4f1f05a..f8c9a2f 100644 --- a/log4j-flume-ng/src/site/xdoc/index.xml.vm +++ b/log4j-flume-ng/src/site/xdoc/index.xml.vm @@ -237,6 +237,7 @@ <section name="Requirements"> <p> The Flume Appender requires the Log4J 2 API. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-iostreams/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-iostreams/src/site/xdoc/index.xml b/log4j-iostreams/src/site/xdoc/index.xml index 188f007..a617b61 100644 --- a/log4j-iostreams/src/site/xdoc/index.xml +++ b/log4j-iostreams/src/site/xdoc/index.xml @@ -38,6 +38,7 @@ <section name="Requirements"> <p> The Log4j IOStreams API extension requires the Log4j 2 API. This component was introduced in Log4j 2.1. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> <section name="Usage"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-jcl/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-jcl/src/site/xdoc/index.xml b/log4j-jcl/src/site/xdoc/index.xml index aa80903..c9b5932 100644 --- a/log4j-jcl/src/site/xdoc/index.xml +++ b/log4j-jcl/src/site/xdoc/index.xml @@ -36,6 +36,7 @@ <p> The Commons Logging Bridge is dependent on the Log4j 2 API and Commons Logging. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> @@ -48,4 +49,4 @@ </section> </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-jmx-gui/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-jmx-gui/src/site/xdoc/index.xml b/log4j-jmx-gui/src/site/xdoc/index.xml index f732e4b..1497df2 100644 --- a/log4j-jmx-gui/src/site/xdoc/index.xml +++ b/log4j-jmx-gui/src/site/xdoc/index.xml @@ -36,6 +36,7 @@ <section name="Requirements"> <p> The JMX GUI is dependent on Log4j 2 Core. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> @@ -46,4 +47,4 @@ </section> </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-jul/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-jul/src/site/xdoc/index.xml b/log4j-jul/src/site/xdoc/index.xml index b879666..955a44e 100644 --- a/log4j-jul/src/site/xdoc/index.xml +++ b/log4j-jul/src/site/xdoc/index.xml @@ -36,6 +36,7 @@ <section name="Requirements"> <p> The JDK Logging Adapter is dependent on the Log4j API and optionally Log4j Core. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> <section name="Usage"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-liquibase/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-liquibase/src/site/xdoc/index.xml b/log4j-liquibase/src/site/xdoc/index.xml index 46f70ba..3b6d3c6 100644 --- a/log4j-liquibase/src/site/xdoc/index.xml +++ b/log4j-liquibase/src/site/xdoc/index.xml @@ -35,6 +35,7 @@ <p> The Log4j 2 Liquibase Binding has a dependency on the Log4j 2 API as well as the Liquibase core. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> @@ -45,4 +46,4 @@ </section> </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-nosql/src/site/xdoc/index.xml.vm ---------------------------------------------------------------------- diff --git a/log4j-nosql/src/site/xdoc/index.xml.vm b/log4j-nosql/src/site/xdoc/index.xml.vm index 3fb8caf..6b63b12 100644 --- a/log4j-nosql/src/site/xdoc/index.xml.vm +++ b/log4j-nosql/src/site/xdoc/index.xml.vm @@ -78,6 +78,7 @@ <section name="Requirements"> <p> The NoSQL Appenders is dependent on the Log4j 2 API and implementation. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-slf4j-impl/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-slf4j-impl/src/site/xdoc/index.xml b/log4j-slf4j-impl/src/site/xdoc/index.xml index 5b8af06..d875368 100644 --- a/log4j-slf4j-impl/src/site/xdoc/index.xml +++ b/log4j-slf4j-impl/src/site/xdoc/index.xml @@ -36,6 +36,7 @@ <p> The Log4j 2 SLF4J Binding has a dependency on the Log4j 2 API as well as the SLF4J API. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> @@ -54,4 +55,4 @@ </section> </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-taglib/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-taglib/src/site/xdoc/index.xml b/log4j-taglib/src/site/xdoc/index.xml index d6938b8..2abd3d3 100644 --- a/log4j-taglib/src/site/xdoc/index.xml +++ b/log4j-taglib/src/site/xdoc/index.xml @@ -40,6 +40,7 @@ <p> The Log4j Tag Library requires at least Servlet 2.5 (or Java EE 5), at least JSP 2.1 (or Java EE 5), and is dependent on the Log4j 2 API. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> <p> <b><em>Important Note!</em></b> For performance reasons, containers often ignore certain JARs known not to @@ -80,4 +81,4 @@ </section> </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-to-slf4j/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-to-slf4j/src/site/xdoc/index.xml b/log4j-to-slf4j/src/site/xdoc/index.xml index 181c73b..13bbcc9 100644 --- a/log4j-to-slf4j/src/site/xdoc/index.xml +++ b/log4j-to-slf4j/src/site/xdoc/index.xml @@ -37,6 +37,7 @@ <section name="Requirements"> <p> The Log4j 2 to SLF4J adapter is dependent on the Log4j 2 API and the SLF4J API. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> @@ -46,12 +47,12 @@ the logging implementation as required. </p> <p> - <b><em>Use of the SLF4J adapter (log4j-to-slf4j-2.0.jar) together with - the SLF4J bridge (log4j-slf4j-impl-2.0.jar) should + <b><em>Use of the SLF4J adapter (log4j-to-slf4j-2.x.jar) together with + the SLF4J bridge (log4j-slf4j-impl-2.x.jar) should never be attempted as it will cause events to endlessly be routed between SLF4J and Log4j 2.</em></b> </p> </section> </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/log4j-web/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/log4j-web/src/site/xdoc/index.xml b/log4j-web/src/site/xdoc/index.xml index 4d6cd33..94a7b88 100644 --- a/log4j-web/src/site/xdoc/index.xml +++ b/log4j-web/src/site/xdoc/index.xml @@ -52,8 +52,9 @@ <section name="Requirements"> <p> The Web module requires Servlet 2.5 and is dependent on the Log4j 2 API and implementation. + For more information, see <a href="../runtime-dependencies.html">Runtime Dependencies</a>. </p> </section> </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba610576/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 48e5319..2dceed8 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -172,6 +172,9 @@ <action issue="LOG4J2-1300" dev="mattsicker" type="update"> Remove serializability from classes that don't need it. </action> + <action issue="LOG4J2-1303" dev="mattsicker" type="add"> + Add documentation links to runtime dependencies in each component intro page. + </action> </release> <release version="2.5" date="2015-12-06" description="GA Release 2.5"> <action issue="LOG4J2-324" dev="rpopma" type="fix">
