diff --git a/.github/workflows/scorecards-analysis.yaml b/.github/workflows/scorecards-analysis.yaml
index e4c73a5bf04..1519c3e89b0 100644
--- a/.github/workflows/scorecards-analysis.yaml
+++ b/.github/workflows/scorecards-analysis.yaml
@@ -70,6 +70,6 @@ jobs:
retention-days: 5
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # 2.1.22
+ uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # 2.1.22
with:
sarif_file: results.sarif
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 0cf2f9ecce7..d35a5d0fe29 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -69,7 +69,7 @@
3.11.16
3.11.5
1.16.1
- 1.25.0
+ 1.26.0
1.10.0
2.11.0
2.15.1
@@ -78,7 +78,7 @@
1.2.15
3.4.4
- 8.12.1
+ 8.12.2
0.9.0
7.0.5
4.9.0
@@ -123,7 +123,7 @@
0.2.0
1.2.17
2.15.0
- 1.5.0
+ 1.6.0
1.3.14
3.9.6
4.11.0
@@ -143,7 +143,7 @@
2.0.3
10.0.27
1.7
- 2.35.1
+ 2.35.2
2.9.1
1.9
1.5.5-11
diff --git a/pom.xml b/pom.xml
index 18e2be83d5c..1056c418dc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,7 +304,7 @@
- 2.23.0-SNAPSHOT
+ 2.23.1-SNAPSHOT
- 2023-12-22T14:39:06Z
+ 2024-02-17T09:33:13Z
+
diff --git a/src/changelog/.2.x.x/2238_fix_jdk_string_map.xml b/src/changelog/2.23.0/2238_fix_jdk_string_map.xml
similarity index 100%
rename from src/changelog/.2.x.x/2238_fix_jdk_string_map.xml
rename to src/changelog/2.23.0/2238_fix_jdk_string_map.xml
diff --git a/src/changelog/.2.x.x/2282_fix_1_2_set_level.xml b/src/changelog/2.23.0/2282_fix_1_2_set_level.xml
similarity index 100%
rename from src/changelog/.2.x.x/2282_fix_1_2_set_level.xml
rename to src/changelog/2.23.0/2282_fix_1_2_set_level.xml
diff --git a/src/changelog/.2.x.x/2282_fix_jul_set_level.xml b/src/changelog/2.23.0/2282_fix_jul_set_level.xml
similarity index 100%
rename from src/changelog/.2.x.x/2282_fix_jul_set_level.xml
rename to src/changelog/2.23.0/2282_fix_jul_set_level.xml
diff --git a/src/changelog/.2.x.x/LOG4J2-3680_fix_serial_filter_arrays.xml b/src/changelog/2.23.0/LOG4J2-3680_fix_serial_filter_arrays.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-3680_fix_serial_filter_arrays.xml
rename to src/changelog/2.23.0/LOG4J2-3680_fix_serial_filter_arrays.xml
diff --git a/src/changelog/.2.x.x/add_support_for_disruptor_4.xml b/src/changelog/2.23.0/add_support_for_disruptor_4.xml
similarity index 100%
rename from src/changelog/.2.x.x/add_support_for_disruptor_4.xml
rename to src/changelog/2.23.0/add_support_for_disruptor_4.xml
diff --git a/src/changelog/.2.x.x/allow_arbitrary_properties_order.xml b/src/changelog/2.23.0/allow_arbitrary_properties_order.xml
similarity index 100%
rename from src/changelog/.2.x.x/allow_arbitrary_properties_order.xml
rename to src/changelog/2.23.0/allow_arbitrary_properties_order.xml
diff --git a/src/changelog/.2.x.x/deprecate_StatusConsoleListener_filters.xml b/src/changelog/2.23.0/deprecate_StatusConsoleListener_filters.xml
similarity index 100%
rename from src/changelog/.2.x.x/deprecate_StatusConsoleListener_filters.xml
rename to src/changelog/2.23.0/deprecate_StatusConsoleListener_filters.xml
diff --git a/src/changelog/.2.x.x/deprecate_ring_buffer_log_event_handler.xml b/src/changelog/2.23.0/deprecate_ring_buffer_log_event_handler.xml
similarity index 100%
rename from src/changelog/.2.x.x/deprecate_ring_buffer_log_event_handler.xml
rename to src/changelog/2.23.0/deprecate_ring_buffer_log_event_handler.xml
diff --git a/src/changelog/.2.x.x/fix_RingBufferLogEvent_clear.xml b/src/changelog/2.23.0/fix_RingBufferLogEvent_clear.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_RingBufferLogEvent_clear.xml
rename to src/changelog/2.23.0/fix_RingBufferLogEvent_clear.xml
diff --git a/src/changelog/.2.x.x/fix_api_recursive_formatting.xml b/src/changelog/2.23.0/fix_api_recursive_formatting.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_api_recursive_formatting.xml
rename to src/changelog/2.23.0/fix_api_recursive_formatting.xml
diff --git a/src/changelog/.2.x.x/fix_security_manager_use_in_LoaderUtil.xml b/src/changelog/2.23.0/fix_security_manager_use_in_LoaderUtil.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_security_manager_use_in_LoaderUtil.xml
rename to src/changelog/2.23.0/fix_security_manager_use_in_LoaderUtil.xml
diff --git a/src/changelog/.2.x.x/fix_spring_cloud_config_client_deps.xml b/src/changelog/2.23.0/fix_spring_cloud_config_client_deps.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_spring_cloud_config_client_deps.xml
rename to src/changelog/2.23.0/fix_spring_cloud_config_client_deps.xml
diff --git a/src/changelog/.2.x.x/fix_typo_kubernetes.xml b/src/changelog/2.23.0/fix_typo_kubernetes.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_typo_kubernetes.xml
rename to src/changelog/2.23.0/fix_typo_kubernetes.xml
diff --git a/src/changelog/.2.x.x/simplify_configuration_after_bnd_7_update.xml b/src/changelog/2.23.0/simplify_configuration_after_bnd_7_update.xml
similarity index 100%
rename from src/changelog/.2.x.x/simplify_configuration_after_bnd_7_update.xml
rename to src/changelog/2.23.0/simplify_configuration_after_bnd_7_update.xml
diff --git a/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml b/src/changelog/2.23.0/update_com_fasterxml_jackson_jackson_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml
rename to src/changelog/2.23.0/update_com_fasterxml_jackson_jackson_bom.xml
diff --git a/src/changelog/.2.x.x/update_commons_codec_commons_codec.xml b/src/changelog/2.23.0/update_commons_codec_commons_codec.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_commons_codec_commons_codec.xml
rename to src/changelog/2.23.0/update_commons_codec_commons_codec.xml
diff --git a/src/changelog/.2.x.x/update_io_netty_netty_bom.xml b/src/changelog/2.23.0/update_io_netty_netty_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_io_netty_netty_bom.xml
rename to src/changelog/2.23.0/update_io_netty_netty_bom.xml
diff --git a/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/2.23.0/update_org_apache_logging_logging_parent.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml
rename to src/changelog/2.23.0/update_org_apache_logging_logging_parent.xml
diff --git a/src/changelog/.2.x.x/update_org_eclipse_jetty_jetty_bom.xml b/src/changelog/2.23.0/update_org_eclipse_jetty_jetty_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_eclipse_jetty_jetty_bom.xml
rename to src/changelog/2.23.0/update_org_eclipse_jetty_jetty_bom.xml
diff --git a/src/changelog/.2.x.x/update_org_jctools_jctools_core.xml b/src/changelog/2.23.0/update_org_jctools_jctools_core.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_jctools_jctools_core.xml
rename to src/changelog/2.23.0/update_org_jctools_jctools_core.xml
diff --git a/src/changelog/.2.x.x/update_org_springframework_spring_framework_bom.xml b/src/changelog/2.23.0/update_org_springframework_spring_framework_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_springframework_spring_framework_bom.xml
rename to src/changelog/2.23.0/update_org_springframework_spring_framework_bom.xml
diff --git a/src/changelog/.2.x.x/update_org_zeromq_jeromq.xml b/src/changelog/2.23.0/update_org_zeromq_jeromq.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_zeromq_jeromq.xml
rename to src/changelog/2.23.0/update_org_zeromq_jeromq.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index d321d395685..ebb3779dd6c 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.23.0-SNAPSHOT
+:project-version: 2.23.1-SNAPSHOT
: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 a8faebbe2af..3e30d0070cd 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -37,6 +37,7 @@
= Release Notes
include::_release-notes/_2.x.x.adoc[]
+include::_release-notes/_2.23.0.adoc[]
include::_release-notes/_2.22.1.adoc[]
include::_release-notes/_2.22.0.adoc[]
include::_release-notes/_2.21.1.adoc[]
diff --git a/src/site/_release-notes/_2.23.0.adoc b/src/site/_release-notes/_2.23.0.adoc
new file mode 100644
index 00000000000..8733255e3bf
--- /dev/null
+++ b/src/site/_release-notes/_2.23.0.adoc
@@ -0,0 +1,68 @@
+////
+ 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-2-23-0]
+== 2.23.0
+
+Release date:: 2024-02-17
+
+This release adds support for LMAX Disruptor 4.x and several performance and bug fixes.
+
+In order to maintain compatibility with JRE 8, support for LMAX Disruptor 3.x is maintained.
+
+
+[#release-notes-2-23-0-added]
+=== Added
+
+* Added support for LMAX Disruptor 4.x (https://github.com/apache/logging-log4j2/issues/1821[1821])
+
+[#release-notes-2-23-0-changed]
+=== Changed
+
+* Simplify BND configuration after upgrade from version `6.4.1` to `7.0.0`
+
+[#release-notes-2-23-0-deprecated]
+=== Deprecated
+
+* Deprecate the configuration attribute `verbose` (i.e., ` node to appear in any position in the configuration element.
+* Fix forgotten `threadName` field in `RingBufferLogEvent#clear()` (https://github.com/apache/logging-log4j2/issues/2234[2234])
+* Fix `StringBuilder` cache corruption on recursive access
+* Fixed use of `SecurityManager` in `LoaderUtil` where `AccessController::doPrivileged` should only be invoked when a `SecurityManager` is installed. Some runtimes do not seem to have this method available. (https://github.com/apache/logging-log4j2/issues/2129[2129])
+* Fix `log4j-spring-cloud-config-client` dependencies to include only those required. (https://github.com/apache/logging-log4j2/pull/2157[2157])
+* Fix typo in Kubernetes `clientKeyData` configuration property.
+
+[#release-notes-2-23-0-updated]
+=== Updated
+
+* Update `com.fasterxml.jackson:jackson-bom` to version `2.16.1` (https://github.com/apache/logging-log4j2/pull/2126[2126])
+* Update `commons-codec:commons-codec` to version `1.16.1` (https://github.com/apache/logging-log4j2/pull/2277[2277])
+* Update `io.netty:netty-bom` to version `4.1.107.Final` (https://github.com/apache/logging-log4j2/pull/2284[2284])
+* Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j2/pull/2197[2197])
+* Update `org.eclipse.jetty:jetty-bom` to version `9.4.54.v20240208` (https://github.com/apache/logging-log4j2/pull/2287[2287])
+* Update `org.jctools:jctools-core` to version `4.0.3` (https://github.com/apache/logging-log4j2/pull/2270[2270])
+* Update `org.springframework:spring-framework-bom` to version `5.3.32` (https://github.com/apache/logging-log4j2/pull/2293[2293])
+* Update `org.zeromq:jeromq` to version `0.6.0` (https://github.com/apache/logging-log4j2/pull/2271[2271])
diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc
index 977bbc928f5..6ea7146a1b9 100644
--- a/src/site/_release-notes/_2.x.x.adoc
+++ b/src/site/_release-notes/_2.x.x.adoc
@@ -23,46 +23,17 @@
This releases contains ...
-[#release-notes-2-x-x-added]
-=== Added
-
-* Added support for LMAX Disruptor 4.x (https://github.com/apache/logging-log4j2/issues/1821[1821])
-
[#release-notes-2-x-x-changed]
=== Changed
-* Simplify BND configuration after upgrade from version `6.4.1` to `7.0.0`
-
-[#release-notes-2-x-x-deprecated]
-=== Deprecated
-
-* Deprecate the configuration attribute `verbose` (i.e., ` node to appear in any position in the configuration element.
-* Fix forgotten `threadName` field in `RingBufferLogEvent#clear()` (https://github.com/apache/logging-log4j2/issues/2234[2234])
-* Fix `StringBuilder` cache corruption on recursive access
-* Fixed use of `SecurityManager` in `LoaderUtil` where `AccessController::doPrivileged` should only be invoked when a `SecurityManager` is installed. Some runtimes do not seem to have this method available. (https://github.com/apache/logging-log4j2/issues/2129[2129])
-* Fix `log4j-spring-cloud-config-client` dependencies to include only those required. (https://github.com/apache/logging-log4j2/pull/2157[2157])
-* Fix typo in Kubernetes `clientKeyData` configuration property.
+* Improve performance of `CloseableThreadContext#closeMap()` (https://github.com/apache/logging-log4j2/pull/2296[2296])
[#release-notes-2-x-x-updated]
=== Updated
-* Update `com.fasterxml.jackson:jackson-bom` to version `2.16.1` (https://github.com/apache/logging-log4j2/pull/2126[2126])
-* Update `commons-codec:commons-codec` to version `1.16.1` (https://github.com/apache/logging-log4j2/pull/2277[2277])
-* Update `github/codeql-action` to version `3.24.3` (https://github.com/apache/logging-log4j2/pull/2295[2295])
+* Update `co.elastic.clients:elasticsearch-java` to version `8.12.2` (https://github.com/apache/logging-log4j2/pull/2315[2315])
+* Update `co.elastic.logging:log4j2-ecs-layout` to version `1.6.0` (https://github.com/apache/logging-log4j2/pull/2301[2301])
+* Update `com.github.tomakehurst:wiremock-jre8` to version `2.35.2` (https://github.com/apache/logging-log4j2/pull/2306[2306])
+* Update `github/codeql-action` to version `3.24.5` (https://github.com/apache/logging-log4j2/pull/2317[2317])
* Update `io.fabric8:docker-maven-plugin` to version `0.44.0` (https://github.com/apache/logging-log4j2/pull/2299[2299])
-* Update `io.netty:netty-bom` to version `4.1.107.Final` (https://github.com/apache/logging-log4j2/pull/2284[2284])
-* Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j2/pull/2197[2197])
-* Update `org.eclipse.jetty:jetty-bom` to version `9.4.54.v20240208` (https://github.com/apache/logging-log4j2/pull/2287[2287])
-* Update `org.jctools:jctools-core` to version `4.0.3` (https://github.com/apache/logging-log4j2/pull/2270[2270])
-* Update `org.springframework:spring-framework-bom` to version `5.3.32` (https://github.com/apache/logging-log4j2/pull/2293[2293])
-* Update `org.zeromq:jeromq` to version `0.6.0` (https://github.com/apache/logging-log4j2/pull/2271[2271])
+* Update `org.apache.commons:commons-compress` to version `1.26.0` (https://github.com/apache/logging-log4j2/pull/2304[2304])