You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/02/21 12:51:29 UTC

(logging-log4j2) 02/08: Prepare release notes for 3.0.0-beta2

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

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 2e748ffaf7bb921ec412bc1af84a4b2be367c3bf
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Sat Feb 17 15:02:58 2024 +0100

    Prepare release notes for 3.0.0-beta2
---
 src/changelog/3.0.0-beta2/.release-notes.adoc.ftl  | 36 +++++++++++
 .../.release.xml}                                  | 11 ++--
 .../1223_change_formatted_message_heuristic.xml    |  0
 .../1626_parameter_format_rewrite.xml              |  0
 .../1747_mongodb4-long-collection-size-conifg.xml  |  0
 ..._JdkMapAdapterStringMap_detect_immutability.xml |  0
 .../2147_add_instance_factory_dsls.xml             |  0
 .../2238_fix_jdk_string_map.xml                    |  0
 .../LOG4J2-1921_ClassCastException.xml             |  0
 ...nterException_in_MongoDb4DocumentObject_Mon.xml |  0
 .../add_configuration_extension.xml                |  0
 .../create_async_logger.xml                        |  0
 .../create_config_properties.xml                   |  0
 .../create_config_properties_legacy.xml            |  0
 .../{.3.x.x => 3.0.0-beta2}/create_config_yaml.xml |  0
 .../fix_NPE_in_closeable_thread_context.xml        |  0
 .../fix_create_parent_dir.xml                      |  0
 .../fix_spring_cloud_config_client_deps.xml        |  0
 .../remove_DefaultLogEventFactory.xml              |  0
 .../{.3.x.x => 3.0.0-beta2}/remove_appserver.xml   |  0
 .../{.3.x.x => 3.0.0-beta2}/remove_core_parser.xml |  0
 .../{.3.x.x => 3.0.0-beta2}/remove_jcl.xml         |  0
 .../{.3.x.x => 3.0.0-beta2}/remove_jmx.xml         |  0
 .../remove_layout_jackson.xml                      |  0
 .../remove_layout_jackson_xml.xml                  |  0
 .../remove_thread_locals_property.xml              |  0
 .../update_apache_logging_parent.xml               |  0
 .../update_com_fasterxml_jackson_jackson_bom.xml   |  0
 .../update_commons_codec_commons_codec.xml         |  0
 .../update_io_netty_netty_bom.xml                  |  0
 .../update_org_apache_logging_logging_parent.xml   |  0
 .../update_org_apache_tomcat_tomcat_juli.xml}      |  4 +-
 .../update_org_eclipse_jetty_jetty_bom.xml         |  0
 .../update_org_jctools_jctools_core.xml            |  0
 .../update_org_slf4j_slf4j_api.xml                 |  0
 ...ingframework_boot_spring_boot_autoconfigure.xml |  0
 ..._springframework_cloud_spring_cloud_context.xml |  0
 ...te_org_springframework_spring_framework_bom.xml |  0
 .../workaround_coursier_bug.xml                    |  0
 src/site/_release-notes.adoc                       |  2 +-
 .../{_3.x.x.adoc => _3.0.0-beta2.adoc}             | 45 +++++++-------
 src/site/_release-notes/_3.x.x.adoc                | 72 ----------------------
 42 files changed, 65 insertions(+), 105 deletions(-)

diff --git a/src/changelog/3.0.0-beta2/.release-notes.adoc.ftl b/src/changelog/3.0.0-beta2/.release-notes.adoc.ftl
new file mode 100644
index 0000000000..3e4c3f9a6c
--- /dev/null
+++ b/src/changelog/3.0.0-beta2/.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 provides a continuation of the modularisation process of Log4j Core.
+The following features were moved to separate artifacts:
+
+* The async logger feature was moved to `log4j-async-logger` and it was upgraded to use LMAX Disruptor 4.x.
+The async appender is still available by default in `log4j-core`.
+* The YAML configuration is available now in `log4j-config-yaml`.
+* The Java properties configuration was removed and replaced with a similar format based on https://github.com/FasterXML/jackson-dataformats-text/tree/2.17/properties[`jackson-dataformat-properties`].
+
+Other features were removed:
+
+* Jetty 9.x users are encouraged to migrate to Jetty 10.x or later and replace `log4j-appserver` with `log4j-slf4j2-impl`.
+* Tomcat JULI support will be available from a third-party (cf. https://github.com/copernik-eu/log4j-plugins/pull/102[copernik-eu/log4j-plugins]).
+* Apache Commons Logging users are encouraged to upgrade `commons-logging` to version 1.3.0 or later and remove `log4j-jcl`.
+* Support for the XML layout was dropped.
+* Support for JMX was dropped and will be replaced with a more recent technology.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/.3.x.x/remove_layout_jackson.xml b/src/changelog/3.0.0-beta2/.release.xml
similarity index 66%
copy from src/changelog/.3.x.x/remove_layout_jackson.xml
copy to src/changelog/3.0.0-beta2/.release.xml
index acd3f5a5fd..f3118eeef5 100644
--- a/src/changelog/.3.x.x/remove_layout_jackson.xml
+++ b/src/changelog/3.0.0-beta2/.release.xml
@@ -15,10 +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.3.xsd"
-       type="removed">
-  <issue id="2198" link="https://github.com/apache/logging-log4j2/pull/2198"/>
-  <description format="asciidoc">Remove `log4j-layout-jackson` module</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.3.xsd"
+         date="2024-02-17" version="3.0.0-beta2"/>
diff --git a/src/changelog/.3.x.x/1223_change_formatted_message_heuristic.xml b/src/changelog/3.0.0-beta2/1223_change_formatted_message_heuristic.xml
similarity index 100%
rename from src/changelog/.3.x.x/1223_change_formatted_message_heuristic.xml
rename to src/changelog/3.0.0-beta2/1223_change_formatted_message_heuristic.xml
diff --git a/src/changelog/.3.x.x/1626_parameter_format_rewrite.xml b/src/changelog/3.0.0-beta2/1626_parameter_format_rewrite.xml
similarity index 100%
rename from src/changelog/.3.x.x/1626_parameter_format_rewrite.xml
rename to src/changelog/3.0.0-beta2/1626_parameter_format_rewrite.xml
diff --git a/src/changelog/.3.x.x/1747_mongodb4-long-collection-size-conifg.xml b/src/changelog/3.0.0-beta2/1747_mongodb4-long-collection-size-conifg.xml
similarity index 100%
rename from src/changelog/.3.x.x/1747_mongodb4-long-collection-size-conifg.xml
rename to src/changelog/3.0.0-beta2/1747_mongodb4-long-collection-size-conifg.xml
diff --git a/src/changelog/.3.x.x/2098_JdkMapAdapterStringMap_detect_immutability.xml b/src/changelog/3.0.0-beta2/2098_JdkMapAdapterStringMap_detect_immutability.xml
similarity index 100%
rename from src/changelog/.3.x.x/2098_JdkMapAdapterStringMap_detect_immutability.xml
rename to src/changelog/3.0.0-beta2/2098_JdkMapAdapterStringMap_detect_immutability.xml
diff --git a/src/changelog/.3.x.x/2147_add_instance_factory_dsls.xml b/src/changelog/3.0.0-beta2/2147_add_instance_factory_dsls.xml
similarity index 100%
rename from src/changelog/.3.x.x/2147_add_instance_factory_dsls.xml
rename to src/changelog/3.0.0-beta2/2147_add_instance_factory_dsls.xml
diff --git a/src/changelog/.3.x.x/2238_fix_jdk_string_map.xml b/src/changelog/3.0.0-beta2/2238_fix_jdk_string_map.xml
similarity index 100%
rename from src/changelog/.3.x.x/2238_fix_jdk_string_map.xml
rename to src/changelog/3.0.0-beta2/2238_fix_jdk_string_map.xml
diff --git a/src/changelog/.3.x.x/LOG4J2-1921_ClassCastException.xml b/src/changelog/3.0.0-beta2/LOG4J2-1921_ClassCastException.xml
similarity index 100%
rename from src/changelog/.3.x.x/LOG4J2-1921_ClassCastException.xml
rename to src/changelog/3.0.0-beta2/LOG4J2-1921_ClassCastException.xml
diff --git a/src/changelog/.3.x.x/LOG4J2-3392_Possible_NullPointerException_in_MongoDb4DocumentObject_Mon.xml b/src/changelog/3.0.0-beta2/LOG4J2-3392_Possible_NullPointerException_in_MongoDb4DocumentObject_Mon.xml
similarity index 100%
rename from src/changelog/.3.x.x/LOG4J2-3392_Possible_NullPointerException_in_MongoDb4DocumentObject_Mon.xml
rename to src/changelog/3.0.0-beta2/LOG4J2-3392_Possible_NullPointerException_in_MongoDb4DocumentObject_Mon.xml
diff --git a/src/changelog/.3.x.x/add_configuration_extension.xml b/src/changelog/3.0.0-beta2/add_configuration_extension.xml
similarity index 100%
rename from src/changelog/.3.x.x/add_configuration_extension.xml
rename to src/changelog/3.0.0-beta2/add_configuration_extension.xml
diff --git a/src/changelog/.3.x.x/create_async_logger.xml b/src/changelog/3.0.0-beta2/create_async_logger.xml
similarity index 100%
rename from src/changelog/.3.x.x/create_async_logger.xml
rename to src/changelog/3.0.0-beta2/create_async_logger.xml
diff --git a/src/changelog/.3.x.x/create_config_properties.xml b/src/changelog/3.0.0-beta2/create_config_properties.xml
similarity index 100%
rename from src/changelog/.3.x.x/create_config_properties.xml
rename to src/changelog/3.0.0-beta2/create_config_properties.xml
diff --git a/src/changelog/.3.x.x/create_config_properties_legacy.xml b/src/changelog/3.0.0-beta2/create_config_properties_legacy.xml
similarity index 100%
rename from src/changelog/.3.x.x/create_config_properties_legacy.xml
rename to src/changelog/3.0.0-beta2/create_config_properties_legacy.xml
diff --git a/src/changelog/.3.x.x/create_config_yaml.xml b/src/changelog/3.0.0-beta2/create_config_yaml.xml
similarity index 100%
rename from src/changelog/.3.x.x/create_config_yaml.xml
rename to src/changelog/3.0.0-beta2/create_config_yaml.xml
diff --git a/src/changelog/.3.x.x/fix_NPE_in_closeable_thread_context.xml b/src/changelog/3.0.0-beta2/fix_NPE_in_closeable_thread_context.xml
similarity index 100%
rename from src/changelog/.3.x.x/fix_NPE_in_closeable_thread_context.xml
rename to src/changelog/3.0.0-beta2/fix_NPE_in_closeable_thread_context.xml
diff --git a/src/changelog/.3.x.x/fix_create_parent_dir.xml b/src/changelog/3.0.0-beta2/fix_create_parent_dir.xml
similarity index 100%
rename from src/changelog/.3.x.x/fix_create_parent_dir.xml
rename to src/changelog/3.0.0-beta2/fix_create_parent_dir.xml
diff --git a/src/changelog/.3.x.x/fix_spring_cloud_config_client_deps.xml b/src/changelog/3.0.0-beta2/fix_spring_cloud_config_client_deps.xml
similarity index 100%
rename from src/changelog/.3.x.x/fix_spring_cloud_config_client_deps.xml
rename to src/changelog/3.0.0-beta2/fix_spring_cloud_config_client_deps.xml
diff --git a/src/changelog/.3.x.x/remove_DefaultLogEventFactory.xml b/src/changelog/3.0.0-beta2/remove_DefaultLogEventFactory.xml
similarity index 100%
rename from src/changelog/.3.x.x/remove_DefaultLogEventFactory.xml
rename to src/changelog/3.0.0-beta2/remove_DefaultLogEventFactory.xml
diff --git a/src/changelog/.3.x.x/remove_appserver.xml b/src/changelog/3.0.0-beta2/remove_appserver.xml
similarity index 100%
rename from src/changelog/.3.x.x/remove_appserver.xml
rename to src/changelog/3.0.0-beta2/remove_appserver.xml
diff --git a/src/changelog/.3.x.x/remove_core_parser.xml b/src/changelog/3.0.0-beta2/remove_core_parser.xml
similarity index 100%
rename from src/changelog/.3.x.x/remove_core_parser.xml
rename to src/changelog/3.0.0-beta2/remove_core_parser.xml
diff --git a/src/changelog/.3.x.x/remove_jcl.xml b/src/changelog/3.0.0-beta2/remove_jcl.xml
similarity index 100%
rename from src/changelog/.3.x.x/remove_jcl.xml
rename to src/changelog/3.0.0-beta2/remove_jcl.xml
diff --git a/src/changelog/.3.x.x/remove_jmx.xml b/src/changelog/3.0.0-beta2/remove_jmx.xml
similarity index 100%
rename from src/changelog/.3.x.x/remove_jmx.xml
rename to src/changelog/3.0.0-beta2/remove_jmx.xml
diff --git a/src/changelog/.3.x.x/remove_layout_jackson.xml b/src/changelog/3.0.0-beta2/remove_layout_jackson.xml
similarity index 100%
rename from src/changelog/.3.x.x/remove_layout_jackson.xml
rename to src/changelog/3.0.0-beta2/remove_layout_jackson.xml
diff --git a/src/changelog/.3.x.x/remove_layout_jackson_xml.xml b/src/changelog/3.0.0-beta2/remove_layout_jackson_xml.xml
similarity index 100%
rename from src/changelog/.3.x.x/remove_layout_jackson_xml.xml
rename to src/changelog/3.0.0-beta2/remove_layout_jackson_xml.xml
diff --git a/src/changelog/.3.x.x/remove_thread_locals_property.xml b/src/changelog/3.0.0-beta2/remove_thread_locals_property.xml
similarity index 100%
rename from src/changelog/.3.x.x/remove_thread_locals_property.xml
rename to src/changelog/3.0.0-beta2/remove_thread_locals_property.xml
diff --git a/src/changelog/.3.x.x/update_apache_logging_parent.xml b/src/changelog/3.0.0-beta2/update_apache_logging_parent.xml
similarity index 100%
copy from src/changelog/.3.x.x/update_apache_logging_parent.xml
copy to src/changelog/3.0.0-beta2/update_apache_logging_parent.xml
diff --git a/src/changelog/.3.x.x/update_com_fasterxml_jackson_jackson_bom.xml b/src/changelog/3.0.0-beta2/update_com_fasterxml_jackson_jackson_bom.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_com_fasterxml_jackson_jackson_bom.xml
rename to src/changelog/3.0.0-beta2/update_com_fasterxml_jackson_jackson_bom.xml
diff --git a/src/changelog/.3.x.x/update_commons_codec_commons_codec.xml b/src/changelog/3.0.0-beta2/update_commons_codec_commons_codec.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_commons_codec_commons_codec.xml
rename to src/changelog/3.0.0-beta2/update_commons_codec_commons_codec.xml
diff --git a/src/changelog/.3.x.x/update_io_netty_netty_bom.xml b/src/changelog/3.0.0-beta2/update_io_netty_netty_bom.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_io_netty_netty_bom.xml
rename to src/changelog/3.0.0-beta2/update_io_netty_netty_bom.xml
diff --git a/src/changelog/.3.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/3.0.0-beta2/update_org_apache_logging_logging_parent.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_org_apache_logging_logging_parent.xml
rename to src/changelog/3.0.0-beta2/update_org_apache_logging_logging_parent.xml
diff --git a/src/changelog/.3.x.x/update_apache_logging_parent.xml b/src/changelog/3.0.0-beta2/update_org_apache_tomcat_tomcat_juli.xml
similarity index 62%
rename from src/changelog/.3.x.x/update_apache_logging_parent.xml
rename to src/changelog/3.0.0-beta2/update_org_apache_tomcat_tomcat_juli.xml
index dced805653..4915336401 100644
--- a/src/changelog/.3.x.x/update_apache_logging_parent.xml
+++ b/src/changelog/3.0.0-beta2/update_org_apache_tomcat_tomcat_juli.xml
@@ -3,6 +3,6 @@
        xmlns="http://logging.apache.org/log4j/changelog"
        xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
        type="updated">
-  <issue id="2191" link="https://github.com/apache/logging-log4j2/pull/2191"/>
-  <description format="asciidoc">Update `apache/logging-parent` to version ``</description>
+  <issue id="2176" link="https://github.com/apache/logging-log4j2/pull/2176"/>
+  <description format="asciidoc">Update `org.apache.tomcat:tomcat-juli` to version `10.1.18`</description>
 </entry>
diff --git a/src/changelog/.3.x.x/update_org_eclipse_jetty_jetty_bom.xml b/src/changelog/3.0.0-beta2/update_org_eclipse_jetty_jetty_bom.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_org_eclipse_jetty_jetty_bom.xml
rename to src/changelog/3.0.0-beta2/update_org_eclipse_jetty_jetty_bom.xml
diff --git a/src/changelog/.3.x.x/update_org_jctools_jctools_core.xml b/src/changelog/3.0.0-beta2/update_org_jctools_jctools_core.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_org_jctools_jctools_core.xml
rename to src/changelog/3.0.0-beta2/update_org_jctools_jctools_core.xml
diff --git a/src/changelog/.3.x.x/update_org_slf4j_slf4j_api.xml b/src/changelog/3.0.0-beta2/update_org_slf4j_slf4j_api.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_org_slf4j_slf4j_api.xml
rename to src/changelog/3.0.0-beta2/update_org_slf4j_slf4j_api.xml
diff --git a/src/changelog/.3.x.x/update_org_springframework_boot_spring_boot_autoconfigure.xml b/src/changelog/3.0.0-beta2/update_org_springframework_boot_spring_boot_autoconfigure.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_org_springframework_boot_spring_boot_autoconfigure.xml
rename to src/changelog/3.0.0-beta2/update_org_springframework_boot_spring_boot_autoconfigure.xml
diff --git a/src/changelog/.3.x.x/update_org_springframework_cloud_spring_cloud_context.xml b/src/changelog/3.0.0-beta2/update_org_springframework_cloud_spring_cloud_context.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_org_springframework_cloud_spring_cloud_context.xml
rename to src/changelog/3.0.0-beta2/update_org_springframework_cloud_spring_cloud_context.xml
diff --git a/src/changelog/.3.x.x/update_org_springframework_spring_framework_bom.xml b/src/changelog/3.0.0-beta2/update_org_springframework_spring_framework_bom.xml
similarity index 100%
rename from src/changelog/.3.x.x/update_org_springframework_spring_framework_bom.xml
rename to src/changelog/3.0.0-beta2/update_org_springframework_spring_framework_bom.xml
diff --git a/src/changelog/.3.x.x/workaround_coursier_bug.xml b/src/changelog/3.0.0-beta2/workaround_coursier_bug.xml
similarity index 100%
rename from src/changelog/.3.x.x/workaround_coursier_bug.xml
rename to src/changelog/3.0.0-beta2/workaround_coursier_bug.xml
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 59cdaaaeef..d9895d85c7 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
 [#release-notes]
 = Release Notes
 
-include::_release-notes/_3.x.x.adoc[]
+include::_release-notes/_3.0.0-beta2.adoc[]
 include::_release-notes/_3.0.0-beta1.adoc[]
 include::_release-notes/_3.0.0-alpha1.adoc[]
 include::_release-notes/_2.20.0.adoc[]
diff --git a/src/site/_release-notes/_3.x.x.adoc b/src/site/_release-notes/_3.0.0-beta2.adoc
similarity index 69%
copy from src/site/_release-notes/_3.x.x.adoc
copy to src/site/_release-notes/_3.0.0-beta2.adoc
index b1e89432d4..b8a7090bb1 100644
--- a/src/site/_release-notes/_3.x.x.adoc
+++ b/src/site/_release-notes/_3.0.0-beta2.adoc
@@ -15,28 +15,40 @@
     limitations under the License.
 ////
 
-= 3.x.x
+= 3.0.0-beta2 (2024-02-17)
 
-This release contains...
+This release provides a continuation of the modularisation process of Log4j Core.
+The following features were moved to separate artifacts:
 
+* The async logger feature was moved to `log4j-async-logger` and it was upgraded to use LMAX Disruptor 4.x.
+The async appender is still available by default in `log4j-core`.
+* The YAML configuration is available now in `log4j-config-yaml`.
+* The Java properties configuration was removed and replaced with a similar format based on https://github.com/FasterXML/jackson-dataformats-text/tree/2.17/properties[`jackson-dataformat-properties`].
 
-[#release-notes-3-x-x-added]
+Other features were removed:
+
+* Jetty 9.x users are encouraged to migrate to Jetty 10.x or later and replace `log4j-appserver` with `log4j-slf4j2-impl`.
+* Tomcat JULI support will be available from a third-party (cf. https://github.com/copernik-eu/log4j-plugins/pull/102[copernik-eu/log4j-plugins]).
+* Apache Commons Logging users are encouraged to upgrade `commons-logging` to version 1.3.0 or later and remove `log4j-jcl`.
+* Support for the XML layout was dropped.
+* Support for JMX was dropped and will be replaced with a more recent technology.
+
+
+[#release-notes-3-0-0-beta2-added]
 === Added
 
 * Add and update DSLs for setting up dependency injection for test and non-test code. (https://github.com/apache/logging-log4j2/issues/2147[2147])
 * Add a `ConfigurationExtension` mechanism to allow third-party JARs to extend the `<Configuration>` element.
 * Add a new properties configuration factory based on `jackson-dataformat-properties`.
 
-[#release-notes-3-x-x-changed]
+[#release-notes-3-0-0-beta2-changed]
 === Changed
 
 * Change the order of evaluation of `FormattedMessage` formatters. Messages are evaluated using `java.util.Format` only if they don't comply to the `java.text.MessageFormat` or `ParameterizedMessage` format. (https://github.com/apache/logging-log4j2/issues/1223[1223])
 * Split off async logger support into a new `log4j-async-logger` module.
 * Split off YAML configuration into a new `log4j-config-yaml` module.
-* Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` (https://github.com/apache/logging-log4j2/pull/2102[2102])
-* Update `com.google.guava:guava` to version `33.0.0-jre` (https://github.com/apache/logging-log4j2/pull/2108[2108])
 
-[#release-notes-3-x-x-fixed]
+[#release-notes-3-0-0-beta2-fixed]
 === Fixed
 
 * Rewrote message parameter formatter with improved escape handling (https://github.com/apache/logging-log4j2/issues/1626[1626])
@@ -50,7 +62,7 @@ This release contains...
 * Fix `log4j-spring-cloud-config-client` dependencies to include only those required. (https://github.com/apache/logging-log4j2/pull/2157[2157])
 * Workaround a Coursier/Ivy dependency resolution bug affecting `log4j-slf4j-impl` and `log4j-mongodb3`. (https://github.com/apache/logging-log4j2/pull/2065[2065])
 
-[#release-notes-3-x-x-removed]
+[#release-notes-3-0-0-beta2-removed]
 === Removed
 
 * Removed legacy `2.x` properties configuration factory.
@@ -63,31 +75,18 @@ This release contains...
 * Remove `log4j-layout-jackson-xml` module (https://github.com/apache/logging-log4j2/pull/2198[2198])
 * Remove `log4j2.enable.threadlocals` property (https://github.com/apache/logging-log4j2/issues/2105[2105])
 
-[#release-notes-3-x-x-updated]
+[#release-notes-3-0-0-beta2-updated]
 === Updated
 
 * Update `apache/logging-parent` to version `` (https://github.com/apache/logging-log4j2/pull/2191[2191])
-* Update `co.elastic.logging:log4j2-ecs-layout` to version `1.6.0` (https://github.com/apache/logging-log4j2/pull/2303[2303])
 * Update `com.fasterxml.jackson:jackson-bom` to version `2.16.1` (https://github.com/apache/logging-log4j2/pull/2127[2127])
-* Update `com.github.h-thurow:simple-jndi` to version `0.24.0` (https://github.com/apache/logging-log4j2/pull/2195[2195])
-* Update `com.github.tomakehurst:wiremock-jre8` to version `2.35.2` (https://github.com/apache/logging-log4j2/pull/2305[2305])
 * Update `commons-codec:commons-codec` to version `1.16.1` (https://github.com/apache/logging-log4j2/pull/2276[2276])
 * Update `io.netty:netty-bom` to version `4.1.107.Final` (https://github.com/apache/logging-log4j2/pull/2283[2283])
-* Update `org.apache.commons:commons-compress` to version `1.26.0` (https://github.com/apache/logging-log4j2/pull/2300[2300])
-* Update `org.apache.groovy:groovy-bom` to version `4.0.18` (https://github.com/apache/logging-log4j2/pull/2217[2217])
 * Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j2/pull/2193[2193])
-* Update `org.apache.maven.surefire:surefire-junit47` to version `3.2.5` (https://github.com/apache/logging-log4j2/pull/2177[2177])
-* Update `org.apache.tomcat:tomcat-juli` to version `10.1.19` (https://github.com/apache/logging-log4j2/pull/2302[2302])
-* Update `org.assertj:assertj-core` to version `3.25.3` (https://github.com/apache/logging-log4j2/pull/2263[2263])
+* Update `org.apache.tomcat:tomcat-juli` to version `10.1.18` (https://github.com/apache/logging-log4j2/pull/2176[2176])
 * Update `org.eclipse.jetty:jetty-bom` to version `9.4.54.v20240208` (https://github.com/apache/logging-log4j2/pull/2285[2285])
-* Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.18` (https://github.com/apache/logging-log4j2/pull/2268[2268])
-* Update `org.graalvm.truffle:truffle-api` to version `23.1.2` (https://github.com/apache/logging-log4j2/pull/2206[2206])
 * Update `org.jctools:jctools-core` to version `4.0.3` (https://github.com/apache/logging-log4j2/pull/2267[2267])
-* Update `org.junit:junit-bom` to version `5.10.2` (https://github.com/apache/logging-log4j2/pull/2260[2260])
-* Update `org.mockito:mockito-bom` to version `5.10.0` (https://github.com/apache/logging-log4j2/pull/2245[2245])
 * Update `org.slf4j:slf4j-api` to version `2.0.10` (https://github.com/apache/logging-log4j2/pull/2136[2136])
 * Update `org.springframework.boot:spring-boot-autoconfigure` to version `3.2.2` (https://github.com/apache/logging-log4j2/pull/2222[2222])
-* Update `org.springframework.boot:spring-boot-dependencies` to version `3.2.1` (https://github.com/apache/logging-log4j2/pull/2123[2123])
 * Update `org.springframework.cloud:spring-cloud-context` to version `4.1.1` (https://github.com/apache/logging-log4j2/pull/2236[2236])
 * Update `org.springframework:spring-framework-bom` to version `6.1.4` (https://github.com/apache/logging-log4j2/pull/2294[2294])
-* Update `uk.org.webcompere:system-stubs-core` to version `2.1.6` (https://github.com/apache/logging-log4j2/pull/2196[2196])
diff --git a/src/site/_release-notes/_3.x.x.adoc b/src/site/_release-notes/_3.x.x.adoc
index b1e89432d4..905c45b3d3 100644
--- a/src/site/_release-notes/_3.x.x.adoc
+++ b/src/site/_release-notes/_3.x.x.adoc
@@ -19,75 +19,3 @@
 
 This release contains...
 
-
-[#release-notes-3-x-x-added]
-=== Added
-
-* Add and update DSLs for setting up dependency injection for test and non-test code. (https://github.com/apache/logging-log4j2/issues/2147[2147])
-* Add a `ConfigurationExtension` mechanism to allow third-party JARs to extend the `<Configuration>` element.
-* Add a new properties configuration factory based on `jackson-dataformat-properties`.
-
-[#release-notes-3-x-x-changed]
-=== Changed
-
-* Change the order of evaluation of `FormattedMessage` formatters. Messages are evaluated using `java.util.Format` only if they don't comply to the `java.text.MessageFormat` or `ParameterizedMessage` format. (https://github.com/apache/logging-log4j2/issues/1223[1223])
-* Split off async logger support into a new `log4j-async-logger` module.
-* Split off YAML configuration into a new `log4j-config-yaml` module.
-* Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` (https://github.com/apache/logging-log4j2/pull/2102[2102])
-* Update `com.google.guava:guava` to version `33.0.0-jre` (https://github.com/apache/logging-log4j2/pull/2108[2108])
-
-[#release-notes-3-x-x-fixed]
-=== Fixed
-
-* Rewrote message parameter formatter with improved escape handling (https://github.com/apache/logging-log4j2/issues/1626[1626])
-* The MongoDb4 appender now supports long values to configure `collectionSize` (https://github.com/apache/logging-log4j2/issues/1747[1747])
-* Mark `JdkMapAdapterStringMap` as frozen if map is immutable. (https://github.com/apache/logging-log4j2/issues/2098[2098])
-* Fix regression in `JdkMapAdapterStringMap` performance. (https://github.com/apache/logging-log4j2/issues/2238[2238])
-* Prevents ClassCastException when trying to assign a SimpleLoggerContext to a core LoggerContext (https://issues.apache.org/jira/browse/LOG4J2-1921[LOG4J2-1921])
-* Possible NullPointerException in MongoDb4DocumentObject, MongoDbDocumentObject, DefaultNoSqlObject. (https://issues.apache.org/jira/browse/LOG4J2-3392[LOG4J2-3392])
-* Fix NPE in `CloseableThreadContext`. (https://github.com/apache/logging-log4j2/pull/1426[1426])
-* Fix NPE in `RollingFileManager`. (https://github.com/apache/logging-log4j2/pull/1645[1645])
-* Fix `log4j-spring-cloud-config-client` dependencies to include only those required. (https://github.com/apache/logging-log4j2/pull/2157[2157])
-* Workaround a Coursier/Ivy dependency resolution bug affecting `log4j-slf4j-impl` and `log4j-mongodb3`. (https://github.com/apache/logging-log4j2/pull/2065[2065])
-
-[#release-notes-3-x-x-removed]
-=== Removed
-
-* Removed legacy `2.x` properties configuration factory.
-* Remove `DefaultLogEventFactory`
-* Remove `log4j-appserver` module (https://github.com/apache/logging-log4j2/pull/2257[2257])
-* Remove `org.apache.logging.log4j.core.parser` and related packages. (https://github.com/apache/logging-log4j2/pull/2154[2154])
-* Remove `log4j-jcl` module (https://github.com/apache/logging-log4j2/pull/2257[2257])
-* Removed JMX support.
-* Remove `log4j-layout-jackson` module (https://github.com/apache/logging-log4j2/pull/2198[2198])
-* Remove `log4j-layout-jackson-xml` module (https://github.com/apache/logging-log4j2/pull/2198[2198])
-* Remove `log4j2.enable.threadlocals` property (https://github.com/apache/logging-log4j2/issues/2105[2105])
-
-[#release-notes-3-x-x-updated]
-=== Updated
-
-* Update `apache/logging-parent` to version `` (https://github.com/apache/logging-log4j2/pull/2191[2191])
-* Update `co.elastic.logging:log4j2-ecs-layout` to version `1.6.0` (https://github.com/apache/logging-log4j2/pull/2303[2303])
-* Update `com.fasterxml.jackson:jackson-bom` to version `2.16.1` (https://github.com/apache/logging-log4j2/pull/2127[2127])
-* Update `com.github.h-thurow:simple-jndi` to version `0.24.0` (https://github.com/apache/logging-log4j2/pull/2195[2195])
-* Update `com.github.tomakehurst:wiremock-jre8` to version `2.35.2` (https://github.com/apache/logging-log4j2/pull/2305[2305])
-* Update `commons-codec:commons-codec` to version `1.16.1` (https://github.com/apache/logging-log4j2/pull/2276[2276])
-* Update `io.netty:netty-bom` to version `4.1.107.Final` (https://github.com/apache/logging-log4j2/pull/2283[2283])
-* Update `org.apache.commons:commons-compress` to version `1.26.0` (https://github.com/apache/logging-log4j2/pull/2300[2300])
-* Update `org.apache.groovy:groovy-bom` to version `4.0.18` (https://github.com/apache/logging-log4j2/pull/2217[2217])
-* Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j2/pull/2193[2193])
-* Update `org.apache.maven.surefire:surefire-junit47` to version `3.2.5` (https://github.com/apache/logging-log4j2/pull/2177[2177])
-* Update `org.apache.tomcat:tomcat-juli` to version `10.1.19` (https://github.com/apache/logging-log4j2/pull/2302[2302])
-* Update `org.assertj:assertj-core` to version `3.25.3` (https://github.com/apache/logging-log4j2/pull/2263[2263])
-* Update `org.eclipse.jetty:jetty-bom` to version `9.4.54.v20240208` (https://github.com/apache/logging-log4j2/pull/2285[2285])
-* Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.18` (https://github.com/apache/logging-log4j2/pull/2268[2268])
-* Update `org.graalvm.truffle:truffle-api` to version `23.1.2` (https://github.com/apache/logging-log4j2/pull/2206[2206])
-* Update `org.jctools:jctools-core` to version `4.0.3` (https://github.com/apache/logging-log4j2/pull/2267[2267])
-* Update `org.junit:junit-bom` to version `5.10.2` (https://github.com/apache/logging-log4j2/pull/2260[2260])
-* Update `org.mockito:mockito-bom` to version `5.10.0` (https://github.com/apache/logging-log4j2/pull/2245[2245])
-* Update `org.slf4j:slf4j-api` to version `2.0.10` (https://github.com/apache/logging-log4j2/pull/2136[2136])
-* Update `org.springframework.boot:spring-boot-autoconfigure` to version `3.2.2` (https://github.com/apache/logging-log4j2/pull/2222[2222])
-* Update `org.springframework.boot:spring-boot-dependencies` to version `3.2.1` (https://github.com/apache/logging-log4j2/pull/2123[2123])
-* Update `org.springframework.cloud:spring-cloud-context` to version `4.1.1` (https://github.com/apache/logging-log4j2/pull/2236[2236])
-* Update `org.springframework:spring-framework-bom` to version `6.1.4` (https://github.com/apache/logging-log4j2/pull/2294[2294])
-* Update `uk.org.webcompere:system-stubs-core` to version `2.1.6` (https://github.com/apache/logging-log4j2/pull/2196[2196])