You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/09/29 10:52:43 UTC
[logging-log4j-tools] branch main updated (878f0d8 -> 485d73c)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
from 878f0d8 Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.0`
add 8ad2848 Bump commons-io:commons-io from 2.11.0 to 2.13.0
new c4c2536 Made `author` element optional and bumped the XML schema version to `0.1.2` (#81)
new fc2f6b7 Minor documentation fixes
new 2085509 Limit `on.push` in CI to `main` and `release/*` branches to avoid duplicate runs
new ca3faa2 Improve the docs on `author`
new a3ef6ff Add missing changelog issue (#81)
new 1018522 Make `log4j-changelog-maven-plugin` thread-safe (#80)
new 7b42573 Update `org.apache.logging:logging-parent` to version `10.1.0` (#82)
new 64b9f26 Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.0`
new 485d73c Merge remote-tracking branch 'origin/main'
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
log4j-tools-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[logging-log4j-tools] 05/09: Add missing changelog issue (#81)
Posted by vy...@apache.org.
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
commit a3ef6ff58d91dafdf3975b5466c7f35633fc03d9
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 10:57:19 2023 +0200
Add missing changelog issue (#81)
---
src/changelog/.0.x.x/make-author-optional.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/changelog/.0.x.x/make-author-optional.xml b/src/changelog/.0.x.x/make-author-optional.xml
index e6d3f47..e664fb5 100644
--- a/src/changelog/.0.x.x/make-author-optional.xml
+++ b/src/changelog/.0.x.x/make-author-optional.xml
@@ -19,6 +19,7 @@
xmlns="http://logging.apache.org/log4j/changelog"
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
+ <issue id="81" link="https://github.com/apache/logging-log4j-tools/issues/81"/>
<author id="github:vy"/>
<description format="asciidoc">Made `author` element optional and bumped the XML schema version to `0.1.2`</description>
</entry>
[logging-log4j-tools] 01/09: Made `author` element optional and bumped the XML schema version to `0.1.2` (#81)
Posted by vy...@apache.org.
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
commit c4c25362035911aaac5c7cd105f83e6b940be58c
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Sep 28 16:19:28 2023 +0200
Made `author` element optional and bumped the XML schema version to `0.1.2` (#81)
---
.../logging/log4j/changelog/ChangelogEntry.java | 3 ---
.../logging/log4j/changelog/util/XmlUtils.java | 2 +-
.../src/main/resources/log4j-changelog.xsd | 4 ++--
...Add_getExplicitLevel_method_to_LoggerConfig.xml | 2 +-
...ConsoleListener_use_SimpleLogger_internally.xml | 2 +-
..._InstantFormatter_against_delegate_failures.xml | 2 +-
.../test/resources/2-imported/2.17.2/.release.xml | 2 +-
...s_initialized_if_the_LoggerFactory_is_provi.xml | 2 +-
...ContextDataInjector_initialization_deadlock.xml | 2 +-
..._Spring_Boot_Lookup_requires_the_log4j_spri.xml | 2 +-
.../test/resources/2-imported/2.18.0/.release.xml | 2 +-
...erStrategy_should_use_the_current_time_when.xml | 2 +-
...lloverStrategy_was_not_detecting_the_correc.xml | 2 +-
...se_Paths_get_to_avoid_circular_file_systems.xml | 2 +-
...Add_getExplicitLevel_method_to_LoggerConfig.xml | 2 +-
...ConsoleListener_use_SimpleLogger_internally.xml | 2 +-
..._InstantFormatter_against_delegate_failures.xml | 2 +-
.../.3.x.x/1220_Simplify_site_generation.xml | 2 +-
.../1221_switch_from_jira_to_github_issues.xml | 2 +-
...notation_to_support_plugin_ordering_when_tw.xml | 3 +--
.../test/resources/3-enriched/.changelog.adoc.ftl | 24 +---------------------
.../test/resources/3-enriched/2.17.2/.release.xml | 2 +-
...s_initialized_if_the_LoggerFactory_is_provi.xml | 2 +-
...ContextDataInjector_initialization_deadlock.xml | 2 +-
..._Spring_Boot_Lookup_requires_the_log4j_spri.xml | 2 +-
.../test/resources/3-enriched/2.18.0/.release.xml | 2 +-
...erStrategy_should_use_the_current_time_when.xml | 2 +-
...lloverStrategy_was_not_detecting_the_correc.xml | 2 +-
...se_Paths_get_to_avoid_circular_file_systems.xml | 2 +-
.../src/test/resources/4-exported/2.17.2.adoc | 6 +++---
.../src/test/resources/4-exported/2.18.0.adoc | 6 +++---
.../src/test/resources/4-exported/2.x.x.adoc | 6 +++---
.../src/test/resources/4-exported/3.x.x.adoc | 6 +++---
.../.3.x.x/1220_Simplify_site_generation.xml | 2 +-
.../1221_switch_from_jira_to_github_issues.xml | 2 +-
...notation_to_support_plugin_ordering_when_tw.xml | 3 +--
.../test/resources/5-released/.changelog.adoc.ftl | 24 +---------------------
.../test/resources/5-released/2.17.2/.release.xml | 2 +-
...s_initialized_if_the_LoggerFactory_is_provi.xml | 2 +-
...ContextDataInjector_initialization_deadlock.xml | 2 +-
..._Spring_Boot_Lookup_requires_the_log4j_spri.xml | 2 +-
.../test/resources/5-released/2.18.0/.release.xml | 2 +-
...erStrategy_should_use_the_current_time_when.xml | 2 +-
...lloverStrategy_was_not_detecting_the_correc.xml | 2 +-
...se_Paths_get_to_avoid_circular_file_systems.xml | 2 +-
.../test/resources/5-released/2.19.0/.release.xml | 2 +-
...Add_getExplicitLevel_method_to_LoggerConfig.xml | 2 +-
...ConsoleListener_use_SimpleLogger_internally.xml | 2 +-
..._InstantFormatter_against_delegate_failures.xml | 2 +-
.../LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml | 2 +-
.../.3.x.x/1220_Simplify_site_generation.xml | 2 +-
.../1221_switch_from_jira_to_github_issues.xml | 2 +-
...notation_to_support_plugin_ordering_when_tw.xml | 3 +--
.../resources/6-enriched-again/.changelog.adoc.ftl | 24 +---------------------
.../resources/6-enriched-again/2.17.2/.release.xml | 2 +-
...s_initialized_if_the_LoggerFactory_is_provi.xml | 2 +-
...ContextDataInjector_initialization_deadlock.xml | 2 +-
..._Spring_Boot_Lookup_requires_the_log4j_spri.xml | 2 +-
.../resources/6-enriched-again/2.18.0/.release.xml | 2 +-
...erStrategy_should_use_the_current_time_when.xml | 2 +-
...lloverStrategy_was_not_detecting_the_correc.xml | 2 +-
...se_Paths_get_to_avoid_circular_file_systems.xml | 2 +-
.../resources/6-enriched-again/2.19.0/.release.xml | 2 +-
...Add_getExplicitLevel_method_to_LoggerConfig.xml | 2 +-
...ConsoleListener_use_SimpleLogger_internally.xml | 2 +-
..._InstantFormatter_against_delegate_failures.xml | 2 +-
.../.3.x.x/1220_Simplify_site_generation.xml | 2 +-
.../1221_switch_from_jira_to_github_issues.xml | 2 +-
...notation_to_support_plugin_ordering_when_tw.xml | 3 +--
.../resources/7-released-again/.changelog.adoc.ftl | 24 +---------------------
.../resources/7-released-again/2.17.2/.release.xml | 2 +-
...s_initialized_if_the_LoggerFactory_is_provi.xml | 2 +-
...ContextDataInjector_initialization_deadlock.xml | 2 +-
..._Spring_Boot_Lookup_requires_the_log4j_spri.xml | 2 +-
.../resources/7-released-again/2.18.0/.release.xml | 2 +-
...erStrategy_should_use_the_current_time_when.xml | 2 +-
...lloverStrategy_was_not_detecting_the_correc.xml | 2 +-
...se_Paths_get_to_avoid_circular_file_systems.xml | 2 +-
.../resources/7-released-again/2.19.0/.release.xml | 2 +-
...Add_getExplicitLevel_method_to_LoggerConfig.xml | 2 +-
...ConsoleListener_use_SimpleLogger_internally.xml | 2 +-
..._InstantFormatter_against_delegate_failures.xml | 2 +-
.../LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml | 2 +-
src/changelog/.0.x.x/add-website.xml | 18 +++++++++++++++-
...g_schema_0_1_1.xml => make-author-optional.xml} | 4 ++--
src/changelog/.index.adoc.ftl | 2 +-
src/changelog/0.1.0/.release.xml | 2 +-
...J2-3628_add_tools_bom_and_changelog_modules.xml | 2 +-
src/changelog/0.2.0/.release.xml | 2 +-
src/changelog/0.2.0/13_add_changelog_xsd.xml | 2 +-
.../0.2.0/14_remove_changelog_security_type.xml | 2 +-
.../0.2.0/17_fix_unreleased_directory_order.xml | 2 +-
src/changelog/0.2.0/19_fix_Windows_compat.xml | 2 +-
.../0.2.0/20_add_changelog_maven_plugin.xml | 2 +-
...20_rename_exporter_outputDirectory_property.xml | 2 +-
src/changelog/0.3.0/.release.xml | 2 +-
src/changelog/0.3.0/37_add_changelogEntryCount.xml | 2 +-
.../0.3.0/44_make_changelog_format_agnostic.xml | 2 +-
src/changelog/0.3.0/java_17.xml | 2 +-
src/changelog/0.4.0/.release.xml | 2 +-
.../0.4.0/63_add_versionPattern_to_ReleaseMojo.xml | 2 +-
.../0.4.0/change_ExportMojo_outputDirectory.xml | 2 +-
src/changelog/0.4.0/changelog_migration.xml | 2 +-
src/changelog/0.4.0/fix_repetitive_release.xml | 2 +-
src/site/_log4j-changelog.adoc | 4 ++--
src/site/_release-notes/_0.x.x.adoc | 2 +-
106 files changed, 132 insertions(+), 211 deletions(-)
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
index b44be12..b5ef3fa 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/ChangelogEntry.java
@@ -187,9 +187,6 @@ public final class ChangelogEntry {
return new Author(authorId, authorName);
})
.collect(Collectors.toList());
- if (authors.isEmpty()) {
- throw XmlReader.failureAtXmlNode(entryElement, "no `author` elements found");
- }
// Read the `description` element
final Element descriptionElement = XmlReader.requireChildElementMatchingName(entryElement, "description");
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlUtils.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlUtils.java
index a6d56bc..34c1ee2 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlUtils.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/XmlUtils.java
@@ -29,7 +29,7 @@ final class XmlUtils {
static final String XML_NAMESPACE = "http://logging.apache.org/log4j/changelog";
- static final String XML_SCHEMA_LOCATION = "https://logging.apache.org/log4j/changelog-0.1.1.xsd";
+ static final String XML_SCHEMA_LOCATION = "https://logging.apache.org/log4j/changelog-0.1.2.xsd";
private XmlUtils() {}
diff --git a/log4j-changelog/src/main/resources/log4j-changelog.xsd b/log4j-changelog/src/main/resources/log4j-changelog.xsd
index 40ce80d..0a44055 100644
--- a/log4j-changelog/src/main/resources/log4j-changelog.xsd
+++ b/log4j-changelog/src/main/resources/log4j-changelog.xsd
@@ -19,7 +19,7 @@
targetNamespace="http://logging.apache.org/log4j/changelog"
xmlns:cl="http://logging.apache.org/log4j/changelog"
elementFormDefault="qualified"
- version="0.1.1">
+ version="0.1.2">
<element name="release">
<complexType>
@@ -36,7 +36,7 @@
<complexType>
<sequence>
<element name="issue" type="cl:issueType" minOccurs="0" maxOccurs="unbounded"/>
- <element name="author" type="cl:authorType" maxOccurs="unbounded"/>
+ <element name="author" type="cl:authorType" minOccurs="0" maxOccurs="unbounded"/>
<element name="description" type="cl:descriptionType"/>
</sequence>
<attribute name="type" type="cl:changeType" use="required"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml b/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
index 6f09267..d3fef61 100644
--- a/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
+++ b/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="LOG4J2-3572" link="https://issues.apache.org/jira/browse/LOG4J2-3572"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml b/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
index bb4d892..9ba4738 100644
--- a/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
+++ b/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3584" link="https://issues.apache.org/jira/browse/LOG4J2-3584"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml b/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
index 95821b4..eb1709c 100644
--- a/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
+++ b/log4j-changelog/src/test/resources/2-imported/.2.x.x/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3614" link="https://issues.apache.org/jira/browse/LOG4J2-3614"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/2.17.2/.release.xml b/log4j-changelog/src/test/resources/2-imported/2.17.2/.release.xml
index c08038c..af809e2 100644
--- a/log4j-changelog/src/test/resources/2-imported/2.17.2/.release.xml
+++ b/log4j-changelog/src/test/resources/2-imported/2.17.2/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-02-23" version="2.17.2"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml b/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
index a975856..ee96f5d 100644
--- a/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
+++ b/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3304" link="https://issues.apache.org/jira/browse/LOG4J2-3304"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml b/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
index aeaf265..c29a5b3 100644
--- a/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
+++ b/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3333" link="https://issues.apache.org/jira/browse/LOG4J2-3333"/>
<author id="ckozak"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml b/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
index b8ace28..11f82e1 100644
--- a/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
+++ b/log4j-changelog/src/test/resources/2-imported/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3405" link="https://issues.apache.org/jira/browse/LOG4J2-3405"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/2.18.0/.release.xml b/log4j-changelog/src/test/resources/2-imported/2.18.0/.release.xml
index 21c277c..8644d44 100644
--- a/log4j-changelog/src/test/resources/2-imported/2.18.0/.release.xml
+++ b/log4j-changelog/src/test/resources/2-imported/2.18.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-06-28" version="2.18.0"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml b/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
index e606513..fc192ec 100644
--- a/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
+++ b/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3339" link="https://issues.apache.org/jira/browse/LOG4J2-3339"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml b/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
index 1c3d065..12ca1b4 100644
--- a/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
+++ b/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3490" link="https://issues.apache.org/jira/browse/LOG4J2-3490"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml b/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
index 2f7e830..3a12a61 100644
--- a/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
+++ b/log4j-changelog/src/test/resources/2-imported/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-3527" link="https://issues.apache.org/jira/browse/LOG4J2-3527"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml b/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
index 6f09267..d3fef61 100644
--- a/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="LOG4J2-3572" link="https://issues.apache.org/jira/browse/LOG4J2-3572"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml b/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
index bb4d892..9ba4738 100644
--- a/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3584" link="https://issues.apache.org/jira/browse/LOG4J2-3584"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml b/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
index 95821b4..eb1709c 100644
--- a/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/.2.x.x/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3614" link="https://issues.apache.org/jira/browse/LOG4J2-3614"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/.3.x.x/1220_Simplify_site_generation.xml b/log4j-changelog/src/test/resources/3-enriched/.3.x.x/1220_Simplify_site_generation.xml
index 517f632..a6a855c 100644
--- a/log4j-changelog/src/test/resources/3-enriched/.3.x.x/1220_Simplify_site_generation.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/.3.x.x/1220_Simplify_site_generation.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="1220" link="https://github.com/apache/logging-log4j2/pull/1220"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/.3.x.x/1221_switch_from_jira_to_github_issues.xml b/log4j-changelog/src/test/resources/3-enriched/.3.x.x/1221_switch_from_jira_to_github_issues.xml
index 3a6b086..eaf2619 100644
--- a/log4j-changelog/src/test/resources/3-enriched/.3.x.x/1221_switch_from_jira_to_github_issues.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/.3.x.x/1221_switch_from_jira_to_github_issues.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="1221" link="https://github.com/apache/logging-log4j2/pull/1221"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml b/log4j-changelog/src/test/resources/3-enriched/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
index 07de5c0..76876c1 100644
--- a/log4j-changelog/src/test/resources/3-enriched/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
@@ -17,10 +17,9 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-857" link="https://issues.apache.org/jira/browse/LOG4J2-857"/>
- <author id="mattsicker"/>
<description format="asciidoc">
Add `@Ordered` annotation to support plugin ordering when two or more plugins within the same category have the same case-insensitive name
</description>
diff --git a/log4j-changelog/src/test/resources/3-enriched/.changelog.adoc.ftl b/log4j-changelog/src/test/resources/3-enriched/.changelog.adoc.ftl
index 188eff4..5622786 100644
--- a/log4j-changelog/src/test/resources/3-enriched/.changelog.adoc.ftl
+++ b/log4j-changelog/src/test/resources/3-enriched/.changelog.adoc.ftl
@@ -20,29 +20,7 @@
=== ${entryType?capitalize}
<#list entries as entry>
-* ${entry.description.text?replace("\\s+", " ", "r")} (for <@compress single_line=true>
-<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list> by
-<#list entry.authors as author>
-<@compress single_line=true>
-<#if !author.id?has_content>${author.name}
-<#elseif author.id == "rgoers">Ralph Goers
-<#elseif author.id == "ggregory">Gary Gregory
-<#elseif author.id == "sdeboy">Scott Deboy
-<#elseif author.id == "rpopma">Remko Popma
-<#elseif author.id == "nickwilliams">Nick Williams
-<#elseif author.id == "mattsicker">Matt Sicker
-<#elseif author.id == "bbrouwer">Bruce Brouwer
-<#elseif author.id == "rgupta">Raman Gupta
-<#elseif author.id == "mikes">Mikael Ståldal
-<#elseif author.id == "ckozak">Carter Kozak
-<#elseif author.id == "vy">Volkan Yazıcı
-<#elseif author.id == "rgrabowski">Ron Grabowski
-<#elseif author.id == "pkarwasz">Piotr P. Karwasz
-<#else>`${author.id}`
-</#if>
-</...@compress><#if author?has_next>, </#if>
-</#list>
-</...@compress>)
+* ${entry.description.text?replace("\\s+", " ", "r")}<#if entry.issues?has_content> [<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>]</#if><#if entry.authors?has_content> (<#list entry.authors as author><#if author.id?has_content>@${author.id}<#else>${author.name}</#if><#if author?has_next>, </#if></#list>)</#if>
</#list>
</#list>
</#if>
diff --git a/log4j-changelog/src/test/resources/3-enriched/2.17.2/.release.xml b/log4j-changelog/src/test/resources/3-enriched/2.17.2/.release.xml
index c08038c..af809e2 100644
--- a/log4j-changelog/src/test/resources/3-enriched/2.17.2/.release.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/2.17.2/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-02-23" version="2.17.2"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml b/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
index a975856..ee96f5d 100644
--- a/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3304" link="https://issues.apache.org/jira/browse/LOG4J2-3304"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml b/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
index aeaf265..c29a5b3 100644
--- a/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3333" link="https://issues.apache.org/jira/browse/LOG4J2-3333"/>
<author id="ckozak"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml b/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
index b8ace28..11f82e1 100644
--- a/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3405" link="https://issues.apache.org/jira/browse/LOG4J2-3405"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/2.18.0/.release.xml b/log4j-changelog/src/test/resources/3-enriched/2.18.0/.release.xml
index 21c277c..8644d44 100644
--- a/log4j-changelog/src/test/resources/3-enriched/2.18.0/.release.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/2.18.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-06-28" version="2.18.0"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml b/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
index e606513..fc192ec 100644
--- a/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3339" link="https://issues.apache.org/jira/browse/LOG4J2-3339"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml b/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
index 1c3d065..12ca1b4 100644
--- a/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3490" link="https://issues.apache.org/jira/browse/LOG4J2-3490"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml b/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
index 2f7e830..3a12a61 100644
--- a/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
+++ b/log4j-changelog/src/test/resources/3-enriched/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-3527" link="https://issues.apache.org/jira/browse/LOG4J2-3527"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/4-exported/2.17.2.adoc b/log4j-changelog/src/test/resources/4-exported/2.17.2.adoc
index a9dcac6..95a7c2a 100644
--- a/log4j-changelog/src/test/resources/4-exported/2.17.2.adoc
+++ b/log4j-changelog/src/test/resources/4-exported/2.17.2.adoc
@@ -48,9 +48,9 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Removed
-* Fix `ThreadContextDataInjector` initialization deadlock (for https://issues.apache.org/jira/browse/LOG4J2-3333[LOG4J2-3333] by Carter Kozak)
-* Document that the Spring Boot Lookup requires the `log4j-spring-boot` dependency (for https://issues.apache.org/jira/browse/LOG4J2-3405[LOG4J2-3405] by Ralph Goers)
+* Fix `ThreadContextDataInjector` initialization deadlock [https://issues.apache.org/jira/browse/LOG4J2-3333[LOG4J2-3333]] (@ckozak)
+* Document that the Spring Boot Lookup requires the `log4j-spring-boot` dependency [https://issues.apache.org/jira/browse/LOG4J2-3405[LOG4J2-3405]] (@rgoers)
=== Fixed
-* Flag `LogManager` as initialized if the `LoggerFactory` is provided as a property (for https://issues.apache.org/jira/browse/LOG4J2-3304[LOG4J2-3304] by Ralph Goers, francis-FY)
+* Flag `LogManager` as initialized if the `LoggerFactory` is provided as a property [https://issues.apache.org/jira/browse/LOG4J2-3304[LOG4J2-3304]] (@rgoers, francis-FY)
diff --git a/log4j-changelog/src/test/resources/4-exported/2.18.0.adoc b/log4j-changelog/src/test/resources/4-exported/2.18.0.adoc
index b91a019..172261a 100644
--- a/log4j-changelog/src/test/resources/4-exported/2.18.0.adoc
+++ b/log4j-changelog/src/test/resources/4-exported/2.18.0.adoc
@@ -37,12 +37,12 @@ For complete information on Apache Log4j 2, including instructions on how to sub
=== Added
-* Don't use `Paths.get()` to avoid circular file systems (for https://issues.apache.org/jira/browse/LOG4J2-3527[LOG4J2-3527] by Ralph Goers)
+* Don't use `Paths.get()` to avoid circular file systems [https://issues.apache.org/jira/browse/LOG4J2-3527[LOG4J2-3527]] (@rgoers)
=== Removed
-* The `DirectWriteRolloverStrategy` was not detecting the correct index to use during startup (for https://issues.apache.org/jira/browse/LOG4J2-3490[LOG4J2-3490] by Ralph Goers)
+* The `DirectWriteRolloverStrategy` was not detecting the correct index to use during startup [https://issues.apache.org/jira/browse/LOG4J2-3490[LOG4J2-3490]] (@rgoers)
=== Fixed
-* `DirectWriteRolloverStrategy` should use the current time when creating files (for https://issues.apache.org/jira/browse/LOG4J2-3339[LOG4J2-3339] by Ralph Goers)
+* `DirectWriteRolloverStrategy` should use the current time when creating files [https://issues.apache.org/jira/browse/LOG4J2-3339[LOG4J2-3339]] (@rgoers)
diff --git a/log4j-changelog/src/test/resources/4-exported/2.x.x.adoc b/log4j-changelog/src/test/resources/4-exported/2.x.x.adoc
index 0f3cfd9..1835b17 100644
--- a/log4j-changelog/src/test/resources/4-exported/2.x.x.adoc
+++ b/log4j-changelog/src/test/resources/4-exported/2.x.x.adoc
@@ -23,9 +23,9 @@ Changes staged for the next 2.x.x version that is yet to be released.
=== Changed
-* Add `getExplicitLevel` method to `LoggerConfig` (for https://issues.apache.org/jira/browse/LOG4J2-3572[LOG4J2-3572] by Ralph Goers)
+* Add `getExplicitLevel` method to `LoggerConfig` [https://issues.apache.org/jira/browse/LOG4J2-3572[LOG4J2-3572]] (@rgoers)
=== Fixed
-* Make `StatusConsoleListener` use `SimpleLogger` internally (for https://issues.apache.org/jira/browse/LOG4J2-3584[LOG4J2-3584] by Volkan Yazıcı)
-* Harden `InstantFormatter` against delegate failures (for https://issues.apache.org/jira/browse/LOG4J2-3614[LOG4J2-3614] by Volkan Yazıcı, strainu)
+* Make `StatusConsoleListener` use `SimpleLogger` internally [https://issues.apache.org/jira/browse/LOG4J2-3584[LOG4J2-3584]] (@vy)
+* Harden `InstantFormatter` against delegate failures [https://issues.apache.org/jira/browse/LOG4J2-3614[LOG4J2-3614]] (@vy, strainu)
diff --git a/log4j-changelog/src/test/resources/4-exported/3.x.x.adoc b/log4j-changelog/src/test/resources/4-exported/3.x.x.adoc
index cb75630..0e890f3 100644
--- a/log4j-changelog/src/test/resources/4-exported/3.x.x.adoc
+++ b/log4j-changelog/src/test/resources/4-exported/3.x.x.adoc
@@ -23,9 +23,9 @@ Changes staged for the next 3.x.x version that is yet to be released.
=== Added
-* Add `@Ordered` annotation to support plugin ordering when two or more plugins within the same category have the same case-insensitive name (for https://issues.apache.org/jira/browse/LOG4J2-857[LOG4J2-857] by Matt Sicker)
+* Add `@Ordered` annotation to support plugin ordering when two or more plugins within the same category have the same case-insensitive name [https://issues.apache.org/jira/browse/LOG4J2-857[LOG4J2-857]]
=== Changed
-* Simplify Maven `site` phase and align it with the one in `release-2.x` branch (for https://github.com/apache/logging-log4j2/pull/1220[1220] by Volkan Yazıcı)
-* Switch the issue tracker from https://issues.apache.org/jira/browse/LOG4J2[JIRA] to https://github.com/apache/logging-log4j2/issues[GitHub Issues] (for https://github.com/apache/logging-log4j2/pull/1221[1221] by Volkan Yazıcı)
+* Simplify Maven `site` phase and align it with the one in `release-2.x` branch [https://github.com/apache/logging-log4j2/pull/1220[1220]] (@vy)
+* Switch the issue tracker from https://issues.apache.org/jira/browse/LOG4J2[JIRA] to https://github.com/apache/logging-log4j2/issues[GitHub Issues] [https://github.com/apache/logging-log4j2/pull/1221[1221]] (@vy)
diff --git a/log4j-changelog/src/test/resources/5-released/.3.x.x/1220_Simplify_site_generation.xml b/log4j-changelog/src/test/resources/5-released/.3.x.x/1220_Simplify_site_generation.xml
index 517f632..a6a855c 100644
--- a/log4j-changelog/src/test/resources/5-released/.3.x.x/1220_Simplify_site_generation.xml
+++ b/log4j-changelog/src/test/resources/5-released/.3.x.x/1220_Simplify_site_generation.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="1220" link="https://github.com/apache/logging-log4j2/pull/1220"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/5-released/.3.x.x/1221_switch_from_jira_to_github_issues.xml b/log4j-changelog/src/test/resources/5-released/.3.x.x/1221_switch_from_jira_to_github_issues.xml
index 3a6b086..eaf2619 100644
--- a/log4j-changelog/src/test/resources/5-released/.3.x.x/1221_switch_from_jira_to_github_issues.xml
+++ b/log4j-changelog/src/test/resources/5-released/.3.x.x/1221_switch_from_jira_to_github_issues.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="1221" link="https://github.com/apache/logging-log4j2/pull/1221"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/5-released/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml b/log4j-changelog/src/test/resources/5-released/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
index 07de5c0..76876c1 100644
--- a/log4j-changelog/src/test/resources/5-released/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
+++ b/log4j-changelog/src/test/resources/5-released/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
@@ -17,10 +17,9 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-857" link="https://issues.apache.org/jira/browse/LOG4J2-857"/>
- <author id="mattsicker"/>
<description format="asciidoc">
Add `@Ordered` annotation to support plugin ordering when two or more plugins within the same category have the same case-insensitive name
</description>
diff --git a/log4j-changelog/src/test/resources/5-released/.changelog.adoc.ftl b/log4j-changelog/src/test/resources/5-released/.changelog.adoc.ftl
index 188eff4..5622786 100644
--- a/log4j-changelog/src/test/resources/5-released/.changelog.adoc.ftl
+++ b/log4j-changelog/src/test/resources/5-released/.changelog.adoc.ftl
@@ -20,29 +20,7 @@
=== ${entryType?capitalize}
<#list entries as entry>
-* ${entry.description.text?replace("\\s+", " ", "r")} (for <@compress single_line=true>
-<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list> by
-<#list entry.authors as author>
-<@compress single_line=true>
-<#if !author.id?has_content>${author.name}
-<#elseif author.id == "rgoers">Ralph Goers
-<#elseif author.id == "ggregory">Gary Gregory
-<#elseif author.id == "sdeboy">Scott Deboy
-<#elseif author.id == "rpopma">Remko Popma
-<#elseif author.id == "nickwilliams">Nick Williams
-<#elseif author.id == "mattsicker">Matt Sicker
-<#elseif author.id == "bbrouwer">Bruce Brouwer
-<#elseif author.id == "rgupta">Raman Gupta
-<#elseif author.id == "mikes">Mikael Ståldal
-<#elseif author.id == "ckozak">Carter Kozak
-<#elseif author.id == "vy">Volkan Yazıcı
-<#elseif author.id == "rgrabowski">Ron Grabowski
-<#elseif author.id == "pkarwasz">Piotr P. Karwasz
-<#else>`${author.id}`
-</#if>
-</...@compress><#if author?has_next>, </#if>
-</#list>
-</...@compress>)
+* ${entry.description.text?replace("\\s+", " ", "r")}<#if entry.issues?has_content> [<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>]</#if><#if entry.authors?has_content> (<#list entry.authors as author><#if author.id?has_content>@${author.id}<#else>${author.name}</#if><#if author?has_next>, </#if></#list>)</#if>
</#list>
</#list>
</#if>
diff --git a/log4j-changelog/src/test/resources/5-released/2.17.2/.release.xml b/log4j-changelog/src/test/resources/5-released/2.17.2/.release.xml
index c08038c..af809e2 100644
--- a/log4j-changelog/src/test/resources/5-released/2.17.2/.release.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.17.2/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-02-23" version="2.17.2"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml b/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
index a975856..ee96f5d 100644
--- a/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3304" link="https://issues.apache.org/jira/browse/LOG4J2-3304"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml b/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
index aeaf265..c29a5b3 100644
--- a/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3333" link="https://issues.apache.org/jira/browse/LOG4J2-3333"/>
<author id="ckozak"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml b/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
index b8ace28..11f82e1 100644
--- a/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3405" link="https://issues.apache.org/jira/browse/LOG4J2-3405"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.18.0/.release.xml b/log4j-changelog/src/test/resources/5-released/2.18.0/.release.xml
index 21c277c..8644d44 100644
--- a/log4j-changelog/src/test/resources/5-released/2.18.0/.release.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.18.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-06-28" version="2.18.0"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml b/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
index e606513..fc192ec 100644
--- a/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3339" link="https://issues.apache.org/jira/browse/LOG4J2-3339"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml b/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
index 1c3d065..12ca1b4 100644
--- a/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3490" link="https://issues.apache.org/jira/browse/LOG4J2-3490"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml b/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
index 2f7e830..3a12a61 100644
--- a/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-3527" link="https://issues.apache.org/jira/browse/LOG4J2-3527"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.19.0/.release.xml b/log4j-changelog/src/test/resources/5-released/2.19.0/.release.xml
index 9fae4c6..fb6b2d4 100644
--- a/log4j-changelog/src/test/resources/5-released/2.19.0/.release.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.19.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2023-01-25" version="2.19.0"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml b/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
index 6f09267..d3fef61 100644
--- a/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="LOG4J2-3572" link="https://issues.apache.org/jira/browse/LOG4J2-3572"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml b/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
index bb4d892..9ba4738 100644
--- a/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3584" link="https://issues.apache.org/jira/browse/LOG4J2-3584"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml b/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
index 95821b4..eb1709c 100644
--- a/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
+++ b/log4j-changelog/src/test/resources/5-released/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3614" link="https://issues.apache.org/jira/browse/LOG4J2-3614"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.2.x.x/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml b/log4j-changelog/src/test/resources/6-enriched-again/.2.x.x/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
index 6a2cd42..ee79cb4 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/.2.x.x/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/.2.x.x/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3657" link="https://issues.apache.org/jira/browse/LOG4J2-3657"/>
<author name="Marat Kamalov"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1220_Simplify_site_generation.xml b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1220_Simplify_site_generation.xml
index 517f632..a6a855c 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1220_Simplify_site_generation.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1220_Simplify_site_generation.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="1220" link="https://github.com/apache/logging-log4j2/pull/1220"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1221_switch_from_jira_to_github_issues.xml b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1221_switch_from_jira_to_github_issues.xml
index 3a6b086..eaf2619 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1221_switch_from_jira_to_github_issues.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1221_switch_from_jira_to_github_issues.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="1221" link="https://github.com/apache/logging-log4j2/pull/1221"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
index 07de5c0..76876c1 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
@@ -17,10 +17,9 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-857" link="https://issues.apache.org/jira/browse/LOG4J2-857"/>
- <author id="mattsicker"/>
<description format="asciidoc">
Add `@Ordered` annotation to support plugin ordering when two or more plugins within the same category have the same case-insensitive name
</description>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.changelog.adoc.ftl b/log4j-changelog/src/test/resources/6-enriched-again/.changelog.adoc.ftl
index 188eff4..5622786 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/.changelog.adoc.ftl
+++ b/log4j-changelog/src/test/resources/6-enriched-again/.changelog.adoc.ftl
@@ -20,29 +20,7 @@
=== ${entryType?capitalize}
<#list entries as entry>
-* ${entry.description.text?replace("\\s+", " ", "r")} (for <@compress single_line=true>
-<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list> by
-<#list entry.authors as author>
-<@compress single_line=true>
-<#if !author.id?has_content>${author.name}
-<#elseif author.id == "rgoers">Ralph Goers
-<#elseif author.id == "ggregory">Gary Gregory
-<#elseif author.id == "sdeboy">Scott Deboy
-<#elseif author.id == "rpopma">Remko Popma
-<#elseif author.id == "nickwilliams">Nick Williams
-<#elseif author.id == "mattsicker">Matt Sicker
-<#elseif author.id == "bbrouwer">Bruce Brouwer
-<#elseif author.id == "rgupta">Raman Gupta
-<#elseif author.id == "mikes">Mikael Ståldal
-<#elseif author.id == "ckozak">Carter Kozak
-<#elseif author.id == "vy">Volkan Yazıcı
-<#elseif author.id == "rgrabowski">Ron Grabowski
-<#elseif author.id == "pkarwasz">Piotr P. Karwasz
-<#else>`${author.id}`
-</#if>
-</...@compress><#if author?has_next>, </#if>
-</#list>
-</...@compress>)
+* ${entry.description.text?replace("\\s+", " ", "r")}<#if entry.issues?has_content> [<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>]</#if><#if entry.authors?has_content> (<#list entry.authors as author><#if author.id?has_content>@${author.id}<#else>${author.name}</#if><#if author?has_next>, </#if></#list>)</#if>
</#list>
</#list>
</#if>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/.release.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/.release.xml
index c08038c..af809e2 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/.release.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-02-23" version="2.17.2"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
index a975856..ee96f5d 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3304" link="https://issues.apache.org/jira/browse/LOG4J2-3304"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
index aeaf265..c29a5b3 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3333" link="https://issues.apache.org/jira/browse/LOG4J2-3333"/>
<author id="ckozak"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
index b8ace28..11f82e1 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3405" link="https://issues.apache.org/jira/browse/LOG4J2-3405"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/.release.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/.release.xml
index 21c277c..8644d44 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/.release.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-06-28" version="2.18.0"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
index e606513..fc192ec 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3339" link="https://issues.apache.org/jira/browse/LOG4J2-3339"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
index 1c3d065..12ca1b4 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3490" link="https://issues.apache.org/jira/browse/LOG4J2-3490"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
index 2f7e830..3a12a61 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-3527" link="https://issues.apache.org/jira/browse/LOG4J2-3527"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release.xml
index 9fae4c6..fb6b2d4 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2023-01-25" version="2.19.0"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
index 6f09267..d3fef61 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="LOG4J2-3572" link="https://issues.apache.org/jira/browse/LOG4J2-3572"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
index bb4d892..9ba4738 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3584" link="https://issues.apache.org/jira/browse/LOG4J2-3584"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
index 95821b4..eb1709c 100644
--- a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
+++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3614" link="https://issues.apache.org/jira/browse/LOG4J2-3614"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1220_Simplify_site_generation.xml b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1220_Simplify_site_generation.xml
index 517f632..a6a855c 100644
--- a/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1220_Simplify_site_generation.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1220_Simplify_site_generation.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="1220" link="https://github.com/apache/logging-log4j2/pull/1220"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1221_switch_from_jira_to_github_issues.xml b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1221_switch_from_jira_to_github_issues.xml
index 3a6b086..eaf2619 100644
--- a/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1221_switch_from_jira_to_github_issues.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1221_switch_from_jira_to_github_issues.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="1221" link="https://github.com/apache/logging-log4j2/pull/1221"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
index 07de5c0..76876c1 100644
--- a/log4j-changelog/src/test/resources/7-released-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml
@@ -17,10 +17,9 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-857" link="https://issues.apache.org/jira/browse/LOG4J2-857"/>
- <author id="mattsicker"/>
<description format="asciidoc">
Add `@Ordered` annotation to support plugin ordering when two or more plugins within the same category have the same case-insensitive name
</description>
diff --git a/log4j-changelog/src/test/resources/7-released-again/.changelog.adoc.ftl b/log4j-changelog/src/test/resources/7-released-again/.changelog.adoc.ftl
index 188eff4..5622786 100644
--- a/log4j-changelog/src/test/resources/7-released-again/.changelog.adoc.ftl
+++ b/log4j-changelog/src/test/resources/7-released-again/.changelog.adoc.ftl
@@ -20,29 +20,7 @@
=== ${entryType?capitalize}
<#list entries as entry>
-* ${entry.description.text?replace("\\s+", " ", "r")} (for <@compress single_line=true>
-<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list> by
-<#list entry.authors as author>
-<@compress single_line=true>
-<#if !author.id?has_content>${author.name}
-<#elseif author.id == "rgoers">Ralph Goers
-<#elseif author.id == "ggregory">Gary Gregory
-<#elseif author.id == "sdeboy">Scott Deboy
-<#elseif author.id == "rpopma">Remko Popma
-<#elseif author.id == "nickwilliams">Nick Williams
-<#elseif author.id == "mattsicker">Matt Sicker
-<#elseif author.id == "bbrouwer">Bruce Brouwer
-<#elseif author.id == "rgupta">Raman Gupta
-<#elseif author.id == "mikes">Mikael Ståldal
-<#elseif author.id == "ckozak">Carter Kozak
-<#elseif author.id == "vy">Volkan Yazıcı
-<#elseif author.id == "rgrabowski">Ron Grabowski
-<#elseif author.id == "pkarwasz">Piotr P. Karwasz
-<#else>`${author.id}`
-</#if>
-</...@compress><#if author?has_next>, </#if>
-</#list>
-</...@compress>)
+* ${entry.description.text?replace("\\s+", " ", "r")}<#if entry.issues?has_content> [<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>]</#if><#if entry.authors?has_content> (<#list entry.authors as author><#if author.id?has_content>@${author.id}<#else>${author.name}</#if><#if author?has_next>, </#if></#list>)</#if>
</#list>
</#list>
</#if>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.17.2/.release.xml b/log4j-changelog/src/test/resources/7-released-again/2.17.2/.release.xml
index c08038c..af809e2 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.17.2/.release.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.17.2/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-02-23" version="2.17.2"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml b/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
index a975856..ee96f5d 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3304" link="https://issues.apache.org/jira/browse/LOG4J2-3304"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml b/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
index aeaf265..c29a5b3 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3333" link="https://issues.apache.org/jira/browse/LOG4J2-3333"/>
<author id="ckozak"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml b/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
index b8ace28..11f82e1 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3405_Document_that_the_Spring_Boot_Lookup_requires_the_log4j_spri.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3405" link="https://issues.apache.org/jira/browse/LOG4J2-3405"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.18.0/.release.xml b/log4j-changelog/src/test/resources/7-released-again/2.18.0/.release.xml
index 21c277c..8644d44 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.18.0/.release.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.18.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-06-28" version="2.18.0"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml b/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
index e606513..fc192ec 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3339" link="https://issues.apache.org/jira/browse/LOG4J2-3339"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml b/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
index 1c3d065..12ca1b4 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="LOG4J2-3490" link="https://issues.apache.org/jira/browse/LOG4J2-3490"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml b/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
index 2f7e830..3a12a61 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3527_Don_t_use_Paths_get_to_avoid_circular_file_systems.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-3527" link="https://issues.apache.org/jira/browse/LOG4J2-3527"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release.xml b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release.xml
index 9fae4c6..fb6b2d4 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2023-01-25" version="2.19.0"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
index 6f09267..d3fef61 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="LOG4J2-3572" link="https://issues.apache.org/jira/browse/LOG4J2-3572"/>
<author id="rgoers"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
index bb4d892..9ba4738 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3584" link="https://issues.apache.org/jira/browse/LOG4J2-3584"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
index 95821b4..eb1709c 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3614" link="https://issues.apache.org/jira/browse/LOG4J2-3614"/>
<author id="vy"/>
diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
index 6a2cd42..ee79cb4 100644
--- a/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
+++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3657" link="https://issues.apache.org/jira/browse/LOG4J2-3657"/>
<author name="Marat Kamalov"/>
diff --git a/src/changelog/.0.x.x/add-website.xml b/src/changelog/.0.x.x/add-website.xml
index 0cf8cb4..9360ed1 100644
--- a/src/changelog/.0.x.x/add-website.xml
+++ b/src/changelog/.0.x.x/add-website.xml
@@ -1,7 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<author id="github:vy"/>
<description format="asciidoc">Started publishing https://logging.apache.org/log4j/tools[the project website]</description>
diff --git a/src/changelog/.0.x.x/set_changelog_schema_0_1_1.xml b/src/changelog/.0.x.x/make-author-optional.xml
similarity index 85%
rename from src/changelog/.0.x.x/set_changelog_schema_0_1_1.xml
rename to src/changelog/.0.x.x/make-author-optional.xml
index f66ef70..e6d3f47 100644
--- a/src/changelog/.0.x.x/set_changelog_schema_0_1_1.xml
+++ b/src/changelog/.0.x.x/make-author-optional.xml
@@ -17,8 +17,8 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<author id="github:vy"/>
- <description format="asciidoc">Bump the default `log4j-changelog` XML schema version to `0.1.1`</description>
+ <description format="asciidoc">Made `author` element optional and bumped the XML schema version to `0.1.2`</description>
</entry>
diff --git a/src/changelog/.index.adoc.ftl b/src/changelog/.index.adoc.ftl
index 8c4ff21..fc6f4c8 100644
--- a/src/changelog/.index.adoc.ftl
+++ b/src/changelog/.index.adoc.ftl
@@ -34,7 +34,7 @@
////
[#release-notes]
-== Release Notes
+=== Release Notes
<#list releases as release><#if release.changelogEntryCount gt 0>
include::_release-notes/_${release.version}.adoc[]
diff --git a/src/changelog/0.1.0/.release.xml b/src/changelog/0.1.0/.release.xml
index d11a434..b99d943 100644
--- a/src/changelog/0.1.0/.release.xml
+++ b/src/changelog/0.1.0/.release.xml
@@ -17,6 +17,6 @@
-->
<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2023-01-10"
version="0.1.0"/>
diff --git a/src/changelog/0.1.0/LOG4J2-3628_add_tools_bom_and_changelog_modules.xml b/src/changelog/0.1.0/LOG4J2-3628_add_tools_bom_and_changelog_modules.xml
index 67cba74..1674b32 100644
--- a/src/changelog/0.1.0/LOG4J2-3628_add_tools_bom_and_changelog_modules.xml
+++ b/src/changelog/0.1.0/LOG4J2-3628_add_tools_bom_and_changelog_modules.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="LOG4J2-3628" link="https://issues.apache.org/jira/browse/LOG4J2-3628"/>
<author id="github:vy"/>
diff --git a/src/changelog/0.2.0/.release.xml b/src/changelog/0.2.0/.release.xml
index 327d442..2289ee9 100644
--- a/src/changelog/0.2.0/.release.xml
+++ b/src/changelog/0.2.0/.release.xml
@@ -17,6 +17,6 @@
-->
<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2023-01-31"
version="0.2.0"/>
diff --git a/src/changelog/0.2.0/13_add_changelog_xsd.xml b/src/changelog/0.2.0/13_add_changelog_xsd.xml
index 73d0776..2815acc 100644
--- a/src/changelog/0.2.0/13_add_changelog_xsd.xml
+++ b/src/changelog/0.2.0/13_add_changelog_xsd.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="13" link="https://github.com/apache/logging-log4j-tools/issues/13"/>
<author id="github:ppkarwasz"/>
diff --git a/src/changelog/0.2.0/14_remove_changelog_security_type.xml b/src/changelog/0.2.0/14_remove_changelog_security_type.xml
index 68f6b5b..c8195c6 100644
--- a/src/changelog/0.2.0/14_remove_changelog_security_type.xml
+++ b/src/changelog/0.2.0/14_remove_changelog_security_type.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="removed">
<issue id="14" link="https://github.com/apache/logging-log4j-tools/issues/14"/>
<author id="github:rgoers"/>
diff --git a/src/changelog/0.2.0/17_fix_unreleased_directory_order.xml b/src/changelog/0.2.0/17_fix_unreleased_directory_order.xml
index f969059..2c2922d 100644
--- a/src/changelog/0.2.0/17_fix_unreleased_directory_order.xml
+++ b/src/changelog/0.2.0/17_fix_unreleased_directory_order.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="17" link="https://github.com/apache/logging-log4j-tools/issues/17"/>
<author id="github:vy"/>
diff --git a/src/changelog/0.2.0/19_fix_Windows_compat.xml b/src/changelog/0.2.0/19_fix_Windows_compat.xml
index 9c31d2e..071af66 100644
--- a/src/changelog/0.2.0/19_fix_Windows_compat.xml
+++ b/src/changelog/0.2.0/19_fix_Windows_compat.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="19" link="https://github.com/apache/logging-log4j-tools/issues/19"/>
<author id="github:ppkarwasz"/>
diff --git a/src/changelog/0.2.0/20_add_changelog_maven_plugin.xml b/src/changelog/0.2.0/20_add_changelog_maven_plugin.xml
index b66d1b0..adc8a3e 100644
--- a/src/changelog/0.2.0/20_add_changelog_maven_plugin.xml
+++ b/src/changelog/0.2.0/20_add_changelog_maven_plugin.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="20" link="https://github.com/apache/logging-log4j-tools/issues/20"/>
<author id="github:vy"/>
diff --git a/src/changelog/0.2.0/20_rename_exporter_outputDirectory_property.xml b/src/changelog/0.2.0/20_rename_exporter_outputDirectory_property.xml
index 8354053..da464a7 100644
--- a/src/changelog/0.2.0/20_rename_exporter_outputDirectory_property.xml
+++ b/src/changelog/0.2.0/20_rename_exporter_outputDirectory_property.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<issue id="20" link="https://github.com/apache/logging-log4j-tools/issues/20"/>
<author id="github:vy"/>
diff --git a/src/changelog/0.3.0/.release.xml b/src/changelog/0.3.0/.release.xml
index c33354f..a2ff346 100644
--- a/src/changelog/0.3.0/.release.xml
+++ b/src/changelog/0.3.0/.release.xml
@@ -17,6 +17,6 @@
-->
<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2023-03-14"
version="0.3.0"/>
diff --git a/src/changelog/0.3.0/37_add_changelogEntryCount.xml b/src/changelog/0.3.0/37_add_changelogEntryCount.xml
index fc8c3e5..c931910 100644
--- a/src/changelog/0.3.0/37_add_changelogEntryCount.xml
+++ b/src/changelog/0.3.0/37_add_changelogEntryCount.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="37" link="https://github.com/apache/logging-log4j-tools/issues/37"/>
<author id="github:vy"/>
diff --git a/src/changelog/0.3.0/44_make_changelog_format_agnostic.xml b/src/changelog/0.3.0/44_make_changelog_format_agnostic.xml
index a52f447..f0a22c0 100644
--- a/src/changelog/0.3.0/44_make_changelog_format_agnostic.xml
+++ b/src/changelog/0.3.0/44_make_changelog_format_agnostic.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="44" link="https://github.com/apache/logging-log4j-tools/issues/44"/>
<author id="github:vy"/>
diff --git a/src/changelog/0.3.0/java_17.xml b/src/changelog/0.3.0/java_17.xml
index 82659a8..802e669 100644
--- a/src/changelog/0.3.0/java_17.xml
+++ b/src/changelog/0.3.0/java_17.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<author id="github:vy"/>
<description format="asciidoc">Upgrade the compiler version to Java 17, yet still target Java 8</description>
diff --git a/src/changelog/0.4.0/.release.xml b/src/changelog/0.4.0/.release.xml
index 873838b..245c063 100644
--- a/src/changelog/0.4.0/.release.xml
+++ b/src/changelog/0.4.0/.release.xml
@@ -17,5 +17,5 @@
-->
<release xmlns="http://logging.apache.org/log4j/changelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2023-07-02" version="0.4.0"/>
diff --git a/src/changelog/0.4.0/63_add_versionPattern_to_ReleaseMojo.xml b/src/changelog/0.4.0/63_add_versionPattern_to_ReleaseMojo.xml
index 61108f5..aede91d 100644
--- a/src/changelog/0.4.0/63_add_versionPattern_to_ReleaseMojo.xml
+++ b/src/changelog/0.4.0/63_add_versionPattern_to_ReleaseMojo.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="added">
<issue id="63" link="https://github.com/apache/logging-log4j-tools/issues/63"/>
<author id="github:vy"/>
diff --git a/src/changelog/0.4.0/change_ExportMojo_outputDirectory.xml b/src/changelog/0.4.0/change_ExportMojo_outputDirectory.xml
index 015e523..1db7ef6 100644
--- a/src/changelog/0.4.0/change_ExportMojo_outputDirectory.xml
+++ b/src/changelog/0.4.0/change_ExportMojo_outputDirectory.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<author id="github:vy"/>
<description format="asciidoc">Change the default value of `outputDirectory` to `${project.build.directory}/generated-sources/site/changelog` for the Maven `export` goal</description>
diff --git a/src/changelog/0.4.0/changelog_migration.xml b/src/changelog/0.4.0/changelog_migration.xml
index 15c64c5..cafda6d 100644
--- a/src/changelog/0.4.0/changelog_migration.xml
+++ b/src/changelog/0.4.0/changelog_migration.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="changed">
<author id="github:vy"/>
<description format="asciidoc">Migrate from `CHANGELOG.adoc` to using `log4j-changelog-maven-plugin`</description>
diff --git a/src/changelog/0.4.0/fix_repetitive_release.xml b/src/changelog/0.4.0/fix_repetitive_release.xml
index d588b20..0037f7a 100644
--- a/src/changelog/0.4.0/fix_repetitive_release.xml
+++ b/src/changelog/0.4.0/fix_repetitive_release.xml
@@ -17,7 +17,7 @@
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<author id="github:vy"/>
<description format="asciidoc">Improve Maven `release` goal to accommodate repetitive invocations</description>
diff --git a/src/site/_log4j-changelog.adoc b/src/site/_log4j-changelog.adoc
index 2ade2ac..cec9328 100644
--- a/src/site/_log4j-changelog.adoc
+++ b/src/site/_log4j-changelog.adoc
@@ -100,7 +100,7 @@ A sample _release entry_ file is shared below.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://logging.apache.org/log4j/changelog
- https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ https://logging.apache.org/log4j/changelog-0.1.2.xsd"
date="2022-09-09"
version="2.19.0"/>
----
@@ -127,7 +127,7 @@ A sample _changelog entry_ file is shared below.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://logging.apache.org/log4j/changelog
- https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3556" link="https://issues.apache.org/jira/browse/LOG4J2-3556"/>
<author id="vy"/>
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc
index 03dcddc..f78e91b 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.x.x.adoc
@@ -47,4 +47,4 @@ This minor release contains various bug fixes and improvements.
==== Changed
-* Bump the default `log4j-changelog` XML schema version to `0.1.1`
+* Bump the default `log4j-changelog` XML schema version to `0.1.2`
[logging-log4j-tools] 02/09: Minor documentation fixes
Posted by vy...@apache.org.
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
commit fc2f6b721af67a10ebb69de837ce64d7943332e2
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 10:14:15 2023 +0200
Minor documentation fixes
---
src/changelog/.index.adoc.ftl | 2 +-
src/site/_log4j-changelog-maven-plugin.adoc | 4 ++--
src/site/_log4j-changelog.adoc | 4 +++-
src/site/_release-notes/_0.x.x.adoc | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/changelog/.index.adoc.ftl b/src/changelog/.index.adoc.ftl
index fc6f4c8..8c4ff21 100644
--- a/src/changelog/.index.adoc.ftl
+++ b/src/changelog/.index.adoc.ftl
@@ -34,7 +34,7 @@
////
[#release-notes]
-=== Release Notes
+== Release Notes
<#list releases as release><#if release.changelogEntryCount gt 0>
include::_release-notes/_${release.version}.adoc[]
diff --git a/src/site/_log4j-changelog-maven-plugin.adoc b/src/site/_log4j-changelog-maven-plugin.adoc
index 723f0b3..2f3dc82 100644
--- a/src/site/_log4j-changelog-maven-plugin.adoc
+++ b/src/site/_log4j-changelog-maven-plugin.adoc
@@ -20,8 +20,8 @@ limitations under the License.
This project ships a Maven plugin providing access to the `ChangelogExporter` and `ChangelogReleaser` of xref:#log4j-changelog[`log4j-changelog`].
-[#log4j-changelog-dependencies]
-== Dependencies
+[#log4j-changelog-maven-plugin-dependencies]
+=== Dependencies
You need to have the `org.apache.logging.log4j:log4j-changelog-maven-plugin` dependency in your classpath:
diff --git a/src/site/_log4j-changelog.adoc b/src/site/_log4j-changelog.adoc
index cec9328..d269405 100644
--- a/src/site/_log4j-changelog.adoc
+++ b/src/site/_log4j-changelog.adoc
@@ -22,7 +22,7 @@ This project contains tools to maintain changelogs.
It is designed for Apache Log4j, but can be used for any Java project.
[#log4j-changelog-dependencies]
-== Dependencies
+=== Dependencies
You need to have the `org.apache.logging.log4j:log4j-changelog` dependency in your classpath:
@@ -35,6 +35,8 @@ You need to have the `org.apache.logging.log4j:log4j-changelog` dependency in yo
</dependency>
----
+Java module name and OSGi `Bundle-SymbolicName` are set to `org.apache.logging.log4j.changelog`.
+
[#log4j-changelog-what-is-a-changelog]
=== What is a changelog?
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc
index f78e91b..70beb61 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.x.x.adoc
@@ -47,4 +47,4 @@ This minor release contains various bug fixes and improvements.
==== Changed
-* Bump the default `log4j-changelog` XML schema version to `0.1.2`
+* Made `author` element optional and bumped the XML schema version to `0.1.2`
[logging-log4j-tools] 08/09: Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.0`
Posted by vy...@apache.org.
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
commit 64b9f261c3ad48a13f4b236b020e5633ba07cf31
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Fri Sep 29 09:20:44 2023 +0000
Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.0`
---
log4j-tools-parent/pom.xml | 2 +-
.../.0.x.x/update_org_junit_jupiter_junit_jupiter_engine.xml | 8 ++++++++
src/site/_release-notes/_0.x.x.adoc | 1 +
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/log4j-tools-parent/pom.xml b/log4j-tools-parent/pom.xml
index fe11a70..609912c 100644
--- a/log4j-tools-parent/pom.xml
+++ b/log4j-tools-parent/pom.xml
@@ -35,7 +35,7 @@
<assertj.version>3.24.2</assertj.version>
<commons-io.version>2.13.0</commons-io.version>
<freemarker.version>2.3.32</freemarker.version>
- <junit.version>5.9.3</junit.version>
+ <junit.version>5.10.0</junit.version>
<maven-plugin.version>3.8.2</maven-plugin.version>
<maven-plugin-api.version>3.6.3</maven-plugin-api.version>
diff --git a/src/changelog/.0.x.x/update_org_junit_jupiter_junit_jupiter_engine.xml b/src/changelog/.0.x.x/update_org_junit_jupiter_junit_jupiter_engine.xml
new file mode 100644
index 0000000..f2c5d35
--- /dev/null
+++ b/src/changelog/.0.x.x/update_org_junit_jupiter_junit_jupiter_engine.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://logging.apache.org/log4j/changelog"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ type="changed">
+ <author id="github:dependabot"/>
+ <description format="asciidoc">Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.0`</description>
+</entry>
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc
index c19aa20..8350215 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.x.x.adoc
@@ -50,3 +50,4 @@ This minor release contains various bug fixes and improvements.
* Made `author` element optional and bumped the XML schema version to `0.1.2` (https://github.com/apache/logging-log4j-tools/issues/81[81])
* Make `log4j-changelog-maven-plugin` thread-safe (https://github.com/apache/logging-log4j-tools/issues/80[80])
* Update `org.apache.logging:logging-parent` to version `10.1.0` (https://github.com/apache/logging-log4j-tools/pull/82[82])
+* Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.0`
[logging-log4j-tools] 09/09: Merge remote-tracking branch 'origin/main'
Posted by vy...@apache.org.
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
commit 485d73c7b4a462e1cd2018e46271cb6e8344eb6b
Merge: 64b9f26 878f0d8
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 12:53:11 2023 +0200
Merge remote-tracking branch 'origin/main'
[logging-log4j-tools] 07/09: Update `org.apache.logging:logging-parent` to version `10.1.0` (#82)
Posted by vy...@apache.org.
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
commit 7b425739839a6d1460b3d29ab991be8ad1f5102a
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 11:03:20 2023 +0200
Update `org.apache.logging:logging-parent` to version `10.1.0` (#82)
---
pom.xml | 2 +-
.../update_org_apache_logging_logging_parent.xml | 25 ++++++++++++++++++++++
src/site/_release-notes/_0.x.x.adoc | 1 +
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 803a57e..093087b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
- <version>10.1.0-SNAPSHOT</version>
+ <version>10.1.0</version>
</parent>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/src/changelog/.0.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/.0.x.x/update_org_apache_logging_logging_parent.xml
new file mode 100644
index 0000000..f7ab80b
--- /dev/null
+++ b/src/changelog/.0.x.x/update_org_apache_logging_logging_parent.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://logging.apache.org/log4j/changelog"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
+ type="changed">
+ <issue id="82" link="https://github.com/apache/logging-log4j-tools/pull/82"/>
+ <author id="github:vy"/>
+ <description format="asciidoc">Update `org.apache.logging:logging-parent` to version `10.1.0`</description>
+</entry>
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc
index 49cc4cf..c19aa20 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.x.x.adoc
@@ -49,3 +49,4 @@ This minor release contains various bug fixes and improvements.
* Made `author` element optional and bumped the XML schema version to `0.1.2` (https://github.com/apache/logging-log4j-tools/issues/81[81])
* Make `log4j-changelog-maven-plugin` thread-safe (https://github.com/apache/logging-log4j-tools/issues/80[80])
+* Update `org.apache.logging:logging-parent` to version `10.1.0` (https://github.com/apache/logging-log4j-tools/pull/82[82])
[logging-log4j-tools] 06/09: Make `log4j-changelog-maven-plugin` thread-safe (#80)
Posted by vy...@apache.org.
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
commit 10185227f8e3efe376ebdf5a95ba76c183cb6127
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 10:57:37 2023 +0200
Make `log4j-changelog-maven-plugin` thread-safe (#80)
---
.../java/org/apache/logging/log4j/ExportMojo.java | 4 +--
.../java/org/apache/logging/log4j/ImportMojo.java | 4 +--
.../java/org/apache/logging/log4j/ReleaseMojo.java | 4 +--
.../.0.x.x/make-maven-plugin-thread-safe.xml | 41 ++++++++++++++++++++++
src/site/_release-notes/_0.x.x.adoc | 3 +-
5 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ExportMojo.java b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ExportMojo.java
index 96cb074..084f611 100644
--- a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ExportMojo.java
+++ b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ExportMojo.java
@@ -36,7 +36,7 @@ import org.apache.maven.plugins.annotations.Parameter;
*
* @see ChangelogExporter
*/
-@Mojo(name = "export", defaultPhase = LifecyclePhase.PRE_SITE)
+@Mojo(name = "export", defaultPhase = LifecyclePhase.PRE_SITE, threadSafe = true)
public final class ExportMojo extends AbstractMojo {
private static final String SOURCE_TARGET_TEMPLATE_PATTERN =
@@ -72,7 +72,7 @@ public final class ExportMojo extends AbstractMojo {
required = true)
private File outputDirectory;
- public void execute() {
+ public synchronized void execute() {
final Set<ChangelogExporterTemplate> translatedIndexTemplates = toExporterTemplates(indexTemplates);
final Set<ChangelogExporterTemplate> translatedReleaseChangelogTemplates = toExporterTemplates(
changelogTemplates);
diff --git a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ImportMojo.java b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ImportMojo.java
index f96adc9..64c8906 100644
--- a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ImportMojo.java
+++ b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ImportMojo.java
@@ -30,7 +30,7 @@ import org.apache.maven.plugins.annotations.Parameter;
*
* @see ChangelogReleaser
*/
-@Mojo(name = "import")
+@Mojo(name = "import", threadSafe = true)
public final class ImportMojo extends AbstractMojo {
/**
@@ -59,7 +59,7 @@ public final class ImportMojo extends AbstractMojo {
required = true)
private int releaseVersionMajor;
- public void execute() {
+ public synchronized void execute() {
final MavenChangesImporterArgs args = new MavenChangesImporterArgs(
changelogDirectory.toPath(),
changesXmlFile.toPath(),
diff --git a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ReleaseMojo.java b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ReleaseMojo.java
index 2e46488..c460899 100644
--- a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ReleaseMojo.java
+++ b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ReleaseMojo.java
@@ -32,7 +32,7 @@ import org.apache.maven.plugins.annotations.Parameter;
*
* @see ChangelogReleaser
*/
-@Mojo(name = "release", defaultPhase = LifecyclePhase.VALIDATE)
+@Mojo(name = "release", defaultPhase = LifecyclePhase.VALIDATE, threadSafe = true)
public final class ReleaseMojo extends AbstractMojo {
/**
@@ -66,7 +66,7 @@ public final class ReleaseMojo extends AbstractMojo {
@Parameter(property = "log4j.changelog.versionPattern")
private String versionPattern;
- public void execute() {
+ public synchronized void execute() {
Pattern compiledVersionPattern = versionPattern != null ? Pattern.compile(versionPattern) : null;
final ChangelogReleaserArgs args = new ChangelogReleaserArgs(
changelogDirectory.toPath(),
diff --git a/src/changelog/.0.x.x/make-maven-plugin-thread-safe.xml b/src/changelog/.0.x.x/make-maven-plugin-thread-safe.xml
new file mode 100644
index 0000000..7dfdfc0
--- /dev/null
+++ b/src/changelog/.0.x.x/make-maven-plugin-thread-safe.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://logging.apache.org/log4j/changelog"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"
+ type="changed">
+ <issue id="80" link="https://github.com/apache/logging-log4j-tools/issues/80"/>
+ <author id="github:vy"/>
+ <!-- The definition of what is "thread-safe" from a Maven point of view is really unclear.
+ The only relevant resource is the issue wiki regarding the parallel builds introduced in Maven 3: https://cwiki.apache.org/confluence/display/MAVEN/Parallel+builds+in+Maven+3#ParallelbuildsinMaven3-Mojothreadsafetyassertionchecklist
+ The guidance provided there is as follows:
+
+ - Check all static fields/variables in plugin code are not subject to threading problems.
+ You might want to pay special attention to static member variables of the subclasses of `java.text.Format` (`NumberFormat`, `DateFormat`, etc.), most of which are not thread-safe and cannot be shared as static variables.
+
+ - Check any plexus `components.xml`; if the components defined are singletons they need to be thread-safe.
+
+ - Check for presence of known tainted libraries.
+
+ - Check thread-safety of any other third party libraries.
+ This last item can be a bit hard, but inquiries on mailing lists can get you a long way.
+
+ I think we are not prone to any of the problems shared above.
+ To be certain, I have added `synchronized` modifier to each `execute()` method. -->
+ <description format="asciidoc">Make `log4j-changelog-maven-plugin` thread-safe</description>
+</entry>
diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc
index 70beb61..49cc4cf 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.x.x.adoc
@@ -47,4 +47,5 @@ This minor release contains various bug fixes and improvements.
==== Changed
-* Made `author` element optional and bumped the XML schema version to `0.1.2`
+* Made `author` element optional and bumped the XML schema version to `0.1.2` (https://github.com/apache/logging-log4j-tools/issues/81[81])
+* Make `log4j-changelog-maven-plugin` thread-safe (https://github.com/apache/logging-log4j-tools/issues/80[80])
[logging-log4j-tools] 03/09: Limit `on.push` in CI to `main` and `release/*` branches to avoid duplicate runs
Posted by vy...@apache.org.
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
commit 20855098241a0958693cdfd06cd7f51b548b0e60
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 10:15:35 2023 +0200
Limit `on.push` in CI to `main` and `release/*` branches to avoid duplicate runs
---
.github/workflows/build.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1e09709..a7ba748 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,6 +19,9 @@ name: build
on:
push:
+ branches:
+ - "main"
+ - "release/*"
paths-ignore:
- "**.adoc"
- "**.md"
[logging-log4j-tools] 04/09: Improve the docs on `author`
Posted by vy...@apache.org.
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
commit ca3faa21cbd75ee178d63264ea01753d8ef274c9
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Sep 29 10:26:30 2023 +0200
Improve the docs on `author`
---
src/site/_log4j-changelog.adoc | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/site/_log4j-changelog.adoc b/src/site/_log4j-changelog.adoc
index d269405..b4b6235 100644
--- a/src/site/_log4j-changelog.adoc
+++ b/src/site/_log4j-changelog.adoc
@@ -132,7 +132,7 @@ A sample _changelog entry_ file is shared below.
https://logging.apache.org/log4j/changelog-0.1.2.xsd"
type="fixed">
<issue id="LOG4J2-3556" link="https://issues.apache.org/jira/browse/LOG4J2-3556"/>
- <author id="vy"/>
+ <author id="github:vy"/>
<author name="Arthur Gavlyukovskiy"/>
<description format="asciidoc">
Make `JsonTemplateLayout` stack trace truncation operate for each label block
@@ -149,9 +149,15 @@ Some remarks about the structure of changelog entry files:
** `deprecated` – for soon-to-be removed features
** `removed` – for now removed features
** `fixed` – for any bug fixes
-* `issue` element is optional, and, if present, must contain `id` and `link` attributes
-* `author` element must have at least one of `id` or `name` attributes
-* There must be at least one `author`
+* `issue` element is optional, can occur multiple times, and, if present, must contain `id` and `link` attributes
+* `author` element is optional, can occur multiple times, and, if present, must have at least one of `id` or `name` attributes
++
+[WARNING]
+====
+The usage of `author` is mostly discouraged.
+It is yet another bit to maintain and creates role-related (who did what) problems.
+Many modern software projects are developed using a VCS (e.g., Git) and supporting services (e.g., GitHub) which make it trivial to trace back the origin of a change using commit and issue IDs.
+====
* There must be a single `description` element with non-blank content and `format` attribute
[#log4j-changelog-export]