You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gi...@apache.org on 2024/09/06 08:11:07 UTC

(logging-log4j2) branch main-site-stg-out updated: Add website content generated from `5a5224e7c373535d39115c2d8265becf2a4d0c48`

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch main-site-stg-out
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/main-site-stg-out by this push:
     new 52e9d72400 Add website content generated from `5a5224e7c373535d39115c2d8265becf2a4d0c48`
52e9d72400 is described below

commit 52e9d72400eb4491efc7d87055b43bc5225af584
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Fri Sep 6 08:11:02 2024 +0000

    Add website content generated from `5a5224e7c373535d39115c2d8265becf2a4d0c48`
---
 components.html                | 211 +++++++++++++++++++++++++++--------------
 manual/appenders/database.html |  20 ++--
 plugin-reference.html          | 180 +++++++++++++++++------------------
 release-notes.html             |   3 +
 sitemap.xml                    | 100 +++++++++----------
 5 files changed, 290 insertions(+), 224 deletions(-)

diff --git a/components.html b/components.html
index e0524ad878..7aff28a5ef 100644
--- a/components.html
+++ b/components.html
@@ -1079,10 +1079,10 @@ that uses
 <p>The <code>log4j-jdbc-dbcp2</code> artifact contains a data source for the
 <a href="manual/appenders/database.html#JdbcAppender" class="xref page">JDBC Appender</a>
 that uses
-<a href="https://commons.apache.org/proper/commons-dbcp/">Apache Commons DBCP</a>.</p>
+<a href="https://docs.oracle.com/javase/tutorial/jndi/overview/index.html">JNDI</a>.</p>
 </div>
 <div class="paragraph">
-<p>See <a href="manual/appenders/database.html#PoolingDriverConnectionSource" class="xref page"><code>PoolingDriver</code> connection source</a> for more details.</p>
+<p>See <a href="manual/appenders/database.html#DataSourceConnectionSource" class="xref page"><code>DataSource</code> connection source</a> for more details.</p>
 </div>
 <div id="_tabs_13" class="openblock tabs is-sync is-loading">
 <div class="content">
@@ -1104,7 +1104,7 @@ that uses
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-  &lt;artifactId&gt;log4j-jdbc-dbcp2&lt;/artifactId&gt;
+  &lt;artifactId&gt;log4j-jdbc-jndi&lt;/artifactId&gt;
   &lt;scope&gt;runtime&lt;/scope&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
@@ -1116,6 +1116,71 @@ that uses
 </div>
 <div class="listingblock">
 <div class="content">
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">runtimeOnly 'org.apache.logging.log4j:log4j-jdbc-jndi'</code></pre>
+</div>
+</div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="log4j-jdbc-jndi"><a class="anchor" href="#log4j-jdbc-jndi"></a><code>log4j-jdbc-jndi</code></h2>
+<div class="sectionbody">
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 100%;">
+</colgroup>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">JPMS module</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>org.apache.logging.log4j.jdbc.jndi</code></p></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>The <code>log4j-jdbc-jndi</code> artifact contains a data source for the
+<a href="manual/appenders/database.html#JdbcAppender" class="xref page">JDBC Appender</a>
+that uses
+<a href="https://commons.apache.org/proper/commons-dbcp/">Apache Commons DBCP</a>.</p>
+</div>
+<div class="paragraph">
+<p>See <a href="manual/appenders/database.html#PoolingDriverConnectionSource" class="xref page"><code>PoolingDriver</code> connection source</a> for more details.</p>
+</div>
+<div id="_tabs_14" class="openblock tabs is-sync is-loading">
+<div class="content">
+<div class="ulist tablist">
+<ul>
+<li id="_tabs_14_maven" class="tab">
+<p>Maven</p>
+</li>
+<li id="_tabs_14_gradle" class="tab">
+<p>Gradle</p>
+</li>
+</ul>
+</div>
+<div id="_tabs_14_maven--panel" class="tabpanel" aria-labelledby="_tabs_14_maven">
+<div class="paragraph">
+<p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
+  &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
+  &lt;artifactId&gt;log4j-jdbc-dbcp2&lt;/artifactId&gt;
+  &lt;scope&gt;runtime&lt;/scope&gt;
+&lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
+<div id="_tabs_14_gradle--panel" class="tabpanel" aria-labelledby="_tabs_14_gradle">
+<div class="paragraph">
+<p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
+</div>
+<div class="listingblock">
+<div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">runtimeOnly 'org.apache.logging.log4j:log4j-jdbc-dbcp2'</code></pre>
 </div>
 </div>
@@ -1159,19 +1224,19 @@ that uses
 </li>
 </ul>
 </div>
-<div id="_tabs_14" class="openblock tabs is-sync is-loading">
+<div id="_tabs_15" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_14_maven" class="tab">
+<li id="_tabs_15_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_14_gradle" class="tab">
+<li id="_tabs_15_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_14_maven--panel" class="tabpanel" aria-labelledby="_tabs_14_maven">
+<div id="_tabs_15_maven--panel" class="tabpanel" aria-labelledby="_tabs_15_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1185,7 +1250,7 @@ that uses
 </div>
 </div>
 </div>
-<div id="_tabs_14_gradle--panel" class="tabpanel" aria-labelledby="_tabs_14_gradle">
+<div id="_tabs_15_gradle--panel" class="tabpanel" aria-labelledby="_tabs_15_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1223,19 +1288,19 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 <div class="paragraph">
 <p>See <a href="manual/installation.html#impl-core-bridge-jpl" class="xref page">Installing the JPL-to-Log4j API bridge</a> for more details.</p>
 </div>
-<div id="_tabs_15" class="openblock tabs is-sync is-loading">
+<div id="_tabs_16" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_15_maven" class="tab">
+<li id="_tabs_16_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_15_gradle" class="tab">
+<li id="_tabs_16_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_15_maven--panel" class="tabpanel" aria-labelledby="_tabs_15_maven">
+<div id="_tabs_16_maven--panel" class="tabpanel" aria-labelledby="_tabs_16_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1249,7 +1314,7 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 </div>
 </div>
 </div>
-<div id="_tabs_15_gradle--panel" class="tabpanel" aria-labelledby="_tabs_15_gradle">
+<div id="_tabs_16_gradle--panel" class="tabpanel" aria-labelledby="_tabs_16_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1301,19 +1366,19 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 </tr>
 </table>
 </div>
-<div id="_tabs_16" class="openblock tabs is-sync is-loading">
+<div id="_tabs_17" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_16_maven" class="tab">
+<li id="_tabs_17_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_16_gradle" class="tab">
+<li id="_tabs_17_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_16_maven--panel" class="tabpanel" aria-labelledby="_tabs_16_maven">
+<div id="_tabs_17_maven--panel" class="tabpanel" aria-labelledby="_tabs_17_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1327,7 +1392,7 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 </div>
 </div>
 </div>
-<div id="_tabs_16_gradle--panel" class="tabpanel" aria-labelledby="_tabs_16_gradle">
+<div id="_tabs_17_gradle--panel" class="tabpanel" aria-labelledby="_tabs_17_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1364,19 +1429,19 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 <div class="paragraph">
 <p><a href="#log4j-core">Log4j Core 3</a> is based on this artifact.</p>
 </div>
-<div id="_tabs_17" class="openblock tabs is-sync is-loading">
+<div id="_tabs_18" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_17_maven" class="tab">
+<li id="_tabs_18_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_17_gradle" class="tab">
+<li id="_tabs_18_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_17_maven--panel" class="tabpanel" aria-labelledby="_tabs_17_maven">
+<div id="_tabs_18_maven--panel" class="tabpanel" aria-labelledby="_tabs_18_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1390,7 +1455,7 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 </div>
 </div>
 </div>
-<div id="_tabs_17_gradle--panel" class="tabpanel" aria-labelledby="_tabs_17_gradle">
+<div id="_tabs_18_gradle--panel" class="tabpanel" aria-labelledby="_tabs_18_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1428,19 +1493,19 @@ to format log events as JSON.</p>
 <div class="paragraph">
 <p>See <a href="manual/json-template-layout.html" class="xref page">JSON Template Layout</a> for details.</p>
 </div>
-<div id="_tabs_18" class="openblock tabs is-sync is-loading">
+<div id="_tabs_19" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_18_maven" class="tab">
+<li id="_tabs_19_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_18_gradle" class="tab">
+<li id="_tabs_19_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_18_maven--panel" class="tabpanel" aria-labelledby="_tabs_18_maven">
+<div id="_tabs_19_maven--panel" class="tabpanel" aria-labelledby="_tabs_19_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1454,7 +1519,7 @@ to format log events as JSON.</p>
 </div>
 </div>
 </div>
-<div id="_tabs_18_gradle--panel" class="tabpanel" aria-labelledby="_tabs_18_gradle">
+<div id="_tabs_19_gradle--panel" class="tabpanel" aria-labelledby="_tabs_19_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1496,19 +1561,19 @@ It is based on the latest version of the Java driver.</p>
 <a href="manual/appenders/database.html#MongoDbProvider" class="xref page">MongoDb provider</a>
 for more information.</p>
 </div>
-<div id="_tabs_19" class="openblock tabs is-sync is-loading">
+<div id="_tabs_20" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_19_maven" class="tab">
+<li id="_tabs_20_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_19_gradle" class="tab">
+<li id="_tabs_20_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_19_maven--panel" class="tabpanel" aria-labelledby="_tabs_19_maven">
+<div id="_tabs_20_maven--panel" class="tabpanel" aria-labelledby="_tabs_20_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1522,7 +1587,7 @@ for more information.</p>
 </div>
 </div>
 </div>
-<div id="_tabs_19_gradle--panel" class="tabpanel" aria-labelledby="_tabs_19_gradle">
+<div id="_tabs_20_gradle--panel" class="tabpanel" aria-labelledby="_tabs_20_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1560,19 +1625,19 @@ used to compile <a href="manual/plugins.html" class="xref page">Log4j plugins</a
 <div class="paragraph">
 <p>See <a href="manual/extending.html" class="xref page">Extending Log4j</a> for more details.</p>
 </div>
-<div id="_tabs_20" class="openblock tabs is-sync is-loading">
+<div id="_tabs_21" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_20_maven" class="tab">
+<li id="_tabs_21_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_20_gradle" class="tab">
+<li id="_tabs_21_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_20_maven--panel" class="tabpanel" aria-labelledby="_tabs_20_maven">
+<div id="_tabs_21_maven--panel" class="tabpanel" aria-labelledby="_tabs_21_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1586,7 +1651,7 @@ used to compile <a href="manual/plugins.html" class="xref page">Log4j plugins</a
 </div>
 </div>
 </div>
-<div id="_tabs_20_gradle--panel" class="tabpanel" aria-labelledby="_tabs_20_gradle">
+<div id="_tabs_21_gradle--panel" class="tabpanel" aria-labelledby="_tabs_21_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1623,19 +1688,19 @@ used to compile <a href="manual/plugins.html" class="xref page">Log4j plugins</a
 <div class="paragraph">
 <p>See <a href="manual/architecture.html" class="xref page">Architecture</a> for more details.</p>
 </div>
-<div id="_tabs_21" class="openblock tabs is-sync is-loading">
+<div id="_tabs_22" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_21_maven" class="tab">
+<li id="_tabs_22_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_21_gradle" class="tab">
+<li id="_tabs_22_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_21_maven--panel" class="tabpanel" aria-labelledby="_tabs_21_maven">
+<div id="_tabs_22_maven--panel" class="tabpanel" aria-labelledby="_tabs_22_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1649,7 +1714,7 @@ used to compile <a href="manual/plugins.html" class="xref page">Log4j plugins</a
 </div>
 </div>
 </div>
-<div id="_tabs_21_gradle--panel" class="tabpanel" aria-labelledby="_tabs_21_gradle">
+<div id="_tabs_22_gradle--panel" class="tabpanel" aria-labelledby="_tabs_22_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1699,19 +1764,19 @@ It is required by:</p>
 <div class="paragraph">
 <p>See <a href="manual/scripts.html" class="xref page">Scripts</a> for more details.</p>
 </div>
-<div id="_tabs_22" class="openblock tabs is-sync is-loading">
+<div id="_tabs_23" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_22_maven" class="tab">
+<li id="_tabs_23_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_22_gradle" class="tab">
+<li id="_tabs_23_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_22_maven--panel" class="tabpanel" aria-labelledby="_tabs_22_maven">
+<div id="_tabs_23_maven--panel" class="tabpanel" aria-labelledby="_tabs_23_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1725,7 +1790,7 @@ It is required by:</p>
 </div>
 </div>
 </div>
-<div id="_tabs_22_gradle--panel" class="tabpanel" aria-labelledby="_tabs_22_gradle">
+<div id="_tabs_23_gradle--panel" class="tabpanel" aria-labelledby="_tabs_23_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1776,19 +1841,19 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 </tr>
 </table>
 </div>
-<div id="_tabs_23" class="openblock tabs is-sync is-loading">
+<div id="_tabs_24" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_23_maven" class="tab">
+<li id="_tabs_24_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_23_gradle" class="tab">
+<li id="_tabs_24_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_23_maven--panel" class="tabpanel" aria-labelledby="_tabs_23_maven">
+<div id="_tabs_24_maven--panel" class="tabpanel" aria-labelledby="_tabs_24_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1802,7 +1867,7 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 </div>
 </div>
 </div>
-<div id="_tabs_23_gradle--panel" class="tabpanel" aria-labelledby="_tabs_23_gradle">
+<div id="_tabs_24_gradle--panel" class="tabpanel" aria-labelledby="_tabs_24_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1853,19 +1918,19 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 </tr>
 </table>
 </div>
-<div id="_tabs_24" class="openblock tabs is-sync is-loading">
+<div id="_tabs_25" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_24_maven" class="tab">
+<li id="_tabs_25_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_24_gradle" class="tab">
+<li id="_tabs_25_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_24_maven--panel" class="tabpanel" aria-labelledby="_tabs_24_maven">
+<div id="_tabs_25_maven--panel" class="tabpanel" aria-labelledby="_tabs_25_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1879,7 +1944,7 @@ to the <a href="manual/api.html" class="xref page">Log4j API</a>.</p>
 </div>
 </div>
 </div>
-<div id="_tabs_24_gradle--panel" class="tabpanel" aria-labelledby="_tabs_24_gradle">
+<div id="_tabs_25_gradle--panel" class="tabpanel" aria-labelledby="_tabs_25_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1916,19 +1981,19 @@ or earlier versions.</p>
 <div class="paragraph">
 <p>See <a href="log4j-spring-cloud-config-client.html" class="xref page">Log4j Spring Cloud Configuration</a> for more details.</p>
 </div>
-<div id="_tabs_25" class="openblock tabs is-sync is-loading">
+<div id="_tabs_26" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_25_maven" class="tab">
+<li id="_tabs_26_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_25_gradle" class="tab">
+<li id="_tabs_26_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_25_maven--panel" class="tabpanel" aria-labelledby="_tabs_25_maven">
+<div id="_tabs_26_maven--panel" class="tabpanel" aria-labelledby="_tabs_26_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1942,7 +2007,7 @@ or earlier versions.</p>
 </div>
 </div>
 </div>
-<div id="_tabs_25_gradle--panel" class="tabpanel" aria-labelledby="_tabs_25_gradle">
+<div id="_tabs_26_gradle--panel" class="tabpanel" aria-labelledby="_tabs_26_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -1995,19 +2060,19 @@ that logs to
 </tr>
 </table>
 </div>
-<div id="_tabs_26" class="openblock tabs is-sync is-loading">
+<div id="_tabs_27" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_26_maven" class="tab">
+<li id="_tabs_27_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_26_gradle" class="tab">
+<li id="_tabs_27_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_26_maven--panel" class="tabpanel" aria-labelledby="_tabs_26_maven">
+<div id="_tabs_27_maven--panel" class="tabpanel" aria-labelledby="_tabs_27_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -2021,7 +2086,7 @@ that logs to
 </div>
 </div>
 </div>
-<div id="_tabs_26_gradle--panel" class="tabpanel" aria-labelledby="_tabs_26_gradle">
+<div id="_tabs_27_gradle--panel" class="tabpanel" aria-labelledby="_tabs_27_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -2074,19 +2139,19 @@ that logs to
 </tr>
 </table>
 </div>
-<div id="_tabs_27" class="openblock tabs is-sync is-loading">
+<div id="_tabs_28" class="openblock tabs is-sync is-loading">
 <div class="content">
 <div class="ulist tablist">
 <ul>
-<li id="_tabs_27_maven" class="tab">
+<li id="_tabs_28_maven" class="tab">
 <p>Maven</p>
 </li>
-<li id="_tabs_27_gradle" class="tab">
+<li id="_tabs_28_gradle" class="tab">
 <p>Gradle</p>
 </li>
 </ul>
 </div>
-<div id="_tabs_27_maven--panel" class="tabpanel" aria-labelledby="_tabs_27_maven">
+<div id="_tabs_28_maven--panel" class="tabpanel" aria-labelledby="_tabs_28_maven">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
@@ -2100,7 +2165,7 @@ that logs to
 </div>
 </div>
 </div>
-<div id="_tabs_27_gradle--panel" class="tabpanel" aria-labelledby="_tabs_27_gradle">
+<div id="_tabs_28_gradle--panel" class="tabpanel" aria-labelledby="_tabs_28_gradle">
 <div class="paragraph">
 <p>We assume you use <a href="#log4j-bom"><code>log4j-bom</code></a> for dependency management.</p>
 </div>
diff --git a/manual/appenders/database.html b/manual/appenders/database.html
index ab5831455f..bd90224aa8 100644
--- a/manual/appenders/database.html
+++ b/manual/appenders/database.html
@@ -864,7 +864,7 @@ implementation that formats a log event as
 </tbody>
 </table>
 <div class="paragraph">
-<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-core_org-apache-logging-log4j-core-appender-db-jdbc-JdbcAppender" class="xref page">&#x1F4D6; Plugin reference for <code>JDBC</code></a></p>
+<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-JdbcAppender" class="xref page">&#x1F4D6; Plugin reference for <code>JDBC</code></a></p>
 </div>
 <div class="paragraph">
 <p>Additional runtime dependencies are required to use the JDBC Appender:</p>
@@ -916,7 +916,7 @@ that the appender will use to get
 <a href="https://docs.oracle.com/javase/8/docs/api/java/sql/Connection.html"><code>Connection</code></a> objects.</p>
 </div>
 <div class="paragraph">
-<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-core_org-apache-logging-log4j-core-appender-db-jdbc-ConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>ConnectionSource</code></a></p>
+<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-ConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>ConnectionSource</code></a></p>
 </div>
 <div class="paragraph">
 <p>The following connection sources are available out-of-the-box:</p>
@@ -994,7 +994,7 @@ configuration property to <code>true</code>.</p>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.logging.log4j&lt;/groupId&gt;
-  &lt;artifactId&gt;log4j-jndi&lt;/artifactId&gt;
+  &lt;artifactId&gt;log4j-jdbc-jndi&lt;/artifactId&gt;
   &lt;scope&gt;runtime&lt;/scope&gt;
 &lt;/dependency&gt;</code></pre>
 </div>
@@ -1006,14 +1006,14 @@ configuration property to <code>true</code>.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">runtimeOnly 'org.apache.logging.log4j:log4j-jndi'</code></pre>
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">runtimeOnly 'org.apache.logging.log4j:log4j-jdbc-jndi'</code></pre>
 </div>
 </div>
 </div>
 </div>
 </div>
 <div class="paragraph">
-<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-core_org-apache-logging-log4j-core-appender-db-jdbc-DataSourceConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>DataSource</code></a></p>
+<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>DataSource</code></a></p>
 </div>
 </div>
 <div class="sect3">
@@ -1072,7 +1072,7 @@ or
 </tbody>
 </table>
 <div class="paragraph">
-<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-core_org-apache-logging-log4j-core-appender-db-jdbc-FactoryMethodConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>ConnectionFactory</code></a></p>
+<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-FactoryMethodConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>ConnectionFactory</code></a></p>
 </div>
 </div>
 <div class="sect3">
@@ -1173,7 +1173,7 @@ for more details.</p></td>
 </tbody>
 </table>
 <div class="paragraph">
-<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-core_org-apache-logging-log4j-core-appender-db-jdbc-DriverManagerConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>DriverManager</code></a></p>
+<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DriverManagerConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>DriverManager</code></a></p>
 </div>
 </div>
 <div class="sect3">
@@ -1259,13 +1259,13 @@ for more details.</p></td>
 <p class="tableblock">If supplied, the <a href="#DriverManagerConnectionSource-attr-userName"><code>userName</code></a> and <a href="#DriverManagerConnectionSource-attr-password"><code>password</code></a> attributes will be ignored.</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code><a id="PoolingDriverConnectionSource-element-PoolingConnectionFactoryConfig"></a><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-core-appender-db-jdbc-PoolableConnectionFactoryConfig" class="xref page"><code>PoolableConnectionFactory</code></a></code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code><a id="PoolingDriverConnectionSource-element-PoolingConnectionFactoryConfig"></a><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-dbcp2-appender-PoolableConnectionFactoryConfig" class="xref page"><code>PoolableConnectionFactory</code></a></code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">zero or one</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Allows finely tuning the configuration of the DBCP 2 connection pool.
 The available parameters are the same as those provided by DBCP 2.
 See
 <a href="https://commons.apache.org/proper/commons-dbcp/configuration.html">DBCP 2 configuration</a> for more details.</p>
-<p class="tableblock"><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-core-appender-db-jdbc-PoolableConnectionFactoryConfig" class="xref page">&#x1F4D6; Plugin reference for <code>PoolableConnectionFactory</code></a></p></td>
+<p class="tableblock"><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-dbcp2-appender-PoolableConnectionFactoryConfig" class="xref page">&#x1F4D6; Plugin reference for <code>PoolableConnectionFactory</code></a></p></td>
 </tr>
 </tbody>
 </table>
@@ -1311,7 +1311,7 @@ See
 </div>
 </div>
 <div class="paragraph">
-<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-core-appender-db-jdbc-PoolingDriverConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>PoolingDriver</code></a></p>
+<p><a href="../../plugin-reference.html#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-dbcp2-appender-PoolingDriverConnectionSource" class="xref page">&#x1F4D6; Plugin reference for <code>PoolingDriver</code></a></p>
 </div>
 </div>
 </div>
diff --git a/plugin-reference.html b/plugin-reference.html
index 490b23b8c3..68bae55ca8 100644
--- a/plugin-reference.html
+++ b/plugin-reference.html
@@ -958,9 +958,6 @@ NOTE: The Log4j API supports custom levels, the following list contains only the
 <p><a href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-dbcp2-appender-PoolingDriverConnectionSource">PoolingDriverConnectionSource</a></p>
 </li>
 <li>
-<p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource">DataSourceConnectionSource</a></p>
-</li>
-<li>
 <p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DriverManagerConnectionSource">DriverManagerConnectionSource</a></p>
 </li>
 <li>
@@ -970,6 +967,9 @@ NOTE: The Log4j API supports custom levels, the following list contains only the
 <p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-JdbcAppender">JdbcAppender</a></p>
 </li>
 <li>
+<p><a href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource">DataSourceConnectionSource</a></p>
+</li>
+<li>
 <p><a href="#org-apache-logging-log4j_log4j-script_org-apache-logging-log4j-script-appender-ScriptAppenderSelector">ScriptAppenderSelector</a></p>
 </li>
 <li>
@@ -1385,9 +1385,6 @@ In most circumstances, implementation classes should store their <code>org.apach
 <p><a href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-dbcp2-appender-PoolingDriverConnectionSource">PoolingDriverConnectionSource</a></p>
 </li>
 <li>
-<p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource">DataSourceConnectionSource</a></p>
-</li>
-<li>
 <p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DriverManagerConnectionSource">DriverManagerConnectionSource</a></p>
 </li>
 <li>
@@ -1397,6 +1394,9 @@ In most circumstances, implementation classes should store their <code>org.apach
 <p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-JdbcAppender">JdbcAppender</a></p>
 </li>
 <li>
+<p><a href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource">DataSourceConnectionSource</a></p>
+</li>
+<li>
 <p><a href="#org-apache-logging-log4j_log4j-script_org-apache-logging-log4j-script-appender-ScriptAppenderSelector">ScriptAppenderSelector</a></p>
 </li>
 <li>
@@ -2579,12 +2579,7 @@ This attribute is ignored if <code>immediateFlush</code> is set to <code>true</c
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Property</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code><a href="#org-apache-logging-log4j_log4j-core_org-apache-logging-log4j-core-config-Property">Property</a>?</code></p></td>
-<td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
-<p>A generic list of key/value properties</p>
-</div>
-<div class="paragraph">
-<p>The meaning of these properties depends on the component.</p>
-</div></div></td>
+<td class="tableblock halign-left valign-top"><div class="content"></div></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"></td>
@@ -16233,65 +16228,6 @@ toString(), or to output the value of a specific key within the property bundle
 </div>
 </div>
 <div class="sect3">
-<h4 id="org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource"></a>DataSource</h4>
-<div class="dlist">
-<dl>
-<dt class="hdlist1">Class</dt>
-<dd>
-<p><code>org.apache.logging.log4j.jdbc.appender.DataSourceConnectionSource</code></p>
-</dd>
-<dt class="hdlist1">Provider</dt>
-<dd>
-<p><code>org.apache.logging.log4j:log4j-jdbc</code></p>
-</dd>
-</dl>
-</div>
-<div class="paragraph">
-<p>A <a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-JdbcAppender">JdbcAppender</a> connection source that uses a <code>javax.sql.DataSource</code> to connect to the database.</p>
-</div>
-<div class="sect4">
-<h5 id="org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource_XML-snippet"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource_XML-snippet"></a>XML snippet</h5>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;DataSource jndiName=""/&gt;</code></pre>
-</div>
-</div>
-</div>
-<div class="sect4">
-<h5 id="org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource-attributes"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource-attributes"></a>Attributes</h5>
-<div class="paragraph">
-<p>Optional attributes are denoted by <code>?</code>-suffixed types.</p>
-</div>
-<table class="tableblock frame-all grid-all stretch">
-<colgroup>
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-<col style="width: 12.5%;">
-<col style="width: 62.5%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Name</th>
-<th class="tableblock halign-left valign-top">Type</th>
-<th class="tableblock halign-left valign-top">Default</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>jndiName</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String?</code></p></td>
-<td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
-<p>The full JNDI path where the data source is bound.
-Must start with java:/comp/env or environment-equivalent.</p>
-</div></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect3">
 <h4 id="org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DriverManagerConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DriverManagerConnectionSource"></a>DriverManager</h4>
 <div class="dlist">
 <dl>
@@ -16630,7 +16566,7 @@ This appender can be reconfigured at run time.</p>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code><a href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-ConnectionSource">ConnectionSource</a></code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code><a href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-ConnectionSource">ConnectionSource</a></code></p></td>
 <td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
 <p>The connections source from which database connections should be retrieved.</p>
 </div></div></td>
@@ -16941,12 +16877,12 @@ This appender can be reconfigured at run time.</p>
 </div>
 </div>
 <div class="sect3">
-<h4 id="org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractConnectionSource"></a><code>org.apache.logging.log4j.jdbc.appender.AbstractConnectionSource</code></h4>
+<h4 id="org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractDriverManagerConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractDriverManagerConnectionSource"></a><code>org.apache.logging.log4j.jdbc.appender.AbstractDriverManagerConnectionSource</code></h4>
 <div class="dlist">
 <dl>
 <dt class="hdlist1">Class</dt>
 <dd>
-<p><code>org.apache.logging.log4j.jdbc.appender.AbstractConnectionSource</code></p>
+<p><code>org.apache.logging.log4j.jdbc.appender.AbstractDriverManagerConnectionSource</code></p>
 </dd>
 <dt class="hdlist1">Provider</dt>
 <dd>
@@ -16955,41 +16891,38 @@ This appender can be reconfigured at run time.</p>
 </dl>
 </div>
 <div class="sect4">
-<h5 id="org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractConnectionSource_implementations"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractConnectionSource_implementations"></a>Known implementations</h5>
+<h5 id="org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractDriverManagerConnectionSource_implementations"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractDriverManagerConnectionSource_implementations"></a>Known implementations</h5>
 <div class="ulist">
 <ul>
 <li>
 <p><a href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-dbcp2-appender-PoolingDriverConnectionSource">PoolingDriverConnectionSource</a></p>
 </li>
 <li>
-<p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource">DataSourceConnectionSource</a></p>
-</li>
-<li>
 <p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DriverManagerConnectionSource">DriverManagerConnectionSource</a></p>
 </li>
-<li>
-<p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-FactoryMethodConnectionSource">FactoryMethodConnectionSource</a></p>
-</li>
 </ul>
 </div>
 </div>
 </div>
+</div>
+<div class="sect2">
+<h3 id="org-apache-logging-log4j_log4j-jdbc-jndi"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-jndi"></a><code>org.apache.logging.log4j:log4j-jdbc-jndi</code></h3>
 <div class="sect3">
-<h4 id="org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractDriverManagerConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractDriverManagerConnectionSource"></a><code>org.apache.logging.log4j.jdbc.appender.AbstractDriverManagerConnectionSource</code></h4>
+<h4 id="org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-AbstractConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-AbstractConnectionSource"></a><code>org.apache.logging.log4j.jdbc.appender.AbstractConnectionSource</code></h4>
 <div class="dlist">
 <dl>
 <dt class="hdlist1">Class</dt>
 <dd>
-<p><code>org.apache.logging.log4j.jdbc.appender.AbstractDriverManagerConnectionSource</code></p>
+<p><code>org.apache.logging.log4j.jdbc.appender.AbstractConnectionSource</code></p>
 </dd>
 <dt class="hdlist1">Provider</dt>
 <dd>
-<p><code>org.apache.logging.log4j:log4j-jdbc-dbcp2</code></p>
+<p><code>org.apache.logging.log4j:log4j-jdbc-jndi</code></p>
 </dd>
 </dl>
 </div>
 <div class="sect4">
-<h5 id="org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractDriverManagerConnectionSource_implementations"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-AbstractDriverManagerConnectionSource_implementations"></a>Known implementations</h5>
+<h5 id="org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-AbstractConnectionSource_implementations"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-AbstractConnectionSource_implementations"></a>Known implementations</h5>
 <div class="ulist">
 <ul>
 <li>
@@ -16998,12 +16931,18 @@ This appender can be reconfigured at run time.</p>
 <li>
 <p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DriverManagerConnectionSource">DriverManagerConnectionSource</a></p>
 </li>
+<li>
+<p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-FactoryMethodConnectionSource">FactoryMethodConnectionSource</a></p>
+</li>
+<li>
+<p><a href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource">DataSourceConnectionSource</a></p>
+</li>
 </ul>
 </div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-ConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-ConnectionSource"></a><code>org.apache.logging.log4j.jdbc.appender.ConnectionSource</code></h4>
+<h4 id="org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-ConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-ConnectionSource"></a><code>org.apache.logging.log4j.jdbc.appender.ConnectionSource</code></h4>
 <div class="dlist">
 <dl>
 <dt class="hdlist1">Class</dt>
@@ -17012,30 +16951,89 @@ This appender can be reconfigured at run time.</p>
 </dd>
 <dt class="hdlist1">Provider</dt>
 <dd>
-<p><code>org.apache.logging.log4j:log4j-jdbc-dbcp2</code></p>
+<p><code>org.apache.logging.log4j:log4j-jdbc-jndi</code></p>
 </dd>
 </dl>
 </div>
 <div class="sect4">
-<h5 id="org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-ConnectionSource_implementations"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-jdbc-appender-ConnectionSource_implementations"></a>Known implementations</h5>
+<h5 id="org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-ConnectionSource_implementations"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-appender-ConnectionSource_implementations"></a>Known implementations</h5>
 <div class="ulist">
 <ul>
 <li>
 <p><a href="#org-apache-logging-log4j_log4j-jdbc-dbcp2_org-apache-logging-log4j-dbcp2-appender-PoolingDriverConnectionSource">PoolingDriverConnectionSource</a></p>
 </li>
 <li>
-<p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DataSourceConnectionSource">DataSourceConnectionSource</a></p>
-</li>
-<li>
 <p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-DriverManagerConnectionSource">DriverManagerConnectionSource</a></p>
 </li>
 <li>
 <p><a href="#org-apache-logging-log4j_log4j-jdbc_org-apache-logging-log4j-jdbc-appender-FactoryMethodConnectionSource">FactoryMethodConnectionSource</a></p>
 </li>
+<li>
+<p><a href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource">DataSourceConnectionSource</a></p>
+</li>
 </ul>
 </div>
 </div>
 </div>
+<div class="sect3">
+<h4 id="org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource"></a>DataSource</h4>
+<div class="dlist">
+<dl>
+<dt class="hdlist1">Class</dt>
+<dd>
+<p><code>org.apache.logging.log4j.jdbc.jndi.DataSourceConnectionSource</code></p>
+</dd>
+<dt class="hdlist1">Provider</dt>
+<dd>
+<p><code>org.apache.logging.log4j:log4j-jdbc-jndi</code></p>
+</dd>
+</dl>
+</div>
+<div class="paragraph">
+<p>A <code>org.apache.logging.log4j.jdbc.jndi.org.apache.logging.log4j.jdbc.appender.JdbcAppender</code> connection source that uses a <code>javax.sql.DataSource</code> to connect to the database.</p>
+</div>
+<div class="sect4">
+<h5 id="org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource_XML-snippet"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource_XML-snippet"></a>XML snippet</h5>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;DataSource jndiName=""/&gt;</code></pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource-attributes"><a class="anchor" href="#org-apache-logging-log4j_log4j-jdbc-jndi_org-apache-logging-log4j-jdbc-jndi-DataSourceConnectionSource-attributes"></a>Attributes</h5>
+<div class="paragraph">
+<p>Optional attributes are denoted by <code>?</code>-suffixed types.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 12.5%;">
+<col style="width: 12.5%;">
+<col style="width: 12.5%;">
+<col style="width: 62.5%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Default</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>jndiName</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String?</code></p></td>
+<td class="tableblock halign-left valign-top"></td>
+<td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
+<p>The full JNDI path where the data source is bound.
+Must start with java:/comp/env or environment-equivalent.</p>
+</div></div></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="org-apache-logging-log4j_log4j-jndi"><a class="anchor" href="#org-apache-logging-log4j_log4j-jndi"></a><code>org.apache.logging.log4j:log4j-jndi</code></h3>
diff --git a/release-notes.html b/release-notes.html
index 03899af536..d3fea657f1 100644
--- a/release-notes.html
+++ b/release-notes.html
@@ -311,6 +311,9 @@
 <p>Add <code>useFqdn</code> configuration attribute to RFC5424 Layout. (<a href="https://github.com/apache/logging-log4j2/issues/1740">1740</a>)</p>
 </li>
 <li>
+<p>Split off JNDI support of <code>log4j-jdbc</code> to a new <code>log4j-jdbc-jndi</code> module (<a href="https://github.com/apache/logging-log4j2/issues/1914">1914</a>)</p>
+</li>
+<li>
 <p>Add <em>"Plugin Reference"</em> to the website. It is a Javadoc-on-steroids focusing on Log4j plugins. (<a href="https://github.com/apache/logging-log4j2/issues/1954">1954</a>)</p>
 </li>
 </ul>
diff --git a/sitemap.xml b/sitemap.xml
index be04c4ca14..91adf8c573 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2,202 +2,202 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 <url>
 <loc>https://logging.apache.org/log4j/3.x/articles.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/components.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/development.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/download.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/faq.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/hibernate.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/index.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/javadoc.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-jul.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-slf4j-impl.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-slf4j2-impl.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-spring-cloud-config-client.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/log4j-to-jul.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/api.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/appenders.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/appenders/database.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/appenders/delegating.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/appenders/file.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/appenders/message-queue.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/appenders/network.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/appenders/rolling-file.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/architecture.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/async.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/cloud.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/config-intro.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/configuration.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/customconfig.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/dependencyinjection.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/extending.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/filters.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/garbagefree.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/getting-started.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/implementation.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/index.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/installation.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/json-template-layout.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/layouts.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/lookups.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/migration.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/pattern-layout.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/performance.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/plugins.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/scripts.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/systemproperties.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/manual/usage.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/migrate-from-logback.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/migrate-from-slf4j.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/plugin-reference.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/release-notes.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 <url>
 <loc>https://logging.apache.org/log4j/3.x/thanks.html</loc>
-<lastmod>2024-09-05T20:45:19.160Z</lastmod>
+<lastmod>2024-09-06T08:10:35.313Z</lastmod>
 </url>
 </urlset>