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:22 UTC
[logging-log4j2] branch release-2.x updated (cc29895 -> 5bbb05c)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from cc29895 LOG4J2-3189: Improve worst-case NameAbbreviator performance
add 29dee7e LOG4J2-2978: add support for Jakarta EE 9
add 6175890 corect formatting issues
add e8e4fcf correct documentation
add 98b0ac2 corect formatting issues
add 3d0b379 Merge branch 'release-2.x' into feature/LOG4J2-2978
add 4a4ed38 refactor: upgrade from hamcrest-all:1.3 to hamcrest:2.2
add b76b599 Merge branch 'release-2.x' into feature/LOG4J2-2978
new f855bb7 Add missing end tags
new 1a3fcdf PR #574 - minor changes
new 5bbb05c Merge branch 'mseele-feature/LOG4J2-2978' into release-2.x
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/logging/log4j/util/Constants.java | 3 +-
{log4j-web => log4j-jakarta-web}/pom.xml | 18 ++--
{log4j-web => log4j-jakarta-web}/revapi.json | 0
.../web/Log4jServletContainerInitializer.java | 10 +--
.../log4j/web/Log4jServletContextListener.java | 6 +-
.../logging/log4j/web/Log4jServletFilter.java | 14 ++--
.../Log4jShutdownOnContextDestroyedListener.java | 6 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 4 +-
.../logging/log4j/web/Log4jWebLifeCycle.java | 0
.../apache/logging/log4j/web/Log4jWebSupport.java | 16 ++--
.../log4j/web/ServletRequestThreadContext.java | 4 +-
.../logging/log4j/web/WebLoggerContextUtils.java | 2 +-
.../org/apache/logging/log4j/web/WebLookup.java | 2 +-
.../log4j/web/appender/ServletAppender.java | 2 +-
.../org/apache/logging/log4j/web/package-info.java | 0
.../javax.servlet.ServletContainerInitializer | 0
.../src/main/resources/META-INF/web-fragment.xml | 0
.../src/site/markdown/index.md | 2 +-
{log4j-web => log4j-jakarta-web}/src/site/site.xml | 0
.../web/Log4jServletContainerInitializerTest.java | 8 +-
.../log4j/web/Log4jServletContextListenerTest.java | 4 +-
.../logging/log4j/web/Log4jServletFilterTest.java | 10 +--
...og4jShutdownOnContextDestroyedListenerTest.java | 4 +-
.../log4j/web/Log4jWebInitializerImplTest.java | 2 +-
.../org/apache/logging/log4j/web/PropertyTest.java | 0
.../logging/log4j/web/ServletAppenderTest.java | 58 +++++++++++++
.../apache/logging/log4j/web/TestAsyncServlet.java | 10 +--
.../apache/logging/log4j/web/WebLookupTest.java | 98 ++++++++++++++++++++++
.../resources/WEB-INF/classes/log4j-servlet.xml | 0
.../resources/WEB-INF/classes/log4j-webvar.xml | 0
.../src/test/resources/log4j2-combined.xml | 0
.../src/test/resources/log4j2-override.xml | 0
pom.xml | 6 ++
src/changes/changes.xml | 3 +
src/site/site.xml | 1 +
src/site/xdoc/manual/webapp.xml | 4 +
36 files changed, 234 insertions(+), 63 deletions(-)
copy {log4j-web => log4j-jakarta-web}/pom.xml (93%)
copy {log4j-web => log4j-jakarta-web}/revapi.json (100%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/Log4jServletContainerInitializer.java (93%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java (96%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java (92%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java (96%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java (99%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/Log4jWebLifeCycle.java (100%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/Log4jWebSupport.java (81%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java (95%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/WebLoggerContextUtils.java (99%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/WebLookup.java (99%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/appender/ServletAppender.java (99%)
copy {log4j-web => log4j-jakarta-web}/src/main/java/org/apache/logging/log4j/web/package-info.java (100%)
copy {log4j-web => log4j-jakarta-web}/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer (100%)
copy {log4j-web => log4j-jakarta-web}/src/main/resources/META-INF/web-fragment.xml (100%)
copy {log4j-web => log4j-jakarta-web}/src/site/markdown/index.md (95%)
copy {log4j-web => log4j-jakarta-web}/src/site/site.xml (100%)
copy {log4j-web => log4j-jakarta-web}/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java (98%)
copy {log4j-web => log4j-jakarta-web}/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java (98%)
copy {log4j-web => log4j-jakarta-web}/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java (95%)
copy {log4j-web => log4j-jakarta-web}/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java (97%)
copy {log4j-web => log4j-jakarta-web}/src/test/java/org/apache/logging/log4j/web/Log4jWebInitializerImplTest.java (99%)
copy {log4j-web => log4j-jakarta-web}/src/test/java/org/apache/logging/log4j/web/PropertyTest.java (100%)
create mode 100644 log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/ServletAppenderTest.java
copy {log4j-web => log4j-jakarta-web}/src/test/java/org/apache/logging/log4j/web/TestAsyncServlet.java (90%)
create mode 100644 log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/WebLookupTest.java
copy {log4j-web => log4j-jakarta-web}/src/test/resources/WEB-INF/classes/log4j-servlet.xml (100%)
copy {log4j-web => log4j-jakarta-web}/src/test/resources/WEB-INF/classes/log4j-webvar.xml (100%)
copy {log4j-web => log4j-jakarta-web}/src/test/resources/log4j2-combined.xml (100%)
copy {log4j-web => log4j-jakarta-web}/src/test/resources/log4j2-override.xml (100%)
[logging-log4j2] 02/03: PR #574 - minor changes
Posted by rg...@apache.org.
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
[logging-log4j2] 01/03: Add missing end tags
Posted by rg...@apache.org.
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 f855bb770e1f26ad71ab155f3820c16c333e3c54
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Mon Nov 15 11:36:20 2021 -0700
Add missing end tags
---
src/changes/changes.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index aebc5b7..19a3c54 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -33,8 +33,10 @@
<!-- ADDS -->
<action issue="LOG4J2-2978" dev="vy" 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">
Improve NameAbbreviator worst-case performance.
+ </action>
<action issue="LOG4J2-3170" dev="vy" type="add" due-to="Gareth Smith">
Make CRLF/HTML encoding run in O(n) worst-case time, rather than O(n^2).
</action>
[logging-log4j2] 03/03: Merge branch 'mseele-feature/LOG4J2-2978' into release-2.x
Posted by rg...@apache.org.
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 5bbb05c97bba50a5d212aa6fbe7cd0bb436543c4
Merge: cc29895 1a3fcdf
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Mon Nov 15 20:15:23 2021 -0700
Merge branch 'mseele-feature/LOG4J2-2978' into release-2.x
.../org/apache/logging/log4j/util/Constants.java | 3 +-
log4j-jakarta-web/pom.xml | 192 ++++++++++
log4j-jakarta-web/revapi.json | 14 +
.../web/Log4jServletContainerInitializer.java | 69 ++++
.../log4j/web/Log4jServletContextListener.java | 93 +++++
.../logging/log4j/web/Log4jServletFilter.java | 87 +++++
.../Log4jShutdownOnContextDestroyedListener.java | 80 ++++
.../logging/log4j/web/Log4jWebInitializerImpl.java | 297 +++++++++++++++
.../logging/log4j/web/Log4jWebLifeCycle.java | 43 +++
.../apache/logging/log4j/web/Log4jWebSupport.java | 95 +++++
.../log4j/web/ServletRequestThreadContext.java | 45 +++
.../logging/log4j/web/WebLoggerContextUtils.java | 143 ++++++++
.../org/apache/logging/log4j/web/WebLookup.java | 115 ++++++
.../log4j/web/appender/ServletAppender.java | 130 +++++++
.../org/apache/logging/log4j/web/package-info.java | 24 ++
.../javax.servlet.ServletContainerInitializer | 22 ++
.../src/main/resources/META-INF/web-fragment.xml | 33 ++
log4j-jakarta-web/src/site/markdown/index.md | 30 ++
log4j-jakarta-web/src/site/site.xml | 52 +++
.../web/Log4jServletContainerInitializerTest.java | 184 ++++++++++
.../log4j/web/Log4jServletContextListenerTest.java | 109 ++++++
.../logging/log4j/web/Log4jServletFilterTest.java | 111 ++++++
...og4jShutdownOnContextDestroyedListenerTest.java | 83 +++++
.../log4j/web/Log4jWebInitializerImplTest.java | 403 +++++++++++++++++++++
.../org/apache/logging/log4j/web/PropertyTest.java | 42 +++
.../logging/log4j/web/ServletAppenderTest.java | 58 +++
.../apache/logging/log4j/web/TestAsyncServlet.java | 54 +++
.../apache/logging/log4j/web/WebLookupTest.java | 98 +++++
.../resources/WEB-INF/classes/log4j-servlet.xml | 33 ++
.../resources/WEB-INF/classes/log4j-webvar.xml | 29 ++
.../src/test/resources/log4j2-combined.xml | 31 ++
.../src/test/resources/log4j2-override.xml | 23 ++
pom.xml | 6 +
src/changes/changes.xml | 3 +
src/site/site.xml | 1 +
src/site/xdoc/manual/webapp.xml | 4 +
36 files changed, 2838 insertions(+), 1 deletion(-)