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

github-bot pushed a commit to branch release/2.21.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release/2.21.0 by this push:
     new 2b8a27f87a Release changelog for version `2.21.0`
2b8a27f87a is described below

commit 2b8a27f87a2163acb61490c2570033759d71289c
Author: ASF Logging Services RM <priv...@logging.apache.org>
AuthorDate: Thu Oct 12 13:31:21 2023 +0000

    Release changelog for version `2.21.0`
---
 src/changelog/2.21.0/.release-notes.adoc.ftl       | 46 +++++++++++++
 .../.release.xml}                                  | 12 ++--
 .../1231_validation_path_condition.xml             |  0
 .../1232_log4j-to-sfl4j-2-OSGiMetadata.xml         |  0
 .../{.2.x.x => 2.21.0}/1275_fix-javadoc.xml        |  0
 .../1281_remove_locale-dependent_toLowerCase.xml   |  0
 .../1284_redirect_old_javadoc_urls.xml             |  0
 .../1312_add_environment_arbiter.xml               |  0
 .../{.2.x.x => 2.21.0}/1365_open-FileExtension.xml |  0
 .../{.2.x.x => 2.21.0}/1366_fix_java_sql_date.xml  |  0
 ...1367_Missing-Bundle-Activation-OSGiMetadata.xml |  0
 .../1369_bump_build_requirement_jdk_11.xml         |  0
 ...tringResolver_uses_instance_after_recycling.xml |  0
 .../1381_support_parents_in_MarkerResolver.xml     |  0
 ..._connectionStringSource_in_MongoDb4Provider.xml |  0
 .../1391_fix_NPE_in_PluginElementVisitor.xml       |  0
 .../1405_column_mapping_rename_type_attribute.xml  |  0
 .../1414_restore_SLF4J_Log4jMarker_visibility.xml  |  0
 ..._fix_ArrayOutOfBound_in_Log4jFixedFormatter.xml |  0
 .../1445_1549_fix_sync_roll_action_propagation.xml |  0
 .../1445_fix_synchronous_rolling_file_manager.xml  |  0
 .../1484_fix_StackLocator_stdout.xml               |  0
 ...5_fix_DatePatternConverter_when_TL_disabled.xml |  0
 .../1503_change_defaults_for_LevelRangeFilter.xml  |  0
 .../{.2.x.x => 2.21.0}/1508_fix-javadoc.xml        |  0
 ...1530_fix_runtime-dependencies_documentation.xml |  0
 .../1533_set_fqcn_eventbuilder.xml                 |  0
 ...e_of_incorrect_syntax_of_highlighting_style.xml |  0
 .../1550_multiple_filter_invocations.xml           |  0
 .../{.2.x.x => 2.21.0}/1589_mongodb_tests.xml      |  0
 .../1626_parameter_format_rewrite.xml              |  0
 .../1640_java_9_stack_trace_element.xml            |  0
 .../{.2.x.x => 2.21.0}/1646_unsafe_cleaner.xml     |  0
 .../1650_fix_rollover_strategy_log4j1.xml          |  0
 .../1681_fix_and_improve_lookup_docs.xml           |  0
 .../1692_make_JTL_LocationAware.xml                |  0
 .../1747_mongodb4-long-collection-size-conifg.xml  |  0
 ...a_version_specific_warnings_in_StackLocator.xml |  0
 ...w_multiple_servletcontextlistener_instances.xml |  0
 .../1783_spring_arbiter_without_environment.xml    |  0
 .../1786_fix_async_context_data_loss.xml           |  0
 .../1805_fix_NPE_in_JTL_LevelResolver.xml          |  0
 .../LOG4J2-170_Improve_XML_schema.xml              |  0
 .../LOG4J2-3217_fix_NPE_in_ContextSelector.xml     |  0
 .../LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml |  0
 ...ix_notEmpty_converter_for_empty_collections.xml |  0
 ...4J2-3663_fix_file_descriptor_leak_on_Tomcat.xml |  0
 .../{.2.x.x => 2.21.0}/OsgiServiceLocator_npe.xml  |  0
 .../{.2.x.x => 2.21.0}/PreventResourceLeak.xml     |  0
 .../{.2.x.x => 2.21.0}/new-release-process.xml     |  0
 .../{.2.x.x => 2.21.0}/remove-jmx-gui.xml          |  0
 .../update-1runtime-angus-activation.xml           |  0
 .../update-1runtime-angus-mail.xml                 |  0
 .../update-1runtime-cassandra-driver.xml           |  0
 .../update-1runtime-cassandra.xml                  |  0
 .../update-1runtime-commons-compress.xml           |  0
 .../update-1runtime-commons-csv.xml                |  0
 .../{.2.x.x => 2.21.0}/update-1runtime-jackson.xml |  0
 .../update-1runtime-jakarta-activation.xml         |  0
 .../update-1runtime-jakarta-mail.xml               |  0
 .../{.2.x.x => 2.21.0}/update-1runtime-jctools.xml |  0
 .../{.2.x.x => 2.21.0}/update-1runtime-kafka.xml   |  0
 .../update-1runtime-kubernetes.xml                 |  0
 .../{.2.x.x => 2.21.0}/update-1runtime-mongodb.xml |  0
 .../{.2.x.x => 2.21.0}/update-1runtime-netty.xml   |  0
 .../update-1runtime-spring-boot.xml                |  0
 .../update-1runtime-spring-framework.xml           |  0
 .../update-1runtime-tomcat-juli.xml                |  0
 .../update-1runtime-woodstox.xml                   |  0
 src/site/_constants.adoc                           |  2 +-
 src/site/_release-notes.adoc                       |  2 +-
 .../_release-notes/{_2.x.x.adoc => _2.21.0.adoc}   |  6 +-
 src/site/_release-notes/_2.x.x.adoc                | 79 ----------------------
 73 files changed, 55 insertions(+), 92 deletions(-)

diff --git a/src/changelog/2.21.0/.release-notes.adoc.ftl 
b/src/changelog/2.21.0/.release-notes.adoc.ftl
new file mode 100644
index 0000000000..4bef52a4a9
--- /dev/null
+++ b/src/changelog/2.21.0/.release-notes.adoc.ftl
@@ -0,0 +1,46 @@
+////
+    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-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+== ${release.version}
+
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This release primarily focuses on enhancements to our OSGi and JPMS support 
and contains several bug fixes.
+It will be the first release built and signed by the CI using the 
https://keyserver.ubuntu.com/pks/lookup?search=077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0&op=index[ASF
 Logging Services Release Manager GPG key], which is shared in 
https://www.apache.org/dist/logging/KEYS[KEYS].
+
+The Log4j 2.21.0 API, as well as the other artifacts, maintains binary 
compatibility with the previous release.
+
+Apache Log4j 2.21.0 requires Java 8 to run.
+The build requires JDK 11 and generates reproducible binaries.
+
+For complete information on Apache Log4j 2, including instructions on how to 
submit bug reports, patches, get support, or suggestions for improvement, see 
http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website].
+
+=== OSGi changes
+
+All the published artifacts are OSGi bundles or fragments.
+
+This release introduces a change in the bundle symbolic names to allow them to 
function as JPMS module name: all hyphens `-` present in the bundle names of 
previous releases were replaced by dots `.`.
+
+=== JPMS changes
+
+All the published artifacts have been migrated from automatic modules to named 
JPMS modules.
+All packages marked as private in the Javadoc are not exported.
+
+The module name of four bridges (`log4j-slf4j-impl`, `log4j-slf4j2-impl`, 
`log4j-to-jul` and `log4j-to-slf4j`) have been changed to adhere to the same 
convention as the OSGi bundle names.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/.2.x.x/new-release-process.xml 
b/src/changelog/2.21.0/.release.xml
similarity index 67%
copy from src/changelog/.2.x.x/new-release-process.xml
copy to src/changelog/2.21.0/.release.xml
index 6530dcb9e7..587d92e7f5 100644
--- a/src/changelog/.2.x.x/new-release-process.xml
+++ b/src/changelog/2.21.0/.release.xml
@@ -15,11 +15,7 @@
   ~ 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="changed">
-  <author name="github:pkarwasz"/>
-  <author name="github:vy"/>
-  <description format="asciidoc">Implemented a CI-based release 
process</description>
-</entry>
+<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-10-12" version="2.21.0"/>
diff --git a/src/changelog/.2.x.x/1231_validation_path_condition.xml 
b/src/changelog/2.21.0/1231_validation_path_condition.xml
similarity index 100%
rename from src/changelog/.2.x.x/1231_validation_path_condition.xml
rename to src/changelog/2.21.0/1231_validation_path_condition.xml
diff --git a/src/changelog/.2.x.x/1232_log4j-to-sfl4j-2-OSGiMetadata.xml 
b/src/changelog/2.21.0/1232_log4j-to-sfl4j-2-OSGiMetadata.xml
similarity index 100%
rename from src/changelog/.2.x.x/1232_log4j-to-sfl4j-2-OSGiMetadata.xml
rename to src/changelog/2.21.0/1232_log4j-to-sfl4j-2-OSGiMetadata.xml
diff --git a/src/changelog/.2.x.x/1275_fix-javadoc.xml 
b/src/changelog/2.21.0/1275_fix-javadoc.xml
similarity index 100%
rename from src/changelog/.2.x.x/1275_fix-javadoc.xml
rename to src/changelog/2.21.0/1275_fix-javadoc.xml
diff --git a/src/changelog/.2.x.x/1281_remove_locale-dependent_toLowerCase.xml 
b/src/changelog/2.21.0/1281_remove_locale-dependent_toLowerCase.xml
similarity index 100%
rename from src/changelog/.2.x.x/1281_remove_locale-dependent_toLowerCase.xml
rename to src/changelog/2.21.0/1281_remove_locale-dependent_toLowerCase.xml
diff --git a/src/changelog/.2.x.x/1284_redirect_old_javadoc_urls.xml 
b/src/changelog/2.21.0/1284_redirect_old_javadoc_urls.xml
similarity index 100%
rename from src/changelog/.2.x.x/1284_redirect_old_javadoc_urls.xml
rename to src/changelog/2.21.0/1284_redirect_old_javadoc_urls.xml
diff --git a/src/changelog/.2.x.x/1312_add_environment_arbiter.xml 
b/src/changelog/2.21.0/1312_add_environment_arbiter.xml
similarity index 100%
rename from src/changelog/.2.x.x/1312_add_environment_arbiter.xml
rename to src/changelog/2.21.0/1312_add_environment_arbiter.xml
diff --git a/src/changelog/.2.x.x/1365_open-FileExtension.xml 
b/src/changelog/2.21.0/1365_open-FileExtension.xml
similarity index 100%
rename from src/changelog/.2.x.x/1365_open-FileExtension.xml
rename to src/changelog/2.21.0/1365_open-FileExtension.xml
diff --git a/src/changelog/.2.x.x/1366_fix_java_sql_date.xml 
b/src/changelog/2.21.0/1366_fix_java_sql_date.xml
similarity index 100%
rename from src/changelog/.2.x.x/1366_fix_java_sql_date.xml
rename to src/changelog/2.21.0/1366_fix_java_sql_date.xml
diff --git 
a/src/changelog/.2.x.x/1367_Missing-Bundle-Activation-OSGiMetadata.xml 
b/src/changelog/2.21.0/1367_Missing-Bundle-Activation-OSGiMetadata.xml
similarity index 100%
rename from src/changelog/.2.x.x/1367_Missing-Bundle-Activation-OSGiMetadata.xml
rename to src/changelog/2.21.0/1367_Missing-Bundle-Activation-OSGiMetadata.xml
diff --git a/src/changelog/.2.x.x/1369_bump_build_requirement_jdk_11.xml 
b/src/changelog/2.21.0/1369_bump_build_requirement_jdk_11.xml
similarity index 100%
rename from src/changelog/.2.x.x/1369_bump_build_requirement_jdk_11.xml
rename to src/changelog/2.21.0/1369_bump_build_requirement_jdk_11.xml
diff --git 
a/src/changelog/.2.x.x/1380_StackTraceStringResolver_uses_instance_after_recycling.xml
 
b/src/changelog/2.21.0/1380_StackTraceStringResolver_uses_instance_after_recycling.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/1380_StackTraceStringResolver_uses_instance_after_recycling.xml
rename to 
src/changelog/2.21.0/1380_StackTraceStringResolver_uses_instance_after_recycling.xml
diff --git a/src/changelog/.2.x.x/1381_support_parents_in_MarkerResolver.xml 
b/src/changelog/2.21.0/1381_support_parents_in_MarkerResolver.xml
similarity index 100%
rename from src/changelog/.2.x.x/1381_support_parents_in_MarkerResolver.xml
rename to src/changelog/2.21.0/1381_support_parents_in_MarkerResolver.xml
diff --git 
a/src/changelog/.2.x.x/1389_Added_missing_setter_for_connectionStringSource_in_MongoDb4Provider.xml
 
b/src/changelog/2.21.0/1389_Added_missing_setter_for_connectionStringSource_in_MongoDb4Provider.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/1389_Added_missing_setter_for_connectionStringSource_in_MongoDb4Provider.xml
rename to 
src/changelog/2.21.0/1389_Added_missing_setter_for_connectionStringSource_in_MongoDb4Provider.xml
diff --git a/src/changelog/.2.x.x/1391_fix_NPE_in_PluginElementVisitor.xml 
b/src/changelog/2.21.0/1391_fix_NPE_in_PluginElementVisitor.xml
similarity index 100%
rename from src/changelog/.2.x.x/1391_fix_NPE_in_PluginElementVisitor.xml
rename to src/changelog/2.21.0/1391_fix_NPE_in_PluginElementVisitor.xml
diff --git a/src/changelog/.2.x.x/1405_column_mapping_rename_type_attribute.xml 
b/src/changelog/2.21.0/1405_column_mapping_rename_type_attribute.xml
similarity index 100%
rename from src/changelog/.2.x.x/1405_column_mapping_rename_type_attribute.xml
rename to src/changelog/2.21.0/1405_column_mapping_rename_type_attribute.xml
diff --git a/src/changelog/.2.x.x/1414_restore_SLF4J_Log4jMarker_visibility.xml 
b/src/changelog/2.21.0/1414_restore_SLF4J_Log4jMarker_visibility.xml
similarity index 100%
rename from src/changelog/.2.x.x/1414_restore_SLF4J_Log4jMarker_visibility.xml
rename to src/changelog/2.21.0/1414_restore_SLF4J_Log4jMarker_visibility.xml
diff --git 
a/src/changelog/.2.x.x/1418_fix_ArrayOutOfBound_in_Log4jFixedFormatter.xml 
b/src/changelog/2.21.0/1418_fix_ArrayOutOfBound_in_Log4jFixedFormatter.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/1418_fix_ArrayOutOfBound_in_Log4jFixedFormatter.xml
rename to 
src/changelog/2.21.0/1418_fix_ArrayOutOfBound_in_Log4jFixedFormatter.xml
diff --git 
a/src/changelog/.2.x.x/1445_1549_fix_sync_roll_action_propagation.xml 
b/src/changelog/2.21.0/1445_1549_fix_sync_roll_action_propagation.xml
similarity index 100%
rename from src/changelog/.2.x.x/1445_1549_fix_sync_roll_action_propagation.xml
rename to src/changelog/2.21.0/1445_1549_fix_sync_roll_action_propagation.xml
diff --git a/src/changelog/.2.x.x/1445_fix_synchronous_rolling_file_manager.xml 
b/src/changelog/2.21.0/1445_fix_synchronous_rolling_file_manager.xml
similarity index 100%
rename from src/changelog/.2.x.x/1445_fix_synchronous_rolling_file_manager.xml
rename to src/changelog/2.21.0/1445_fix_synchronous_rolling_file_manager.xml
diff --git a/src/changelog/.2.x.x/1484_fix_StackLocator_stdout.xml 
b/src/changelog/2.21.0/1484_fix_StackLocator_stdout.xml
similarity index 100%
rename from src/changelog/.2.x.x/1484_fix_StackLocator_stdout.xml
rename to src/changelog/2.21.0/1484_fix_StackLocator_stdout.xml
diff --git 
a/src/changelog/.2.x.x/1485_fix_DatePatternConverter_when_TL_disabled.xml 
b/src/changelog/2.21.0/1485_fix_DatePatternConverter_when_TL_disabled.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/1485_fix_DatePatternConverter_when_TL_disabled.xml
rename to 
src/changelog/2.21.0/1485_fix_DatePatternConverter_when_TL_disabled.xml
diff --git a/src/changelog/.2.x.x/1503_change_defaults_for_LevelRangeFilter.xml 
b/src/changelog/2.21.0/1503_change_defaults_for_LevelRangeFilter.xml
similarity index 100%
rename from src/changelog/.2.x.x/1503_change_defaults_for_LevelRangeFilter.xml
rename to src/changelog/2.21.0/1503_change_defaults_for_LevelRangeFilter.xml
diff --git a/src/changelog/.2.x.x/1508_fix-javadoc.xml 
b/src/changelog/2.21.0/1508_fix-javadoc.xml
similarity index 100%
rename from src/changelog/.2.x.x/1508_fix-javadoc.xml
rename to src/changelog/2.21.0/1508_fix-javadoc.xml
diff --git 
a/src/changelog/.2.x.x/1530_fix_runtime-dependencies_documentation.xml 
b/src/changelog/2.21.0/1530_fix_runtime-dependencies_documentation.xml
similarity index 100%
rename from src/changelog/.2.x.x/1530_fix_runtime-dependencies_documentation.xml
rename to src/changelog/2.21.0/1530_fix_runtime-dependencies_documentation.xml
diff --git a/src/changelog/.2.x.x/1533_set_fqcn_eventbuilder.xml 
b/src/changelog/2.21.0/1533_set_fqcn_eventbuilder.xml
similarity index 100%
rename from src/changelog/.2.x.x/1533_set_fqcn_eventbuilder.xml
rename to src/changelog/2.21.0/1533_set_fqcn_eventbuilder.xml
diff --git 
a/src/changelog/.2.x.x/1545_add_warn_in_case_of_incorrect_syntax_of_highlighting_style.xml
 
b/src/changelog/2.21.0/1545_add_warn_in_case_of_incorrect_syntax_of_highlighting_style.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/1545_add_warn_in_case_of_incorrect_syntax_of_highlighting_style.xml
rename to 
src/changelog/2.21.0/1545_add_warn_in_case_of_incorrect_syntax_of_highlighting_style.xml
diff --git a/src/changelog/.2.x.x/1550_multiple_filter_invocations.xml 
b/src/changelog/2.21.0/1550_multiple_filter_invocations.xml
similarity index 100%
rename from src/changelog/.2.x.x/1550_multiple_filter_invocations.xml
rename to src/changelog/2.21.0/1550_multiple_filter_invocations.xml
diff --git a/src/changelog/.2.x.x/1589_mongodb_tests.xml 
b/src/changelog/2.21.0/1589_mongodb_tests.xml
similarity index 100%
rename from src/changelog/.2.x.x/1589_mongodb_tests.xml
rename to src/changelog/2.21.0/1589_mongodb_tests.xml
diff --git a/src/changelog/.2.x.x/1626_parameter_format_rewrite.xml 
b/src/changelog/2.21.0/1626_parameter_format_rewrite.xml
similarity index 100%
rename from src/changelog/.2.x.x/1626_parameter_format_rewrite.xml
rename to src/changelog/2.21.0/1626_parameter_format_rewrite.xml
diff --git a/src/changelog/.2.x.x/1640_java_9_stack_trace_element.xml 
b/src/changelog/2.21.0/1640_java_9_stack_trace_element.xml
similarity index 100%
rename from src/changelog/.2.x.x/1640_java_9_stack_trace_element.xml
rename to src/changelog/2.21.0/1640_java_9_stack_trace_element.xml
diff --git a/src/changelog/.2.x.x/1646_unsafe_cleaner.xml 
b/src/changelog/2.21.0/1646_unsafe_cleaner.xml
similarity index 100%
rename from src/changelog/.2.x.x/1646_unsafe_cleaner.xml
rename to src/changelog/2.21.0/1646_unsafe_cleaner.xml
diff --git a/src/changelog/.2.x.x/1650_fix_rollover_strategy_log4j1.xml 
b/src/changelog/2.21.0/1650_fix_rollover_strategy_log4j1.xml
similarity index 100%
rename from src/changelog/.2.x.x/1650_fix_rollover_strategy_log4j1.xml
rename to src/changelog/2.21.0/1650_fix_rollover_strategy_log4j1.xml
diff --git a/src/changelog/.2.x.x/1681_fix_and_improve_lookup_docs.xml 
b/src/changelog/2.21.0/1681_fix_and_improve_lookup_docs.xml
similarity index 100%
rename from src/changelog/.2.x.x/1681_fix_and_improve_lookup_docs.xml
rename to src/changelog/2.21.0/1681_fix_and_improve_lookup_docs.xml
diff --git a/src/changelog/.2.x.x/1692_make_JTL_LocationAware.xml 
b/src/changelog/2.21.0/1692_make_JTL_LocationAware.xml
similarity index 100%
rename from src/changelog/.2.x.x/1692_make_JTL_LocationAware.xml
rename to src/changelog/2.21.0/1692_make_JTL_LocationAware.xml
diff --git a/src/changelog/.2.x.x/1747_mongodb4-long-collection-size-conifg.xml 
b/src/changelog/2.21.0/1747_mongodb4-long-collection-size-conifg.xml
similarity index 100%
rename from src/changelog/.2.x.x/1747_mongodb4-long-collection-size-conifg.xml
rename to src/changelog/2.21.0/1747_mongodb4-long-collection-size-conifg.xml
diff --git 
a/src/changelog/.2.x.x/1760_use_java_version_specific_warnings_in_StackLocator.xml
 
b/src/changelog/2.21.0/1760_use_java_version_specific_warnings_in_StackLocator.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/1760_use_java_version_specific_warnings_in_StackLocator.xml
rename to 
src/changelog/2.21.0/1760_use_java_version_specific_warnings_in_StackLocator.xml
diff --git 
a/src/changelog/.2.x.x/1782_allow_multiple_servletcontextlistener_instances.xml 
b/src/changelog/2.21.0/1782_allow_multiple_servletcontextlistener_instances.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/1782_allow_multiple_servletcontextlistener_instances.xml
rename to 
src/changelog/2.21.0/1782_allow_multiple_servletcontextlistener_instances.xml
diff --git a/src/changelog/.2.x.x/1783_spring_arbiter_without_environment.xml 
b/src/changelog/2.21.0/1783_spring_arbiter_without_environment.xml
similarity index 100%
rename from src/changelog/.2.x.x/1783_spring_arbiter_without_environment.xml
rename to src/changelog/2.21.0/1783_spring_arbiter_without_environment.xml
diff --git a/src/changelog/.2.x.x/1786_fix_async_context_data_loss.xml 
b/src/changelog/2.21.0/1786_fix_async_context_data_loss.xml
similarity index 100%
rename from src/changelog/.2.x.x/1786_fix_async_context_data_loss.xml
rename to src/changelog/2.21.0/1786_fix_async_context_data_loss.xml
diff --git a/src/changelog/.2.x.x/1805_fix_NPE_in_JTL_LevelResolver.xml 
b/src/changelog/2.21.0/1805_fix_NPE_in_JTL_LevelResolver.xml
similarity index 100%
rename from src/changelog/.2.x.x/1805_fix_NPE_in_JTL_LevelResolver.xml
rename to src/changelog/2.21.0/1805_fix_NPE_in_JTL_LevelResolver.xml
diff --git a/src/changelog/.2.x.x/LOG4J2-170_Improve_XML_schema.xml 
b/src/changelog/2.21.0/LOG4J2-170_Improve_XML_schema.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-170_Improve_XML_schema.xml
rename to src/changelog/2.21.0/LOG4J2-170_Improve_XML_schema.xml
diff --git a/src/changelog/.2.x.x/LOG4J2-3217_fix_NPE_in_ContextSelector.xml 
b/src/changelog/2.21.0/LOG4J2-3217_fix_NPE_in_ContextSelector.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-3217_fix_NPE_in_ContextSelector.xml
rename to src/changelog/2.21.0/LOG4J2-3217_fix_NPE_in_ContextSelector.xml
diff --git 
a/src/changelog/.2.x.x/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml 
b/src/changelog/2.21.0/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
rename to src/changelog/2.21.0/LOG4J2-3657_fix_TL_usage_in_AbstractLogger.xml
diff --git 
a/src/changelog/.2.x.x/LOG4J2-3660_fix_notEmpty_converter_for_empty_collections.xml
 
b/src/changelog/2.21.0/LOG4J2-3660_fix_notEmpty_converter_for_empty_collections.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/LOG4J2-3660_fix_notEmpty_converter_for_empty_collections.xml
rename to 
src/changelog/2.21.0/LOG4J2-3660_fix_notEmpty_converter_for_empty_collections.xml
diff --git 
a/src/changelog/.2.x.x/LOG4J2-3663_fix_file_descriptor_leak_on_Tomcat.xml 
b/src/changelog/2.21.0/LOG4J2-3663_fix_file_descriptor_leak_on_Tomcat.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/LOG4J2-3663_fix_file_descriptor_leak_on_Tomcat.xml
rename to 
src/changelog/2.21.0/LOG4J2-3663_fix_file_descriptor_leak_on_Tomcat.xml
diff --git a/src/changelog/.2.x.x/OsgiServiceLocator_npe.xml 
b/src/changelog/2.21.0/OsgiServiceLocator_npe.xml
similarity index 100%
rename from src/changelog/.2.x.x/OsgiServiceLocator_npe.xml
rename to src/changelog/2.21.0/OsgiServiceLocator_npe.xml
diff --git a/src/changelog/.2.x.x/PreventResourceLeak.xml 
b/src/changelog/2.21.0/PreventResourceLeak.xml
similarity index 100%
rename from src/changelog/.2.x.x/PreventResourceLeak.xml
rename to src/changelog/2.21.0/PreventResourceLeak.xml
diff --git a/src/changelog/.2.x.x/new-release-process.xml 
b/src/changelog/2.21.0/new-release-process.xml
similarity index 100%
rename from src/changelog/.2.x.x/new-release-process.xml
rename to src/changelog/2.21.0/new-release-process.xml
diff --git a/src/changelog/.2.x.x/remove-jmx-gui.xml 
b/src/changelog/2.21.0/remove-jmx-gui.xml
similarity index 100%
rename from src/changelog/.2.x.x/remove-jmx-gui.xml
rename to src/changelog/2.21.0/remove-jmx-gui.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-angus-activation.xml 
b/src/changelog/2.21.0/update-1runtime-angus-activation.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-angus-activation.xml
rename to src/changelog/2.21.0/update-1runtime-angus-activation.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-angus-mail.xml 
b/src/changelog/2.21.0/update-1runtime-angus-mail.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-angus-mail.xml
rename to src/changelog/2.21.0/update-1runtime-angus-mail.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-cassandra-driver.xml 
b/src/changelog/2.21.0/update-1runtime-cassandra-driver.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-cassandra-driver.xml
rename to src/changelog/2.21.0/update-1runtime-cassandra-driver.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-cassandra.xml 
b/src/changelog/2.21.0/update-1runtime-cassandra.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-cassandra.xml
rename to src/changelog/2.21.0/update-1runtime-cassandra.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-commons-compress.xml 
b/src/changelog/2.21.0/update-1runtime-commons-compress.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-commons-compress.xml
rename to src/changelog/2.21.0/update-1runtime-commons-compress.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-commons-csv.xml 
b/src/changelog/2.21.0/update-1runtime-commons-csv.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-commons-csv.xml
rename to src/changelog/2.21.0/update-1runtime-commons-csv.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-jackson.xml 
b/src/changelog/2.21.0/update-1runtime-jackson.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-jackson.xml
rename to src/changelog/2.21.0/update-1runtime-jackson.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-jakarta-activation.xml 
b/src/changelog/2.21.0/update-1runtime-jakarta-activation.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-jakarta-activation.xml
rename to src/changelog/2.21.0/update-1runtime-jakarta-activation.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-jakarta-mail.xml 
b/src/changelog/2.21.0/update-1runtime-jakarta-mail.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-jakarta-mail.xml
rename to src/changelog/2.21.0/update-1runtime-jakarta-mail.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-jctools.xml 
b/src/changelog/2.21.0/update-1runtime-jctools.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-jctools.xml
rename to src/changelog/2.21.0/update-1runtime-jctools.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-kafka.xml 
b/src/changelog/2.21.0/update-1runtime-kafka.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-kafka.xml
rename to src/changelog/2.21.0/update-1runtime-kafka.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-kubernetes.xml 
b/src/changelog/2.21.0/update-1runtime-kubernetes.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-kubernetes.xml
rename to src/changelog/2.21.0/update-1runtime-kubernetes.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-mongodb.xml 
b/src/changelog/2.21.0/update-1runtime-mongodb.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-mongodb.xml
rename to src/changelog/2.21.0/update-1runtime-mongodb.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-netty.xml 
b/src/changelog/2.21.0/update-1runtime-netty.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-netty.xml
rename to src/changelog/2.21.0/update-1runtime-netty.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-spring-boot.xml 
b/src/changelog/2.21.0/update-1runtime-spring-boot.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-spring-boot.xml
rename to src/changelog/2.21.0/update-1runtime-spring-boot.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-spring-framework.xml 
b/src/changelog/2.21.0/update-1runtime-spring-framework.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-spring-framework.xml
rename to src/changelog/2.21.0/update-1runtime-spring-framework.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-tomcat-juli.xml 
b/src/changelog/2.21.0/update-1runtime-tomcat-juli.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-tomcat-juli.xml
rename to src/changelog/2.21.0/update-1runtime-tomcat-juli.xml
diff --git a/src/changelog/.2.x.x/update-1runtime-woodstox.xml 
b/src/changelog/2.21.0/update-1runtime-woodstox.xml
similarity index 100%
rename from src/changelog/.2.x.x/update-1runtime-woodstox.xml
rename to src/changelog/2.21.0/update-1runtime-woodstox.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index 078500bfd2..9e4123d270 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
 ////
 
 :project-github-url: https://github.com/apache/logging-log4j2
-:project-version: 2.21.0-SNAPSHOT
+:project-version: 2.21.0
 :project-name: Log4j
 :project-id: log4j
 :java-target-version: 8
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 6f9d281820..c4743cb131 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
 [#release-notes]
 = Release Notes
 
-include::_release-notes/_2.x.x.adoc[]
+include::_release-notes/_2.21.0.adoc[]
 include::_release-notes/_2.20.0.adoc[]
 include::_release-notes/_2.19.0.adoc[]
 include::_release-notes/_2.18.0.adoc[]
diff --git a/src/site/_release-notes/_2.x.x.adoc 
b/src/site/_release-notes/_2.21.0.adoc
similarity index 99%
copy from src/site/_release-notes/_2.x.x.adoc
copy to src/site/_release-notes/_2.21.0.adoc
index c3204dc278..eca7ba5894 100644
--- a/src/site/_release-notes/_2.x.x.adoc
+++ b/src/site/_release-notes/_2.21.0.adoc
@@ -15,10 +15,10 @@
     limitations under the License.
 ////
 
-[#release-notes-2-x-x]
-== 2.x.x
-
+[#release-notes-2-21-0]
+== 2.21.0
 
+Release date:: 2023-10-12
 
 This release primarily focuses on enhancements to our OSGi and JPMS support 
and contains several bug fixes.
 It will be the first release built and signed by the CI using the 
https://keyserver.ubuntu.com/pks/lookup?search=077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0&op=index[ASF
 Logging Services Release Manager GPG key], which is shared in 
https://www.apache.org/dist/logging/KEYS[KEYS].
diff --git a/src/site/_release-notes/_2.x.x.adoc 
b/src/site/_release-notes/_2.x.x.adoc
index c3204dc278..8e28472b1e 100644
--- a/src/site/_release-notes/_2.x.x.adoc
+++ b/src/site/_release-notes/_2.x.x.adoc
@@ -43,82 +43,3 @@ All packages marked as private in the Javadoc are not 
exported.
 
 The module name of four bridges (`log4j-slf4j-impl`, `log4j-slf4j2-impl`, 
`log4j-to-jul` and `log4j-to-slf4j`) have been changed to adhere to the same 
convention as the OSGi bundle names.
 
-
-=== Added
-
-* Added marker parent support to `JsonTemplateLayout` 
(https://github.com/apache/logging-log4j2/pull/1381[1381])
-* Added https://facebook.github.io/zstd/[ZStandard compression] support 
(https://github.com/apache/logging-log4j2/issues/1508[1508], 
https://github.com/apache/logging-log4j2/pull/1514[1514])
-* Added a warning for incorrect syntax of highlighting styles 
(https://github.com/apache/logging-log4j2/issues/1545[1545], 
https://github.com/apache/logging-log4j2/pull/1637[1637])
-
-=== Changed
-
-* Open `FileExtension` methods to allow their usage in custom 
``RolloverStrategy``s 
(https://github.com/apache/logging-log4j2/issues/1365[1365], 
https://github.com/apache/logging-log4j2/pull/1683[1683])
-* Bumped the minimum Java version required for the build to JDK 11. Runtime 
requirements remain unchanged. 
(https://github.com/apache/logging-log4j2/issues/1369[1369])
-* Set the default `minLevel` and `maxLevel` of `LevelRangeFilter` to `OFF` and 
`ALL`, respectively (https://github.com/apache/logging-log4j2/pull/1503[1503])
-* Removed additional `isFiltered` checks in `AsyncLoggerConfig` 
(https://github.com/apache/logging-log4j2/pull/1550[1550])
-* Use Java version-specific warnings in `StackLocator` 
(https://github.com/apache/logging-log4j2/pull/1760[1760])
-* Started logging a status error event instead of an NPE in 
`OsgiServiceLocator.loadServices(Class, Lookup, boolean)` when a bundle has no 
valid `BundleContext` for a service type
-* Implemented a CI-based release process
-* Update Eclipse Angus Activation to version 
https://github.com/eclipse-ee4j/angus-activation/releases/tag/2.0.1[2.0.1] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Eclipse Angus Mail to version 
https://github.com/eclipse-ee4j/angus-mail/releases/tag/2.0.2[2.0.2] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update `com.datastax.cassandra:cassandra-driver-core` to version 3.11.5 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Apache Cassandra to version 
https://github.com/apache/cassandra/blob/cassandra-3.11/CHANGES.txt[3.11.16] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Apache Commons Compress to version 
https://commons.apache.org/proper/commons-compress/changes-report.html#a1.24.0[1.24.0]
 (https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Apache Commons CSV to version 
https://commons.apache.org/proper/commons-csv/changes-report.html#a1.10.0[1.10.0]
 (https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Jackson to version 
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.15.2[2.15.2] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Jakarta Activation API to version 
https://jakarta.ee/specifications/activation/2.1/changelog/[2.1.2] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Jakarta Mail API to version 
https://jakarta.ee/specifications/mail/2.1/changelog/[2.1.2] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update JCTools to version 
https://github.com/JCTools/JCTools/blob/master/RELEASE-NOTES.md[4.0.1] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Apache Kafka to version 
https://archive.apache.org/dist/kafka/3.4.0/RELEASE_NOTES.html[3.4.0] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Kubernetes client to version 
https://github.com/fabric8io/kubernetes-client/releases?q=5.12.4[5.12.4] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update `org.mongodb:mongodb-driver-core` to version 4.10.2 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update `io.netty:netty-bom` to version 4.1.97 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Spring Boot to version 
https://github.com/spring-projects/spring-boot/releases/tag/v2.7.15[2.7.15] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Spring Framework to version 
https://github.com/spring-projects/spring-framework/releases/tag/v5.3.29[5.3.29]
 (https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Tomcat JULI to version 10.0.27 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-* Update Woodstox to version 
https://github.com/FasterXML/woodstox/blob/master/release-notes/VERSION[6.5.1] 
(https://github.com/apache/logging-log4j2/issues/1591[1591])
-
-=== Removed
-
-* Moved `log4j-jmx-gui` to 
https://github.com/apache/logging-log4j-jmx-gui/actions[its own repository] 
along with its own release cycle
-
-=== Fixed
-
-* Added validation to rolling file manager path conditions 
(https://github.com/apache/logging-log4j2/issues/1231[1231])
-* Adapted the OSGi metadata of `log4j-to-slf4j` to work with SLF4J 1 and 2. To 
achieve that used a version range of `[1.7,3)` for the imported SLF4J packages. 
(https://github.com/apache/logging-log4j2/issues/1232[1232])
-* Fixed Javadoc failures 
(https://github.com/apache/logging-log4j2/issues/1275[1275], 
https://github.com/apache/logging-log4j2/pull/1753[1753])
-* Removed locale-dependent `toLowerCase/toUpperCase` calls 
(https://github.com/apache/logging-log4j2/pull/1281[1281])
-* Redirected old `/<module>/apidocs` URLs (broken in 2.20.0) to 
`/javadoc/<module>` (https://github.com/apache/logging-log4j2/pull/1284[1284])
-* Added environment variable arbiter 
(https://github.com/apache/logging-log4j2/issues/1312[1312])
-* Fixed logging of `java.sql.Date` objects by appending it before Log4J tries 
to call `java.util.Date.toInstant()` on it 
(https://github.com/apache/logging-log4j2/pull/1366[1366])
-* Adapted the OSGi metadata of `log4j-api`, `log4j-core`, `log4j-slf4j-impl` 
and `log4j-slf4j2-impl` to activate the bundle when it is accessed. To achieve 
that set the `Bundle-ActivationPolicy` to `lazy` for the log4j bundles. 
(https://github.com/apache/logging-log4j2/issues/1367[1367])
-* Avoided using released objects in `StackTraceStringResolver` of 
`JsonTemplateLayout` (https://github.com/apache/logging-log4j2/pull/1380[1380])
-* Added missing setter for `connectionStringSource` in `MongoDb4Provider` 
builder (https://github.com/apache/logging-log4j2/issues/1389[1389])
-* Fixed NPE in `PluginElementVisitor` 
(https://github.com/apache/logging-log4j2/issues/1391[1391])
-* Added `columnType` as alias for the column mapping `type` attribute 
(https://github.com/apache/logging-log4j2/issues/1405[1405])
-* Restored `Log4jMarker` visibility in SLF4J adapters 
(https://github.com/apache/logging-log4j2/issues/1414[1414])
-* Fixed buffer size in `Log4jFixedFormatter` date time formatter 
(https://github.com/apache/logging-log4j2/pull/1418[1418])
-* Fixed the propagation of synchronous action failures in `RollingFileManager` 
and `FileRenameAction` 
(https://github.com/apache/logging-log4j2/issues/1445[1445], 
https://github.com/apache/logging-log4j2/pull/1549[1549])
-* Fixed `RollingFileManager` to propagate failed synchronous actions correctly 
(https://github.com/apache/logging-log4j2/issues/1445[1445])
-* Replaced the usage of `System.out` in `StackLocator` for warnings with 
`System.err` (https://github.com/apache/logging-log4j2/issues/1484[1484])
-* Fixed concurrent date-time formatting issue in `PatternLayout` 
(https://github.com/apache/logging-log4j2/issues/1485[1485])
-* Fixed runtime dependencies documentation 
(https://github.com/apache/logging-log4j2/pull/1530[1530])
-* Allowed to override FQCN in `Log4jEventBuilder` by implementing 
`CallerBoundaryAware` (https://github.com/apache/logging-log4j2/pull/1533[1533])
-* Migrated MongoDB tests to JUnit 5 and Flapdoodle Embedded MongoDB 4 
(https://github.com/apache/logging-log4j2/issues/1589[1589])
-* Rewrote message parameter formatter with improved escape handling 
(https://github.com/apache/logging-log4j2/issues/1626[1626])
-* Improved formatting and serialization of `StackTraceElement` on JDK 9+ 
(https://github.com/apache/logging-log4j2/issues/1640[1640])
-* Fixed `MemoryMappedFileAppender` buffer unmapping on JRE 9+ 
(https://github.com/apache/logging-log4j2/issues/1646[1646])
-* Fixed rollover strategy in the Log4j 1.x compatibility layer 
(https://github.com/apache/logging-log4j2/issues/1650[1650])
-* Removed incorrect mention of `base64` lookup and improve the rest of the 
lookup manual (https://github.com/apache/logging-log4j2/issues/1681[1681], 
https://issues.apache.org/jira/browse/LOG4J2-3504[LOG4J2-3504])
-* Implemented `LocationAware` for `JsonTemplateLayout`, since this was causing 
location not being passed to underlying appenders 
(https://github.com/apache/logging-log4j2/issues/1692[1692])
-* Added support for `long` values in MongoDb 4 appender to configure 
`collectionSize` (https://github.com/apache/logging-log4j2/issues/1747[1747])
-* Only shutdown Log4j after last `Log4jServletContextListener` is executed 
(https://github.com/apache/logging-log4j2/issues/1782[1782])
-* Allowed using Spring Arbiter without a Spring environment 
(https://github.com/apache/logging-log4j2/issues/1783[1783])
-* Fixed context data loss if `<AsyncLogger>` components are used with an all 
async logger context 
(https://github.com/apache/logging-log4j2/issues/1786[1786])
-* Fixed `JsonTemplateLayout` NPE thrown on custom log levels 
(https://github.com/apache/logging-log4j2/issues/1805[1805])
-* Improved `Log4j-config.xsd` schema 
(https://issues.apache.org/jira/browse/LOG4J2-170[LOG4J2-170])
-* Fixed NPE in `ContextSelector` 
(https://issues.apache.org/jira/browse/LOG4J2-3217[LOG4J2-3217], 
https://github.com/apache/logging-log4j2/pull/1538[1538])
-* Avoided allocating ``ThreadLocal``s in `AbstractLogger` when they are 
disabled, since this was causing memory leaks due to retained reference to 
class loaders in web applications 
(https://issues.apache.org/jira/browse/LOG4J2-3657[LOG4J2-3657])
-* Fixed `%notEmpty` directive of `PatternLayout` for empty MDC/NDC inputs 
(https://issues.apache.org/jira/browse/LOG4J2-3660[LOG4J2-3660])
-* Fixed file descriptor leak on Tomcat 
(https://issues.apache.org/jira/browse/LOG4J2-3663[LOG4J2-3663])
-* Ensured `FileOutputStream` is closed in `CommonsCompressAction.execute()`


Reply via email to