(logging-log4j2) 02/02: More `pom.xml` fine tuning
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-docgen
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 46e52100deef207536a390b448f5cc19976d3ab5
Author: Volkan Yazıcı
AuthorDate: Tue Mar 19 20:22:28 2024 +0100
More `pom.xml` fine tuning
---
pom.xml | 16
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4ec0a51e31..390ad9bcc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -325,9 +325,10 @@
-->
-all,-missing,-html
+ We also don't generate Javadoc HTML for all modules, but only for two
modules: `log4j-api` and `log4j-core`.
+ Hence, we disable it by default: -->
true
+all,-missing,-html
true
true
@@ -840,6 +841,7 @@
Though `asciidoctor-maven-plugin` version `<3.0.0` doesn't work
against `asciidoctorj` version `3.x`.
Hence, override the `asciidoctor-maven-plugin` version to `3.x`.
-->
3.0.0
+false
io.spring.asciidoctor
@@ -900,16 +902,6 @@
-
- java8-doclint-disabled
-
-[1.8,)
-
-
-${doclint}
-
-
-
java8-tests
(logging-log4j2) 01/01: Implement docgen integration
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 3.x-docgen
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 057ec1881665309d1a53c6e91df088bd09563028
Author: Volkan Yazıcı
AuthorDate: Tue Mar 19 22:19:13 2024 +0100
Implement docgen integration
---
log4j-1.2-api/.log4j-plugin-processing-activator | 1 +
log4j-1.2-api/pom.xml | 20 +--
.../.log4j-plugin-processing-activator | 1 +
log4j-async-logger/pom.xml | 19 +--
.../.log4j-plugin-processing-activator | 1 +
log4j-config-properties/pom.xml| 19 +--
.../.log4j-plugin-processing-activator | 1 +
log4j-config-yaml/pom.xml | 19 +--
log4j-core-test/.log4j-plugin-processing-activator | 1 +
log4j-core-test/pom.xml| 33 +
log4j-core/.log4j-plugin-processing-activator | 1 +
log4j-core/pom.xml | 36 ++---
.../java/org/apache/logging/log4j/core/Layout.java | 2 +-
log4j-csv/.log4j-plugin-processing-activator | 1 +
log4j-csv/pom.xml | 20 +--
log4j-docker/.log4j-plugin-processing-activator| 1 +
log4j-docker/pom.xml | 25 +---
log4j-flume-ng/.log4j-plugin-processing-activator | 1 +
log4j-flume-ng/pom.xml | 21 +--
.../.log4j-plugin-processing-activator | 1 +
log4j-jdbc-dbcp2/pom.xml | 20 +--
log4j-jdbc/.log4j-plugin-processing-activator | 1 +
log4j-jdbc/pom.xml | 18 +--
log4j-jndi/.log4j-plugin-processing-activator | 1 +
log4j-jndi/pom.xml | 21 +--
log4j-jul/pom.xml | 13 --
.../.log4j-plugin-processing-activator | 1 +
log4j-kubernetes/pom.xml | 22 +---
.../.log4j-plugin-processing-activator | 1 +
log4j-layout-template-json-test/pom.xml| 70 +-
.../.log4j-plugin-processing-activator | 1 +
log4j-layout-template-json/pom.xml | 45 ++-
log4j-mongodb4/.log4j-plugin-processing-activator | 1 +
log4j-mongodb4/pom.xml | 18 +--
log4j-osgi-test/.log4j-plugin-processing-activator | 1 +
log4j-osgi-test/pom.xml| 22 ++--
log4j-parent/pom.xml | 115
log4j-plugin-processor/pom.xml | 8 ++
.../.log4j-plugin-processing-activator | 1 +
log4j-plugins-test/pom.xml | 21 +--
log4j-script/.log4j-plugin-processing-activator| 1 +
log4j-script/pom.xml | 19 +--
.../appender/rolling/action/ScriptCondition.java | 4 +-
pom.xml| 135 +--
src/asciidoc/templates/document.html.erb | 1 +
src/docgen-templates/index.adoc.ftl| 60 +
src/docgen-templates/license.adoc | 16 +++
src/docgen-templates/type.adoc.ftl | 146 +
48 files changed, 617 insertions(+), 390 deletions(-)
diff --git a/log4j-1.2-api/.log4j-plugin-processing-activator
b/log4j-1.2-api/.log4j-plugin-processing-activator
new file mode 100644
index 00..ba133f3696
--- /dev/null
+++ b/log4j-1.2-api/.log4j-plugin-processing-activator
@@ -0,0 +1 @@
+This file is here to activate the `plugin-processing` Maven profile.
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 6e38bbee4e..e53d42ddf6 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -16,17 +16,21 @@
~ limitations under the License.
-->
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/maven-v4_0_0.xsd;>
+
4.0.0
+
org.apache.logging.log4j
log4j
${revision}
../log4j-parent
+
log4j-1.2-api
jar
Apache Log4j 1.x Compatibility API
The Apache Log4j 1.x Compatibility API
+
${basedir}/..
@@ -45,6 +49,7 @@
org.apache.logging.log4j.core
+
javax.jms
@@ -127,21 +132,6 @@
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
-
-
- org.apache.logging.log4j
- log4j-plugin-processor
- ${project.version}
-
-
-
-
-
diff --git a/log4j-async-logger/.log4j-plugin-processing-activator
b/log4j-async-logger/.log4j-plugin-processing-activator
new file mode 100644
index 00..ba133f3696
--- /dev/null
+++
(logging-log4j2) 01/02: Correct `pom.xml` docs
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit c9e1f61a448b5d13f1b5f85c5d06026b8f23e7e6 Author: Volkan Yazıcı AuthorDate: Tue Mar 19 20:00:15 2024 +0100 Correct `pom.xml` docs --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 974486a2e5..4ec0a51e31 100644 --- a/pom.xml +++ b/pom.xml @@ -328,8 +328,7 @@ We also don't generate Javadoc HTML for all modules, but only for two modules: `log4j-api` and `log4j-core`. --> all,-missing,-html true - + true true
(logging-log4j2) branch 2.x-docgen updated (d7e6efe823 -> 46e52100de)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from d7e6efe823 Switch to the standard Maven Javadoc Plugin properties new c9e1f61a44 Correct `pom.xml` docs new 46e52100de More `pom.xml` fine tuning The 2 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: pom.xml | 19 +-- 1 file changed, 5 insertions(+), 14 deletions(-)
(logging-log4j2) branch 3.x-docgen created (now 057ec18816)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 3.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 057ec18816 Implement docgen integration This branch includes the following new commits: new 057ec18816 Implement docgen integration 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-site) branch asf-site updated (ff2c2c68 -> ef927ddf)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/logging-site.git from ff2c2c68 Automatic Site Publish by Buildbot add ef927ddf Automatic Site Publish by Buildbot No new revisions were added by this update. Summary of changes: content/feed.xml | 2 +- content/xml/ns/index.html | 29 +- content/xml/ns/log4j-config-3.0.0.xsd | 613 ++ content/xml/ns/log4j-config-3.xsd | 1 + 4 files changed, 638 insertions(+), 7 deletions(-) create mode 100644 content/xml/ns/log4j-config-3.0.0.xsd create mode 12 content/xml/ns/log4j-config-3.xsd
(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 ef927ddf Automatic Site Publish by Buildbot ef927ddf is described below commit ef927ddf1cb4b872f66474a29b5d931458830f22 Author: buildbot AuthorDate: Tue Mar 19 20:12:06 2024 + Automatic Site Publish by Buildbot --- content/feed.xml | 2 +- content/xml/ns/index.html | 29 +- content/xml/ns/log4j-config-3.0.0.xsd | 613 ++ content/xml/ns/log4j-config-3.xsd | 1 + 4 files changed, 638 insertions(+), 7 deletions(-) diff --git a/content/feed.xml b/content/feed.xml index 477c56cf..fa7f217b 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-03-19T11:18:25+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-03-19T20:12:05+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. diff --git a/content/xml/ns/index.html b/content/xml/ns/index.html index e78f5dec..fef17d04 100644 --- a/content/xml/ns/index.html +++ b/content/xml/ns/index.html @@ -177,7 +177,7 @@ The canonical name for this directory is https://logging.apache.o That is, Log4j 2.24.0 release does not necessarily mean a new log4j-config-2.24.0.xsd: the Log4j 2 runtime configuration API might have been kept intact. -Users are recommended to use schemas with only major versions; log4j-config-2.xsd, log4j-changelog-0.xsd, etc. +Users are recommended to use schemas with only major versions; log4j-config-2.xsd, log4j-config-3.xsd, log4j-changelog-0.xsd, etc. @@ -188,11 +188,11 @@ That is, Log4j 2.24.0 release does not necessarily mean a new -Log4j 2 schemas +Log4j schemas -Log4j 2 is a Java logging framework. -Following schemas model the Log4j runtime configuration, i.e., log4j2.xml. +Log4j is a Java logging framework. +Following schemas model the Log4j runtime configuration, i.e., log4j2.xml[1]. @@ -216,8 +216,19 @@ Following schemas model the Log4j runtime configuration, i.e., log4j2.xml< N/A log4j-config-2.xsd -Points to the most recent XSD. -Users are recommended to refer to this XSD in their XML files. +Points to the most recent XSD of major version 2. +Log4j 2 users are recommended to refer to this XSD in their XML files. + + +2024-03-19 +log4j-config-3.0.0.xsd +N/A + + +N/A +log4j-config-3.xsd +Points to the most recent XSD of major version 3. +Log4j 3 users are recommended to refer to this XSD in their XML files. @@ -315,6 +326,12 @@ It is designed for Apache Log4j, but can be used for any Java project. + + + + +1. Both Log4j 2 and Log4j 3 use log4j2.xml for configuration. + diff --git a/content/xml/ns/log4j-config-3.0.0.xsd b/content/xml/ns/log4j-config-3.0.0.xsd new file mode 100644 index ..8e37a26a --- /dev/null +++ b/content/xml/ns/log4j-config-3.0.0.xsd @@ -0,0 +1,613 @@ +http://www.w3.org/2001/XMLSchema; xmlns:log4j="https://logging.apache.org/xml/ns; elementFormDefault="qualified" targetNamespace="https://logging.apache.org/xml/ns; version="3.0.0-SNAPSHOT">Special level that disables logging. +No events should be logged at this level.A fatal event that will prevent the application from continuingAn error in the application, possibly recoverableAn event that might possible lead to an errorIf not `null`, applies the filter to all events passing through this componentName of the appender to use in referenc [...] + +The default target is `System. out`. + +TODO Accessing `System. out` or `System. err` as a byte stream instead of a writer bypasses the JVM's knowledge of the proper encoding. +(RG) Encoding is handled within the Layout. +Typically, a Layout will generate a String and then call getBytes which may use a configured encoding or the system default. +OTOH, a Writer cannot print byte streams.If not `null`, applies the filter to all events passing through this componentFormats the log eventsSize of the buffer in bytesDetermines whether to use a buffered `OutputStream` + +If set to `true` (default) the appender will buffer messages before sending them. +This attribute is ignored if `immediateFlush` is set to `true`.Determines whether to propagate logging exceptions + +If set to `true` (default), exceptions that occur during logging will appear in the status logger. +
(logging-site) branch main updated: Add Log4j 3 XSD
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 155a1431 Add Log4j 3 XSD
155a1431 is described below
commit 155a14310a1259f1dccb9b498f3455ebaa220854
Author: Volkan Yazıcı
AuthorDate: Tue Mar 19 21:11:23 2024 +0100
Add Log4j 3 XSD
---
xml/ns/index.adoc | 23 +-
xml/ns/log4j-config-3.0.0.xsd | 613 ++
xml/ns/log4j-config-3.xsd | 1 +
3 files changed, 630 insertions(+), 7 deletions(-)
diff --git a/xml/ns/index.adoc b/xml/ns/index.adoc
index 2b0b4bc6..b2e2d629 100644
--- a/xml/ns/index.adoc
+++ b/xml/ns/index.adoc
@@ -26,14 +26,14 @@ There are two important things to understand about XSD
versioning scheme used he
. *Schema versions and project versions evolve independently.*
That is, Log4j `2.24.0` release does not necessarily mean a new
`log4j-config-2.24.0.xsd`: the Log4j 2 runtime configuration API might have
been kept intact.
-. *Users are recommended to use schemas with only major versions*;
`log4j-config-2.xsd`, `log4j-changelog-0.xsd`, etc.
+. *Users are recommended to use schemas with only major versions*;
`log4j-config-2.xsd`, `log4j-config-3.xsd`, `log4j-changelog-0.xsd`, etc.
-[#log4j2]
-== Log4j 2 schemas
+[#log4j]
+== Log4j schemas
-xref:/log4j/2.x[Log4j 2] is a Java logging framework.
-Following schemas model the Log4j runtime configuration, i.e., `log4j2.xml`.
+xref:/log4j[Log4j] is a Java logging framework.
+Following schemas model the Log4j runtime configuration, i.e.,
`log4j2.xml`{empty}footnote:[Both Log4j 2 and Log4j 3 use `log4j2.xml` for
configuration.].
[%header,cols="3*"]
|===
@@ -47,8 +47,17 @@ Following schemas model the Log4j runtime configuration,
i.e., `log4j2.xml`.
|N/A
|xref:log4j-config-2.xsd[]
-|Points to the most recent XSD.
-*Users are recommended to refer to this XSD in their XML files.*
+|Points to the most recent XSD of major version `2`.
+*Log4j 2 users are recommended to refer to this XSD in their XML files.*
+
+|2024-03-19
+|xref:log4j-config-3.0.0.xsd[]
+|N/A
+
+|N/A
+|xref:log4j-config-3.xsd[]
+|Points to the most recent XSD of major version `3`.
+*Log4j 3 users are recommended to refer to this XSD in their XML files.*
|===
.Example Log4j 2 schema usage
diff --git a/xml/ns/log4j-config-3.0.0.xsd b/xml/ns/log4j-config-3.0.0.xsd
new file mode 100644
index ..8e37a26a
--- /dev/null
+++ b/xml/ns/log4j-config-3.0.0.xsd
@@ -0,0 +1,613 @@
+http://www.w3.org/2001/XMLSchema;
xmlns:log4j="https://logging.apache.org/xml/ns; elementFormDefault="qualified"
targetNamespace="https://logging.apache.org/xml/ns;
version="3.0.0-SNAPSHOT">Special level
that disables logging.
+No events should be logged at this
level.A fatal event that will prevent the
application from
continuingAn error in the application, possibly
recoverableAn event that might possible lead to an
errorIf not `null`, applies the filter to
all events passing through this
componentName of the appender to use in
referenc [...]
+
+The default target is `System. out`.
+
+TODO Accessing `System. out` or `System. err` as a byte stream instead of a
writer bypasses the JVM's knowledge of the proper encoding.
+(RG) Encoding is handled within the Layout.
+Typically, a Layout will generate a String and then call getBytes which may
use a configured encoding or the system default.
+OTOH, a Writer cannot print byte
streams.If not `null`, applies the filter to
all events passing through this
componentFormats the log
eventsSize of the buffer in
bytesDetermines whether to use a buffered
`OutputStream`
+
+If set to `true` (default) the appender will buffer messages before sending
them.
+This attribute is ignored if `immediateFlush` is set to
`true`.Determines whether to propagate
logging exceptions
+
+If set to `true` (default), exceptions that occur during logging will appear
in the status logger.
+
+If set to `false`, exceptions will be propagates to the
caller.Flushes the
underlying `OutputStream` after each event
+
+The effects of this setting depend on the output stream implementation (see
apiref:java.io.OutputStream#flush()[]. In the case of files, for example,
setting this attribute to `true`, guarantees that all bytes written are passed
to the operating system, but it *does not* guarantee that they are actually
written to a physical device.
+
+Setting this to `true` automatically disables
buffering.Name of the appender to use in
referencesEnumeration
of [...]
+
+Hopefully it is obvious that the Appenders must be configured to not suppress
exceptions for the FailoverAppender to
work.A Filter
(optional).Determines
whether to propagate logging exceptions
+
+If set to `true` (default), exceptions that occur during logging will appear
in the status logger.
+
+If set to `false`, exceptions
(logging-log4net) branch Feature/111-Dropping-support-for-older-runtimes updated (e22bb394 -> 5e790e1c)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch Feature/111-Dropping-support-for-older-runtimes in repository https://gitbox.apache.org/repos/asf/logging-log4net.git discard e22bb394 #127 consolidated build in Dockerfile changed repository.url in package.json discard 54709d8a 3.0.0 for package.json discard 135fae28 #127 added link for installing docker discard effd49cf #127 consolidated build documentation discard cd530eb8 #127 disable EnvironmentVariable tests temporarily discard 62a8b090 #127 add missing chmod +x docker-build.sh discard 22d9b619 #127 suppress warning for SmtpClient (won't be removed - only obsolete in the mono sdk) discard 87bd8c17 Enable building log4net with docker container #127 add 35767bd9 Enable building log4net with docker container #127 add d8843304 #127 suppress warning for SmtpClient (won't be removed - only obsolete in the mono sdk) add c44c17e8 #127 add missing chmod +x docker-build.sh add a7f02548 #127 disable EnvironmentVariable tests temporarily add be7f327b #127 consolidated build documentation add aaa521e1 #127 added link for installing docker add ee68e61c 3.0.0 for package.json add 5e790e1c #127 consolidated build in Dockerfile changed repository.url in package.json 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 (e22bb394) \ N -- N -- N refs/heads/Feature/111-Dropping-support-for-older-runtimes (5e790e1c) 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:
(logging-log4net) branch Feature/111-Dropping-support-for-older-runtimes updated (db44c9ce -> e22bb394)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch Feature/111-Dropping-support-for-older-runtimes in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from db44c9ce updated release notes for 3.0.0 #111, #124, #127 add 87bd8c17 Enable building log4net with docker container #127 add 22d9b619 #127 suppress warning for SmtpClient (won't be removed - only obsolete in the mono sdk) add 62a8b090 #127 add missing chmod +x docker-build.sh add cd530eb8 #127 disable EnvironmentVariable tests temporarily add effd49cf #127 consolidated build documentation add 135fae28 #127 added link for installing docker add 54709d8a 3.0.0 for package.json add e22bb394 #127 consolidated build in Dockerfile changed repository.url in package.json No new revisions were added by this update. Summary of changes: Dockerfile | 36 ++ appveyer.yml => appveyor.yml | 0 doc/BUILDING.md| 29 +-- package.json | 4 +- .../Util/EnvironmentPatternConverterTest.cs| 4 ++ src/log4net/Appender/SmtpAppender.cs | 2 + src/site/xdoc/release/building.xml | 43 +- 7 files changed, 63 insertions(+), 55 deletions(-) create mode 100644 Dockerfile rename appveyer.yml => appveyor.yml (100%)
(logging-log4net) branch Feature/127-docker-build deleted (was 9e4a9d49)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch Feature/127-docker-build in repository https://gitbox.apache.org/repos/asf/logging-log4net.git was 9e4a9d49 #127 consolidated build in Dockerfile changed repository.url in package.json 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-log4j-audit) branch dependabot/maven/master/io.swagger-swagger-annotations-1.6.14 updated (3c98001 -> f0b3324)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/io.swagger-swagger-annotations-1.6.14 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git discard 3c98001 Bump io.swagger:swagger-annotations from 1.6.13 to 1.6.14 add f0b3324 Update `io.swagger:swagger-annotations` to version `1.6.14` (#131) 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 (3c98001) \ N -- N -- N refs/heads/dependabot/maven/master/io.swagger-swagger-annotations-1.6.14 (f0b3324) 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/.1.x.x/update_io_swagger_swagger_annotations.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4j-audit) branch dependabot/maven/master/io.swagger-swagger-annotations-1.6.14 deleted (was f0b3324)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/io.swagger-swagger-annotations-1.6.14 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git was f0b3324 Update `io.swagger:swagger-annotations` to version `1.6.14` (#131) 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-log4j-audit) branch master updated (b13d150 -> f0b3324)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git from b13d150 Update `org.postgresql:postgresql` to version `42.7.3` (#130) add f0b3324 Update `io.swagger:swagger-annotations` to version `1.6.14` (#131) No new revisions were added by this update. Summary of changes: pom.xml| 2 +- src/changelog/.1.x.x/update_io_swagger_swagger_annotations.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j-audit) branch dependabot/maven/master/io.swagger-swagger-annotations-1.6.14 created (now 3c98001)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/io.swagger-swagger-annotations-1.6.14 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git at 3c98001 Bump io.swagger:swagger-annotations from 1.6.13 to 1.6.14 No new revisions were added by this update.
(logging-log4j2) branch fix/backport-log4j3-api updated (2c9d8312b9 -> 09821aab46)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch fix/backport-log4j3-api in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard 2c9d8312b9 Remove reflection from `log4j-to-jul` and `log4j-to-slf4j` discard 45c7ccf05e Port `Tags` from 3.x discard 2bcfce910d Make default message factories GraalVM friendly discard 54517c0a63 Add `Strings#trimToOptional` discard a0ee40cef6 Remove deprecations from functional interfaces discard 3fe2f98e6b Adapt `ReusableMessage` to be used in 3.x discard 2fc0c47331 Simplify `ServiceLoaderUtil` add d1419e6ebb Simplify `ServiceLoaderUtil` add 0d81a75434 Adapt `ReusableMessage` to be used in 3.x add 7998c9b791 Remove deprecations from functional interfaces add 74029a6f09 Add `Strings#trimToOptional` add bff0bf296b Make default message factories GraalVM friendly add 500ecb7c6e Port `Tags` from 3.x add 09821aab46 Remove reflection from `log4j-to-jul` and `log4j-to-slf4j` 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 (2c9d8312b9) \ N -- N -- N refs/heads/fix/backport-log4j3-api (09821aab46) 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: log4j-api/pom.xml | 4 .../src/main/java/org/apache/logging/log4j/util/StackLocator.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)
(logging-log4j2) branch fix/backport-log4j3-api updated (8882b25232 -> 2c9d8312b9)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch fix/backport-log4j3-api in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git omit 8882b25232 Remove reflection from `log4j-to-jul` and `log4j-to-slf4j` omit 9ba858c3e3 Port `Tags` from 3.x omit 16f16d98a8 Make default message factories GraalVM friendly omit 5bd7a760f4 Add `Strings#trimToOptional` omit 079a237666 Remove deprecations from functional interfaces omit 486289cfd3 Adapt `ReusableMessage` to be used in 3.x omit b755ffe6cf Simplify `ServiceLoaderUtil` add 2fc0c47331 Simplify `ServiceLoaderUtil` add 3fe2f98e6b Adapt `ReusableMessage` to be used in 3.x add a0ee40cef6 Remove deprecations from functional interfaces add 54517c0a63 Add `Strings#trimToOptional` add 2bcfce910d Make default message factories GraalVM friendly add 45c7ccf05e Port `Tags` from 3.x add 2c9d8312b9 Remove reflection from `log4j-to-jul` and `log4j-to-slf4j` 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 (8882b25232) \ N -- N -- N refs/heads/fix/backport-log4j3-api (2c9d8312b9) 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/main/java/org/apache/logging/log4j/test/junit/package-info.java | 2 +- .../src/main/java/org/apache/logging/log4j/tojul/package-info.java | 2 +- log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/package-info.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j2) 01/07: Simplify `ServiceLoaderUtil`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b755ffe6cfa4f5a16a2856f2cc111e8ee0ee1114
Author: Piotr P. Karwasz
AuthorDate: Thu Mar 14 15:58:42 2024 +0100
Simplify `ServiceLoaderUtil`
We make `ServiceLoaderUtil` more GraalVM-friendly by replacing the usage
of `MethodHandles.Lookup` with the requirement for the caller to
instantiate the `ServiceLoader` himself.
---
.../logging/log4j/util/ServiceLoaderUtilTest.java | 25 ++-
.../logging/log4j/message/ThreadDumpMessage.java | 8 +-
.../logging/log4j/util/OsgiServiceLocator.java | 55 --
.../apache/logging/log4j/util/PropertiesUtil.java | 6 +-
.../apache/logging/log4j/util/ProviderUtil.java| 7 +-
.../logging/log4j/util/ServiceLoaderUtil.java | 193 +++--
.../apache/logging/log4j/util/StackLocator.java| 4 +-
.../logging/log4j/core/appender/SmtpAppender.java | 10 +-
.../log4j/core/impl/ThreadContextDataInjector.java | 7 +-
.../logging/log4j/core/util/WatchManager.java | 5 +-
10 files changed, 153 insertions(+), 167 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
index 09b489565c..8ca74a0bee 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
@@ -20,13 +20,15 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.ServiceConfigurationError;
+import java.util.ServiceLoader;
import java.util.stream.Collectors;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusData;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.test.BetterService;
import org.apache.logging.log4j.test.ListStatusListener;
import org.apache.logging.log4j.test.Service;
@@ -35,14 +37,26 @@ import org.junit.jupiter.api.Test;
public class ServiceLoaderUtilTest {
+private static final Logger LOGGER = StatusLogger.getLogger();
+
@Test
public void testServiceResolution() {
final List services = new ArrayList<>();
-assertDoesNotThrow(() ->
ServiceLoaderUtil.loadServices(BetterService.class, MethodHandles.lookup(),
false)
+ServiceLoaderUtil.safeStream(
+BetterService.class,
+ServiceLoader.load(BetterService.class,
getClass().getClassLoader()),
+LOGGER);
+assertDoesNotThrow(() -> ServiceLoaderUtil.safeStream(
+BetterService.class,
+ServiceLoader.load(BetterService.class,
getClass().getClassLoader()),
+LOGGER)
.forEach(services::add));
assertThat(services).hasSize(1);
services.clear();
-assertDoesNotThrow(() ->
ServiceLoaderUtil.loadServices(PropertySource.class, MethodHandles.lookup(),
false)
+assertDoesNotThrow(() -> ServiceLoaderUtil.safeStream(
+PropertySource.class,
+ServiceLoader.load(PropertySource.class,
getClass().getClassLoader()),
+LOGGER)
.forEach(services::add));
assertThat(services).hasSize(3);
}
@@ -51,7 +65,10 @@ public class ServiceLoaderUtilTest {
@UsingStatusListener
public void testBrokenServiceFile(final ListStatusListener listener) {
final List services = new ArrayList<>();
-assertDoesNotThrow(() -> ServiceLoaderUtil.loadServices(Service.class,
MethodHandles.lookup(), false)
+assertDoesNotThrow(() -> ServiceLoaderUtil.safeStream(
+Service.class,
+ServiceLoader.load(Service.class,
getClass().getClassLoader()),
+LOGGER)
.forEach(services::add));
assertEquals(2, services.size());
// A warning for each broken service
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
index 18ed7befe4..4ddbdc5c5f 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
@@ -24,10 +24,11 @@ import aQute.bnd.annotation.spi.ServiceConsumer;
import java.io.InvalidObjectException;
import
(logging-log4j2) 04/07: Add `Strings#trimToOptional`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 5bd7a760f41c2878f3628fca937187c99a5d18ce
Author: Piotr P. Karwasz
AuthorDate: Fri Mar 15 14:28:49 2024 +0100
Add `Strings#trimToOptional`
---
.../main/java/org/apache/logging/log4j/util/Strings.java | 14 ++
1 file changed, 14 insertions(+)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
index bee54324f4..8eea0e782c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
@@ -21,6 +21,7 @@ import static
org.apache.logging.log4j.util.StringBuilders.trimToMaxSize;
import java.util.Iterator;
import java.util.Locale;
import java.util.Objects;
+import java.util.Optional;
/**
* Consider this class private.
@@ -288,6 +289,19 @@ public final class Strings {
return isEmpty(ts) ? null : ts;
}
+/**
+ * Removes control characters from both ends of this String returning
{@code Optional.empty()} if the String is
+ * empty ("") after the trim or if it is {@code null}.
+ * @param str The String to trim.
+ * @return An Optional containing the String.
+ *
+ * @see #trimToNull(String)
+ * @since 2.24.0
+ */
+public static Optional trimToOptional(final String str) {
+return Optional.ofNullable(str).map(String::trim).filter(s ->
!s.isEmpty());
+}
+
private Strings() {
// empty
}
(logging-log4j2) 07/07: Remove reflection from `log4j-to-jul` and `log4j-to-slf4j`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8882b25232308e8d8a9d093c5becfd54fa63180b
Author: Piotr P. Karwasz
AuthorDate: Tue Mar 19 14:11:41 2024 +0100
Remove reflection from `log4j-to-jul` and `log4j-to-slf4j`
By removing the reflective instantiation of `LoggerContextFactory` and
`ThreadContextMap`, we make `log4j-to-jul` and `log4j-to-slf4j` more
GraalVM-friendly.
---
.../org/apache/logging/log4j/tojul/JULProvider.java| 16 +++-
.../java/org/apache/logging/slf4j/SLF4JProvider.java | 18 +-
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git
a/log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java
b/log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java
index 9022d9abeb..0f371f43ef 100644
--- a/log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java
+++ b/log4j-to-jul/src/main/java/org/apache/logging/log4j/tojul/JULProvider.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.tojul;
import aQute.bnd.annotation.Resolution;
import aQute.bnd.annotation.spi.ServiceProvider;
+import org.apache.logging.log4j.spi.LoggerContextFactory;
import org.apache.logging.log4j.spi.Provider;
/**
@@ -27,7 +28,20 @@ import org.apache.logging.log4j.spi.Provider;
*/
@ServiceProvider(value = Provider.class, resolution = Resolution.OPTIONAL)
public class JULProvider extends Provider {
+private static final LoggerContextFactory CONTEXT_FACTORY = new
JULLoggerContextFactory();
+
public JULProvider() {
-super(20, "2.6.0", JULLoggerContextFactory.class, null);
+super(20, CURRENT_VERSION);
+}
+
+@Override
+public LoggerContextFactory getLoggerContextFactory() {
+return CONTEXT_FACTORY;
+}
+
+@Override
+public String getThreadContextMap() {
+// JUL does not provide an MDC implementation
+return NO_OP_CONTEXT_MAP;
}
}
diff --git
a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JProvider.java
b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JProvider.java
index b8514c4f63..318d7937f6 100644
--- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JProvider.java
+++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JProvider.java
@@ -18,14 +18,30 @@ package org.apache.logging.slf4j;
import aQute.bnd.annotation.Resolution;
import aQute.bnd.annotation.spi.ServiceProvider;
+import org.apache.logging.log4j.spi.LoggerContextFactory;
import org.apache.logging.log4j.spi.Provider;
+import org.apache.logging.log4j.spi.ThreadContextMap;
/**
* Bind the Log4j API to SLF4J.
*/
@ServiceProvider(value = Provider.class, resolution = Resolution.OPTIONAL)
public class SLF4JProvider extends Provider {
+
+private static final LoggerContextFactory CONTEXT_FACTORY = new
SLF4JLoggerContextFactory();
+private static final ThreadContextMap THREAD_CONTEXT_MAP = new
MDCContextMap();
+
public SLF4JProvider() {
-super(15, "2.6.0", SLF4JLoggerContextFactory.class,
MDCContextMap.class);
+super(15, CURRENT_VERSION);
+}
+
+@Override
+public LoggerContextFactory getLoggerContextFactory() {
+return CONTEXT_FACTORY;
+}
+
+@Override
+public ThreadContextMap getThreadContextMapInstance() {
+return THREAD_CONTEXT_MAP;
}
}
(logging-log4j2) 06/07: Port `Tags` from 3.x
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 9ba858c3e309366a2c285eb7ecb47b6c93a2b7a4
Author: Piotr P. Karwasz
AuthorDate: Fri Mar 15 16:04:10 2024 +0100
Port `Tags` from 3.x
---
.../org/apache/logging/log4j/test/junit/Tags.java | 33 ++
1 file changed, 33 insertions(+)
diff --git
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java
new file mode 100644
index 00..06bef43b06
--- /dev/null
+++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java
@@ -0,0 +1,33 @@
+/*
+ * 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.test.junit;
+
+/**
+ * A set of tags for JUnit 5 tests.
+ */
+public final class Tags {
+
+/**
+ * Marks tests that don't modify the global environment.
+ *
+ * These tests can safely be run in parallel.
+ *
+ */
+public static final String PARALLEL = "parallel";
+
+private Tags() {}
+}
(logging-log4j2) 05/07: Make default message factories GraalVM friendly
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 16f16d98a89b4dce24e4a4d74cc112c27ee6599e
Author: Piotr P. Karwasz
AuthorDate: Fri Mar 15 14:29:50 2024 +0100
Make default message factories GraalVM friendly
---
.../log4j/message/DefaultFlowMessageFactory.java | 22 ++
.../apache/logging/log4j/spi/AbstractLogger.java | 14 ++
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
index 1c6fcd3f45..3ca2aeba41 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
@@ -17,8 +17,7 @@
package org.apache.logging.log4j.message;
import java.io.Serializable;
-import org.apache.logging.log4j.spi.AbstractLogger;
-import org.apache.logging.log4j.util.LoaderUtil;
+import java.util.Objects;
import org.apache.logging.log4j.util.StringBuilderFormattable;
import org.apache.logging.log4j.util.StringBuilders;
import org.apache.logging.log4j.util.Strings;
@@ -34,6 +33,8 @@ public class DefaultFlowMessageFactory implements
FlowMessageFactory, Serializab
private static final String ENTRY_DEFAULT_PREFIX = "Enter";
private static final long serialVersionUID = 8578655591131397576L;
+public static final FlowMessageFactory INSTANCE = new
DefaultFlowMessageFactory();
+
private final String entryText;
private final String exitText;
private final MessageFactory messageFactory;
@@ -51,17 +52,22 @@ public class DefaultFlowMessageFactory implements
FlowMessageFactory, Serializab
* @param exitText the text to use for trace exit, like {@code "Exit"}.
*/
public DefaultFlowMessageFactory(final String entryText, final String
exitText) {
+this(entryText, exitText, createDefaultMessageFactory());
+}
+
+public DefaultFlowMessageFactory(final MessageFactory messageFactory) {
+this(ENTRY_DEFAULT_PREFIX, EXIT_DEFAULT_PREFIX,
Objects.requireNonNull(messageFactory));
+}
+
+private DefaultFlowMessageFactory(
+final String entryText, final String exitText, final
MessageFactory messageFactory) {
this.entryText = entryText;
this.exitText = exitText;
-this.messageFactory = createDefaultMessageFactory();
+this.messageFactory = messageFactory;
}
private static MessageFactory createDefaultMessageFactory() {
-try {
-return
LoaderUtil.newInstanceOf(AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS);
-} catch (final ReflectiveOperationException e) {
-throw new IllegalStateException(e);
-}
+return ParameterizedMessageFactory.INSTANCE;
}
private static class AbstractFlowMessage implements FlowMessage,
StringBuilderFormattable {
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index d9543f17b5..30d0cffef0 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -35,7 +35,6 @@ import
org.apache.logging.log4j.message.StringFormattedMessage;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Constants;
import org.apache.logging.log4j.util.LambdaUtil;
-import org.apache.logging.log4j.util.LoaderUtil;
import org.apache.logging.log4j.util.MessageSupplier;
import org.apache.logging.log4j.util.PerformanceSensitive;
import org.apache.logging.log4j.util.StackLocatorUtil;
@@ -198,12 +197,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, LocationAwareLog
}
private static MessageFactory2 createDefaultMessageFactory() {
-try {
-final MessageFactory result =
LoaderUtil.newInstanceOf(DEFAULT_MESSAGE_FACTORY_CLASS);
-return narrow(result);
-} catch (final ReflectiveOperationException e) {
-throw new IllegalStateException(e);
-}
+return ParameterizedMessageFactory.INSTANCE;
}
private static MessageFactory2 narrow(final MessageFactory result) {
@@ -214,11 +208,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, LocationAwareLog
}
private static FlowMessageFactory createDefaultFlowMessageFactory() {
-try {
-return
LoaderUtil.newInstanceOf(DEFAULT_FLOW_MESSAGE_FACTORY_CLASS);
-} catch (final ReflectiveOperationException e) {
-throw new IllegalStateException(e);
-}
+return
(logging-log4j2) branch fix/backport-log4j3-api updated (fe8bbd4b0b -> 8882b25232)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch fix/backport-log4j3-api in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard fe8bbd4b0b Port `Tags` from 3.x discard d79ea661f4 Make default message factories GraalVM friendly discard 3d47553bac Add `Strings#trimToOptional` discard 5d68b0970c Remove deprecations from functional interfaces discard 40a37e17bb Adapt `ReusableMessage` to be used in 3.x discard 42cb8a4acd Simplify `ServiceLoaderUtil` discard 8c5ffb7c4c Apply suggestions from review of #2374 add ed4c72e679 Apply suggestions from review of #2374 new b755ffe6cf Simplify `ServiceLoaderUtil` new 486289cfd3 Adapt `ReusableMessage` to be used in 3.x new 079a237666 Remove deprecations from functional interfaces new 5bd7a760f4 Add `Strings#trimToOptional` new 16f16d98a8 Make default message factories GraalVM friendly new 9ba858c3e3 Port `Tags` from 3.x new 8882b25232 Remove reflection from `log4j-to-jul` and `log4j-to-slf4j` 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 (fe8bbd4b0b) \ N -- N -- N refs/heads/fix/backport-log4j3-api (8882b25232) 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. The 7 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: .../apache/logging/log4j/util/ProviderUtilTest.java| 2 +- .../org/apache/logging/log4j/tojul/JULProvider.java| 16 +++- .../java/org/apache/logging/slf4j/SLF4JProvider.java | 18 +- 3 files changed, 33 insertions(+), 3 deletions(-)
(logging-log4j2) 03/07: Remove deprecations from functional interfaces
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 079a237666b48748d8d99ee63eefd63930bb0556
Author: Piotr P. Karwasz
AuthorDate: Fri Mar 15 10:05:24 2024 +0100
Remove deprecations from functional interfaces
---
.../map/UnmodifiableArrayBackedMapTest.java| 30 ++
.../java/org/apache/logging/log4j/LogBuilder.java | 110 +
.../java/org/apache/logging/log4j/LogManager.java | 35 ---
.../main/java/org/apache/logging/log4j/Logger.java | 66 +++--
.../org/apache/logging/log4j/util/BiConsumer.java | 4 +-
.../org/apache/logging/log4j/util/LambdaUtil.java | 3 -
.../apache/logging/log4j/util/MessageSupplier.java | 4 +-
.../org/apache/logging/log4j/util/Supplier.java| 5 +-
8 files changed, 119 insertions(+), 138 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
index efcee80a15..9652034d70 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -31,6 +32,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.logging.log4j.util.ReadOnlyStringMap;
import org.apache.logging.log4j.util.TriConsumer;
import org.junit.jupiter.api.Test;
@@ -238,32 +240,18 @@ public class UnmodifiableArrayBackedMapTest {
@Test
public void testForEachBiConsumer_JavaUtil() {
-UnmodifiableArrayBackedMap map =
UnmodifiableArrayBackedMap.EMPTY_MAP.copyAndPutAll(getTestParameters());
-Set keys = new HashSet<>();
-java.util.function.BiConsumer java_util_action =
-new java.util.function.BiConsumer() {
-@Override
-public void accept(String key, String value) {
-keys.add(key);
-}
-};
-map.forEach(java_util_action);
+final Map map =
UnmodifiableArrayBackedMap.EMPTY_MAP.copyAndPutAll(getTestParameters());
+final Collection keys = new HashSet<>();
+map.forEach((key, value) -> keys.add(key));
assertEquals(map.keySet(), keys);
}
@Test
public void testForEachBiConsumer_Log4jUtil() {
-UnmodifiableArrayBackedMap map =
UnmodifiableArrayBackedMap.EMPTY_MAP.copyAndPutAll(getTestParameters());
-Set keys = new HashSet<>();
-org.apache.logging.log4j.util.BiConsumer
log4j_util_action =
-new org.apache.logging.log4j.util.BiConsumer()
{
-@Override
-public void accept(String key, String value) {
-keys.add(key);
-}
-};
-map.forEach(log4j_util_action);
-assertEquals(map.keySet(), keys);
+final ReadOnlyStringMap map =
UnmodifiableArrayBackedMap.EMPTY_MAP.copyAndPutAll(getTestParameters());
+final Collection keys = new HashSet<>();
+map.forEach((key, value) -> keys.add(key));
+assertEquals(map.toMap().keySet(), keys);
}
@Test
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
b/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
index 91d3083e4a..992d287513 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
@@ -32,7 +32,7 @@ public interface LogBuilder {
* @param marker The Marker to log.
* @return The LogBuilder.
*/
-default LogBuilder withMarker(Marker marker) {
+default LogBuilder withMarker(final Marker marker) {
return this;
}
@@ -41,7 +41,7 @@ public interface LogBuilder {
* @param throwable The Throwable to log.
* @return the LogBuilder.
*/
-default LogBuilder withThrowable(Throwable throwable) {
+default LogBuilder withThrowable(final Throwable throwable) {
return this;
}
@@ -59,7 +59,7 @@ public interface LogBuilder {
* @param location The stack trace element to include in the log event.
* @return The LogBuilder.
*/
-default LogBuilder withLocation(StackTraceElement location) {
+default LogBuilder withLocation(final StackTraceElement location) {
return this;
}
@@
(logging-log4j2) 02/07: Adapt `ReusableMessage` to be used in 3.x
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 486289cfd3a087b3412cff53788100249016db3d
Author: Piotr P. Karwasz
AuthorDate: Thu Mar 14 16:14:04 2024 +0100
Adapt `ReusableMessage` to be used in 3.x
---
.../logging/log4j/message/ReusableMessage.java | 8
.../message/ReusableParameterizedMessage.java | 23 +++---
.../apache/logging/log4j/message/package-info.java | 2 +-
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
index 35e8fa3919..5a5d264e68 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.message;
import org.apache.logging.log4j.util.PerformanceSensitive;
import org.apache.logging.log4j.util.StringBuilderFormattable;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Messages implementing this interface are reused between logging calls.
@@ -29,6 +30,7 @@ import org.apache.logging.log4j.util.StringBuilderFormattable;
* @since 2.6
*/
@PerformanceSensitive("allocation")
+@ProviderType
public interface ReusableMessage extends Message, StringBuilderFormattable {
/**
@@ -69,4 +71,10 @@ public interface ReusableMessage extends Message,
StringBuilderFormattable {
* @return an immutable snapshot of this message
*/
Message memento();
+
+/**
+ * Resets the object to a clean state.
+ * @since 2.24.0
+ */
+void clear();
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
index d55b98ae70..053a5bf8f1 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
@@ -135,26 +135,27 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return null;
}
-ReusableParameterizedMessage set(final String messagePattern, final
Object... arguments) {
+public ReusableParameterizedMessage set(final String messagePattern, final
Object... arguments) {
init(messagePattern, arguments == null ? 0 : arguments.length,
arguments);
varargs = arguments;
return this;
}
-ReusableParameterizedMessage set(final String messagePattern, final Object
p0) {
+public ReusableParameterizedMessage set(final String messagePattern, final
Object p0) {
params[0] = p0;
init(messagePattern, 1, params);
return this;
}
-ReusableParameterizedMessage set(final String messagePattern, final Object
p0, final Object p1) {
+public ReusableParameterizedMessage set(final String messagePattern, final
Object p0, final Object p1) {
params[0] = p0;
params[1] = p1;
init(messagePattern, 2, params);
return this;
}
-ReusableParameterizedMessage set(final String messagePattern, final Object
p0, final Object p1, final Object p2) {
+public ReusableParameterizedMessage set(
+final String messagePattern, final Object p0, final Object p1,
final Object p2) {
params[0] = p0;
params[1] = p1;
params[2] = p2;
@@ -162,7 +163,7 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return this;
}
-ReusableParameterizedMessage set(
+public ReusableParameterizedMessage set(
final String messagePattern, final Object p0, final Object p1,
final Object p2, final Object p3) {
params[0] = p0;
params[1] = p1;
@@ -172,7 +173,7 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return this;
}
-ReusableParameterizedMessage set(
+public ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -188,7 +189,7 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return this;
}
-ReusableParameterizedMessage set(
+public ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -206,7 +207,7 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return this;
}
-ReusableParameterizedMessage set(
+public ReusableParameterizedMessage set(
final String
(logging-log4j2) branch feature/provider-revamp updated (8c5ffb7c4c -> ed4c72e679)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch feature/provider-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git omit 8c5ffb7c4c Apply suggestions from review of #2374 add ed4c72e679 Apply suggestions from review of #2374 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 (8c5ffb7c4c) \ N -- N -- N refs/heads/feature/provider-revamp (ed4c72e679) 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/test/java/org/apache/logging/log4j/util/ProviderUtilTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4j2) 05/06: Make default message factories GraalVM friendly
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d79ea661f4e79c6dc836af021f0ff4659695c7a8
Author: Piotr P. Karwasz
AuthorDate: Fri Mar 15 14:29:50 2024 +0100
Make default message factories GraalVM friendly
---
.../log4j/message/DefaultFlowMessageFactory.java | 22 ++
.../apache/logging/log4j/spi/AbstractLogger.java | 14 ++
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
index 1c6fcd3f45..3ca2aeba41 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
@@ -17,8 +17,7 @@
package org.apache.logging.log4j.message;
import java.io.Serializable;
-import org.apache.logging.log4j.spi.AbstractLogger;
-import org.apache.logging.log4j.util.LoaderUtil;
+import java.util.Objects;
import org.apache.logging.log4j.util.StringBuilderFormattable;
import org.apache.logging.log4j.util.StringBuilders;
import org.apache.logging.log4j.util.Strings;
@@ -34,6 +33,8 @@ public class DefaultFlowMessageFactory implements
FlowMessageFactory, Serializab
private static final String ENTRY_DEFAULT_PREFIX = "Enter";
private static final long serialVersionUID = 8578655591131397576L;
+public static final FlowMessageFactory INSTANCE = new
DefaultFlowMessageFactory();
+
private final String entryText;
private final String exitText;
private final MessageFactory messageFactory;
@@ -51,17 +52,22 @@ public class DefaultFlowMessageFactory implements
FlowMessageFactory, Serializab
* @param exitText the text to use for trace exit, like {@code "Exit"}.
*/
public DefaultFlowMessageFactory(final String entryText, final String
exitText) {
+this(entryText, exitText, createDefaultMessageFactory());
+}
+
+public DefaultFlowMessageFactory(final MessageFactory messageFactory) {
+this(ENTRY_DEFAULT_PREFIX, EXIT_DEFAULT_PREFIX,
Objects.requireNonNull(messageFactory));
+}
+
+private DefaultFlowMessageFactory(
+final String entryText, final String exitText, final
MessageFactory messageFactory) {
this.entryText = entryText;
this.exitText = exitText;
-this.messageFactory = createDefaultMessageFactory();
+this.messageFactory = messageFactory;
}
private static MessageFactory createDefaultMessageFactory() {
-try {
-return
LoaderUtil.newInstanceOf(AbstractLogger.DEFAULT_MESSAGE_FACTORY_CLASS);
-} catch (final ReflectiveOperationException e) {
-throw new IllegalStateException(e);
-}
+return ParameterizedMessageFactory.INSTANCE;
}
private static class AbstractFlowMessage implements FlowMessage,
StringBuilderFormattable {
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index d9543f17b5..30d0cffef0 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -35,7 +35,6 @@ import
org.apache.logging.log4j.message.StringFormattedMessage;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Constants;
import org.apache.logging.log4j.util.LambdaUtil;
-import org.apache.logging.log4j.util.LoaderUtil;
import org.apache.logging.log4j.util.MessageSupplier;
import org.apache.logging.log4j.util.PerformanceSensitive;
import org.apache.logging.log4j.util.StackLocatorUtil;
@@ -198,12 +197,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, LocationAwareLog
}
private static MessageFactory2 createDefaultMessageFactory() {
-try {
-final MessageFactory result =
LoaderUtil.newInstanceOf(DEFAULT_MESSAGE_FACTORY_CLASS);
-return narrow(result);
-} catch (final ReflectiveOperationException e) {
-throw new IllegalStateException(e);
-}
+return ParameterizedMessageFactory.INSTANCE;
}
private static MessageFactory2 narrow(final MessageFactory result) {
@@ -214,11 +208,7 @@ public abstract class AbstractLogger implements
ExtendedLogger, LocationAwareLog
}
private static FlowMessageFactory createDefaultFlowMessageFactory() {
-try {
-return
LoaderUtil.newInstanceOf(DEFAULT_FLOW_MESSAGE_FACTORY_CLASS);
-} catch (final ReflectiveOperationException e) {
-throw new IllegalStateException(e);
-}
+return
(logging-log4j2) branch fix/backport-log4j3-api created (now fe8bbd4b0b)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch fix/backport-log4j3-api in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at fe8bbd4b0b Port `Tags` from 3.x This branch includes the following new commits: new 42cb8a4acd Simplify `ServiceLoaderUtil` new 40a37e17bb Adapt `ReusableMessage` to be used in 3.x new 5d68b0970c Remove deprecations from functional interfaces new 3d47553bac Add `Strings#trimToOptional` new d79ea661f4 Make default message factories GraalVM friendly new fe8bbd4b0b Port `Tags` from 3.x The 6 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) 02/06: Adapt `ReusableMessage` to be used in 3.x
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 40a37e17bb2f933142bb9dbb16997e073f11c750
Author: Piotr P. Karwasz
AuthorDate: Thu Mar 14 16:14:04 2024 +0100
Adapt `ReusableMessage` to be used in 3.x
---
.../logging/log4j/message/ReusableMessage.java | 8
.../message/ReusableParameterizedMessage.java | 23 +++---
.../apache/logging/log4j/message/package-info.java | 2 +-
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
index 35e8fa3919..5a5d264e68 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.message;
import org.apache.logging.log4j.util.PerformanceSensitive;
import org.apache.logging.log4j.util.StringBuilderFormattable;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Messages implementing this interface are reused between logging calls.
@@ -29,6 +30,7 @@ import org.apache.logging.log4j.util.StringBuilderFormattable;
* @since 2.6
*/
@PerformanceSensitive("allocation")
+@ProviderType
public interface ReusableMessage extends Message, StringBuilderFormattable {
/**
@@ -69,4 +71,10 @@ public interface ReusableMessage extends Message,
StringBuilderFormattable {
* @return an immutable snapshot of this message
*/
Message memento();
+
+/**
+ * Resets the object to a clean state.
+ * @since 2.24.0
+ */
+void clear();
}
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
index d55b98ae70..053a5bf8f1 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
@@ -135,26 +135,27 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return null;
}
-ReusableParameterizedMessage set(final String messagePattern, final
Object... arguments) {
+public ReusableParameterizedMessage set(final String messagePattern, final
Object... arguments) {
init(messagePattern, arguments == null ? 0 : arguments.length,
arguments);
varargs = arguments;
return this;
}
-ReusableParameterizedMessage set(final String messagePattern, final Object
p0) {
+public ReusableParameterizedMessage set(final String messagePattern, final
Object p0) {
params[0] = p0;
init(messagePattern, 1, params);
return this;
}
-ReusableParameterizedMessage set(final String messagePattern, final Object
p0, final Object p1) {
+public ReusableParameterizedMessage set(final String messagePattern, final
Object p0, final Object p1) {
params[0] = p0;
params[1] = p1;
init(messagePattern, 2, params);
return this;
}
-ReusableParameterizedMessage set(final String messagePattern, final Object
p0, final Object p1, final Object p2) {
+public ReusableParameterizedMessage set(
+final String messagePattern, final Object p0, final Object p1,
final Object p2) {
params[0] = p0;
params[1] = p1;
params[2] = p2;
@@ -162,7 +163,7 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return this;
}
-ReusableParameterizedMessage set(
+public ReusableParameterizedMessage set(
final String messagePattern, final Object p0, final Object p1,
final Object p2, final Object p3) {
params[0] = p0;
params[1] = p1;
@@ -172,7 +173,7 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return this;
}
-ReusableParameterizedMessage set(
+public ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -188,7 +189,7 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return this;
}
-ReusableParameterizedMessage set(
+public ReusableParameterizedMessage set(
final String messagePattern,
final Object p0,
final Object p1,
@@ -206,7 +207,7 @@ public class ReusableParameterizedMessage implements
ReusableMessage, ParameterV
return this;
}
-ReusableParameterizedMessage set(
+public ReusableParameterizedMessage set(
final String
(logging-log4j2) 03/06: Remove deprecations from functional interfaces
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 5d68b0970cb6ba892429dbce5b5b4e4d67cdd00c
Author: Piotr P. Karwasz
AuthorDate: Fri Mar 15 10:05:24 2024 +0100
Remove deprecations from functional interfaces
---
.../map/UnmodifiableArrayBackedMapTest.java| 30 ++
.../java/org/apache/logging/log4j/LogBuilder.java | 110 +
.../java/org/apache/logging/log4j/LogManager.java | 35 ---
.../main/java/org/apache/logging/log4j/Logger.java | 66 +++--
.../org/apache/logging/log4j/util/BiConsumer.java | 4 +-
.../org/apache/logging/log4j/util/LambdaUtil.java | 3 -
.../apache/logging/log4j/util/MessageSupplier.java | 4 +-
.../org/apache/logging/log4j/util/Supplier.java| 5 +-
8 files changed, 119 insertions(+), 138 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
index efcee80a15..9652034d70 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMapTest.java
@@ -24,6 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -31,6 +32,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.logging.log4j.util.ReadOnlyStringMap;
import org.apache.logging.log4j.util.TriConsumer;
import org.junit.jupiter.api.Test;
@@ -238,32 +240,18 @@ public class UnmodifiableArrayBackedMapTest {
@Test
public void testForEachBiConsumer_JavaUtil() {
-UnmodifiableArrayBackedMap map =
UnmodifiableArrayBackedMap.EMPTY_MAP.copyAndPutAll(getTestParameters());
-Set keys = new HashSet<>();
-java.util.function.BiConsumer java_util_action =
-new java.util.function.BiConsumer() {
-@Override
-public void accept(String key, String value) {
-keys.add(key);
-}
-};
-map.forEach(java_util_action);
+final Map map =
UnmodifiableArrayBackedMap.EMPTY_MAP.copyAndPutAll(getTestParameters());
+final Collection keys = new HashSet<>();
+map.forEach((key, value) -> keys.add(key));
assertEquals(map.keySet(), keys);
}
@Test
public void testForEachBiConsumer_Log4jUtil() {
-UnmodifiableArrayBackedMap map =
UnmodifiableArrayBackedMap.EMPTY_MAP.copyAndPutAll(getTestParameters());
-Set keys = new HashSet<>();
-org.apache.logging.log4j.util.BiConsumer
log4j_util_action =
-new org.apache.logging.log4j.util.BiConsumer()
{
-@Override
-public void accept(String key, String value) {
-keys.add(key);
-}
-};
-map.forEach(log4j_util_action);
-assertEquals(map.keySet(), keys);
+final ReadOnlyStringMap map =
UnmodifiableArrayBackedMap.EMPTY_MAP.copyAndPutAll(getTestParameters());
+final Collection keys = new HashSet<>();
+map.forEach((key, value) -> keys.add(key));
+assertEquals(map.toMap().keySet(), keys);
}
@Test
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
b/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
index 91d3083e4a..992d287513 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java
@@ -32,7 +32,7 @@ public interface LogBuilder {
* @param marker The Marker to log.
* @return The LogBuilder.
*/
-default LogBuilder withMarker(Marker marker) {
+default LogBuilder withMarker(final Marker marker) {
return this;
}
@@ -41,7 +41,7 @@ public interface LogBuilder {
* @param throwable The Throwable to log.
* @return the LogBuilder.
*/
-default LogBuilder withThrowable(Throwable throwable) {
+default LogBuilder withThrowable(final Throwable throwable) {
return this;
}
@@ -59,7 +59,7 @@ public interface LogBuilder {
* @param location The stack trace element to include in the log event.
* @return The LogBuilder.
*/
-default LogBuilder withLocation(StackTraceElement location) {
+default LogBuilder withLocation(final StackTraceElement location) {
return this;
}
@@
(logging-log4j2) 06/06: Port `Tags` from 3.x
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit fe8bbd4b0b06cda4164d07f2b100be621d500f09
Author: Piotr P. Karwasz
AuthorDate: Fri Mar 15 16:04:10 2024 +0100
Port `Tags` from 3.x
---
.../org/apache/logging/log4j/test/junit/Tags.java | 33 ++
1 file changed, 33 insertions(+)
diff --git
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java
new file mode 100644
index 00..06bef43b06
--- /dev/null
+++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java
@@ -0,0 +1,33 @@
+/*
+ * 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.test.junit;
+
+/**
+ * A set of tags for JUnit 5 tests.
+ */
+public final class Tags {
+
+/**
+ * Marks tests that don't modify the global environment.
+ *
+ * These tests can safely be run in parallel.
+ *
+ */
+public static final String PARALLEL = "parallel";
+
+private Tags() {}
+}
(logging-log4j2) 04/06: Add `Strings#trimToOptional`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 3d47553bac4f16b3b9312eb6595d8c881b1779f0
Author: Piotr P. Karwasz
AuthorDate: Fri Mar 15 14:28:49 2024 +0100
Add `Strings#trimToOptional`
---
.../main/java/org/apache/logging/log4j/util/Strings.java | 14 ++
1 file changed, 14 insertions(+)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
index bee54324f4..8eea0e782c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
@@ -21,6 +21,7 @@ import static
org.apache.logging.log4j.util.StringBuilders.trimToMaxSize;
import java.util.Iterator;
import java.util.Locale;
import java.util.Objects;
+import java.util.Optional;
/**
* Consider this class private.
@@ -288,6 +289,19 @@ public final class Strings {
return isEmpty(ts) ? null : ts;
}
+/**
+ * Removes control characters from both ends of this String returning
{@code Optional.empty()} if the String is
+ * empty ("") after the trim or if it is {@code null}.
+ * @param str The String to trim.
+ * @return An Optional containing the String.
+ *
+ * @see #trimToNull(String)
+ * @since 2.24.0
+ */
+public static Optional trimToOptional(final String str) {
+return Optional.ofNullable(str).map(String::trim).filter(s ->
!s.isEmpty());
+}
+
private Strings() {
// empty
}
(logging-log4j2) 01/06: Simplify `ServiceLoaderUtil`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/backport-log4j3-api
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 42cb8a4acd2653b959635de34504293fc6ff183a
Author: Piotr P. Karwasz
AuthorDate: Thu Mar 14 15:58:42 2024 +0100
Simplify `ServiceLoaderUtil`
We make `ServiceLoaderUtil` more GraalVM-friendly by replacing the usage
of `MethodHandles.Lookup` with the requirement for the caller to
instantiate the `ServiceLoader` himself.
---
.../logging/log4j/util/ServiceLoaderUtilTest.java | 25 ++-
.../logging/log4j/message/ThreadDumpMessage.java | 8 +-
.../logging/log4j/util/OsgiServiceLocator.java | 55 --
.../apache/logging/log4j/util/PropertiesUtil.java | 6 +-
.../apache/logging/log4j/util/ProviderUtil.java| 7 +-
.../logging/log4j/util/ServiceLoaderUtil.java | 193 +++--
.../apache/logging/log4j/util/StackLocator.java| 4 +-
.../logging/log4j/core/appender/SmtpAppender.java | 10 +-
.../log4j/core/impl/ThreadContextDataInjector.java | 7 +-
.../logging/log4j/core/util/WatchManager.java | 5 +-
10 files changed, 153 insertions(+), 167 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
index 09b489565c..8ca74a0bee 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
@@ -20,13 +20,15 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.ServiceConfigurationError;
+import java.util.ServiceLoader;
import java.util.stream.Collectors;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.status.StatusData;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.test.BetterService;
import org.apache.logging.log4j.test.ListStatusListener;
import org.apache.logging.log4j.test.Service;
@@ -35,14 +37,26 @@ import org.junit.jupiter.api.Test;
public class ServiceLoaderUtilTest {
+private static final Logger LOGGER = StatusLogger.getLogger();
+
@Test
public void testServiceResolution() {
final List services = new ArrayList<>();
-assertDoesNotThrow(() ->
ServiceLoaderUtil.loadServices(BetterService.class, MethodHandles.lookup(),
false)
+ServiceLoaderUtil.safeStream(
+BetterService.class,
+ServiceLoader.load(BetterService.class,
getClass().getClassLoader()),
+LOGGER);
+assertDoesNotThrow(() -> ServiceLoaderUtil.safeStream(
+BetterService.class,
+ServiceLoader.load(BetterService.class,
getClass().getClassLoader()),
+LOGGER)
.forEach(services::add));
assertThat(services).hasSize(1);
services.clear();
-assertDoesNotThrow(() ->
ServiceLoaderUtil.loadServices(PropertySource.class, MethodHandles.lookup(),
false)
+assertDoesNotThrow(() -> ServiceLoaderUtil.safeStream(
+PropertySource.class,
+ServiceLoader.load(PropertySource.class,
getClass().getClassLoader()),
+LOGGER)
.forEach(services::add));
assertThat(services).hasSize(3);
}
@@ -51,7 +65,10 @@ public class ServiceLoaderUtilTest {
@UsingStatusListener
public void testBrokenServiceFile(final ListStatusListener listener) {
final List services = new ArrayList<>();
-assertDoesNotThrow(() -> ServiceLoaderUtil.loadServices(Service.class,
MethodHandles.lookup(), false)
+assertDoesNotThrow(() -> ServiceLoaderUtil.safeStream(
+Service.class,
+ServiceLoader.load(Service.class,
getClass().getClassLoader()),
+LOGGER)
.forEach(services::add));
assertEquals(2, services.size());
// A warning for each broken service
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
index 18ed7befe4..4ddbdc5c5f 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
@@ -24,10 +24,11 @@ import aQute.bnd.annotation.spi.ServiceConsumer;
import java.io.InvalidObjectException;
import
(logging-log4j2) branch feature/provider-revamp updated (2b7448ff90 -> 8c5ffb7c4c)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch feature/provider-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git discard 2b7448ff90 Apply suggestions from review of #2374 add 8c5ffb7c4c Apply suggestions from review of #2374 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 (2b7448ff90) \ N -- N -- N refs/heads/feature/provider-revamp (8c5ffb7c4c) 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/main/java/org/apache/logging/log4j/test/TestLogger.java | 2 +- .../main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java | 2 +- log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j2) branch feature/provider-revamp updated (c7ceec391a -> 2b7448ff90)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch feature/provider-revamp in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from c7ceec391a Fix Javadoc generation add 2b7448ff90 Apply suggestions from review of #2374 No new revisions were added by this update. Summary of changes: .../org/apache/logging/log4j/test/TestLogger.java | 12 +-- .../org/apache/logging/log4j/TestProvider.java | 2 +- .../logging/log4j/spi/ThreadContextMapTest.java| 24 ++--- .../logging/log4j/util/ProviderUtilTest.java | 120 +++-- .../logging/log4j/spi/NoOpThreadContextMap.java| 3 + .../org/apache/logging/log4j/spi/Provider.java | 63 +-- .../apache/logging/log4j/util/ProviderUtil.java| 46 7 files changed, 182 insertions(+), 88 deletions(-)
(logging-log4j2) branch 2.x-docgen updated: Switch to the standard Maven Javadoc Plugin properties
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-docgen
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x-docgen by this push:
new d7e6efe823 Switch to the standard Maven Javadoc Plugin properties
d7e6efe823 is described below
commit d7e6efe823877aa02c374cf337b5194c91bbc76b
Author: Volkan Yazıcı
AuthorDate: Tue Mar 19 13:02:09 2024 +0100
Switch to the standard Maven Javadoc Plugin properties
---
log4j-api/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
pom.xml| 14 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 082fd2f657..f6e2b44a16 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -28,7 +28,7 @@
Apache Log4j API
The Apache Log4j API
-false
+false
true
diff --git a/pom.xml b/pom.xml
index 4a1e5e866d..974486a2e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,8 +326,8 @@
-all,-missing,-html
-true
+all,-missing,-html
+true
true
@@ -640,12 +640,12 @@
pre-site
true
- ${javadoc.skip}
+ ${maven.javadoc.skip}
true
(logging-log4j2) 03/04: Remove references to the old XSD
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit 8dd9c6c56a3d09aae40a82e565364e8b52fd5194 Author: Volkan Yazıcı AuthorDate: Tue Mar 19 12:14:57 2024 +0100 Remove references to the old XSD --- .../src/main/resources/Log4j-config.xsd| 1405 .../log4j/core/config/xml/XmlSchemaTest.java | 103 -- .../log4j/core/config/xml/XmlConfiguration.java|3 +- log4j-core/src/main/resources/Log4j-config.xsd | 1405 4 files changed, 1 insertion(+), 2915 deletions(-) diff --git a/log4j-core-test/src/main/resources/Log4j-config.xsd b/log4j-core-test/src/main/resources/Log4j-config.xsd deleted file mode 100644 index a5ae2d28a5..00 --- a/log4j-core-test/src/main/resources/Log4j-config.xsd +++ /dev/null @@ -1,1405 +0,0 @@ - - -http://www.w3.org/2001/XMLSchema; -xmlns:tns="http://logging.apache.org/log4j/2.0/config; -targetNamespace="http://logging.apache.org/log4j/2.0/config; -elementFormDefault="qualified"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The Advertiser plugin name which will be used to advertise individual FileAppender or SocketAppender configurations. The only - Advertiser plugin provided is 'multicastdns". - - - - - - Either "err" for stderr, "out" for stdout, a file path, or a URL. - - - - - The minimum amount of time, in seconds, that must elapse before the file configuration is checked for changes. - - - - - The name of the configuration. - - - - - A comma separated list of package names to search for plugins. Plugins are only loaded once per classloader so changing this value - may not have any effect upon reconfiguration. - - - - - - Identifies the location for the classloader to located the XML Schema to use to validate the configuration. Only valid when strict - is set to true. If not set no schema validation will take place. - - - - - - Specifies whether or not Log4j should automatically shutdown when the JVM shuts down. The shutdown hook is enabled by default but - may be disabled by setting this attribute to "disable". - - - - - - - - - - - Specifies how many milliseconds appenders and background tasks will get to shutdown when the JVM shuts down. Default is zero which - mean that each appender uses its default timeout, and don't wait for background tasks. - - - - - - The level of internal Log4j events that should be logged to the console. Valid values for this attribute are "trace", "debug", - "info", "warn", "error" and "fatal". - - - - - - - - - - - Enables the use of the strict XML format. Not supported in JSON configurations. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Action to take when the filter
(logging-log4j2) 01/04: Don't place XSD to the website
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-docgen
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b9c5a3472ce59f20edc68b53f18b858e2101e4a5
Author: Volkan Yazıcı
AuthorDate: Tue Mar 19 10:02:24 2024 +0100
Don't place XSD to the website
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 69a45d9c9c..3cf69cbfe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -825,7 +825,7 @@
pre-site
-
${project.build.directory}/generated-sources/site/resources/config.xsd
+
${project.build.directory}/log4j-config.xsd
(logging-log4j2) 04/04: Merge remote-tracking branch 'origin/2.x' into 2.x-docgen
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit 068e39e8d177027b2db982402ebddc3053d3612a Merge: 8dd9c6c56a 67479ee93c Author: Volkan Yazıcı AuthorDate: Tue Mar 19 12:36:42 2024 +0100 Merge remote-tracking branch 'origin/2.x' into 2.x-docgen .github/workflows/scorecards-analysis.yaml| 2 +- log4j-parent/pom.xml | 8 src/changelog/.2.x.x/update_com_google_guava_guava.xml| 8 src/changelog/.2.x.x/update_github_codeql_action.xml | 8 .../.2.x.x/update_org_apache_activemq_activemq_broker.xml | 8 src/changelog/.2.x.x/update_org_awaitility_awaitility.xml | 8 .../.2.x.x/update_org_springframework_spring_framework_bom.xml| 8 src/site/_release-notes/_2.x.x.adoc | 5 + 8 files changed, 50 insertions(+), 5 deletions(-)
(logging-log4j2) 02/04: Provide schema version to docgen
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit 00fb764fd103de1cea090644d9172516fae9b7de Author: Volkan Yazıcı AuthorDate: Tue Mar 19 11:47:20 2024 +0100 Provide schema version to docgen --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3cf69cbfe6..4a1e5e866d 100644 --- a/pom.xml +++ b/pom.xml @@ -334,7 +334,7 @@ true -1.0.0-SNAPSHOT +0.8.0-SNAPSHOT
(logging-log4j2) branch 2.x-docgen updated (a9e6259f55 -> 068e39e8d1)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch 2.x-docgen
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from a9e6259f55 Remove incidentally committed ``
new b9c5a3472c Don't place XSD to the website
new 00fb764fd1 Provide schema version to docgen
new 8dd9c6c56a Remove references to the old XSD
add b1efec9efb Update `org.springframework:spring-framework-bom` to
version `5.3.33` (#2378)
add baf18f6da3 Update `com.google.guava:guava` to version `33.1.0-jre`
(#2377)
add 7899818c9f Update `org.apache.activemq:activemq-broker` to version
`6.1.0` (#2387)
add 02082a61a8 Update `org.awaitility:awaitility` to version `4.2.1`
(#2386)
add 67479ee93c Update `github/codeql-action` to version `3.24.8` (#2390)
new 068e39e8d1 Merge remote-tracking branch 'origin/2.x' into 2.x-docgen
The 4 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:
.github/workflows/scorecards-analysis.yaml |2 +-
.../src/main/resources/Log4j-config.xsd| 1405
.../log4j/core/config/xml/XmlSchemaTest.java | 103 --
.../log4j/core/config/xml/XmlConfiguration.java|3 +-
log4j-core/src/main/resources/Log4j-config.xsd | 1405
log4j-parent/pom.xml |8 +-
pom.xml|5 +-
.../update_com_google_guava_guava.xml |4 +-
.../update_github_codeql_action.xml} |4 +-
...update_org_apache_activemq_activemq_broker.xml} |4 +-
.../update_org_awaitility_awaitility.xml} |4 +-
...te_org_springframework_spring_framework_bom.xml |4 +-
src/site/_release-notes/_2.x.x.adoc|5 +
13 files changed, 24 insertions(+), 2932 deletions(-)
delete mode 100644 log4j-core-test/src/main/resources/Log4j-config.xsd
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlSchemaTest.java
delete mode 100644 log4j-core/src/main/resources/Log4j-config.xsd
copy src/changelog/{2.22.1 => .2.x.x}/update_com_google_guava_guava.xml (76%)
copy src/changelog/{2.22.0/update_org_zeromq_jeromq.xml =>
.2.x.x/update_github_codeql_action.xml} (63%)
copy src/changelog/{2.22.0/update_com_github_luben_zstd_jni.xml =>
.2.x.x/update_org_apache_activemq_activemq_broker.xml} (62%)
copy src/changelog/{2.22.0/update_org_zeromq_jeromq.xml =>
.2.x.x/update_org_awaitility_awaitility.xml} (63%)
copy src/changelog/{2.22.0 =>
.2.x.x}/update_org_springframework_spring_framework_bom.xml (74%)
(logging-site) branch asf-site updated (3540bbbb -> ff2c2c68)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/logging-site.git from 3540 Automatic Site Publish by Buildbot add 1914ee28 Automatic Site Publish by Buildbot add ff2c2c68 Automatic Site Publish by Buildbot No new revisions were added by this update. Summary of changes: content/feed.xml | 2 +- content/xml/ns/index.html| 112 +- content/xml/ns/log4j-changelog-0.2.0.xsd | 2 +- content/xml/ns/log4j-config-2.23.1.xsd | 598 +++ content/xml/ns/log4j-config-2.xsd| 1 + 5 files changed, 706 insertions(+), 9 deletions(-) create mode 100644 content/xml/ns/log4j-config-2.23.1.xsd create mode 12 content/xml/ns/log4j-config-2.xsd
(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 ff2c2c68 Automatic Site Publish by Buildbot ff2c2c68 is described below commit ff2c2c685748dc9e27ed860b83bc70f31d33d158 Author: buildbot AuthorDate: Tue Mar 19 11:18:26 2024 + Automatic Site Publish by Buildbot --- content/feed.xml | 2 +- content/xml/ns/index.html | 12 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/content/feed.xml b/content/feed.xml index 5846a204..477c56cf 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-03-19T10:45:12+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-03-19T11:18:25+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. diff --git a/content/xml/ns/index.html b/content/xml/ns/index.html index 672f0229..e78f5dec 100644 --- a/content/xml/ns/index.html +++ b/content/xml/ns/index.html @@ -230,16 +230,16 @@ Following schemas model the Log4j runtime configuration, i.e., log4j2.xml< xsi:schemaLocation=" https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd"; - Appenders + appenders Console name="Console" target="SYSTEM_OUT" PatternLayout pattern="%d [%t] %p %c - %m%n"/ /Console - /Appenders - Loggers -Root level="warn" + /appenders + loggers +root level="WARN" AppenderRef ref="Console"/ -/Root - /Loggers +/root + /loggers /Configuration
(logging-site) branch main updated: Fix `log4j2.xml` example
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 227f23c3 Fix `log4j2.xml` example 227f23c3 is described below commit 227f23c30b272f271f1ef45db2203fff6c047246 Author: Volkan Yazıcı AuthorDate: Tue Mar 19 12:18:11 2024 +0100 Fix `log4j2.xml` example --- xml/ns/index.adoc | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xml/ns/index.adoc b/xml/ns/index.adoc index c8c5084b..2b0b4bc6 100644 --- a/xml/ns/index.adoc +++ b/xml/ns/index.adoc @@ -60,16 +60,16 @@ Following schemas model the Log4j runtime configuration, i.e., `log4j2.xml`. xsi:schemaLocation=" https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd;> - + - - - + + + - - + +
(logging-log4j2) branch dependabot/github_actions/2.x/github/codeql-action-3.24.8 deleted (was 67479ee93c)
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.24.8 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 67479ee93c Update `github/codeql-action` to version `3.24.8` (#2390) 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.24.8 updated (7166218bf8 -> 67479ee93c)
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.24.8
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
discard 7166218bf8 Bump github/codeql-action from 3.24.6 to 3.24.8
add 67479ee93c Update `github/codeql-action` to version `3.24.8` (#2390)
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 (7166218bf8)
\
N -- N -- N
refs/heads/dependabot/github_actions/2.x/github/codeql-action-3.24.8
(67479ee93c)
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:
.../update_github_codeql_action.xml} | 4 ++--
src/site/_release-notes/_2.x.x.adoc | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
copy src/changelog/{2.22.0/update_org_mongodb_bson.xml =>
.2.x.x/update_github_codeql_action.xml} (63%)
(logging-log4j2) branch 2.x updated (02082a61a8 -> 67479ee93c)
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 02082a61a8 Update `org.awaitility:awaitility` to version `4.2.1`
(#2386)
add 67479ee93c Update `github/codeql-action` to version `3.24.8` (#2390)
No new revisions were added by this update.
Summary of changes:
.github/workflows/scorecards-analysis.yaml| 2 +-
.../update_github_codeql_action.xml} | 4 ++--
src/site/_release-notes/_2.x.x.adoc | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
copy src/changelog/{2.22.0/update_org_mongodb_bson.xml =>
.2.x.x/update_github_codeql_action.xml} (63%)
svn commit: r68004 - /dev/logging/log4j-tools/
Author: svc_dist_logging Date: Tue Mar 19 11:06:17 2024 New Revision: 68004 Log: Added `apache-log4j-tools` artifacts for release `0.8.0` Added: dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip (with props) dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip.asc dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip.sha512 dev/logging/log4j-tools/apache-log4j-tools-0.8.0-email-announce.txt dev/logging/log4j-tools/apache-log4j-tools-0.8.0-email-vote.txt dev/logging/log4j-tools/apache-log4j-tools-0.8.0-site.zip (with props) dev/logging/log4j-tools/apache-log4j-tools-0.8.0-src.zip (with props) dev/logging/log4j-tools/apache-log4j-tools-0.8.0-src.zip.asc dev/logging/log4j-tools/apache-log4j-tools-0.8.0-src.zip.sha512 Added: dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip == Binary file - no diff available. Propchange: dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip.asc == --- dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip.asc (added) +++ dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip.asc Tue Mar 19 11:06:17 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmX5cacACgkQVuc7qaC1 +ktDMVRAAiXdoyAgfGMElKvxK81w5d+vDIs+xaTpIRNbfE2raB8eKtkuBFbCRfjox +mU2szKellcJvESS4AJ7eiM3cNrhV5Q/xrRDIRlvmM3S6pGAHokU2kdW6Azysnrzs +Cri6BtC6O9zNSRX5hb73qulYQIgCpNKdknxDuF38xAzSR9+PkA/poelDyjD1vhbA +FVfKFvODwxPF8b5yhhkHVrdFrwsbKbzeBbZcZpif9S0iOyAy4QKBNfqPEk0NYvs5 +a69zl2YF6Dyy/3CeY23Z+ZFCIjVJiUQSZ0pYsu/jNmAbAXQ1vlzuRT5gzN/Jq0Zv +Hzd8EbqMxyKFHWzSLkDXye7J6AOuxffzCN0pfFI2t12w0oH6d3HO4+M4oFDbD0SC +aPqcrq5Y7XlzwG4PB7u7fvY8ZnpHR+dULkverYsFV/AqFo0hOFP0LAw1Qm+WRKJr +rd9e3MlqHXK3WuX6mLizDS8yTlXBqPLUvc9XJAXeLuI21v2CsGk/Z0HX4EM4KFC1 +mKunY6A+cEwGQi5ysQjGSZJPVK6qPiFgz7hbz3+aRd039p4KqNcDqN0iZQ9WSIBV +3qYJ2O25yBrCB4wqLWapf+oInhWbfsJO3LmgTdUvJMDu2XxrE/OsFjsZNVHqdwhd +LY7WfATOIEl6gc41DTsj203JqDj/MjtKxIj/L6rELOjflm9JuJc= +=hSMi +-END PGP SIGNATURE- Added: dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip.sha512 == --- dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip.sha512 (added) +++ dev/logging/log4j-tools/apache-log4j-tools-0.8.0-bin.zip.sha512 Tue Mar 19 11:06:17 2024 @@ -0,0 +1 @@ +6fe2488b00878f89c289104baf7134879c28409f548dd2475b21a7800e4d9189263b602d8e63534cd76ce1b95c34682b3ca7fb8528bea9ed30d06dd1b6e3b265 apache-log4j-tools-0.8.0-bin.zip Added: dev/logging/log4j-tools/apache-log4j-tools-0.8.0-email-announce.txt == --- dev/logging/log4j-tools/apache-log4j-tools-0.8.0-email-announce.txt (added) +++ dev/logging/log4j-tools/apache-log4j-tools-0.8.0-email-announce.txt Tue Mar 19 11:06:17 2024 @@ -0,0 +1,46 @@ +To: log4j-u...@logging.apache.org, d...@logging.apache.org +Title: [ANNOUNCE] Apache Log4j Tools 0.8.0 released + +Apache Log4j Tools team is pleased to announce the 0.8.0 +release. This project provides tooling internally used by the +Apache Log4j project. For further information (support, download, +etc.) see the project website[1]. + +[1] https://logging.apache.org/log4j/tools + +=== Release Notes + +This release delivers the first version of Log4j Docgen (Documentation Generator). +It is a set of tools to auto-generate the Log4j plugin documentation (to be integrated into the website) and the Log4j configuration XSD file (for assisting the configuration of the Log4j runtime, i.e., `log4j2.xml`) from the Log4j source code. +See the project website for details. + + +[#release-notes-0-8-0-added] + Added + +* Add the `log4j-docgen` et al. containing a universal XML model to document Log4j plugins + +[#release-notes-0-8-0-changed] + Changed + +* Move Log4j Changelog XML namespace and schema location to `https://logging.apache.org/xml/ns` and `https://logging.apache.org/xml/ns/log4j-changelog-0.xsd`, respectively + +[#release-notes-0-8-0-removed] + Removed + +* Remove `author` from Log4j Changelog. ++ +It was yet another bit to maintain and created role-related (who did what) problems. +Many modern software projects use a VCS (e.g., Git) and support services (e.g., GitHub) which make it trivial to trace back the origin of a change using commit and issue IDs. + +[#release-notes-0-8-0-updated] + Updated + +* Update `org.apache.logging:logging-parent` to version `10.6.0` +* Update `jakarta.inject:jakarta.inject-api` to version `2.0.1` (#94) +* Update `org.apache.logging.log4j:log4j-core` to version `2.23.1` (#108) +* Update `org.apache.logging.log4j:log4j-plugins`
(logging-log4j-tools) branch release/0.8.0 updated: Release changelog for version `0.8.0`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.8.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.8.0 by this push: new 2bb0703 Release changelog for version `0.8.0` 2bb0703 is described below commit 2bb07037bbbfe14fe1c224d46a3e4135b48ffde6 Author: ASF Logging Services RM AuthorDate: Tue Mar 19 11:03:01 2024 + Release changelog for version `0.8.0` --- src/changelog/0.8.0/.release.xml| 2 +- src/site/_release-notes/_0.8.0.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/changelog/0.8.0/.release.xml b/src/changelog/0.8.0/.release.xml index 2ef3b0e..42d7d54 100644 --- a/src/changelog/0.8.0/.release.xml +++ b/src/changelog/0.8.0/.release.xml @@ -18,4 +18,4 @@ http://logging.apache.org/log4j/changelog; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd; - date="2024-03-18" version="0.8.0"/> + date="2024-03-19" version="0.8.0"/> diff --git a/src/site/_release-notes/_0.8.0.adoc b/src/site/_release-notes/_0.8.0.adoc index a138b7d..90f7ce6 100644 --- a/src/site/_release-notes/_0.8.0.adoc +++ b/src/site/_release-notes/_0.8.0.adoc @@ -36,7 +36,7 @@ [#release-notes-0-8-0] === 0.8.0 -Release date:: 2024-03-18 +Release date:: 2024-03-19 This release delivers the first version of Log4j Docgen (Documentation Generator). It is a set of tools to auto-generate the Log4j plugin documentation (to be integrated into the website) and the Log4j configuration XSD file (for assisting the configuration of the Log4j runtime, i.e., `log4j2.xml`) from the Log4j source code.
(logging-log4j-tools) 01/01: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.8.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git commit fcd532db93fddd3ce8e1201f9977150d64a06781 Author: ASF Logging Services RM AuthorDate: Tue Mar 19 11:02:50 2024 + Update the `project.build.outputTimestamp` property --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b71bdc..af78bc9 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ 2. This value is employed in various places while creating the distribution To mitigate these, we define a *dummy* value here and let the CI replace it during a release. Hence, *DO NOT MANUALLY EDIT THIS VALUE*! --> - 2024-03-18T21:08:57Z + 2024-03-19T10:54:43Z true
(logging-log4net) branch Feature/127-docker-build updated (c23f17d2 -> 9e4a9d49)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch Feature/127-docker-build in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from c23f17d2 3.0.0 for package.json add 9e4a9d49 #127 consolidated build in Dockerfile changed repository.url in package.json No new revisions were added by this update. Summary of changes: Dockerfile | 5 +++-- doc/BUILDING.md | 4 ++-- docker-build/.bashrc | 21 - docker-build/docker-build.sh | 21 - package.json | 2 +- 5 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 docker-build/.bashrc delete mode 100644 docker-build/docker-build.sh
(logging-log4j-tools) branch release/0.8.0 updated (46581a1 -> fcd532d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release/0.8.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git discard 46581a1 Update docs new fcd532d Update the `project.build.outputTimestamp` property 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 (46581a1) \ N -- N -- N refs/heads/release/0.8.0 (fcd532d) 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. 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: pom.xml | 2 +- src/site/_log4j-docgen-maven-plugin.adoc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
(logging-log4j-tools) branch release/0.8.0 updated: Update docs
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.8.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.8.0 by this push:
new 46581a1 Update docs
46581a1 is described below
commit 46581a18ebe4e9ef200263af61d010d9056d199d
Author: Volkan Yazıcı
AuthorDate: Tue Mar 19 11:55:18 2024 +0100
Update docs
---
src/site/_log4j-docgen-maven-plugin.adoc | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/site/_log4j-docgen-maven-plugin.adoc
b/src/site/_log4j-docgen-maven-plugin.adoc
index e86236e..545edea 100644
--- a/src/site/_log4j-docgen-maven-plugin.adoc
+++ b/src/site/_log4j-docgen-maven-plugin.adoc
@@ -92,6 +92,7 @@ The `generate-schema` goal generates an XSD derived from the
types loaded using
+ ${project.version}
${project.build.directory}/generated-site/resources/config.xsd
(logging-log4j-tools) branch release/0.8.0 updated: Accept version while generating schema
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.8.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.8.0 by this push:
new b3612d3 Accept version while generating schema
b3612d3 is described below
commit b3612d33185842eaf169f29c7139cc9d6450
Author: Volkan Yazıcı
AuthorDate: Tue Mar 19 10:49:40 2024 +0100
Accept version while generating schema
---
.../apache/logging/log4j/docgen/maven/SchemaGeneratorMojo.java | 8 +++-
.../apache/logging/log4j/docgen/generator/SchemaGenerator.java | 9 -
.../logging/log4j/docgen/generator/SchemaGeneratorArgs.java | 8 +++-
.../logging/log4j/docgen/generator/SchemaGeneratorTest.java | 2 +-
.../src/test/resources/SchemaGeneratorTest/expected-plugins.xsd | 2 +-
5 files changed, 20 insertions(+), 9 deletions(-)
diff --git
a/log4j-docgen-maven-plugin/src/main/java/org/apache/logging/log4j/docgen/maven/SchemaGeneratorMojo.java
b/log4j-docgen-maven-plugin/src/main/java/org/apache/logging/log4j/docgen/maven/SchemaGeneratorMojo.java
index 26f8366..7f16de8 100644
---
a/log4j-docgen-maven-plugin/src/main/java/org/apache/logging/log4j/docgen/maven/SchemaGeneratorMojo.java
+++
b/log4j-docgen-maven-plugin/src/main/java/org/apache/logging/log4j/docgen/maven/SchemaGeneratorMojo.java
@@ -36,6 +36,12 @@ import org.apache.maven.plugins.annotations.Parameter;
@Mojo(name = "generate-schema", defaultPhase =
LifecyclePhase.GENERATE_RESOURCES, threadSafe = true)
public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
+/**
+ * The version of the XSD
+ */
+@Parameter(property = "log4j.docgen.schemaVersion", required = true)
+private String schemaVersion;
+
/**
* The path of the XSD file to write to
*/
@@ -49,7 +55,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
final Predicate classNameFilter = typeFilter != null ?
typeFilter.createPredicate() : ignored -> true;
try {
final SchemaGeneratorArgs generatorArgs =
-new SchemaGeneratorArgs(pluginSets, classNameFilter,
schemaFile.toPath());
+new SchemaGeneratorArgs(pluginSets, classNameFilter,
schemaVersion, schemaFile.toPath());
SchemaGenerator.generateSchema(generatorArgs);
} catch (final XMLStreamException error) {
final String message = String.format("failed generating the schema
file `%s`", schemaFile);
diff --git
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/generator/SchemaGenerator.java
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/generator/SchemaGenerator.java
index 0840a53..e2874c3 100644
---
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/generator/SchemaGenerator.java
+++
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/generator/SchemaGenerator.java
@@ -57,8 +57,6 @@ public final class SchemaGenerator {
private static final String XSD_NAMESPACE =
XMLConstants.W3C_XML_SCHEMA_NS_URI;
-private static final String VERSION = new PluginSet().getSchemaVersion();
-
private static final String MULTIPLICITY_UNBOUNDED = "*";
private static final String CHARSET_NAME = "UTF-8";
@@ -79,7 +77,7 @@ public final class SchemaGenerator {
try (final OutputStream schemaPathOutputStream =
Files.newOutputStream(args.schemaFile)) {
final XMLStreamWriter writer =
factory.createXMLStreamWriter(schemaPathOutputStream, CHARSET_NAME);
try {
-writeSchema(lookup, writer);
+writeSchema(args.schemaVersion, lookup, writer);
} finally {
writer.close();
}
@@ -89,7 +87,8 @@ public final class SchemaGenerator {
}
}
-private static void writeSchema(final TypeLookup lookup, final
XMLStreamWriter writer) throws XMLStreamException {
+private static void writeSchema(final String version, final TypeLookup
lookup, final XMLStreamWriter writer)
+throws XMLStreamException {
writer.writeStartDocument(CHARSET_NAME, "1.0");
writer.setDefaultNamespace(XSD_NAMESPACE);
writer.writeStartElement(XSD_NAMESPACE, "schema");
@@ -97,7 +96,7 @@ public final class SchemaGenerator {
writer.writeNamespace(LOG4J_PREFIX, LOG4J_NAMESPACE);
writer.writeAttribute("elementFormDefault", "qualified");
writer.writeAttribute("targetNamespace", LOG4J_NAMESPACE);
-writer.writeAttribute("version", VERSION);
+writer.writeAttribute("version", version);
// The root element
writer.writeEmptyElement(XSD_NAMESPACE, "element");
diff --git
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/generator/SchemaGeneratorArgs.java
(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 1914ee28 Automatic Site Publish by Buildbot 1914ee28 is described below commit 1914ee28b978591787a44a9ce9518b057466e45b Author: buildbot AuthorDate: Tue Mar 19 10:45:13 2024 + Automatic Site Publish by Buildbot --- content/feed.xml | 2 +- content/xml/ns/index.html| 112 +- content/xml/ns/log4j-changelog-0.2.0.xsd | 2 +- content/xml/ns/log4j-config-2.23.1.xsd | 598 +++ content/xml/ns/log4j-config-2.xsd| 1 + 5 files changed, 706 insertions(+), 9 deletions(-) diff --git a/content/feed.xml b/content/feed.xml index 4a2bf9a5..5846a204 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-03-15T15:22:55+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-03-19T10:45:12+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. diff --git a/content/xml/ns/index.html b/content/xml/ns/index.html index 1c202fa6..672f0229 100644 --- a/content/xml/ns/index.html +++ b/content/xml/ns/index.html @@ -160,13 +160,96 @@ All XML Schemas for Apache Logging Services projects are published at this directory. The canonical name for this directory is https://logging.apache.org/xml/ns; class="bare">https://logging.apache.org/xml/ns. + + + + +Important + + + +There are two important things to understand about XSD versioning scheme used here to employ these schemas in your applications: + + + + +Schema versions and project versions evolve independently. +That is, Log4j 2.24.0 release does not necessarily mean a new log4j-config-2.24.0.xsd: the Log4j 2 runtime configuration API might have been kept intact. + + +Users are recommended to use schemas with only major versions; log4j-config-2.xsd, log4j-changelog-0.xsd, etc. + + + + + + + + + + +Log4j 2 schemas + + +Log4j 2 is a Java logging framework. +Following schemas model the Log4j runtime configuration, i.e., log4j2.xml. + + + + + + + + + +Publication date +File name +Description + + + + +2024-03-19 +log4j-config-2.23.1.xsd +Released with Log4j 2.23.1 + + +N/A +log4j-config-2.xsd +Points to the most recent XSD. +Users are recommended to refer to this XSD in their XML files. + + + + +Example Log4j 2 schema usage + +?xml version="1.0" encoding="UTF-8"? +Configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xmlns="https://logging.apache.org/xml/ns; + xsi:schemaLocation=" + https://logging.apache.org/xml/ns + https://logging.apache.org/xml/ns/log4j-config-2.xsd"; + Appenders +Console name="Console" target="SYSTEM_OUT" + PatternLayout pattern="%d [%t] %p %c - %m%n"/ +/Console + /Appenders + Loggers +Root level="warn" + AppenderRef ref="Console"/ +/Root + /Loggers +/Configuration + + -log4j-changelog schemas +Log4j Changelog schemas -https://logging.apache.org/log4j/tools/latest/#log4j-changelog;>log4j-changelog is a tool to maintain changelogs. +Log4j Changelog is a tool to maintain changelogs. It is designed for Apache Log4j, but can be used for any Java project. @@ -186,22 +269,22 @@ It is designed for Apache Log4j, but can be used for any Java project. 2023-02-03 log4j-changelog-0.1.0.xsd -Released with Log4j Tools 0.2.0 +Released with Log4j Tools 0.2.0 2023-03-17 log4j-changelog-0.1.1.xsd -Released with Log4j Tools 0.3.0 +Released with Log4j Tools 0.3.0 2023-09-28 log4j-changelog-0.1.2.xsd -Released with Log4j Tools 0.5.0 +Released with Log4j Tools 0.5.0 2023-12-13 log4j-changelog-0.1.3.xsd -Released with Log4j Tools 0.7.0 +Released with Log4j Tools 0.7.0 2024-03-15 @@ -212,10 +295,25 @@ It is designed for Apache Log4j, but can be used for any Java project. N/A log4j-changelog-0.xsd Points to the most recent XSD of major version 0. -Users are recommended to refer to this XSD in their XML files. +Users are recommended to refer to this XSD in their XML files. + +Example Log4j Changelog schema usage + +?xml version="1.0" encoding="UTF-8"? +entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xmlns="https://logging.apache.org/xml/ns; + xsi:schemaLocation=" +
(logging-site) 01/03: Fix `version` attribute of `log4j-changelog-0.2.0.xsd`
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 commit 6e0030b83a595b0dda31db96a130ff6580e8a19d Author: Volkan Yazıcı AuthorDate: Tue Mar 19 10:00:10 2024 +0100 Fix `version` attribute of `log4j-changelog-0.2.0.xsd` --- xml/ns/log4j-changelog-0.2.0.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/ns/log4j-changelog-0.2.0.xsd b/xml/ns/log4j-changelog-0.2.0.xsd index 5539b11e..5baeb73f 100644 --- a/xml/ns/log4j-changelog-0.2.0.xsd +++ b/xml/ns/log4j-changelog-0.2.0.xsd @@ -19,7 +19,7 @@ targetNamespace="https://logging.apache.org/xml/ns; xmlns:cl="https://logging.apache.org/xml/ns; elementFormDefault="qualified" -version="1.0.0"> +version="0.2.0">
(logging-site) 03/03: Explain XSD versioning
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 commit 69968e5303be57fc4350c0f1788664623466ab72 Author: Volkan Yazıcı AuthorDate: Tue Mar 19 11:44:42 2024 +0100 Explain XSD versioning --- xml/ns/index.adoc | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/xml/ns/index.adoc b/xml/ns/index.adoc index d781f00f..c8c5084b 100644 --- a/xml/ns/index.adoc +++ b/xml/ns/index.adoc @@ -20,6 +20,15 @@ All XML Schemas for Apache Logging Services projects are published at this directory. The canonical name for this directory is `https://logging.apache.org/xml/ns`. +[IMPORTANT] + +There are two important things to understand about XSD versioning scheme used here to employ these schemas in your applications: + +. *Schema versions and project versions evolve independently.* +That is, Log4j `2.24.0` release does not necessarily mean a new `log4j-config-2.24.0.xsd`: the Log4j 2 runtime configuration API might have been kept intact. +. *Users are recommended to use schemas with only major versions*; `log4j-config-2.xsd`, `log4j-changelog-0.xsd`, etc. + + [#log4j2] == Log4j 2 schemas @@ -48,7 +57,9 @@ Following schemas model the Log4j runtime configuration, i.e., `log4j2.xml`. http://www.w3.org/2001/XMLSchema-instance; xmlns="https://logging.apache.org/xml/ns; - xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd;> + xsi:schemaLocation=" + https://logging.apache.org/xml/ns + https://logging.apache.org/xml/ns/log4j-config-2.xsd;> @@ -106,7 +117,9 @@ It is designed for Apache Log4j, but can be used for any Java project. http://www.w3.org/2001/XMLSchema-instance; xmlns="https://logging.apache.org/xml/ns; - xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd; + xsi:schemaLocation=" + https://logging.apache.org/xml/ns + https://logging.apache.org/xml/ns/log4j-changelog-0.xsd; type="updated"> https://github.com/apache/logging-log4j2/pull/2370"/> Update `actions/checkout` to version `4.1.2`
(logging-site) branch main updated (449602c6 -> 69968e53)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-site.git from 449602c6 Improve XSD descriptions new 6e0030b8 Fix `version` attribute of `log4j-changelog-0.2.0.xsd` new 2d775852 Add Log4j 2 XSD new 69968e53 Explain XSD versioning 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: xml/ns/index.adoc| 82 +- xml/ns/log4j-changelog-0.2.0.xsd | 2 +- xml/ns/log4j-config-2.23.1.xsd | 598 +++ xml/ns/log4j-config-2.xsd| 1 + 4 files changed, 675 insertions(+), 8 deletions(-) create mode 100644 xml/ns/log4j-config-2.23.1.xsd create mode 12 xml/ns/log4j-config-2.xsd
(logging-site) 02/03: Add Log4j 2 XSD
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 commit 2d775852dd9147a5e7a84b7ccc7b2e894c8a3b85 Author: Volkan Yazıcı AuthorDate: Tue Mar 19 11:36:00 2024 +0100 Add Log4j 2 XSD --- xml/ns/index.adoc | 69 - xml/ns/log4j-config-2.23.1.xsd | 598 + xml/ns/log4j-config-2.xsd | 1 + 3 files changed, 661 insertions(+), 7 deletions(-) diff --git a/xml/ns/index.adoc b/xml/ns/index.adoc index 6a7174df..d781f00f 100644 --- a/xml/ns/index.adoc +++ b/xml/ns/index.adoc @@ -20,10 +20,52 @@ All XML Schemas for Apache Logging Services projects are published at this directory. The canonical name for this directory is `https://logging.apache.org/xml/ns`. +[#log4j2] +== Log4j 2 schemas + +xref:/log4j/2.x[Log4j 2] is a Java logging framework. +Following schemas model the Log4j runtime configuration, i.e., `log4j2.xml`. + +[%header,cols="3*"] +|=== +|Publication date +|File name +|Description + +|2024-03-19 +|xref:log4j-config-2.23.1.xsd[] +|Released with link:/log4j/2.x/release-notes.html#release-notes-2-23-1[Log4j `2.23.1`] + +|N/A +|xref:log4j-config-2.xsd[] +|Points to the most recent XSD. +*Users are recommended to refer to this XSD in their XML files.* +|=== + +.Example Log4j 2 schema usage +[source,xml] + + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="https://logging.apache.org/xml/ns; + xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-config-2.xsd;> + + + + + + + + + + + + + [#log4j-changelog] -== `log4j-changelog` schemas +== Log4j Changelog schemas -https://logging.apache.org/log4j/tools/latest/#log4j-changelog[log4j-changelog] is a tool to maintain changelogs. +link:/log4j/tools/latest/#log4j-changelog[Log4j Changelog] is a tool to maintain changelogs. It is designed for Apache Log4j, but can be used for any Java project. [%header,cols="3*"] @@ -34,19 +76,19 @@ It is designed for Apache Log4j, but can be used for any Java project. |2023-02-03 |xref:log4j-changelog-0.1.0.xsd[] -|Released with xref:/log4j/tools/latest/#release-notes-0-2-0[Log4j Tools `0.2.0`] +|Released with link:/log4j/tools/latest/#release-notes-0-2-0[Log4j Tools `0.2.0`] |2023-03-17 |xref:log4j-changelog-0.1.1.xsd[] -|Released with xref:/log4j/tools/latest/#release-notes-0-3-0[Log4j Tools `0.3.0`] +|Released with link:/log4j/tools/latest/#release-notes-0-3-0[Log4j Tools `0.3.0`] |2023-09-28 |xref:log4j-changelog-0.1.2.xsd[] -|Released with xref:/log4j/tools/latest/#release-notes-0-5-0[Log4j Tools `0.5.0`] +|Released with link:/log4j/tools/latest/#release-notes-0-5-0[Log4j Tools `0.5.0`] |2023-12-13 |xref:log4j-changelog-0.1.3.xsd[] -|Released with xref:/log4j/tools/latest/#release-notes-0-7-0[Log4j Tools `0.7.0`] +|Released with link:/log4j/tools/latest/#release-notes-0-7-0[Log4j Tools `0.7.0`] |2024-03-15 |xref:log4j-changelog-0.2.0.xsd[] @@ -55,5 +97,18 @@ It is designed for Apache Log4j, but can be used for any Java project. |N/A |xref:log4j-changelog-0.xsd[] |Points to the most recent XSD of major version `0`. -Users are recommended to refer to this XSD in their XML files. +*Users are recommended to refer to this XSD in their XML files.* |=== + +.Example Log4j Changelog schema usage +[source,xml] + + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="https://logging.apache.org/xml/ns; + xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd; + type="updated"> + https://github.com/apache/logging-log4j2/pull/2370"/> + Update `actions/checkout` to version `4.1.2` + + diff --git a/xml/ns/log4j-config-2.23.1.xsd b/xml/ns/log4j-config-2.23.1.xsd new file mode 100644 index ..2f5ca312 --- /dev/null +++ b/xml/ns/log4j-config-2.23.1.xsd @@ -0,0 +1,598 @@ +http://www.w3.org/2001/XMLSchema; xmlns:log4j="https://logging.apache.org/xml/ns; elementFormDefault="qualified" targetNamespace="https://logging.apache.org/xml/ns; version="2.23.1">Special level that disables logging. +No events should be logged at this level.A fatal event that will prevent the application from continuingAn error in the application, possibly recoverableAn event that might possible lead to an errorIf batch statements are enabled, use this type of batch statement.Whether or not to use batch statements when inserting records.A Filter (optional).If `"true"` (default) exceptions encountered when appending events are logged; otherwise t [...] + +Use for compatibility with version 1.2 and handy for composing a apiref:org.apache.logging.log4j.core.appender.ScriptAppenderSelector[].Appends log events to a given output stream using a layout. + +Character encoding is handled within the Layout. [...] + +The number of
(logging-log4j2) branch dependabot/github_actions/2.x/github/codeql-action-3.24.7 deleted (was 5b50117583)
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.24.7 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 5b50117583 Bump github/codeql-action from 3.24.6 to 3.24.7 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.24.8 created (now 7166218bf8)
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.24.8 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 7166218bf8 Bump github/codeql-action from 3.24.6 to 3.24.8 No new revisions were added by this update.
(logging-parent) branch dependabot/github_actions/github/codeql-action-3.24.8 deleted (was 87df9b0)
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.24.8 in repository https://gitbox.apache.org/repos/asf/logging-parent.git was 87df9b0 Update `github/codeql-action` to version `3.24.8` (#142) 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 (8cec32e -> 87df9b0)
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 8cec32e Update `actions/setup-java` to version `4.2.1` (#137) add 87df9b0 Update `github/codeql-action` to version `3.24.8` (#142) 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.24.8 updated (e74ef06 -> 87df9b0)
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.24.8 in repository https://gitbox.apache.org/repos/asf/logging-parent.git discard e74ef06 Bump github/codeql-action from 3.24.7 to 3.24.8 add 87df9b0 Update `github/codeql-action` to version `3.24.8` (#142) 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 (e74ef06) \ N -- N -- N refs/heads/dependabot/github_actions/github/codeql-action-3.24.8 (87df9b0) 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.24.8 created (now e74ef06)
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.24.8 in repository https://gitbox.apache.org/repos/asf/logging-parent.git at e74ef06 Bump github/codeql-action from 3.24.7 to 3.24.8 No new revisions were added by this update.
(logging-parent) branch feature/coverage updated (e5a8086 -> 70ca727)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch feature/coverage in repository https://gitbox.apache.org/repos/asf/logging-parent.git discard e5a8086 Add test coverage profile new 70ca727 Add test coverage profile 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 (e5a8086) \ N -- N -- N refs/heads/feature/coverage (70ca727) 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. 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: pom.xml | 1 + 1 file changed, 1 insertion(+)
(logging-parent) 01/01: Add test coverage profile
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch feature/coverage
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 70ca727edef59b46256f609a6dba39e650d32381
Author: Piotr P. Karwasz
AuthorDate: Tue Mar 19 09:38:55 2024 +0100
Add test coverage profile
---
pom.xml| 121 +++--
src/changelog/.10.x.x/140_add_coverage_profile.xml | 8 ++
2 files changed, 94 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc89855..10fea24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
-10.6.1-SNAPSHOT
+10.7.0-SNAPSHOT
@@ -365,47 +367,46 @@
${asciidoctor-maven-plugin.version}
-
- org.apache.maven.plugins
- maven-artifact-plugin
- ${maven-artifact-plugin.version}
+ com.github.genthaler
+ beanshell-maven-plugin
+ ${beanshell-maven-plugin.version}
- org.codehaus.mojo
- flatten-maven-plugin
- ${flatten-maven-plugin.version}
+ biz.aQute.bnd
+ bnd-baseline-maven-plugin
+ ${bnd-baseline-maven-plugin.version}
- org.simplify4u.plugins
- sign-maven-plugin
- ${sign-maven-plugin.version}
+ biz.aQute.bnd
+ bnd-maven-plugin
+ ${bnd-maven-plugin.version}
- com.github.spotbugs
- spotbugs-maven-plugin
- ${spotbugs-maven-plugin.version}
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ ${build-helper-maven-plugin.version}
- org.codehaus.mojo
- xml-maven-plugin
- ${xml-maven-plugin.version}
+ org.cyclonedx
+ cyclonedx-maven-plugin
+ ${cyclonedx-maven-plugin.version}
- com.diffplug.spotless
- spotless-maven-plugin
- ${spotless-maven-plugin.version}
+ org.codehaus.mojo
+ flatten-maven-plugin
+ ${flatten-maven-plugin.version}
- com.github.genthaler
- beanshell-maven-plugin
- ${beanshell-maven-plugin.version}
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco-maven-plugin.version}
@@ -414,28 +415,35 @@
${log4j-changelog-maven-plugin.version}
+
- biz.aQute.bnd
- bnd-baseline-maven-plugin
- ${bnd-baseline-maven-plugin.version}
+ org.apache.maven.plugins
+ maven-artifact-plugin
+ ${maven-artifact-plugin.version}
- biz.aQute.bnd
- bnd-maven-plugin
- ${bnd-maven-plugin.version}
+ org.simplify4u.plugins
+ sign-maven-plugin
+ ${sign-maven-plugin.version}
- org.codehaus.mojo
- build-helper-maven-plugin
- ${build-helper-maven-plugin.version}
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ ${spotbugs-maven-plugin.version}
- org.cyclonedx
- cyclonedx-maven-plugin
- ${cyclonedx-maven-plugin.version}
+ com.diffplug.spotless
+ spotless-maven-plugin
+ ${spotless-maven-plugin.version}
+
+
+
+ org.codehaus.mojo
+ xml-maven-plugin
+ ${xml-maven-plugin.version}
@@ -1659,6 +1667,49 @@ import org.apache.commons.codec.digest.*;
+
+
+
+ coverage
+
+
+
+
+
+org.jacoco
+jacoco-maven-plugin
+
+
+org/apache/flume/**
+org/apache/log4j/**
+org/apache/logging/**
+
+
+
+**/test/**
+
+
+
+
+prepare-jacoco-agent
+
+ prepare-agent
+
+
+
+report-test-coverage
+
+ report
+
+
+
+
+
+
+
+
+
+
diff --git a/src/changelog/.10.x.x/140_add_coverage_profile.xml
b/src/changelog/.10.x.x/140_add_coverage_profile.xml
new file mode 100644
index 000..f12813a
--- /dev/null
+++ b/src/changelog/.10.x.x/140_add_coverage_profile.xml
@@ -0,0 +1,8 @@
+
+http://www.w3.org/2001/XMLSchema-instance;
+ xmlns="http://logging.apache.org/log4j/changelog;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.3.xsd;
+ type="added">
+ https://github.com/apache/logging-parent/pull/140"/>
+ Add `coverage` profile
(logging-parent) 01/01: Add test coverage profile
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch feature/coverage
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit e5a808633ecefb01ac8178cc30682b3300253e02
Author: Piotr P. Karwasz
AuthorDate: Tue Mar 19 09:38:55 2024 +0100
Add test coverage profile
---
pom.xml| 120 +++--
src/changelog/.10.x.x/140_add_coverage_profile.xml | 8 ++
2 files changed, 93 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc89855..82f8f9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
-10.6.1-SNAPSHOT
+10.7.0-SNAPSHOT
- org.apache.maven.plugins
- maven-artifact-plugin
- ${maven-artifact-plugin.version}
+ com.github.genthaler
+ beanshell-maven-plugin
+ ${beanshell-maven-plugin.version}
- org.codehaus.mojo
- flatten-maven-plugin
- ${flatten-maven-plugin.version}
+ biz.aQute.bnd
+ bnd-baseline-maven-plugin
+ ${bnd-baseline-maven-plugin.version}
- org.simplify4u.plugins
- sign-maven-plugin
- ${sign-maven-plugin.version}
+ biz.aQute.bnd
+ bnd-maven-plugin
+ ${bnd-maven-plugin.version}
- com.github.spotbugs
- spotbugs-maven-plugin
- ${spotbugs-maven-plugin.version}
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ ${build-helper-maven-plugin.version}
- org.codehaus.mojo
- xml-maven-plugin
- ${xml-maven-plugin.version}
+ org.cyclonedx
+ cyclonedx-maven-plugin
+ ${cyclonedx-maven-plugin.version}
- com.diffplug.spotless
- spotless-maven-plugin
- ${spotless-maven-plugin.version}
+ org.codehaus.mojo
+ flatten-maven-plugin
+ ${flatten-maven-plugin.version}
- com.github.genthaler
- beanshell-maven-plugin
- ${beanshell-maven-plugin.version}
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco-maven-plugin.version}
@@ -414,28 +414,35 @@
${log4j-changelog-maven-plugin.version}
+
- biz.aQute.bnd
- bnd-baseline-maven-plugin
- ${bnd-baseline-maven-plugin.version}
+ org.apache.maven.plugins
+ maven-artifact-plugin
+ ${maven-artifact-plugin.version}
- biz.aQute.bnd
- bnd-maven-plugin
- ${bnd-maven-plugin.version}
+ org.simplify4u.plugins
+ sign-maven-plugin
+ ${sign-maven-plugin.version}
- org.codehaus.mojo
- build-helper-maven-plugin
- ${build-helper-maven-plugin.version}
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ ${spotbugs-maven-plugin.version}
- org.cyclonedx
- cyclonedx-maven-plugin
- ${cyclonedx-maven-plugin.version}
+ com.diffplug.spotless
+ spotless-maven-plugin
+ ${spotless-maven-plugin.version}
+
+
+
+ org.codehaus.mojo
+ xml-maven-plugin
+ ${xml-maven-plugin.version}
@@ -1659,6 +1666,49 @@ import org.apache.commons.codec.digest.*;
+
+
+
+ coverage
+
+
+
+
+
+org.jacoco
+jacoco-maven-plugin
+
+
+org/apache/flume/**
+org/apache/log4j/**
+org/apache/logging/**
+
+
+
+**/test/**
+
+
+
+
+prepare-jacoco-agent
+
+ prepare-agent
+
+
+
+report-test-coverage
+
+ report
+
+
+
+
+
+
+
+
+
+
diff --git a/src/changelog/.10.x.x/140_add_coverage_profile.xml
b/src/changelog/.10.x.x/140_add_coverage_profile.xml
new file mode 100644
index 000..f12813a
--- /dev/null
+++ b/src/changelog/.10.x.x/140_add_coverage_profile.xml
@@ -0,0 +1,8 @@
+
+http://www.w3.org/2001/XMLSchema-instance;
+ xmlns="http://logging.apache.org/log4j/changelog;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.3.xsd;
+ type="added">
+ https://github.com/apache/logging-parent/pull/140"/>
+ Add `coverage` profile to generate a test
coverage report.
+
(logging-parent) branch feature/coverage updated (4041bf1 -> e5a8086)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch feature/coverage
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
discard 4041bf1 Add test coverage profile
new e5a8086 Add test coverage profile
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 (4041bf1)
\
N -- N -- N refs/heads/feature/coverage (e5a8086)
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.
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:
pom.xml| 2 +-
.../140_add_coverage_profile.xml} | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
copy src/changelog/{10.0.0/add-changelog-export-profile.xml =>
.10.x.x/140_add_coverage_profile.xml} (62%)
(logging-parent) 01/01: Add test coverage profile
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch feature/coverage
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 4041bf1d59d72e442f16de76d2fc112e4c2c3c5b
Author: Piotr P. Karwasz
AuthorDate: Tue Mar 19 09:38:55 2024 +0100
Add test coverage profile
---
pom.xml | 118 +---
1 file changed, 84 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc89855..924c099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,6 +299,7 @@
3.5.0
2.7.11
1.6.0
+0.8.11
0.7.0
3.5.0
2.5.0
@@ -365,47 +366,46 @@
${asciidoctor-maven-plugin.version}
-
- org.apache.maven.plugins
- maven-artifact-plugin
- ${maven-artifact-plugin.version}
+ com.github.genthaler
+ beanshell-maven-plugin
+ ${beanshell-maven-plugin.version}
- org.codehaus.mojo
- flatten-maven-plugin
- ${flatten-maven-plugin.version}
+ biz.aQute.bnd
+ bnd-baseline-maven-plugin
+ ${bnd-baseline-maven-plugin.version}
- org.simplify4u.plugins
- sign-maven-plugin
- ${sign-maven-plugin.version}
+ biz.aQute.bnd
+ bnd-maven-plugin
+ ${bnd-maven-plugin.version}
- com.github.spotbugs
- spotbugs-maven-plugin
- ${spotbugs-maven-plugin.version}
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ ${build-helper-maven-plugin.version}
- org.codehaus.mojo
- xml-maven-plugin
- ${xml-maven-plugin.version}
+ org.cyclonedx
+ cyclonedx-maven-plugin
+ ${cyclonedx-maven-plugin.version}
- com.diffplug.spotless
- spotless-maven-plugin
- ${spotless-maven-plugin.version}
+ org.codehaus.mojo
+ flatten-maven-plugin
+ ${flatten-maven-plugin.version}
- com.github.genthaler
- beanshell-maven-plugin
- ${beanshell-maven-plugin.version}
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco-maven-plugin.version}
@@ -414,28 +414,35 @@
${log4j-changelog-maven-plugin.version}
+
- biz.aQute.bnd
- bnd-baseline-maven-plugin
- ${bnd-baseline-maven-plugin.version}
+ org.apache.maven.plugins
+ maven-artifact-plugin
+ ${maven-artifact-plugin.version}
- biz.aQute.bnd
- bnd-maven-plugin
- ${bnd-maven-plugin.version}
+ org.simplify4u.plugins
+ sign-maven-plugin
+ ${sign-maven-plugin.version}
- org.codehaus.mojo
- build-helper-maven-plugin
- ${build-helper-maven-plugin.version}
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ ${spotbugs-maven-plugin.version}
- org.cyclonedx
- cyclonedx-maven-plugin
- ${cyclonedx-maven-plugin.version}
+ com.diffplug.spotless
+ spotless-maven-plugin
+ ${spotless-maven-plugin.version}
+
+
+
+ org.codehaus.mojo
+ xml-maven-plugin
+ ${xml-maven-plugin.version}
@@ -1659,6 +1666,49 @@ import org.apache.commons.codec.digest.*;
+
+
+
+ coverage
+
+
+
+
+
+org.jacoco
+jacoco-maven-plugin
+
+
+org/apache/flume/**
+org/apache/log4j/**
+org/apache/logging/**
+
+
+
+**/test/**
+
+
+
+
+prepare-jacoco-agent
+
+ prepare-agent
+
+
+
+report-test-coverage
+
+ report
+
+
+
+
+
+
+
+
+
+
(logging-parent) branch feature/coverage created (now 4041bf1)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch feature/coverage in repository https://gitbox.apache.org/repos/asf/logging-parent.git at 4041bf1 Add test coverage profile This branch includes the following new commits: new 4041bf1 Add test coverage profile 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 2.x-docgen updated (55659648e5 -> a9e6259f55)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from 55659648e5 Improve plugin reference pages new f17f26dc34 Fix broken plugin manual link new e5104f2abd Update auto-generated files new a491ebe41d Fix `log4j-layout-template-json-test` POM new fcc53b9970 Create a common `log4j.docgen.typeFilter.excludePattern` property new a9e6259f55 Remove incidentally committed `` The 5 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: log4j-core/pom.xml | 1 + log4j-layout-template-json-test/pom.xml | 2 +- log4j-parent/pom.xml| 1 + pom.xml | 11 +++ src/docgen-templates/index.adoc.ftl | 2 +- src/site/_release-notes/_2.x.x.adoc | 5 + 6 files changed, 16 insertions(+), 6 deletions(-)
(logging-log4j2) 05/05: Remove incidentally committed ``
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-docgen
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a9e6259f550ebac261899f0394110b94b45a97b5
Author: Volkan Yazıcı
AuthorDate: Fri Mar 15 14:32:05 2024 +0100
Remove incidentally committed ``
---
pom.xml | 8
1 file changed, 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06f484753e..69a45d9c9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -527,14 +527,6 @@
-
-
- org.apache.logging.log4j
- log4j-docgen
- ${log4j-docgen.version}
-
-
-
(logging-log4j2) 04/05: Create a common `log4j.docgen.typeFilter.excludePattern` property
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x-docgen
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit fcc53b997088adba13ff625186cd3a1926fa2f03
Author: Volkan Yazıcı
AuthorDate: Fri Mar 15 11:30:52 2024 +0100
Create a common `log4j.docgen.typeFilter.excludePattern` property
---
log4j-core/pom.xml | 1 +
log4j-parent/pom.xml | 1 +
pom.xml | 19 +++
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index b8737a72b2..b8ef135c25 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -266,6 +266,7 @@
-Alog4j.docgen.artifactId=${project.artifactId}
-Alog4j.docgen.version=${project.version}
-Alog4j.docgen.description=${project.description}
+
-Alog4j.docgen.typeFilter.excludePattern=${log4j.docgen.typeFilter.excludePattern}
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index b3d3e4bcbc..edee1511c6 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -1242,6 +1242,7 @@
-Alog4j.docgen.artifactId=${project.artifactId}
-Alog4j.docgen.version=${project.version}
-Alog4j.docgen.description=${project.description}
+
-Alog4j.docgen.typeFilter.excludePattern=${log4j.docgen.typeFilter.excludePattern}
diff --git a/pom.xml b/pom.xml
index 49e8528346..06f484753e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,6 +336,11 @@
1.0.0-SNAPSHOT
+
+
+
^java\..+
${maven.multiModuleProjectDirectory}/target/plugin-descriptors/phase1
${maven.multiModuleProjectDirectory}/target/plugin-descriptors/phase2
@@ -522,6 +527,14 @@
+
+
+ org.apache.logging.log4j
+ log4j-docgen
+ ${log4j-docgen.version}
+
+
+
@@ -782,9 +795,8 @@
-
- java\..+
+ ${log4j.docgen.typeFilter.excludePattern}
@@ -875,8 +887,7 @@
rouge
left
${project.build.directory}/plugin-descriptors
-
-
java\..+
+
${log4j.docgen.typeFilter.excludePattern}
../../%g/%a/%c.html
(logging-log4j2) 03/05: Fix `log4j-layout-template-json-test` POM
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit a491ebe41d9aa6cc31758f82a163d476dbfd748a Author: Volkan Yazıcı AuthorDate: Fri Mar 15 11:30:28 2024 +0100 Fix `log4j-layout-template-json-test` POM --- log4j-layout-template-json-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml index 20c9d9d155..ed7b188b13 100644 --- a/log4j-layout-template-json-test/pom.xml +++ b/log4j-layout-template-json-test/pom.xml @@ -32,8 +32,8 @@ +true true -true true
(logging-log4j2) 01/05: Fix broken plugin manual link
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit f17f26dc3411a56f104264ae42df06c228503f5b Author: Volkan Yazıcı AuthorDate: Fri Mar 15 11:28:55 2024 +0100 Fix broken plugin manual link --- src/docgen-templates/index.adoc.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docgen-templates/index.adoc.ftl b/src/docgen-templates/index.adoc.ftl index b914712e74..48e8d0fd3b 100644 --- a/src/docgen-templates/index.adoc.ftl +++ b/src/docgen-templates/index.adoc.ftl @@ -26,7 +26,7 @@ You can use this reference manual to precisely customize your `log4j2.xml`. [INFO] -Every running Log4j system is a constellation of xref:manual/plugins.adoc[plugins], which is analogous to beans in Java EE and Spring. +Every running Log4j system is a constellation of xref:../manual/plugins.adoc[plugins], which is analogous to beans in Java EE and Spring. This not only allows Log4j itself to be developed in individual components, but also enables extensibility users can leverage.
(logging-log4j2) 02/05: Update auto-generated files
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch 2.x-docgen in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit e5104f2abde5e06d7ce5d786ff255c6b078fa618 Author: Volkan Yazıcı AuthorDate: Fri Mar 15 11:29:05 2024 +0100 Update auto-generated files --- src/site/_release-notes/_2.x.x.adoc | 5 + 1 file changed, 5 insertions(+) diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc index 815bc7403d..1fd7caf36c 100644 --- a/src/site/_release-notes/_2.x.x.adoc +++ b/src/site/_release-notes/_2.x.x.adoc @@ -23,6 +23,11 @@ This releases contains ... +[#release-notes-2-x-x-added] +=== Added + +* Add a faster `ThreadContextMap` for web app users: `org.apache.logging.log4j.internal.map.StringArrayThreadContextMap`. (https://github.com/apache/logging-log4j2/pull/2330[2330]) + [#release-notes-2-x-x-updated] === Updated
