This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch LOG4J2-3628
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


 discard 8f3e20c945 LOG4J2-3628 Adopt the new log4j-tools packages and group ID.
 discard d3a96a7e17 LOG4J2-3628 Use `Log4jReleaseVersion` property for 
`ChangelogReleaser`.
 discard f75054ccb4 LOG4J2-3628 Trim changelog intros.
 discard 5e32076065 Merge remote-tracking branch 'origin/release-2.x' into 
LOG4J2-3628
 discard 056c6bc92c LOG4J2-3628 Update `CHANGELOG.adoc`.
 discard b8e1bdf647 LOG4J2-3628 More `log4j-tools` fixes.
 discard 9941aab756 LOG4J2-3628 Replace `log4j-internal-util` with 
`log4j-tools` project.
 discard 86610b36ce LOG4J2-3628 Disallow SNAPSHOT versions in releaser by 
default.
 discard 1092944eab LOG4J2-3628 Allow SNAPSHOT versions in releaser.
 discard ff52ab005c LOG4J2-3628 Move `changelog` to `src/changelog`.
 discard a8754d59b1 LOG4J2-3628 More `maven-changes-plugin` clean up.
 discard b975a84a98 LOG4J2-3628 `spotless:apply` changes.
 discard 30f871b152 LOG4J2-3628 Switch unreleased directory name to 
`.unreleased-<releaseVersionMajor>` pattern.
 discard 712cc0b721 LOG4J2-3628 Avoid committing generated changelog files.
 discard e3b3ea50a0 Remove incorrectly committed `workflows` directory.
 discard b911d26812 LOG4J2-3628 Rename `unreleased.adoc` to 
`<releaseVersionMajor>.x.x.adoc`.
 discard d64770b1ca LOG4J2-3628 Order changelog entries by filepath in 
`AsciiDocExporter`.
 discard 3892403894 LOG4J2-3628 Protect `DocumentBuilderFactory` against XXE.
 discard 583050c1c9 LOG4J2-3628 Remove redundant maven-failsafe-plugin 
executions.
 discard d6b5cfe075 LOG4J2-3628 Fix screwed ordering due to rebase.
 discard 48c2f8d2d9 LOG4J2-3628 Add changelog entry for this feature.
 discard 80df306fa5 LOG4J2-3628 Add README.
 discard 3c0a8466f7 LOG4J2-3628 Add exec-maven-plugin entries.
 discard 692aa41934 LOG4J2-3628 Address Spotless complaints.
 discard 83e99b8d88 LOG4J2-3628 Add releaser.
 discard 41321570e7 LOG4J2-3628 Fix module import order.
 discard efdf09edea LOG4J2-3628 Add missing license headers.
 discard 33672e125c LOG4J2-3628 Minor corrections.
 discard 072ef05f90 LOG4J2-3628 Add missing author IDs.
 discard b4c5cce4d5 LOG4J2-3628 Corrections on imports & exports.
 discard d74f1f2126 LOG4J2-3628 Remove Maven Changes Plugin et al.
 discard 4c66c02cb4 LOG4J2-3628 Use only the version in generated changelog 
files.
 discard 26b299efce LOG4J2-3628 Initial changelog import & export.
 discard 91eff37b7c LOG4J2-3628 Initial changelog import & export utilities.
     add 7e0b31252c Fix NPE in Log4jMarker
     add 2fc1f328a2 LOG4J2-3644 - Deprecate package scanning
     add 72799465fd LOG4J2-3628 Initial changelog import & export utilities.
     add 3f987d05e5 LOG4J2-3628 Initial changelog import & export.
     add 6a55f11c7f LOG4J2-3628 Use only the version in generated changelog 
files.
     add be2d2181b2 LOG4J2-3628 Remove Maven Changes Plugin et al.
     add 88d6bd5618 LOG4J2-3628 Corrections on imports & exports.
     add 84683423c7 LOG4J2-3628 Add missing author IDs.
     add c905425559 LOG4J2-3628 Minor corrections.
     add 5cef0313e5 LOG4J2-3628 Add missing license headers.
     add 41cc1ef3f0 LOG4J2-3628 Fix module import order.
     add eef9a74d6f LOG4J2-3628 Add releaser.
     add 85413aff79 LOG4J2-3628 Address Spotless complaints.
     add 7211115aed LOG4J2-3628 Add exec-maven-plugin entries.
     add b974f3a033 LOG4J2-3628 Add README.
     add 1555b7fa04 LOG4J2-3628 Add changelog entry for this feature.
     add 5cc570c05b LOG4J2-3628 Fix screwed ordering due to rebase.
     add aa9883f1c5 LOG4J2-3628 Remove redundant maven-failsafe-plugin 
executions.
     add da263c87a6 LOG4J2-3628 Protect `DocumentBuilderFactory` against XXE.
     add 04f90d93aa LOG4J2-3628 Order changelog entries by filepath in 
`AsciiDocExporter`.
     add f570edb879 LOG4J2-3628 Rename `unreleased.adoc` to 
`<releaseVersionMajor>.x.x.adoc`.
     add e2181b77dd LOG4J2-3628 Avoid committing generated changelog files.
     add 967b74d1f3 LOG4J2-3628 Switch unreleased directory name to 
`.unreleased-<releaseVersionMajor>` pattern.
     add 8b126a322f LOG4J2-3628 `spotless:apply` changes.
     add 9d68397ecd LOG4J2-3628 More `maven-changes-plugin` clean up.
     add 0fdc594244 LOG4J2-3628 Move `changelog` to `src/changelog`.
     add d7896424e5 LOG4J2-3628 Allow SNAPSHOT versions in releaser.
     add 0d77f8fd74 LOG4J2-3628 Disallow SNAPSHOT versions in releaser by 
default.
     add 93ca85605e LOG4J2-3628 Replace `log4j-internal-util` with 
`log4j-tools` project.
     add 4340d48dd4 LOG4J2-3628 More `log4j-tools` fixes.
     add dd26866513 LOG4J2-3628 Update `CHANGELOG.adoc`.
     add ee05ebaaf7 LOG4J2-3628 Trim changelog intros.
     add 87532b52f1 LOG4J2-3628 Use `Log4jReleaseVersion` property for 
`ChangelogReleaser`.
     add e524a1f3b8 LOG4J2-3628 Adopt the new log4j-tools packages and group ID.
     add 480ec1c8ce Simplify POM

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   (8f3e20c945)
            \
             N -- N -- N   refs/heads/LOG4J2-3628 (480ec1c8ce)

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:
 .../core/config/plugins/util/PluginManager.java    | 16 +++--
 .../java/org/apache/logging/slf4j/Log4jMarker.java | 75 +++++++++++-----------
 .../java/org/apache/logging/slf4j/Log4jMarker.java | 75 +++++++++++-----------
 pom.xml                                            |  2 -
 src/site/xdoc/manual/appenders.xml                 | 60 ++++++++---------
 src/site/xdoc/manual/configuration.xml.vm          |  5 +-
 src/site/xdoc/manual/filters.xml                   | 30 ++++-----
 src/site/xdoc/manual/plugins.xml                   |  6 +-
 8 files changed, 139 insertions(+), 130 deletions(-)

Reply via email to