This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
commit 2f3198acd7ace5a3aef43c080ef455df4345e03e Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu Jun 29 20:19:11 2023 +0200 Fix changelog entry and template file population on multiple Maven `release` goal invocations --- .../changelog/releaser/ChangelogReleaser.java | 2 +- .../log4j/changelog/ChangelogReleaserTest.java | 30 ++++++++++++-- .../LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml | 26 ++++++++++++ .../.3.x.x/.release-notes.adoc.ftl | 22 ++++++++++ .../.3.x.x/1220_Simplify_site_generation.xml | 25 +++++++++++ .../1221_switch_from_jira_to_github_issues.xml | 25 +++++++++++ ...notation_to_support_plugin_ordering_when_tw.xml | 27 ++++++++++++ .../.4.x.x/.release-notes.adoc.ftl | 22 ++++++++++ .../resources/6-enriched-again/.changelog.adoc.ftl | 48 ++++++++++++++++++++++ .../resources/6-enriched-again/.changelog.txt.ftl | 26 ++++++++++++ .../resources/6-enriched-again/.index.adoc.ftl | 22 ++++++++++ .../2.17.2/.release-notes.adoc.ftl | 47 +++++++++++++++++++++ .../resources/6-enriched-again/2.17.2/.release.xml | 21 ++++++++++ ...s_initialized_if_the_LoggerFactory_is_provi.xml | 26 ++++++++++++ ...ContextDataInjector_initialization_deadlock.xml | 25 +++++++++++ ..._Spring_Boot_Lookup_requires_the_log4j_spri.xml | 25 +++++++++++ .../2.18.0/.release-notes.adoc.ftl | 36 ++++++++++++++++ .../resources/6-enriched-again/2.18.0/.release.xml | 21 ++++++++++ ...erStrategy_should_use_the_current_time_when.xml | 25 +++++++++++ ...lloverStrategy_was_not_detecting_the_correc.xml | 25 +++++++++++ ...se_Paths_get_to_avoid_circular_file_systems.xml | 25 +++++++++++ .../2.19.0/.release-notes.adoc.ftl | 21 ++++++++++ .../2.19.0/.release-notes.common.ftl | 18 ++++++++ .../6-enriched-again/2.19.0/.release-notes.md.ftl | 21 ++++++++++ .../6-enriched-again/2.19.0/.release-notes.txt.ftl | 21 ++++++++++ .../resources/6-enriched-again/2.19.0/.release.xml | 21 ++++++++++ ...Add_getExplicitLevel_method_to_LoggerConfig.xml | 25 +++++++++++ ...ConsoleListener_use_SimpleLogger_internally.xml | 25 +++++++++++ ..._InstantFormatter_against_delegate_failures.xml | 26 ++++++++++++ .../.3.x.x/.release-notes.adoc.ftl | 22 ++++++++++ .../.3.x.x/1220_Simplify_site_generation.xml | 25 +++++++++++ .../1221_switch_from_jira_to_github_issues.xml | 25 +++++++++++ ...notation_to_support_plugin_ordering_when_tw.xml | 27 ++++++++++++ .../.4.x.x/.release-notes.adoc.ftl | 22 ++++++++++ .../resources/7-released-again/.changelog.adoc.ftl | 48 ++++++++++++++++++++++ .../resources/7-released-again/.changelog.txt.ftl | 26 ++++++++++++ .../resources/7-released-again/.index.adoc.ftl | 22 ++++++++++ .../2.17.2/.release-notes.adoc.ftl | 47 +++++++++++++++++++++ .../resources/7-released-again/2.17.2/.release.xml | 21 ++++++++++ ...s_initialized_if_the_LoggerFactory_is_provi.xml | 26 ++++++++++++ ...ContextDataInjector_initialization_deadlock.xml | 25 +++++++++++ ..._Spring_Boot_Lookup_requires_the_log4j_spri.xml | 25 +++++++++++ .../2.18.0/.release-notes.adoc.ftl | 36 ++++++++++++++++ .../resources/7-released-again/2.18.0/.release.xml | 21 ++++++++++ ...erStrategy_should_use_the_current_time_when.xml | 25 +++++++++++ ...lloverStrategy_was_not_detecting_the_correc.xml | 25 +++++++++++ ...se_Paths_get_to_avoid_circular_file_systems.xml | 25 +++++++++++ .../2.19.0/.release-notes.adoc.ftl | 21 ++++++++++ .../2.19.0/.release-notes.common.ftl | 18 ++++++++ .../7-released-again/2.19.0/.release-notes.md.ftl | 21 ++++++++++ .../7-released-again/2.19.0/.release-notes.txt.ftl | 21 ++++++++++ .../resources/7-released-again/2.19.0/.release.xml | 21 ++++++++++ ...Add_getExplicitLevel_method_to_LoggerConfig.xml | 25 +++++++++++ ...ConsoleListener_use_SimpleLogger_internally.xml | 25 +++++++++++ ..._InstantFormatter_against_delegate_failures.xml | 26 ++++++++++++ .../LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml | 26 ++++++++++++ src/changelog/.0.x.x/fix_repetitive_release.xml | 24 +++++++++++ 57 files changed, 1445 insertions(+), 5 deletions(-) diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java index 9f0f293..ba0d7a2 100644 --- a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java +++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java @@ -145,8 +145,8 @@ public final class ChangelogReleaser { releaseDirectory, false, paths -> paths - .filter(path -> path.endsWith(templateFileNameSuffix)) .map(path -> path.getFileName().toString()) + .filter(path -> path.endsWith(templateFileNameSuffix)) .collect(Collectors.toSet())); } diff --git a/log4j-changelog/src/test/java/org/apache/logging/log4j/changelog/ChangelogReleaserTest.java b/log4j-changelog/src/test/java/org/apache/logging/log4j/changelog/ChangelogReleaserTest.java index a90dd26..21c76fa 100644 --- a/log4j-changelog/src/test/java/org/apache/logging/log4j/changelog/ChangelogReleaserTest.java +++ b/log4j-changelog/src/test/java/org/apache/logging/log4j/changelog/ChangelogReleaserTest.java @@ -34,11 +34,33 @@ import static org.apache.logging.log4j.changelog.FileTestUtils.assertDirectoryCo class ChangelogReleaserTest { @Test - void output_should_match(@TempDir(cleanup = CleanupMode.ON_SUCCESS) final Path changelogDirectory) + void first_time_release_output_should_match( + @TempDir(cleanup = CleanupMode.ON_SUCCESS) final Path changelogDirectory) + throws Exception { + verifyReleaseOutput( + changelogDirectory, + "src/test/resources/3-enriched", + "src/test/resources/5-released"); + } + + @Test + void second_time_release_output_should_match( + @TempDir(cleanup = CleanupMode.ON_SUCCESS) final Path changelogDirectory) + throws Exception { + verifyReleaseOutput( + changelogDirectory, + "src/test/resources/6-enriched-again", + "src/test/resources/7-released-again"); + } + + private static void verifyReleaseOutput( + final Path changelogDirectory, + final String referenceChangelogDirectory, + final String expectedOutputDirectory) throws Exception { - // Clone the directory to avoid `move` operations cluttering the reference folder - copyDirectory(new File("src/test/resources/3-enriched"), changelogDirectory.toFile()); + // Clone the directory to avoid `copy`/`move` operations cluttering the reference folder + copyDirectory(new File(referenceChangelogDirectory), changelogDirectory.toFile()); // Invoke the releaser final ChangelogReleaserArgs args = new ChangelogReleaserArgs( @@ -50,7 +72,7 @@ class ChangelogReleaserTest { // Empty folders are not tracked by git, though created by `ChangelogReleaser`. // Create the `.2.x.x` folder to match the actual output. - final Path expectedChangelogDirectory = Paths.get("src/test/resources/5-released"); + final Path expectedChangelogDirectory = Paths.get(expectedOutputDirectory); final Path emptyFolder = expectedChangelogDirectory.resolve(".2.x.x"); if (!Files.exists(emptyFolder)) { Files.createDirectories(emptyFolder); 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 new file mode 100644 index 0000000..6a2cd42 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.2.x.x/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml @@ -0,0 +1,26 @@ +<?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"; + type="fixed"> + <issue id="LOG4J2-3657" link="https://issues.apache.org/jira/browse/LOG4J2-3657"/> + <author name="Marat Kamalov"/> + <author id="vy"/> + <description format="asciidoc">When ``ThreadLocal``s are disabled, avoid allocating them in `AbstractLogger` causing memory leaks due to retained reference to class loaders in web applications</description> +</entry> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/.release-notes.adoc.ftl new file mode 100644 index 0000000..95a0397 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/.release-notes.adoc.ftl @@ -0,0 +1,22 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> + +Changes staged for the next 3.x.x version that is yet to be released. + +<#include "../.changelog.adoc.ftl"> 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 new file mode 100644 index 0000000..e1061f7 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1220_Simplify_site_generation.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="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.0.xsd"; + type="changed"> + <issue id="1220" link="https://github.com/apache/logging-log4j2/pull/1220"/> + <author id="vy"/> + <description format="asciidoc">Simplify Maven `site` phase and align it with the one in `release-2.x` branch</description> +</entry> 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 new file mode 100644 index 0000000..1fad519 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/1221_switch_from_jira_to_github_issues.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="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.0.xsd"; + type="changed"> + <issue id="1221" link="https://github.com/apache/logging-log4j2/pull/1221"/> + <author id="vy"/> + <description format="asciidoc">Switch the issue tracker from https://issues.apache.org/jira/browse/LOG4J2[JIRA] to https://github.com/apache/logging-log4j2/issues[GitHub Issues]</description> +</entry> 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 new file mode 100644 index 0000000..e812464 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml @@ -0,0 +1,27 @@ +<?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="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.0.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> +</entry> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.4.x.x/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/6-enriched-again/.4.x.x/.release-notes.adoc.ftl new file mode 100644 index 0000000..c01f82f --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.4.x.x/.release-notes.adoc.ftl @@ -0,0 +1,22 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> + +Changes staged for the next 4.x.x version that is yet to be released. + +<#include "../.changelog.adoc.ftl"> 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 new file mode 100644 index 0000000..188eff4 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.changelog.adoc.ftl @@ -0,0 +1,48 @@ +<#-- + 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 + + https://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. +--> +<#if entriesByType?size gt 0>== Changes +<#list entriesByType as entryType, entries> + +=== ${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>) +</#list> +</#list> +</#if> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.changelog.txt.ftl b/log4j-changelog/src/test/resources/6-enriched-again/.changelog.txt.ftl new file mode 100644 index 0000000..fd135eb --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.changelog.txt.ftl @@ -0,0 +1,26 @@ +<#-- + 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 + + https://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. +--> +<#if entriesByType?size gt 0>=== Changes +<#list entriesByType as entryType, entries> + +--- ${entryType?capitalize} + +<#list entries as entry> +* ${entry.description.text?replace("\\s+", " ", "r")} (<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>) +</#list> +</#list> +</#if> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/.index.adoc.ftl b/log4j-changelog/src/test/resources/6-enriched-again/.index.adoc.ftl new file mode 100644 index 0000000..8be38da --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/.index.adoc.ftl @@ -0,0 +1,22 @@ +//// + 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 + + https://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. +//// + += Release notes + +<#list releases as release><#if release.changelogEntryCount gt 0> +* xref:${release.version}.adoc[${release.version}]<#if release.date?has_content> (${release.date})</#if> +</#if></#list> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/.release-notes.adoc.ftl new file mode 100644 index 0000000..bc0ffc4 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/.release-notes.adoc.ftl @@ -0,0 +1,47 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> + +This release contains the changes noted below: + +* Over 50 improvements and fixes to the Log4j 1.x support. +Continued testing has shown it is a suitable replacement for Log4j 1.x in most cases. +* Scripting now requires a system property be specified naming the languages the user wishes to allow. +The scripting engine will not load if the property isn't set. +* By default, the only remote protocol allowed for loading configuration files is HTTPS. +Users can specify a system property to allow others or prevent remote loading entirely. +* Variable resolution has been modified so that only properties defined as properties in the configuration file can be recursive. +All other Lookups are now non-recursive. +This addresses issues users were having resolving lookups specified in property definitions for use in the `RoutingAppender` and `RollingFileAppender` due to restrictions put in place in 2.17.1. +* Many other fixes and improvements. + +Due to a break in compatibility in the SLF4J binding, Log4j now ships with two versions of the SLF4J to Log4j adapters. +`log4j-slf4j-impl` should be used with SLF4J 1.7.x and earlier and `log4j-slf4j18-impl` should be used with SLF4J 1.8.x and later. +SLF4J-2.0.0 alpha releases are not fully supported. +See https://issues.apache.org/jira/browse/LOG4J2-2975[LOG4J2-2975] and https://jira.qos.ch/browse/SLF4J-511[SLF4J-511]. + +The Log4j 2.17.2 API, as well as many core components, maintains binary compatibility with previous releases. + +Apache Log4j 2.17.2 requires a minimum of Java 8 to build and run. +Log4j 2.12.4 is the last release to support Java 7. +Log4j 2.3.2 is the last release to support Java 6. +Java 6 and Java 7 are no longer supported by the Log4j team. + +For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. + +<#include "../.changelog.adoc.ftl"> 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 new file mode 100644 index 0000000..f8ba78b --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/.release.xml @@ -0,0 +1,21 @@ +<?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. + --> +<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.0.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 new file mode 100644 index 0000000..45314ea --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml @@ -0,0 +1,26 @@ +<?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="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.0.xsd"; + type="fixed"> + <issue id="LOG4J2-3304" link="https://issues.apache.org/jira/browse/LOG4J2-3304"/> + <author id="rgoers"/> + <author name="francis-FY"/> + <description format="asciidoc">Flag `LogManager` as initialized if the `LoggerFactory` is provided as a property</description> +</entry> 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 new file mode 100644 index 0000000..32b57cf --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.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="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.0.xsd"; + type="removed"> + <issue id="LOG4J2-3333" link="https://issues.apache.org/jira/browse/LOG4J2-3333"/> + <author id="ckozak"/> + <description format="asciidoc">Fix `ThreadContextDataInjector` initialization deadlock</description> +</entry> 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 new file mode 100644 index 0000000..58f51df --- /dev/null +++ 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 @@ -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="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.0.xsd"; + type="removed"> + <issue id="LOG4J2-3405" link="https://issues.apache.org/jira/browse/LOG4J2-3405"/> + <author id="rgoers"/> + <description format="asciidoc">Document that the Spring Boot Lookup requires the `log4j-spring-boot` dependency</description> +</entry> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/.release-notes.adoc.ftl new file mode 100644 index 0000000..a388c95 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/.release-notes.adoc.ftl @@ -0,0 +1,36 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> + +This release primarily contains bug fixes and minor enhancements. + +Due to a break in compatibility in the SLF4J binding, Log4j now ships with two versions of the SLF4J to Log4j adapters. +`log4j-slf4j-impl` should be used with SLF4J 1.7.x and earlier and `log4j-slf4j18-impl` should be used with SLF4J 1.8.x and later. +SLF4J-2.0.0 alpha releases are not fully supported. +See https://issues.apache.org/jira/browse/LOG4J2-2975[LOG4J2-2975] and https://jira.qos.ch/browse/SLF4J-511[SLF4J-511]. + +The Log4j 2.18.0 API, as well as many core components, maintains binary compatibility with previous releases. + +Apache Log4j 2.18.0 requires a minimum of Java 8 to build and run. +Log4j 2.12.4 is the last release to support Java 7. +Log4j 2.3.2 is the last release to support Java 6. +Java 6 and Java 7 are no longer supported by the Log4j team. + +For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. + +<#include "../.changelog.adoc.ftl"> 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 new file mode 100644 index 0000000..1d064d7 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/.release.xml @@ -0,0 +1,21 @@ +<?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. + --> +<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.0.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 new file mode 100644 index 0000000..8bb07a4 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.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="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.0.xsd"; + type="fixed"> + <issue id="LOG4J2-3339" link="https://issues.apache.org/jira/browse/LOG4J2-3339"/> + <author id="rgoers"/> + <description format="asciidoc">`DirectWriteRolloverStrategy` should use the current time when creating files</description> +</entry> 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 new file mode 100644 index 0000000..e4c1079 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.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="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.0.xsd"; + type="removed"> + <issue id="LOG4J2-3490" link="https://issues.apache.org/jira/browse/LOG4J2-3490"/> + <author id="rgoers"/> + <description format="asciidoc">The `DirectWriteRolloverStrategy` was not detecting the correct index to use during startup</description> +</entry> 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 new file mode 100644 index 0000000..9d83a55 --- /dev/null +++ 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 @@ -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="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.0.xsd"; + type="added"> + <issue id="LOG4J2-3527" link="https://issues.apache.org/jira/browse/LOG4J2-3527"/> + <author id="rgoers"/> + <description format="asciidoc">Don't use `Paths.get()` to avoid circular file systems</description> +</entry> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.adoc.ftl new file mode 100644 index 0000000..baa52d9 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.adoc.ftl @@ -0,0 +1,21 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> +<#include ".release-notes.common.ftl"> + +<#include "../.changelog.adoc.ftl"> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.common.ftl b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.common.ftl new file mode 100644 index 0000000..a1267ac --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.common.ftl @@ -0,0 +1,18 @@ +<#-- + 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 + + https://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. +--> + +Changes staged for the next 2.19.0 version that is yet to be released. diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.md.ftl b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.md.ftl new file mode 100644 index 0000000..122eabd --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.md.ftl @@ -0,0 +1,21 @@ +<#-- + 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 + + https://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. +--> + +### ${release.version}<#if release.date?has_content> (${release.date})</#if> ### +<#include ".release-notes.common.ftl"> + +<#include "../.changelog.txt.ftl"> diff --git a/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.txt.ftl b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.txt.ftl new file mode 100644 index 0000000..122eabd --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release-notes.txt.ftl @@ -0,0 +1,21 @@ +<#-- + 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 + + https://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. +--> + +### ${release.version}<#if release.date?has_content> (${release.date})</#if> ### +<#include ".release-notes.common.ftl"> + +<#include "../.changelog.txt.ftl"> 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 new file mode 100644 index 0000000..1c60333 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/.release.xml @@ -0,0 +1,21 @@ +<?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. + --> +<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.0.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 new file mode 100644 index 0000000..26b5621 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.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="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.0.xsd"; + type="changed"> + <issue id="LOG4J2-3572" link="https://issues.apache.org/jira/browse/LOG4J2-3572"/> + <author id="rgoers"/> + <description format="asciidoc">Add `getExplicitLevel` method to `LoggerConfig`</description> +</entry> 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 new file mode 100644 index 0000000..4722ff8 --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.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="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.0.xsd"; + type="fixed"> + <issue id="LOG4J2-3584" link="https://issues.apache.org/jira/browse/LOG4J2-3584"/> + <author id="vy"/> + <description format="asciidoc">Make `StatusConsoleListener` use `SimpleLogger` internally</description> +</entry> 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 new file mode 100644 index 0000000..58a686c --- /dev/null +++ b/log4j-changelog/src/test/resources/6-enriched-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml @@ -0,0 +1,26 @@ +<?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="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.0.xsd"; + type="fixed"> + <issue id="LOG4J2-3614" link="https://issues.apache.org/jira/browse/LOG4J2-3614"/> + <author id="vy"/> + <author name="strainu"/> + <description format="asciidoc">Harden `InstantFormatter` against delegate failures</description> +</entry> diff --git a/log4j-changelog/src/test/resources/7-released-again/.3.x.x/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/.release-notes.adoc.ftl new file mode 100644 index 0000000..95a0397 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/.release-notes.adoc.ftl @@ -0,0 +1,22 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> + +Changes staged for the next 3.x.x version that is yet to be released. + +<#include "../.changelog.adoc.ftl"> 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 new file mode 100644 index 0000000..e1061f7 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1220_Simplify_site_generation.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="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.0.xsd"; + type="changed"> + <issue id="1220" link="https://github.com/apache/logging-log4j2/pull/1220"/> + <author id="vy"/> + <description format="asciidoc">Simplify Maven `site` phase and align it with the one in `release-2.x` branch</description> +</entry> 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 new file mode 100644 index 0000000..1fad519 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/1221_switch_from_jira_to_github_issues.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="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.0.xsd"; + type="changed"> + <issue id="1221" link="https://github.com/apache/logging-log4j2/pull/1221"/> + <author id="vy"/> + <description format="asciidoc">Switch the issue tracker from https://issues.apache.org/jira/browse/LOG4J2[JIRA] to https://github.com/apache/logging-log4j2/issues[GitHub Issues]</description> +</entry> 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 new file mode 100644 index 0000000..e812464 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/.3.x.x/LOG4J2-857_Add_Ordered_annotation_to_support_plugin_ordering_when_tw.xml @@ -0,0 +1,27 @@ +<?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="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.0.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> +</entry> diff --git a/log4j-changelog/src/test/resources/7-released-again/.4.x.x/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/7-released-again/.4.x.x/.release-notes.adoc.ftl new file mode 100644 index 0000000..c01f82f --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/.4.x.x/.release-notes.adoc.ftl @@ -0,0 +1,22 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> + +Changes staged for the next 4.x.x version that is yet to be released. + +<#include "../.changelog.adoc.ftl"> 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 new file mode 100644 index 0000000..188eff4 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/.changelog.adoc.ftl @@ -0,0 +1,48 @@ +<#-- + 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 + + https://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. +--> +<#if entriesByType?size gt 0>== Changes +<#list entriesByType as entryType, entries> + +=== ${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>) +</#list> +</#list> +</#if> diff --git a/log4j-changelog/src/test/resources/7-released-again/.changelog.txt.ftl b/log4j-changelog/src/test/resources/7-released-again/.changelog.txt.ftl new file mode 100644 index 0000000..fd135eb --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/.changelog.txt.ftl @@ -0,0 +1,26 @@ +<#-- + 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 + + https://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. +--> +<#if entriesByType?size gt 0>=== Changes +<#list entriesByType as entryType, entries> + +--- ${entryType?capitalize} + +<#list entries as entry> +* ${entry.description.text?replace("\\s+", " ", "r")} (<#list entry.issues as issue>${issue.link}[${issue.id}]<#if issue?has_next>, </#if></#list>) +</#list> +</#list> +</#if> diff --git a/log4j-changelog/src/test/resources/7-released-again/.index.adoc.ftl b/log4j-changelog/src/test/resources/7-released-again/.index.adoc.ftl new file mode 100644 index 0000000..8be38da --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/.index.adoc.ftl @@ -0,0 +1,22 @@ +//// + 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 + + https://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. +//// + += Release notes + +<#list releases as release><#if release.changelogEntryCount gt 0> +* xref:${release.version}.adoc[${release.version}]<#if release.date?has_content> (${release.date})</#if> +</#if></#list> diff --git a/log4j-changelog/src/test/resources/7-released-again/2.17.2/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/7-released-again/2.17.2/.release-notes.adoc.ftl new file mode 100644 index 0000000..bc0ffc4 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.17.2/.release-notes.adoc.ftl @@ -0,0 +1,47 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> + +This release contains the changes noted below: + +* Over 50 improvements and fixes to the Log4j 1.x support. +Continued testing has shown it is a suitable replacement for Log4j 1.x in most cases. +* Scripting now requires a system property be specified naming the languages the user wishes to allow. +The scripting engine will not load if the property isn't set. +* By default, the only remote protocol allowed for loading configuration files is HTTPS. +Users can specify a system property to allow others or prevent remote loading entirely. +* Variable resolution has been modified so that only properties defined as properties in the configuration file can be recursive. +All other Lookups are now non-recursive. +This addresses issues users were having resolving lookups specified in property definitions for use in the `RoutingAppender` and `RollingFileAppender` due to restrictions put in place in 2.17.1. +* Many other fixes and improvements. + +Due to a break in compatibility in the SLF4J binding, Log4j now ships with two versions of the SLF4J to Log4j adapters. +`log4j-slf4j-impl` should be used with SLF4J 1.7.x and earlier and `log4j-slf4j18-impl` should be used with SLF4J 1.8.x and later. +SLF4J-2.0.0 alpha releases are not fully supported. +See https://issues.apache.org/jira/browse/LOG4J2-2975[LOG4J2-2975] and https://jira.qos.ch/browse/SLF4J-511[SLF4J-511]. + +The Log4j 2.17.2 API, as well as many core components, maintains binary compatibility with previous releases. + +Apache Log4j 2.17.2 requires a minimum of Java 8 to build and run. +Log4j 2.12.4 is the last release to support Java 7. +Log4j 2.3.2 is the last release to support Java 6. +Java 6 and Java 7 are no longer supported by the Log4j team. + +For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. + +<#include "../.changelog.adoc.ftl"> 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 new file mode 100644 index 0000000..f8ba78b --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.17.2/.release.xml @@ -0,0 +1,21 @@ +<?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. + --> +<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.0.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 new file mode 100644 index 0000000..45314ea --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3304_Flag_LogManager_as_initialized_if_the_LoggerFactory_is_provi.xml @@ -0,0 +1,26 @@ +<?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="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.0.xsd"; + type="fixed"> + <issue id="LOG4J2-3304" link="https://issues.apache.org/jira/browse/LOG4J2-3304"/> + <author id="rgoers"/> + <author name="francis-FY"/> + <description format="asciidoc">Flag `LogManager` as initialized if the `LoggerFactory` is provided as a property</description> +</entry> 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 new file mode 100644 index 0000000..32b57cf --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.17.2/LOG4J2-3333_Fix_ThreadContextDataInjector_initialization_deadlock.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="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.0.xsd"; + type="removed"> + <issue id="LOG4J2-3333" link="https://issues.apache.org/jira/browse/LOG4J2-3333"/> + <author id="ckozak"/> + <description format="asciidoc">Fix `ThreadContextDataInjector` initialization deadlock</description> +</entry> 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 new file mode 100644 index 0000000..58f51df --- /dev/null +++ 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 @@ -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="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.0.xsd"; + type="removed"> + <issue id="LOG4J2-3405" link="https://issues.apache.org/jira/browse/LOG4J2-3405"/> + <author id="rgoers"/> + <description format="asciidoc">Document that the Spring Boot Lookup requires the `log4j-spring-boot` dependency</description> +</entry> diff --git a/log4j-changelog/src/test/resources/7-released-again/2.18.0/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/7-released-again/2.18.0/.release-notes.adoc.ftl new file mode 100644 index 0000000..a388c95 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.18.0/.release-notes.adoc.ftl @@ -0,0 +1,36 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> + +This release primarily contains bug fixes and minor enhancements. + +Due to a break in compatibility in the SLF4J binding, Log4j now ships with two versions of the SLF4J to Log4j adapters. +`log4j-slf4j-impl` should be used with SLF4J 1.7.x and earlier and `log4j-slf4j18-impl` should be used with SLF4J 1.8.x and later. +SLF4J-2.0.0 alpha releases are not fully supported. +See https://issues.apache.org/jira/browse/LOG4J2-2975[LOG4J2-2975] and https://jira.qos.ch/browse/SLF4J-511[SLF4J-511]. + +The Log4j 2.18.0 API, as well as many core components, maintains binary compatibility with previous releases. + +Apache Log4j 2.18.0 requires a minimum of Java 8 to build and run. +Log4j 2.12.4 is the last release to support Java 7. +Log4j 2.3.2 is the last release to support Java 6. +Java 6 and Java 7 are no longer supported by the Log4j team. + +For complete information on Apache Log4j 2, including instructions on how to submit bug reports, patches, or suggestions for improvement, see http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website]. + +<#include "../.changelog.adoc.ftl"> 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 new file mode 100644 index 0000000..1d064d7 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.18.0/.release.xml @@ -0,0 +1,21 @@ +<?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. + --> +<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.0.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 new file mode 100644 index 0000000..8bb07a4 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3339_DirectWriteRolloverStrategy_should_use_the_current_time_when.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="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.0.xsd"; + type="fixed"> + <issue id="LOG4J2-3339" link="https://issues.apache.org/jira/browse/LOG4J2-3339"/> + <author id="rgoers"/> + <description format="asciidoc">`DirectWriteRolloverStrategy` should use the current time when creating files</description> +</entry> 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 new file mode 100644 index 0000000..e4c1079 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.18.0/LOG4J2-3490_The_DirectWriteRolloverStrategy_was_not_detecting_the_correc.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="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.0.xsd"; + type="removed"> + <issue id="LOG4J2-3490" link="https://issues.apache.org/jira/browse/LOG4J2-3490"/> + <author id="rgoers"/> + <description format="asciidoc">The `DirectWriteRolloverStrategy` was not detecting the correct index to use during startup</description> +</entry> 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 new file mode 100644 index 0000000..9d83a55 --- /dev/null +++ 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 @@ -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="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.0.xsd"; + type="added"> + <issue id="LOG4J2-3527" link="https://issues.apache.org/jira/browse/LOG4J2-3527"/> + <author id="rgoers"/> + <description format="asciidoc">Don't use `Paths.get()` to avoid circular file systems</description> +</entry> diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.adoc.ftl b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.adoc.ftl new file mode 100644 index 0000000..baa52d9 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.adoc.ftl @@ -0,0 +1,21 @@ +//// + 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 + + https://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. +//// + += ${release.version}<#if release.date?has_content> (${release.date})</#if> +<#include ".release-notes.common.ftl"> + +<#include "../.changelog.adoc.ftl"> diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.common.ftl b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.common.ftl new file mode 100644 index 0000000..a1267ac --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.common.ftl @@ -0,0 +1,18 @@ +<#-- + 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 + + https://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. +--> + +Changes staged for the next 2.19.0 version that is yet to be released. diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.md.ftl b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.md.ftl new file mode 100644 index 0000000..122eabd --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.md.ftl @@ -0,0 +1,21 @@ +<#-- + 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 + + https://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. +--> + +### ${release.version}<#if release.date?has_content> (${release.date})</#if> ### +<#include ".release-notes.common.ftl"> + +<#include "../.changelog.txt.ftl"> diff --git a/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.txt.ftl b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.txt.ftl new file mode 100644 index 0000000..122eabd --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release-notes.txt.ftl @@ -0,0 +1,21 @@ +<#-- + 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 + + https://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. +--> + +### ${release.version}<#if release.date?has_content> (${release.date})</#if> ### +<#include ".release-notes.common.ftl"> + +<#include "../.changelog.txt.ftl"> 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 new file mode 100644 index 0000000..1c60333 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/.release.xml @@ -0,0 +1,21 @@ +<?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. + --> +<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.0.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 new file mode 100644 index 0000000..26b5621 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3572_Add_getExplicitLevel_method_to_LoggerConfig.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="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.0.xsd"; + type="changed"> + <issue id="LOG4J2-3572" link="https://issues.apache.org/jira/browse/LOG4J2-3572"/> + <author id="rgoers"/> + <description format="asciidoc">Add `getExplicitLevel` method to `LoggerConfig`</description> +</entry> 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 new file mode 100644 index 0000000..4722ff8 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3584_Make_StatusConsoleListener_use_SimpleLogger_internally.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="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.0.xsd"; + type="fixed"> + <issue id="LOG4J2-3584" link="https://issues.apache.org/jira/browse/LOG4J2-3584"/> + <author id="vy"/> + <description format="asciidoc">Make `StatusConsoleListener` use `SimpleLogger` internally</description> +</entry> 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 new file mode 100644 index 0000000..58a686c --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3614_Harden_InstantFormatter_against_delegate_failures.xml @@ -0,0 +1,26 @@ +<?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="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.0.xsd"; + type="fixed"> + <issue id="LOG4J2-3614" link="https://issues.apache.org/jira/browse/LOG4J2-3614"/> + <author id="vy"/> + <author name="strainu"/> + <description format="asciidoc">Harden `InstantFormatter` against delegate failures</description> +</entry> 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 new file mode 100644 index 0000000..6a2cd42 --- /dev/null +++ b/log4j-changelog/src/test/resources/7-released-again/2.19.0/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml @@ -0,0 +1,26 @@ +<?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"; + type="fixed"> + <issue id="LOG4J2-3657" link="https://issues.apache.org/jira/browse/LOG4J2-3657"/> + <author name="Marat Kamalov"/> + <author id="vy"/> + <description format="asciidoc">When ``ThreadLocal``s are disabled, avoid allocating them in `AbstractLogger` causing memory leaks due to retained reference to class loaders in web applications</description> +</entry> diff --git a/src/changelog/.0.x.x/fix_repetitive_release.xml b/src/changelog/.0.x.x/fix_repetitive_release.xml new file mode 100644 index 0000000..410ce47 --- /dev/null +++ b/src/changelog/.0.x.x/fix_repetitive_release.xml @@ -0,0 +1,24 @@ +<?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"; + type="fixed"> + <author id="vy"/> + <description format="markdown">Fix changelog entry and template file population on multiple Maven `release` goal invocations</description> +</entry>
