update docs

Signed-off-by: Ceki Gulcu <[email protected]>

Author: ceki

slf4j-site/src/site/images.src/concrete-bindings.odg

@@ -420,14 +420,14 @@ <h3 class="doAnchor" name="null_LF">Logging factory implementation
     <!-- ====================================================== -->
 
     <h3 class="doAnchor" name="log4jDelegationLoop">Detected both
-    log4j-over-slf4j.jar AND slf4j-log4j12.jar on the class path,
+    log4j-over-slf4j.jar AND slf4j-reload4j on the class path,
     preempting <code>StackOverflowError</code>.
     </h3>
 
-    <p>The purpose of slf4j-log4j12 module is to delegate or redirect
-    calls made to an SLF4J logger to log4j. The purpose of the
-    log4j-over-slf4j module is to redirect calls made to a log4j
-    logger to SLF4J. If SLF4J is bound with<em>slf4j-log4j12.jar</em>
+    <p>The purpose of slf4j-reload4j module is to delegate or redirect
+    calls made to an SLF4J logger to log4j/reload4j. The purpose of
+    the log4j-over-slf4j module is to redirect calls made to a log4j
+    logger to SLF4J. If SLF4J is bound with<em>slf4j-reload4j.jar</em>
     and <em>log4j-over-slf4j.jar</em> is also present on the class
     path, a <code>StackOverflowError</code> will inevitably occur
     immediately after the first invocation of an SLF4J or a log4j

slf4j-site/src/site/images.src/legacy.odg

@@ -192,7 +192,8 @@ <h4 class="doAnchor" name="losOverhead">What about the
     made by using logback should compensate for the overhead of using
     log4j-over-slf4j instead of log4j directly.
     </p>
-    
+
+    <!--
     <h4 class="doAnchor" name="log4jRecursion">log4j-over-slf4j.jar
     and slf4j-log4j12.jar cannot be present simultaneously
     </h4>
@@ -205,7 +206,8 @@ <h4 class="doAnchor" name="log4jRecursion">log4j-over-slf4j.jar
     log4j, and log4j calls redirected to SLF4j, resulting in an <a
     href="codes.html#log4jDelegationLoop">endless loop</a>.
     </p>
-
+    -->
+    
     <h4 class="doAnchor" name="log4jRecursion2">log4j-over-slf4j.jar
     and slf4j-reload4j.jar cannot be present simultaneously
     </h4>

slf4j-site/src/site/pages/codes.html

@@ -31,10 +31,10 @@ <h2>SLF4J user manual</h2>
 
     <p>The Simple Logging Facade for Java (SLF4J) serves as a simple
     facade or abstraction for various logging frameworks, such as
-    java.util.logging, logback and log4j. SLF4J allows the end-user to
-    plug in the desired logging framework at <em>deployment</em> time.
-    Note that SLF4J-enabling your library/application implies the
-    addition of only a single mandatory dependency, namely
+    java.util.logging, logback and reload4j. SLF4J allows the end-user
+    to plug in the desired logging framework at <em>deployment</em>
+    time.  Note that SLF4J-enabling your library/application implies
+    the addition of only a single mandatory dependency, namely
     <em>slf4j-api-${project.version}.jar</em>.</p>
 
     <p><span class="label">since 1.6.0</span> If no binding is found on the
@@ -271,12 +271,14 @@ <h3 class="doAnchor" name="swapping">Binding with a logging
         </dt>
         <dd>Binding/provider for <a
         href="http://logging.apache.org/log4j/1.2/index.html">log4j
-        version 1.2</a>, a widely used logging framework. You also
-        need to place <em>log4j.jar</em> on your class path.  <span
-        class="red">Assuming you wish to continue to use the log4j 1.x
-        framework, given that the log4j 1.x has reached EOL status, we
-        strongly encourage you to use <em>slf4j-reload4j</em>
-        instead.</span> See below.
+        version 1.2</a>, a widely used logging framework. <span
+        class="red">Given that log4j 1.x has been declared EOL in 2015
+        and again in 2022, as of SLF4J 1.7.35, the <em>slf4j-log4j
+        module</em> automatically redirects to the
+        <em>slf4j-reload4j</em> module at <b>build time</b>.</span>
+        Assuming you wish to continue to use the log4j 1.x framework,
+        we strongly encourage you to use <code>slf4j-reload4j</code>
+        instead. See below.
         <p/>
 
         </dd>
@@ -445,13 +447,14 @@ <h3 class="doAnchor" name="projectDep">Declaring project
       you need to do is to declare "ch.qos.logback:logback-classic" as
       a dependency in your <em>pom.xml</em> file as shown below. In
       addition to <em>logback-classic-${logback.version}.jar</em>,
-      this will pull <em>slf4j-api-${latest.stable.version}.jar</em> as well
-      as <em>logback-core-${logback.version}.jar</em> into your
+      this will pull in
+      <em>slf4j-api-${latest.stable.version}.jar</em> as well as
+      <em>logback-core-${logback.version}.jar</em> into your
       project. Note that explicitly declaring a dependency on
       <em>logback-core-${logback.version}</em> or
-      <em>slf4j-api-${latest.stable.version}.jar</em> is not wrong and may
-      be necessary to impose the correct version of said artifacts by
-      virtue of Maven's "nearest definition" dependency mediation
+      <em>slf4j-api-${latest.stable.version}.jar</em> is not wrong and
+      may be necessary to impose the correct version of said artifacts
+      by virtue of Maven's "nearest definition" dependency mediation
       rule.
       </p>
 
@@ -465,19 +468,18 @@ <h3 class="doAnchor" name="projectDep">Declaring project
 
      <!-- ================================== -->
      <p><span class="label notice">reload4j</span> If you wish to use
-      reload4j as the underlying logging framework, all you need to do is
-      to declare "org.slf4j:slf4j-reload4j" as a dependency in your
-      <em>pom.xml</em> file as shown below. In addition to
-      <em>slf4j-reload4j-${latest.stable.version}.jar</em>, this will pull
-      <em>slf4j-api-${latest.stable.version}.jar</em> as well as
-      <em>reload4j-${reload4j.version}.jar</em> into your project.  Note
-      that explicitly declaring a dependency on
-      <em>reload4j-${reload4j.version}.jar</em> or
-      <em>slf4j-api-${latest.stable.version}.jar</em> is not wrong and may
-      be necessary to impose the correct version of said artifacts by
-      virtue of Maven's "nearest definition" dependency mediation
-      rule.</p>
-
+     reload4j as the underlying logging framework, all you need to do
+     is to declare "org.slf4j:slf4j-reload4j" as a dependency in your
+     <em>pom.xml</em> file as shown below. In addition to
+     <em>slf4j-reload4j-${latest.stable.version}.jar</em>, this will
+     pull in <em>slf4j-api-${latest.stable.version}.jar</em> as well
+     as <em>reload4j-${reload4j.version}.jar</em> into your project.
+     Note that explicitly declaring a dependency on
+     <em>reload4j-${reload4j.version}.jar</em> or
+     <em>slf4j-api-${latest.stable.version}.jar</em> is not wrong and
+     may be necessary to impose the correct version of said artifacts
+     by virtue of Maven's "nearest definition" dependency mediation
+     rule.</p>
 
 <pre class="prettyprint source">&lt;dependency> 
   &lt;groupId>org.slf4j&lt;/groupId>
@@ -488,19 +490,10 @@ <h3 class="doAnchor" name="projectDep">Declaring project
 
      <!-- ================================== -->     
 
-     <p><span class="label notice">log4j</span> If you wish to use
-      log4j as the underlying logging framework, all you need to do is
-      to declare "org.slf4j:slf4j-log4j12" as a dependency in your
-      <em>pom.xml</em> file as shown below. In addition to
-      <em>slf4j-log4j12-${latest.stable.version}.jar</em>, this will pull
-      <em>slf4j-api-${latest.stable.version}.jar</em> as well as
-      <em>log4j-${log4j.version}.jar</em> into your project.  Note
-      that explicitly declaring a dependency on
-      <em>log4j-${log4j.version}.jar</em> or
-      <em>slf4j-api-${latest.stable.version}.jar</em> is not wrong and may
-      be necessary to impose the correct version of said artifacts by
-      virtue of Maven's "nearest definition" dependency mediation
-      rule.</p>
+     <p><span class="label notice">log4j</span> As of version 1.7.35,
+     declaring a dependency on <code>org.slf4j:slf4j-log4j12</code>
+     redirects to <code>org.slf4j:slf4j-reload4j</code> by virtue of
+     Maven &lt;relocation&gt; directive. </p>
 
 <pre class="prettyprint source">&lt;dependency> 
   &lt;groupId>org.slf4j&lt;/groupId>
@@ -517,12 +510,12 @@ <h3 class="doAnchor" name="projectDep">Declaring project
       framework, all you need to do is to declare
       "org.slf4j:slf4j-jdk14" as a dependency in your <em>pom.xml</em>
       file as shown below. In addition to
-      <em>slf4j-jdk14-${latest.stable.version}.jar</em>, this will pull
-      <em>slf4j-api-${latest.stable.version}.jar</em> into your project.
-      Note that explicitly declaring a dependency on
-      <em>slf4j-api-${latest.stable.version}.jar</em> is not wrong and may
-      be necessary to impose the correct version of said artifact by
-      virtue of Maven's "nearest definition" dependency mediation
+      <em>slf4j-jdk14-${latest.stable.version}.jar</em>, this will
+      pull in <em>slf4j-api-${latest.stable.version}.jar</em> into
+      your project.  Note that explicitly declaring a dependency on
+      <em>slf4j-api-${latest.stable.version}.jar</em> is not wrong and
+      may be necessary to impose the correct version of said artifact
+      by virtue of Maven's "nearest definition" dependency mediation
       rule.</p>
 
 <pre class="prettyprint source">&lt;dependency> 

slf4j-site/src/site/pages/legacy.html

@@ -40,6 +40,36 @@ <h1>SLF4J News</h1>
      class names in <code/>
    -->
 
+   <hr noshade="noshade" size="1"/>
+   
+    <h3>2022-01-25 - Release of SLF4J 1.7.35</h3>
+
+    <p>&bull; In this release, the "slf4j-log4j12" artifact
+    automatically instructs Maven to use the "slf4j-reload4j" artifact
+    instead. As you might have guessed, the "slf4j-reload4j" binding
+    delegates log processing to the reload4j logging framework.
+    </p>
+      
+    <p>The <a href="https://reload4j.qos.ch">reload4j</a> project is a
+    fork of Apache log4j version 1.2.17 with the goal of fixing
+    pressing security issues. It is intended as a drop-in replacement
+    for log4j version 1.2.17. By drop-in, we mean the replacement of
+    log4j.jar with reload4j.jar in your build with no source code
+    changes in .java files being necessary.
+    </p>
+
+    <p>&bull; Fix incorrect version number in the relocation element
+    in <em>slf4j-log4j12/pom.ml</em>. This issue was reported in <a
+    href="https://jira.qos.ch/browse/SLF4J-539">SLF4J-539</a> by
+    Alexander Veit.
+    </p>
+    
+    <h3>2022-01-25 - Release of SLF4J 1.7.34</h3>
+
+    <p>The relocation element in slf4j-log4j12 had incorrect
+    version number. Version 1.7.34 should not be used.
+    </p>
+    
    <h3>2022-01-13 - Release of SLF4J 2.0.0-alpha6</h3>
 
    <p class="highlight">The the 2.0.x series requires Java&nbsp;8 and