You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2023/06/03 04:41:39 UTC
[logging-log4j2] branch main updated: More site updates
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 35a56d1281 More site updates
35a56d1281 is described below
commit 35a56d1281f8541d4d4ed9cb772d1ca2c6b58bad
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Fri Jun 2 21:41:28 2023 -0700
More site updates
---
src/site/asciidoc/articles.adoc | 2 +-
src/site/asciidoc/download.adoc | 99 -------
src/site/asciidoc/download.adoc.vm | 96 +++++++
src/site/asciidoc/faq.adoc | 2 +-
src/site/asciidoc/guidelines.adoc | 2 +-
src/site/asciidoc/javadoc.adoc | 4 +-
src/site/asciidoc/runtime-dependencies.adoc | 397 ++++++++++++++++++++++++++--
src/site/asciidoc/security.adoc | 2 +-
src/site/asciidoc/support.adoc | 2 +-
src/site/asciidoc/thanks.adoc | 2 +-
10 files changed, 480 insertions(+), 128 deletions(-)
diff --git a/src/site/asciidoc/articles.adoc b/src/site/asciidoc/articles.adoc
index 105029af4b..ce36dfb08c 100644
--- a/src/site/asciidoc/articles.adoc
+++ b/src/site/asciidoc/articles.adoc
@@ -17,7 +17,7 @@
= Articles and Tutorials
++++
-<link rel="stylesheet" type="text/css" href="../css/tables.css">
+<link rel="stylesheet" type="text/css" href="css/tables.css">
++++
A collection of external articles and tutorials about Log4j 2. The manual/index.html[Log4j 2 manual] is the ultimate
diff --git a/src/site/asciidoc/download.adoc b/src/site/asciidoc/download.adoc
deleted file mode 100644
index 211f6cc74b..0000000000
--- a/src/site/asciidoc/download.adoc
+++ /dev/null
@@ -1,99 +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.
-////
-= Download Apache Log4j 2
-
-++++
-<link rel="stylesheet" type="text/css" href="../css/tables.css">
-++++
-
-Apache Log4j 2 is distributed under the
-https://www.apache.org/licenses/LICENSE-2.0.html[Apache License, version 2.0].
-
-The link in the Mirrors column should display a list of available
-mirrors with a default selection based on your inferred location. If you
-do not see that page, try a different browser. The checksum and
-signature are links to the originals on the main distribution server.
-
-|===
-|Distribution |Mirrors |Checksum |Signature
-
-|Apache Log4j 2 binary (tar.gz)
-|https://www.apache.org/dyn/closer.lua/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-bin.tar.gz[apache-log4j-{Log4jReleaseVersion}-bin.tar.gz]
-|https://www.apache.org/dist/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-bin.tar.gz.sha512[apache-log4j-{Log4jReleaseVersion}-bin.tar.gz.sha512]
-|https://www.apache.org/dist/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-bin.tar.gz.asc[apache-log4j-{Log4jReleaseVersion}-bin.tar.gz.asc]
-
-|Apache Log4j 2 binary (zip)
-|https://www.apache.org/dyn/closer.lua/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-bin.zip[apache-log4j-{Log4jReleaseVersion}-bin.zip]
-|https://www.apache.org/dist/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-bin.zip.sha512[apache-log4j-{Log4jReleaseVersion}-bin.zip.sha512]
-|https://www.apache.org/dist/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-bin.zip.asc[apache-log4j-{Log4jReleaseVersion}-bin.zip.asc]
-
-|Apache Log4j 2 source (tar.gz)
-|https://www.apache.org/dyn/closer.lua/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-src.tar.gz[apache-log4j-{Log4jReleaseVersion}-src.tar.gz]
-|https://www.apache.org/dist/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-src.tar.gz.sha512[apache-log4j-{Log4jReleaseVersion}-src.tar.gz.sha512]
-|https://www.apache.org/dist/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-src.tar.gz.asc[apache-log4j-{Log4jReleaseVersion}-src.tar.gz.asc]
-
-|Apache Log4j 2 source (zip)
-|https://www.apache.org/dyn/closer.lua/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-src.zip[apache-log4j-{Log4jReleaseVersion}-src.zip]
-|https://www.apache.org/dist/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-src.zip.sha512[apache-log4j-{Log4jReleaseVersion}-src.zip.sha512]
-|https://www.apache.org/dist/logging/log4j/{Log4jReleaseVersion}/apache-log4j-{Log4jReleaseVersion}-src.zip.asc[apache-log4j-{Log4jReleaseVersion}-src.zip.asc]
-|===
-
-It is essential that you verify the integrity of the downloaded files
-using the PGP or SHA512 signatures. Please read
-https://httpd.apache.org/dev/verification.html[Verifying Apache HTTP
-Server Releases] for more information on why you should verify our
-releases.
-
-The PGP signatures can be verified using PGP or GPG. First download the
-https://www.apache.org/dist/logging/KEYS[KEYS] as well as the asc
-signature file for the relevant distribution. Make sure you get these
-files from the https://www.apache.org/dist/logging/[main distribution
-directory], rather than from a mirror. Then verify the signatures using
-
-[source,sh,subs=attributes]
-----
-gpg --import KEYS
-gpg --verify apache-log4j-{Log4jReleaseVersion}-bin.tar.gz.asc apache-log4j-{Log4jReleaseVersion}-bin.tar.gz
-gpg --verify apache-log4j-{Log4jReleaseVersion}-bin.zip.asc apache-log4j-{Log4jReleaseVersion}-bin.zip
-gpg --verify apache-log4j-{Log4jReleaseVersion}-src.tar.gz.asc apache-log4j-{Log4jReleaseVersion}-src.tar.gz
-gpg --verify apache-log4j-{Log4jReleaseVersion}-src.zip.asc apache-log4j-{Log4jReleaseVersion}-src.zip
-----
-
-Apache Log4j {Log4jReleaseVersion} is signed by {Log4jReleaseManager} ({Log4jReleaseKey}).
-
-Alternatively, you can verify the SHA512 signature on the files. A unix
-program called sha512sum is included in many unix distributions.
-
-== Previous Releases
-
-Log4j 2.12.1 was the last 2.x release to support Java 7 while Log4j 2.3 was the last 2.x release to support
-Java 6. The Log4j team no longer provides support for Java 6 or 7.
-
-All previous releases of Apache log4j can be found in the
-https://archive.apache.org/dist/logging/log4j/[ASF archive repository]. Of course, all releases are availble for
-use as dependencies from the https://search.maven.org/search?q=org.apache.logging.log4j[Maven Central Repository]
-
-== Using Log4j on your classpath
-
-To use Log4j 2 in your application make sure that both the API and Core
-jars are in the application’s classpath. Add the dependencies listed
-below to your classpath.
-
-* log4j-api-{Log4jReleaseVersion}.jar
-* log4j-core-{Log4jReleaseVersion}.jar
-
-You can do this from the command line or a manifest file.
diff --git a/src/site/asciidoc/download.adoc.vm b/src/site/asciidoc/download.adoc.vm
new file mode 100644
index 0000000000..c4c3aa6a37
--- /dev/null
+++ b/src/site/asciidoc/download.adoc.vm
@@ -0,0 +1,96 @@
+////
+ 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.
+////
+= Download Apache Log4j 2
+
+++++
+<link rel="stylesheet" type="text/css" href="css/tables.css">
+++++
+
+Apache Log4j 2 is distributed under the
+https://www.apache.org/licenses/LICENSE-2.0.html[Apache License, version 2.0].
+
+The link in the Mirrors column should display a list of available
+mirrors with a default selection based on your inferred location. If you
+do not see that page, try a different browser. The checksum and
+signature are links to the originals on the main distribution server.
+
+|===
+|Distribution |Mirrors |Checksum |Signature
+
+|Apache Log4j 3.x binary (tar.gz)
+|https://www.apache.org/dyn/closer.lua/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-bin.tar.gz[apache-log4j-${Log4jReleaseVersion}-bin.tar.gz]
+|https://www.apache.org/dist/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-bin.tar.gz.sha512[apache-log4j-${Log4jReleaseVersion}-bin.tar.gz.sha512]
+|https://www.apache.org/dist/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-bin.tar.gz.asc[apache-log4j-${Log4jReleaseVersion}-bin.tar.gz.asc]
+
+|Apache Log4j 3.x binary (zip)
+|https://www.apache.org/dyn/closer.lua/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-bin.zip[apache-log4j-${Log4jReleaseVersion}-bin.zip]
+|https://www.apache.org/dist/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-bin.zip.sha512[apache-log4j-${Log4jReleaseVersion}-bin.zip.sha512]
+|https://www.apache.org/dist/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-bin.zip.asc[apache-log4j-${Log4jReleaseVersion}-bin.zip.asc]
+
+|Apache Log4j 3.x source (tar.gz)
+|https://www.apache.org/dyn/closer.lua/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-src.tar.gz[apache-log4j-${Log4jReleaseVersion}-src.tar.gz]
+|https://www.apache.org/dist/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-src.tar.gz.sha512[apache-log4j-${Log4jReleaseVersion}-src.tar.gz.sha512]
+|https://www.apache.org/dist/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-src.tar.gz.asc[apache-log4j-${Log4jReleaseVersion}-src.tar.gz.asc]
+
+|Apache Log4j 3.x source (zip)
+|https://www.apache.org/dyn/closer.lua/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-src.zip[apache-log4j-${Log4jReleaseVersion}-src.zip]
+|https://www.apache.org/dist/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-src.zip.sha512[apache-log4j-${Log4jReleaseVersion}-src.zip.sha512]
+|https://www.apache.org/dist/logging/log4j/${Log4jReleaseVersion}/apache-log4j-${Log4jReleaseVersion}-src.zip.asc[apache-log4j-${Log4jReleaseVersion}-src.zip.asc]
+|===
+
+It is essential that you verify the integrity of the downloaded files
+using the PGP or SHA512 signatures. Please read
+https://httpd.apache.org/dev/verification.html[Verifying Apache HTTP
+Server Releases] for more information on why you should verify our
+releases.
+
+The PGP signatures can be verified using PGP or GPG. First download the
+https://www.apache.org/dist/logging/KEYS[KEYS] as well as the asc
+signature file for the relevant distribution. Make sure you get these
+files from the https://www.apache.org/dist/logging/[main distribution
+directory], rather than from a mirror. Then verify the signatures using
+
+[source,sh,subs=attributes]
+----
+gpg --import KEYS
+gpg --verify apache-log4j-${Log4jReleaseVersion}-bin.tar.gz.asc apache-log4j-${Log4jReleaseVersion}-bin.tar.gz
+gpg --verify apache-log4j-${Log4jReleaseVersion}-bin.zip.asc apache-log4j-${Log4jReleaseVersion}-bin.zip
+gpg --verify apache-log4j-${Log4jReleaseVersion}-src.tar.gz.asc apache-log4j-${Log4jReleaseVersion}-src.tar.gz
+gpg --verify apache-log4j-${Log4jReleaseVersion}-src.zip.asc apache-log4j-${Log4jReleaseVersion}-src.zip
+----
+
+Apache Log4j ${Log4jReleaseVersion} is signed by {Log4jReleaseManager} ({Log4jReleaseKey}).
+
+Alternatively, you can verify the SHA512 signature on the files. A unix
+program called sha512sum is included in many unix distributions.
+
+== Previous Releases
+
+All previous releases of Apache log4j can be found in the
+https://archive.apache.org/dist/logging/log4j/[ASF archive repository]. Of course, all releases are availble for
+use as dependencies from the https://search.maven.org/search?q=org.apache.logging.log4j[Maven Central Repository]
+
+== Using Log4j on your classpath
+
+To use Log4j 3.x in your application make sure that both the API and Core
+jars are in the application’s classpath. Add the dependencies listed
+below to your classpath.
+
+* log4j-api-${Log4jReleaseVersion}.jar
+* log4j-core-${Log4jReleaseVersion}.jar
+
+You can do this from the command line or a manifest file.
diff --git a/src/site/asciidoc/faq.adoc b/src/site/asciidoc/faq.adoc
index 1dea0a0496..d431ffe306 100644
--- a/src/site/asciidoc/faq.adoc
+++ b/src/site/asciidoc/faq.adoc
@@ -17,7 +17,7 @@
= Frequently Asked Questions
++++
-<link rel="stylesheet" type="text/css" href="../css/tables.css">
+<link rel="stylesheet" type="text/css" href="css/tables.css">
++++
:toc:
diff --git a/src/site/asciidoc/guidelines.adoc b/src/site/asciidoc/guidelines.adoc
index 7b36f3efb1..7927eacec7 100644
--- a/src/site/asciidoc/guidelines.adoc
+++ b/src/site/asciidoc/guidelines.adoc
@@ -17,7 +17,7 @@
= Apache Log4j Project Guidelines
++++
-<link rel="stylesheet" type="text/css" href="../css/tables.css">
+<link rel="stylesheet" type="text/css" href="css/tables.css">
++++
This document defines the guidelines for the
diff --git a/src/site/asciidoc/javadoc.adoc b/src/site/asciidoc/javadoc.adoc
index dea964c3d3..e68020956a 100644
--- a/src/site/asciidoc/javadoc.adoc
+++ b/src/site/asciidoc/javadoc.adoc
@@ -26,9 +26,9 @@ directly in code. You can also use the menu links on the left.
|===
|Component |Description
-|link:javadoc/log4j-api[Log4j 2 API]
+|link:javadoc/log4j-api[Log4j 3.x API]
|The interface that applications should use and code against.
|link:javadoc/log4j-core[Implementation]
-|The standard implementation, also called the Log4j 2 Core, that contains Appenders, Filters, and more.
+|The standard implementation, also called the Log4j 3.x Core, that contains Appenders, Filters, and more.
|===
diff --git a/src/site/asciidoc/runtime-dependencies.adoc b/src/site/asciidoc/runtime-dependencies.adoc
index 2b3ae8abb7..c016f28d0b 100644
--- a/src/site/asciidoc/runtime-dependencies.adoc
+++ b/src/site/asciidoc/runtime-dependencies.adoc
@@ -17,14 +17,13 @@
= Runtime Dependencies
++++
-<link rel="stylesheet" type="text/css" href="../css/tables.css">
+<link rel="stylesheet" type="text/css" href="css/tables.css">
++++
Some Log4j features depend on external libraries. This page lists the
required and optional dependencies.
-As of version 2.10.0 the Log4j API is a Java module (with a
-module-info.java). Many of the other jars are automatic modules. The
+The Log4j API is a Java module (with a module-info.java). Many of the other jars are also JPMS modules. The
characteristics of the modules are:
[cols="3h,5m,12a"]
@@ -38,31 +37,194 @@ characteristics of the modules are:
!===
!Module Directive !Notes
-2+!exports org.apache.logging.log4j
+!exports org.apache.logging.log4j
+!
-2+!exports org.apache.logging.log4j.message
+!exports org.apache.logging.log4j.message
+!
-2+!exports org.apache.logging.log4j.simple
+!exports org.apache.logging.log4j.simple
+!
-2+!exports org.apache.logging.log4j.spi
+!exports org.apache.logging.log4j.spi
+!
-2+!exports org.apache.logging.log4j.spi
+!exports org.apache.logging.log4j.status
+!
!exports org.apache.logging.log4j.util
!Some classes in this package are used by the logging implementation and should be considered private.
The module info definition may be modified in the future to export these only to the logging implementation.
+!requires static java.sql
+!
+!requires static org.osgi.framework
+!
+
!uses org.apache.logging.log4j.spi.Provider
!Service that must be provided by the logging implementation.
+!uses PropertySource
+!Service that must be provided by the logging implementation.
+!uses org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory
+!Service that must be provided by the logging implementation.
+
+!provides PropertySource with EnvironmentPropertySource, SystemPropertiesPropertySource
+!
!===
|log4j-core
|org.apache.logging.log4j.core
-|Automatic Module
+|
+[cols="m,"]
+!===
+!Module Directive !Notes
+
+!exports org.apache.logging.log4j.core
+!
+!exports org.apache.logging.log4j.core.appender
+!
+!exports org.apache.logging.log4j.core.appender.db
+!
+!exports org.apache.logging.log4j.core.appender.nosql
+!
+!exports org.apache.logging.log4j.core.appender.rewrite
+!
+!exports org.apache.logging.log4j.core.appender.rolling
+!
+!exports org.apache.logging.log4j.core.appender.rolling.action
+!
+!exports org.apache.logging.log4j.core.appender.routing
+!
+!exports org.apache.logging.log4j.core.async
+!
+!exports org.apache.logging.log4j.core.config
+!
+!exports org.apache.logging.log4j.core.config.arbiters
+!
+!exports org.apache.logging.log4j.core.config.builder.api
+!
+!exports org.apache.logging.log4j.core.config.builder.impl
+!
+!exports org.apache.logging.log4j.core.config.composite
+!
+!exports org.apache.logging.log4j.core.config.json
+!
+!exports org.apache.logging.log4j.core.config.plugins
+!
+!exports org.apache.logging.log4j.core.config.plugins.convert
+!
+!exports org.apache.logging.log4j.core.config.plugins.util
+!
+!exports org.apache.logging.log4j.core.config.plugins.visit
+!
+!exports org.apache.logging.log4j.core.config.properties
+!
+!exports org.apache.logging.log4j.core.config.status
+!
+!exports org.apache.logging.log4j.core.config.xml
+!
+!exports org.apache.logging.log4j.core.config.yaml
+!
+!exports org.apache.logging.log4j.core.filter
+!
+!exports org.apache.logging.log4j.core.impl
+!
+!exports org.apache.logging.log4j.core.jmx
+!
+!exports org.apache.logging.log4j.core.layout
+!
+!exports org.apache.logging.log4j.core.lookup
+!
+!exports org.apache.logging.log4j.core.message
+!
+!exports org.apache.logging.log4j.core.net
+!
+!exports org.apache.logging.log4j.core.net.ssl
+!
+!exports org.apache.logging.log4j.core.osgi
+!
+!exports org.apache.logging.log4j.core.parser
+!
+!exports org.apache.logging.log4j.core.pattern
+!
+!exports org.apache.logging.log4j.core.script
+!
+!exports org.apache.logging.log4j.core.selector
+!
+!exports org.apache.logging.log4j.core.time
+!
+!exports org.apache.logging.log4j.core.tools
+!
+!exports org.apache.logging.log4j.core.tools.picocli
+!
+!exports org.apache.logging.log4j.core.util
+!
+!exports org.apache.logging.log4j.core.util.datetime
+!
+
+!// Required Dependencies
+!
+!requires transitive org.apache.logging.log4j
+!
+!requires transitive org.apache.logging.log4j.plugins
+!
+!// Optional Dependencies
+!
+!requires static java.desktop
+!
+!requires static java.management
+!
+!requires static java.sql
+!
+!requires static java.rmi
+!
+!requires static java.xml
+!
+!requires static com.lmax.disruptor
+!
+!requires static org.jctools.core
+!
+!requires static org.osgi.framework
+!
+!requires static com.conversantmedia.disruptor
+!
+!requires static com.fasterxml.jackson.core
+!
+!requires static com.fasterxml.jackson.databind
+!
+!requires static com.fasterxml.jackson.dataformat.xml
+!
+!requires static com.fasterxml.jackson.dataformat.yaml
+!
+!requires static org.apache.commons.compress
+!
+!requires static org.fusesource.jansi
+!
+
+!requires static jdk.unsupported
+!
+
+!uses ContextDataProvider
+!
+!uses WatchEventService
+!
+!uses ScriptManagerFactory
+!
+!provides ThreadInfoFactory with ExtendedThreadInfoFactory
+!
+!provides ContextDataProvider with ThreadContextDataProvider
+!
+!provides Provider with Log4jProvider
+!
+!provides PluginService with Log4jPlugins
+!
+!provides InjectorCallback with DefaultCallback
+!
+!===
|log4j-1.2-api
|org.apache.log4j
-|Automatic Module
+|Automatic Module - It is unlikely any application using JPMS would use Log4j 1.x.
|log4j-appserver
|org.apache.logging.log4j.appserver
@@ -96,9 +258,75 @@ The module info definition may be modified in the future to export these only to
|org.apache.logging.log4j.jmx.gui
|Automatic Module
+|log4j-jpl
+|org.apache.logging.log4j.jpl
+|
+[cols="m,"]
+!===
+!Module Directive !Notes
+
+!exports org.apache.logging.log4j.jpl to junit
+!
+!requires org.apache.logging.log4j
+!
+!requires transitive org.apache.logging.log4j.core
+!
+!provides java.lang.System.LoggerFinder with org.apache.logging.log4j.jpl.Log4jSystemLoggerFinder
+!
+!===
+
|log4j-jul
|org.apache.logging.log4j.jul
-|Automatic Module
+|
+[cols="m,"]
+!===
+!Module Directive !Notes
+
+!exports org.apache.logging.log4j.jul
+!
+!opens org.apache.logging.log4j.jul to org.apache.logging.log4j
+!
+
+!requires org.apache.logging.log4j
+!
+!requires org.apache.logging.log4j.core
+!
+!requires java.desktop
+!
+!requires java.logging
+!
+!===
+
+|log4j-layout-template-json
+|org.apache.logging.log4j.layout.template.json
+|
+[cols="m,"]
+!===
+!Module Directive !Notes
+
+!exports org.apache.logging.log4j.layout.template.json
+!
+!exports org.apache.logging.log4j.layout.template.json.resolver
+!
+!exports org.apache.logging.log4j.layout.template.json.util
+!
+
+!opens org.apache.logging.log4j.layout.template.json
+!
+!opens org.apache.logging.log4j.layout.template.json.resolver
+!
+!opens org.apache.logging.log4j.layout.template.json.util
+!
+
+!requires org.apache.logging.log4j
+!
+!requires org.apache.logging.log4j.plugins
+!
+!requires org.apache.logging.log4j.core
+!
+!requires org.jctools.core
+!
+!===
|log4j-mongodb
|org.apache.logging.log4j.mongodb
@@ -108,10 +336,145 @@ The module info definition may be modified in the future to export these only to
|org.apache.logging.log4j.osgi
|Automatic Module. Unclear how OSGi will support Java modules.
+|log4j-plugin-processor
+|org.apache.logging.log4j.plugin.processor
+|
+[cols="m,"]
+!===
+!Module Directive !Notes
+
+!exports org.apache.logging.log4j.plugin.processor
+!
+
+!requires java.compiler
+!
+!requires org.apache.logging.log4j
+!
+!requires org.apache.logging.log4j.plugins
+!
+!requires transitive org.osgi.framework
+!
+
+!provides javax.annotation.processing.Processor with org.apache.logging.log4j.plugin.processor.PluginProcessor
+!
+!===
+
+|log4j-plugins
+|org.apache.logging.log4j.plugins
+|
+[cols="m,"]
+!===
+!Module Directive !Notes
+
+!exports org.apache.logging.log4j.plugins
+!
+!exports org.apache.logging.log4j.plugins.condition
+!
+!exports org.apache.logging.log4j.plugins.convert
+!
+!exports org.apache.logging.log4j.plugins.di
+!
+!exports org.apache.logging.log4j.plugins.model
+!
+!exports org.apache.logging.log4j.plugins.name
+!
+!exports org.apache.logging.log4j.plugins.util
+!
+!exports org.apache.logging.log4j.plugins.validation
+!
+!exports org.apache.logging.log4j.plugins.validation.constraints
+!
+!exports org.apache.logging.log4j.plugins.validation.validators
+!
+!exports org.apache.logging.log4j.plugins.visit
+!
+
+!requires org.apache.logging.log4j
+!
+!requires static org.osgi.framework
+!
+
+!uses PluginService
+!
+!uses InjectorCallback
+!
+!===
+
+|log4j-script
+|org.apache.logging.log4j.script
+|
+[cols="m,"]
+!===
+!Module Directive !Notes
+
+!exports org.apache.logging.log4j.script
+!
+!exports org.apache.logging.log4j.script.appender
+!
+!opens org.apache.logging.log4j.script.appender to org.junit.platform.commons, org.apache.logging.log4j.core
+!
+!exports org.apache.logging.log4j.script.appender.rolling to junit
+!
+!exports org.apache.logging.log4j.script.appender.rolling.action
+!
+!exports org.apache.logging.log4j.script.appender.routing to junit
+!
+!exports org.apache.logging.log4j.script.config to org.junit.platform.commons
+!
+!exports org.apache.logging.log4j.script.config.arbiter
+!
+!opens org.apache.logging.log4j.script.config.arbiter to org.apache.logging.log4j.core
+!
+!exports org.apache.logging.log4j.script.config.builder to org.junit.platform.commons
+!
+!opens org.apache.logging.log4j.script.config.builder to org.apache.logging.log4j.core
+!
+!exports org.apache.logging.log4j.script.filter
+!
+!exports org.apache.logging.log4j.script.layout
+!
+!opens org.apache.logging.log4j.script.layout to org.apache.logging.log4j.core
+!
+
+!requires org.apache.logging.log4j
+!
+!requires org.apache.logging.log4j.core
+!
+!requires org.apache.logging.log4j.plugins
+!
+!requires java.scripting
+!
+
+!provides PluginService with Log4jPlugins
+!
+!provides ScriptManagerFactory with ScriptManagerFactoryImpl
+!
+!===
+
|log4j-slf4j-impl
|org.apache.logging.log4j.slf4j.impl
|Automatic Module. May require renaming should SLF4J ever require all implementations to have the same module name.
+|log4j-to-jul
+|org.apache.logging.log4j.tojul
+|
+[cols="m,"]
+!===
+!Module Directive !Notes
+
+!exports org.apache.logging.log4j.tojul to org.apache.logging.log4j, org.apache.logging.log4j.tojul.test
+!
+
+!requires org.apache.logging.log4j
+!
+!requires java.logging
+!
+
+!provides org.apache.logging.log4j.spi.Provider with org.apache.logging.log4j.tojul.JULProvider
+!
+
+!===
+
|log4j-to-slf4j
|org.apache.logging.log4j.slf4j
|Automatic Module
@@ -125,20 +488,12 @@ The module info definition may be modified in the future to export these only to
|Automatic Module
|===
-As of version 2.9.1 Log4j supports Java 9 but will still work in Java 7
-or 8. In this version log4j-api is packaged as a multi-release jar and
-supports the use of the StackWalker and Process APIs.
-
-As of version 2.4, Log4j requires Java 7.
-
-Log4j version 2.3 and older require Java 6.
log4j-api[[log4j-api]]::
-The Log4j link:log4j-api/index.html[API] module has no external
-dependencies.
+The Log4j link:log4j-api/index.html[API] module has no required external dependencies.
log4j-core[[log4j-core]]::
-The Log4j link:log4j-core/index.html[Implementation] has several
+The Log4j link:log4j-core/index.html[Implementation] has no required exterbak dependencies but has several
optional link:log4j-core/dependencies.html[dependencies]. See the
link:log4j-core/dependencies.html#Dependency_Tree[Dependency Tree] for
the exact list of JAR files needed for these features.
diff --git a/src/site/asciidoc/security.adoc b/src/site/asciidoc/security.adoc
index 6fe1249aca..705f3551aa 100644
--- a/src/site/asciidoc/security.adoc
+++ b/src/site/asciidoc/security.adoc
@@ -17,7 +17,7 @@
= Apache Log4j Security Vulnerabilities
++++
-<link rel="stylesheet" type="text/css" href="../css/tables.css">
+<link rel="stylesheet" type="text/css" href="css/tables.css">
++++
This page lists all the security vulnerabilities fixed in released versions of Apache Log4j 2.
diff --git a/src/site/asciidoc/support.adoc b/src/site/asciidoc/support.adoc
index 64b5cfe7b9..810587e2f2 100644
--- a/src/site/asciidoc/support.adoc
+++ b/src/site/asciidoc/support.adoc
@@ -17,7 +17,7 @@
= Support
++++
-<link rel="stylesheet" type="text/css" href="../css/tables.css">
+<link rel="stylesheet" type="text/css" href="css/tables.css">
++++
The Apache Software Foundation does not employ individuals to develop and support any of its projects.
diff --git a/src/site/asciidoc/thanks.adoc b/src/site/asciidoc/thanks.adoc
index 4af1bf87df..f8513c2255 100644
--- a/src/site/asciidoc/thanks.adoc
+++ b/src/site/asciidoc/thanks.adoc
@@ -17,7 +17,7 @@
= Project Thanks
++++
-<link rel="stylesheet" type="text/css" href="../css/tables.css">
+<link rel="stylesheet" type="text/css" href="css/tables.css">
++++
Log4j 2 is a successful project because of the large and diverse