(logging-log4j2) branch 2.x-StatusLogger-revamp updated (40cc7218ce -> 88eb8fcb41)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-StatusLogger-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 40cc7218ce Rework `StatusLogger` effective level add 88eb8fcb41 Improve `StatusLoggerAdmin` conditional registration No new revisions were added by this update. Summary of changes: .../logging/log4j/core/jmx/StatusLoggerAdmin.java | 70 +- .../logging/log4j/core/jmx/package-info.java | 2 +- 2 files changed, 42 insertions(+), 30 deletions(-)
(logging-log4j2) branch main updated: Remove forgotten `log4j-layout-jackson` site files (#2198)
This is an automated email from the ASF dual-hosted git repository. vy 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 bd1091950b Remove forgotten `log4j-layout-jackson` site files (#2198) bd1091950b is described below commit bd1091950b89d3f9e4264b43bcdbdfc739825b33 Author: Volkan Yazıcı AuthorDate: Mon Jan 29 20:26:04 2024 +0100 Remove forgotten `log4j-layout-jackson` site files (#2198) --- src/site/markdown/log4j-layout-jackson-xml.md | 33 --- src/site/markdown/log4j-layout-jackson.md | 33 --- 2 files changed, 66 deletions(-) diff --git a/src/site/markdown/log4j-layout-jackson-xml.md b/src/site/markdown/log4j-layout-jackson-xml.md deleted file mode 100644 index b46d3680ff..00 --- a/src/site/markdown/log4j-layout-jackson-xml.md +++ /dev/null @@ -1,33 +0,0 @@ - - - -# Apache Log4j Layout for Jackson XML module - -As of Log4j 3.0.0, the layout based on Jackson XML has moved from the existing module log4j-core to the new modules log4j-layout-jackson-xml. - -## Requirements - -This module was introduced in Log4j 2.11.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/src/site/markdown/log4j-layout-jackson.md b/src/site/markdown/log4j-layout-jackson.md deleted file mode 100644 index 8f3b15d7d6..00 --- a/src/site/markdown/log4j-layout-jackson.md +++ /dev/null @@ -1,33 +0,0 @@ - - - -# Apache Log4j Layout for Jackson module - -As of Log4j 3.0.0, common code for layouts based on Jackson have moved from the existing module log4j-core to the new modules log4j-layout-jackson. - -## Requirements - -This module was introduced in Log4j 2.11.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.
(logging-log4j2) branch main-remove-jcl-and-appserver deleted (was 4c65aa6078)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-remove-jcl-and-appserver in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 4c65aa6078 Update changelog The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch main updated: Remove `log4j-jcl` and `log4j-appserver` modules (#2257)
This is an automated email from the ASF dual-hosted git repository.
vy 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 c861f059c2 Remove `log4j-jcl` and `log4j-appserver` modules (#2257)
c861f059c2 is described below
commit c861f059c2bc02796bf482c773b854e5f9454089
Author: Volkan Yazıcı
AuthorDate: Mon Jan 29 21:52:59 2024 +0100
Remove `log4j-jcl` and `log4j-appserver` modules (#2257)
---
log4j-appserver/pom.xml| 73 ---
.../log4j/appserver/jetty/Log4j2Logger.java| 217 -
.../log4j/appserver/jetty/package-info.java| 27 ---
.../log4j/appserver/tomcat/TomcatLogger.java | 190 --
.../log4j/appserver/tomcat/package-info.java | 25 ---
log4j-jcl/pom.xml | 71 ---
.../org/apache/logging/log4j/jcl/Log4jLog.java | 125
.../org/apache/logging/log4j/jcl/LogAdapter.java | 45 -
.../apache/logging/log4j/jcl/LogFactoryImpl.java | 86
.../org/apache/logging/log4j/jcl/package-info.java | 25 ---
.../services/org.apache.commons.logging.LogFactory | 1 -
.../logging/log4j/jcl/CallerInformationTest.java | 58 --
.../org/apache/logging/log4j/jcl/LoggerTest.java | 58 --
.../src/test/resources/CallerInformationTest.xml | 42
log4j-jcl/src/test/resources/LoggerTest.xml| 55 --
pom.xml| 2 -
src/changelog/.3.x.x/remove_appserver.xml | 8 +
src/changelog/.3.x.x/remove_jcl.xml| 8 +
src/site/_release-notes/_3.x.x.adoc| 1 +
src/site/asciidoc/faq.adoc | 3 -
src/site/asciidoc/runtime-dependencies.adoc| 14 --
src/site/markdown/log4j-appserver.md.vm| 59 --
src/site/markdown/log4j-flume-ng.md.vm | 10 -
src/site/markdown/log4j-jcl.md | 33
src/site/markdown/maven-artifacts.md.vm| 7 -
src/site/site.xml | 2 -
26 files changed, 17 insertions(+), 1228 deletions(-)
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
deleted file mode 100644
index df0ce0067d..00
--- a/log4j-appserver/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-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;>
-
- 4.0.0
-
-
-org.apache.logging.log4j
-log4j
-${revision}
-../log4j-parent
-
-
- log4j-appserver
- jar
- Apache Log4j App Server Support
- Provide Log4j as the logging implementation for application
servers
-
-
-
-
-
-
- org.apache.juli.logging;version="[8.0,12)";resolution:=optional,
-
- org.eclipse.jetty.util.log;version="[7.6,10)";resolution:=optional
-
-
-
- org.apache.tomcat.juli;transitive=false,
- org.eclipse.jetty.util;transitive=false
-
-
-
-
-
- org.eclipse.jetty
- jetty-util
- provided
-
-
- org.apache.tomcat
- tomcat-juli
- provided
-
-
- org.apache.logging.log4j
- log4j-api
-
-
-
diff --git
a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
deleted file mode 100644
index 953b11f023..00
---
a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
+++ /dev/null
@@ -1,217 +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.
- */
-package org.apache.logging.log4j.appserver.jetty;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.spi.ExtendedLogger;
-import org.apache.logging.log4j.spi.LoggerContext;
-import org.eclipse.jetty.util.log.AbstractLogger;
-import org.eclipse.jetty.util.log.Logger;
-
-/**
- * Provides a native Apache Log4j 2 logger for Eclipse Jetty logging.
- *
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 5ec7735a Automatic Site Publish by Buildbot 5ec7735a is described below commit 5ec7735af190924234e5161d9967ca5502cc69cc Author: buildbot AuthorDate: Mon Jan 29 20:41:45 2024 + Automatic Site Publish by Buildbot --- content/feed.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/feed.xml b/content/feed.xml index df32a7c7..67241423 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -1,4 +1,4 @@ -http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2024-01-17T19:30:38+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] +http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2024-01-29T20:41:44+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] Today, December 17, 2023 marks a significant milestone for the Apache Logging Services project, as we celebrate 20 years since the inception of Log4j 1.
(logging-site) branch main updated: GitHub workflows on `asf-staging` are not taking effect, copy them to here
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-site.git
The following commit(s) were added to refs/heads/main by this push:
new f674214d GitHub workflows on `asf-staging` are not taking effect, copy
them to here
f674214d is described below
commit f674214defe44f4e9671fdb1c4eeefe1d13be0b4
Author: Volkan Yazıcı
AuthorDate: Mon Jan 29 21:41:27 2024 +0100
GitHub workflows on `asf-staging` are not taking effect, copy them to here
---
.github/workflows/update-stats.yaml | 186
1 file changed, 186 insertions(+)
diff --git a/.github/workflows/update-stats.yaml
b/.github/workflows/update-stats.yaml
new file mode 100644
index ..61e16118
--- /dev/null
+++ b/.github/workflows/update-stats.yaml
@@ -0,0 +1,186 @@
+#
+# 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.
+#
+
+name: update-stats
+
+on:
+ workflow_dispatch: {}
+ schedule:
+- cron: "0 0 1 * 1"
+
+concurrency:
+ group: ${{ github.ref_name }}
+ cancel-in-progress: true
+
+permissions: read-all
+
+env:
+ DATA_FILEPATH: stats.csv
+
+jobs:
+
+ collect:
+
+name: "collect (${{ matrix.proj-spec.id }})"
+
+runs-on: ubuntu-latest
+
+strategy:
+ matrix:
+proj-spec:
+ - id: chainsaw
+repo-name: apache/logging-chainsaw
+repo-branch: master
+ - id: log4cxx
+repo-name: apache/logging-log4cxx
+repo-branch: master
+packaging: cmake
+ - id: log4j-1
+repo-name: apache/logging-log4j1
+repo-branch: main
+ - id: log4j-2
+repo-name: apache/logging-log4j2
+repo-branch: 2.x
+ - id: log4j-jmx-gui
+repo-name: apache/logging-log4j-jmx-gui
+ - id: log4j-kotlin
+repo-name: apache/logging-log4j-kotlin
+ - id: log4j-scala
+repo-name: apache/logging-log4j-scala
+ - id: log4j-transform
+repo-name: apache/logging-log4j-transform
+ - id: log4j-tools
+repo-name: apache/logging-log4j-tools
+ - id: log4j-audit
+repo-name: apache/logging-log4j-audit
+repo-branch: master
+ - id: log4net
+repo-name: apache/logging-log4net
+repo-branch: master
+packaging: nant
+ - id: log4j-server
+repo-name: apache/logging-log4j-server
+repo-branch: master
+
+env:
+ PROJ_ID: ${{ matrix.proj-spec.id }}
+ REPO_NAME: ${{ matrix.proj-spec.repo-name }}
+ REPO_BRANCH: ${{ matrix.proj-spec.repo-branch || 'main' }}
+ PROJ_PACKAGING: ${{ matrix.proj-spec.packaging || 'maven' }}
+
+steps:
+
+ - name: Checkout the repository
+uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #
4.0.0
+with:
+ repository: ${{ env.REPO_NAME }}
+ ref: ${{ env.REPO_BRANCH }}
+ # Fetch all the history:
+ fetch-depth: 0
+
+ - name: Collect statistics
+shell: bash
+run: |
+ case $PROJ_PACKAGING in
+
+maven)
+ find . -regextype posix-extended -name "pom.xml" -and -not
-regex "(.*/)?target/.*" | while read pomXmlFilepath; do
+
+# Ignore the artifact, if it is skipped at deployment
+skipMatchCount=$(python -c "import xml.etree.ElementTree as
ET;
print(len(ET.parse('$pomXmlFilepath').findall('./{*}properties/{*}maven.deploy.skip')))")
+[ "$skipMatchCount" -gt 0 ] && continue
+
+# Extract the module name (i.e., `artifactId`)
+module=$(python -c "import xml.etree.ElementTree as ET;
print(ET.parse('$pomXmlFilepath').findall('./{*}artifactId')[0].text)")
+
+# Dump statistics of the module folder
+moduleDir=$(dirname "$pomXmlFilepath")
+git log --pretty=tformat:"%as %ae" -- "$moduleDir" | while
read instant author; do
+ echo "$PROJ_ID,$module,$instant,$author"
+done >>"$DATA_FILEPATH"
+
+ done
+ ;;
+
+
(logging-log4j2) branch main-remove-jcl-and-appserver updated (8b519093a1 -> 4c65aa6078)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-remove-jcl-and-appserver in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 8b519093a1 Remove `log4j-jcl` and `log4j-appserver` modules add 4c65aa6078 Update changelog No new revisions were added by this update. Summary of changes: src/changelog/.3.x.x/remove_appserver.xml | 1 + src/changelog/.3.x.x/remove_jcl.xml | 1 + 2 files changed, 2 insertions(+)
(logging-log4j2) 01/01: Remove `log4j-jcl` and `log4j-appserver` modules
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main-remove-jcl-and-appserver
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8b519093a17d45baf4b67e2a80629750c27e335a
Author: Volkan Yazıcı
AuthorDate: Mon Jan 29 20:31:35 2024 +0100
Remove `log4j-jcl` and `log4j-appserver` modules
---
log4j-appserver/pom.xml| 73 ---
.../log4j/appserver/jetty/Log4j2Logger.java| 217 -
.../log4j/appserver/jetty/package-info.java| 27 ---
.../log4j/appserver/tomcat/TomcatLogger.java | 190 --
.../log4j/appserver/tomcat/package-info.java | 25 ---
log4j-jcl/pom.xml | 71 ---
.../org/apache/logging/log4j/jcl/Log4jLog.java | 125
.../org/apache/logging/log4j/jcl/LogAdapter.java | 45 -
.../apache/logging/log4j/jcl/LogFactoryImpl.java | 86
.../org/apache/logging/log4j/jcl/package-info.java | 25 ---
.../services/org.apache.commons.logging.LogFactory | 1 -
.../logging/log4j/jcl/CallerInformationTest.java | 58 --
.../org/apache/logging/log4j/jcl/LoggerTest.java | 58 --
.../src/test/resources/CallerInformationTest.xml | 42
log4j-jcl/src/test/resources/LoggerTest.xml| 55 --
pom.xml| 2 -
src/changelog/.3.x.x/remove_appserver.xml | 7 +
src/changelog/.3.x.x/remove_jcl.xml| 7 +
src/site/_release-notes/_3.x.x.adoc| 1 +
src/site/asciidoc/faq.adoc | 3 -
src/site/asciidoc/runtime-dependencies.adoc| 14 --
src/site/markdown/log4j-appserver.md.vm| 59 --
src/site/markdown/log4j-flume-ng.md.vm | 10 -
src/site/markdown/log4j-jcl.md | 33
src/site/markdown/maven-artifacts.md.vm| 7 -
src/site/site.xml | 2 -
26 files changed, 15 insertions(+), 1228 deletions(-)
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
deleted file mode 100644
index df0ce0067d..00
--- a/log4j-appserver/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-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;>
-
- 4.0.0
-
-
-org.apache.logging.log4j
-log4j
-${revision}
-../log4j-parent
-
-
- log4j-appserver
- jar
- Apache Log4j App Server Support
- Provide Log4j as the logging implementation for application
servers
-
-
-
-
-
-
- org.apache.juli.logging;version="[8.0,12)";resolution:=optional,
-
- org.eclipse.jetty.util.log;version="[7.6,10)";resolution:=optional
-
-
-
- org.apache.tomcat.juli;transitive=false,
- org.eclipse.jetty.util;transitive=false
-
-
-
-
-
- org.eclipse.jetty
- jetty-util
- provided
-
-
- org.apache.tomcat
- tomcat-juli
- provided
-
-
- org.apache.logging.log4j
- log4j-api
-
-
-
diff --git
a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
deleted file mode 100644
index 953b11f023..00
---
a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java
+++ /dev/null
@@ -1,217 +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.
- */
-package org.apache.logging.log4j.appserver.jetty;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.spi.ExtendedLogger;
-import org.apache.logging.log4j.spi.LoggerContext;
-import org.eclipse.jetty.util.log.AbstractLogger;
-import org.eclipse.jetty.util.log.Logger;
-
-/**
- * Provides a native Apache Log4j 2 logger for Eclipse Jetty logging.
- *
- *
- * To direct Jetty to use this class, set the system property
{{org.eclipse.jetty.util.log.class}} to this class name.
- *
- *
- *
- * From the
(logging-log4j2) branch main-remove-jcl-and-appserver created (now 8b519093a1)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main-remove-jcl-and-appserver in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 8b519093a1 Remove `log4j-jcl` and `log4j-appserver` modules This branch includes the following new commits: new 8b519093a1 Remove `log4j-jcl` and `log4j-appserver` modules The 1 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.
(logging-log4j2) branch move-async deleted (was 4ad805aa49)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch move-async in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 4ad805aa49 Remove references to async context selector in `log4j-script` The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch main updated (9543bee1d7 -> 4ad805aa49)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 9543bee1d7 Merge pull request #2219 from jvz/issue-2100
add 44613d0709 Inline `EventRoute` methods
add f5af863fa7 Move async logger tests to `log4j-async-logger`
add 4e732f1097 Remove instance of checks for async components
add b69110b0fd Last tweaks to tests before moving async support
add a3cf42d2ed Move async support to `log4j-async-logger`
add 1fc391303e Fix failing tests
add fd526f1e6b Add changelog for splitting off `log4j-async-logger`
add 4ad805aa49 Remove references to async context selector in
`log4j-script`
No new revisions were added by this update.
Summary of changes:
{log4j-csv => log4j-async-logger}/pom.xml | 55 ++---
.../logger}/AbstractAsyncExceptionHandler.java | 2 +-
.../logging/log4j/async/logger}/AsyncLogger.java | 4 +-
.../log4j/async/logger}/AsyncLoggerConfig.java | 36 +--
.../AsyncLoggerConfigDefaultExceptionHandler.java | 2 +-
.../async/logger}/AsyncLoggerConfigDelegate.java | 3 +-
.../async/logger}/AsyncLoggerConfigDisruptor.java | 7 +-
.../log4j/async/logger}/AsyncLoggerContext.java| 7 +-
.../async/logger}/AsyncLoggerContextSelector.java | 17 +-
.../AsyncLoggerDefaultExceptionHandler.java| 2 +-
.../log4j/async/logger}/AsyncLoggerDisruptor.java | 6 +-
.../async/logger}/AsyncWaitStrategyFactory.java| 2 +-
.../logger}/BasicAsyncLoggerContextSelector.java | 2 +-
.../logger}/DefaultAsyncWaitStrategyFactory.java | 2 +-
.../async/logger}/DisruptorConfiguration.java | 2 +-
.../logging/log4j/async/logger}/DisruptorUtil.java | 2 +-
.../log4j/async/logger}/RingBufferLogEvent.java| 3 +-
.../async/logger}/RingBufferLogEventHandler.java | 2 +-
.../logger}/RingBufferLogEventTranslator.java | 2 +-
.../async/logger}/TimeoutBlockingWaitStrategy.java | 2 +-
.../log4j/async/logger/AsyncLateConfigTest.java| 52 +
.../logger}/AsyncLoggerClassLoadDeadlockTest.java | 31 ++-
.../log4j/async/logger/AsyncLoggerConfig2Test.java | 28 +--
.../log4j/async/logger/AsyncLoggerConfig3Test.java | 13 +-
.../async/logger}/AsyncLoggerConfig4Test.java | 2 +-
.../logger}/AsyncLoggerConfigAutoFlushTest.java| 27 +--
.../logger}/AsyncLoggerConfigErrorOnFormat.java| 15 +-
.../log4j/async/logger}/AsyncLoggerConfigTest.java | 4 +-
.../AsyncLoggerConfigUseAfterShutdownTest.java | 24 +-
.../AsyncLoggerConfigWithAsyncEnabledTest.java | 2 +-
...AsyncLoggerContextSelectorInitialStateTest.java | 2 +-
.../logger}/AsyncLoggerContextSelectorTest.java| 2 +-
.../async/logger}/AsyncLoggerContextTest.java | 2 +-
.../AsyncLoggerCustomSelectorLocationTest.java | 36 ++-
.../logger}/AsyncLoggerDefaultLocationTest.java| 11 +-
.../AsyncLoggerEventTranslationExceptionTest.java | 16 +-
.../async/logger}/AsyncLoggerLocationTest.java | 25 +-
.../async/logger}/AsyncLoggerNanoTimeTest.java | 4 +-
.../log4j/async/logger}/AsyncLoggerTest.java | 24 +-
.../AsyncLoggerTestArgumentFreedOnErrorTest.java | 3 +-
.../logger}/AsyncLoggerThreadContextTest.java | 17 +-
.../logger}/AsyncLoggerTimestampMessageTest.java | 4 +-
.../logger}/AsyncLoggerUseAfterShutdownTest.java | 25 +-
.../logger}/AsyncLoggersWithAsyncAppenderTest.java | 2 +-
.../AsyncLoggersWithAsyncLoggerConfigTest.java | 4 +-
.../log4j/async/logger}/AsyncRootReloadTest.java | 21 +-
.../async/logger}/AsyncThreadContextTest.java | 20 +-
.../BasicAsyncLoggerContextSelectorTest.java | 2 +-
.../async/logger/DefaultIncludeLocationTest.java | 91
.../logger}/DisruptorConfigurationInvalidTest.java | 2 +-
.../async/logger}/DisruptorConfigurationTest.java | 2 +-
.../logger}/GarbageFreeAsyncThreadContextTest.java | 2 +-
.../async/logger}/Log4j2Jira1688AsyncTest.java | 4 +-
.../async/logger/NestedAsyncLoggerConfigTest.java | 15 +-
.../async/logger/QueueFullAsyncAbstractTest.java | 260 +
.../async/logger/QueueFullAsyncLogger2Test.java| 5 +-
.../async/logger/QueueFullAsyncLogger3Test.java| 16 +-
.../logger/QueueFullAsyncLoggerConfig2Test.java| 4 +-
...lAsyncLoggerConfigLoggingFromToString2Test.java | 4 +-
...llAsyncLoggerConfigLoggingFromToStringTest.java | 5 +-
.../logger}/QueueFullAsyncLoggerConfigTest.java| 5 +-
...ueueFullAsyncLoggerLoggingFromToStringTest.java | 10 +-
.../async/logger}/QueueFullAsyncLoggerTest.java| 10 +-
.../async/logger}/RingBufferLogEventTest.java | 2 +-
...AsyncWaitStrategyIncorrectFactoryConfigTest.xml | 0
.../logger/AsyncLoggerClassLoadDeadlockTest.xml| 0
.../log4j/async/logger/AsyncLoggerConfig2Test.xml | 2 +-
.../log4j/async/logger/AsyncLoggerConfig3Test.xml | 2 +-
(logging-log4j2) branch move-async updated (2b22eea39a -> 4ad805aa49)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch move-async in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard 2b22eea39a Remove references to async context selector in `log4j-script` discard 41fd431eb8 Add changelog for splitting off `log4j-async-logger` discard 3dc12aa4a2 Fix failing tests discard 98e0eeb6c9 Move async support to `log4j-async-logger` discard 26c1c6b9aa Last tweaks to tests before moving async support discard 129e0d08ea Remove instance of checks for async components discard 1db31e7191 Move async logger tests to `log4j-async-logger` discard 317742fc30 Inline `EventRoute` methods add 59b4055f1d Add security threat model to docs add b8f220664a Simplify statement add 6108781065 Add example add f3c6262a9e Apply suggestions from code review add 32908544df Apply more code review suggestions add 9543bee1d7 Merge pull request #2219 from jvz/issue-2100 add 44613d0709 Inline `EventRoute` methods add f5af863fa7 Move async logger tests to `log4j-async-logger` add 4e732f1097 Remove instance of checks for async components add b69110b0fd Last tweaks to tests before moving async support add a3cf42d2ed Move async support to `log4j-async-logger` add 1fc391303e Fix failing tests add fd526f1e6b Add changelog for splitting off `log4j-async-logger` add 4ad805aa49 Remove references to async context selector in `log4j-script` This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2b22eea39a) \ N -- N -- N refs/heads/move-async (4ad805aa49) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/site/asciidoc/download.adoc.vm| 7 ++-- src/site/asciidoc/manual/layouts.adoc | 4 +- src/site/asciidoc/security.adoc | 76 +++ 3 files changed, 82 insertions(+), 5 deletions(-)
(logging-log4j2) 01/01: Fix regression in `JdkMapAdapterStringMap` performance
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/2238_fix_jdk_string_map
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit f83d1926738ba958e3ecce1715f5c5755b3aa6e3
Author: Piotr P. Karwasz
AuthorDate: Mon Jan 29 19:56:29 2024 +0100
Fix regression in `JdkMapAdapterStringMap` performance
We introduce a new constructor for `JdkMapAdapterStringMap` to prevent
the performance penalty of an exception if the map is immutable.
---
.../log4j/core/impl/JdkMapAdapterStringMapTest.java | 1 +
.../logging/log4j/core/impl/JdkMapAdapterStringMap.java | 16 +++-
.../log4j/core/impl/ThreadContextDataInjector.java | 14 +++---
.../logging/log4j/core/util/ContextDataProvider.java | 2 +-
.../log4j/layout/template/json/util/JsonWriterTest.java | 4 ++--
src/changelog/.3.x.x/2238_fix_jdk_string_map.xml | 10 ++
6 files changed, 36 insertions(+), 11 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
index 65e894814d..39953f0474 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
@@ -44,6 +44,7 @@ public class JdkMapAdapterStringMapTest {
@Test
public void testConstructorDisallowsNull() {
assertThrows(NullPointerException.class, () -> new
JdkMapAdapterStringMap(null));
+assertThrows(NullPointerException.class, () -> new
JdkMapAdapterStringMap(null, false));
}
@Test
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
index 8da3952cd8..b158143093 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
@@ -47,9 +47,14 @@ public class JdkMapAdapterStringMap implements StringMap {
private transient String[] sortedKeys;
public JdkMapAdapterStringMap() {
-this(new HashMap());
+this(new HashMap(), false);
}
+/**
+ * @deprecated for performance reasons since 2.23.
+ * Use {@link #JdkMapAdapterStringMap(Map, boolean)} instead.
+ */
+@Deprecated
public JdkMapAdapterStringMap(final Map map) {
this.map = Objects.requireNonNull(map, "map");
try {
@@ -59,6 +64,15 @@ public class JdkMapAdapterStringMap implements StringMap {
}
}
+/**
+ * @param map a JDK map,
+ * @param immutable must be {@code true} if the map is immutable or it
should not be modified.
+ */
+public JdkMapAdapterStringMap(final Map map, final boolean
immutable) {
+this.map = Objects.requireNonNull(map, "map");
+this.immutable = immutable;
+}
+
@Override
public Map toMap() {
return map;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
index 4df68ce64a..24d8604bca 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
@@ -121,7 +121,7 @@ public class ThreadContextDataInjector {
// data. Note that we cannot reuse the specified StringMap: some
Loggers may have properties defined
// and others not, so the LogEvent's context data may have been
replaced with an immutable copy from
// the ThreadContext - this will throw an
UnsupportedOperationException if we try to modify it.
-final StringMap result = new JdkMapAdapterStringMap(new
HashMap<>(copy));
+final StringMap result = new JdkMapAdapterStringMap(new
HashMap<>(copy), false);
for (int i = 0; i < props.size(); i++) {
final Property prop = props.get(i);
if (!copy.containsKey(prop.getName())) {
@@ -133,20 +133,20 @@ public class ThreadContextDataInjector {
}
private static JdkMapAdapterStringMap frozenStringMap(final
Map copy) {
-final JdkMapAdapterStringMap result = new
JdkMapAdapterStringMap(copy);
-result.freeze();
-return result;
+return new JdkMapAdapterStringMap(copy, true);
}
@Override
public ReadOnlyStringMap rawContextData() {
final ReadOnlyThreadContextMap map =
ThreadContext.getThreadContextMap();
-if (map instanceof
(logging-log4j2) branch fix/2238_fix_jdk_string_map created (now f83d192673)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch fix/2238_fix_jdk_string_map in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at f83d192673 Fix regression in `JdkMapAdapterStringMap` performance This branch includes the following new commits: new f83d192673 Fix regression in `JdkMapAdapterStringMap` performance The 1 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.
(logging-log4j2) branch main updated (0f2bf49bd7 -> 9543bee1d7)
This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 0f2bf49bd7 Fix missing import add 59b4055f1d Add security threat model to docs add b8f220664a Simplify statement add 6108781065 Add example add f3c6262a9e Apply suggestions from code review add 32908544df Apply more code review suggestions new 9543bee1d7 Merge pull request #2219 from jvz/issue-2100 The 1 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: src/site/asciidoc/download.adoc.vm| 7 ++-- src/site/asciidoc/manual/layouts.adoc | 4 +- src/site/asciidoc/security.adoc | 76 +++ 3 files changed, 82 insertions(+), 5 deletions(-)
(logging-log4j2) 01/01: Merge pull request #2219 from jvz/issue-2100
This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit 9543bee1d7e43ac7cf29f118db6d2fd24c089da9 Merge: 0f2bf49bd7 32908544df Author: Matt Sicker AuthorDate: Mon Jan 29 12:11:33 2024 -0600 Merge pull request #2219 from jvz/issue-2100 Add security threat model to docs src/site/asciidoc/download.adoc.vm| 7 ++-- src/site/asciidoc/manual/layouts.adoc | 4 +- src/site/asciidoc/security.adoc | 76 +++ 3 files changed, 82 insertions(+), 5 deletions(-)
(logging-log4j2) branch 2.x-StatusLogger-revamp updated (fdcb05bd58 -> 40cc7218ce)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-StatusLogger-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from fdcb05bd58 Fix Spotless issues add 40cc7218ce Rework `StatusLogger` effective level No new revisions were added by this update. Summary of changes: .../log4j/status/StatusLoggerLevelTest.java| 85 ++ .../apache/logging/log4j/status/StatusLogger.java | 43 --- 2 files changed, 100 insertions(+), 28 deletions(-) create mode 100644 log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusLoggerLevelTest.java
(logging-log4j2) branch dependabot/github_actions/2.x/github/codeql-action-3.23.2 deleted (was d717857206)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/2.x/github/codeql-action-3.23.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was d717857206 Update `github/codeql-action` to version `3.23.2` (#2253) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch dependabot/github_actions/2.x/github/codeql-action-3.23.2 updated (f772e14714 -> d717857206)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/2.x/github/codeql-action-3.23.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard f772e14714 Bump github/codeql-action from 3.23.1 to 3.23.2 add d717857206 Update `github/codeql-action` to version `3.23.2` (#2253) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f772e14714) \ N -- N -- N refs/heads/dependabot/github_actions/2.x/github/codeql-action-3.23.2 (d717857206) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/changelog/.2.x.x/update_github_codeql_action.xml | 4 ++-- src/site/_release-notes/_2.x.x.adoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j2) branch 2.x updated (390b08a2a6 -> d717857206)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 390b08a2a6 Update `org.assertj:assertj-core` to version `3.25.2` (#2244) add d717857206 Update `github/codeql-action` to version `3.23.2` (#2253) No new revisions were added by this update. Summary of changes: .github/workflows/scorecards-analysis.yaml | 2 +- src/changelog/.2.x.x/update_github_codeql_action.xml | 4 ++-- src/site/_release-notes/_2.x.x.adoc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
(logging-log4j2) branch dependabot/github_actions/2.x/github/codeql-action-3.23.2 created (now f772e14714)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/2.x/github/codeql-action-3.23.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at f772e14714 Bump github/codeql-action from 3.23.1 to 3.23.2 No new revisions were added by this update.
(logging-parent) branch dependabot/github_actions/github/codeql-action-3.23.2 deleted (was 022e3c8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-3.23.2 in repository https://gitbox.apache.org/repos/asf/logging-parent.git was 022e3c8 Update `github/codeql-action` to version `3.23.2` (#112) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-parent) branch main updated (2c228e3 -> 022e3c8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git from 2c228e3 Update `de.skuzzle.enforcer:restrict-imports-enforcer-rule` to version `2.5.0` (#111) add 022e3c8 Update `github/codeql-action` to version `3.23.2` (#112) No new revisions were added by this update. Summary of changes: .github/workflows/codeql-analysis-reusable.yaml | 4 ++-- .github/workflows/scorecards-analysis-reusable.yaml | 2 +- src/changelog/.10.x.x/update_github_codeql_action.xml | 4 ++-- src/site/_release-notes/_10.x.x.adoc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
(logging-parent) branch dependabot/github_actions/github/codeql-action-3.23.2 updated (1c94a1d -> 022e3c8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-3.23.2 in repository https://gitbox.apache.org/repos/asf/logging-parent.git discard 1c94a1d Bump github/codeql-action from 3.23.1 to 3.23.2 add 022e3c8 Update `github/codeql-action` to version `3.23.2` (#112) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1c94a1d) \ N -- N -- N refs/heads/dependabot/github_actions/github/codeql-action-3.23.2 (022e3c8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/changelog/.10.x.x/update_github_codeql_action.xml | 4 ++-- src/site/_release-notes/_10.x.x.adoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-parent) branch dependabot/github_actions/github/codeql-action-3.23.2 created (now 1c94a1d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/github/codeql-action-3.23.2 in repository https://gitbox.apache.org/repos/asf/logging-parent.git at 1c94a1d Bump github/codeql-action from 3.23.1 to 3.23.2 No new revisions were added by this update.
(logging-log4j2) branch 2.x-StatusLogger-revamp updated (2c01bcd2d9 -> fdcb05bd58)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-StatusLogger-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 2c01bcd2d9 Fix `@Version`s add fdcb05bd58 Fix Spotless issues No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/logging/log4j/status/StatusLogger.java | 1 - 1 file changed, 1 deletion(-)
(logging-log4j2) branch 2.x-StatusLogger-revamp updated (3684a2e2de -> 2c01bcd2d9)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-StatusLogger-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 3684a2e2de Initialize the default `StatusLogger` instance lazy add 2c01bcd2d9 Fix `@Version`s No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/logging/log4j/test/junit/package-info.java | 2 +- .../src/main/java/org/apache/logging/log4j/status/package-info.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(logging-log4j2) branch 2.x-StatusLogger-revamp updated (c4c941e912 -> 3684a2e2de)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-StatusLogger-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from c4c941e912 Document unmodifiable collection usage add 3684a2e2de Initialize the default `StatusLogger` instance lazy No new revisions were added by this update. Summary of changes: .../org/apache/logging/log4j/status/StatusLogger.java | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-)
(logging-log4j2) branch 2.x-StatusLogger-revamp updated (f1e3e2f323 -> c4c941e912)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-StatusLogger-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from f1e3e2f323 Make `StatusLogger()` ctor private add c4c941e912 Document unmodifiable collection usage No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/logging/log4j/status/StatusLogger.java| 3 +++ 1 file changed, 3 insertions(+)
(logging-log4j2) branch 2.x-StatusLogger-revamp updated (cd3fadb3bc -> f1e3e2f323)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-StatusLogger-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from cd3fadb3bc Bring the fallback `StatusListener` concept back add f1e3e2f323 Make `StatusLogger()` ctor private No new revisions were added by this update. Summary of changes: .../main/java/org/apache/logging/log4j/status/StatusLogger.java | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-)
(logging-log4j2) branch 2.x-StatusLogger-revamp updated (cd8912d7f9 -> cd3fadb3bc)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-StatusLogger-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from cd8912d7f9 Merge remote-tracking branch 'origin/2.x' into 2.x-StatusLogger-revamp add cd3fadb3bc Bring the fallback `StatusListener` concept back No new revisions were added by this update. Summary of changes: .../apache/logging/log4j/AbstractLoggerTest.java | 1 + .../apache/logging/log4j/status/StatusLogger.java | 124 +++-- .../rolling/action/AbstractActionTest.java | 2 +- .../core/config/xml/XmlConfigurationPropsTest.java | 4 +- .../core/config/status/StatusConfiguration.java| 4 +- .../logging/log4j/core/jmx/StatusLoggerAdmin.java | 74 6 files changed, 124 insertions(+), 85 deletions(-)
