This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 696bb99 Various cleanups in prep for a release
696bb99 is described below
commit 696bb995a16c7827cd4e457aff4c3e49bca1cb6b
Author: Ralph Goers <[email protected]>
AuthorDate: Mon Dec 6 10:32:27 2021 -0700
Various cleanups in prep for a release
---
.../logging/log4j/core/layout/JsonLayout.java | 2 ++
log4j-spring-boot/pom.xml | 2 +-
log4j-spring-boot/src/site/markdown/index.md | 31 ++++++++++++++++++++++
log4j-spring-boot/src/site/site.xml | 2 +-
pom.xml | 2 +-
src/site/markdown/index.md.vm | 16 ++++++-----
src/site/site.xml | 1 +
src/site/xdoc/manual/configuration.xml.vm | 2 +-
src/site/xdoc/manual/layouts.xml.vm | 5 ++++
9 files changed, 53 insertions(+), 10 deletions(-)
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
index 6b3555d..6092412 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
@@ -35,6 +35,8 @@ import
org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.util.KeyValuePair;
/**
+ * Note: The JsonLayout should be considered to be deprecated. Please use
JsonTemplateLayout instead.
+ *
* Appends a series of JSON events as strings serialized as bytes.
*
* <h3>Complete well-formed JSON vs. fragment JSON</h3>
diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml
index aef5cf1..297547e 100644
--- a/log4j-spring-boot/pom.xml
+++ b/log4j-spring-boot/pom.xml
@@ -26,7 +26,7 @@
<artifactId>log4j-spring-boot</artifactId>
<packaging>jar</packaging>
<name>Apache Log4j Spring Boot Support</name>
- <description>Apache Log4j Spring iBoot Support</description>
+ <description>Apache Log4j Spring Boot Support</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Spring Boot Documentation</docLabel>
diff --git a/log4j-spring-boot/src/site/markdown/index.md
b/log4j-spring-boot/src/site/markdown/index.md
index 325455c..4cd1feb 100644
--- a/log4j-spring-boot/src/site/markdown/index.md
+++ b/log4j-spring-boot/src/site/markdown/index.md
@@ -49,6 +49,37 @@ to be specified in the Spring Configuration. However, some
properties that are o
during the first Log4j initialization, such as the property Log4j uses to
allow the default
Log4j implementation to be chosen, would not be available.
+### Spring Profile Arbiter
+
+New with Log4j 2.15.0 are "Arbiters" which are conditionals that can cause a
portion of the Log4j configuration to
+be included or excluded. log4j-spring-boot provides an Arbiter that allows a
Spring profile value to be used for
+this purpose. Below is an example:
+```
+<Configuration name="ConfigTest" status="ERROR" monitorInterval="5">
+ <Appenders>
+
+ <SpringProfile name="dev | staging">
+ <Console name="Out">
+ <PatternLayout pattern="%m%n"/>
+ </Console>
+ </SpringProfile>
+ <SpringProfile name="prod">
+ <List name="Out">
+ </List>
+ </SpringProfile>
+
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.test" level="trace" additivity="false">
+ <AppenderRef ref="Out"/>
+ </Logger>
+ <Root level="error">
+ <AppenderRef ref="Out"/>
+ </Root>
+ </Loggers>
+</Configuration>
+```
+
## Requirements
The Log4j 2 Spring Cloud Configuration integration has a dependency on Log4j 2
API, Log4j 2 Core, and
diff --git a/log4j-spring-boot/src/site/site.xml
b/log4j-spring-boot/src/site/site.xml
index 5abfffd..3f8f776 100644
--- a/log4j-spring-boot/src/site/site.xml
+++ b/log4j-spring-boot/src/site/site.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<project name="Log4j Spring Cloud Config Integration"
+<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";>
diff --git a/pom.xml b/pom.xml
index 9a55dda..0e7f26e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,7 +188,7 @@
<properties>
<!-- make sure to update these for each release! -->
<log4jParentDir>${basedir}</log4jParentDir>
- <Log4jReleaseVersion>2.14.1</Log4jReleaseVersion>
+ <Log4jReleaseVersion>2.15.0</Log4jReleaseVersion>
<Log4jReleaseManager>Ralph Goers</Log4jReleaseManager>
<Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey>
<!--<Log4jReleaseManager>Matt Sicker</Log4jReleaseManager> -->
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index d00b1db..fb596f6 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -131,8 +131,9 @@ The Log4j 2 User's Guide is available on this
[site](manual/index.html) or as a
$h2 Requirements
-Log4j 2.13.0 and greater require Java 8. Version 2.4 through 2.12.1 required
Java 7. Some features require optional
-dependencies; the documentation for these features will specify the required
dependencies.
+Log4j 2.13.0 and greater require Java 8. Version 2.4 through 2.12.1 required
Java 7 (the Log4j team no longer supports
+Java 7). Some features require optional dependencies; the documentation for
these features will specify the required
+dependencies.
$h2 News
@@ -144,10 +145,13 @@ Log4j $Log4jReleaseVersion is the latest release of
Log4j. As of Log4j 2.13.0 Lo
runtime. This release contains new features and fixes which can be found
in the latest [changes report](changes-report.html#a$Log4jReleaseVersion).
-Log4j 2.14.0 contains a new Layout,
[JsonTemplateLayout](manual/json-template-layout.html), that is intended to
-ultimately replace JsonLayout. As its name suggests it uses a template to
define the elements to include in the JSON.
-This Layout was contributed by the author of the log4j2-logstash-layout at
GitHub, and who is now a member of the Log4j community.
+Some of the new features in Log4j 2.15.0 include:
-Log4j 2.14.0 adds support for MongoDB 4 and removes support for MongoDB 2.
+* Support for Arbiters, which are conditionals that can enable sections of the
logging configuration
+for inclusion or exclusion. In particular, SpringProfile, SystemProperty,
Script, and Class Arbiters have been
+provided that use the Spring profile, System property, the result of a script,
or the presence of a class respectively
+to determine whether a section of configuration should be included.
+* Support for Jakarta EE 9. This is functionally equivalent to Log4j's
log4j-web module but uses the Jakarta project.
+* Various performance improvements.
Log4j $Log4jReleaseVersion maintains binary compatibility with previous
releases.
diff --git a/src/site/site.xml b/src/site/site.xml
index a08f8b3..fa9cebc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -327,6 +327,7 @@
<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"/>
</menu>
diff --git a/src/site/xdoc/manual/configuration.xml.vm
b/src/site/xdoc/manual/configuration.xml.vm
index a42c486..46c0187 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -190,7 +190,7 @@
</Configuration>
]]></pre>
<p>
- Natively Log4j contains the SystemProperty Arbister that can
evaluate whether to include elements based on
+ Natively Log4j contains the SystemProperty Arbiter that can
evaluate whether to include elements based on
whether a SystemProperty is non-null or has a specific value, a
ClassArbiter that makes its decision
based on whether the specified class is present, and a
ScriptArbiter that makes its decision based
on the result of the script configured with it.
diff --git a/src/site/xdoc/manual/layouts.xml.vm
b/src/site/xdoc/manual/layouts.xml.vm
index 9d9ccc5..8f0ed74 100644
--- a/src/site/xdoc/manual/layouts.xml.vm
+++ b/src/site/xdoc/manual/layouts.xml.vm
@@ -429,6 +429,11 @@ logger.debug("one={}, two={}, three={}", 1, 2, 3);
<a name="JSONLayout"/>
<subsection name="JSON Layout">
<p>
+ <b>Note:</b> JsonTemplate is considered deprecated.
JsonTemplateLayout provides more capabilitites and
+ should be used instead.
+ </p>
+
+ <p>
Appends a series of JSON events as strings serialized as bytes.
</p>
<h4>Complete well-formed JSON vs. fragment JSON</h4>
