(logging-log4cxx) branch reduce_logger_overhead deleted (was 25eff459)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch reduce_logger_overhead in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git was 25eff459 Merge branch 'reduce_logger_overhead' of https://github.com/apache/logging-log4cxx into reduce_logger_overhead 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-log4cxx) branch inline_short_file_name_calculation deleted (was ec155be2)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch inline_short_file_name_calculation in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git was ec155be2 Support c++11 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-log4cxx) branch master updated: Use a compile-time evaluated LocationInfo::calcShortFileName implementation (#361)
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new ac7eda0d Use a compile-time evaluated LocationInfo::calcShortFileName
implementation (#361)
ac7eda0d is described below
commit ac7eda0d371a2812a3973b817bba9b6f95c968db
Author: Stephen Webb
AuthorDate: Tue Mar 12 13:15:14 2024 +1100
Use a compile-time evaluated LocationInfo::calcShortFileName implementation
(#361)
* MSVC optimizer does not inline a function that calls another function
---
src/main/cpp/locationinfo.cpp | 8 +++--
.../include/log4cxx/spi/location/locationinfo.h| 34 +++---
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp
index 1cef433c..5e34e840 100644
--- a/src/main/cpp/locationinfo.cpp
+++ b/src/main/cpp/locationinfo.cpp
@@ -45,9 +45,9 @@ LocationInfo::LocationInfo( const char* const fileName1,
const char* const methodName1,
int lineNumber1 )
: lineNumber( lineNumber1 ),
- fileName( fileName1 ),
- shortFileName(shortFileName1),
- methodName( methodName1 )
+ fileName( fileName1 ? fileName1 : LocationInfo::NA ),
+ shortFileName(shortFileName1 ? shortFileName1 : LocationInfo::NA ),
+ methodName( methodName1 ? methodName1 : LocationInfo::NA_METHOD )
{
}
@@ -81,6 +81,7 @@ LocationInfo::LocationInfo( const LocationInfo& src )
LocationInfo& LocationInfo::operator = ( const LocationInfo& src )
{
fileName = src.fileName;
+ shortFileName = src.shortFileName;
methodName = src.methodName;
lineNumber = src.lineNumber;
return * this;
@@ -92,6 +93,7 @@ LocationInfo& LocationInfo::operator = ( const LocationInfo&
src )
void LocationInfo::clear()
{
fileName = NA;
+ shortFileName = NA;
methodName = NA_METHOD;
lineNumber = -1;
}
diff --git a/src/main/include/log4cxx/spi/location/locationinfo.h
b/src/main/include/log4cxx/spi/location/locationinfo.h
index 1dd97f8b..3b68d531 100644
--- a/src/main/include/log4cxx/spi/location/locationinfo.h
+++ b/src/main/include/log4cxx/spi/location/locationinfo.h
@@ -20,13 +20,7 @@
#include
#include
-
-#if __cpp_lib_string_view || (_MSVC_LANG >= 201703L)
-#include
-#define LOG4CXX_HAS_STRING_VIEW
-#else
#include
-#endif
#if defined(_WIN32)
#define LOG4CXX_SHORT_FILENAME_SPLIT_CHAR '\\'
@@ -46,8 +40,6 @@ class LOG4CXX_EXPORT LocationInfo
{
public:
-
-
/**
* When location information is not available the constant
* NA is returned. Current value of this string
constant is ?.
@@ -57,20 +49,28 @@ class LOG4CXX_EXPORT LocationInfo
static const LocationInfo& getLocationUnavailable();
-#ifdef LOG4CXX_HAS_STRING_VIEW
+ /**
+* The part of \c fileName after the path.
+*
+* Implemented to allow compile-time evaluation when called
with a literal string
+*/
+#if 201304L <= __cpp_constexpr
static constexpr const char* calcShortFileName(const char*
fileName){
- if(fileName == nullptr) return NA;
- std::string_view view(fileName);
- // If the separator is not found, rfind will return -1.
Adding 1 to
- // that will have it pointing at fileName, which is a
good fallback.
- return fileName +
view.rfind(LOG4CXX_SHORT_FILENAME_SPLIT_CHAR) + 1;
- }
#else
static const char* calcShortFileName(const char* fileName){
+#endif
+ if (fileName == nullptr) return nullptr;
+#if defined(_MSC_VER)
+ // As at 2024, the MSVC optimizer does not inline a
function that calls another function
+ const char* location = nullptr;
+ for (auto p = fileName; *p; ++p)
+ if (*p == LOG4CXX_SHORT_FILENAME_SPLIT_CHAR)
+ location = p;
+#else
const char* location = strrchr(fileName,
LOG4CXX_SHORT_FILENAME_SPLIT_CHAR);
+#endif
return location == nullptr ? fileName : location + 1;
}
-#endif
/**
* Constructor.
@@ -164,7 +164,7 @@ class LOG4CXX_EXPORT LocationInfo
#endif
#endif
#if !defined(__LOG4CXX_FUNC__)
- #define __LOG4CXX_FUNC__ ""
+ #define __LOG4CXX_FUNC__ nullptr
#endif
(logging-log4cxx) branch inline_short_file_name_calculation updated (455c9d6f -> ec155be2)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch inline_short_file_name_calculation in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git from 455c9d6f Add compiler visible intent add ec155be2 Support c++11 No new revisions were added by this update. Summary of changes: src/main/include/log4cxx/spi/location/locationinfo.h | 4 1 file changed, 4 insertions(+)
(logging-log4cxx) branch inline_short_file_name_calculation updated (9252535b -> 455c9d6f)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch inline_short_file_name_calculation in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git from 9252535b Add intent add 455c9d6f Add compiler visible intent No new revisions were added by this update. Summary of changes: src/main/include/log4cxx/spi/location/locationinfo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4cxx) branch inline_short_file_name_calculation updated (d4ce7897 -> 9252535b)
This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a change to branch inline_short_file_name_calculation in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git from d4ce7897 Restore missing header add 9252535b Add intent No new revisions were added by this update. Summary of changes: src/main/include/log4cxx/spi/location/locationinfo.h | 6 ++ 1 file changed, 6 insertions(+)
(logging-log4j2) branch fix/generalize-di-usage created (now 536df2aa1c)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch fix/generalize-di-usage in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 536df2aa1c Generalize DI usage This branch includes the following new commits: new 536df2aa1c Generalize DI usage 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-log4j-transform) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 deleted (was c1bce20)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git was c1bce20 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#88) 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-transform) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 updated (caf9aa8 -> c1bce20)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git discard caf9aa8 Bump org.apache.logging.log4j:log4j-bom from 2.23.0 to 2.23.1 add c1bce20 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#88) 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 (caf9aa8) \ N -- N -- N refs/heads/dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 (c1bce20) 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/.0.x.x/update_org_apache_logging_log4j_log4j_bom.xml | 4 ++-- src/site/_release-notes/_0.x.x.adoc| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j-transform) branch main updated (b687087 -> c1bce20)
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-log4j-transform.git from b687087 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.0` (#86) add c1bce20 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#88) No new revisions were added by this update. Summary of changes: log4j-transform-parent/pom.xml | 2 +- src/changelog/.0.x.x/update_org_apache_logging_log4j_log4j_bom.xml | 4 ++-- src/site/_release-notes/_0.x.x.adoc| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
(logging-log4j-transform) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 created (now caf9aa8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-transform.git at caf9aa8 Bump org.apache.logging.log4j:log4j-bom from 2.23.0 to 2.23.1 No new revisions were added by this update.
(logging-log4j-jmx-gui) branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 deleted (was b5e3d8c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git was b5e3d8c Update `org.apache.logging.log4j:log4j-core` to version `2.23.1` (#10) 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-jmx-gui) branch main updated (4fdd2f2 -> b5e3d8c)
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-log4j-jmx-gui.git from 4fdd2f2 Update `org.apache.logging.log4j:log4j-core` to version `2.23.0` (#9) add b5e3d8c Update `org.apache.logging.log4j:log4j-core` to version `2.23.1` (#10) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- src/changelog/.2.x.x/update_org_apache_logging_log4j_log4j_core.xml | 4 ++-- src/site/_constants.adoc| 2 +- src/site/_release-notes/_2.x.x.adoc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
(logging-log4j-jmx-gui) branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 updated (4f9af73 -> b5e3d8c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git discard 4f9af73 Bump org.apache.logging.log4j:log4j-core from 2.23.0 to 2.23.1 add b5e3d8c Update `org.apache.logging.log4j:log4j-core` to version `2.23.1` (#10) 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 (4f9af73) \ N -- N -- N refs/heads/dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 (b5e3d8c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/changelog/.2.x.x/update_org_apache_logging_log4j_log4j_core.xml | 4 ++-- src/site/_constants.adoc| 2 +- src/site/_release-notes/_2.x.x.adoc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
(logging-log4j-jmx-gui) branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 created (now 4f9af73)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-jmx-gui.git at 4f9af73 Bump org.apache.logging.log4j:log4j-core from 2.23.0 to 2.23.1 No new revisions were added by this update.
(logging-log4j-audit) branch dependabot/maven/master/log4j2.version-2.23.0 deleted (was 7299bb6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/log4j2.version-2.23.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git was 7299bb6 Bump log4j2.version from 2.21.1 to 2.23.0 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/log4j2.version-2.23.1 created (now 690b174)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/log4j2.version-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit.git at 690b174 Bump log4j2.version from 2.21.1 to 2.23.1 No new revisions were added by this update.
(logging-log4j2) branch ms12_restructure_website_2x updated: improved some links
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch ms12_restructure_website_2x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/ms12_restructure_website_2x by this push: new f8a829311d improved some links f8a829311d is described below commit f8a829311d37dd81f968ad4ea5378c02d93aee15 Author: Christian Grobmeier AuthorDate: Mon Mar 11 17:02:30 2024 +0100 improved some links --- src/asciidoc/templates/document.html.erb | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/asciidoc/templates/document.html.erb b/src/asciidoc/templates/document.html.erb index 36d13b0bb8..bd752114f4 100644 --- a/src/asciidoc/templates/document.html.erb +++ b/src/asciidoc/templates/document.html.erb @@ -65,10 +65,7 @@ Learn - - - -Old Docs +Documentation https://cwiki.apache.org/confluence/display/LOGGING/Log4j;>Wiki Articles FAQ
(logging-log4j2) 01/02: added configuration docs
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch ms12_restructure_website_2x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit 9f6a942ea36d7790ec372c23080391d8cc07c977 Author: Christian Grobmeier AuthorDate: Mon Mar 11 15:29:57 2024 +0100 added configuration docs --- src/site/asciidoc/manual/configuration.adoc | 2527 +++ 1 file changed, 2527 insertions(+) diff --git a/src/site/asciidoc/manual/configuration.adoc b/src/site/asciidoc/manual/configuration.adoc index 0c770bffb2..a469e85620 100644 --- a/src/site/asciidoc/manual/configuration.adoc +++ b/src/site/asciidoc/manual/configuration.adoc @@ -1 +1,2528 @@ + +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. + += Configuration Ralph Goers + +Inserting log requests into the application code requires a fair amount +of planning and effort. Observation shows that approximately 4 percent +of code is dedicated to logging. Consequently, even moderately sized +applications will have thousands of logging statements embedded within +their code. Given their number, it becomes imperative to manage these +log statements without the need to modify them manually. + +Configuration of Log4j 2 can be accomplished in 1 of 4 ways: + +1. Through a configuration file written in XML, JSON, YAML, or +properties format. +2. Programmatically, by creating a ConfigurationFactory and +Configuration implementation. +3. Programmatically, by calling the APIs exposed in the Configuration +interface to add components to the default configuration. +4. Programmatically, by calling methods on the internal Logger class. + +This page focuses primarily on configuring Log4j through a configuration +file. Information on programmatically configuring Log4j can be found at +link:extending.html[Extending Log4j 2] and +link:customconfig.html[Programmatic Log4j Configuration]. + +All available formats are functionally equivalent. For example, a +configuration file in XML can be rewritten using the properties format +(and the opposite) without any loss of functionality. However, the +hierarchical nature of a Log4j configuration can be captured better in +formats which naturally support nesting so XML, JSON, and YAML files, +are usually easier to use. + +Note that unlike Log4j 1.x, the public Log4j 2 API does not expose +methods to add, modify or remove appenders and filters or manipulate the +configuration in any way. + +[#Architecture] +== Architecture + +In part because support for XML was added first, Log4j's configuration is reflected as a tree structure. +In fact every configuration dialect, including the ConfigurationBuilder, generates a Node for every +configuration element. A node is a fairly simple structure that contains a set of attributes, a set of +child nodes and a PluginType. It is important to note that every Node must have a corresponding plugn, +as the plugin is the component that actually performs the work represented by the node. + +Every document type supported by Log4j has a ConfigurationFactory. The factory itself is a Log4j plugin +that declares what file extensions it supports and what its priority is. Properties have the highest +precedence with a value of 8, followed by yaml, json and xml. When autoconfiguration is performed Log4j +will call each of these factories in order to determine which, if any, support the specified configuration +file format. If one is found that factory will create the corresponding Configuratoin object and pass the +reference to the configuration data to it. + +Every configuration implementation, such as XMLConfiguration, YamlConfiguration, JsonConfiguration, etc. +has the primary task of converting the configuration text into the Node tree, typically by parsing the +text with whatever tool is available for that document type. It should be noted that while most of the +supported document types are inherintly tree structured, the Java properties syntax is not. Because of the +need to convert the syntax into a Node tree the Java properties syntax used by Log4j required all properties +follow a naming pattern that made the tree structure clear. As a
(logging-log4j2) branch ms12_restructure_website_2x updated (e904a46f57 -> 0d9297efe1)
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a change to branch ms12_restructure_website_2x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from e904a46f57 transformed config docs to asciidoc, syncing with 3x
new 9f6a942ea3 added configuration docs
new 0d9297efe1 migrated xml documentation to asciidoc
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:
src/site/asciidoc/manual/configuration.adoc| 2527 ++
src/site/asciidoc/manual/customconfig.adoc | 386 +++
src/site/asciidoc/manual/customloglevels.adoc | 323 +++
.../manual/eventlogging.adoc} | 110 +-
src/site/asciidoc/manual/extending.adoc| 618 +
src/site/asciidoc/manual/filters.adoc | 1017
.../manual/flowtracing.adoc} | 222 +-
src/site/asciidoc/manual/garbagefree.adoc | 582 +
src/site/asciidoc/manual/index.adoc| 138 +
src/site/asciidoc/manual/jmx.adoc | 100 +
src/site/asciidoc/manual/layouts.adoc | 2158 +++
src/site/asciidoc/manual/logbuilder.adoc | 79 +
src/site/asciidoc/manual/logsep.adoc | 116 +
src/site/asciidoc/manual/lookups.adoc | 745 ++
src/site/asciidoc/manual/markers.adoc | 104 +
src/site/asciidoc/manual/messages.adoc | 329 +++
src/site/asciidoc/manual/plugins.adoc | 108 +
src/site/asciidoc/manual/thread-context.adoc | 240 ++
src/site/asciidoc/manual/usage.adoc| 226 ++
src/site/asciidoc/manual/webapp.adoc | 320 +++
src/site/asciidoc/runtime-dependencies.adoc| 267 ++
src/site/xdoc/manual/customconfig.xml | 378 ---
src/site/xdoc/manual/customloglevels.xml.vm| 347 ---
src/site/xdoc/manual/extending.xml | 580
src/site/xdoc/manual/filters.xml | 1059
src/site/xdoc/manual/garbagefree.xml | 615 -
src/site/xdoc/manual/index.xml | 147 --
src/site/xdoc/manual/jmx.xml.vm| 109 -
src/site/xdoc/manual/layouts.xml.vm| 2757
src/site/xdoc/manual/logbuilder.xml| 112 -
src/site/xdoc/manual/logsep.xml| 125 -
src/site/xdoc/manual/lookups.xml | 752 --
src/site/xdoc/manual/markers.xml | 109 -
src/site/xdoc/manual/messages.xml | 332 ---
src/site/xdoc/manual/plugins.xml | 259 --
src/site/xdoc/manual/thread-context.xml| 217 --
src/site/xdoc/manual/usage.xml | 258 --
src/site/xdoc/manual/webapp.xml| 464
src/site/xdoc/runtime-dependencies.xml | 445
39 files changed, 10552 insertions(+), 9228 deletions(-)
create mode 100644 src/site/asciidoc/manual/customconfig.adoc
create mode 100644 src/site/asciidoc/manual/customloglevels.adoc
rename src/site/{xdoc/manual/eventlogging.xml =>
asciidoc/manual/eventlogging.adoc} (55%)
create mode 100644 src/site/asciidoc/manual/extending.adoc
create mode 100644 src/site/asciidoc/manual/filters.adoc
rename src/site/{xdoc/manual/flowtracing.xml =>
asciidoc/manual/flowtracing.adoc} (62%)
create mode 100644 src/site/asciidoc/manual/garbagefree.adoc
create mode 100644 src/site/asciidoc/manual/index.adoc
create mode 100644 src/site/asciidoc/manual/jmx.adoc
create mode 100644 src/site/asciidoc/manual/layouts.adoc
create mode 100644 src/site/asciidoc/manual/logbuilder.adoc
create mode 100644 src/site/asciidoc/manual/logsep.adoc
create mode 100644 src/site/asciidoc/manual/lookups.adoc
create mode 100644 src/site/asciidoc/manual/markers.adoc
create mode 100644 src/site/asciidoc/manual/messages.adoc
create mode 100644 src/site/asciidoc/manual/plugins.adoc
create mode 100644 src/site/asciidoc/manual/thread-context.adoc
create mode 100644 src/site/asciidoc/manual/usage.adoc
create mode 100644 src/site/asciidoc/manual/webapp.adoc
create mode 100644 src/site/asciidoc/runtime-dependencies.adoc
delete mode 100644 src/site/xdoc/manual/customconfig.xml
delete mode 100644 src/site/xdoc/manual/customloglevels.xml.vm
delete mode 100644 src/site/xdoc/manual/extending.xml
delete mode 100644 src/site/xdoc/manual/filters.xml
delete mode 100644 src/site/xdoc/manual/garbagefree.xml
delete mode 100644 src/site/xdoc/manual/index.xml
delete mode 100644 src/site/xdoc/manual/jmx.xml.vm
delete mode 100644 src/site/xdoc/manual/layouts.xml.vm
delete mode 100644 src/site/xdoc/manual/logbuilder.xml
delete mode 100644 src/site/xdoc/manual/logsep.xml
(logging-log4j2) branch ms12_restructure_website_2x updated: transformed config docs to asciidoc, syncing with 3x
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch ms12_restructure_website_2x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/ms12_restructure_website_2x by this push: new e904a46f57 transformed config docs to asciidoc, syncing with 3x e904a46f57 is described below commit e904a46f571fce3fc8bfe8de59f8ca2ee84a1999 Author: Christian Grobmeier AuthorDate: Mon Mar 11 15:29:18 2024 +0100 transformed config docs to asciidoc, syncing with 3x --- src/site/asciidoc/manual/configuration.adoc |1 + src/site/xdoc/manual/configuration.xml.vm | 2999 --- 2 files changed, 1 insertion(+), 2999 deletions(-) diff --git a/src/site/asciidoc/manual/configuration.adoc b/src/site/asciidoc/manual/configuration.adoc new file mode 100644 index 00..0c770bffb2 --- /dev/null +++ b/src/site/asciidoc/manual/configuration.adoc @@ -0,0 +1 @@ +Ralph Goers diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm deleted file mode 100644 index 1497a68cea..00 --- a/src/site/xdoc/manual/configuration.xml.vm +++ /dev/null @@ -1,2999 +0,0 @@ - - - -#set($dollar = '$') - -http://maven.apache.org/XDOC/2.0; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd;> - -Configuring Log4j 2 -Ralph Goers - - - - -#if (!$alignedFileName) -#set ($isPDF = true) -#else -#set ($isPDF = false) -#end -Inserting log requests into the application code requires a fair - amount of planning and effort. Observation shows that approximately 4 - percent of code is dedicated to logging. Consequently, even moderately - sized applications will have thousands of logging statements embedded - within their code. Given their number, it becomes imperative to - manage these log statements without the need to modify them manually. - - - Configuration of Log4j 2 can be accomplished in 1 of 4 ways: - - -Through a configuration file written in XML, JSON, YAML, or properties format. -Programmatically, by creating a ConfigurationFactory and Configuration implementation. -Programmatically, by calling the APIs exposed in the Configuration interface to add - components to the default configuration. -Programmatically, by calling methods on the internal Logger class. - - - This page focuses primarily on configuring Log4j through a configuration file. Information on - programmatically configuring Log4j can be found at Extending Log4j 2 - and Programmatic Log4j Configuration. - - - All available formats are functionally equivalent. For example, a configuration file in XML can be - rewritten using the properties format (and the opposite) without any loss of functionality. However, - the hierarchical nature of a Log4j configuration can be captured better in formats which naturally - support nesting so XML, JSON, and YAML files, are usually easier to use. - - - Note that unlike Log4j 1.x, the public Log4j 2 API does not expose methods to add, modify or remove - appenders and filters or manipulate the configuration in any way. - - - - -In part because support for XML was added first, Log4j's configuration is reflected as a tree structure. -In fact every configuration dialect, including the ConfigurationBuilder, generates a Node for every -configuration element. A node is a fairly simple structure that contains a set of attributes, a set of -child nodes and a PluginType. It is important to note that every Node must have a corresponding plugin, -as the plugin is the component that actually performs the work represented by the node. - - -Every document type supported by Log4j has a ConfigurationFactory. The factory itself is a Log4j plugin -that declares what file extensions it supports and what its priority is. Properties have the highest -precedence with a value of 8, followed by yaml, json and xml. When autoconfiguration is performed Log4j -will call each of these factories in order to determine which, if any, support the specified configuration -file format. If one is found that factory will create the corresponding Configuration object and pass the -reference to the configuration data to it. - - Every configuration implementation, such as XMLConfiguration,
(logging-log4j2) branch dependabot/maven/2.x/com.fasterxml.jackson-jackson-bom-2.16.2 updated (6b2ed0c2b5 -> 222913d359)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/2.x/com.fasterxml.jackson-jackson-bom-2.16.2
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
discard 6b2ed0c2b5 Bump com.fasterxml.jackson:jackson-bom from 2.16.1 to 2.16.2
add 82b873f960 Update `org.apache.commons:commons-compress` to version
`1.26.1` (#2361)
add 222913d359 Update `com.fasterxml.jackson:jackson-bom` to version
`2.16.2` (#2360)
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 (6b2ed0c2b5)
\
N -- N -- N
refs/heads/dependabot/maven/2.x/com.fasterxml.jackson-jackson-bom-2.16.2
(222913d359)
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-parent/pom.xml| 2 +-
.../{2.22.0 => .2.x.x}/update_com_fasterxml_jackson_jackson_bom.xml | 4 ++--
.../update_org_apache_commons_commons_compress.xml | 4 ++--
src/site/_constants.adoc| 2 +-
src/site/_release-notes.adoc| 1 +
src/site/_release-notes/_2.x.x.adoc | 6 ++
6 files changed, 13 insertions(+), 6 deletions(-)
copy src/changelog/{2.22.0 =>
.2.x.x}/update_com_fasterxml_jackson_jackson_bom.xml (75%)
copy src/changelog/{2.22.1 =>
.2.x.x}/update_org_apache_commons_commons_compress.xml (74%)
(logging-log4j2) branch dependabot/maven/2.x/com.fasterxml.jackson-jackson-bom-2.16.2 deleted (was 222913d359)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/com.fasterxml.jackson-jackson-bom-2.16.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 222913d359 Update `com.fasterxml.jackson:jackson-bom` to version `2.16.2` (#2360) 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 2.x updated (82b873f960 -> 222913d359)
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 82b873f960 Update `org.apache.commons:commons-compress` to version
`1.26.1` (#2361)
add 222913d359 Update `com.fasterxml.jackson:jackson-bom` to version
`2.16.2` (#2360)
No new revisions were added by this update.
Summary of changes:
log4j-parent/pom.xml | 2 +-
.../{2.22.0 => .2.x.x}/update_com_fasterxml_jackson_jackson_bom.xml | 4 ++--
src/site/_release-notes/_2.x.x.adoc | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
copy src/changelog/{2.22.0 =>
.2.x.x}/update_com_fasterxml_jackson_jackson_bom.xml (75%)
(logging-log4j2) branch dependabot/maven/main/org.apache.commons-commons-compress-1.26.1 deleted (was 62b41908da)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/org.apache.commons-commons-compress-1.26.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 62b41908da Update `org.apache.commons:commons-compress` to version `1.26.1` (#2358) 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/maven/main/org.apache.commons-commons-compress-1.26.1 updated (d932669057 -> 62b41908da)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/main/org.apache.commons-commons-compress-1.26.1
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
discard d932669057 Bump org.apache.commons:commons-compress from 1.26.0 to
1.26.1
add 9d49dba0f6 Update `com.fasterxml.jackson:jackson-bom` to version
`2.16.2` (#2359)
add 62b41908da Update `org.apache.commons:commons-compress` to version
`1.26.1` (#2358)
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 (d932669057)
\
N -- N -- N
refs/heads/dependabot/maven/main/org.apache.commons-commons-compress-1.26.1
(62b41908da)
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-parent/pom.xml | 2 +-
.../update_com_fasterxml_jackson_jackson_bom.xml | 4 ++--
src/changelog/.3.x.x/update_org_apache_commons_commons_compress.xml | 4 ++--
src/site/_release-notes/_3.x.x.adoc | 3 ++-
4 files changed, 7 insertions(+), 6 deletions(-)
copy src/changelog/{3.0.0-beta2 =>
.3.x.x}/update_com_fasterxml_jackson_jackson_bom.xml (75%)
(logging-log4j2) branch main updated (9d49dba0f6 -> 62b41908da)
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-log4j2.git from 9d49dba0f6 Update `com.fasterxml.jackson:jackson-bom` to version `2.16.2` (#2359) add 62b41908da Update `org.apache.commons:commons-compress` to version `1.26.1` (#2358) No new revisions were added by this update. Summary of changes: log4j-parent/pom.xml| 2 +- src/changelog/.3.x.x/update_org_apache_commons_commons_compress.xml | 4 ++-- src/site/_release-notes/_3.x.x.adoc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
(logging-log4net) branch github-actions updated (5a5b2be8 -> ddfb1684)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 5a5b2be8 Merge remote-tracking branch 'origin/master' into github-actions add 9282c95f :mute: disable debug logging new ddfb1684 Merge remote-tracking branch 'origin/master' into github-actions 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: .github/workflows/git-broadcast.yml | 1 - 1 file changed, 1 deletion(-)
(logging-log4net) 01/01: Merge remote-tracking branch 'origin/master' into github-actions
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git commit ddfb1684df9e478f663ca7e91cd01dd0b75e199d Merge: 5a5b2be8 9282c95f Author: Git Broadcast AuthorDate: Mon Mar 11 14:00:26 2024 + Merge remote-tracking branch 'origin/master' into github-actions .github/workflows/git-broadcast.yml | 1 - 1 file changed, 1 deletion(-)
(logging-log4net) branch dependabot/npm_and_yarn/minimatch-3.1.2 updated (ced699eb -> 5c65e478)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/minimatch-3.1.2 in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from ced699eb Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 add 9282c95f :mute: disable debug logging add 5c65e478 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 1 - 1 file changed, 1 deletion(-)
(logging-log4net) branch release/2.x updated (7922edd5 -> e63688e7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 7922edd5 Merge remote-tracking branch 'origin/master' into release/2.x add 9282c95f :mute: disable debug logging add e63688e7 Merge remote-tracking branch 'origin/master' into release/2.x No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 1 - 1 file changed, 1 deletion(-)
(logging-log4net) branch Feature/111-Dropping-support-for-older-runtimes updated (bab47ac5 -> 7c03ad6d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch Feature/111-Dropping-support-for-older-runtimes in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from bab47ac5 Merge remote-tracking branch 'origin/master' into Feature/111-Dropping-support-for-older-runtimes add 9282c95f :mute: disable debug logging add 7c03ad6d Merge remote-tracking branch 'origin/master' into Feature/111-Dropping-support-for-older-runtimes No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 1 - 1 file changed, 1 deletion(-)
(logging-log4net) branch master updated: :mute: disable debug logging
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
The following commit(s) were added to refs/heads/master by this push:
new 9282c95f :mute: disable debug logging
9282c95f is described below
commit 9282c95f50eb6905f7e29a5731037f0ed1730460
Author: Davyd McColl
AuthorDate: Mon Mar 11 16:00:01 2024 +0200
:mute: disable debug logging
---
.github/workflows/git-broadcast.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/git-broadcast.yml
b/.github/workflows/git-broadcast.yml
index 0853817c..cf314b4f 100644
--- a/.github/workflows/git-broadcast.yml
+++ b/.github/workflows/git-broadcast.yml
@@ -19,7 +19,6 @@ jobs:
node-version: '16'
- name: broadcast master changes to satellite branches
env:
-DEBUG: '*'
RUN_NUMBER: ${{ github.run_number }}
run: |
git config --global user.name "Git Broadcast"
(logging-log4net) branch dependabot/npm_and_yarn/minimatch-3.1.2 updated (a155490c -> ced699eb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/minimatch-3.1.2 in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from a155490c Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 add 2ab37099 :alembic: enable DEBUG logging to get more info - ignored branches _should_ be working add 1d89d41d :bug: should include quotes in yaml add ced699eb Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 1 + 1 file changed, 1 insertion(+)
(logging-log4net) branch release/2.x updated (2b13bd9d -> 7922edd5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 2b13bd9d Merge remote-tracking branch 'origin/master' into release/2.x add 2ab37099 :alembic: enable DEBUG logging to get more info - ignored branches _should_ be working add 1d89d41d :bug: should include quotes in yaml add 7922edd5 Merge remote-tracking branch 'origin/master' into release/2.x No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 1 + 1 file changed, 1 insertion(+)
(logging-log4net) 01/01: Merge remote-tracking branch 'origin/master' into github-actions
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git commit 5a5b2be8c7f390879968467240ad0494d1a41385 Merge: 04440d04 1d89d41d Author: Git Broadcast AuthorDate: Mon Mar 11 13:50:40 2024 + Merge remote-tracking branch 'origin/master' into github-actions .github/workflows/git-broadcast.yml | 1 + 1 file changed, 1 insertion(+)
(logging-log4net) branch github-actions updated (04440d04 -> 5a5b2be8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 04440d04 Merge remote-tracking branch 'origin/master' into github-actions add 2ab37099 :alembic: enable DEBUG logging to get more info - ignored branches _should_ be working add 1d89d41d :bug: should include quotes in yaml new 5a5b2be8 Merge remote-tracking branch 'origin/master' into github-actions 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: .github/workflows/git-broadcast.yml | 1 + 1 file changed, 1 insertion(+)
(logging-log4net) branch Feature/111-Dropping-support-for-older-runtimes updated (8dd714c5 -> bab47ac5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch Feature/111-Dropping-support-for-older-runtimes in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 8dd714c5 Merge remote-tracking branch 'origin/master' into Feature/111-Dropping-support-for-older-runtimes add 2ab37099 :alembic: enable DEBUG logging to get more info - ignored branches _should_ be working add 1d89d41d :bug: should include quotes in yaml add bab47ac5 Merge remote-tracking branch 'origin/master' into Feature/111-Dropping-support-for-older-runtimes No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 1 + 1 file changed, 1 insertion(+)
(logging-log4net) branch master updated: :bug: should include quotes in yaml
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
The following commit(s) were added to refs/heads/master by this push:
new 1d89d41d :bug: should include quotes in yaml
1d89d41d is described below
commit 1d89d41d1b3abf1202638f6694d5850fdf196bdb
Author: Davyd McColl
AuthorDate: Mon Mar 11 15:50:16 2024 +0200
:bug: should include quotes in yaml
---
.github/workflows/git-broadcast.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/git-broadcast.yml
b/.github/workflows/git-broadcast.yml
index 374a06ad..0853817c 100644
--- a/.github/workflows/git-broadcast.yml
+++ b/.github/workflows/git-broadcast.yml
@@ -19,7 +19,7 @@ jobs:
node-version: '16'
- name: broadcast master changes to satellite branches
env:
-DEBUG: *
+DEBUG: '*'
RUN_NUMBER: ${{ github.run_number }}
run: |
git config --global user.name "Git Broadcast"
(logging-log4net) branch master updated: :alembic: enable DEBUG logging to get more info - ignored branches _should_ be working
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
The following commit(s) were added to refs/heads/master by this push:
new 2ab37099 :alembic: enable DEBUG logging to get more info - ignored
branches _should_ be working
2ab37099 is described below
commit 2ab370999ff75df72af6ed9ebcd6e45feec7c836
Author: Davyd McColl
AuthorDate: Mon Mar 11 15:49:04 2024 +0200
:alembic: enable DEBUG logging to get more info - ignored branches _should_
be working
---
.github/workflows/git-broadcast.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/git-broadcast.yml
b/.github/workflows/git-broadcast.yml
index cf314b4f..374a06ad 100644
--- a/.github/workflows/git-broadcast.yml
+++ b/.github/workflows/git-broadcast.yml
@@ -19,6 +19,7 @@ jobs:
node-version: '16'
- name: broadcast master changes to satellite branches
env:
+DEBUG: *
RUN_NUMBER: ${{ github.run_number }}
run: |
git config --global user.name "Git Broadcast"
(logging-log4net) branch Feature/111-Dropping-support-for-older-runtimes updated (b814f6b1 -> 8dd714c5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch Feature/111-Dropping-support-for-older-runtimes in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from b814f6b1 Merge #120 add b6e0374d :alembic: try pre-release git-broadcast for ignore support add 8dd714c5 Merge remote-tracking branch 'origin/master' into Feature/111-Dropping-support-for-older-runtimes No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4net) branch Feature/111-Dropping-support-for-older-runtimes updated (20cf9dca -> b814f6b1)
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 20cf9dca - updated build scripts - added Jan Friedrich as Committer add 9f8a047a Update copyright year in `NOTICE` add fe6bf055 :memo: update build docs add a1c3ce57 Merge pull request #116 from apache/Feature/v2.0.16 add 3877e0b8 Merge pull request #117 from apache/Feature/TabsToSpaces add 95104eb8 Fast fix for NullRefException from FileAppender add a649e8f3 :wrench: enable automatic broadcast of changes in master to outstanding satellite branches add 47f08865 :wrench: remove trailing reference to slack-webhook-say add 9e40bc7e :wrench: update urls for issues, etc (I'm not even sure why they're set to my fork) add b814f6b1 Merge #120 No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml| 26 ++ package.json | 4 ++-- .../Appender/RollingFileAppenderTest.cs| 10 + src/log4net.Tests/log4net.Tests.csproj | 1 + src/log4net.sln| 8 +++ src/log4net/Appender/FileAppender.cs | 2 +- 6 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/git-broadcast.yml
(logging-log4net) branch github-actions updated (10e589ff -> 04440d04)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 10e589ff Merge remote-tracking branch 'origin/master' into github-actions add b6e0374d :alembic: try pre-release git-broadcast for ignore support new 04440d04 Merge remote-tracking branch 'origin/master' into github-actions 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: .github/workflows/git-broadcast.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4net) branch release/2.x updated (e8e8c450 -> 2b13bd9d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from e8e8c450 Update version for 2.0.17 add b6e0374d :alembic: try pre-release git-broadcast for ignore support add 2b13bd9d Merge remote-tracking branch 'origin/master' into release/2.x No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4net) branch dependabot/npm_and_yarn/minimatch-3.1.2 updated (22256f47 -> a155490c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/minimatch-3.1.2 in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 22256f47 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 add b6e0374d :alembic: try pre-release git-broadcast for ignore support add a155490c Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4net) branch release/2.x updated (e417c038 -> ac99446a)
This is an automated email from the ASF dual-hosted git repository.
freeandnil pushed a change to branch release/2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
discard e417c038 Merge remote-tracking branch 'origin/master' into release/2.x
discard 88ccd8fe Merge remote-tracking branch 'origin/master' into release/2.x
discard fd883afd Update version for 2.0.17
add ac99446a Update version for 2.0.17
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 (e417c038)
\
N -- N -- N refs/heads/release/2.x (ac99446a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
{src/site/xdoc/release => doc}/MailTemplate.txt | 0
doc/RELEASING.md| 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
copy {src/site/xdoc/release => doc}/MailTemplate.txt (100%)
(logging-log4net) 01/01: Merge remote-tracking branch 'origin/master' into github-actions
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git commit 04440d04bc1556571263c50c8add4a038a72e9fb Merge: 10e589ff b6e0374d Author: Git Broadcast AuthorDate: Mon Mar 11 13:10:49 2024 + Merge remote-tracking branch 'origin/master' into github-actions .github/workflows/git-broadcast.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4net) branch master updated: :alembic: try pre-release git-broadcast for ignore support
This is an automated email from the ASF dual-hosted git repository. davydm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4net.git The following commit(s) were added to refs/heads/master by this push: new b6e0374d :alembic: try pre-release git-broadcast for ignore support b6e0374d is described below commit b6e0374d14c588c3a3e640ff31baeb4df8d4854a Author: Davyd McColl AuthorDate: Mon Mar 11 15:10:30 2024 +0200 :alembic: try pre-release git-broadcast for ignore support --- .github/workflows/git-broadcast.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/git-broadcast.yml b/.github/workflows/git-broadcast.yml index 5efe4b3a..cf314b4f 100644 --- a/.github/workflows/git-broadcast.yml +++ b/.github/workflows/git-broadcast.yml @@ -23,4 +23,4 @@ jobs: run: | git config --global user.name "Git Broadcast" git config --global user.email "git-broadc...@no-reply.com" -npx git-broadcast@latest --from master --push --pretty --suppress-log-prefixes --prefix-logs-with $GITHUB_REPOSITORY +npx git-broadcast@beta --ignore abandoned-develop --from master --push --pretty --suppress-log-prefixes --prefix-logs-with $GITHUB_REPOSITORY
(logging-log4net) branch release/2.x updated (97aec84b -> e8e8c450)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git discard 97aec84b Update version for 2.0.17 add e8e8c450 Update version for 2.0.17 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 (97aec84b) \ N -- N -- N refs/heads/release/2.x (e8e8c450) 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: doc/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4net) branch release/2.x updated (8c262cf2 -> 97aec84b)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git discard 8c262cf2 Update version for 2.0.17 add 97aec84b Update version for 2.0.17 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 (8c262cf2) \ N -- N -- N refs/heads/release/2.x (97aec84b) 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 release/2.x updated (ac99446a -> 8c262cf2)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git discard ac99446a Update version for 2.0.17 add 8c262cf2 Update version for 2.0.17 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 (ac99446a) \ N -- N -- N refs/heads/release/2.x (8c262cf2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/site/xdoc/release/MailTemplate.txt | 19 --- 1 file changed, 19 deletions(-) delete mode 100644 src/site/xdoc/release/MailTemplate.txt
(logging-log4net) branch release/2.x updated (88ccd8fe -> e417c038)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 88ccd8fe Merge remote-tracking branch 'origin/master' into release/2.x add 9e40bc7e :wrench: update urls for issues, etc (I'm not even sure why they're set to my fork) add e417c038 Merge remote-tracking branch 'origin/master' into release/2.x No new revisions were added by this update. Summary of changes: package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4net) 01/01: Merge remote-tracking branch 'origin/master' into github-actions
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git commit 10e589ff82a1bf2f97fa6275a152779abd695199 Merge: 0c18a4f9 9e40bc7e Author: Git Broadcast AuthorDate: Mon Mar 11 12:43:36 2024 + Merge remote-tracking branch 'origin/master' into github-actions package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4net) branch master updated: :wrench: update urls for issues, etc (I'm not even sure why they're set to my fork)
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
The following commit(s) were added to refs/heads/master by this push:
new 9e40bc7e :wrench: update urls for issues, etc (I'm not even sure why
they're set to my fork)
9e40bc7e is described below
commit 9e40bc7e9967f0dc1794bd2f6e056034ffd363fa
Author: Davyd McColl
AuthorDate: Mon Mar 11 14:43:09 2024 +0200
:wrench: update urls for issues, etc (I'm not even sure why they're set to
my fork)
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 640be925..443bab25 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,9 @@
"author": "",
"license": "Apache-2.0",
"bugs": {
-"url": "https://github.com/fluffynuts/logging-log4net/issues;
+"url": "https://github.com/apache/logging-log4net/issues;
},
- "homepage": "https://github.com/fluffynuts/logging-log4net#readme;,
+ "homepage": "https://github.com/apache/logging-log4net#readme;,
"devDependencies": {
"cross-env": "^7.0.2",
"gulp-debug": "^4.0.0",
(logging-log4net) branch release/2.x updated (fd883afd -> 88ccd8fe)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from fd883afd Update version for 2.0.17 add a649e8f3 :wrench: enable automatic broadcast of changes in master to outstanding satellite branches add 47f08865 :wrench: remove trailing reference to slack-webhook-say add 88ccd8fe Merge remote-tracking branch 'origin/master' into release/2.x No new revisions were added by this update. Summary of changes: .github/workflows/git-broadcast.yml | 26 ++ src/log4net.sln | 8 2 files changed, 34 insertions(+) create mode 100644 .github/workflows/git-broadcast.yml
(logging-log4net) branch release/2.x created (now fd883afd)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git at fd883afd Update version for 2.0.17 This branch includes the following new commits: new fd883afd Update version for 2.0.17 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-log4net) branch dependabot/npm_and_yarn/minimatch-3.1.2 updated (c0306ff4 -> 22256f47)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/minimatch-3.1.2 in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from c0306ff4 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 add 9e40bc7e :wrench: update urls for issues, etc (I'm not even sure why they're set to my fork) add 22256f47 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 No new revisions were added by this update. Summary of changes: package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4net) branch github-actions updated (0c18a4f9 -> 10e589ff)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 0c18a4f9 Merge remote-tracking branch 'origin/master' into github-actions add 9e40bc7e :wrench: update urls for issues, etc (I'm not even sure why they're set to my fork) new 10e589ff Merge remote-tracking branch 'origin/master' into github-actions 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: package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(logging-log4net) 01/01: Update version for 2.0.17
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a commit to branch release/2.x in repository https://gitbox.apache.org/repos/asf/logging-log4net.git commit fd883afdd149e81dd5343ae7762da300047b04b6 Author: Jan Friedrich AuthorDate: Mon Mar 11 13:42:04 2024 +0100 Update version for 2.0.17 --- src/log4net/log4net.csproj | 4 +-- src/site/xdoc/download_log4net.xml | 51 - src/site/xdoc/release/MailTemplate.txt | 19 src/site/xdoc/release/release-notes.xml | 27 +++-- 4 files changed, 57 insertions(+), 44 deletions(-) diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index 61dfe5a9..380fba97 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net/log4net.csproj @@ -1,8 +1,8 @@ log4net -2.0.16 -2.0.16 +2.0.17 +$(Version) Apache log4net Apache log4net diff --git a/src/site/xdoc/download_log4net.xml b/src/site/xdoc/download_log4net.xml index 0a343092..3e52ee76 100644 --- a/src/site/xdoc/download_log4net.xml +++ b/src/site/xdoc/download_log4net.xml @@ -23,27 +23,22 @@ limitations under the License. - Apache log4net is distributed under the http://www.apache.org/licenses/LICENSE-2.0.html;>Apache - License, version 2.0. + Apache log4net is distributed under the http://www.apache.org/licenses/LICENSE-2.0.html;>Apache License, version 2.0. - Starting with log4net 1.2.11 log4net is available as source only or - binary only release. + Starting with log4net 1.2.11 log4net is available as source only or binary only release. - Users who download the ZIP files to Windows may need to unblock the - archive (right click on the ZIP and press the "Unblock" button) - before extracting it. + Users who download the ZIP files to Windows may need to unblock the archive (right click on the ZIP and press the "Unblock" button) before extracting it. - + -https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.16.zip;>apache-log4net-source-2.0.16.zip -https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.16.zip.sha512;>sha512 -https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.16.zip.asc;>pgp +https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.17.zip;>apache-log4net-source-2.0.17.zip +https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.17.zip.sha512;>sha512 +https://downloads.apache.org/logging/log4net/source/apache-log4net-source-2.0.17.zip.asc;>pgp @@ -52,14 +47,14 @@ limitations under the License. Binaries are available in a zip file or nupkg, which is also available from https://www.nuget.org/packages/log4net/;>nuget.org -https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.16.zip;>log4net-binaries-2.0.16.zip -https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.16.zip.sha512;>sha512 -https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.16.zip.asc;>pgp +https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.17.zip;>log4net-binaries-2.0.17.zip +https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.17.zip.sha512;>sha512 +https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.17.zip.asc;>pgp -https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.16.nupkg;>log4net-2.0.16.nupkg -https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.16.nupkg.sha512;>sha512 -https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.16.nupkg.asc;>pgp +https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.17.nupkg;>log4net-2.0.17.nupkg +https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.17.nupkg.sha512;>sha512 +https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.17.nupkg.asc;>pgp @@ -67,12 +62,8 @@ limitations under the License. -The http://www.apache.org/dist/logging/log4net/KEYS;>KEYS link -links to the code signing keys used to sign the product. The -PGP link downloads the OpenPGP compatible -signature from our main site. The MD5 link -downloads the checksum from the main site. +The http://www.apache.org/dist/logging/log4net/KEYS;>KEYS link links to the code signing keys used to sign the product. +The PGP link downloads the OpenPGP compatible signature
(logging-log4j-audit-sample) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 deleted (was 2c03605)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git was 2c03605 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#41) 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-sample) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 updated (6a36884 -> 2c03605)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git discard 6a36884 Bump org.apache.logging.log4j:log4j-bom from 2.23.0 to 2.23.1 add 2c03605 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#41) 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 (6a36884) \ N -- N -- N refs/heads/dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 (2c03605) 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-log4j-audit-sample) branch master updated (6575cb2 -> 2c03605)
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-sample.git from 6575cb2 Update `com.fasterxml.jackson:jackson-bom` to version `2.16.2` (#40) add 2c03605 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#41) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4j2) branch dependabot/maven/2.x/org.apache.commons-commons-compress-1.26.1 updated (7a0219a773 -> 82b873f960)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/2.x/org.apache.commons-commons-compress-1.26.1
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
discard 7a0219a773 Bump org.apache.commons:commons-compress from 1.26.0 to
1.26.1
add 82b873f960 Update `org.apache.commons:commons-compress` to version
`1.26.1` (#2361)
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 (7a0219a773)
\
N -- N -- N
refs/heads/dependabot/maven/2.x/org.apache.commons-commons-compress-1.26.1
(82b873f960)
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_org_apache_commons_commons_compress.xml | 4 ++--
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 1 +
src/site/_release-notes/_2.x.x.adoc | 5 +
4 files changed, 9 insertions(+), 3 deletions(-)
copy src/changelog/{2.22.1 =>
.2.x.x}/update_org_apache_commons_commons_compress.xml (74%)
(logging-log4j2) branch dependabot/maven/2.x/org.apache.commons-commons-compress-1.26.1 deleted (was 82b873f960)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/org.apache.commons-commons-compress-1.26.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 82b873f960 Update `org.apache.commons:commons-compress` to version `1.26.1` (#2361) 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 2.x updated (a5de55e7dc -> 82b873f960)
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 a5de55e7dc Set the version to `2.24.0-SNAPSHOT`
add 82b873f960 Update `org.apache.commons:commons-compress` to version
`1.26.1` (#2361)
No new revisions were added by this update.
Summary of changes:
log4j-parent/pom.xml | 2 +-
.../update_org_apache_commons_commons_compress.xml | 4 ++--
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 1 +
src/site/_release-notes/_2.x.x.adoc | 5 +
5 files changed, 10 insertions(+), 4 deletions(-)
copy src/changelog/{2.22.1 =>
.2.x.x}/update_org_apache_commons_commons_compress.xml (74%)
(logging-site) branch main updated: changed Davyd McColl to PMC Member
This is an automated email from the ASF dual-hosted git repository. freeandnil 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 725860d8 changed Davyd McColl to PMC Member 725860d8 is described below commit 725860d8aae0cfe56eb46c0f2e4a0b0a98a90596 Author: Jan Friedrich AuthorDate: Mon Mar 11 12:46:49 2024 +0100 changed Davyd McColl to PMC Member --- team-list.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/team-list.adoc b/team-list.adoc index 06be770b..0ef58652 100644 --- a/team-list.adoc +++ b/team-list.adoc @@ -39,7 +39,7 @@ Active Team Members | Raman Gupta | rgupta at apache.org | Committer | Log4j-Kotlin | Andrei Ivanov | shadow at apache.org | Committer | Log4j-Audit | Carter Kozak | ckozak at apache.org | PMC Member | Log4j2 -| Davyd McColl | davydm at apache.org | Committer | Log4net +| Davyd McColl | davydm at apache.org | PMC Member | Log4net | Christian Grobmeier | grobmeier at apache.org | PMC Member | Log4j, Log4j2, Log4php, Chainsaw | Ron Grabowski | rgrabowski at apache.org | PMC Member | Log4net, Log4j | Robert Middleton | rmiddleton at apache.org | Committer | Log4cxx
(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 89ae68f8 Automatic Site Publish by Buildbot 89ae68f8 is described below commit 89ae68f8cb8e9b829823d47d87ca6b6b7cebce9c Author: buildbot AuthorDate: Mon Mar 11 11:47:10 2024 + Automatic Site Publish by Buildbot --- content/feed.xml | 2 +- content/team-list.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/feed.xml b/content/feed.xml index 829b9c2b..728f861d 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-08T10:44:22+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-11T11:47:09+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/team-list.html b/content/team-list.html index 4f79d6de..fe6d7d2e 100644 --- a/content/team-list.html +++ b/content/team-list.html @@ -220,7 +220,7 @@ Davyd McColl davydm at apache.org -Committer +PMC Member Log4net
(logging-log4j-audit-sample) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 updated (0431198 -> 6a36884)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git discard 0431198 Bump org.apache.logging.log4j:log4j-bom from 2.23.0 to 2.23.1 add 6575cb2 Update `com.fasterxml.jackson:jackson-bom` to version `2.16.2` (#40) add 6a36884 Bump org.apache.logging.log4j:log4j-bom from 2.23.0 to 2.23.1 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 (0431198) \ N -- N -- N refs/heads/dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 (6a36884) 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4j-audit-sample) branch dependabot/maven/com.fasterxml.jackson-jackson-bom-2.16.2 deleted (was 6575cb2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.fasterxml.jackson-jackson-bom-2.16.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git was 6575cb2 Update `com.fasterxml.jackson:jackson-bom` to version `2.16.2` (#40) 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-sample) branch dependabot/maven/com.fasterxml.jackson-jackson-bom-2.16.2 updated (48ac6c3 -> 6575cb2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.fasterxml.jackson-jackson-bom-2.16.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git discard 48ac6c3 Bump com.fasterxml.jackson:jackson-bom from 2.16.1 to 2.16.2 add 6575cb2 Update `com.fasterxml.jackson:jackson-bom` to version `2.16.2` (#40) 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 (48ac6c3) \ N -- N -- N refs/heads/dependabot/maven/com.fasterxml.jackson-jackson-bom-2.16.2 (6575cb2) 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-log4j-audit-sample) branch master updated (c836ad1 -> 6575cb2)
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-sample.git from c836ad1 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.0` (#39) add 6575cb2 Update `com.fasterxml.jackson:jackson-bom` to version `2.16.2` (#40) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(logging-log4j2) branch dependabot/maven/main/com.fasterxml.jackson-jackson-bom-2.16.2 updated (7c7e33ffb9 -> 9d49dba0f6)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/main/com.fasterxml.jackson-jackson-bom-2.16.2
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
discard 7c7e33ffb9 Bump com.fasterxml.jackson:jackson-bom from 2.16.1 to 2.16.2
add 9d49dba0f6 Update `com.fasterxml.jackson:jackson-bom` to version
`2.16.2` (#2359)
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 (7c7e33ffb9)
\
N -- N -- N
refs/heads/dependabot/maven/main/com.fasterxml.jackson-jackson-bom-2.16.2
(9d49dba0f6)
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_com_fasterxml_jackson_jackson_bom.xml | 4 ++--
src/site/_release-notes/_3.x.x.adoc | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
copy src/changelog/{3.0.0-beta2 =>
.3.x.x}/update_com_fasterxml_jackson_jackson_bom.xml (75%)
(logging-log4j2) branch dependabot/maven/main/com.fasterxml.jackson-jackson-bom-2.16.2 deleted (was 9d49dba0f6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/com.fasterxml.jackson-jackson-bom-2.16.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 9d49dba0f6 Update `com.fasterxml.jackson:jackson-bom` to version `2.16.2` (#2359) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch main updated (12cd428bda -> 9d49dba0f6)
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-log4j2.git
from 12cd428bda added callouts to sourcecode, made example simpler
add 9d49dba0f6 Update `com.fasterxml.jackson:jackson-bom` to version
`2.16.2` (#2359)
No new revisions were added by this update.
Summary of changes:
log4j-parent/pom.xml | 2 +-
.../update_com_fasterxml_jackson_jackson_bom.xml | 4 ++--
src/site/_release-notes/_3.x.x.adoc | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
copy src/changelog/{3.0.0-beta2 =>
.3.x.x}/update_com_fasterxml_jackson_jackson_bom.xml (75%)
(logging-log4j-audit-sample) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 created (now 0431198)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git at 0431198 Bump org.apache.logging.log4j:log4j-bom from 2.23.0 to 2.23.1 No new revisions were added by this update.
(logging-log4j-audit-sample) branch dependabot/maven/com.fasterxml.jackson-jackson-bom-2.16.2 created (now 48ac6c3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.fasterxml.jackson-jackson-bom-2.16.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git at 48ac6c3 Bump com.fasterxml.jackson:jackson-bom from 2.16.1 to 2.16.2 No new revisions were added by this update.
(logging-log4net) 01/01: Merge remote-tracking branch 'origin/master' into github-actions
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git commit 0c18a4f97398b18c8951fee991ffc77b26149b39 Merge: 62627160 47f08865 Author: Git Broadcast AuthorDate: Mon Mar 11 10:53:46 2024 + Merge remote-tracking branch 'origin/master' into github-actions .asf.yaml | 57 + .github/workflows/git-broadcast.yml| 26 + .gitignore |2 + .zarro-defaults| 28 + NOTICE |2 +- doc/BUILDING.md| 33 +- doc/RELEASING.md |2 + .../1.0/Tutorials/ConsoleApp/cs/src/App.config |2 +- .../1.1/Tutorials/ConsoleApp/cpp/src/App.config|2 +- .../net/1.1/Tutorials/ConsoleApp/js/src/App.config |2 +- .../Appenders/SampleAppendersApp/cs/src/App.config |2 +- .../net/2.0/Tutorials/ConsoleApp/cs/src/App.config |2 +- .../net/2.0/Tutorials/ConsoleApp/vb/src/App.config |2 +- local-tasks/build-site.js | 53 +- ...date-version-info.js => update-version-info.ts} | 25 +- log4net.build |2 +- log4net.shfbproj |2 +- package-lock.json | 1869 - package.json | 29 +- pom.xml|3 +- .../Appender/AdoNet/Log4NetCommand.cs | 232 +- .../Appender/AdoNet/Log4NetConnection.cs | 164 +- .../Appender/AdoNet/Log4NetParameter.cs| 148 +- .../Appender/AdoNet/Log4NetParameterCollection.cs | 62 +- .../Appender/AdoNet/Log4NetTransaction.cs | 54 +- src/log4net.Tests/Appender/AdoNetAppenderTest.cs | 306 +- .../Appender/AppenderCollectionTest.cs | 70 +- .../Appender/BufferingAppenderTest.cs | 168 +- src/log4net.Tests/Appender/CountingAppender.cs | 112 +- src/log4net.Tests/Appender/DebugAppenderTest.cs| 210 +- src/log4net.Tests/Appender/EventLogAppenderTest.cs | 142 +- src/log4net.Tests/Appender/MemoryAppenderTest.cs | 95 +- src/log4net.Tests/Appender/RemotingAppenderTest.cs | 764 ++-- .../Appender/RollingFileAppenderTest.cs| 3823 +- .../Appender/SmtpPickupDirAppenderTest.cs | 430 +- src/log4net.Tests/Appender/StringAppender.cs | 88 +- src/log4net.Tests/Appender/TraceAppenderTest.cs| 134 +- .../Context/LogicalThreadContextTest.cs| 616 +-- src/log4net.Tests/Context/ThreadContextTest.cs | 406 +- src/log4net.Tests/Core/EvaluatorTest.cs| 222 +- src/log4net.Tests/Core/FixingTest.cs | 282 +- src/log4net.Tests/Core/ShutdownTest.cs | 70 +- src/log4net.Tests/Core/StringFormatTest.cs | 1328 +++ src/log4net.Tests/Filter/FilterTest.cs | 109 +- src/log4net.Tests/Hierarchy/Hierarchy.cs | 128 +- src/log4net.Tests/Hierarchy/Logger.cs | 568 +-- .../Layout/DynamicPatternLayoutTest.cs | 26 +- src/log4net.Tests/Layout/PatternLayoutTest.cs | 606 +-- src/log4net.Tests/Layout/XmlLayoutTest.cs | 525 +-- .../LoggerRepository/ConfigurationMessages.cs | 84 +- src/log4net.Tests/NUnitTestRunnerInitializer.cs| 18 +- src/log4net.Tests/Signing.cs | 26 +- src/log4net.Tests/Util/CyclicBufferTest.cs | 160 +- .../Util/EnvironmentPatternConverterTest.cs| 132 +- src/log4net.Tests/Util/LogLogTest.cs | 152 +- src/log4net.Tests/Util/PatternConverterTest.cs | 172 +- src/log4net.Tests/Util/PatternStringTest.cs| 124 +- src/log4net.Tests/Util/PropertiesDictionaryTest.cs | 66 +- .../Util/RandomStringPatternConverterTest.cs | 104 +- src/log4net.Tests/Util/SystemInfoTest.cs | 283 +- src/log4net.Tests/Util/TransformTest.cs| 31 +- src/log4net.Tests/Utils.cs | 191 +- src/log4net.Tests/log4net.Tests.csproj | 22 +- src/log4net.sln| 17 + src/log4net/Appender/AdoNetAppender.cs | 2270 +-- src/log4net/Appender/AnsiColorTerminalAppender.cs | 1080 ++--- src/log4net/Appender/AppenderCollection.cs | 1748 - src/log4net/Appender/AppenderSkeleton.cs | 1748 - src/log4net/Appender/AspNetTraceAppender.cs| 242 +- src/log4net/Appender/BufferingAppenderSkeleton.cs | 1256 +++--- .../Appender/BufferingForwardingAppender.cs| 452 +-- src/log4net/Appender/ColoredConsoleAppender.cs | 1234 +++--- src/log4net/Appender/ConsoleAppender.cs| 378 +-
(logging-log4net) branch github-actions updated (62627160 -> 0c18a4f9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch github-actions in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 62627160 this works add ab74a0a3 Support converting '.NET TP Worker' to the numeric thread ID on .NET 8+ add 765567a7 Merge pull request #103 from erikmav/dev/erikmav/net8ThreadPoolWorker add d6e81b35 :memo: update RELEASING.md with explicit nuget publish instructions add 84917ab1 :alembic: port & modify .asf.yaml from log4j add 48fe03e4 :wrench: a little configuration and an update to zarro add f0771d0d :fire: remove .NET label - automation doesn't accept it add 2a013ea2 Removing username and password in SQL connection string to prevent CodeQL rule id cs/password-in-configuration false positive add 9f8a047a Update copyright year in `NOTICE` add fe6bf055 :memo: update build docs add 2640e822 - added release notes for 2.0.16 - changed csproj for deterministic builds add d565df42 :wrench: upgrade update-version-info task and zarro add 2f9666e2 :bookmark: update versioning to 2.0.16.0 add 66891fdd :bug: should delete old site before asking mvn to make a new one add 77f01660 :fire: remove changelog item - it's not done yet! add f43726a3 :alembic: enable beta package building add bf678749 :wrench: fully rely on zarro's release-nuget task add 8ba453e6 :arrow_up: upgrade to release version of zarro add a1c3ce57 Merge pull request #116 from apache/Feature/v2.0.16 add 8dbb52b2 Update copyright year in `NOTICE` add fc4c0f39 :memo: update build docs add 2121c474 tabs to spaces #111 add 223a9abf format documents #111 add e1be2df9 tabs to spaces (test project) add 788cf6ed format documents (test project) add 3877e0b8 Merge pull request #117 from apache/Feature/TabsToSpaces add 95104eb8 Fast fix for NullRefException from FileAppender add a649e8f3 :wrench: enable automatic broadcast of changes in master to outstanding satellite branches add 47f08865 :wrench: remove trailing reference to slack-webhook-say new 0c18a4f9 Merge remote-tracking branch 'origin/master' into github-actions 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: .asf.yaml | 57 + .github/workflows/git-broadcast.yml| 26 + .gitignore |2 + .zarro-defaults| 28 + NOTICE |2 +- doc/BUILDING.md| 33 +- doc/RELEASING.md |2 + .../1.0/Tutorials/ConsoleApp/cs/src/App.config |2 +- .../1.1/Tutorials/ConsoleApp/cpp/src/App.config|2 +- .../net/1.1/Tutorials/ConsoleApp/js/src/App.config |2 +- .../Appenders/SampleAppendersApp/cs/src/App.config |2 +- .../net/2.0/Tutorials/ConsoleApp/cs/src/App.config |2 +- .../net/2.0/Tutorials/ConsoleApp/vb/src/App.config |2 +- local-tasks/build-site.js | 53 +- ...date-version-info.js => update-version-info.ts} | 25 +- log4net.build |2 +- log4net.shfbproj |2 +- package-lock.json | 1869 - package.json | 29 +- pom.xml|3 +- .../Appender/AdoNet/Log4NetCommand.cs | 232 +- .../Appender/AdoNet/Log4NetConnection.cs | 164 +- .../Appender/AdoNet/Log4NetParameter.cs| 148 +- .../Appender/AdoNet/Log4NetParameterCollection.cs | 62 +- .../Appender/AdoNet/Log4NetTransaction.cs | 54 +- src/log4net.Tests/Appender/AdoNetAppenderTest.cs | 306 +- .../Appender/AppenderCollectionTest.cs | 70 +- .../Appender/BufferingAppenderTest.cs | 168 +- src/log4net.Tests/Appender/CountingAppender.cs | 112 +- src/log4net.Tests/Appender/DebugAppenderTest.cs| 210 +- src/log4net.Tests/Appender/EventLogAppenderTest.cs | 142 +- src/log4net.Tests/Appender/MemoryAppenderTest.cs | 95 +- src/log4net.Tests/Appender/RemotingAppenderTest.cs | 764 ++-- .../Appender/RollingFileAppenderTest.cs| 3823 +- .../Appender/SmtpPickupDirAppenderTest.cs | 430 +- src/log4net.Tests/Appender/StringAppender.cs | 88 +- src/log4net.Tests/Appender/TraceAppenderTest.cs| 134 +- .../Context/LogicalThreadContextTest.cs| 616 +-- src/log4net.Tests/Context/ThreadContextTest.cs | 406 +- src/log4net.Tests/Core/EvaluatorTest.cs
(logging-log4net) branch dependabot/npm_and_yarn/minimatch-3.1.2 updated (80321037 -> c0306ff4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/minimatch-3.1.2 in repository https://gitbox.apache.org/repos/asf/logging-log4net.git from 80321037 :arrow_up: Bump minimatch from 3.0.4 to 3.1.2 add ea29f17e Add Peek() method to ThreadContextStack and LogicalThreadContextStack. add eb9ea3ff Use tabs. add 38996351 Tab fixes. add 22d3378f Merge pull request #101 from andreycha/feat/support-peek-in-stacks add cf2d2bdf Fix typo in RemotingServer App.Config add ce27c082 Merge pull request #94 from craigdfrench/patch-1 add 10d9a4e7 :arrow_up: Bump ant from 1.9.4 to 1.10.11 add 81139939 Merge pull request #84 from apache/dependabot/maven/org.apache.ant-ant-1.10.11 add 236bbff8 :arrow_up: Bump decode-uri-component from 0.2.0 to 0.2.2 add 14c28004 Merge pull request #96 from apache/dependabot/npm_and_yarn/decode-uri-component-0.2.2 add 7a9a68c0 :arrow_up: Bump qs from 6.5.2 to 6.5.3 add 9d60cb7b Merge pull request #98 from apache/dependabot/npm_and_yarn/qs-6.5.3 add 7b1bf797 :arrow_up: Bump simple-git from 2.48.0 to 3.16.0 add e024c5c0 Merge pull request #99 from apache/dependabot/npm_and_yarn/simple-git-3.16.0 add ab74a0a3 Support converting '.NET TP Worker' to the numeric thread ID on .NET 8+ add 765567a7 Merge pull request #103 from erikmav/dev/erikmav/net8ThreadPoolWorker add d6e81b35 :memo: update RELEASING.md with explicit nuget publish instructions add 84917ab1 :alembic: port & modify .asf.yaml from log4j add 48fe03e4 :wrench: a little configuration and an update to zarro add f0771d0d :fire: remove .NET label - automation doesn't accept it add 2a013ea2 Removing username and password in SQL connection string to prevent CodeQL rule id cs/password-in-configuration false positive add 9f8a047a Update copyright year in `NOTICE` add fe6bf055 :memo: update build docs add 2640e822 - added release notes for 2.0.16 - changed csproj for deterministic builds add d565df42 :wrench: upgrade update-version-info task and zarro add 2f9666e2 :bookmark: update versioning to 2.0.16.0 add 66891fdd :bug: should delete old site before asking mvn to make a new one add 77f01660 :fire: remove changelog item - it's not done yet! add f43726a3 :alembic: enable beta package building add bf678749 :wrench: fully rely on zarro's release-nuget task add 8ba453e6 :arrow_up: upgrade to release version of zarro add a1c3ce57 Merge pull request #116 from apache/Feature/v2.0.16 add 8dbb52b2 Update copyright year in `NOTICE` add fc4c0f39 :memo: update build docs add 2121c474 tabs to spaces #111 add 223a9abf format documents #111 add e1be2df9 tabs to spaces (test project) add 788cf6ed format documents (test project) add 3877e0b8 Merge pull request #117 from apache/Feature/TabsToSpaces add 95104eb8 Fast fix for NullRefException from FileAppender add a649e8f3 :wrench: enable automatic broadcast of changes in master to outstanding satellite branches add 47f08865 :wrench: remove trailing reference to slack-webhook-say add c0306ff4 Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/minimatch-3.1.2 No new revisions were added by this update. Summary of changes: .asf.yaml | 57 + .github/workflows/git-broadcast.yml| 26 + .gitignore |2 + .zarro-defaults| 28 + NOTICE |2 +- doc/BUILDING.md| 33 +- doc/RELEASING.md |2 + .../1.0/Tutorials/ConsoleApp/cs/src/App.config |2 +- .../1.1/Tutorials/ConsoleApp/cpp/src/App.config|2 +- .../net/1.1/Tutorials/ConsoleApp/js/src/App.config |2 +- .../Appenders/SampleAppendersApp/cs/src/App.config |2 +- .../2.0/Remoting/RemotingServer/cs/src/App.config |2 +- .../net/2.0/Tutorials/ConsoleApp/cs/src/App.config |2 +- .../net/2.0/Tutorials/ConsoleApp/vb/src/App.config |2 +- local-tasks/build-site.js | 53 +- ...date-version-info.js => update-version-info.ts} | 25 +- log4net.build |2 +- log4net.shfbproj |2 +- package-lock.json | 1913 - package.json | 29 +- pom.xml|5 +- .../Appender/AdoNet/Log4NetCommand.cs | 232 +- .../Appender/AdoNet/Log4NetConnection.cs | 164 +- .../Appender/AdoNet/Log4NetParameter.cs| 148 +- .../Appender/AdoNet/Log4NetParameterCollection.cs | 62 +-
(logging-parent) branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.9.0.202403050737-r updated (4bb8fbc -> 6747121)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.9.0.202403050737-r
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
discard 4bb8fbc Bump org.eclipse.jgit:org.eclipse.jgit
add 6747121 Update `org.eclipse.jgit:org.eclipse.jgit` to version
`6.9.0.202403050737-r` (#130)
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 (4bb8fbc)
\
N -- N -- N
refs/heads/dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.9.0.202403050737-r
(6747121)
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:
...ns_setup_java.xml => update_org_eclipse_jgit_org_eclipse_jgit.xml} | 4 ++--
src/site/_release-notes/_10.x.x.adoc | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
copy src/changelog/.10.x.x/{update_actions_setup_java.xml =>
update_org_eclipse_jgit_org_eclipse_jgit.xml} (60%)
(logging-parent) branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.9.0.202403050737-r deleted (was 6747121)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.9.0.202403050737-r in repository https://gitbox.apache.org/repos/asf/logging-parent.git was 6747121 Update `org.eclipse.jgit:org.eclipse.jgit` to version `6.9.0.202403050737-r` (#130) 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 (9f437bc -> 6747121)
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 9f437bc Mention `-DskipTests` in the review kit
add 6747121 Update `org.eclipse.jgit:org.eclipse.jgit` to version
`6.9.0.202403050737-r` (#130)
No new revisions were added by this update.
Summary of changes:
pom.xml | 2 +-
...ns_setup_java.xml => update_org_eclipse_jgit_org_eclipse_jgit.xml} | 4 ++--
src/site/_release-notes/_10.x.x.adoc | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
copy src/changelog/.10.x.x/{update_actions_setup_java.xml =>
update_org_eclipse_jgit_org_eclipse_jgit.xml} (60%)
(logging-log4j2) branch dependabot/maven/2.x/org.apache.commons-commons-compress-1.26.1 created (now 7a0219a773)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/org.apache.commons-commons-compress-1.26.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 7a0219a773 Bump org.apache.commons:commons-compress from 1.26.0 to 1.26.1 No new revisions were added by this update.
(logging-log4j2) branch dependabot/maven/2.x/com.fasterxml.jackson-jackson-bom-2.16.2 created (now 6b2ed0c2b5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/com.fasterxml.jackson-jackson-bom-2.16.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 6b2ed0c2b5 Bump com.fasterxml.jackson:jackson-bom from 2.16.1 to 2.16.2 No new revisions were added by this update.
(logging-log4net) branch master updated: :wrench: remove trailing reference to slack-webhook-say
This is an automated email from the ASF dual-hosted git repository. davydm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4net.git The following commit(s) were added to refs/heads/master by this push: new 47f08865 :wrench: remove trailing reference to slack-webhook-say 47f08865 is described below commit 47f088652b659942704704f5062cada43664d6ee Author: Davyd McColl AuthorDate: Mon Mar 11 12:34:50 2024 +0200 :wrench: remove trailing reference to slack-webhook-say --- .github/workflows/git-broadcast.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/git-broadcast.yml b/.github/workflows/git-broadcast.yml index 23b3bcb4..5efe4b3a 100644 --- a/.github/workflows/git-broadcast.yml +++ b/.github/workflows/git-broadcast.yml @@ -23,4 +23,4 @@ jobs: run: | git config --global user.name "Git Broadcast" git config --global user.email "git-broadc...@no-reply.com" -npx git-broadcast@latest --from master --push --pretty --suppress-log-prefixes --prefix-logs-with $GITHUB_REPOSITORY | npx slack-webhook-say --echo +npx git-broadcast@latest --from master --push --pretty --suppress-log-prefixes --prefix-logs-with $GITHUB_REPOSITORY
(logging-log4j2) branch dependabot/maven/main/com.fasterxml.jackson-jackson-bom-2.16.2 created (now 7c7e33ffb9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/com.fasterxml.jackson-jackson-bom-2.16.2 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 7c7e33ffb9 Bump com.fasterxml.jackson:jackson-bom from 2.16.1 to 2.16.2 No new revisions were added by this update.
(logging-log4j2) branch dependabot/maven/main/org.apache.commons-commons-compress-1.26.1 created (now d932669057)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/main/org.apache.commons-commons-compress-1.26.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at d932669057 Bump org.apache.commons:commons-compress from 1.26.0 to 1.26.1 No new revisions were added by this update.
(logging-parent) branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.9.0.202403050737-r created (now 4bb8fbc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.9.0.202403050737-r in repository https://gitbox.apache.org/repos/asf/logging-parent.git at 4bb8fbc Bump org.eclipse.jgit:org.eclipse.jgit No new revisions were added by this update.
(logging-log4net) branch master updated: :wrench: enable automatic broadcast of changes in master to outstanding satellite branches
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
The following commit(s) were added to refs/heads/master by this push:
new a649e8f3 :wrench: enable automatic broadcast of changes in master to
outstanding satellite branches
a649e8f3 is described below
commit a649e8f3679e931205e3033c2a74900c7d163f51
Author: Davyd McColl
AuthorDate: Mon Mar 11 12:00:26 2024 +0200
:wrench: enable automatic broadcast of changes in master to outstanding
satellite branches
---
.github/workflows/git-broadcast.yml | 26 ++
src/log4net.sln | 8
2 files changed, 34 insertions(+)
diff --git a/.github/workflows/git-broadcast.yml
b/.github/workflows/git-broadcast.yml
new file mode 100644
index ..23b3bcb4
--- /dev/null
+++ b/.github/workflows/git-broadcast.yml
@@ -0,0 +1,26 @@
+name: Broadcast master updates to satellites
+
+on:
+ push:
+branches: [ master ]
+ pull_request:
+branches: [ master ]
+
+concurrency:
+ group: git-broadcast
+
+jobs:
+ main:
+runs-on: ubuntu-latest
+steps:
+- uses: actions/checkout@v2
+- uses: actions/setup-node@v2-beta
+ with:
+node-version: '16'
+- name: broadcast master changes to satellite branches
+ env:
+RUN_NUMBER: ${{ github.run_number }}
+ run: |
+git config --global user.name "Git Broadcast"
+git config --global user.email "git-broadc...@no-reply.com"
+npx git-broadcast@latest --from master --push --pretty
--suppress-log-prefixes --prefix-logs-with $GITHUB_REPOSITORY | npx
slack-webhook-say --echo
diff --git a/src/log4net.sln b/src/log4net.sln
index 7e7716ab..c1093610 100644
--- a/src/log4net.sln
+++ b/src/log4net.sln
@@ -45,6 +45,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") =
".config", ".config", "{78CD
..\pom.xml = ..\pom.xml
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github",
"{3EE6A25B-2DF9-4825-A784-EE32EEA0BE58}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows",
"{92B16708-35B8-4E60-AF44-CF6D797FB63B}"
+ ProjectSection(SolutionItems) = preProject
+ ..\.github\workflows\git-broadcast.yml =
..\.github\workflows\git-broadcast.yml
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -89,5 +96,6 @@ Global
{D818035F-0345-49EF-9AB9-021583986CE2} =
{8953473C-EEE8-4740-993D-B8E10FA876CD}
{169118A6-CAC3-4E83-ABEE-9E884B75B294} =
{8953473C-EEE8-4740-993D-B8E10FA876CD}
{A4F9E417-2250-4075-9118-B4FF1C58B6C5} =
{8953473C-EEE8-4740-993D-B8E10FA876CD}
+ {92B16708-35B8-4E60-AF44-CF6D797FB63B} =
{3EE6A25B-2DF9-4825-A784-EE32EEA0BE58}
EndGlobalSection
EndGlobal
(logging-log4j2) branch ms12_restructure_website_2x updated: converted async
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch ms12_restructure_website_2x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/ms12_restructure_website_2x by this push: new 87aab22603 converted async 87aab22603 is described below commit 87aab226038d283e0b7303a004220eb15034ed3b Author: Christian Grobmeier AuthorDate: Mon Mar 11 10:50:39 2024 +0100 converted async --- src/site/asciidoc/manual/async.adoc | 732 + src/site/xdoc/manual/async.xml | 1002 --- 2 files changed, 732 insertions(+), 1002 deletions(-) diff --git a/src/site/asciidoc/manual/async.adoc b/src/site/asciidoc/manual/async.adoc new file mode 100644 index 00..679ff85e12 --- /dev/null +++ b/src/site/asciidoc/manual/async.adoc @@ -0,0 +1,732 @@ + +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. + += Lock-free Asynchronous Loggers for Low-Latency Logging +Remko Popma + +Asynchronous logging can improve your application's performance by +executing the I/O operations in a separate thread. Log4j 2 makes a +number of improvements in this area. + +* *Asynchronous Loggers* are a new addition in Log4j 2. Their aim is to +return from the call to Logger.log to the application as soon as +possible. You can choose between making all Loggers asynchronous or +using a mixture of synchronous and asynchronous Loggers. Making all +Loggers asynchronous will give the best performance, while mixing gives +you more flexibility. +* *LMAX Disruptor technology*. Asynchronous Loggers internally use the +link:#UnderTheHood[Disruptor], a lock-free inter-thread communication +library, instead of queues, resulting in higher throughput and lower +latency. +* As part of the work for Async Loggers, *Asynchronous Appenders* have +been enhanced to flush to disk at the end of a batch (when the queue is +empty). This produces the same result as configuring +"immediateFlush=true", that is, all received log events are always +available on disk, but is more efficient because it does not need to +touch the disk on each and every log event. (Async Appenders use +ArrayBlockingQueue internally and do not need the disruptor jar on the +classpath.) + +[#Trade-offs] +== Trade-offs + +Although asynchronous logging can give significant performance benefits, +there are situations where you may want to choose synchronous logging. +This section describes some of the trade-offs of asynchronous logging. + +=== Benefits + +* Higher peak link:#Performance[throughput]. With an asynchronous logger +your application can log messages at 6 - 68 times the rate of a +synchronous logger. ++ +This is especially interesting for applications that occasionally need +to log bursts of messages. Async logging can help prevent or dampen +latency spikes by shortening the wait time until the next message can be +logged. If the queue size is configured large enough to handle the +burst, asynchronous logging will help prevent your application from +falling behind (as much) during a sudden increase of activity. +* Lower logging response time link:#Latency[latency]. Response time +latency is the time it takes for a call to Logger.log to return under a +given workload. Asynchronous Loggers have consistently lower latency +than synchronous loggers or even queue-based asynchronous appenders. + +=== Drawbacks + +* Error handling. If a problem happens during the logging process and an +exception is thrown, it is less easy for an asynchronous logger or +appender to signal this problem to the application. This can partly be +alleviated by configuring an `ExceptionHandler`, but this may still not +cover all cases. For this reason, if logging is part of your business +logic, for example if you are using Log4j as an audit logging framework, +we would recommend to synchronously log those audit messages. (Note that +you can still link:#MixedSync-Async[combine] them and use asynchronous +logging for debug/trace logging in addition to synchronous logging for +the audit trail.) +* In some rare cases, care must be taken with mutable messages. Most of +the time you
(logging-log4j2) branch ms12_restructure_website_2x updated: migrated architecture to asciidoc
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch ms12_restructure_website_2x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/ms12_restructure_website_2x by this push: new 874418dbe1 migrated architecture to asciidoc 874418dbe1 is described below commit 874418dbe1b1f67466b0b15d6f9adc611782a3c6 Author: Christian Grobmeier AuthorDate: Mon Mar 11 10:35:53 2024 +0100 migrated architecture to asciidoc --- src/site/asciidoc/manual/architecture.adoc | 481 +++ src/site/xdoc/manual/architecture.xml | 741 - 2 files changed, 481 insertions(+), 741 deletions(-) diff --git a/src/site/asciidoc/manual/architecture.adoc b/src/site/asciidoc/manual/architecture.adoc new file mode 100644 index 00..e6ab20f2f3 --- /dev/null +++ b/src/site/asciidoc/manual/architecture.adoc @@ -0,0 +1,481 @@ + +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. + += Architecture +Ralph Goers + +== Main Components + +Log4j uses the classes shown in the diagram below. + +image:../images/Log4jClasses.jpg[Log4j 2 Class Relationships,title="Log4j 2 Class Relationships"] + +Applications using the Log4j 2 API will request a Logger with a specific +name from the LogManager. The LogManager will locate the appropriate +LoggerContext and then obtain the Logger from it. If the Logger must be +created it will be associated with the LoggerConfig that contains either +a) the same name as the Logger, b) the name of a parent package, or c) +the root LoggerConfig. LoggerConfig objects are created from Logger +declarations in the configuration. The LoggerConfig is associated with +the Appenders that actually deliver the LogEvents. + +=== Logger Hierarchy + +The first and foremost advantage of any logging API over plain +`System.out.println` resides in its ability to disable certain log +statements while allowing others to print unhindered. This capability +assumes that the logging space, that is, the space of all possible +logging statements, is categorized according to some developer-chosen +criteria. + +In Log4j 1.x the Logger Hierarchy was maintained through a relationship +between Loggers. In Log4j 2 this relationship no longer exists. Instead, +the hierarchy is maintained in the relationship between LoggerConfig +objects. + +Loggers and LoggerConfigs are named entities. Logger names are +case-sensitive and they follow the hierarchical naming rule: + +Named Hierarchy:: +A LoggerConfig is said to be an _ancestor_ of another LoggerConfig if +its name followed by a dot is a prefix of the _descendant_ logger +name. A LoggerConfig is said to be a _parent_ of a _child_ +LoggerConfig if there are no ancestors between itself and the +descendant LoggerConfig. + +For example, the LoggerConfig named `"com.foo"` is a parent of the +LoggerConfig named `"com.foo.Bar"`. Similarly, `"java"` is a parent of +`"java.util"` and an ancestor of `"java.util.Vector"`. This naming +scheme should be familiar to most developers. + +The root LoggerConfig resides at the top of the LoggerConfig hierarchy. +It is exceptional in that it always exists and it is part of every +hierarchy. A Logger that is directly linked to the root LoggerConfig can +be obtained as follows: + +[source,java] + +Logger logger = LogManager.getLogger(LogManager.ROOT_LOGGER_NAME); + + +Alternatively, and more simply: + +[source,java] + +Logger logger = LogManager.getRootLogger(); + + +All other Loggers can be retrieved using the +link:../log4j-api/apidocs/org/apache/logging/log4j/LogManager.html#getLogger(java.lang.String)[`LogManager.getLogger`] +static method by passing the name of the desired Logger. Further +information on the Logging API can be found in the +link:../log4j-api/api.html[Log4j 2 API]. + +=== LoggerContext + +The +link:../log4j-core/apidocs/org/apache/logging/log4j/core/LoggerContext.html[`LoggerContext`] +acts as the anchor point for the Logging system. However, it is possible +to have multiple active LoggerContexts in an application depending on +the circumstances. More details on the LoggerContext are in the
(logging-log4j-tools) branch main updated: Derive FQCN of a `{@link` using `ImportTree`
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-log4j-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 4780647 Derive FQCN of a `{@link` using `ImportTree`
4780647 is described below
commit 47806471625ffee75061baf3753ff5a378010cd8
Author: Volkan Yazıcı
AuthorDate: Mon Mar 11 10:17:58 2024 +0100
Derive FQCN of a `{@link` using `ImportTree`
---
.../processor/AbstractAsciiDocTreeVisitor.java | 14 +++--
.../log4j/docgen/processor/AsciiDocConverter.java | 17 +++---
.../log4j/docgen/processor/AsciiDocData.java | 14 +++--
.../docgen/processor/DescriptorGenerator.java | 43 -
.../log4j/docgen/processor/ElementImports.java | 71 ++
.../docgen/processor/ElementImportsFactory.java} | 29 +++--
.../docgen/processor/AsciiDocConverterTest.java| 4 +-
.../AsciiDocConverterTest/JavadocExample.adoc | 2 +-
.../AsciiDocConverterTest/JavadocExample.java | 5 +-
.../DescriptorGeneratorTest/expected-plugins.xml | 2 +-
.../java-of-log4j2/MyEnum.java | 3 +-
.../java-of-log4j3/MyEnum.java | 3 +-
12 files changed, 145 insertions(+), 62 deletions(-)
diff --git
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/AbstractAsciiDocTreeVisitor.java
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/AbstractAsciiDocTreeVisitor.java
index a6434ff..843e95e 100644
---
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/AbstractAsciiDocTreeVisitor.java
+++
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/AbstractAsciiDocTreeVisitor.java
@@ -23,6 +23,7 @@ import com.sun.source.doctree.EndElementTree;
import com.sun.source.doctree.EntityTree;
import com.sun.source.doctree.LinkTree;
import com.sun.source.doctree.LiteralTree;
+import com.sun.source.doctree.ReferenceTree;
import com.sun.source.doctree.StartElementTree;
import com.sun.source.doctree.TextTree;
import com.sun.source.util.SimpleDocTreeVisitor;
@@ -45,6 +46,7 @@ import org.asciidoctor.ast.Row;
import org.asciidoctor.ast.Section;
import org.asciidoctor.ast.StructuralNode;
import org.asciidoctor.ast.Table;
+import org.jspecify.annotations.Nullable;
abstract class AbstractAsciiDocTreeVisitor extends SimpleDocTreeVisitor {
@@ -117,12 +119,8 @@ abstract class AbstractAsciiDocTreeVisitor extends
SimpleDocTreeVisitor paragraphs = new ArrayDeque<>();
private final Deque lines = new ArrayDeque<>();
-public AsciiDocData() {
-document = new DocumentImpl();
-currentSectionLevel = 1;
-currentNode = document;
-paragraphs.push(new BlockImpl(currentNode));
-lines.push(new StringBuilder());
+public AsciiDocData(final ElementImports imports) {
+this.imports = imports;
+this.document = new DocumentImpl();
+this.currentSectionLevel = 1;
+this.currentNode = document;
+this.paragraphs.push(new BlockImpl(currentNode));
+this.lines.push(new StringBuilder());
}
public void newLine() {
diff --git
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/DescriptorGenerator.java
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/DescriptorGenerator.java
index ba41dd2..44dfbfb 100644
---
a/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/DescriptorGenerator.java
+++
b/log4j-docgen/src/main/java/org/apache/logging/log4j/docgen/processor/DescriptorGenerator.java
@@ -25,6 +25,7 @@ import com.sun.source.doctree.DocTree;
import com.sun.source.doctree.ParamTree;
import com.sun.source.util.DocTrees;
import com.sun.source.util.SimpleDocTreeVisitor;
+import com.sun.source.util.Trees;
import java.io.IOException;
import java.io.Writer;
import java.nio.file.Files;
@@ -139,6 +140,8 @@ public class DescriptorGenerator extends AbstractProcessor {
private Types types;
+private ElementImportsFactory importsFactory;
+
private AsciiDocConverter converter;
private Annotations annotations;
@@ -158,6 +161,8 @@ public class DescriptorGenerator extends AbstractProcessor {
elements = processingEnv.getElementUtils();
messager = processingEnv.getMessager();
types = processingEnv.getTypeUtils();
+final Trees trees = Trees.instance(processingEnv);
+importsFactory = ElementImports.factory(trees);
converter = new AsciiDocConverter(docTrees);
annotations = new Annotations(elements, types);
collectionType = getDeclaredType(processingEnv,
"java.util.Collection");
@@ -286,7 +291,7 @@ public class DescriptorGenerator extends AbstractProcessor {
// Class name
docgenType.setClassName(element.getQualifiedName().toString());
// Description
-
(logging-log4j-kotlin) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 updated (e46b1ac -> 3a6f057)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git discard e46b1ac Bump org.apache.logging.log4j:log4j-bom from 2.23.0 to 2.23.1 add 3a6f057 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#70) 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 (e46b1ac) \ N -- N -- N refs/heads/dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 (3a6f057) 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_org_apache_logging_log4j_log4j_bom.xml | 4 ++-- src/site/_release-notes/_1.x.x.adoc| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
(logging-log4j-kotlin) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 deleted (was 3a6f057)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git was 3a6f057 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#70) 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-kotlin) branch main updated (a6a8185 -> 3a6f057)
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-log4j-kotlin.git from a6a8185 Update `org.codehaus.mojo:exec-maven-plugin` to version `3.2.0` (#69) add 3a6f057 Update `org.apache.logging.log4j:log4j-bom` to version `2.23.1` (#70) No new revisions were added by this update. Summary of changes: pom.xml| 2 +- src/changelog/.1.x.x/update_org_apache_logging_log4j_log4j_bom.xml | 4 ++-- src/site/_release-notes/_1.x.x.adoc| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
(logging-log4j-kotlin) branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 created (now e46b1ac)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-bom-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git at e46b1ac Bump org.apache.logging.log4j:log4j-bom from 2.23.0 to 2.23.1 No new revisions were added by this update.
(logging-log4j-tools) branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 deleted (was e06237c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git was e06237c Update `org.apache.logging.log4j:log4j-core` to version `2.23.1` (#108) 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-tools) branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 updated (66533ea -> e06237c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git discard 66533ea Bump org.apache.logging.log4j:log4j-core from 2.23.0 to 2.23.1 add e06237c Update `org.apache.logging.log4j:log4j-core` to version `2.23.1` (#108) 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 (66533ea) \ N -- N -- N refs/heads/dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 (e06237c) 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: .../.1.x.x/update_org_apache_logging_log4j_log4j_core.xml | 8 src/site/_release-notes/_1.x.x.adoc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
(logging-log4j-tools) branch main updated (1c3a5a2 -> e06237c)
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-log4j-tools.git from 1c3a5a2 Shorten test resource paths to avoid Windows failures add e06237c Update `org.apache.logging.log4j:log4j-core` to version `2.23.1` (#108) No new revisions were added by this update. Summary of changes: log4j-docgen/pom.xml | 2 +- .../.1.x.x/update_org_apache_logging_log4j_log4j_core.xml | 8 src/site/_release-notes/_1.x.x.adoc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
(logging-log4j-tools) branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 created (now 66533ea)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging.log4j-log4j-core-2.23.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git at 66533ea Bump org.apache.logging.log4j:log4j-core from 2.23.0 to 2.23.1 No new revisions were added by this update.
