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 2022/12/19 10:21:39 UTC

[logging-log4j2] 33/33: Simplify site generation

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

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

commit b6e06c9a023228e0e0ad20cb769138d450182587
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Dec 19 11:21:07 2022 +0100

    Simplify site generation
---
 .github/workflows/build.yml                        |   1 -
 BUILDING.md                                        |   2 +-
 doap_log4j2.rdf                                    | 447 -----------
 log4j-1.2-api/pom.xml                              |   1 -
 log4j-1.2-api/src/site/site.xml                    |  50 --
 log4j-api-java9/pom.xml                            |   8 -
 log4j-api-test/pom.xml                             |   1 -
 log4j-api/pom.xml                                  |   1 -
 log4j-api/src/site/site.xml                        |  50 --
 log4j-appserver/pom.xml                            |   1 -
 log4j-appserver/src/site/site.xml                  |  50 --
 log4j-cassandra/pom.xml                            |   1 -
 log4j-cassandra/src/site/site.xml                  |  50 --
 log4j-core-java9/pom.xml                           |   8 -
 log4j-core-test/pom.xml                            |   1 -
 log4j-core/pom.xml                                 |   1 -
 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-distribution/pom.xml                         |   8 -
 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-iostreams/pom.xml                            |   1 -
 log4j-iostreams/src/site/site.xml                  |  50 --
 log4j-jakarta-smtp/pom.xml                         |   1 -
 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/manual/index.md          |  35 -
 log4j-jdbc-dbcp2/src/site/site.xml                 |  50 --
 log4j-jmx-gui/pom.xml                              |   1 -
 log4j-jmx-gui/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-kubernetes/pom.xml                           |   1 -
 log4j-kubernetes/src/site/site.xml                 |  50 --
 log4j-layout-template-json-test/pom.xml            |   1 -
 log4j-layout-template-json/pom.xml                 |   1 -
 .../src/site/manual/index.md                       |  32 -
 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                                 |   1 -
 log4j-samples/log4j-samples-flume-embedded/pom.xml |   4 -
 log4j-samples/pom.xml                              |   8 -
 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-spring-boot/pom.xml                          |   1 -
 log4j-spring-boot/src/site/site.xml                |  50 --
 .../src/site/site.xml                              |  50 --
 .../pom.xml                                        |  35 +-
 .../pom.xml                                        | 100 +--
 .../readme.txt                                     |   0
 .../log4j-spring-cloud-config-samples/pom.xml      |   8 -
 log4j-spring-cloud-config/pom.xml                  |  15 +-
 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                                            | 851 +++++++++------------
 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
 .../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
 .../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
 .../site/markdown/log4j-kubernetes.md.vm           |   0
 .../site/markdown/log4j-liquibase.md               |   0
 .../site/markdown/log4j-mongodb3.md.vm             |   0
 .../site/markdown/log4j-mongodb4.md.vm             |   0
 .../site/markdown/log4j-slf4j-impl.md              |   0
 .../site/markdown/log4j-slf4j2-impl.md             |   0
 .../site/markdown/log4j-spring-boot.md             |   0
 .../markdown/log4j-spring-cloud-config-client.md   |   0
 .../site/markdown/log4j-spring-cloud-config.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                                  |  57 +-
 113 files changed, 457 insertions(+), 3206 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3f7b258cda..734d414bfd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,7 +98,6 @@ jobs:
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress \
             --non-recursive \
-            -Dmaven.doap.skip \
             -DskipTests \
             --global-toolchains ".github/workflows/maven-toolchains.xml" \
             site
diff --git a/BUILDING.md b/BUILDING.md
index 0ce6664dd1..c6773a4371 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -58,4 +58,4 @@ 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 --non-recursive -DskipTests site
diff --git a/doap_log4j2.rdf b/doap_log4j2.rdf
deleted file mode 100644
index fc2328e7ae..0000000000
--- a/doap_log4j2.rdf
+++ /dev/null
@@ -1,447 +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.
-
--->
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Doap Plugin 1.2 on 1/15/17 8:25 PM                  -->
-<!-- See: http://maven.apache.org/plugins/maven-doap-plugin/                -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<rdf:RDF xml:lang="en" xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:asfext="http://projects.apache.org/ns/asfext#">
-  <Project rdf:about="http://logging.apache.org/log4j/2.x/">
-
-    <!-- ====================================================================== -->
-    <!-- A name of something.                                                   -->
-    <!-- ====================================================================== -->
-
-    <name>Apache Log4j 2</name>
-
-    <!-- ====================================================================== -->
-    <!-- Plain text description of a project, of 2-4 sentences in length.       -->
-    <!-- ====================================================================== -->
-
-    <description xml:lang="en">Apache Log4j 2</description>
-    <shortdesc xml:lang="en">Apache Log4j 2</shortdesc>
-
-    <!-- ====================================================================== -->
-    <!-- Vendor.                                                                -->
-    <!-- ====================================================================== -->
-
-    <vendor>Apache Software Foundation</vendor>
-
-    <!-- ====================================================================== -->
-    <!-- Date when something was created, in YYYY-MM-DD form. e.g. 2004-04-05   -->
-    <!-- ====================================================================== -->
-
-    <created>1999-01-01</created>
-
-    <!-- ====================================================================== -->
-    <!-- URL of a project's homepage, associated with exactly one project.      -->
-    <!-- ====================================================================== -->
-
-    <homepage rdf:resource="http://logging.apache.org/log4j/2.x/"/>
-
-    <!-- ====================================================================== -->
-    <!-- The URI of the license the software is distributed under.              -->
-    <!-- ====================================================================== -->
-
-    <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-
-    <!-- ====================================================================== -->
-    <!-- Programming language.                                                  -->
-    <!-- ====================================================================== -->
-
-    <programming-language>Java</programming-language>
-
-    <!-- ====================================================================== -->
-    <!-- A category of project.                                                 -->
-    <!-- ====================================================================== -->
-
-    <category rdf:resource="http://projects.apache.org/category/library"/>
-
-    <!-- ====================================================================== -->
-    <!-- Anonymous Source Repository.                                           -->
-    <!-- ====================================================================== -->
-
-    <repository>
-      <Repository>
-        <location rdf:resource="git:http://git-wip-us.apache.org/repos/asf/logging-log4j2.git"/>
-        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=summary"/>
-      </Repository>
-    </repository>
-
-    <!-- ====================================================================== -->
-    <!-- Developer Source Repository.                                           -->
-    <!-- ====================================================================== -->
-
-    <repository>
-      <Repository>
-        <location rdf:resource="git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git"/>
-        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=summary"/>
-      </Repository>
-    </repository>
-
-    <!-- ====================================================================== -->
-    <!-- Bug database.                                                          -->
-    <!-- ====================================================================== -->
-
-    <bug-database rdf:resource="https://issues.apache.org/jira/browse/LOG4J2"/>
-
-    <!-- ====================================================================== -->
-    <!-- Mailing lists.                                                         -->
-    <!-- ====================================================================== -->
-
-    <mailing-list rdf:resource="http://logging.apache.org/log4j/2.x//mail-lists.html"/>
-
-    <!-- ====================================================================== -->
-    <!-- Download page.                                                         -->
-    <!-- ====================================================================== -->
-
-    <download-page rdf:resource="https://logging.apache.org/log4j/2.x/download.html"/>
-
-    <!-- ====================================================================== -->
-    <!-- Project releases.                                                      -->
-    <!-- ====================================================================== -->
-
-    <release>
-      <Version>
-        <name>Latest stable release</name>
-        <revision>2.7</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.7/log4j-2.7.pom</file-release>
-        <created>2016-10-06</created>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.6.2</name>
-        <revision>2.6.2</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.6.2/log4j-2.6.2.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.6.1</name>
-        <revision>2.6.1</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.6.1/log4j-2.6.1.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.6</name>
-        <revision>2.6</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.6/log4j-2.6.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.5</name>
-        <revision>2.5</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.5/log4j-2.5.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.4.1</name>
-        <revision>2.4.1</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.4.1/log4j-2.4.1.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.4</name>
-        <revision>2.4</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.4/log4j-2.4.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.3</name>
-        <revision>2.3</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.3/log4j-2.3.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.2</name>
-        <revision>2.2</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.2/log4j-2.2.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.1</name>
-        <revision>2.1</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.1/log4j-2.1.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0.2</name>
-        <revision>2.0.2</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0.2/log4j-2.0.2.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0.1</name>
-        <revision>2.0.1</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0.1/log4j-2.0.1.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0</name>
-        <revision>2.0</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0/log4j-2.0.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-rc2</name>
-        <revision>2.0-rc2</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-rc2/log4j-2.0-rc2.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-rc1</name>
-        <revision>2.0-rc1</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-rc1/log4j-2.0-rc1.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta9</name>
-        <revision>2.0-beta9</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta9/log4j-2.0-beta9.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta8</name>
-        <revision>2.0-beta8</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta8/log4j-2.0-beta8.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta7</name>
-        <revision>2.0-beta7</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta7/log4j-2.0-beta7.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta6</name>
-        <revision>2.0-beta6</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta6/log4j-2.0-beta6.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta5</name>
-        <revision>2.0-beta5</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta5/log4j-2.0-beta5.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta4</name>
-        <revision>2.0-beta4</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta4/log4j-2.0-beta4.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta3</name>
-        <revision>2.0-beta3</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta3/log4j-2.0-beta3.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta2</name>
-        <revision>2.0-beta2</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta2/log4j-2.0-beta2.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-beta1</name>
-        <revision>2.0-beta1</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-beta1/log4j-2.0-beta1.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-alpha2</name>
-        <revision>2.0-alpha2</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-alpha2/log4j-2.0-alpha2.pom</file-release>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache Log4j 2 - 2.0-alpha1</name>
-        <revision>2.0-alpha1</revision>
-        <file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.0-alpha1/log4j-2.0-alpha1.pom</file-release>
-      </Version>
-    </release>
-
-    <!-- ====================================================================== -->
-    <!-- Main committers.                                                       -->
-    <!-- ====================================================================== -->
-
-    <maintainer>
-      <foaf:Person>
-        <foaf:name>Bruce Brouwer</foaf:name>
-        <foaf:mbox rdf:resource="mailto:bruce.brouwer@gmail.com"/>
-      </foaf:Person>
-    </maintainer>
-    <maintainer>
-      <foaf:Person rdf:nodeID="b1">
-        <foaf:name>Gary Gregory</foaf:name>
-        <foaf:mbox rdf:resource="mailto:ggregory@apache.org"/>
-      </foaf:Person>
-    </maintainer>
-    <maintainer>
-      <foaf:Person rdf:nodeID="b2">
-        <foaf:name>Matt Sicker</foaf:name>
-        <foaf:mbox rdf:resource="mailto:mattsicker@apache.org"/>
-      </foaf:Person>
-    </maintainer>
-    <maintainer>
-      <foaf:Person rdf:nodeID="b3">
-        <foaf:name>Mikael Ståldal</foaf:name>
-        <foaf:mbox rdf:resource="mailto:mikes@apache.org"/>
-      </foaf:Person>
-    </maintainer>
-    <maintainer>
-      <foaf:Person>
-        <foaf:name>Nick Williams</foaf:name>
-        <foaf:mbox rdf:resource="mailto:nickwilliams@apache.org"/>
-      </foaf:Person>
-    </maintainer>
-    <maintainer>
-      <foaf:Person rdf:nodeID="b4">
-        <foaf:name>Ralph Goers</foaf:name>
-        <foaf:mbox rdf:resource="mailto:rgoers@apache.org"/>
-      </foaf:Person>
-    </maintainer>
-    <maintainer>
-      <foaf:Person>
-        <foaf:name>Remko Popma</foaf:name>
-        <foaf:mbox rdf:resource="mailto:rpopma@apache.org"/>
-      </foaf:Person>
-    </maintainer>
-    <maintainer>
-      <foaf:Person>
-        <foaf:name>Scott Deboy</foaf:name>
-        <foaf:mbox rdf:resource="mailto:sdeboy@apache.org"/>
-      </foaf:Person>
-    </maintainer>
-
-    <!-- ====================================================================== -->
-    <!-- Contributed persons.                                                   -->
-    <!-- ====================================================================== -->
-
-    <helper>
-      <foaf:Person>
-        <foaf:name>Murad Ersoy</foaf:name>
-        <foaf:mbox rdf:resource="mailto:muradersoy@gmail.com"/>
-        <foaf:homepage rdf:resource="https://www.behance.net/muradersoy"/>
-      </foaf:Person>
-    </helper>
-
-    <!-- ====================================================================== -->
-    <!-- ASF extension.                                                         -->
-    <!-- ====================================================================== -->
-
-    <asfext:pmc rdf:resource="http://logging.apache.org/log4j/2.x/"/>
-    <asfext:name>Apache Log4j 2</asfext:name>
-    <foaf:homepage rdf:resource="http://logging.apache.org/log4j/2.x/"/>
-    <asfext: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.</asfext:charter>
-    <asfext:chair>
-      <foaf:Person rdf:nodeID="b5">
-        <foaf:name>Ralph Goers</foaf:name>
-        <foaf:mbox rdf:resource="mailto:rgoers@apache.org"/>
-      </foaf:Person>
-    </asfext:chair>
-    <asfext:member>
-      <foaf:Person rdf:nodeID="b6">
-        <foaf:name>Gary Gregory</foaf:name>
-        <foaf:mbox rdf:resource="mailto:ggregory@apache.org"/>
-      </foaf:Person>
-    </asfext:member>
-    <asfext:member>
-      <foaf:Person rdf:nodeID="b7">
-        <foaf:name>Matt Sicker</foaf:name>
-        <foaf:mbox rdf:resource="mailto:mattsicker@apache.org"/>
-      </foaf:Person>
-    </asfext:member>
-    <asfext:member>
-      <foaf:Person rdf:nodeID="b8">
-        <foaf:name>Mikael Ståldal</foaf:name>
-        <foaf:mbox rdf:resource="mailto:mikes@apache.org"/>
-      </foaf:Person>
-    </asfext:member>
-    <asfext:member>
-      <foaf:Person>
-        <foaf:name>Nick Williams</foaf:name>
-        <foaf:mbox rdf:resource="mailto:nickwilliams@apache.org"/>
-      </foaf:Person>
-    </asfext:member>
-    <asfext:member>
-      <foaf:Person>
-        <foaf:name>Remko Popma</foaf:name>
-        <foaf:mbox rdf:resource="mailto:rpopma@apache.org"/>
-      </foaf:Person>
-    </asfext:member>
-    <asfext:member>
-      <foaf:Person>
-        <foaf:name>Scott Deboy</foaf:name>
-        <foaf:mbox rdf:resource="mailto:sdeboy@apache.org"/>
-      </foaf:Person>
-    </asfext:member>
-  </Project>
-  <foaf:Organization>
-    <foaf:name>Nextiva</foaf:name>
-    <foaf:member rdf:nodeID="b4"/>
-    <foaf:member rdf:nodeID="b5"/>
-  </foaf:Organization>
-  <foaf:Organization>
-    <foaf:name>Spotify</foaf:name>
-    <foaf:member rdf:nodeID="b3"/>
-    <foaf:member rdf:nodeID="b8"/>
-  </foaf:Organization>
-  <foaf:Organization>
-    <foaf:name>Rocket Software</foaf:name>
-    <foaf:member rdf:nodeID="b1"/>
-    <foaf:member rdf:nodeID="b6"/>
-  </foaf:Organization>
-  <foaf:Organization>
-    <foaf:name>SPR Consulting</foaf:name>
-    <foaf:member rdf:nodeID="b2"/>
-    <foaf:member rdf:nodeID="b7"/>
-  </foaf:Organization>
-</rdf:RDF>
\ No newline at end of file
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 8c64f5cd52..81d189a6be 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>
     <!-- Used for JMS appenders (needs an implementation of course) -->
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-java9/pom.xml b/log4j-api-java9/pom.xml
index f77cd4e0d5..7dbb6cb8d9 100644
--- a/log4j-api-java9/pom.xml
+++ b/log4j-api-java9/pom.xml
@@ -118,14 +118,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index c6a366b50a..ca2f1e8673 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/pom.xml b/log4j-api/pom.xml
index ee3010e501..a54050e601 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/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 fbb55f9694..1b1528f7fa 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>
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-cassandra/pom.xml b/log4j-cassandra/pom.xml
index 050c92cde8..ba4e5eab3b 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-java9/pom.xml b/log4j-core-java9/pom.xml
index f866a71665..9ea44e8dda 100644
--- a/log4j-core-java9/pom.xml
+++ b/log4j-core-java9/pom.xml
@@ -118,14 +118,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-toolchains-plugin</artifactId>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 5a46fc378c..d28502fad6 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>/core</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
     <!--<revapi.skip>true</revapi.skip>-->
   </properties>
   <dependencies>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index ae7a3f0ee3..4733384e45 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>
     <!--<revapi.skip>true</revapi.skip>-->
   </properties>
   <dependencies>
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 cea1e89fc3..d745927365 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-distribution/pom.xml b/log4j-distribution/pom.xml
index a106d6d922..4997026633 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -684,14 +684,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
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 6b7e7252cd..9149a4dc36 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 04ffb436f3..911df56359 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-iostreams/pom.xml b/log4j-iostreams/pom.xml
index f27d363c59..8afdcb0299 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-smtp/pom.xml b/log4j-jakarta-smtp/pom.xml
index e56809086c..fad515117e 100644
--- a/log4j-jakarta-smtp/pom.xml
+++ b/log4j-jakarta-smtp/pom.xml
@@ -32,7 +32,6 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Log4j SMTP Appender Documentation</docLabel>
     <projectDir>/log4j-jakarta-smtp</projectDir>
-    <maven.doap.skip>true</maven.doap.skip>
     <module.name>org.apache.logging.log4j.smtp</module.name>
   </properties>
 
diff --git a/log4j-jakarta-web/pom.xml b/log4j-jakarta-web/pom.xml
index 0c3784ec51..c73300a238 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 09eacc605a..ce5c3c9547 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 4175ccab81..3196eed201 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.jdbc.dbcp2</module.name>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
diff --git a/log4j-jdbc-dbcp2/src/site/manual/index.md b/log4j-jdbc-dbcp2/src/site/manual/index.md
deleted file mode 100644
index b7fb5a56bd..0000000000
--- a/log4j-jdbc-dbcp2/src/site/manual/index.md
+++ /dev/null
@@ -1,35 +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 JDBC Connection Source with Apache Commons DBCP 2
-
-This module adds a connection source for JDBC Appenders. The PoolingDriverConnectionSource 
-provides connection pooling through Apache Commons DBCP 2. 
-
-## Requirements
-
-This module was introduced in Log4j 2.11.0 and requires Apache Commons DBCP 2 to provide
-connection pooling.
-
-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-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-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index b1037b7d95..b160ecbefd 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -34,7 +34,6 @@
     <projectDir>/jmx-gui</projectDir>
     <jenkins.java.home>/home/jenkins/tools/java/latest1.7</jenkins.java.home>
     <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-jpa/pom.xml b/log4j-jpa/pom.xml
index 3969976931..40e4a1a3dd 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 358ba3914a..015cf0cefe 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>
     <!-- Do not upgrade until https://issues.apache.org/jira/browse/SUREFIRE-2073 is fixed -->
     <surefire.version>2.13</surefire.version>
   </properties>
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 43b80564c1..23005f008e 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -26,7 +26,6 @@
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <module.name>org.apache.logging.log4j.jul</module.name>
-    <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-kubernetes/pom.xml b/log4j-kubernetes/pom.xml
index a3ea35c9bd..9041f0aadb 100644
--- a/log4j-kubernetes/pom.xml
+++ b/log4j-kubernetes/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.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-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml
index a580529777..e117ba3321 100644
--- a/log4j-layout-template-json-test/pom.xml
+++ b/log4j-layout-template-json-test/pom.xml
@@ -36,7 +36,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/pom.xml b/log4j-layout-template-json/pom.xml
index 227d82d648..58a4569058 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -36,7 +36,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/manual/index.md b/log4j-layout-template-json/src/site/manual/index.md
deleted file mode 100644
index b8cb6e38da..0000000000
--- a/log4j-layout-template-json/src/site/manual/index.md
+++ /dev/null
@@ -1,32 +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
-
-This module provides a customizable and efficient JSON layout.
-
-## Requirements
-
-This module was introduced in Log4j 3.0.0 and requires Jackson.
-
-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/src/site/site.xml b/log4j-layout-template-json/src/site/site.xml
deleted file mode 100644
index 633de94c82..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 c901a7ab75..d189ae2c6d 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 d7e863a2f4..58e9037eee 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 0ec4e6c101..64c9b1ff0d 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 57f7960cee..1a4156f62a 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>
   </properties>
   <dependencies>
     <dependency>
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index 476dfb76b4..ffa91ce1ea 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -35,7 +35,6 @@
     <projectDir>/log4j-perf</projectDir>
     <uberjar.name>benchmarks</uberjar.name>
     <revapi.skip>true</revapi.skip>
-    <maven.doap.skip>true</maven.doap.skip>
     <module.name>org.apache.logging.log4j.perf</module.name>
   </properties>
 
diff --git a/log4j-samples/log4j-samples-flume-embedded/pom.xml b/log4j-samples/log4j-samples-flume-embedded/pom.xml
index 84492b0d58..0c1133c7d5 100644
--- a/log4j-samples/log4j-samples-flume-embedded/pom.xml
+++ b/log4j-samples/log4j-samples-flume-embedded/pom.xml
@@ -57,10 +57,6 @@
       <groupId>org.apache.flume</groupId>
       <artifactId>flume-ng-node</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.samples</groupId>
       <artifactId>log4j-samples-flume-common</artifactId>
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index 44a21b5849..a682f54ad0 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -75,14 +75,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 79f5f834e9..6b1cfd9d27 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -34,7 +34,6 @@
       they do not require support for SLF4J's EventData -->
     <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 93d41a2286..a0e7c7dac7 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.0</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-spring-boot/pom.xml b/log4j-spring-boot/pom.xml
index fd0be2c6c0..e467055962 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>
     <revapi.skip>true</revapi.skip>
   </properties>
 
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-application/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
index 7c7e032d38..91b6bd5ce6 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
@@ -137,10 +137,12 @@
 
   <build>
     <plugins>
+
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -166,6 +168,7 @@
           <proc>none</proc>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -173,6 +176,7 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -202,14 +206,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -238,6 +235,7 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-toolchains-plugin</artifactId>
@@ -256,6 +254,7 @@
           </toolchains>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
@@ -267,6 +266,26 @@
           </execution>
         </executions>
       </plugin>
+
+      <!-- Skipping `requireUpperBoundDeps` enforcer rule.
+           The entire Spring Boot, SnakeYAML, and Kotlin milky way is causing a mayhem there.
+           We should not fix `requireUpperBoundDeps` issues of our dependencies. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-upper-bound-deps</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
   <profiles>
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 f637b13b8f..b981a5890d 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
@@ -23,7 +23,7 @@
     <artifactId>log4j-spring-cloud-config-samples</artifactId>
     <version>2.19.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.logging.log4j.samples</groupId>
+
   <artifactId>log4j-spring-cloud-config-sample-server</artifactId>
   <packaging>jar</packaging>
 
@@ -42,7 +42,6 @@
 
     <!-- maven plugin config -->
     <pmd.failurePriority>2</pmd.failurePriority>
-    <maven.doap.skip>true</maven.doap.skip>
   </properties>
 
   <dependencies>
@@ -108,39 +107,14 @@
     </dependency>
   </dependencies>
 
-
   <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>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -148,6 +122,7 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -171,30 +146,34 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
+
+      <!-- Skipping `requireUpperBoundDeps` enforcer rule.
+           The entire Spring Boot, SnakeYAML, and Kotlin milky way is causing a mayhem there.
+           We should not fix `requireUpperBoundDeps` issues of our dependencies. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-upper-bound-deps</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 
-  <distributionManagement>
-    <downloadUrl>https://logging.apache.org/log4j/2.x/download.html</downloadUrl>
-    <!-- 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>
-    </site>
-  </distributionManagement>
-
   <repositories>
     <repository>
       <id>spring-snapshots</id>
@@ -213,32 +192,5 @@
       </snapshots>
     </repository>
   </repositories>
-  <profiles>
-    <profile>
-      <id>rat</id>
-      <build>
-        <plugins>
-          <!-- RAT report -->
-          <plugin>
-            <groupId>org.apache.rat</groupId>
-            <artifactId>apache-rat-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/*.yaml</exclude>
-                <exclude>**/readme.txt</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>verify</phase>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+
 </project>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/readme.txt b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/readme.txt
deleted file mode 100644
index e69de29bb2..0000000000
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 a215ff448b..209a630af0 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
@@ -71,14 +71,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 8761293822..a5d7105d6c 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -16,26 +16,30 @@
  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/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j</artifactId>
     <version>2.19.1-SNAPSHOT</version>
   </parent>
+
   <artifactId>log4j-spring-cloud-config</artifactId>
   <packaging>pom</packaging>
   <name>Apache Log4j Spring Cloud Config Support</name>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <revapi.skip>true</revapi.skip>
     <log4jParentDir>${basedir}/..</log4jParentDir>
-    <maven.doap.skip>true</maven.doap.skip>
-
     <spring-cloud.version>2021.0.4</spring-cloud.version>
   </properties>
+
   <dependencyManagement>
     <dependencies>
-      <!-- First BOM declaring a version wins, so it must be ours. -->
+
+      <!-- First BOM declaring a version wins, so it must be ours: -->
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-bom</artifactId>
@@ -43,6 +47,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
@@ -50,6 +55,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
@@ -57,10 +63,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
     </dependencies>
   </dependencyManagement>
+
   <modules>
     <module>log4j-spring-cloud-config-client</module>
     <module>log4j-spring-cloud-config-samples</module>
   </modules>
+
 </project>
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 00883595c6..8b99aafcb2 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 c9723daf14..3d79a88e79 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>
     <revapi.skip>true</revapi.skip>
   </properties>
   <dependencies>
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 b6c87fe3e7..ee49f444f8 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 25eb6caf82..8a3d75c9a0 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 63249e9365..8a62c5f9ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,30 +16,38 @@
   ~ 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 https://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>2.19.1-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>2.19.1-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>GitHub Actions</system>
     <url>https://github.com/apache/logging-log4j2/actions</url>
   </ciManagement>
   <inceptionYear>1999</inceptionYear>
+
   <developers>
+
     <developer>
       <id>rgoers</id>
       <name>Ralph Goers</name>
@@ -50,6 +58,7 @@
       </roles>
       <timezone>America/Phoenix</timezone>
     </developer>
+
     <developer>
       <id>ggregory</id>
       <name>Gary Gregory</name>
@@ -61,10 +70,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>
@@ -74,6 +81,7 @@
       </roles>
       <timezone>America/Los_Angeles</timezone>
     </developer>
+
     <developer>
       <id>rpopma</id>
       <name>Remko Popma</name>
@@ -82,10 +90,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>
@@ -95,6 +101,7 @@
       </roles>
       <timezone>America/Chicago</timezone>
     </developer>
+
     <developer>
       <id>mattsicker</id>
       <name>Matt Sicker</name>
@@ -105,6 +112,7 @@
       </roles>
       <timezone>America/Chicago</timezone>
     </developer>
+
     <developer>
       <id>bbrouwer</id>
       <name>Bruce Brouwer</name>
@@ -114,6 +122,7 @@
       </roles>
       <timezone>America/Detroit</timezone>
     </developer>
+
     <developer>
       <id>rgupta</id>
       <name>Raman Gupta</name>
@@ -123,6 +132,7 @@
       </roles>
       <timezone>Asia/Kolkata</timezone>
     </developer>
+
     <developer>
       <id>mikes</id>
       <name>Mikael Ståldal</name>
@@ -133,6 +143,7 @@
       </roles>
       <timezone>Europe/Stockholm</timezone>
     </developer>
+
     <developer>
       <id>ckozak</id>
       <name>Carter Kozak</name>
@@ -142,10 +153,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>
@@ -154,7 +163,8 @@
         <role>PMC Member</role>
       </roles>
       <timezone>Europe/Amsterdam</timezone>
-    </developer>	  
+    </developer>
+
     <developer>
       <id>rgrabowski</id>
       <name>Ron Grabowski</name>
@@ -164,6 +174,7 @@
       </roles>
       <timezone>America/New_York</timezone>
     </developer>
+
     <developer>
       <id>pkarwasz</id>
       <name>Piotr P. Karwasz</name>
@@ -173,6 +184,7 @@
       </roles>
       <timezone>Europe/Warsaw</timezone>
     </developer>
+
     <developer>
       <id>grobmeier</id>
       <name>Christian Grobmeier</name>
@@ -182,70 +194,41 @@
       </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>https://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>https://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>https://mail-archives.apache.org/mod_mbox/logging-log4j-user/</otherArchive>
-        <otherArchive>https://marc.info/?l=log4j-user</otherArchive>
-        <otherArchive>https://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>https://mail-archives.apache.org/mod_mbox/logging-dev/</otherArchive>
-        <otherArchive>https://marc.info/?l=dev</otherArchive>
-        <otherArchive>https://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>
     <tag>log4j-${Log4jReleaseVersion}</tag>
   </scm>
+
   <properties>
-    <!-- make sure to update these for each release! -->
+
+    <!-- ===========================
+         Release-specific properties
+         =========================== -->
     <log4jParentDir>${basedir}</log4jParentDir>
     <Log4jReleaseVersion>2.19.0</Log4jReleaseVersion>
     <Log4jReleaseVersionJava7>2.12.4</Log4jReleaseVersionJava7>
@@ -253,11 +236,14 @@
     <Log4jReleaseManager>Ralph Goers</Log4jReleaseManager>
     <Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey>
     <Log4jSigningUserName>rgoers@apache.org</Log4jSigningUserName>
+
+    <!-- =================
+         Common properties
+         ================= -->
     <revapi.skip>false</revapi.skip>
     <manifestfile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestfile>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.doap.skip>false</maven.doap.skip>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- See https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <!-- 1641056400 = Jan 1 2022, instead of 1969, which shows up in Javadoc -->
@@ -265,31 +251,44 @@
     <docLabel>Site Documentation</docLabel>
     <projectDir/>
     <module.name/>
-    <argLine>-Xms256m -Xmx1024m</argLine>
-    <javaTargetVersion>1.8</javaTargetVersion>
+    <!-- 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>
+
+    <!-- ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+         ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+         ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+         ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+          ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
 
-    <!-- Plugin versions -->
-    <!-- Properties in the format `<artifactId>.version` -->
-    <!-- Spring Boot uses the same convention. -->
+         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 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.8</jacoco-maven-plugin.version>
     <log4j-tools.version>0.1.0-SNAPSHOT</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>
@@ -297,18 +296,15 @@
     <maven-toolchains-plugin.version>3.1.0</maven-toolchains-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.2</activemq.version>
     <assertj.version>3.23.1</assertj.version>
     <awaitility.version>4.2.0</awaitility.version>
@@ -323,7 +319,8 @@
     <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.15</conversant.disruptor.version> <!-- Version 1.2.16 requires Java 9 -->
+    <!-- `com.conversantmedia:disruptor` version 1.2.16 requires Java 9: -->
+    <conversant.disruptor.version>1.2.15</conversant.disruptor.version>
     <disruptor.version>3.4.4</disruptor.version>
     <elasticsearch.version>7.17.6</elasticsearch.version>
     <embedded-ldap.version>0.9.0</embedded-ldap.version>
@@ -340,12 +337,12 @@
     <icu4j.version>72.1</icu4j.version>
     <jackson1.version>1.9.13</jackson1.version>
     <jackson-bom.version>2.13.4.20221013</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-jms.version>2.0.1</javax-jms.version>
@@ -370,6 +367,7 @@
     <kafka.version>1.1.1</kafka.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-cachefile-transformer.version>2.15.0</log4j2-cachefile-transformer.version>
@@ -382,7 +380,7 @@
     <org.eclipse.osgi.version>3.13.0.v20180226-1711</org.eclipse.osgi.version>
     <org.eclipse.persistence.version>2.7.11</org.eclipse.persistence.version>
     <oro.version>2.0.8</oro.version>
-    <!-- The OSGi API version MUST always be the MINIMUM version Log4j supports -->
+    <!-- The OSGi API version MUST always be the MINIMUM version Log4j supports: -->
     <osgi.api.version>6.0.0</osgi.api.version>
     <pax-exam.version>4.13.5</pax-exam.version>
     <plexus-utils.version>3.4.2</plexus-utils.version>
@@ -396,10 +394,12 @@
     <woodstox.version>6.3.1</woodstox.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>
@@ -407,6 +407,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-bom</artifactId>
@@ -414,6 +415,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
@@ -421,6 +423,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>jakarta.platform</groupId>
         <artifactId>jakarta.jakartaee-bom</artifactId>
@@ -428,6 +431,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
@@ -435,7 +439,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <!-- JUnit 5 engine -->
+
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
@@ -443,6 +447,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>io.fabric8</groupId>
         <artifactId>kubernetes-client-bom</artifactId>
@@ -450,6 +455,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
@@ -457,6 +463,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
@@ -464,127 +471,148 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api-java9</artifactId>
         <version>${project.version}</version>
         <type>zip</type>
       </dependency>
+
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core-java9</artifactId>
         <version>${project.version}</version>
         <type>zip</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>
@@ -612,6 +640,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-core</artifactId>
@@ -627,6 +656,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-embedded-agent</artifactId>
@@ -650,6 +680,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-node</artifactId>
@@ -673,6 +704,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+
       <dependency>
         <groupId>org.apache.flume</groupId>
         <artifactId>flume-ng-sdk</artifactId>
@@ -688,22 +720,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>
@@ -727,317 +763,372 @@
           </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 -->
+
       <dependency>
         <groupId>com.google.code.java-allocation-instrumenter</groupId>
         <artifactId>java-allocation-instrumenter</artifactId>
         <version>3.3.0</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>com.sun</groupId>
         <artifactId>jconsole</artifactId>
         <version>${jconsole.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>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>
-      <!-- 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>
+
       <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.apache.felix</groupId>
         <artifactId>org.apache.felix.framework</artifactId>
         <version>${felix.version}</version>
       </dependency>
+
       <dependency>
         <groupId>org.eclipse.tycho</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.core</artifactId>
         <version>${osgi.api.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>
@@ -1049,109 +1140,105 @@
           </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.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>
       </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>
       </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 verify</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.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.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>
-        </plugin>
+
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
@@ -1167,19 +1254,13 @@
             </execution>
           </executions>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>${maven-checkstyle-plugin.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>com.puppycrawl.tools</groupId>
-              <artifactId>checkstyle</artifactId>
-              <version>${checkstyle.version}</version>
-            </dependency>
-          </dependencies>
         </plugin>
-        <!-- some nice default compiler options -->
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -1199,20 +1280,16 @@
             </compilerArguments>
           </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>
@@ -1239,6 +1316,7 @@
             </execution>
           </executions>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -1249,26 +1327,25 @@
             <doclint>none</doclint>
           </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.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>
@@ -1284,65 +1361,39 @@
             </execution>
           </executions>
         </plugin>
+
         <plugin>
           <groupId>net.sourceforge.maven-taglib</groupId>
           <artifactId>maven-taglib-plugin</artifactId>
           <version>${maven-taglib-plugin.version}</version>
         </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-toolchains-plugin</artifactId>
           <version>${maven-toolchains-plugin.version}</version>
         </plugin>
+
         <plugin>
           <groupId>com.github.spotbugs</groupId>
           <artifactId>spotbugs-maven-plugin</artifactId>
           <version>${spotbugs-maven-plugin.version}</version>
-          <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>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>
@@ -1372,7 +1423,6 @@
             <!-- Other -->
             <exclude>felix-cache/**</exclude>
             <exclude>**/README.md</exclude>
-            <exclude>RELEASE-NOTES.md</exclude>
             <exclude>SECURITY.md</exclude>
             <exclude>.java-version</exclude>
             <exclude>**/*.yml</exclude>
@@ -1393,6 +1443,7 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -1402,14 +1453,41 @@
             <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-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-upper-bound-deps</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireUpperBoundDeps/>
+              </rules>
             </configuration>
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
@@ -1421,65 +1499,55 @@
           </dependency>
         </dependencies>
       </plugin>
+
       <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-      </plugin>
-      <!-- DOAP (RDF) metadata generation -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-doap-plugin</artifactId>
-        <inherited>false</inherited>
-        <dependencies>
-          <!-- Fix java.lang.IllegalArgumentException: Invalid version number: Version number may be negative or greater than 255 -->
-          <dependency>
-            <groupId>com.ibm.icu</groupId>
-            <artifactId>icu4j</artifactId>
-            <version>${icu4j.version}</version>
-          </dependency>
-        </dependencies>
-        <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>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>site</id>
-            <phase>site</phase>
+            <id>default-spotless</id>
             <goals>
-              <goal>generate</goal>
+              <goal>check</goal>
             </goals>
           </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>
-      <!-- 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>
-        <executions>
-          <execution>
-            <id>enforce-upper-bound-deps</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <enforceUpperBoundDeps/>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
+        <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>
@@ -1501,26 +1569,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-asciidoc-export</id>
@@ -1558,11 +1633,13 @@
           </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>
             <id>copy-site</id>
             <phase>pre-site</phase>
@@ -1584,18 +1661,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>
@@ -1612,130 +1686,49 @@
             </attributes>
           </asciidoc>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctor-maven-plugin</artifactId>
+            <version>${asciidoctor-maven-plugin.version}</version>
+          </dependency>
+        </dependencies>
       </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>
-        </configuration>
-      </plugin>
+
+      <!-- ███████ ███    ██ ██████         ███████ ██ ████████ ███████
+           ██      ████   ██ ██   ██ ██     ██      ██    ██    ██
+           █████   ██ ██  ██ ██   ██        ███████ ██    ██    █████
+           ██      ██  ██ ██ ██   ██ ██          ██ ██    ██    ██
+           ███████ ██   ████ ██████         ███████ ██    ██    ███████ -->
+
     </plugins>
+
   </build>
+
+  <!-- *Warning!* Do not add anything to `reporting`, unless you disable something inherited from parent POMs.
+       Site generation is actively worked on to move away from `maven-site-plugin` et al. -->
   <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>
-            <exclude>**/target/**/*</exclude>
-            <!-- 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>
-            <!-- 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>**/README.md</exclude>
-            <exclude>SECURITY.md</exclude>
-            <exclude>RELEASE-NOTES.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>
-            <exclude>.java-version</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
+
+      <!-- disable `maven-project-info-reports-plugin` injected by `org.apache:apache` POM, which is parenting `org.apache.logging:logging-parent` POM, which is parenting us: -->
       <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>rel/${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>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
           </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>
@@ -1743,11 +1736,14 @@
     <!-- `repository` from ASF parent POM (id: apache.releases.https) -->
     <!-- `snapshotRepository` from ASF parent POM (id: apache.snapshots.https) -->
   </distributionManagement>
+
   <modules>
+
     <!-- Unpublished modules first: -->
     <module>log4j-api-java9</module>
     <module>log4j-core-java9</module>
-    <!-- Alphabetical order -->
+
+    <!-- Modules in alphabetical order: -->
     <module>log4j-1.2-api</module>
     <module>log4j-api</module>
     <module>log4j-api-test</module>
@@ -1758,6 +1754,9 @@
     <module>log4j-core-its</module>
     <module>log4j-core-test</module>
     <module>log4j-couchdb</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-iostreams</module>
@@ -1786,32 +1785,12 @@
     <module>log4j-to-slf4j</module>
     <module>log4j-to-jul</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>
@@ -1861,6 +1840,8 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- shortcut to enable `log4j-distribution` module creating the release distribution containing artifacts, sources, etc. -->
     <profile>
       <id>apache-release</id>
       <build>
@@ -1882,113 +1863,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>
-                <exclude>**/target/**/*</exclude>
-                <!-- 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>
-                <!-- 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>**/README.md</exclude>
-                <exclude>RELEASE-NOTES.md</exclude>
-                <exclude>SECURITY.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>
-                <exclude>.java-version</exclude>
-              </excludes>
-            </configuration>
-            <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>jdk8orGreater</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-    </profile>
+
     <profile>
       <id>java8-doclint-disabled</id>
       <activation>
@@ -1998,5 +1873,7 @@
         <javadoc.opts>-Xdoclint:none</javadoc.opts>
       </properties>
     </profile>
+
   </profiles>
+
 </project>
diff --git a/src/site/custom/project-info-report.properties b/src/site/custom/project-info-report.properties
deleted file mode 100644
index cf6162affc..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 submodules.
-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 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 check out 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 check out the Subversion repository via HTTPS.
-report.scm.devaccess.svn.intro1.other                              = Committers must check out the Subversion repository.
-report.scm.devaccess.svn.intro1.svn                                = Committers must check out the Subversion repository via SVN.
-report.scm.devaccess.svn.intro1.svnssh                             = Committers must check out 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 consists 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 (subprojects) 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 information 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/src/site/markdown/index.md b/src/site/markdown/log4j-api.md
similarity index 100%
rename from log4j-api/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-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-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-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-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-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-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-spring-cloud-config/src/site/markdown/index.md b/src/site/markdown/log4j-spring-cloud-config.md
similarity index 100%
rename from log4j-spring-cloud-config/src/site/markdown/index.md
rename to src/site/markdown/log4j-spring-cloud-config.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 f513d97a8d..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>https://logging.apache.org/log4j/2.x/images/logo.jpg</projectLogo>
-    <companyName>The Apache Software Foundation</companyName>
-    <companyLogo>https://www.apache.org/images/asf_logo_wide.png</companyLogo>
-  </cover>
-</document>
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 8db9e6be29..0ce9a34c72 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -320,40 +320,37 @@
     </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="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="Apache Flume Appender" href="log4j-flume-ng.html"/>
+      <item name="Log4j Tag Library" href="log4j-taglib.html"/>
+      <item name="Log4j JMX GUI" href="log4j-jmx-gui.html"/>
+      <item name="Log4j Web Application Support" href="log4j-web.html"/>
+      <item name="Log4j Jakarta Web Application Support" href="log4j-jakarta-web.html"/>
+      <item name="Log4j Application Server Integration" href="log4j-appserver.html"/>
+      <item name="Log4j CouchDB appender" href="log4j-couchdb.html"/>
+      <item name="Log4j MongoDB3 appender" href="log4j-mongodb3.html"/>
+      <item name="Log4j MongoDB4 appender" href="log4j-mongodb4.html"/>
+      <item name="Log4j Cassandra appender" href="log4j-cassandra.html"/>
+      <item name="Log4j IO Streams" href="log4j-iostreams.html"/>
+      <item name="Log4j Liquibase Binding" href="log4j-liquibase.html"/>
+      <item name="Log4j Docker Support" href="log4j-docker.html"/>
+      <item name="Log4j Spring Boot" href="log4j-spring-boot.html"/>
+      <item name="Log4j Spring Cloud Config Client" href="log4j-spring-cloud-config-client.html"/>
     </menu>
 
     <menu name="Project Information" img="img/glyphicons/info.png">
-      <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" />
+      <item name="Mailing Lists" href="/mailing-lists.html" />
+      <item name="Issue Tracking" href="https://github.com/apache/logging-log4j2/issues" />
+      <item name="Project License" href="https://www.apache.org/licenses/LICENSE-2.0" />
+      <item name="Source Repository" href="https://github.com/apache/logging-log4j2" />
     </menu>
 
     <menu name="Project Reports" img="img/glyphicons/layers.png">