You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@logging.apache.org by Gary Gregory <ga...@gmail.com> on 2022/03/07 22:27:41 UTC
Re: [logging-log4j2] branch release-2.x updated (f8f11e2 -> ba16485)
Piotr,
Would you update changes.xml please?
TY,
Gary
On Mon, Mar 7, 2022, 16:26 <pk...@apache.org> wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> pkarwasz pushed a change to branch release-2.x
> in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
>
>
> from f8f11e2 Add comment.
> add ba16485 [LOG4J2-3426] Refactors wrapping code
>
> No new revisions were added by this update.
>
> Summary of changes:
> .../src/main/java/org/apache/log4j/Category.java | 2 +-
> .../org/apache/log4j/bridge/AppenderAdapter.java | 26
> ++++++++++++++++++--
> .../org/apache/log4j/bridge/AppenderWrapper.java | 28
> +++++++++++++++++++++-
> .../org/apache/log4j/bridge/FilterAdapter.java | 25
> ++++++++++++-------
> .../org/apache/log4j/bridge/FilterWrapper.java | 21 ++++++++++++++++
> .../org/apache/log4j/bridge/LayoutAdapter.java | 24
> ++++++++++++++++++-
> .../org/apache/log4j/bridge/LayoutWrapper.java | 18 ++++++++++++++
> .../org/apache/log4j/builders/AbstractBuilder.java | 2 +-
> .../builders/appender/AsyncAppenderBuilder.java | 4 ++--
> .../builders/appender/ConsoleAppenderBuilder.java | 9 ++-----
> .../appender/DailyRollingFileAppenderBuilder.java | 9 ++-----
> .../builders/appender/FileAppenderBuilder.java | 9 ++-----
> .../builders/appender/NullAppenderBuilder.java | 4 ++--
> .../builders/appender/RewriteAppenderBuilder.java | 2 +-
> .../appender/RollingFileAppenderBuilder.java | 9 ++-----
> .../builders/appender/SocketAppenderBuilder.java | 9 ++-----
> .../builders/appender/SyslogAppenderBuilder.java | 10 +++-----
> .../builders/filter/LevelMatchFilterBuilder.java | 2 +-
> .../builders/filter/LevelRangeFilterBuilder.java | 2 +-
> .../builders/filter/StringMatchFilterBuilder.java | 2 +-
> .../log4j/builders/layout/HtmlLayoutBuilder.java | 2 +-
> .../builders/layout/PatternLayoutBuilder.java | 2 +-
> .../log4j/builders/layout/TTCCLayoutBuilder.java | 2 +-
> .../log4j/builders/layout/XmlLayoutBuilder.java | 2 +-
> .../log4j/config/PropertiesConfiguration.java | 12 ++--------
> .../org/apache/log4j/xml/XmlConfiguration.java | 6 +----
> .../log4j/builders/Log4j2ListAppenderBuilder.java | 9 ++-----
> 27 files changed, 161 insertions(+), 91 deletions(-)
>
Re: [logging-log4j2] branch release-2.x updated (f8f11e2 -> ba16485)
Posted by Matt Sicker <bo...@gmail.com>.
Depends if you want to copy commits to other branches, too. If so, I'd
suggest separating them to make it easier to possibly cherry-pick.
On Mon, Mar 7, 2022 at 4:33 PM Piotr P. Karwasz <pi...@gmail.com> wrote:
>
> Gary,
>
> I updated `changes.xml` in the next commit:
>
> https://github.com/apache/logging-log4j2/commit/e5c74576662f5a7d2d93f2fee65e2a5d66d5c47f
>
> Or should I do it in the same commit?
>
> Piotr
>
> On Mon, Mar 7, 2022 at 11:28 PM Gary Gregory <ga...@gmail.com> wrote:
> >
> > Piotr,
> >
> > Would you update changes.xml please?
> >
> > TY,
> > Gary
> >
> > On Mon, Mar 7, 2022, 16:26 <pk...@apache.org> wrote:
> >
> > > This is an automated email from the ASF dual-hosted git repository.
> > >
> > > pkarwasz pushed a change to branch release-2.x
> > > in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
> > >
> > >
> > > from f8f11e2 Add comment.
> > > add ba16485 [LOG4J2-3426] Refactors wrapping code
> > >
> > > No new revisions were added by this update.
> > >
> > > Summary of changes:
> > > .../src/main/java/org/apache/log4j/Category.java | 2 +-
> > > .../org/apache/log4j/bridge/AppenderAdapter.java | 26
> > > ++++++++++++++++++--
> > > .../org/apache/log4j/bridge/AppenderWrapper.java | 28
> > > +++++++++++++++++++++-
> > > .../org/apache/log4j/bridge/FilterAdapter.java | 25
> > > ++++++++++++-------
> > > .../org/apache/log4j/bridge/FilterWrapper.java | 21 ++++++++++++++++
> > > .../org/apache/log4j/bridge/LayoutAdapter.java | 24
> > > ++++++++++++++++++-
> > > .../org/apache/log4j/bridge/LayoutWrapper.java | 18 ++++++++++++++
> > > .../org/apache/log4j/builders/AbstractBuilder.java | 2 +-
> > > .../builders/appender/AsyncAppenderBuilder.java | 4 ++--
> > > .../builders/appender/ConsoleAppenderBuilder.java | 9 ++-----
> > > .../appender/DailyRollingFileAppenderBuilder.java | 9 ++-----
> > > .../builders/appender/FileAppenderBuilder.java | 9 ++-----
> > > .../builders/appender/NullAppenderBuilder.java | 4 ++--
> > > .../builders/appender/RewriteAppenderBuilder.java | 2 +-
> > > .../appender/RollingFileAppenderBuilder.java | 9 ++-----
> > > .../builders/appender/SocketAppenderBuilder.java | 9 ++-----
> > > .../builders/appender/SyslogAppenderBuilder.java | 10 +++-----
> > > .../builders/filter/LevelMatchFilterBuilder.java | 2 +-
> > > .../builders/filter/LevelRangeFilterBuilder.java | 2 +-
> > > .../builders/filter/StringMatchFilterBuilder.java | 2 +-
> > > .../log4j/builders/layout/HtmlLayoutBuilder.java | 2 +-
> > > .../builders/layout/PatternLayoutBuilder.java | 2 +-
> > > .../log4j/builders/layout/TTCCLayoutBuilder.java | 2 +-
> > > .../log4j/builders/layout/XmlLayoutBuilder.java | 2 +-
> > > .../log4j/config/PropertiesConfiguration.java | 12 ++--------
> > > .../org/apache/log4j/xml/XmlConfiguration.java | 6 +----
> > > .../log4j/builders/Log4j2ListAppenderBuilder.java | 9 ++-----
> > > 27 files changed, 161 insertions(+), 91 deletions(-)
> > >
Re: [logging-log4j2] branch release-2.x updated (f8f11e2 -> ba16485)
Posted by Gary Gregory <ga...@gmail.com>.
It depends on the commit. I rarely touch changes.xml in a PR because it is
quite likely to have conflicts.
Gary
On Mon, Mar 7, 2022, 17:33 Piotr P. Karwasz <pi...@gmail.com> wrote:
> Gary,
>
> I updated `changes.xml` in the next commit:
>
>
> https://github.com/apache/logging-log4j2/commit/e5c74576662f5a7d2d93f2fee65e2a5d66d5c47f
>
> Or should I do it in the same commit?
>
> Piotr
>
> On Mon, Mar 7, 2022 at 11:28 PM Gary Gregory <ga...@gmail.com>
> wrote:
> >
> > Piotr,
> >
> > Would you update changes.xml please?
> >
> > TY,
> > Gary
> >
> > On Mon, Mar 7, 2022, 16:26 <pk...@apache.org> wrote:
> >
> > > This is an automated email from the ASF dual-hosted git repository.
> > >
> > > pkarwasz pushed a change to branch release-2.x
> > > in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
> > >
> > >
> > > from f8f11e2 Add comment.
> > > add ba16485 [LOG4J2-3426] Refactors wrapping code
> > >
> > > No new revisions were added by this update.
> > >
> > > Summary of changes:
> > > .../src/main/java/org/apache/log4j/Category.java | 2 +-
> > > .../org/apache/log4j/bridge/AppenderAdapter.java | 26
> > > ++++++++++++++++++--
> > > .../org/apache/log4j/bridge/AppenderWrapper.java | 28
> > > +++++++++++++++++++++-
> > > .../org/apache/log4j/bridge/FilterAdapter.java | 25
> > > ++++++++++++-------
> > > .../org/apache/log4j/bridge/FilterWrapper.java | 21
> ++++++++++++++++
> > > .../org/apache/log4j/bridge/LayoutAdapter.java | 24
> > > ++++++++++++++++++-
> > > .../org/apache/log4j/bridge/LayoutWrapper.java | 18 ++++++++++++++
> > > .../org/apache/log4j/builders/AbstractBuilder.java | 2 +-
> > > .../builders/appender/AsyncAppenderBuilder.java | 4 ++--
> > > .../builders/appender/ConsoleAppenderBuilder.java | 9 ++-----
> > > .../appender/DailyRollingFileAppenderBuilder.java | 9 ++-----
> > > .../builders/appender/FileAppenderBuilder.java | 9 ++-----
> > > .../builders/appender/NullAppenderBuilder.java | 4 ++--
> > > .../builders/appender/RewriteAppenderBuilder.java | 2 +-
> > > .../appender/RollingFileAppenderBuilder.java | 9 ++-----
> > > .../builders/appender/SocketAppenderBuilder.java | 9 ++-----
> > > .../builders/appender/SyslogAppenderBuilder.java | 10 +++-----
> > > .../builders/filter/LevelMatchFilterBuilder.java | 2 +-
> > > .../builders/filter/LevelRangeFilterBuilder.java | 2 +-
> > > .../builders/filter/StringMatchFilterBuilder.java | 2 +-
> > > .../log4j/builders/layout/HtmlLayoutBuilder.java | 2 +-
> > > .../builders/layout/PatternLayoutBuilder.java | 2 +-
> > > .../log4j/builders/layout/TTCCLayoutBuilder.java | 2 +-
> > > .../log4j/builders/layout/XmlLayoutBuilder.java | 2 +-
> > > .../log4j/config/PropertiesConfiguration.java | 12 ++--------
> > > .../org/apache/log4j/xml/XmlConfiguration.java | 6 +----
> > > .../log4j/builders/Log4j2ListAppenderBuilder.java | 9 ++-----
> > > 27 files changed, 161 insertions(+), 91 deletions(-)
> > >
>
Re: [logging-log4j2] branch release-2.x updated (f8f11e2 -> ba16485)
Posted by "Piotr P. Karwasz" <pi...@gmail.com>.
Gary,
I updated `changes.xml` in the next commit:
https://github.com/apache/logging-log4j2/commit/e5c74576662f5a7d2d93f2fee65e2a5d66d5c47f
Or should I do it in the same commit?
Piotr
On Mon, Mar 7, 2022 at 11:28 PM Gary Gregory <ga...@gmail.com> wrote:
>
> Piotr,
>
> Would you update changes.xml please?
>
> TY,
> Gary
>
> On Mon, Mar 7, 2022, 16:26 <pk...@apache.org> wrote:
>
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > pkarwasz pushed a change to branch release-2.x
> > in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
> >
> >
> > from f8f11e2 Add comment.
> > add ba16485 [LOG4J2-3426] Refactors wrapping code
> >
> > No new revisions were added by this update.
> >
> > Summary of changes:
> > .../src/main/java/org/apache/log4j/Category.java | 2 +-
> > .../org/apache/log4j/bridge/AppenderAdapter.java | 26
> > ++++++++++++++++++--
> > .../org/apache/log4j/bridge/AppenderWrapper.java | 28
> > +++++++++++++++++++++-
> > .../org/apache/log4j/bridge/FilterAdapter.java | 25
> > ++++++++++++-------
> > .../org/apache/log4j/bridge/FilterWrapper.java | 21 ++++++++++++++++
> > .../org/apache/log4j/bridge/LayoutAdapter.java | 24
> > ++++++++++++++++++-
> > .../org/apache/log4j/bridge/LayoutWrapper.java | 18 ++++++++++++++
> > .../org/apache/log4j/builders/AbstractBuilder.java | 2 +-
> > .../builders/appender/AsyncAppenderBuilder.java | 4 ++--
> > .../builders/appender/ConsoleAppenderBuilder.java | 9 ++-----
> > .../appender/DailyRollingFileAppenderBuilder.java | 9 ++-----
> > .../builders/appender/FileAppenderBuilder.java | 9 ++-----
> > .../builders/appender/NullAppenderBuilder.java | 4 ++--
> > .../builders/appender/RewriteAppenderBuilder.java | 2 +-
> > .../appender/RollingFileAppenderBuilder.java | 9 ++-----
> > .../builders/appender/SocketAppenderBuilder.java | 9 ++-----
> > .../builders/appender/SyslogAppenderBuilder.java | 10 +++-----
> > .../builders/filter/LevelMatchFilterBuilder.java | 2 +-
> > .../builders/filter/LevelRangeFilterBuilder.java | 2 +-
> > .../builders/filter/StringMatchFilterBuilder.java | 2 +-
> > .../log4j/builders/layout/HtmlLayoutBuilder.java | 2 +-
> > .../builders/layout/PatternLayoutBuilder.java | 2 +-
> > .../log4j/builders/layout/TTCCLayoutBuilder.java | 2 +-
> > .../log4j/builders/layout/XmlLayoutBuilder.java | 2 +-
> > .../log4j/config/PropertiesConfiguration.java | 12 ++--------
> > .../org/apache/log4j/xml/XmlConfiguration.java | 6 +----
> > .../log4j/builders/Log4j2ListAppenderBuilder.java | 9 ++-----
> > 27 files changed, 161 insertions(+), 91 deletions(-)
> >