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 2021/11/16 04:00:24 UTC
[logging-log4j2] 02/03: PR #574 - minor changes
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
commit 1a3fcdfad919ceaae755b64263a3fb6913b6dea1
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Mon Nov 15 20:14:36 2021 -0700
PR #574 - minor changes
---
log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java | 3 ++-
src/changes/changes.xml | 2 +-
src/site/xdoc/manual/webapp.xml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
index 81ecc12..ff908ee 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java
@@ -28,7 +28,8 @@ public final class Constants {
* is present in the classpath.
*/
public static final boolean IS_WEB_APP = PropertiesUtil.getProperties().getBooleanProperty(
- "log4j2.is.webapp", isClassAvailable("javax.servlet.Servlet") || isClassAvailable("jakarta.servlet.Servlet"));
+ "log4j2.is.webapp", isClassAvailable("javax.servlet.Servlet")
+ || isClassAvailable("jakarta.servlet.Servlet"));
/**
* Kill switch for object pooling in ThreadLocals that enables much of the LOG4J2-1270 no-GC behaviour.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 19a3c54..b3339a5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,7 +31,7 @@
-->
<release version="2.15.0" date="2021-MM-DD" description="GA Release 2.15.0">
<!-- ADDS -->
- <action issue="LOG4J2-2978" dev="vy" type="add" due-to="Michael Seele">
+ <action issue="LOG4J2-2978" dev="rgoers" type="add" due-to="Michael Seele">
Add support for Jakarta EE 9 (Tomcat 10 / Jetty 11)
</action>
<action issue="LOG4J2-3189" dev="ckozak" type="add">
diff --git a/src/site/xdoc/manual/webapp.xml b/src/site/xdoc/manual/webapp.xml
index 5de3a12..a7f27fd 100644
--- a/src/site/xdoc/manual/webapp.xml
+++ b/src/site/xdoc/manual/webapp.xml
@@ -38,7 +38,7 @@
</p>
<p>
Due to the namespace change from <code>javax</code> to <code>jakarta</code> you need to use
- <code>log4j-jakarta-web</code> instead of <code>log4j-web</code> for <a href="#Servlet-5.0">Servlet 5.0 or newer</a>.
+ <code>log4j-jakarta-web</code> instead of <code>log4j-web</code> for Servlet 5.0 or newer.
</p>
<p>
In either case, you'll need to add the <code>log4j-web</code> module to your deployment as detailed in the