You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/01/22 18:59:09 UTC

[logging-log4j2] branch mvn-site-simplified-3.x-take2 created (now c3176236c1)

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

vy pushed a change to branch mvn-site-simplified-3.x-take2
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


      at c3176236c1 Improve `log4j-osgi` POM

This branch includes the following new commits:

     new 336d13e77a Simplify Maven `site` phase and align it with the one in `release-2.x`
     new ae85f2f904 Commit changelog
     new c3176236c1 Improve `log4j-osgi` POM

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[logging-log4j2] 02/03: Commit changelog

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch mvn-site-simplified-3.x-take2
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit ae85f2f9044c6fd681721048011cb59c36dffd09
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Sat Jan 21 20:24:40 2023 +0100

    Commit changelog
---
 .../.3.x.x/1219_Simplify_site_generation.xml       | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/changelog/.3.x.x/1219_Simplify_site_generation.xml b/src/changelog/.3.x.x/1219_Simplify_site_generation.xml
new file mode 100644
index 0000000000..bb1808bee5
--- /dev/null
+++ b/src/changelog/.3.x.x/1219_Simplify_site_generation.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<entry type="changed">
+  <issue id="1219" link="https://github.com/apache/logging-log4j2/pull/1219"/>
+  <author id="vy"/>
+  <description format="asciidoc">Simplify Maven `site` phase and align it with the one in `release-2.x` branch</description>
+</entry>


[logging-log4j2] 03/03: Improve `log4j-osgi` POM

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch mvn-site-simplified-3.x-take2
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit c3176236c17fc3118a6fded09146b4743a2937de
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Sat Jan 21 22:31:35 2023 +0100

    Improve `log4j-osgi` POM
---
 log4j-osgi/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 2aa49bdeb7..6a4440376f 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>OSGi Documentation</docLabel>
     <projectDir>/osgi</projectDir>
     <module.name>org.apache.logging.log4j.osgi</module.name>
-    <pax.exam.version>4.13.5</pax.exam.version>
   </properties>
   <dependencies>
     <dependency>
@@ -140,7 +139,6 @@
       <plugin>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>exam-maven-plugin</artifactId>
-        <version>${pax.exam.version}</version>
         <executions>
             <execution>
                 <phase>generate-test-resources</phase>


[logging-log4j2] 01/03: Simplify Maven `site` phase and align it with the one in `release-2.x`

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch mvn-site-simplified-3.x-take2
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 336d13e77a926f15db38ca9e31604bc42c3705bd
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Sat Jan 21 20:15:33 2023 +0100

    Simplify Maven `site` phase and align it with the one in `release-2.x`
---
 .github/workflows/build.yml                        |    7 +-
 BUILDING.md                                        |    6 +-
 log4j-1.2-api/pom.xml                              |    1 -
 log4j-1.2-api/src/site/site.xml                    |   50 -
 log4j-api-test/pom.xml                             |    1 -
 log4j-api-test/src/site/site.xml                   |   50 -
 log4j-api/pom.xml                                  |    1 -
 log4j-api/src/site/markdown/index.md               |   26 -
 log4j-api/src/site/site.xml                        |   50 -
 log4j-appserver/pom.xml                            |    2 -
 log4j-appserver/src/site/site.xml                  |   50 -
 log4j-bom/pom.xml                                  |    1 -
 log4j-cassandra/pom.xml                            |    1 -
 log4j-cassandra/src/site/site.xml                  |   50 -
 log4j-core-its/pom.xml                             |    3 -
 log4j-core-test/pom.xml                            |    2 -
 log4j-core-test/src/site/site.xml                  |   50 -
 log4j-core/pom.xml                                 |    2 -
 log4j-core/src/site/manual/index.md                |   33 -
 log4j-core/src/site/site.xml                       |   50 -
 log4j-couchdb/pom.xml                              |    1 -
 log4j-couchdb/src/site/site.xml                    |   50 -
 log4j-csv/pom.xml                                  |    1 -
 log4j-csv/src/site/site.xml                        |   50 -
 log4j-distribution/pom.xml                         |    3 -
 log4j-distribution/src/assembly/src.xml            |    1 -
 log4j-docker/pom.xml                               |    1 -
 log4j-docker/src/site/site.xml                     |   50 -
 log4j-flume-ng/pom.xml                             |    1 -
 log4j-flume-ng/src/site/site.xml                   |   50 -
 log4j-gctests/pom.xml                              |    3 -
 log4j-iostreams/pom.xml                            |    1 -
 log4j-iostreams/src/site/site.xml                  |   50 -
 log4j-jakarta-web/pom.xml                          |    1 -
 log4j-jakarta-web/src/site/site.xml                |   50 -
 log4j-jcl/pom.xml                                  |    1 -
 log4j-jcl/src/site/site.xml                        |   50 -
 log4j-jdbc-dbcp2/pom.xml                           |    1 -
 log4j-jdbc-dbcp2/src/site/site.xml                 |   50 -
 log4j-jdbc/pom.xml                                 |    1 -
 log4j-jdbc/src/site/manual/index.md                |   33 -
 log4j-jdbc/src/site/site.xml                       |   50 -
 log4j-jeromq/pom.xml                               |    1 -
 log4j-jeromq/src/site/manual/index.md              |   33 -
 log4j-jeromq/src/site/site.xml                     |   50 -
 log4j-jms/pom.xml                                  |    1 -
 log4j-jms/src/site/site.xml                        |   50 -
 log4j-jmx-gui/pom.xml                              |    1 -
 log4j-jmx-gui/src/site/site.xml                    |   50 -
 log4j-jndi-test/pom.xml                            |    1 -
 log4j-jndi-test/src/site/manual/index.md           |   33 -
 log4j-jndi-test/src/site/site.xml                  |   50 -
 log4j-jndi/pom.xml                                 |    1 -
 log4j-jndi/src/site/manual/index.md                |   33 -
 log4j-jndi/src/site/site.xml                       |   50 -
 log4j-jpa/pom.xml                                  |    1 -
 log4j-jpa/src/site/manual/index.md                 |   33 -
 log4j-jpa/src/site/site.xml                        |   50 -
 log4j-jpl/pom.xml                                  |    1 -
 log4j-jpl/src/site/site.xml                        |   50 -
 log4j-jul/pom.xml                                  |    1 -
 log4j-jul/src/site/site.xml                        |   50 -
 log4j-kafka/pom.xml                                |    1 -
 log4j-kafka/src/site/site.xml                      |   50 -
 log4j-kubernetes/pom.xml                           |    1 -
 log4j-kubernetes/src/site/site.xml                 |   50 -
 log4j-layout-jackson-json/pom.xml                  |    1 -
 log4j-layout-jackson-json/src/site/site.xml        |   50 -
 log4j-layout-jackson-xml/pom.xml                   |    1 -
 log4j-layout-jackson-xml/src/site/site.xml         |   50 -
 log4j-layout-jackson-yaml/pom.xml                  |    1 -
 log4j-layout-jackson-yaml/src/site/site.xml        |   50 -
 log4j-layout-jackson/pom.xml                       |    1 -
 log4j-layout-jackson/src/site/site.xml             |   50 -
 log4j-layout-template-json-test/pom.xml            |    1 -
 .../src/site/manual/index.md                       |   31 -
 log4j-layout-template-json-test/src/site/site.xml  |   53 -
 log4j-layout-template-json/pom.xml                 |    1 -
 log4j-layout-template-json/src/site/site.xml       |   53 -
 log4j-liquibase/pom.xml                            |    1 -
 log4j-liquibase/src/site/site.xml                  |   50 -
 log4j-mongodb3/pom.xml                             |    1 -
 log4j-mongodb3/src/site/site.xml                   |   50 -
 log4j-mongodb4/pom.xml                             |    1 -
 log4j-mongodb4/src/site/site.xml                   |   50 -
 log4j-osgi/pom.xml                                 |    1 -
 log4j-perf/pom.xml                                 |    3 -
 log4j-plugin-processor/pom.xml                     |    2 -
 log4j-plugins-test/pom.xml                         |    2 -
 log4j-plugins/pom.xml                              |    2 -
 log4j-samples/pom.xml                              |   32 +-
 log4j-script/pom.xml                               |    1 -
 log4j-script/src/site/site.xml                     |   50 -
 log4j-slf4j-impl/pom.xml                           |    1 -
 log4j-slf4j-impl/src/site/site.xml                 |   50 -
 log4j-slf4j2-impl/pom.xml                          |    1 -
 log4j-slf4j2-impl/src/site/site.xml                |   50 -
 log4j-smtp/pom.xml                                 |    2 -
 log4j-smtp/src/site/site.xml                       |   50 -
 log4j-spring-boot/pom.xml                          |    1 -
 log4j-spring-boot/src/site/site.xml                |   50 -
 .../src/site/site.xml                              |   50 -
 .../pom.xml                                        |   29 -
 .../log4j-spring-cloud-config-samples/pom.xml      |   21 +-
 log4j-spring-cloud-config/pom.xml                  |    1 -
 .../src/site/markdown/index.md                     |   21 -
 log4j-spring-cloud-config/src/site/site.xml        |   50 -
 log4j-taglib/pom.xml                               |    1 -
 log4j-taglib/src/site/site.xml                     |   51 -
 log4j-to-jul/pom.xml                               |    1 -
 log4j-to-jul/src/site/site.xml                     |   50 -
 log4j-to-slf4j/pom.xml                             |    1 -
 log4j-to-slf4j/src/site/site.xml                   |   50 -
 log4j-web/pom.xml                                  |    1 -
 log4j-web/src/site/site.xml                        |   50 -
 pom.xml                                            | 1039 ++++++++------------
 src/site/asciidoc/index.adoc                       |    3 +-
 src/site/custom/project-info-report.properties     |  333 -------
 .../index.md => src/site/markdown/log4j-1.2-api.md |    0
 .../index.md => src/site/markdown/log4j-api.md     |    0
 .../site/markdown/log4j-appserver.md.vm            |    0
 .../site/markdown/log4j-cassandra.md.vm            |    0
 .../index.md => src/site/markdown/log4j-core.md    |    0
 .../site/markdown/log4j-couchdb.md.vm              |    0
 .../site/markdown/log4j-docker.md.vm               |    0
 .../site/markdown/log4j-flume-ng.md.vm             |    0
 .../site/markdown/log4j-iostreams.md               |    0
 .../site/markdown/log4j-jakarta-web.md             |    0
 .../index.md => src/site/markdown/log4j-jcl.md     |    0
 .../site/markdown/log4j-jdbc-dbcp2.md              |    0
 .../index.md => src/site/markdown/log4j-jeromq.md  |    0
 .../index.md => src/site/markdown/log4j-jms.md     |    0
 .../index.md => src/site/markdown/log4j-jmx-gui.md |    0
 .../index.md => src/site/markdown/log4j-jpl.md     |    0
 .../index.md => src/site/markdown/log4j-jul.md     |    0
 .../index.md => src/site/markdown/log4j-kafka.md   |    0
 .../site/markdown/log4j-kubernetes.md.vm           |    0
 .../site/markdown/log4j-layout-jackson-json.md     |    0
 .../site/markdown/log4j-layout-jackson-xml.md      |    0
 .../site/markdown/log4j-layout-jackson-yaml.md     |    0
 .../site/markdown/log4j-layout-jackson.md          |    0
 .../site/markdown/log4j-layout-template-json.md    |    0
 .../site/markdown/log4j-liquibase.md               |    0
 .../site/markdown/log4j-mongodb3.md.vm             |    0
 .../site/markdown/log4j-mongodb4.md.vm             |    0
 .../index.md => src/site/markdown/log4j-script.md  |    0
 .../site/markdown/log4j-slf4j-impl.md              |    0
 .../site/markdown/log4j-slf4j2-impl.md             |    0
 .../index.md => src/site/markdown/log4j-smtp.md    |    0
 .../site/markdown/log4j-spring-boot.md             |    0
 .../markdown/log4j-spring-cloud-config-client.md   |    0
 .../index.md => src/site/markdown/log4j-taglib.md  |    0
 .../index.md => src/site/markdown/log4j-to-jul.md  |    0
 .../site/markdown/log4j-to-slf4j.md                |    0
 .../index.md => src/site/markdown/log4j-web.md     |    0
 src/site/pdf.xml                                   |   59 --
 src/site/resources/pdf-config.xml                  |   47 -
 src/site/site.xml                                  |   50 +-
 158 files changed, 475 insertions(+), 3804 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 172bbe0b41..42864fbc7b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -72,18 +72,13 @@ jobs:
             -Dlog4j2.junit.fileCleanerSleepPeriodMillis=1000 \
             verify
 
-      # Maven `site` goal takes ~1 hour and mostly irrelevant for typical PRs.
-      # Hence, we only execute that for `dependabot` PRs, which tend to break `site` occasionally.
       - name: Maven "site"
-        if: ${{ github.actor == 'dependabot[bot]' }}
-        timeout-minutes: 60
+        timeout-minutes: 10
         shell: bash
         run: |
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress --fail-at-end \
             --non-recursive \
-            -Dmaven.doap.skip \
-            -DskipTests \
             site
 
   deploy:
diff --git a/BUILDING.md b/BUILDING.md
index 839913f23f..eedc553a03 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -50,4 +50,8 @@ To remedy this, you can execute the following:
 
 You can build the website and manual as follows:
 
-    ./mvnw --non-recursive -Dmaven.doap.skip -DskipTests site
+    ./mvnw site
+
+And view it using a simple HTTP server, e.g., the one comes with the Python:
+
+    python3 -m http.server -d target/site
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 3d6aa39829..623ebd5f0a 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>Log4j 1.2 Documentation</docLabel>
     <projectDir>/log4j12-api</projectDir>
     <module.name>org.apache.log4j</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-1.2-api/src/site/site.xml b/log4j-1.2-api/src/site/site.xml
deleted file mode 100644
index 5356eb566e..0000000000
--- a/log4j-1.2-api/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j 1.x Adaptor"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index fcfd20dbbf..67c0b43eb8 100644
--- a/log4j-api-test/pom.xml
+++ b/log4j-api-test/pom.xml
@@ -30,7 +30,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>API Documentation</docLabel>
     <projectDir>/api</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-api-test/src/site/site.xml b/log4j-api-test/src/site/site.xml
deleted file mode 100644
index 94ac4e55b1..0000000000
--- a/log4j-api-test/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j API"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index f10910a557..f4ab48371a 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -30,7 +30,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>API Documentation</docLabel>
     <projectDir>/api</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-api/src/site/markdown/index.md b/log4j-api/src/site/markdown/index.md
deleted file mode 100644
index f83cc0d7a6..0000000000
--- a/log4j-api/src/site/markdown/index.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Log4j 2 API
-
-The Log4j 2 API provides the interface that applications should code to and provides the
-adapter components required for implementers to create a logging implementation.
-
-## Requirements
-
-As of version 2.4, the Log4j 2 API requires Java 7. Versions 2.3 and earlier require Java 6.
diff --git a/log4j-api/src/site/site.xml b/log4j-api/src/site/site.xml
deleted file mode 100644
index 94ac4e55b1..0000000000
--- a/log4j-api/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j API"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index dad0b911d8..68cb84d593 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -35,7 +35,6 @@
     <docLabel>Web Documentation</docLabel>
     <projectDir>/log4j-appserver</projectDir>
     <module.name>org.apache.logging.log4j.appserver</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
@@ -95,7 +94,6 @@
             and the Apache Log4j logo are trademarks of The Apache Software Foundation.&lt;/p&gt;</bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating
                project -->
-          <additionalparam>${javadoc.opts}</additionalparam>
           <detectOfflineLinks>false</detectOfflineLinks>
           <linksource>true</linksource>
           <source>8</source>
diff --git a/log4j-appserver/src/site/site.xml b/log4j-appserver/src/site/site.xml
deleted file mode 100644
index 6d96be1455..0000000000
--- a/log4j-appserver/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j App Server Integration"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 5f21d56331..23ad28b20c 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -33,7 +33,6 @@
   <properties>
     <!-- reproducible build setting -->
     <project.build.outputTimestamp>10</project.build.outputTimestamp>
-    <maven.doap.skip>true</maven.doap.skip>
     <maven.site.skip>true</maven.site.skip>
     <maven.site.deploy.skip>true</maven.site.deploy.skip>
   </properties>
diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml
index 53ae60f4b6..5e7dbd8e89 100644
--- a/log4j-cassandra/pom.xml
+++ b/log4j-cassandra/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Cassandra Documentation</docLabel>
     <projectDir>/log4j-cassandra</projectDir>
     <module.name>org.apache.logging.log4j.cassandra</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
 
     <!-- cassandra-all breaks with a newer version -->
     <!-- at least this version has one CVE less than the one suggested by Cassandra -->
diff --git a/log4j-cassandra/src/site/site.xml b/log4j-cassandra/src/site/site.xml
deleted file mode 100644
index ec6375c8ec..0000000000
--- a/log4j-cassandra/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Cassandra Appender"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 460c0731a7..fc48a65f09 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -31,10 +31,7 @@
     <docLabel>Core Integration Tests Documentation</docLabel>
     <projectDir>/log4j-core-its</projectDir>
     <revapi.skip>true</revapi.skip>
-    <maven.doap.skip>true</maven.doap.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.site.skip>true</maven.site.skip>
-    <maven.site.deploy.skip>true</maven.site.deploy.skip>
     <maven.test.skip>true</maven.test.skip>
   </properties>
   <dependencies>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index fade0695e9..0af8e2eec9 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -30,7 +30,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Core Documentation</docLabel>
     <projectDir>/log4j-core-test</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <!-- Used for OSGi bundle support -->
@@ -441,7 +440,6 @@
             and the Apache Log4j logo are trademarks of The Apache Software Foundation.&lt;/p&gt;</bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating
                project -->
-          <additionalparam>${javadoc.opts}</additionalparam>
           <detectOfflineLinks>false</detectOfflineLinks>
           <linksource>true</linksource>
           <links>
diff --git a/log4j-core-test/src/site/site.xml b/log4j-core-test/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-core-test/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index c4b7bf5348..c6d5cb170b 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -30,7 +30,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Core Documentation</docLabel>
     <projectDir>/core</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <!-- Used for OSGi bundle support -->
@@ -226,7 +225,6 @@
             and the Apache Log4j logo are trademarks of The Apache Software Foundation.&lt;/p&gt;</bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating
                project -->
-          <additionalparam>${javadoc.opts}</additionalparam>
           <detectOfflineLinks>false</detectOfflineLinks>
           <linksource>true</linksource>
           <links>
diff --git a/log4j-core/src/site/manual/index.md b/log4j-core/src/site/manual/index.md
deleted file mode 100644
index 7595a08e9a..0000000000
--- a/log4j-core/src/site/manual/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Log4j 2 Implementation
-
-The Log4j 2 implementation provides the functional components of the logging system.
-Users are free to create their own plugins and include them in the logging configuration.
-
-## Requirements
-
-As of version 2.4, Log4j 2 requires Java 7. Versions 2.3 and earlier require Java 6.
-Some features may require optional
-[dependencies](../runtime-dependencies.html). These dependencies are specified in the
-documentation for those features.
-
-Some Log4j features require external dependencies.
-See the [Dependency Tree](dependencies.html#Dependency_Tree)
-for the exact list of JAR files needed for these features.
diff --git a/log4j-core/src/site/site.xml b/log4j-core/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-core/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml
index a61f0b9465..8aa72f1092 100644
--- a/log4j-couchdb/pom.xml
+++ b/log4j-couchdb/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>CouchDB Documentation</docLabel>
     <projectDir>/log4j-couchdb</projectDir>
     <module.name>org.apache.logging.log4j.couchdb</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-couchdb/src/site/site.xml b/log4j-couchdb/src/site/site.xml
deleted file mode 100644
index 9724622a15..0000000000
--- a/log4j-couchdb/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j CouchDB Appender"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-csv/pom.xml b/log4j-csv/pom.xml
index d0ba717176..72684fb815 100644
--- a/log4j-csv/pom.xml
+++ b/log4j-csv/pom.xml
@@ -24,7 +24,6 @@
     <docLabel>Log4j CSV Documentation</docLabel>
     <projectDir>/log4j-csv</projectDir>
     <module.name>org.apache.logging.log4j.csv</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-csv/src/site/site.xml b/log4j-csv/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-csv/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index a6e5bf2a9a..a2857d7039 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -27,10 +27,7 @@
   <name>Log4j Distribution</name>
   <description>The Apache Log4j distribution archives.</description>
   <properties>
-    <maven.doap.skip>true</maven.doap.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.site.skip>true</maven.site.skip>
-    <maven.site.deploy.skip>true</maven.site.deploy.skip>
   </properties>
   <dependencies>
     <!-- log4j-1.2-api -->
diff --git a/log4j-distribution/src/assembly/src.xml b/log4j-distribution/src/assembly/src.xml
index b38a99d705..058ed56820 100644
--- a/log4j-distribution/src/assembly/src.xml
+++ b/log4j-distribution/src/assembly/src.xml
@@ -65,7 +65,6 @@
 
         <!-- misc -->
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?doap_vfs\.rdf]</exclude>
 
         <!-- release-plugin temp files -->
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml
index bb50013bae..7cfcc41fbb 100644
--- a/log4j-docker/pom.xml
+++ b/log4j-docker/pom.xml
@@ -33,7 +33,6 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <module.name>org.apache.logging.log4j.docker</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-docker/src/site/site.xml b/log4j-docker/src/site/site.xml
deleted file mode 100644
index a16689a880..0000000000
--- a/log4j-docker/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Docker Support"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index 03c7b65318..45cf39098d 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>Flume Documentation</docLabel>
     <projectDir>/flume-ng</projectDir>
     <module.name>org.apache.logging.log4j.flume</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-flume-ng/src/site/site.xml b/log4j-flume-ng/src/site/site.xml
deleted file mode 100644
index 689144f5e3..0000000000
--- a/log4j-flume-ng/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Flume Appender"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-gctests/pom.xml b/log4j-gctests/pom.xml
index 9547105fe4..28f0507fba 100644
--- a/log4j-gctests/pom.xml
+++ b/log4j-gctests/pom.xml
@@ -30,11 +30,8 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Core Documentation</docLabel>
     <projectDir>/core</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
     <maven.install.skip>true</maven.install.skip>
-    <maven.site.skip>true</maven.site.skip>
-    <maven.site.deploy.skip>true</maven.site.deploy.skip>
   </properties>
   <dependencies>
     <!-- Naturally, all implementations require the log4j-api JAR -->
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index 488b3b4352..a3e5e7887d 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>Streaming Documentation</docLabel>
     <projectDir>/log4j-iostreams</projectDir>
     <module.name>org.apache.logging.log4j.iostreams</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-iostreams/src/site/site.xml b/log4j-iostreams/src/site/site.xml
deleted file mode 100644
index 29c3eebcb2..0000000000
--- a/log4j-iostreams/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j IOStreams"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jakarta-web/pom.xml b/log4j-jakarta-web/pom.xml
index 514c154524..90a279681a 100644
--- a/log4j-jakarta-web/pom.xml
+++ b/log4j-jakarta-web/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Web Documentation</docLabel>
     <projectDir>/log4j-jakarta-web</projectDir>
     <module.name>org.apache.logging.log4j.web</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-jakarta-web/src/site/site.xml b/log4j-jakarta-web/src/site/site.xml
deleted file mode 100644
index 0ad38d049c..0000000000
--- a/log4j-jakarta-web/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Web Support"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index cacbb0dd92..c7eba6df27 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>JCL Bridge Documentation</docLabel>
     <projectDir>/jcl-bridge</projectDir>
     <module.name>org.apache.logging.log4j.jcl</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-jcl/src/site/site.xml b/log4j-jcl/src/site/site.xml
deleted file mode 100644
index fd250807a9..0000000000
--- a/log4j-jcl/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Commons Logging Adaptor"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
index b50a7666b7..b8bfcf7f0f 100644
--- a/log4j-jdbc-dbcp2/pom.xml
+++ b/log4j-jdbc-dbcp2/pom.xml
@@ -24,7 +24,6 @@
     <docLabel>Log4j JDBC DBCP 2 Documentation</docLabel>
     <projectDir>/log4j-jdbc-dbcp2</projectDir>
     <module.name>org.apache.logging.log4j.dbcp2</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-jdbc-dbcp2/src/site/site.xml b/log4j-jdbc-dbcp2/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-jdbc-dbcp2/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jdbc/pom.xml b/log4j-jdbc/pom.xml
index b297cc926f..74cbe949a0 100644
--- a/log4j-jdbc/pom.xml
+++ b/log4j-jdbc/pom.xml
@@ -24,7 +24,6 @@
     <docLabel>Log4j JDBC Documentation</docLabel>
     <projectDir>/log4j-jdbc</projectDir>
     <module.name>org.apache.logging.log4j.jdbc</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-jdbc/src/site/manual/index.md b/log4j-jdbc/src/site/manual/index.md
deleted file mode 100644
index 84fca1379a..0000000000
--- a/log4j-jdbc/src/site/manual/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Apache Log4j ZeroMQ using JeroMQ module
-
-As of Log4j 2.11.0, ZeroMQ using JeroMQ support has moved from the existing module log4j-core to the new module log4j-jeromq.
-
-## Requirements
-
-This module was introduced in Log4j 2.11.0 and requires the jeromq JAR.
-
-Some features may require optional
-[dependencies](../runtime-dependencies.html). These dependencies are specified in the
-documentation for those features.
-
-Some Log4j features require external dependencies.
-See the [Dependency Tree](dependencies.html#Dependency_Tree)
-for the exact list of JAR files needed for these features.
diff --git a/log4j-jdbc/src/site/site.xml b/log4j-jdbc/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-jdbc/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jeromq/pom.xml b/log4j-jeromq/pom.xml
index f40aa8ca47..b7b72e7a9f 100644
--- a/log4j-jeromq/pom.xml
+++ b/log4j-jeromq/pom.xml
@@ -24,7 +24,6 @@
     <docLabel>Log4j ZeroMQ using JeroMQ Documentation</docLabel>
     <projectDir>/log4j-jpa</projectDir>
     <module.name>org.apache.logging.log4j.jeromq</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-jeromq/src/site/manual/index.md b/log4j-jeromq/src/site/manual/index.md
deleted file mode 100644
index 84fca1379a..0000000000
--- a/log4j-jeromq/src/site/manual/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Apache Log4j ZeroMQ using JeroMQ module
-
-As of Log4j 2.11.0, ZeroMQ using JeroMQ support has moved from the existing module log4j-core to the new module log4j-jeromq.
-
-## Requirements
-
-This module was introduced in Log4j 2.11.0 and requires the jeromq JAR.
-
-Some features may require optional
-[dependencies](../runtime-dependencies.html). These dependencies are specified in the
-documentation for those features.
-
-Some Log4j features require external dependencies.
-See the [Dependency Tree](dependencies.html#Dependency_Tree)
-for the exact list of JAR files needed for these features.
diff --git a/log4j-jeromq/src/site/site.xml b/log4j-jeromq/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-jeromq/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jms/pom.xml b/log4j-jms/pom.xml
index e1a9083ff2..91b5edc88c 100644
--- a/log4j-jms/pom.xml
+++ b/log4j-jms/pom.xml
@@ -24,7 +24,6 @@
     <docLabel>Log4j JMS Documentation</docLabel>
     <projectDir>/log4j-jms</projectDir>
     <module.name>org.apache.logging.log4j.jms</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-jms/src/site/site.xml b/log4j-jms/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-jms/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index c950b92198..54fc1f16db 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>JMX GUI Documentation</docLabel>
     <projectDir>/jmx-gui</projectDir>
     <module.name>org.apache.logging.log4j.jmx.gui</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-jmx-gui/src/site/site.xml b/log4j-jmx-gui/src/site/site.xml
deleted file mode 100644
index 01e7c1fc1f..0000000000
--- a/log4j-jmx-gui/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j JMX JConsole GUI"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jndi-test/pom.xml b/log4j-jndi-test/pom.xml
index b52e0954d0..4ca8be822d 100644
--- a/log4j-jndi-test/pom.xml
+++ b/log4j-jndi-test/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>JNDI Documentation</docLabel>
     <projectDir>/log4j-jndi-test</projectDir>
     <module.name>org.apache.logging.log4j.jndi.test</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-jndi-test/src/site/manual/index.md b/log4j-jndi-test/src/site/manual/index.md
deleted file mode 100644
index fddbae958f..0000000000
--- a/log4j-jndi-test/src/site/manual/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Apache Log4j Java Naming and Directory Interface (JNDI) module
-
-As of Log4j 3.0.0, JMS support has moved from the existing module log4j-core to the new module log4j-jndi.
-
-## Requirements
-
-This module was introduced in Log4j 3.0.0 and requires the java.naming module.
-
-Some features may require optional
-[dependencies](../runtime-dependencies.html). These dependencies are specified in the
-documentation for those features.
-
-Some Log4j features require external dependencies.
-See the [Dependency Tree](dependencies.html#Dependency_Tree)
-for the exact list of JAR files needed for these features.
diff --git a/log4j-jndi-test/src/site/site.xml b/log4j-jndi-test/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-jndi-test/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jndi/pom.xml b/log4j-jndi/pom.xml
index a4413dba5a..2bac3a3251 100644
--- a/log4j-jndi/pom.xml
+++ b/log4j-jndi/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>JNDI Documentation</docLabel>
     <projectDir>/log4j-jndi</projectDir>
     <module.name>org.apache.logging.log4j.jndi</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-jndi/src/site/manual/index.md b/log4j-jndi/src/site/manual/index.md
deleted file mode 100644
index fddbae958f..0000000000
--- a/log4j-jndi/src/site/manual/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Apache Log4j Java Naming and Directory Interface (JNDI) module
-
-As of Log4j 3.0.0, JMS support has moved from the existing module log4j-core to the new module log4j-jndi.
-
-## Requirements
-
-This module was introduced in Log4j 3.0.0 and requires the java.naming module.
-
-Some features may require optional
-[dependencies](../runtime-dependencies.html). These dependencies are specified in the
-documentation for those features.
-
-Some Log4j features require external dependencies.
-See the [Dependency Tree](dependencies.html#Dependency_Tree)
-for the exact list of JAR files needed for these features.
diff --git a/log4j-jndi/src/site/site.xml b/log4j-jndi/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-jndi/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml
index f456dc76c0..9b1bc505c0 100644
--- a/log4j-jpa/pom.xml
+++ b/log4j-jpa/pom.xml
@@ -24,7 +24,6 @@
     <docLabel>Log4j JPA Documentation</docLabel>
     <projectDir>/log4j-jpa</projectDir>
     <module.name>org.apache.logging.log4j.jpa</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-jpa/src/site/manual/index.md b/log4j-jpa/src/site/manual/index.md
deleted file mode 100644
index 6b1b12eef3..0000000000
--- a/log4j-jpa/src/site/manual/index.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Log4j Java Persistence API module
-
-As of Log4j 2.11.0, JPA support has moved from the existing module log4j-core to the new module log4j-jpa.
-
-## Requirements
-
-This module was introduced in Log4j 2.11.0 and requires the javax.persistence API.
-
-Some features may require optional
-[dependencies](../runtime-dependencies.html). These dependencies are specified in the
-documentation for those features.
-
-Some Log4j features require external dependencies.
-See the [Dependency Tree](dependencies.html#Dependency_Tree)
-for the exact list of JAR files needed for these features.
diff --git a/log4j-jpa/src/site/site.xml b/log4j-jpa/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-jpa/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml
index b8e81d923a..54744b8e8e 100644
--- a/log4j-jpl/pom.xml
+++ b/log4j-jpl/pom.xml
@@ -26,7 +26,6 @@
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <module.name>org.apache.logging.log4j.jpl</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <artifactId>log4j-jpl</artifactId>
diff --git a/log4j-jpl/src/site/site.xml b/log4j-jpl/src/site/site.xml
deleted file mode 100644
index 06a070594c..0000000000
--- a/log4j-jpl/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j JDK Platform Logging Adapter"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index 6e40c6e814..41641e812d 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -25,7 +25,6 @@
 
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <artifactId>log4j-jul</artifactId>
diff --git a/log4j-jul/src/site/site.xml b/log4j-jul/src/site/site.xml
deleted file mode 100644
index 3bd9c9d87f..0000000000
--- a/log4j-jul/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j JDK Logging Adapter"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-kafka/pom.xml b/log4j-kafka/pom.xml
index 1b50680dc9..8baf127f57 100644
--- a/log4j-kafka/pom.xml
+++ b/log4j-kafka/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Log4j Kafka Documentation</docLabel>
     <projectDir>/log4j-kafka</projectDir>
     <module.name>org.apache.logging.log4j.kafka</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-kafka/src/site/site.xml b/log4j-kafka/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-kafka/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml
index 52de28392c..8c9124851a 100644
--- a/log4j-kubernetes/pom.xml
+++ b/log4j-kubernetes/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>Log4j Kubernetes Library Documentation</docLabel>
     <projectDir>/kubernetes</projectDir>
     <module.name>org.apache.logging.log4j.kubernetes</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-kubernetes/src/site/site.xml b/log4j-kubernetes/src/site/site.xml
deleted file mode 100644
index a16689a880..0000000000
--- a/log4j-kubernetes/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Docker Support"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-layout-jackson-json/pom.xml b/log4j-layout-jackson-json/pom.xml
index ba6b8db10a..7b23978bda 100644
--- a/log4j-layout-jackson-json/pom.xml
+++ b/log4j-layout-jackson-json/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Log4j Layout for Jackson JSON Documentation</docLabel>
     <projectDir>/log4j-layout-json</projectDir>
     <module.name>org.apache.logging.log4j.jackson.json</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-layout-jackson-json/src/site/site.xml b/log4j-layout-jackson-json/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-layout-jackson-json/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-layout-jackson-xml/pom.xml b/log4j-layout-jackson-xml/pom.xml
index db23a35b18..12039cec04 100644
--- a/log4j-layout-jackson-xml/pom.xml
+++ b/log4j-layout-jackson-xml/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Log4j Layout for Jackson XML Documentation</docLabel>
     <projectDir>/log4j-layout-xml</projectDir>
     <module.name>org.apache.logging.log4j.jackson.xml</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-layout-jackson-xml/src/site/site.xml b/log4j-layout-jackson-xml/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-layout-jackson-xml/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-layout-jackson-yaml/pom.xml b/log4j-layout-jackson-yaml/pom.xml
index bdf027e900..3ce3bfe78b 100644
--- a/log4j-layout-jackson-yaml/pom.xml
+++ b/log4j-layout-jackson-yaml/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Log4j Layout for Jackson YAML Documentation</docLabel>
     <projectDir>/log4j-layout-yaml</projectDir>
     <module.name>org.apache.logging.log4j.jackson.yaml</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-layout-jackson-yaml/src/site/site.xml b/log4j-layout-jackson-yaml/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-layout-jackson-yaml/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-layout-jackson/pom.xml b/log4j-layout-jackson/pom.xml
index 25f47808ec..aa8b4e7263 100644
--- a/log4j-layout-jackson/pom.xml
+++ b/log4j-layout-jackson/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Log4j Layout for Jackson Documentation</docLabel>
     <projectDir>/log4j-layout-jackson</projectDir>
     <module.name>org.apache.logging.log4j.jackson</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-layout-jackson/src/site/site.xml b/log4j-layout-jackson/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-layout-jackson/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml
index 69e806fe4b..f1b6e0b32a 100644
--- a/log4j-layout-template-json-test/pom.xml
+++ b/log4j-layout-template-json-test/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Tests for the JSON Template Layout of Apache Log4j</docLabel>
     <projectDir>/log4j-layout-template-json-test</projectDir>
     <module.name>org.apache.logging.log4j.layout.template.json.test</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-layout-template-json-test/src/site/manual/index.md b/log4j-layout-template-json-test/src/site/manual/index.md
deleted file mode 100644
index 7bd83d9d37..0000000000
--- a/log4j-layout-template-json-test/src/site/manual/index.md
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Apache Log4j JSON Template Layout module tests
-
-This module provides tests and test utilities for [the JSON Template Layout](/manual/json-template-layout.html).
-
-## Requirements
-
-This module was introduced in Log4j 3.0.0.
-
-Some features may require optional [dependencies](../runtime-dependencies.html).
-These dependencies are specified in the documentation for those features.
-
-Some Log4j features require external dependencies.
-See the [Dependency Tree](dependencies.html#Dependency_Tree) for the exact list of JAR files needed for these features.
diff --git a/log4j-layout-template-json-test/src/site/site.xml b/log4j-layout-template-json-test/src/site/site.xml
deleted file mode 100644
index a0c70c3473..0000000000
--- a/log4j-layout-template-json-test/src/site/site.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-
-  <body>
-
-    <links>
-      <item name="Apache" href="http://www.apache.org/"/>
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-    <!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html"/>
-      <item name="Dependency Convergence" href="../dependency-convergence.html"/>
-      <item name="Dependency Management" href="../dependency-management.html"/>
-      <item name="Project Team" href="../team-list.html"/>
-      <item name="Mailing Lists" href="../mail-lists.html"/>
-      <item name="Issue Tracking" href="../issue-tracking.html"/>
-      <item name="Project License" href="../license.html"/>
-      <item name="Source Repository" href="../source-repository.html"/>
-      <item name="Project Summary" href="../project-summary.html"/>
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html"/>
-      <item name="RAT Report" href="../rat-report.html"/>
-    </menu>
-
-  </body>
-
-</project>
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 6a8f0e7dbd..43133d025b 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -37,7 +37,6 @@
     <docLabel>Log4j Layout for JSON Template Documentation</docLabel>
     <projectDir>/log4j-layout-template-json</projectDir>
     <module.name>org.apache.logging.log4j.layout.template.json</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-layout-template-json/src/site/site.xml b/log4j-layout-template-json/src/site/site.xml
deleted file mode 100644
index a0c70c3473..0000000000
--- a/log4j-layout-template-json/src/site/site.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-
-  <body>
-
-    <links>
-      <item name="Apache" href="http://www.apache.org/"/>
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-    <!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html"/>
-      <item name="Dependency Convergence" href="../dependency-convergence.html"/>
-      <item name="Dependency Management" href="../dependency-management.html"/>
-      <item name="Project Team" href="../team-list.html"/>
-      <item name="Mailing Lists" href="../mail-lists.html"/>
-      <item name="Issue Tracking" href="../issue-tracking.html"/>
-      <item name="Project License" href="../license.html"/>
-      <item name="Source Repository" href="../source-repository.html"/>
-      <item name="Project Summary" href="../project-summary.html"/>
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html"/>
-      <item name="RAT Report" href="../rat-report.html"/>
-    </menu>
-
-  </body>
-
-</project>
diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml
index 6b4015f58b..f4ec1910dc 100644
--- a/log4j-liquibase/pom.xml
+++ b/log4j-liquibase/pom.xml
@@ -30,7 +30,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Liquibase Documentation</docLabel>
     <projectDir>/liquibase</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
     <module.name>org.apache.logging.log4j.liquibase</module.name>
   </properties>
   <dependencies>
diff --git a/log4j-liquibase/src/site/site.xml b/log4j-liquibase/src/site/site.xml
deleted file mode 100644
index 2a9171bf97..0000000000
--- a/log4j-liquibase/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Apache Log4j Liquibase Binding"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-    <!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
\ No newline at end of file
diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml
index c24d1c8e9e..f37f01678c 100644
--- a/log4j-mongodb3/pom.xml
+++ b/log4j-mongodb3/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>MongoDB 3 Documentation</docLabel>
     <projectDir>/log4j-mongodb3</projectDir>
     <module.name>org.apache.logging.log4j.mongodb3</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
 
     <!-- Override of the parent POM version -->
     <mongodb.version>3.12.11</mongodb.version>
diff --git a/log4j-mongodb3/src/site/site.xml b/log4j-mongodb3/src/site/site.xml
deleted file mode 100644
index be371cc446..0000000000
--- a/log4j-mongodb3/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j MongoDB Appender"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
index b16382af89..1b8e47a053 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb4/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>MongoDB 4 Documentation</docLabel>
     <projectDir>/log4j-mongodb4</projectDir>
     <module.name>org.apache.logging.log4j.mongodb4</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-mongodb4/src/site/site.xml b/log4j-mongodb4/src/site/site.xml
deleted file mode 100644
index be371cc446..0000000000
--- a/log4j-mongodb4/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j MongoDB Appender"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index f1b2eec154..2aa49bdeb7 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>OSGi Documentation</docLabel>
     <projectDir>/osgi</projectDir>
     <module.name>org.apache.logging.log4j.osgi</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
     <pax.exam.version>4.13.5</pax.exam.version>
   </properties>
   <dependencies>
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index e3fdf27d5c..9114e943f0 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -35,10 +35,7 @@
     <projectDir>/log4j-perf</projectDir>
     <uberjar.name>benchmarks</uberjar.name>
     <revapi.skip>true</revapi.skip>
-    <maven.doap.skip>true</maven.doap.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.site.skip>true</maven.site.skip>
-    <maven.site.deploy.skip>true</maven.site.deploy.skip>
     <module.name>org.apache.logging.log4j.perf</module.name>
   </properties>
 
diff --git a/log4j-plugin-processor/pom.xml b/log4j-plugin-processor/pom.xml
index aecfb3bbce..771eebbfb5 100644
--- a/log4j-plugin-processor/pom.xml
+++ b/log4j-plugin-processor/pom.xml
@@ -30,7 +30,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Plugin Documentation</docLabel>
     <projectDir>/plugins</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <!-- Used for OSGi bundle support -->
@@ -175,7 +174,6 @@
             and the Apache Log4j logo are trademarks of The Apache Software Foundation.&lt;/p&gt;</bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating
                project -->
-          <additionalparam>${javadoc.opts}</additionalparam>
           <detectOfflineLinks>false</detectOfflineLinks>
           <linksource>true</linksource>
           <links>
diff --git a/log4j-plugins-test/pom.xml b/log4j-plugins-test/pom.xml
index 66af0e54ea..f5924bbae5 100644
--- a/log4j-plugins-test/pom.xml
+++ b/log4j-plugins-test/pom.xml
@@ -30,7 +30,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Plugin Documentation</docLabel>
     <projectDir>/plugins</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <!-- Used for OSGi bundle support -->
@@ -166,7 +165,6 @@
             and the Apache Log4j logo are trademarks of The Apache Software Foundation.&lt;/p&gt;</bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating
                project -->
-          <additionalparam>${javadoc.opts}</additionalparam>
           <detectOfflineLinks>false</detectOfflineLinks>
           <linksource>true</linksource>
           <links>
diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml
index 7d359f7026..56a8dd7898 100644
--- a/log4j-plugins/pom.xml
+++ b/log4j-plugins/pom.xml
@@ -30,7 +30,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Plugin Documentation</docLabel>
     <projectDir>/plugins</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <!-- Used for OSGi bundle support -->
@@ -124,7 +123,6 @@
             and the Apache Log4j logo are trademarks of The Apache Software Foundation.&lt;/p&gt;</bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating
                project -->
-          <additionalparam>${javadoc.opts}</additionalparam>
           <detectOfflineLinks>false</detectOfflineLinks>
           <linksource>true</linksource>
           <links>
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index 70b4850cbd..a5cf6aff34 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -27,33 +27,35 @@
   <packaging>pom</packaging>
   <name>Apache Log4j Samples</name>
   <url>http://maven.apache.org</url>
+
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <revapi.skip>true</revapi.skip>
-    <maven.doap.skip>true</maven.doap.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
     <maven.install.skip>true</maven.install.skip>
-    <maven.site.skip>true</maven.site.skip>
-    <maven.site.deploy.skip>true</maven.site.deploy.skip>
     <maven-jetty-plugin.version>6.1.26</maven-jetty-plugin.version>
-
     <spring-ws.version>4.0.0</spring-ws.version>
   </properties>
+
   <dependencyManagement>
+
     <dependencies>
       <dependency>
         <groupId>org.apache.logging.log4j.samples</groupId>
         <artifactId>log4j-samples-flume-common</artifactId>
         <version>${project.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.springframework.ws</groupId>
         <artifactId>spring-ws-core</artifactId>
         <version>${spring-ws.version}</version>
       </dependency>
     </dependencies>
+
   </dependencyManagement>
+
   <modules>
     <module>log4j-samples-configuration</module>
     <module>log4j-samples-flume-common</module>
@@ -62,6 +64,7 @@
     <module>log4j-samples-loggerProperties</module>
   </modules>
   <build>
+
     <pluginManagement>
       <plugins>
         <plugin>
@@ -71,11 +74,32 @@
         </plugin>
       </plugins>
     </pluginManagement>
+
     <plugins>
+
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
       </plugin>
+
+      <!-- `enforce-upper-bound-deps` enforcer using `requireUpperBoundDeps` directive has been of no help so far.
+           It is a source of compilation errors that have nothing much to do with Log4j.
+           Hence, disabling it for samples: -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-upper-bound-deps</id>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
+
   </build>
+
 </project>
diff --git a/log4j-script/pom.xml b/log4j-script/pom.xml
index a23d365daf..5f199fb068 100644
--- a/log4j-script/pom.xml
+++ b/log4j-script/pom.xml
@@ -26,7 +26,6 @@
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <module.name>org.apache.logging.log4j.script</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <artifactId>log4j-script</artifactId>
diff --git a/log4j-script/src/site/site.xml b/log4j-script/src/site/site.xml
deleted file mode 100644
index 3bd9c9d87f..0000000000
--- a/log4j-script/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j JDK Logging Adapter"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index adaaef2eae..509b7b7eaa 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -32,7 +32,6 @@
     <projectDir>/slf4j-impl</projectDir>
     <slf4j.version>1.7.25</slf4j.version>
     <module.name>org.apache.logging.log4j.slf4j</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-slf4j-impl/src/site/site.xml b/log4j-slf4j-impl/src/site/site.xml
deleted file mode 100644
index 68451f38c5..0000000000
--- a/log4j-slf4j-impl/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="SLF4J Binding Using Log4j"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml
index 1f66ce755a..4e6e80cafa 100644
--- a/log4j-slf4j2-impl/pom.xml
+++ b/log4j-slf4j2-impl/pom.xml
@@ -33,7 +33,6 @@
     <!-- Override parent's default -->
     <slf4j.version>2.0.6</slf4j.version>
     <module.name>org.apache.logging.log4j.slf4j</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-slf4j2-impl/src/site/site.xml b/log4j-slf4j2-impl/src/site/site.xml
deleted file mode 100644
index 68451f38c5..0000000000
--- a/log4j-slf4j2-impl/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="SLF4J Binding Using Log4j"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-smtp/pom.xml b/log4j-smtp/pom.xml
index 09909a1329..39412019ea 100644
--- a/log4j-smtp/pom.xml
+++ b/log4j-smtp/pom.xml
@@ -24,8 +24,6 @@
     <docLabel>Log4j SMTP Appender Documentation</docLabel>
     <projectDir>/log4j-smtp</projectDir>
     <module.name>org.apache.logging.log4j.smtp</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
-    <module.name>org.apache.logging.log4j.smtp</module.name>
   </properties>
 
   <dependencies>
diff --git a/log4j-smtp/src/site/site.xml b/log4j-smtp/src/site/site.xml
deleted file mode 100644
index cddcff38d0..0000000000
--- a/log4j-smtp/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Core"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml
index f520295cb3..369b219531 100644
--- a/log4j-spring-boot/pom.xml
+++ b/log4j-spring-boot/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>Log4j Spring Boot Documentation</docLabel>
     <projectDir>/log4j-spring-boot</projectDir>
     <module.name>org.apache.logging.log4j.spring.boot</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-spring-boot/src/site/site.xml b/log4j-spring-boot/src/site/site.xml
deleted file mode 100644
index e31d4aa854..0000000000
--- a/log4j-spring-boot/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Spring Boot Integration"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/site.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/site.xml
deleted file mode 100644
index 8787f1593b..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Spring Cloud Config Integration"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
index 940f9d971d..403869786d 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
@@ -37,8 +37,6 @@
     <module.name>org.apache.logging.log4j.spring.cloud.config.sample.server</module.name>
 
     <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.site.skip>true</maven.site.skip>
-    <maven.site.deploy.skip>true</maven.site.deploy.skip>
 
     <!-- paths -->
     <sonar.dependencyCheck.reportPath>${project.build.directory}/dependency-check-report.xml
@@ -46,7 +44,6 @@
 
     <!-- maven plugin config -->
     <pmd.failurePriority>2</pmd.failurePriority>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
@@ -115,32 +112,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>com/oracle/brm/**/*.class</exclude>
-            <exclude>org/w3/**/*.class</exclude>
-            <exclude>org/xmlsoap/**/*.class</exclude>
-            <exclude>oracle/security/pki/*.class</exclude>
-          </excludes>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>report</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
index 3531216a73..6b56b64aa0 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
@@ -30,10 +30,7 @@
   <properties>
     <log4jParentDir>${basedir}/../..</log4jParentDir>
     <revapi.skip>true</revapi.skip>
-    <maven.doap.skip>true</maven.doap.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.site.skip>true</maven.site.skip>
-    <maven.site.deploy.skip>true</maven.site.deploy.skip>
 
     <spring-ws.version>4.0.0</spring-ws.version>
   </properties>
@@ -68,6 +65,7 @@
       </plugins>
     </pluginManagement>
     <plugins>
+
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
@@ -75,6 +73,23 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+
+      <!-- `enforce-upper-bound-deps` enforcer using `requireUpperBoundDeps` directive has been of no help so far.
+           It is a source of compilation errors that have nothing much to do with Log4j.
+           Hence, disabling it for samples: -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-upper-bound-deps</id>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 3dee9cc253..de737ba827 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -31,7 +31,6 @@
     <revapi.skip>true</revapi.skip>
     <spring-cloud.version>2021.0.4</spring-cloud.version>
     <log4jParentDir>${basedir}/..</log4jParentDir>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/log4j-spring-cloud-config/src/site/markdown/index.md b/log4j-spring-cloud-config/src/site/markdown/index.md
deleted file mode 100644
index 7f51be45d2..0000000000
--- a/log4j-spring-cloud-config/src/site/markdown/index.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Log4j Spring Cloud Config
-
-
diff --git a/log4j-spring-cloud-config/src/site/site.xml b/log4j-spring-cloud-config/src/site/site.xml
deleted file mode 100644
index bb864fb541..0000000000
--- a/log4j-spring-cloud-config/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Spring Cloud Config"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index 440fe564ad..0b4adb87ed 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>Log4j Tag Library Documentation</docLabel>
     <projectDir>/taglib</projectDir>
     <module.name>org.apache.logging.log4j.taglib</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-taglib/src/site/site.xml b/log4j-taglib/src/site/site.xml
deleted file mode 100644
index 26f023762a..0000000000
--- a/log4j-taglib/src/site/site.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Tag Library"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
\ No newline at end of file
diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml
index 9b4dc81168..9c37a79560 100644
--- a/log4j-to-jul/pom.xml
+++ b/log4j-to-jul/pom.xml
@@ -32,7 +32,6 @@
     <docLabel>Log4j to JUL Documentation</docLabel>
     <projectDir>/log4j-to-jul</projectDir>
     <module.name>org.apache.logging.tojul</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-to-jul/src/site/site.xml b/log4j-to-jul/src/site/site.xml
deleted file mode 100644
index c7f15e5288..0000000000
--- a/log4j-to-jul/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Provider Using JUL"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index b8909df718..85d1f9c876 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -31,7 +31,6 @@
     <docLabel>SLF4J Documentation</docLabel>
     <projectDir>/log4j-to-slf4j</projectDir>
     <module.name>org.apache.logging.slf4j</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-to-slf4j/src/site/site.xml b/log4j-to-slf4j/src/site/site.xml
deleted file mode 100644
index 7715af4c4d..0000000000
--- a/log4j-to-slf4j/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Provider Using SLF4J"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 55ed37317f..d42753d56c 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -33,7 +33,6 @@
     <docLabel>Web Documentation</docLabel>
     <projectDir>/log4j-web</projectDir>
     <module.name>org.apache.logging.log4j.web</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-web/src/site/site.xml b/log4j-web/src/site/site.xml
deleted file mode 100644
index 0ad38d049c..0000000000
--- a/log4j-web/src/site/site.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project name="Log4j Web Support"
-         xmlns="http://maven.apache.org/DECORATION/1.4.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
-  <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/" />
-      <item name="Logging Services" href="http://logging.apache.org/"/>
-      <item name="Log4j" href="../index.html"/>
-    </links>
-
-    <!-- Component-specific reports -->
-    <menu ref="reports"/>
-
-	<!-- Overall Project Info -->
-    <menu name="Log4j Project Information" img="icon-info-sign">
-      <item name="Dependencies" href="../dependencies.html" />
-      <item name="Dependency Convergence" href="../dependency-convergence.html" />
-      <item name="Dependency Management" href="../dependency-management.html" />
-      <item name="Project Team" href="../team-list.html" />
-      <item name="Mailing Lists" href="../mail-lists.html" />
-      <item name="Issue Tracking" href="../issue-tracking.html" />
-      <item name="Project License" href="../license.html" />
-      <item name="Source Repository" href="../source-repository.html" />
-      <item name="Project Summary" href="../project-summary.html" />
-    </menu>
-
-    <menu name="Log4j Project Reports" img="icon-cog">
-      <item name="Surefire Report" href="../surefire-report.html" />
-      <item name="RAT Report" href="../rat-report.html" />
-    </menu>
-  </body>
-</project>
diff --git a/pom.xml b/pom.xml
index 43890ae1fd..8e09dc5aec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,32 +16,40 @@
   ~ limitations under the license.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.logging.log4j</groupId>
-  <artifactId>log4j</artifactId>
-  <packaging>pom</packaging>
-  <name>Apache Log4j 2</name>
-  <version>3.0.0-SNAPSHOT</version>
+
   <parent>
     <groupId>org.apache.logging</groupId>
     <artifactId>logging-parent</artifactId>
     <version>7</version>
     <relativePath/>
   </parent>
+
+  <groupId>org.apache.logging.log4j</groupId>
+  <artifactId>log4j</artifactId>
+  <packaging>pom</packaging>
+  <version>3.0.0-SNAPSHOT</version>
+
+  <name>Apache Log4j 2</name>
   <description>Apache Log4j 2</description>
   <url>https://logging.apache.org/log4j/2.x/</url>
   <issueManagement>
     <system>JIRA</system>
     <url>https://issues.apache.org/jira/browse/LOG4J2</url>
   </issueManagement>
+
   <ciManagement>
-    <system>Jenkins</system>
-    <url>https://ci-builds.apache.org/job/Logging/job/log4j/</url>
+    <system>GitHub Actions</system>
+    <url>https://github.com/apache/logging-log4j2/actions</url>
   </ciManagement>
+
   <inceptionYear>1999</inceptionYear>
+
   <!-- Developer IDs are used to map author IDs to names while exporting changelogs.
        Hence, updates here need to be reflected to `.changelog-entries.adoc.ftl` too. -->
   <developers>
+
     <developer>
       <id>rgoers</id>
       <name>Ralph Goers</name>
@@ -52,6 +60,7 @@
       </roles>
       <timezone>America/Phoenix</timezone>
     </developer>
+
     <developer>
       <id>ggregory</id>
       <name>Gary Gregory</name>
@@ -63,10 +72,8 @@
         <role>PMC Member</role>
       </roles>
       <timezone>America/New_York</timezone>
-      <properties>
-        <picUrl>https://people.apache.org/~ggregory/img/garydgregory80.png</picUrl>
-      </properties>
     </developer>
+
     <developer>
       <id>sdeboy</id>
       <name>Scott Deboy</name>
@@ -76,6 +83,7 @@
       </roles>
       <timezone>America/Los_Angeles</timezone>
     </developer>
+
     <developer>
       <id>rpopma</id>
       <name>Remko Popma</name>
@@ -84,10 +92,8 @@
         <role>PMC Member</role>
       </roles>
       <timezone>Asia/Tokyo</timezone>
-      <properties>
-        <picUrl>https://people.apache.org/~rpopma/img/profilepic.jpg</picUrl>
-      </properties>
     </developer>
+
     <developer>
       <id>nickwilliams</id>
       <name>Nick Williams</name>
@@ -97,6 +103,7 @@
       </roles>
       <timezone>America/Chicago</timezone>
     </developer>
+
     <developer>
       <id>mattsicker</id>
       <name>Matt Sicker</name>
@@ -107,6 +114,7 @@
       </roles>
       <timezone>America/Chicago</timezone>
     </developer>
+
     <developer>
       <id>bbrouwer</id>
       <name>Bruce Brouwer</name>
@@ -116,6 +124,7 @@
       </roles>
       <timezone>America/Detroit</timezone>
     </developer>
+
     <developer>
       <id>rgupta</id>
       <name>Raman Gupta</name>
@@ -125,6 +134,7 @@
       </roles>
       <timezone>Asia/Kolkata</timezone>
     </developer>
+
     <developer>
       <id>mikes</id>
       <name>Mikael Ståldal</name>
@@ -135,6 +145,7 @@
       </roles>
       <timezone>Europe/Stockholm</timezone>
     </developer>
+
     <developer>
       <id>ckozak</id>
       <name>Carter Kozak</name>
@@ -144,10 +155,8 @@
         <role>PMC Member</role>
       </roles>
       <timezone>America/New York</timezone>
-      <properties>
-        <picUrl>https://www.gravatar.com/avatar/e057b8f2538a0258f451d9efc8d2f6fa.jpg</picUrl>
-      </properties>
     </developer>
+
     <developer>
       <id>vy</id>
       <name>Volkan Yazıcı</name>
@@ -157,6 +166,7 @@
       </roles>
       <timezone>Europe/Amsterdam</timezone>
     </developer>
+
     <developer>
       <id>rgrabowski</id>
       <name>Ron Grabowski</name>
@@ -166,6 +176,7 @@
       </roles>
       <timezone>America/New_York</timezone>
     </developer>
+
     <developer>
       <id>pkarwasz</id>
       <name>Piotr P. Karwasz</name>
@@ -175,6 +186,7 @@
       </roles>
       <timezone>Europe/Warsaw</timezone>
     </developer>
+
     <developer>
       <id>grobmeier</id>
       <name>Christian Grobmeier</name>
@@ -184,116 +196,99 @@
       </roles>
       <timezone>Europe/Berlin</timezone>
     </developer>
+
   </developers>
-  <!-- Contributors -->
-  <contributors>
-      <contributor>
-        <name>Murad Ersoy</name>
-        <email>muradersoy@gmail.com</email>
-        <url>https://www.behance.net/muradersoy</url>
-        <roles>
-          <role>Illustrator and Designer</role>
-          <role>created the new Log4j 2 logo.</role>
-        </roles>
-        <timezone>Europe/Istanbul</timezone>
-        <properties>
-          <picUrl>https://mir-s3-cdn-cf.behance.net/user/138/403dcf1521581.54d67f8fb01f7.jpg</picUrl>
-        </properties>
-      </contributor>
-      <contributor>
-        <name>Michael Vorburger.ch</name>
-        <email>vorburger@apache.org</email>
-        <url>http://www.vorburger.ch</url>
-        <roles>
-          <role>https://github.com/apache/logging-log4j2/commits?author=vorburger</role>
-          <role>JULer</role>
-        </roles>
-        <timezone>Europe/Zurich</timezone>
-        <properties>
-          <picUrl>http://www.vorburger.ch/michael_vorburger_portrait_in_bay_of_roses_spain_with_bad_lighting.jpg</picUrl>
-        </properties>
-      </contributor>
-  </contributors>
+
   <mailingLists>
+
     <mailingList>
       <name>log4j-user</name>
       <subscribe>log4j-user-subscribe@logging.apache.org</subscribe>
       <unsubscribe>log4j-user-unsubscribe@logging.apache.org</unsubscribe>
       <post>log4j-user@logging.apache.org</post>
       <archive>https://lists.apache.org/list.html?log4j-user@logging.apache.org</archive>
-      <otherArchives>
-        <otherArchive>http://mail-archives.apache.org/mod_mbox/logging-log4j-user/</otherArchive>
-        <otherArchive>http://marc.info/?l=log4j-user</otherArchive>
-        <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.user</otherArchive>
-      </otherArchives>
     </mailingList>
+
     <mailingList>
       <name>dev</name>
       <subscribe>dev-subscribe@logging.apache.org</subscribe>
       <unsubscribe>dev-unsubscribe@logging.apache.org</unsubscribe>
       <post>dev@logging.apache.org</post>
       <archive>https://lists.apache.org/list.html?dev@logging.apache.org</archive>
-      <otherArchives>
-        <otherArchive>http://mail-archives.apache.org/mod_mbox/logging-dev/</otherArchive>
-        <otherArchive>http://marc.info/?l=dev</otherArchive>
-        <otherArchive>http://dir.gmane.org/gmane.comp.jakarta.log4j.devel</otherArchive>
-      </otherArchives>
     </mailingList>
+
   </mailingLists>
+
   <scm>
-    <connection>scm:git:https://gitbox.apache.org/repos/asf/logging-log4j2.git</connection>
-    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/logging-log4j2.git</developerConnection>
-    <url>https://gitbox.apache.org/repos/asf?p=logging-log4j2.git</url>
+    <connection>scm:git:https://github.com/apache/logging-log4j2.git</connection>
+    <developerConnection>scm:git:https://github.com/apache/logging-log4j2.git</developerConnection>
+    <url>https://github.com/apache/logging-log4j2</url>
     <tag>log4j-${Log4jReleaseVersion}</tag>
   </scm>
+
   <properties>
-    <!-- make sure to update these for each release! -->
+
+    <!-- ===========================
+         Release-specific properties
+         =========================== -->
     <log4jParentDir>${basedir}</log4jParentDir>
     <Log4jReleaseVersion>3.0.0</Log4jReleaseVersion>
     <Log4jReleaseManager>Ralph Goers</Log4jReleaseManager>
     <Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey>
-    <!--<Log4jReleaseManager>Matt Sicker</Log4jReleaseManager> -->
-    <!--<Log4jReleaseKey>748F15B2CF9BA8F024155E6ED7C92B70FA1C814D</Log4jReleaseKey> -->
+    <Log4jSigningUserName>rgoers@apache.org</Log4jSigningUserName>
+
+    <!-- =================
+         Common properties
+         ================= -->
     <revapi.skip>true</revapi.skip>
     <manifestfile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestfile>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.release>11</maven.compiler.release>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <maven.doap.skip>false</maven.doap.skip>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- 1641056400 = Jan 1 2022, instead of 1969, which shows up in Javadoc -->
-    <project.build.outputTimestamp>1641056400</project.build.outputTimestamp>
+    <!-- See https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
+    <!-- 1672527600 = 2023-01-01, instead of the default 1969, which shows up in Javadoc -->
+    <project.build.outputTimestamp>1672527600</project.build.outputTimestamp>
     <docLabel>Site Documentation</docLabel>
     <projectDir/>
-    <!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->
-    <minSeverity>info</minSeverity>
-    <argLine>-Xms256m -Xmx1024m</argLine>
-    <javaTargetVersion>11</javaTargetVersion>
     <module.name/>
+    <!-- Skipping `maven-site-plugin` globally.
+         It is manually enabled only for the parent module below. -->
+    <maven.site.skip>true</maven.site.skip>
+    <maven.site.deploy.skip>true</maven.site.deploy.skip>
+
+    <!-- ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+         ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+         ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+         ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+          ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+         Dependency and plugin version properties might have many implications beyond their simple appearance!
+         Walk through the following checklist before making a change in these properties!
+
+         1. Follow the `<artifactId>.version` naming convention
+         2. Make sure properties are sorted in alphabetical order
+         3. Check parent POMs for any associations.
+            For instance, Maven Surefire Plugin version property is such an exception.
+            It is named as `surefire.version` rather than `maven-surefire-plugin.version`, since `surefire.version` is already employed by `apache.org:apache` parent POM.
+         4. Think of consequences when users _import_ this POM along with, e.g., `spring-boot-dependencies` BOM -->
 
-    <!-- Plugin versions -->
-    <!-- Properties in the format `<artifactId>.version` -->
-    <!-- Spring Boot uses the same convention. -->
+    <!-- =================================================
+         Plugin version properties (in alphabetical order)
+         ================================================= -->
     <asciidoctor-maven-plugin.version>2.2.2</asciidoctor-maven-plugin.version>
     <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
-    <!-- checkstyle 10.0 requires Java 11 -->
-    <checkstyle.version>9.3</checkstyle.version>
     <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
-    <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
     <docker-maven-plugin.version>0.40.2</docker-maven-plugin.version>
     <exam-maven-plugin.version>4.13.5</exam-maven-plugin.version>
     <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
     <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
-    <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
     <log4j-tools.version>0.1.0</log4j-tools.version>
     <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
     <maven-checkstyle-plugin.version>3.2.0</maven-checkstyle-plugin.version>
     <maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
-    <maven-doap-plugin.version>1.2</maven-doap-plugin.version>
     <maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
-    <!-- Do not update the pdf plugin version without verifying the new version works by running mvn site -->
-    <maven-pdf-plugin.version>1.2</maven-pdf-plugin.version>
     <maven-pmd-plugin.version>3.19.0</maven-pmd-plugin.version>
     <maven-scm-plugin.version>1.12.2</maven-scm-plugin.version>
     <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
@@ -301,33 +296,30 @@
     <revapi-maven-plugin.version>0.12.2</revapi-maven-plugin.version>
     <spotbugs-maven-plugin.version>4.7.2.1</spotbugs-maven-plugin.version>
     <spotless-maven-plugin.version>2.27.2</spotless-maven-plugin.version>
-    <!-- surefire.plugin.version 2.18 yields http://jira.codehaus.org/browse/SUREFIRE-1121, which is fixed in 2.18.1 -->
-    <!-- surefire.plugin.version 2.19 yields https://issues.apache.org/jira/browse/SUREFIRE-1193. -->
-    <!-- all versions after 2.13 yield https://issues.apache.org/jira/browse/SUREFIRE-720 -->
-    <!-- property used in `apache.org:apache` -->
+    <!-- `surefire.version` property used in `apache.org:apache`: -->
     <surefire.version>3.0.0-M7</surefire.version>
     <!-- Maven site depends on Velocity and the escaping rules are different in newer versions. -->
     <!-- See https://maven.apache.org/plugins/maven-site-plugin/migrate.html -->
     <velocity.plugin.version>1.5</velocity.plugin.version>
 
-    <!-- Dependency versions -->
-    <!-- We can use the property names from Spring Boot: -->
-    <!--  https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.7.4/spring-boot-dependencies-2.7.4.pom -->
+    <!-- =====================================================
+         Dependency version properties (in alphabetical order)
+         ===================================================== -->
     <activemq.version>5.17.3</activemq.version>
-    <assertj.version>3.21.0</assertj.version>
-    <awaitility.version>4.0.2</awaitility.version>
+    <assertj.version>3.23.1</assertj.version>
+    <awaitility.version>4.2.0</awaitility.version>
     <bsh.version>2.0b6</bsh.version>
     <cassandra.version>3.11.14</cassandra.version>
     <cassandra-driver.version>3.11.3</cassandra-driver.version>
     <commons-codec.version>1.15</commons-codec.version>
     <commons-compress.version>1.22</commons-compress.version>
-    <commons-csv.version>1.8</commons-csv.version>
+    <commons-csv.version>1.9.0</commons-csv.version>
     <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
     <commons-io.version>2.11.0</commons-io.version>
     <commons-lang3.version>3.12.0</commons-lang3.version>
     <commons-logging.version>1.2</commons-logging.version>
     <commons-pool2.version>2.11.1</commons-pool2.version>
-    <conversant.disruptor.version>1.2.19</conversant.disruptor.version> <!-- Version 1.2.16 requires Java 9 -->
+    <conversant.disruptor.version>1.2.21</conversant.disruptor.version>
     <disruptor.version>3.4.4</disruptor.version>
     <elasticsearch.version>7.17.8</elasticsearch.version>
     <embedded-ldap.version>0.9.0</embedded-ldap.version>
@@ -338,19 +330,19 @@
     <graalvm.version>21.3.0</graalvm.version>
     <groovy.version>4.0.6</groovy.version>
     <guava.version>31.1-jre</guava.version>
-    <h2.version>1.4.199</h2.version>
+    <h2.version>2.1.214</h2.version>
     <hadoop.version>1.2.1</hadoop.version>
     <hamcrest.version>2.2</hamcrest.version>
     <HdrHistogram.version>2.1.12</HdrHistogram.version>
-    <hsqldb.version>2.4.1</hsqldb.version>
+    <hsqldb.version>2.5.2</hsqldb.version>
     <jackson1.version>1.9.13</jackson1.version>
     <jackson-bom.version>2.14.1</jackson-bom.version>
-    <!-- Implementation of `jakarta.activation-api` -->
+    <!-- Implementation of `jakarta.activation-api`: -->
     <jakarta-activation.version>2.0.1</jakarta-activation.version>
     <jakarta-mail.version>2.0.1</jakarta-mail.version>
-    <!-- BOM with Jakarta EE 9 APIs -->
+    <!-- BOM with Jakarta EE 9 APIs: -->
     <jakartaee-bom.version>9.0.0</jakartaee-bom.version>
-    <!-- No BOM for Java EE 8 APIs, so we list them separately -->
+    <!-- No BOM for Java EE 8 APIs, so we list them separately: -->
     <javax-activation.version>1.2.0</javax-activation.version>
     <javax-inject.version>1</javax-inject.version>
     <javax-jaxb.version>2.3.1</javax-jaxb.version>
@@ -359,10 +351,10 @@
     <javax-persistence.version>2.2</javax-persistence.version>
     <javax-servlet.version>4.0.1</javax-servlet.version>
     <javax-servlet-jsp.version>2.3.3</javax-servlet-jsp.version>
-    <jansi.version>2.3.2</jansi.version>
+    <jansi.version>2.4.0</jansi.version>
     <java-allocation-instrumenter.version>3.3.0</java-allocation-instrumenter.version>
     <jctools.version>3.3.0</jctools.version>
-    <je.version>5.0.73</je.version>
+    <je.version>18.3.12</je.version>
     <jeromq.version>0.5.3</jeromq.version>
     <jetty.version>9.4.50.v20221201</jetty.version>
     <jmdns.version>3.5.8</jmdns.version>
@@ -371,11 +363,11 @@
     <json-unit.version>2.36.0</json-unit.version>
     <junit.version>4.13.2</junit.version>
     <junit-jupiter.version>5.9.1</junit-jupiter.version>
-    <!-- Do not upgrade to 1.7.x until https://github.com/junit-pioneer/junit-pioneer/issues/623 is fixed -->
-    <junit-pioneer.version>1.6.2</junit-pioneer.version>
+    <junit-pioneer.version>1.9.1</junit-pioneer.version>
     <kafka.version>1.1.1</kafka.version>
-    <kubernetes-client.version>4.6.1</kubernetes-client.version>
-    <lightcouch.version>0.0.6</lightcouch.version>
+    <kubernetes-client.version>5.12.2</kubernetes-client.version>
+    <lightcouch.version>0.2.0</lightcouch.version>
+    <!-- Liquibase 3.6.0 to 4.3.2 breaks binary compatibility: -->
     <liquibase.version>3.5.5</liquibase.version>
     <log4j.version>1.2.17</log4j.version>
     <log4j2-custom-layout.version>1.1.0</log4j2-custom-layout.version>
@@ -384,7 +376,7 @@
     <logback.version>1.2.11</logback.version>
     <maven.version>3.8.6</maven.version>
     <mockito.version>4.11.0</mockito.version>
-    <mongodb.version>4.0.3</mongodb.version>
+    <mongodb.version>4.5.0</mongodb.version>
     <nashorn.version>15.3</nashorn.version>
     <netty.version>4.1.86.Final</netty.version>
     <opentest4j.version>1.2.0</opentest4j.version>
@@ -395,25 +387,23 @@
     <osgi.framework.version>1.10.0</osgi.framework.version>
     <osgi.resource.version>1.0.1</osgi.resource.version>
     <pax-exam.version>4.13.5</pax-exam.version>
-    <plexus.errorprone.version>2.8.8</plexus.errorprone.version>
     <plexus-utils.version>3.5.0</plexus-utils.version>
-    <revapi.version>0.22.1</revapi.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <spotbugs.version>4.1.2</spotbugs.version>
     <spring.version>5.3.24</spring.version>
     <spring-boot.version>2.7.7</spring-boot.version>
     <system-stubs.version>2.0.1</system-stubs.version>
     <tomcat-juli.version>10.0.23</tomcat-juli.version>
     <velocity.version>1.7</velocity.version>
-    <wagon.version>3.1.0</wagon.version>
     <wiremock.version>2.35.0</wiremock.version>
     <woodstox.version>6.4.0</woodstox.version>
-    <xmlunit.version>2.8.3</xmlunit.version>
+    <xmlunit.version>2.9.0</xmlunit.version>
     <xz.version>1.9</xz.version>
+
   </properties>
 
   <dependencyManagement>
     <dependencies>
+
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-bom</artifactId>
@@ -421,6 +411,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.apache.groovy</groupId>
         <artifactId>groovy-bom</artifactId>
@@ -428,6 +419,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
@@ -435,6 +427,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>jakarta.platform</groupId>
         <artifactId>jakarta.jakartaee-bom</artifactId>
@@ -442,6 +435,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
@@ -449,7 +443,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <!-- JUnit 5 engine -->
+
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
@@ -457,6 +451,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>io.fabric8</groupId>
         <artifactId>kubernetes-client-bom</artifactId>
@@ -464,6 +459,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
@@ -471,6 +467,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
@@ -478,127 +475,148 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jdbc</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
       </dependency>
+
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-layout-jackson</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
       </dependency>
+
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-broker</artifactId>
         <version>${activemq.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
         <version>${assertj.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>
         <version>${awaitility.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache-extras.beanshell</groupId>
         <artifactId>bsh</artifactId>
         <version>${bsh.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.mongodb</groupId>
         <artifactId>bson</artifactId>
         <version>${mongodb.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.cassandra</groupId>
         <artifactId>cassandra-all</artifactId>
         <version>${cassandra.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.datastax.cassandra</groupId>
         <artifactId>cassandra-driver-core</artifactId>
         <version>${cassandra-driver.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.cassandra</groupId>
         <artifactId>cassandra-thrift</artifactId>
         <version>${cassandra.version}</version>
       </dependency>
+
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>${commons-codec.version}</version>
       </dependency>
-      <!-- Used for compressing to formats other than zip and gz -->
+
+      <!-- Used for compressing to formats other than `zip` and `gz`: -->
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
         <version>${commons-compress.version}</version>
       </dependency>
-      <!-- Used for the CSV layout -->
+
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-csv</artifactId>
         <version>${commons-csv.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-dbcp2</artifactId>
         <version>${commons-dbcp2.version}</version>
       </dependency>
+
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <version>${commons-io.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
         <version>${commons-lang3.version}</version>
       </dependency>
+
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>${commons-logging.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-pool2</artifactId>
         <version>${commons-pool2.version}</version>
       </dependency>
+
       <dependency>
-        <!-- Testing MongoDB -->
         <groupId>de.flapdoodle.embed</groupId>
         <artifactId>de.flapdoodle.embed.mongo</artifactId>
         <version>${embedded-mongo.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.conversantmedia</groupId>
         <artifactId>disruptor</artifactId>
         <version>${conversant.disruptor.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.lmax</groupId>
         <artifactId>disruptor</artifactId>
         <version>${disruptor.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.elasticsearch.client</groupId>
         <artifactId>elasticsearch-rest-high-level-client</artifactId>
         <version>${elasticsearch.version}</version>
       </dependency>
-      <!-- Testing LDAP -->
+
       <dependency>
         <groupId>org.zapodot</groupId>
         <artifactId>embedded-ldap-junit</artifactId>
         <version>${embedded-ldap.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume.flume-ng-channels</groupId>
         <artifactId>flume-file-channel</artifactId>
@@ -626,6 +644,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-core</artifactId>
@@ -641,6 +660,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-embedded-agent</artifactId>
@@ -664,6 +684,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-node</artifactId>
@@ -687,6 +708,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-sdk</artifactId>
@@ -702,22 +724,26 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <version>${guava.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.google.guava</groupId>
         <!-- https://javadoc.io/doc/com.google.guava/guava-testlib/latest/com/google/common/testing/TestLogHandler.html used in log4j-to-jul tests -->
         <artifactId>guava-testlib</artifactId>
         <version>${guava.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
         <version>${h2.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-core</artifactId>
@@ -741,204 +767,214 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest</artifactId>
         <version>${hamcrest.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-core</artifactId>
         <version>${hamcrest.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-library</artifactId>
         <version>${hamcrest.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.hdrhistogram</groupId>
         <artifactId>HdrHistogram</artifactId>
         <version>${HdrHistogram.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
         <version>${hsqldb.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-core-asl</artifactId>
         <version>${jackson1.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-mapper-asl</artifactId>
         <version>${jackson1.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.sun.activation</groupId>
         <artifactId>jakarta.activation</artifactId>
         <version>${jakarta-activation.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.fusesource.jansi</groupId>
         <artifactId>jansi</artifactId>
         <version>${jansi.version}</version>
       </dependency>
-      <!-- GC-free -->
+
+      <!-- Used for garbage-free tests: -->
       <dependency>
         <groupId>com.google.code.java-allocation-instrumenter</groupId>
         <artifactId>java-allocation-instrumenter</artifactId>
-        <version>3.3.0</version>
-        <exclusions>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava-testlib</artifactId>
-          </exclusion>
-        </exclusions>
+        <version>${java-allocation-instrumenter.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.sun.activation</groupId>
         <artifactId>javax.activation</artifactId>
         <version>${javax-activation.version}</version>
       </dependency>
-      <!-- Jackson 2 end -->
+
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>javax.activation-api</artifactId>
         <version>${javax-activation.version}</version>
       </dependency>
+
       <dependency>
         <groupId>javax.inject</groupId>
         <artifactId>javax.inject</artifactId>
         <version>${javax-inject.version}</version>
       </dependency>
+
       <dependency>
         <groupId>javax.jms</groupId>
         <artifactId>javax.jms-api</artifactId>
         <version>${javax-jms.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.sun.mail</groupId>
         <artifactId>javax.mail</artifactId>
         <version>${javax-mail.version}</version>
       </dependency>
+
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>javax.mail-api</artifactId>
         <version>${javax-mail.version}</version>
       </dependency>
+
       <dependency>
         <groupId>javax.persistence</groupId>
         <artifactId>javax.persistence-api</artifactId>
         <version>${javax-persistence.version}</version>
       </dependency>
+
       <dependency>
         <groupId>javax.servlet.jsp</groupId>
         <artifactId>javax.servlet.jsp-api</artifactId>
         <version>${javax-servlet-jsp.version}</version>
       </dependency>
+
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
         <version>${javax-servlet.version}</version>
       </dependency>
+
       <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
         <version>${javax-jaxb.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.jctools</groupId>
         <artifactId>jctools-core</artifactId>
         <version>${jctools.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.sleepycat</groupId>
         <artifactId>je</artifactId>
         <version>${je.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.zeromq</groupId>
         <artifactId>jeromq</artifactId>
         <version>${jeromq.version}</version>
       </dependency>
-      <!-- Zeroconf advertiser tests -->
+
+      <!-- Zeroconf advertiser tests: -->
       <dependency>
         <groupId>org.jmdns</groupId>
         <artifactId>jmdns</artifactId>
         <version>${jmdns.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.openjdk.jmh</groupId>
         <artifactId>jmh-core</artifactId>
         <version>${jmh.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.openjdk.jmh</groupId>
         <artifactId>jmh-generator-annprocess</artifactId>
         <version>${jmh.version}</version>
       </dependency>
+
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
         <version>${jna.version}</version>
       </dependency>
+
       <dependency>
         <groupId>net.javacrumbs.json-unit</groupId>
         <artifactId>json-unit</artifactId>
         <version>${json-unit.version}</version>
       </dependency>
-      <!-- JUnit 4 API dependency -->
+
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>${junit.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.junit-pioneer</groupId>
         <artifactId>junit-pioneer</artifactId>
         <version>${junit-pioneer.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.kafka</groupId>
         <artifactId>kafka-clients</artifactId>
         <version>${kafka.version}</version>
       </dependency>
-      <dependency>
-        <groupId>io.fabric8</groupId>
-        <artifactId>kubernetes-model</artifactId>
-        <version>${kubernetes-client.version}</version>
-        <!-- This POM bumps these deps to jakartified versions. -->
-        <!-- Using the corresponding `javax.*` deps is safer. -->
-        <exclusions>
-          <exclusion>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
+
       <dependency>
         <groupId>org.lightcouch</groupId>
         <artifactId>lightcouch</artifactId>
         <version>${lightcouch.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.liquibase</groupId>
         <artifactId>liquibase-core</artifactId>
-        <!-- 3.6.0 to 4.3.2 break binary compatibility. -->
         <version>${liquibase.version}</version>
       </dependency>
+
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>${log4j.version}</version>
       </dependency>
+
+      <!-- Tested as a legacy 2.x plugin: -->
       <dependency>
         <groupId>com.github.ivandzf</groupId>
         <artifactId>log4j2-custom-layout</artifactId>
@@ -950,168 +986,198 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <!-- Used for testing JsonTemplateLayout -->
+
+      <!-- Used for testing `JsonTemplateLayout`: -->
       <dependency>
         <groupId>co.elastic.logging</groupId>
         <artifactId>log4j2-ecs-layout</artifactId>
         <version>${log4j2-ecs-layout.version}</version>
       </dependency>
-      <!-- For testing log4j 2 2.x plugins -->
+
+      <!-- Tested as a legacy 2.x plugin: -->
       <dependency>
         <groupId>com.vlkan.log4j2</groupId>
         <artifactId>log4j2-logstash-layout</artifactId>
         <version>${log4j2-logstash-layout.version}</version>
       </dependency>
+
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
         <version>${logback.version}</version>
       </dependency>
+
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
         <version>${logback.version}</version>
         <type>test-jar</type>
       </dependency>
+
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
         <version>${logback.version}</version>
       </dependency>
+
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <type>test-jar</type>
         <version>${logback.version}</version>
+        <type>test-jar</type>
       </dependency>
+
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-core</artifactId>
         <version>${maven.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
         <version>${mockito.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-inline</artifactId>
         <version>${mockito.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-junit-jupiter</artifactId>
         <version>${mockito.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.mongodb</groupId>
         <artifactId>mongodb-driver-legacy</artifactId>
         <version>${mongodb.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.mongodb</groupId>
         <artifactId>mongodb-driver-sync</artifactId>
         <version>${mongodb.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.openjdk.nashorn</groupId>
         <artifactId>nashorn-core</artifactId>
         <version>${nashorn.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.opentest4j</groupId>
         <artifactId>opentest4j</artifactId>
         <version>${opentest4j.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.framework</artifactId>
         <version>${felix.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.eclipse.platform</groupId>
         <artifactId>org.eclipse.osgi</artifactId>
         <version>${org.eclipse.osgi.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>org.eclipse.persistence.jpa</artifactId>
         <version>${org.eclipse.persistence.version}</version>
         <exclusions>
-          <!-- A copy of `javax.persistence:javax.persistence-api` -->
+          <!-- A copy of `javax.persistence:javax.persistence-api`: -->
           <exclusion>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>jakarta.persistence</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.framework</artifactId>
         <version>${osgi.framework.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.resource</artifactId>
         <version>${osgi.resource.version}</version>
       </dependency>
+
       <dependency>
         <groupId>oro</groupId>
         <artifactId>oro</artifactId>
         <version>${oro.version}</version>
       </dependency>
-      <!-- OSGI testing -->
+
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam</artifactId>
         <version>${pax-exam.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-native</artifactId>
         <version>${pax-exam.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-junit4</artifactId>
         <version>${pax-exam.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-link-assembly</artifactId>
         <version>${pax-exam.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-spi</artifactId>
         <version>${pax-exam.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
         <version>${plexus-utils.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-ext</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.sun.mail</groupId>
         <artifactId>smtp</artifactId>
         <version>${jakarta-mail.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot</artifactId>
         <version>${spring-boot.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-test</artifactId>
@@ -1123,55 +1189,57 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>uk.org.webcompere</groupId>
         <artifactId>system-stubs-core</artifactId>
         <version>${system-stubs.version}</version>
       </dependency>
-      <!-- Environment and system properties support for Jupiter -->
+
+      <!-- Environment and system properties support for JUnit Jupiter: -->
       <dependency>
         <groupId>uk.org.webcompere</groupId>
         <artifactId>system-stubs-jupiter</artifactId>
         <version>${system-stubs.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.tomcat</groupId>
         <artifactId>tomcat-juli</artifactId>
         <version>${tomcat-juli.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.graalvm.truffle</groupId>
         <artifactId>truffle-api</artifactId>
         <version>${graalvm.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
         <version>${velocity.version}</version>
       </dependency>
-      <!-- Used for testing HttpAppender -->
+
+      <!-- Used for testing `HttpAppender`: -->
       <dependency>
         <groupId>com.github.tomakehurst</groupId>
         <artifactId>wiremock-jre8</artifactId>
         <version>${wiremock.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>com.github.jknack</groupId>
-            <artifactId>handlebars-helpers</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
+
       <dependency>
         <groupId>com.fasterxml.woodstox</groupId>
         <artifactId>woodstox-core</artifactId>
         <version>${woodstox.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-core</artifactId>
         <version>${xmlunit.version}</version>
-        <!-- This POM bumps these deps to jakartified versions. -->
-        <!-- Using the corresponding `javax.*` deps is safer. -->
+        <!-- This POM bumps these deps to Jakartified versions.
+             Using the corresponding `javax.*` deps is safer. -->
         <exclusions>
           <exclusion>
             <groupId>jakarta.xml.bind</groupId>
@@ -1179,62 +1247,61 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-matchers</artifactId>
         <version>${xmlunit.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.tukaani</groupId>
         <artifactId>xz</artifactId>
         <version>${xz.version}</version>
       </dependency>
+
     </dependencies>
   </dependencyManagement>
+
   <build>
     <defaultGoal>clean install</defaultGoal>
+
     <pluginManagement>
+
       <plugins>
+
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>${build-helper-maven-plugin.version}</version>
         </plugin>
+
+        <!-- used by `log4j-distribution` module which is enabled via `apache-release` profile: -->
         <plugin>
           <groupId>net.nicoulaj.maven.plugins</groupId>
           <artifactId>checksum-maven-plugin</artifactId>
           <version>${checksum-maven-plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.eluder.coveralls</groupId>
-          <artifactId>coveralls-maven-plugin</artifactId>
-          <version>${coveralls-maven-plugin.version}</version>
-        </plugin>
+
+        <!-- used by `docker` profile in `log4j-layout-template-json-test`: -->
         <plugin>
           <groupId>io.fabric8</groupId>
           <artifactId>docker-maven-plugin</artifactId>
           <version>${docker-maven-plugin.version}</version>
         </plugin>
+
         <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco-maven-plugin.version}</version>
-          <executions>
-            <execution>
-                <id>prepare-agent</id>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-            </execution>
-            <execution>
-              <id>default-report</id>
-              <phase>prepare-package</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-            </execution>
-          </executions>
+          <groupId>org.ops4j.pax.exam</groupId>
+          <artifactId>exam-maven-plugin</artifactId>
+          <version>${exam-maven-plugin.version}</version>
         </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>${exec-maven-plugin.version}</version>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
@@ -1250,15 +1317,13 @@
             </execution>
           </executions>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>${maven-checkstyle-plugin.version}</version>
-          <configuration>
-            <excludes>**/module-info.java</excludes>
-          </configuration>
         </plugin>
-        <!-- some nice default compiler options -->
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -1269,10 +1334,8 @@
             <compilerArgs>
               <arg>-XDcompilePolicy=simple</arg>
               <arg>-Xplugin:ErrorProne</arg>
-              <!--
-              https://errorprone.info/docs/installation
-              in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals that errorprone needs
-              -->
+              <!-- JEP 396 shipped with Java 16 encapsulates internals that Error Prone needs.
+                   For details, see https://errorprone.info/docs/installation -->
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
@@ -1302,20 +1365,16 @@
             </annotationProcessorPaths>
           </configuration>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <version>${maven-dependency-plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-doap-plugin</artifactId>
-          <version>${maven-doap-plugin.version}</version>
-        </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <!-- version inherited from ASF parent POM -->
           <executions>
             <execution>
               <id>default-jar</id>
@@ -1341,41 +1400,37 @@
             </execution>
           </executions>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <configuration>
             <bottom>&lt;p align="center"&gt;Copyright &amp;#169; {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.&lt;br /&gt;
-            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache Logging project logo,
-            and the Apache Log4j logo are trademarks of The Apache Software Foundation.&lt;/p&gt;</bottom>
-            <additionalparam>${javadoc.opts}</additionalparam>
+              Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache Logging project logo,
+              and the Apache Log4j logo are trademarks of The Apache Software Foundation.&lt;/p&gt;</bottom>
+            <doclint>none</doclint>
+            <skip>${javadoc.skip}</skip>
           </configuration>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jxr-plugin</artifactId>
           <version>${maven-jxr-plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pdf-plugin</artifactId>
-          <version>${maven-pdf-plugin.version}</version>
-        </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
           <version>${maven-pmd-plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.bsc.maven</groupId>
-          <artifactId>maven-processor-plugin</artifactId>
-          <version>5.0-rc1</version>
-        </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-plugin</artifactId>
           <version>${maven-scm-plugin.version}</version>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
@@ -1391,87 +1446,45 @@
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>exec-maven-plugin</artifactId>
-          <version>${exec-maven-plugin.version}</version>
-        </plugin>
+
         <plugin>
           <groupId>net.sourceforge.maven-taglib</groupId>
           <artifactId>maven-taglib-plugin</artifactId>
           <version>${maven-taglib-plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.revapi</groupId>
-          <artifactId>revapi-maven-plugin</artifactId>
-          <version>${revapi-maven-plugin.version}</version>
-        </plugin>
+
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
           <version>${spotbugs-maven-plugin.version}</version>
-          <dependencies>
-            <!-- overwrite dependency on spotbugs if you want to specify the version of spotbugs -->
-            <dependency>
-              <groupId>com.github.spotbugs</groupId>
-              <artifactId>spotbugs</artifactId>
-              <version>${spotbugs.version}</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <plugins>
-              <plugin>
-                <groupId>com.h3xstream.findsecbugs</groupId>
-                <artifactId>findsecbugs-plugin</artifactId>
-                <version>${findsecbugs-plugin.version}</version>
-              </plugin>
-            </plugins>
-            <excludeFilterFile>${log4jParentDir}/spotbugs-exclude-filter.xml</excludeFilterFile>
-            <fork>true</fork>
-            <jvmArgs>-Duser.language=en</jvmArgs>
-            <effort>Default</effort>
-            <threshold>Normal</threshold>
-          </configuration>
         </plugin>
+
         <plugin>
           <groupId>com.diffplug.spotless</groupId>
           <artifactId>spotless-maven-plugin</artifactId>
           <version>${spotless-maven-plugin.version}</version>
-          <configuration>
-            <!-- Check last 32 commits -->
-            <ratchetFrom>HEAD~31</ratchetFrom>
-            <java>
-              <licenseHeader>
-                <file>${log4jParentDir}/checkstyle-header.txt</file>
-              </licenseHeader>
-
-              <!-- Whitespace -->
-              <trimTrailingWhitespace/>
-              <endWithNewline/>
-              <indent>
-                <spaces>true</spaces>
-                <spacesPerTab>4</spacesPerTab>
-              </indent>
-
-              <!-- Imports -->
-              <importOrder>
-                <order>java,org,com,\#</order>
-              </importOrder>
-            </java>
-          </configuration>
         </plugin>
+
       </plugins>
     </pluginManagement>
+
     <plugins>
-      <!-- RAT report -->
+
+      <!-- Apache RAT (Release Audit Tool) check to verify licenses.
+           `apache-rat-plugin`: https://creadur.apache.org/rat/apache-rat-plugin/
+           Release Audit Tool: https://creadur.apache.org/rat/index.html -->
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <consoleOutput>true</consoleOutput>
           <excludes>
+            <exclude>**/target/**/*</exclude>
             <!-- Matches other RAT configurations in this POM -->
             <exclude>src/main/resources/META-INF/services/**/*</exclude>
+            <!-- IntelliJ files -->
+            <exclude>.idea/**/*</exclude>
+            <exclude>**/*.iml</exclude>
             <exclude>src/test/resources/**/*</exclude>
             <!-- IDE settings imports -->
             <exclude>src/ide/**</exclude>
@@ -1480,8 +1493,6 @@
             <!-- jQuery is MIT-licensed, but RAT can't figure it out -->
             <exclude>src/site/resources/js/jquery.js</exclude>
             <exclude>src/site/resources/js/jquery.min.js</exclude>
-            <!-- highlight.js is BSD3-licensed -->
-            <exclude>src/site/resources/js/highlight.pack.js</exclude>
             <!-- Generated files -->
             <exclude>log4j-distribution/target/**/*</exclude>
             <exclude>log4j-distribution/.project</exclude>
@@ -1489,9 +1500,10 @@
             <exclude>**/.toDelete</exclude>
             <exclude>velocity.log</exclude>
             <!-- Other -->
-            <exclude>.java-version</exclude>
             <exclude>felix-cache/**</exclude>
-            <exclude>**/*.md</exclude>
+            <exclude>**/README.md</exclude>
+            <exclude>SECURITY.md</exclude>
+            <exclude>.java-version</exclude>
             <exclude>**/*.yml</exclude>
             <exclude>**/*.yaml</exclude>
             <exclude>**/*.json</exclude>
@@ -1500,7 +1512,6 @@
             <exclude>**/rabbitmq.config</exclude>
             <exclude>**/MANIFEST.MF</exclude>
             <exclude>.surefire-*</exclude>
-            <exclude>src/changelog/**</exclude>
           </excludes>
         </configuration>
         <executions>
@@ -1512,6 +1523,7 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -1521,69 +1533,94 @@
             <goals>
               <goal>timestamp-property</goal>
             </goals>
-            <phase>pre-site</phase>
+            <phase>initialize</phase>
             <configuration>
               <name>currentYear</name>
               <pattern>yyyy</pattern>
+              <locale>en_US</locale>
             </configuration>
           </execution>
         </executions>
       </plugin>
+
+      <!-- Ensure that version for each dependency resolved during a build, is equal to or higher than all transitive dependency declarations.
+           A failure here requires adding the dependency to the dependency management. -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-      </plugin>
-      <!-- DOAP (RDF) metadata generation -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-doap-plugin</artifactId>
-        <configuration>
-          <doapOptions>
-            <programmingLanguage>Java</programmingLanguage>
-            <category>library</category>
-          </doapOptions>
-          <asfExtOptions>
-            <charter>
-              The Apache Logging Services Project creates and maintains open-source software related to the logging of
-              application behavior and released at no charge to the public.
-            </charter>
-            <pmc>https://logging.apache.org</pmc>
-          </asfExtOptions>
-          <skip>${maven.doap.skip}</skip>
-        </configuration>
+        <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
           <execution>
-            <id>site</id>
-            <phase>site</phase>
+            <id>enforce-upper-bound-deps</id>
             <goals>
-              <goal>generate</goal>
+              <goal>enforce</goal>
             </goals>
+            <configuration>
+              <rules>
+                <requireUpperBoundDeps/>
+              </rules>
+            </configuration>
           </execution>
         </executions>
       </plugin>
-      <!-- Check if transitive dependencies resolve to the highest required version -->
-      <!-- A failure here requires adding the dep to dependency management -->
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>enforce-upper-bound-deps</id>
+            <id>default-spotless</id>
             <goals>
-              <goal>enforce</goal>
+              <goal>check</goal>
             </goals>
-            <configuration>
-              <rules>
-                <enforceUpperBoundDeps/>
-              </rules>
-            </configuration>
           </execution>
         </executions>
+        <configuration>
+          <ratchetFrom>HEAD~31</ratchetFrom>
+          <java>
+            <licenseHeader>
+              <file>${log4jParentDir}/checkstyle-header.txt</file>
+            </licenseHeader>
+            <trimTrailingWhitespace/>
+            <endWithNewline/>
+            <indent>
+              <spaces>true</spaces>
+              <spacesPerTab>4</spacesPerTab>
+            </indent>
+            <importOrder>
+              <order>java,org,com,\#</order>
+            </importOrder>
+          </java>
+        </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <configuration>
+          <plugins>
+            <plugin>
+              <groupId>com.h3xstream.findsecbugs</groupId>
+              <artifactId>findsecbugs-plugin</artifactId>
+              <version>${findsecbugs-plugin.version}</version>
+            </plugin>
+          </plugins>
+          <excludeFilterFile>${log4jParentDir}/findbugs-exclude-filter.xml</excludeFilterFile>
+          <fork>true</fork>
+          <effort>Default</effort>
+          <threshold>Normal</threshold>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
@@ -1605,26 +1642,33 @@
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pdf-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>pdf</id>
-            <phase>site</phase>
-            <goals>
-              <goal>pdf</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <java.awt.headless>true</java.awt.headless>
+          </systemPropertyVariables>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+        </configuration>
       </plugin>
+
+      <!-- ███████ ████████  █████  ██████  ████████        ███████ ██ ████████ ███████
+           ██         ██    ██   ██ ██   ██    ██    ██     ██      ██    ██    ██
+           ███████    ██    ███████ ██████     ██           ███████ ██    ██    █████
+                ██    ██    ██   ██ ██   ██    ██    ██          ██ ██    ██    ██
+           ███████    ██    ██   ██ ██   ██    ██           ███████ ██    ██    ███████
+
+           This section consists of plugins responsible for generating the site.
+           Note that only parent is supposed to have a `site` goal, it is skipped for modules! -->
+
       <!-- export AsciiDoc-formatted sources to `target/generated-sources/site/asciidoc/changelog` -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <inherited>false</inherited>
         <executions>
           <execution>
             <id>changelog-export</id>
@@ -1661,9 +1705,12 @@
           </dependency>
         </dependencies>
       </plugin>
+
+      <!-- copy `src/site` to `target/generated-sources/site` -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
+        <inherited>false</inherited>
         <executions>
           <!-- copy `src/site` to `target/generated-sources/site` -->
           <execution>
@@ -1687,18 +1734,15 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <!-- version inherited from ASF parent POM -->
-        <dependencies>
-          <dependency>
-            <groupId>org.asciidoctor</groupId>
-            <artifactId>asciidoctor-maven-plugin</artifactId>
-            <version>${asciidoctor-maven-plugin.version}</version>
-          </dependency>
-        </dependencies>
-        <configuration>
+        <inherited>false</inherited>
+        <configuration combine.self="override">
+          <skip>false</skip>
+          <generateProjectInfo>false</generateProjectInfo>
+          <generateReports>false</generateReports>
           <siteDirectory>${project.build.directory}/generated-sources/site</siteDirectory>
           <!-- only build English site even on other language OS -->
           <locales>en</locales>
@@ -1715,199 +1759,28 @@
             </attributes>
           </asciidoc>
         </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-spotless</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <java.awt.headless>true</java.awt.headless>
-          </systemPropertyVariables>
-          <forkCount>1</forkCount>
-          <reuseForks>false</reuseForks>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <runOrder>failedfirst</runOrder>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.revapi</groupId>
-        <artifactId>revapi-maven-plugin</artifactId>
         <dependencies>
           <dependency>
-            <groupId>org.revapi</groupId>
-            <artifactId>revapi-java</artifactId>
-            <version>${revapi.version}</version>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctor-maven-plugin</artifactId>
+            <version>${asciidoctor-maven-plugin.version}</version>
           </dependency>
         </dependencies>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <checkDependencies>false</checkDependencies>
-              <skip>${revapi.skip}</skip>
-              <failOnMissingConfigurationFiles>false</failOnMissingConfigurationFiles>
-              <analysisConfigurationFiles>
-                <path>revapi.json</path>
-              </analysisConfigurationFiles>
-              <analysisConfiguration>
-[
-  {
-     "extension": "revapi.java",
-     "configuration": {
-       "missing-classes": {
-         "behavior": "report",
-         "ignoreMissingAnnotations": false
-       },
-       "reportUsesFor": [
-          "java.missing.newClass",
-          "java.class.nonPublicPartOfAPI"
-       ],
-       "filter": {
-         "classes": {
-           "regex": true,
-           "include": [
-             "org\\.apache\\.logging\\.log4j(\\..+)?"
-           ]
-         },
-         "packages": {
-           "regex": true,
-           "include": [
-             "org\\.apache\\.logging\\.log4j(\\..+)?"
-           ]
-         }
-       }
-     }
-  }
-]
-              </analysisConfiguration>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
+
+      <!-- ███████ ███    ██ ██████         ███████ ██ ████████ ███████
+           ██      ████   ██ ██   ██ ██     ██      ██    ██    ██
+           █████   ██ ██  ██ ██   ██        ███████ ██    ██    █████
+           ██      ██  ██ ██ ██   ██ ██          ██ ██    ██    ██
+           ███████ ██   ████ ██████         ███████ ██    ██    ███████ -->
+
     </plugins>
+
   </build>
-  <reporting>
-    <plugins>
-      <!-- RAT report -->
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <!-- version inherited from ASF parent POM -->
-        <configuration>
-          <consoleOutput>true</consoleOutput>
-          <excludes>
-            <!-- Matches other RAT configurations in this POM -->
-            <exclude>src/main/resources/META-INF/services/**/*</exclude>
-            <!-- IntelliJ files -->
-            <exclude>.idea/**/*</exclude>
-            <exclude>src/test/resources/**/*</exclude>
-            <!-- IDE settings imports -->
-            <exclude>src/ide/**</exclude>
-            <!-- does it even make sense to apply a license to a GPG signature? -->
-            <exclude>**/*.asc</exclude>
-            <!-- jQuery is MIT-licensed, but RAT can't figure it out -->
-            <exclude>src/site/resources/js/jquery.js</exclude>
-            <exclude>src/site/resources/js/jquery.min.js</exclude>
-            <!-- highlight.js is BSD3-licensed -->
-            <exclude>src/site/resources/js/highlight.pack.js</exclude>
-            <!-- Generated files -->
-            <exclude>log4j-distribution/target/**/*</exclude>
-            <exclude>log4j-distribution/.project</exclude>
-            <exclude>log4j-distribution/.settings/**</exclude>
-            <exclude>**/.toDelete</exclude>
-            <exclude>velocity.log</exclude>
-            <!-- Other -->
-            <exclude>felix-cache/**</exclude>
-            <exclude>**/*.md</exclude>
-            <exclude>**/*.yml</exclude>
-            <exclude>**/*.yaml</exclude>
-            <exclude>**/*.json</exclude>
-            <excllude>**/images/*.drawio</excllude>
-            <exclude>**/fluent-bit.conf</exclude>
-            <exclude>**/rabbitmq.config</exclude>
-            <exclude>**/MANIFEST.MF</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <!-- version inherited from ASF parent POM -->
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>index</report>
-              <report>dependencies</report>
-              <report>dependency-info</report>
-              <report>dependency-convergence</report>
-              <report>dependency-management</report>
-              <report>team</report>
-              <report>mailing-lists</report>
-              <report>issue-management</report>
-              <report>licenses</report>
-              <report>scm</report>
-              <report>summary</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-        <configuration>
-          <!-- you'd think these would be the defaults, right? -->
-          <customBundle>${project.basedir}/src/site/custom/project-info-report.properties</customBundle>
-          <webAccessUrl>${project.scm.url}</webAccessUrl>
-          <anonymousConnection>${project.scm.connection}</anonymousConnection>
-          <developerConnection>${project.scm.developerConnection}</developerConnection>
-          <scmTag>log4j-${Log4jReleaseVersion}</scmTag>
-        </configuration>
-      </plugin>
-      <!-- Surefire report -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <!-- version specified in ASF parent POM through `surefire.version` -->
-        <reportSets>
-          <reportSet>
-            <id>integration-tests</id>
-            <reports>
-              <report>failsafe-report-only</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.revapi</groupId>
-        <artifactId>revapi-maven-plugin</artifactId>
-        <version>${revapi-maven-plugin.version}</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
+
   <distributionManagement>
     <downloadUrl>https://logging.apache.org/log4j/2.x/download.html</downloadUrl>
-    <!-- site is only included to make maven-site-plugin stop complaining -->
+    <!-- `site` is only included to make `maven-site-plugin` stop complaining: -->
     <site>
       <id>www.example.com</id>
       <url>scp://www.example.com/www/docs/project/</url>
@@ -1915,6 +1788,8 @@
     <!-- `repository` from ASF parent POM (id: apache.releases.https) -->
     <!-- `snapshotRepository` from ASF parent POM (id: apache.snapshots.https) -->
   </distributionManagement>
+
+  <!-- Modules in alphabetical order: -->
   <modules>
     <module>log4j-1.2-api</module>
     <module>log4j-api</module>
@@ -1927,6 +1802,9 @@
     <module>log4j-core-test</module>
     <module>log4j-couchdb</module>
     <module>log4j-csv</module>
+    <!-- `log4j-distribution` is excluded to speed up the build.
+         It is only needed while creating a release.
+         It is enabled by the `apache-release` profile defined below. -->
     <module>log4j-docker</module>
     <module>log4j-flume-ng</module>
     <module>log4j-gctests</module>
@@ -1971,31 +1849,10 @@
     <module>log4j-to-slf4j</module>
     <module>log4j-web</module>
   </modules>
+
   <profiles>
-    <profile>
-      <id>pdf</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-pdf-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>pdf</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>pdf</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- populate `src/changelog/<releaseVersion>` from `src/changelog/.<releaseVersionMajor>.x.x` -->
+
+    <!-- Shortcut to populate `src/changelog/<releaseVersion>` from `src/changelog/.<releaseVersionMajor>.x.x` -->
     <profile>
       <id>changelog-releaser</id>
       <build>
@@ -2044,6 +1901,8 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- shortcut to enable `log4j-distribution` module creating the release distribution containing artifacts, sources, etc. -->
     <profile>
       <id>apache-release</id>
       <build>
@@ -2065,116 +1924,7 @@
         <module>log4j-distribution</module>
       </modules>
     </profile>
-    <profile>
-      <id>rat</id>
-      <build>
-        <plugins>
-          <!-- RAT report -->
-          <plugin>
-            <groupId>org.apache.rat</groupId>
-            <artifactId>apache-rat-plugin</artifactId>
-            <!-- version inherited from ASF parent POM -->
-            <configuration>
-              <consoleOutput>true</consoleOutput>
-              <excludes>
-                <!-- Matches other RAT configurations in this POM -->
-                <exclude>src/main/resources/META-INF/services/**/*</exclude>
-                <!-- IntelliJ files -->
-                <exclude>.idea/**/*</exclude>
-                <exclude>src/test/resources/**/*</exclude>
-                <!-- IDE settings imports -->
-                <exclude>src/ide/**</exclude>
-                <!-- does it even make sense to apply a license to a GPG signature? -->
-                <exclude>**/*.asc</exclude>
-                <!-- jQuery is MIT-licensed, but RAT can't figure it out -->
-                <exclude>src/site/resources/js/jquery.js</exclude>
-                <exclude>src/site/resources/js/jquery.min.js</exclude>
-                <!-- highlight.js is BSD3-licensed -->
-                <exclude>src/site/resources/js/highlight.pack.js</exclude>
-                <!-- Generated files -->
-                <exclude>log4j-distribution/target/**/*</exclude>
-                <exclude>log4j-distribution/.project</exclude>
-                <exclude>log4j-distribution/.settings/**</exclude>
-                <exclude>**/.toDelete</exclude>
-                <exclude>velocity.log</exclude>
-                <!-- Other -->
-                <exclude>felix-cache/**</exclude>
-                <exclude>**/*.md</exclude>
-                <exclude>**/*.yml</exclude>
-                <exclude>**/*.yaml</exclude>
-                <exclude>**/*.json</exclude>
-                <exclude>**/images/*.drawio</exclude>
-                <exclude>**/fluent-bit.conf</exclude>
-                <exclude>**/rabbitmq.config</exclude>
-                <exclude>**/MANIFEST.MF</exclude>
-              </excludes>
-            </configuration>
-            <!-- Turn this one once it passes, not before.
-            <executions>
-              <execution>
-                <phase>verify</phase>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-            -->
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <!-- http://www.yourkit.com/docs/80/help/agent.jsp -->
-      <id>yourkit-mac</id>
-      <!--
-      <activation>
-        <os>
-          <family>Mac</family>
-        </os>
-        <file>
-          <exists>${yourkit.home}/bin/mac/libyjpagent.jnilib</exists>
-        </file>
-      </activation>
-      -->
-      <properties>
-        <yourkit.home>/Applications/YJP.app</yourkit.home>
-      </properties>
-      <dependencies>
-        <dependency>
-          <groupId>com.yourkit</groupId>
-          <artifactId>yjp-controller-api-redist</artifactId>
-          <version>2013</version>
-          <scope>system</scope>
-          <systemPath>${yourkit.home}/lib/yjp-controller-api-redist.jar</systemPath>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <configuration>
-              <argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib"</argLine>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib"</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>java8-doclint-disabled</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <javadoc.opts>-Xdoclint:none</javadoc.opts>
-      </properties>
-    </profile>
+
     <profile>
       <id>enable-plugin-annotation-processor</id>
       <activation>
@@ -2185,6 +1935,7 @@
       <build>
         <plugins>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
               <annotationProcessorPaths combine.children="append">
@@ -2199,5 +1950,7 @@
         </plugins>
       </build>
     </profile>
+
   </profiles>
+
 </project>
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index 63cb17b069..30ddf42e19 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -123,8 +123,7 @@ link:manual/compatiblity.html[Log4j 2 Compatiblity with Log4j 1] for more inform
 
 == Documentation
 
-The Log4j 2 User's Guide is available on this link:manual/index.html[site] or as a downloadable
-link:log4j-users-guide.pdf[PDF].
+The Log4j 2 User's Guide is available on this link:manual/index.html[site].
 
 == Requirements
 
diff --git a/src/site/custom/project-info-report.properties b/src/site/custom/project-info-report.properties
deleted file mode 100644
index 1a8b636d3a..0000000000
--- a/src/site/custom/project-info-report.properties
+++ /dev/null
@@ -1,333 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-report.cim.access                                                  = Access
-report.cim.anthill.intro                                           = This project uses {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
-report.cim.bamboo.intro                                            = This project uses {Bamboo, http://www.atlassian.com/software/bamboo/}.
-report.cim.buildforge.intro                                        = This project uses {Build Forge, http://www-306.ibm.com/software/awdtools/buildforge/enterprise/}.
-report.cim.continuum.intro                                         = This project uses {Continuum, http://continuum.apache.org/}.
-report.cim.cruisecontrol.intro                                     = This project uses {CruiseControl, http://cruisecontrol.sourceforge.net/}.
-report.cim.description                                             = This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.
-report.cim.general.intro                                           = This project uses Continuous Integration System.
-report.cim.hudson.intro                                            = This project uses {Hudson, http://hudson-ci.org/}.
-report.cim.jenkins.intro                                           = This project uses {Jenkins, http://jenkins-ci.org/}.
-report.cim.luntbuild.intro                                         = This project uses {Luntbuild, http://luntbuild.javaforge.com/}.
-report.cim.travis.intro                                            = This project uses {Travis CI, https://travis-ci.org/}.
-report.cim.name                                                    = Continuous Integration
-report.cim.nocim                                                   = No continuous integration management system is defined. Please check back at a later date.
-report.cim.notifiers.column.address                                = Address
-report.cim.notifiers.column.configuration                          = Configuration
-report.cim.notifiers.column.type                                   = Type
-report.cim.notifiers.intro                                         = Configuration for notifying developers/users when a build is unsuccessful, including user information and notification mode.
-report.cim.notifiers.nolist                                        = No notifiers are defined. Please check back at a later date.
-report.cim.notifiers.title                                         = Notifiers
-report.cim.nourl                                                   = No url to the continuous integration system is defined.
-report.cim.overview.title                                          = Overview
-report.cim.title                                                   = Continuous Integration
-report.cim.url                                                     = The following is a link to the continuous integration system used by the project:
-report.dependencies.column.artifactId                              = ArtifactId
-report.dependencies.column.classifier                              = Classifier
-report.dependencies.column.description                             = Description
-report.dependencies.column.groupId                                 = GroupId
-report.dependencies.column.license                                 = License
-report.dependencies.column.optional                                = Optional
-report.dependencies.column.isOptional                              = Yes
-report.dependencies.column.isNotOptional                           = No
-report.dependencies.column.type                                    = Type
-report.dependencies.column.url                                     = URL
-report.dependencies.column.version                                 = Version
-report.dependencies.description                                    = This document lists the project's dependencies and provides information on each dependency.
-report.dependencies.file.details.cell.debuginformation.yes         = Yes
-report.dependencies.file.details.cell.debuginformation.no          = No
-report.dependencies.file.details.column.classes                    = Classes
-report.dependencies.file.details.column.debuginformation           = Debug Information
-report.dependencies.file.details.column.entries                    = Entries
-report.dependencies.file.details.column.file                       = Filename
-report.dependencies.file.details.column.javaVersion                = Java Version
-report.dependencies.file.details.column.packages                   = Packages
-report.dependencies.file.details.column.sealed                     = Sealed
-report.dependencies.file.details.column.size                       = Size
-report.dependencies.file.details.column.size.gb                    = GB
-report.dependencies.file.details.column.size.mb                    = MB
-report.dependencies.file.details.column.size.kb                    = kB
-report.dependencies.file.details.columntitle.debuginformation      = Indicates whether these dependencies have been compiled with debug information.
-report.dependencies.file.details.title                             = Dependency File Details
-report.dependencies.file.details.total                             = Total
-report.dependencies.graph.tables.licenses                          = Licenses
-report.dependencies.graph.tables.unknown                           = Unknown
-report.dependencies.graph.title                                    = Project Dependency Graph
-report.dependencies.graph.tree.title                               = Dependency Tree
-report.dependencies.intro.compile                                  = The following is a list of compile dependencies for this project. These dependencies are required to compile and run the application:
-report.dependencies.intro.provided                                 = The following is a list of provided dependencies for this project. These dependencies are required to compile the application, but should be provided by default when using the library:
-report.dependencies.intro.runtime                                  = The following is a list of runtime dependencies for this project. These dependencies are required to run the application:
-report.dependencies.intro.system                                   = The following is a list of system dependencies for this project. These dependencies are required to compile the application:
-report.dependencies.intro.test                                     = The following is a list of test dependencies for this project. These dependencies are only required to compile and run unit tests for the application:
-report.dependencies.name                                           = Dependencies
-report.dependencies.nolist                                         = There are no dependencies for this project. It is a standalone application that does not depend on any other project.
-report.dependencies.repo.locations.artifact.breakdown              = Repository locations for each of the Dependencies.
-report.dependencies.repo.locations.cell.release.disabled           = No
-report.dependencies.repo.locations.cell.release.enabled            = Yes
-report.dependencies.repo.locations.cell.snapshot.disabled          = No
-report.dependencies.repo.locations.cell.snapshot.enabled           = Yes
-report.dependencies.repo.locations.cell.blacklisted.disabled       = No
-report.dependencies.repo.locations.cell.blacklisted.enabled        = Yes
-report.dependencies.repo.locations.column.artifact                 = Artifact
-report.dependencies.repo.locations.column.blacklisted              = Blacklisted
-report.dependencies.repo.locations.column.release                  = Release
-report.dependencies.repo.locations.column.repoid                   = Repo ID
-report.dependencies.repo.locations.column.snapshot                 = Snapshot
-report.dependencies.repo.locations.column.url                      = URL
-report.dependencies.repo.locations.title                           = Dependency Repository Locations
-report.dependencies.title                                          = Project Dependencies
-report.dependencies.unnamed                                        = Unnamed
-report.dependencies.transitive.intro                               = The following is a list of transitive dependencies for this project. Transitive dependencies are the dependencies of the project dependencies.
-report.dependencies.transitive.nolist                              = No transitive dependencies are required for this project.
-report.dependencies.transitive.title                               = Project Transitive Dependencies
-report.dependency-convergence.convergence.caption                  = Dependencies used in modules
-report.dependency-convergence.convergence.single.caption           = Dependencies used in this project
-report.dependency-convergence.description                          = This document presents the convergence of dependency versions across the entire project, and its sub modules.
-report.dependency-convergence.legend                               = Legend:
-report.dependency-convergence.legend.different                     = At least one dependency has a differing version of the dependency or has SNAPSHOT dependencies.
-report.dependency-convergence.legend.shared                        = All modules/dependencies share one version of the dependency.
-report.dependency-convergence.name                                 = Dependency Convergence
-report.dependency-convergence.reactor.name                         = Reactor Dependency Convergence
-report.dependency-convergence.reactor.title                        = Reactor Dependency Convergence
-report.dependency-convergence.stats.artifacts                      = Number of unique artifacts (NOA):
-report.dependency-convergence.stats.caption                        = Statistics:
-report.dependency-convergence.stats.convergence                    = Convergence (NOD/NOA):
-report.dependency-convergence.stats.dependencies                   = Number of dependencies (NOD):
-report.dependency-convergence.stats.readyrelease                   = Ready for release (100 % convergence and no SNAPSHOTS):
-report.dependency-convergence.stats.readyrelease.error             = Error
-report.dependency-convergence.stats.readyrelease.error.convergence = You do not have 100 % convergence.
-report.dependency-convergence.stats.readyrelease.error.snapshots   = You have SNAPSHOT dependencies.
-report.dependency-convergence.stats.readyrelease.success           = Success
-report.dependency-convergence.stats.conflicting                    = Number of version-conflicting artifacts (NOC):
-report.dependency-convergence.stats.snapshots                      = Number of SNAPSHOT artifacts (NOS):
-report.dependency-convergence.stats.modules                        = Number of modules:
-report.dependency-convergence.title                                = Dependency Convergence
-report.dependency-info.name                                        = Dependency Information
-report.dependency-info.title                                       = Dependency Information
-report.dependency-info.description                                 = This document describes how to to include this project as a dependency using various dependency management tools.
-report.index.nodescription                                         = There is currently no description associated with this project.
-report.index.title                                                 = About
-report.issuetracking.bugzilla.intro                                = This project uses {Bugzilla, http://www.bugzilla.org/}.
-report.issuetracking.custom.intro                                  = This project uses %issueManagementSystem% to manage its issues.
-report.issuetracking.description                                   = This document provides information on the issue management system used in this project.
-report.issuetracking.general.intro                                 = This project uses an Issue Management System to manage its issues.
-report.issuetracking.intro                                         = Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.
-report.issuetracking.jira.intro                                    = This project uses {JIRA, http://www.atlassian.com/software/jira}.
-report.issuetracking.name                                          = Issue Tracking
-report.issuetracking.noissueManagement                             = No issue management system is defined. Please check back at a later date.
-report.issuetracking.overview.title                                = Overview
-report.issuetracking.scarab.intro                                  = This project uses {Scarab, http://scarab.tigris.org/}.
-report.issuetracking.title                                         = Issue Tracking
-report.license.description                                         = This document lists the project license(s).
-report.license.multiple                                            = This project is provided under multiple licenses:
-report.license.name                                                = Project License
-report.license.nolicense                                           = No license is defined for this project.
-report.license.overview.intro                                      = Typically the licenses listed for the project are that of the project itself, and not of dependencies.
-report.license.overview.title                                      = Overview
-report.license.originalText                                        = [Original text]
-report.license.copy                                                = Copy of the license follows:
-report.license.title                                               = Project License
-report.license.unnamed                                             = Unnamed
-report.mailing-lists.column.archive                                = Archive
-report.mailing-lists.column.name                                   = Name
-report.mailing-lists.column.otherArchives                          = Other Archives
-report.mailing-lists.column.post                                   = Post
-report.mailing-lists.column.subscribe                              = Subscribe
-report.mailing-lists.column.unsubscribe                            = Unsubscribe
-report.mailing-lists.description                                   = This document provides subscription and archive information for this project's mailing lists.
-report.mailing-lists.intro                                         = We welcome you to join our mailing lists and let us know about your thoughts or ideas about Apache Log4j. \
-                                                                     <p>Note: These are public mailing lists and anything posted to these lists is archived and is visible to the public, \
-                                                                     indexed by search engines, etc. Posts can only be removed in extraordinary circumstances, in accordance with Apache's <a href="http://www.apache.org/foundation/public-archives.html" class="externalLink">Public Forum Archive Policy</a>.\
-                                                                     </p>\
-                                                                     <p>\
-                                                                     These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p>\
-                                                                             <p>\
-                                                                                 Questions related to the usage of Log4j components should be posted to the \
-                                                                                 <a href="http://mail-archives.apache.org/mod_mbox/logging-log4j-user/" class="externalLink">User List</a>. \
-                                                                                 <br>\
-                                                                                 The <a href="http://mail-archives.apache.org/mod_mbox/logging-log4j-dev/" class="externalLink">Developer List</a> \
-                                                                                 is for questions and discussion related to the development of Commons components.\
-                                                                                 <br>\
-                                                                                 Please do not cross-post; developers are also subscribed to the user list. \
-                                                                                 Read the archives first in case your question has already been answered. \
-                                                                                 If not, then subscribe to the appropriate list and post your question. \
-                                                                             </p>\
-                                                                             <p>
-                                                                                 <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists. \
-                                                                                 Patches are best handled via the <i>Issue Tracking</i> system. \
-                                                                                 Otherwise, please upload the file to a public server and include the URL in the mail. \
-                                                                             </p>\
-                                                                             <p>\
-                                                                                 Please read the <a href="http://www.apache.org/foundation/public-archives.html" class="externalLink">Public Forum Archive Policy</a> \
-                                                                                 and <a href="http://www.apache.org/dev/contrib-email-tips.html" class="externalLink">Tips for email contributors</a>. \
-                                                                                 <br>\
-                                                                                 For further information on Apache mailing lists please read \
-                                                                                 <a href="http://www.apache.org/foundation/mailinglists.html" class="externalLink">General mailing list information</a> \
-                                                                                 in particular the section entitled\
-                                                                                 <a href="http://www.apache.org/foundation/mailinglists.html#subscribe" class="externalLink">Subscribing and Unsubscribing</a>\
-                                                                             </p>
-report.mailing-lists.name                                          = Mailing Lists
-report.mailing-lists.nolist                                        = There are no mailing lists currently associated with this project.
-report.mailing-lists.title                                         = Project Mailing Lists
-report.scm.accessbehindfirewall.cvs.intro                          = For those developers who are stuck behind a corporate firewall, {CVSGrab, http://cvsgrab.sourceforge.net/} can use the viewcvs web interface to checkout the source code.
-report.scm.accessbehindfirewall.general.intro                      = Refer to the documentation of the SCM used for more information about access behind a firewall.
-report.scm.accessbehindfirewall.svn.intro                          = For those users who are stuck behind a corporate firewall which is blocking HTTP access to the Subversion repository, you can try to access it via the developer connection:
-report.scm.accessbehindfirewall.title                              = Access from Behind a Firewall
-report.scm.accessthroughtproxy.svn.intro1                          = The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The file's location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)
-report.scm.accessthroughtproxy.svn.intro2                          = There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.
-report.scm.accessthroughtproxy.svn.intro3                          = Example: Edit the 'servers' file and add something like:
-report.scm.accessthroughtproxy.title                               = Access Through a Proxy
-report.scm.anonymousaccess.cvs.intro                               = This project's CVS repository can be checked out through anonymous CVS with the following instruction set. When prompted for a password for anonymous, simply press the Enter key.
-report.scm.anonymousaccess.general.intro                           = Refer to the documentation of the SCM used for more information about anonymously check out. The connection url is:
-report.scm.anonymousaccess.git.intro                               = The source can be checked out anonymously from Git with this command (See {http://git-scm.com/docs/git-clone,http://git-scm.com/docs/git-clone}):
-report.scm.anonymousaccess.hg.intro                                = The source can be checked out anonymously from Mercurial with this command (See {http://www.selenic.com/mercurial/hg.1.html#clone,http://www.selenic.com/mercurial/hg.1.html#clone}):
-report.scm.anonymousaccess.svn.intro                               = The source can be checked out anonymously from Subversion with this command:
-report.scm.anonymousaccess.title                                   = Anonymous Access
-report.scm.clearcase.intro                                         = This project uses {ClearCase, http://www-306.ibm.com/software/awdtools/clearcase/} to manage its source code. Informations on ClearCase use can be found at {http://www.redbooks.ibm.com/redbooks/pdfs/sg246399.pdf, http://www.redbooks.ibm.com/redbooks/pdfs/sg246399.pdf}.
-report.scm.cvs.intro                                               = This project uses {Concurrent Versions System, http://www.cvshome.org/} to manage its source code. Instructions on CVS use can be found at {http://cvsbook.red-bean.com/, http://cvsbook.red-bean.com/}.
-report.scm.description                                             = This document lists ways to access the online source repository.
-report.scm.devaccess.clearcase.intro                               = Only project developers can access the ClearCase tree via this method. Substitute username with the proper value.
-report.scm.devaccess.cvs.intro                                     = Only project developers can access the CVS tree via this method. Substitute username with the proper value.
-report.scm.devaccess.general.intro                                 = Refer to the documentation of the SCM used for more information about developer check out. The connection url is:
-report.scm.devaccess.git.intro                                     = Only project developers can access the Git tree via this method (See {http://git-scm.com/docs/git-clone,http://git-scm.com/docs/git-clone}).
-report.scm.devaccess.hg.intro                                      = Only project developers can access the Mercurial tree via this method (See {http://www.selenic.com/mercurial/hg.1.html#clone,http://www.selenic.com/mercurial/hg.1.html#clone}).
-report.scm.devaccess.perforce.intro                                = Only project developers can access the Perforce tree via this method. Substitute username and password with the proper values.
-report.scm.devaccess.starteam.intro                                = Only project developers can access the Starteam tree via this method. Substitute username with the proper value.
-report.scm.devaccess.svn.intro1.https                              = Everyone can access the Subversion repository via HTTP, but committers must checkout the Subversion repository via HTTPS.
-report.scm.devaccess.svn.intro1.other                              = Committers must checkout the Subversion repository.
-report.scm.devaccess.svn.intro1.svn                                = Committers must checkout the Subversion repository via SVN.
-report.scm.devaccess.svn.intro1.svnssh                             = Committers must checkout the Subversion repository via SVN+SSH.
-report.scm.devaccess.svn.intro2                                    = To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password):
-report.scm.devaccess.title                                         = Developer Access
-report.scm.general.intro                                           = This project uses a Source Content Management System to manage its source code.
-report.scm.name                                                    = Source Repository
-report.scm.noscm                                                   = No source configuration management system is defined. Please check back at a later date.
-report.scm.overview.title                                          = Overview
-report.scm.git.intro                                               = This project uses {Git, http://git-scm.com/} to manage its source code. Instructions on Git use can be found at {http://git-scm.com/documentation,http://git-scm.com/documentation}.
-report.scm.hg.intro                                                = This project uses {Mercurial, http://mercurial.selenic.com/wiki/} to manage its source code. Instructions on Mercurial use can be found at {http://hgbook.red-bean.com/read/, http://hgbook.red-bean.com/read/}.
-report.scm.perforce.intro                                          = This project uses {Perforce, http://www.perforce.com/} to manage its source code. Instructions on Perforce use can be found at {http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html, http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html}.
-report.scm.starteam.intro                                          = This project uses {Starteam, http://www.borland.com/us/products/starteam/} to manage its source code.
-report.scm.svn.intro                                               = This project uses {Subversion, http://subversion.apache.org/} to manage its source code. Instructions on Subversion use can be found at {http://svnbook.red-bean.com/, http://svnbook.red-bean.com/}.
-report.scm.title                                                   = Source Repository
-report.scm.webaccess.nourl                                         = There is no browsable version of the source repository listed for this project. Please check back again later.
-report.scm.webaccess.title                                         = Web Browser Access
-report.scm.webaccess.url                                           = The following is a link to a browsable version of the source repository:
-report.summary.build.artifactid                                    = ArtifactId
-report.summary.build.groupid                                       = GroupId
-report.summary.build.javaVersion                                   = Java Version
-report.summary.build.title                                         = Build Information
-report.summary.build.type                                          = Type
-report.summary.build.version                                       = Version
-report.summary.description                                         = This document lists other related information of this project
-report.summary.field                                               = Field
-report.summary.general.description                                 = Description
-report.summary.general.homepage                                    = Homepage
-report.summary.general.name                                        = Name
-report.summary.general.title                                       = Project Information
-report.summary.name                                                = Project Summary
-report.summary.organization.name                                   = Name
-report.summary.organization.title                                  = Project Organization
-report.summary.organization.url                                    = URL
-report.summary.noorganization                                      = This project does not belong to an organization.
-report.summary.title                                               = Project Summary
-report.summary.value                                               = Value
-report.summary.download                                            = Download
-report.team-list.contributors.actualtime                           = Actual Time (GMT)
-report.team-list.contributors.email                                = Email
-report.team-list.contributors.intro                                = The following additional people have contributed to this project through the way of suggestions, patches or documentation.
-report.team-list.contributors.image                                = Image
-report.team-list.contributors.name                                 = Name
-report.team-list.contributors.organization                         = Organization
-report.team-list.contributors.organizationurl                      = Organization URL
-report.team-list.contributors.properties                           = Properties
-report.team-list.contributors.roles                                = Roles
-report.team-list.contributors.timezone                             = Time Zone
-report.team-list.contributors.title                                = Contributors
-report.team-list.contributors.url                                  = URL
-report.team-list.description                                       = This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.
-report.team-list.developers.actualtime                             = Actual Time (GMT)
-report.team-list.developers.email                                  = Email
-report.team-list.developers.image                                  = Image
-report.team-list.developers.id                                     = Id
-report.team-list.developers.intro                                  = The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.
-report.team-list.developers.name                                   = Name
-report.team-list.developers.organization                           = Organization
-report.team-list.developers.organizationurl                        = Organization URL
-report.team-list.developers.properties                             = Properties
-report.team-list.developers.roles                                  = Roles
-report.team-list.developers.timezone                               = Time Zone
-report.team-list.developers.title                                  = Members
-report.team-list.developers.url                                    = URL
-report.team-list.intro.description1                                = A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.
-report.team-list.intro.description2                                = The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.
-report.team-list.intro.title                                       = The Team
-report.team-list.name                                              = Project Team
-report.team-list.nocontributor                                     = There are no contributors listed for this project. Please check back again later.
-report.team-list.nodeveloper                                       = There are no developers working on this project.
-report.team-list.title                                             = Project Team
-report.dependencyManagement.name                                   = Dependency Management
-report.dependencyManagement.description                            = This document lists the dependencies that are defined through dependencyManagement.
-report.dependencyManagement.title                                  = Project Dependency Management
-report.dependencyManagement.nolist                                 = There are no dependencies in the DependencyManagement of this project.
-report.dependencyManagement.column.groupId                         = GroupId
-report.dependencyManagement.column.artifactId                      = ArtifactId
-report.dependencyManagement.column.version                         = Version
-report.dependencyManagement.column.classifier                      = Classifier
-report.dependencyManagement.column.type                            = Type
-report.dependencyManagement.column.license                         = License
-report.dependencyManagement.intro.compile                          = The following is a list of compile dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run the submodule:
-report.dependencyManagement.intro.provided                         = The following is a list of provided dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile the submodule, but should be provided by default when using the library:
-report.dependencyManagement.intro.runtime                          = The following is a list of runtime dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to run the submodule:
-report.dependencyManagement.intro.system                           = The following is a list of system dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile the submodule:
-report.dependencyManagement.intro.test                             = The following is a list of test dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run unit tests for the submodule:
-report.pluginManagement.nolist                                     = There are no plugins defined in the PluginManagement part of this project.
-report.pluginManagement.name                                       = Plugin Management
-report.pluginManagement.description                                = This document lists the plugins that are defined through pluginManagement.
-report.pluginManagement.title                                      = Project Plugin Management
-report.plugins.name                                                = Project Plugins
-report.plugins.description                                         = This document lists the build plugins and the report plugins used by this project.
-report.plugins.title                                               = Project Build Plugins
-report.plugins.report.title                                        = Project Report Plugins
-report.plugins.nolist                                              = There are no plugins defined in the Build part of this project.
-report.plugins.report.nolist                                       = There are no plugins reports defined in the Reporting part of this project.
-report.modules.nolist                                              = There are no modules declared in this project.
-report.modules.name                                                = Project Modules
-report.modules.description                                         = This document lists the modules (sub-projects) of this project.
-report.modules.title                                               = Project Modules
-report.modules.intro                                               = This project has declared the following modules:
-report.modules.header.name                                         = Name
-report.modules.header.description                                  = Description
-report.distributionManagement.name                                 = Distribution Management
-report.distributionManagement.description                          = This document provides informations on the distribution management of this project.
-report.distributionManagement.title                                = Project Distribution Management
-report.distributionManagement.nodistributionmanagement             = No distribution management is defined for this project.
-report.distributionManagement.overview.title                       = Overview
-report.distributionManagement.overview.intro                       = The following is the distribution management information used by this project.
-report.distributionManagement.downloadURL                          = Download URL
-report.distributionManagement.repository                           = Repository
-report.distributionManagement.snapshotRepository                   = Snapshot Repository
-report.distributionManagement.site                                 = Site
-report.distributionManagement.relocation                           = Relocation
-report.distributionManagement.field                                = Field
-report.distributionManagement.value                                = Value
-report.distributionManagement.relocation.groupid                   = GroupId
-report.distributionManagement.relocation.artifactid                = ArtifactId
-report.distributionManagement.relocation.version                   = Version
-report.distributionManagement.relocation.message                   = Message
diff --git a/log4j-1.2-api/src/site/markdown/index.md b/src/site/markdown/log4j-1.2-api.md
similarity index 100%
rename from log4j-1.2-api/src/site/markdown/index.md
rename to src/site/markdown/log4j-1.2-api.md
diff --git a/log4j-api-test/src/site/markdown/index.md b/src/site/markdown/log4j-api.md
similarity index 100%
rename from log4j-api-test/src/site/markdown/index.md
rename to src/site/markdown/log4j-api.md
diff --git a/log4j-appserver/src/site/markdown/index.md.vm b/src/site/markdown/log4j-appserver.md.vm
similarity index 100%
rename from log4j-appserver/src/site/markdown/index.md.vm
rename to src/site/markdown/log4j-appserver.md.vm
diff --git a/log4j-cassandra/src/site/markdown/index.md.vm b/src/site/markdown/log4j-cassandra.md.vm
similarity index 100%
rename from log4j-cassandra/src/site/markdown/index.md.vm
rename to src/site/markdown/log4j-cassandra.md.vm
diff --git a/log4j-core-test/src/site/manual/index.md b/src/site/markdown/log4j-core.md
similarity index 100%
rename from log4j-core-test/src/site/manual/index.md
rename to src/site/markdown/log4j-core.md
diff --git a/log4j-couchdb/src/site/markdown/index.md.vm b/src/site/markdown/log4j-couchdb.md.vm
similarity index 100%
rename from log4j-couchdb/src/site/markdown/index.md.vm
rename to src/site/markdown/log4j-couchdb.md.vm
diff --git a/log4j-docker/src/site/markdown/index.md.vm b/src/site/markdown/log4j-docker.md.vm
similarity index 100%
rename from log4j-docker/src/site/markdown/index.md.vm
rename to src/site/markdown/log4j-docker.md.vm
diff --git a/log4j-flume-ng/src/site/markdown/index.md.vm b/src/site/markdown/log4j-flume-ng.md.vm
similarity index 100%
rename from log4j-flume-ng/src/site/markdown/index.md.vm
rename to src/site/markdown/log4j-flume-ng.md.vm
diff --git a/log4j-iostreams/src/site/markdown/index.md b/src/site/markdown/log4j-iostreams.md
similarity index 100%
rename from log4j-iostreams/src/site/markdown/index.md
rename to src/site/markdown/log4j-iostreams.md
diff --git a/log4j-jakarta-web/src/site/markdown/index.md b/src/site/markdown/log4j-jakarta-web.md
similarity index 100%
rename from log4j-jakarta-web/src/site/markdown/index.md
rename to src/site/markdown/log4j-jakarta-web.md
diff --git a/log4j-jcl/src/site/markdown/index.md b/src/site/markdown/log4j-jcl.md
similarity index 100%
rename from log4j-jcl/src/site/markdown/index.md
rename to src/site/markdown/log4j-jcl.md
diff --git a/log4j-jdbc-dbcp2/src/site/manual/index.md b/src/site/markdown/log4j-jdbc-dbcp2.md
similarity index 100%
rename from log4j-jdbc-dbcp2/src/site/manual/index.md
rename to src/site/markdown/log4j-jdbc-dbcp2.md
diff --git a/log4j-csv/src/site/manual/index.md b/src/site/markdown/log4j-jeromq.md
similarity index 100%
rename from log4j-csv/src/site/manual/index.md
rename to src/site/markdown/log4j-jeromq.md
diff --git a/log4j-jms/src/site/manual/index.md b/src/site/markdown/log4j-jms.md
similarity index 100%
rename from log4j-jms/src/site/manual/index.md
rename to src/site/markdown/log4j-jms.md
diff --git a/log4j-jmx-gui/src/site/markdown/index.md b/src/site/markdown/log4j-jmx-gui.md
similarity index 100%
rename from log4j-jmx-gui/src/site/markdown/index.md
rename to src/site/markdown/log4j-jmx-gui.md
diff --git a/log4j-jpl/src/site/markdown/index.md b/src/site/markdown/log4j-jpl.md
similarity index 100%
rename from log4j-jpl/src/site/markdown/index.md
rename to src/site/markdown/log4j-jpl.md
diff --git a/log4j-jul/src/site/markdown/index.md b/src/site/markdown/log4j-jul.md
similarity index 100%
rename from log4j-jul/src/site/markdown/index.md
rename to src/site/markdown/log4j-jul.md
diff --git a/log4j-kafka/src/site/manual/index.md b/src/site/markdown/log4j-kafka.md
similarity index 100%
rename from log4j-kafka/src/site/manual/index.md
rename to src/site/markdown/log4j-kafka.md
diff --git a/log4j-kubernetes/src/site/markdown/index.md.vm b/src/site/markdown/log4j-kubernetes.md.vm
similarity index 100%
rename from log4j-kubernetes/src/site/markdown/index.md.vm
rename to src/site/markdown/log4j-kubernetes.md.vm
diff --git a/log4j-layout-jackson-json/src/site/manual/index.md b/src/site/markdown/log4j-layout-jackson-json.md
similarity index 100%
rename from log4j-layout-jackson-json/src/site/manual/index.md
rename to src/site/markdown/log4j-layout-jackson-json.md
diff --git a/log4j-layout-jackson-xml/src/site/manual/index.md b/src/site/markdown/log4j-layout-jackson-xml.md
similarity index 100%
rename from log4j-layout-jackson-xml/src/site/manual/index.md
rename to src/site/markdown/log4j-layout-jackson-xml.md
diff --git a/log4j-layout-jackson-yaml/src/site/manual/index.md b/src/site/markdown/log4j-layout-jackson-yaml.md
similarity index 100%
rename from log4j-layout-jackson-yaml/src/site/manual/index.md
rename to src/site/markdown/log4j-layout-jackson-yaml.md
diff --git a/log4j-layout-jackson/src/site/manual/index.md b/src/site/markdown/log4j-layout-jackson.md
similarity index 100%
rename from log4j-layout-jackson/src/site/manual/index.md
rename to src/site/markdown/log4j-layout-jackson.md
diff --git a/log4j-layout-template-json/src/site/manual/index.md b/src/site/markdown/log4j-layout-template-json.md
similarity index 100%
rename from log4j-layout-template-json/src/site/manual/index.md
rename to src/site/markdown/log4j-layout-template-json.md
diff --git a/log4j-liquibase/src/site/markdown/index.md b/src/site/markdown/log4j-liquibase.md
similarity index 100%
rename from log4j-liquibase/src/site/markdown/index.md
rename to src/site/markdown/log4j-liquibase.md
diff --git a/log4j-mongodb3/src/site/markdown/index.md.vm b/src/site/markdown/log4j-mongodb3.md.vm
similarity index 100%
rename from log4j-mongodb3/src/site/markdown/index.md.vm
rename to src/site/markdown/log4j-mongodb3.md.vm
diff --git a/log4j-mongodb4/src/site/markdown/index.md.vm b/src/site/markdown/log4j-mongodb4.md.vm
similarity index 100%
rename from log4j-mongodb4/src/site/markdown/index.md.vm
rename to src/site/markdown/log4j-mongodb4.md.vm
diff --git a/log4j-script/src/site/markdown/index.md b/src/site/markdown/log4j-script.md
similarity index 100%
rename from log4j-script/src/site/markdown/index.md
rename to src/site/markdown/log4j-script.md
diff --git a/log4j-slf4j-impl/src/site/markdown/index.md b/src/site/markdown/log4j-slf4j-impl.md
similarity index 100%
rename from log4j-slf4j-impl/src/site/markdown/index.md
rename to src/site/markdown/log4j-slf4j-impl.md
diff --git a/log4j-slf4j2-impl/src/site/markdown/index.md b/src/site/markdown/log4j-slf4j2-impl.md
similarity index 100%
rename from log4j-slf4j2-impl/src/site/markdown/index.md
rename to src/site/markdown/log4j-slf4j2-impl.md
diff --git a/log4j-smtp/src/site/manual/index.md b/src/site/markdown/log4j-smtp.md
similarity index 100%
rename from log4j-smtp/src/site/manual/index.md
rename to src/site/markdown/log4j-smtp.md
diff --git a/log4j-spring-boot/src/site/markdown/index.md b/src/site/markdown/log4j-spring-boot.md
similarity index 100%
rename from log4j-spring-boot/src/site/markdown/index.md
rename to src/site/markdown/log4j-spring-boot.md
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/markdown/index.md b/src/site/markdown/log4j-spring-cloud-config-client.md
similarity index 100%
rename from log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/markdown/index.md
rename to src/site/markdown/log4j-spring-cloud-config-client.md
diff --git a/log4j-taglib/src/site/markdown/index.md b/src/site/markdown/log4j-taglib.md
similarity index 100%
rename from log4j-taglib/src/site/markdown/index.md
rename to src/site/markdown/log4j-taglib.md
diff --git a/log4j-to-jul/src/site/markdown/index.md b/src/site/markdown/log4j-to-jul.md
similarity index 100%
rename from log4j-to-jul/src/site/markdown/index.md
rename to src/site/markdown/log4j-to-jul.md
diff --git a/log4j-to-slf4j/src/site/markdown/index.md b/src/site/markdown/log4j-to-slf4j.md
similarity index 100%
rename from log4j-to-slf4j/src/site/markdown/index.md
rename to src/site/markdown/log4j-to-slf4j.md
diff --git a/log4j-web/src/site/markdown/index.md b/src/site/markdown/log4j-web.md
similarity index 100%
rename from log4j-web/src/site/markdown/index.md
rename to src/site/markdown/log4j-web.md
diff --git a/src/site/pdf.xml b/src/site/pdf.xml
deleted file mode 100644
index 59b6442e3d..0000000000
--- a/src/site/pdf.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache license, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the license at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the license.
-
--->
-<document xmlns="http://maven.apache.org/DOCUMENT/1.0.1"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/DOCUMENT/1.0.1 http://maven.apache.org/xsd/document-1.0.1.xsd"
-          outputName="log4j-users-guide">
-
-  <meta>
-    <title>Apache Log4j 2</title>
-    <author>The Apache Logging Project</author>
-  </meta>
-
-  <toc name="Table of Contents">
-    <item name="Introduction" ref="/manual/index.xml"/>
-    <item name="Architecture" ref="/manual/architecture.xml"/>
-    <item name="Log4j 1.x Migration" ref="manual/migration.xml"/>
-    <item name="API" ref="/manual/api.xml"/>
-    <item name="Configuration" ref="/manual/configuration.xml.vm"/>
-    <item name="Web Applications and JSPs" ref="/manual/webapp.xml"/>
-    <item name="Plugins" ref="/manual/plugins.xml"/>
-    <item name="Lookups" ref="/manual/lookups.xml"/>
-    <item name="Appenders" ref="/manual/appenders.xml"/>
-    <item name="Layouts" ref="/manual/layouts.xml.vm"/>
-    <item name="Filters" ref="/manual/filters.xml"/>
-    <item name="Async Loggers" ref="/manual/async.xml" />
-    <item name="Garbage-free Logging" ref="/manual/garbagefree.xml"/>
-    <item name="JMX" ref="/manual/jmx.xml.vm"/>
-    <item name="Logging Separation" ref="/manual/logsep.xml"/>
-    <item name="Extending Log4j" ref="/manual/extending.xml"/>
-    <item name="Programmatic Log4j Configuration" ref="/manual/customconfig.xml"/>
-    <item name="Custom Log Levels" ref="/manual/customloglevels.xml.vm" />
-  </toc>
-
-  <cover>
-    <coverTitle>${project.name}</coverTitle>
-    <coverSubTitle>v. ${project.version}</coverSubTitle>
-    <coverType>User's Guide</coverType>
-    <projectName>${project.name}</projectName>
-    <projectLogo>http://logging.apache.org/log4j/2.x/images/logo.jpg</projectLogo>
-    <companyName>The Apache Software Foundation</companyName>
-    <companyLogo>http://www.apache.org/images/asf_logo_wide.png</companyLogo>
-  </cover>
-</document>
\ No newline at end of file
diff --git a/src/site/resources/pdf-config.xml b/src/site/resources/pdf-config.xml
deleted file mode 100644
index 924ea5000d..0000000000
--- a/src/site/resources/pdf-config.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- START SNIPPET: foConfig -->
-<xsl:stylesheet
-    version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:fo="http://www.w3.org/1999/XSL/Format">
-  <!-- <xsl:attribute-set name="layout.master.set.base">
-    <xsl:attribute name="page-width">8.5in</xsl:attribute>
-    <xsl:attribute name="page-height">11.0in</xsl:attribute>
-    <xsl:attribute name="margin-top">0.625in</xsl:attribute>
-    <xsl:attribute name="margin-bottom">0.6in</xsl:attribute>
-    <xsl:attribute name="margin-left">1in</xsl:attribute>
-    <xsl:attribute name="margin-right">1in</xsl:attribute>
-  </xsl:attribute-set> -->
-  <xsl:template match="processing-instruction('hard-pagebreak')">
-    <fo:block break-after='page'/>
-  </xsl:template>
-  <xsl:attribute-set name="body.pre" use-attribute-sets="base.pre.style">
-    <xsl:attribute name="font-size">8pt</xsl:attribute>
-  </xsl:attribute-set>
-  <!-- <xsl:attribute-set name="body.source" use-attribute-sets="body.pre">
-    <xsl:attribute name="color">black</xsl:attribute>
-    <xsl:attribute name="start-indent">inherited-property-value(start-indent) + 1.5em</xsl:attribute>
-    <xsl:attribute name="end-indent">inherited-property-value(end-indent) + 1.5em</xsl:attribute>
-  </xsl:attribute-set> -->
-</xsl:stylesheet>
-    <!-- END SNIPPET: foConfig -->
\ No newline at end of file
diff --git a/src/site/site.xml b/src/site/site.xml
index 47e7aa317c..a4f74a9e11 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -306,30 +306,32 @@
     </menu>
 
     <menu name="Components" inherit="top" img="img/glyphicons/cog.png">
-      <item name="API" href="log4j-api/index.html"/>
-      <item name="Implementation" href="log4j-core/index.html"/>
-      <item name="Commons Logging Bridge" href="log4j-jcl/index.html"/>
-      <item name="Log4j 1.2 API" href="log4j-1.2-api/index.html"/>
-      <item name="SLF4J Binding" href="log4j-slf4j-impl/index.html"/>
-      <item name="JUL Adapter" href="log4j-jul/index.html"/>
-      <item name="JDK Platform Logger" href="log4j-jpl/index.html"/>
-      <item name="Log4j 2 to SLF4J Adapter" href="log4j-to-slf4j/index.html"/>
-      <item name="Apache Flume Appender" href="log4j-flume-ng/index.html"/>
-      <item name="Log4j Tag Library" href="log4j-taglib/index.html"/>
-      <item name="Log4j JMX GUI" href="log4j-jmx-gui/index.html"/>
-      <item name="Log4j Web Application Support" href="log4j-web/index.html"/>
-      <item name="Log4j Jakarta Web Application Support" href="log4j-jakarta-web/index.html"/>
-      <item name="Log4j Application Server Integration" href="log4j-appserver/index.html"/>
-      <item name="Log4j CouchDB appender" href="log4j-couchdb/index.html"/>
-      <item name="Log4j MongoDB3 appender" href="log4j-mongodb3/index.html"/>
-      <item name="Log4j MongoDB4 appender" href="log4j-mongodb4/index.html"/>
-      <item name="Log4j Cassandra appender" href="log4j-cassandra/index.html"/>
-      <item name="Log4j IO Streams" href="log4j-iostreams/index.html"/>
-      <item name="Log4j Liquibase Binding" href="log4j-liquibase/index.html"/>
-      <item name="Log4j Docker Support" href="log4j-docker/index.html"/>
-      <item name="Lob4j Kubernetes Support" href="log4j-kubernetes/index.html"/>
-      <item name="Log4j Spring Boot" href="log4j-spring-boot/index.html"/>
-      <item name="Log4j Spring Cloud Config Client" href="log4j-spring-cloud-config/log4j-spring-cloud-config-client/index.html"/>
+      <item name="API" href="log4j-api.html"/>
+      <item name="Implementation" href="log4j-core.html"/>
+      <item name="Commons Logging Bridge" href="log4j-jcl.html"/>
+      <item name="Log4j 1.2 API" href="log4j-1.2-api.html"/>
+      <item name="SLF4J Binding" href="log4j-slf4j-impl.html"/>
+      <item name="JUL Adapter" href="log4j-jul.html"/>
+      <item name="JDK Platform Logger" href="log4j-jpl.html"/>
+      <item name="Log4j 2 to SLF4J Adapter" href="log4j-to-slf4j.html"/>
+      <item name="JDBC Appender" href="log4j-jdbc-dbcp2.html"/>
+      <item name="ZeroMQ Appender" href="log4j-jeromq.html"/>
+      <item name="Apache Flume Appender" href="log4j-flume-ng.html"/>
+      <item name="JMS Appender" href="log4j-jms.html"/>
+      <item name="Tag Library" href="log4j-taglib.html"/>
+      <item name="JMX GUI" href="log4j-jmx-gui.html"/>
+      <item name="Web Application Support" href="log4j-web.html"/>
+      <item name="Jakarta Web Application Support" href="log4j-jakarta-web.html"/>
+      <item name="Application Server Integration" href="log4j-appserver.html"/>
+      <item name="CouchDB appender" href="log4j-couchdb.html"/>
+      <item name="MongoDB3 appender" href="log4j-mongodb3.html"/>
+      <item name="MongoDB4 appender" href="log4j-mongodb4.html"/>
+      <item name="Cassandra appender" href="log4j-cassandra.html"/>
+      <item name="IO Streams" href="log4j-iostreams.html"/>
+      <item name="Liquibase Binding" href="log4j-liquibase.html"/>
+      <item name="Docker Support" href="log4j-docker.html"/>
+      <item name="Kubernetes Support" href="log4j-kubernetes.html"/>
+      <item name="Spring Cloud Config Client" href="log4j-spring-cloud-config-client.html"/>
     </menu>
 
     <menu name="Project Information" img="img/glyphicons/info.png">