From cc2e7892e56bbd858d54af724375bd994e051038 Mon Sep 17 00:00:00 2001
From: ASF Logging Services RM <private@logging.apache.org>
Date: Mon, 22 Jan 2024 11:26:08 +0000
Subject: [PATCH] Update `io.netty:netty-bom` to version `4.1.106.Final`
 (#2225)

---
 log4j-parent/pom.xml                               | 2 +-
 src/changelog/.2.x.x/update_io_netty_netty_bom.xml | 4 ++--
 src/site/_release-notes/_2.x.x.adoc                | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 0cb84e2526e..b04f371762e 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -129,7 +129,7 @@
     <mockito.version>4.11.0</mockito.version>
     <mongodb.version>4.11.1</mongodb.version>
     <nashorn.version>15.4</nashorn.version>
-    <netty.version>4.1.105.Final</netty.version>
+    <netty.version>4.1.106.Final</netty.version>
     <org.eclipse.osgi.version>3.13.0.v20180226-1711</org.eclipse.osgi.version>
     <org.eclipse.persistence.version>2.7.14</org.eclipse.persistence.version>
     <oro.version>2.0.8</oro.version>
diff --git a/src/changelog/.2.x.x/update_io_netty_netty_bom.xml b/src/changelog/.2.x.x/update_io_netty_netty_bom.xml
index 752b221baee..25b7ac52372 100644
--- a/src/changelog/.2.x.x/update_io_netty_netty_bom.xml
+++ b/src/changelog/.2.x.x/update_io_netty_netty_bom.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="2201" link="https://github.com/apache/logging-log4j2/pull/2201"/>
-  <description format="asciidoc">Update `io.netty:netty-bom` to version `4.1.105.Final`</description>
+  <issue id="2225" link="https://github.com/apache/logging-log4j2/pull/2225"/>
+  <description format="asciidoc">Update `io.netty:netty-bom` to version `4.1.106.Final`</description>
 </entry>
diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc
index 3be94adb035..97e8949fa27 100644
--- a/src/site/_release-notes/_2.x.x.adoc
+++ b/src/site/_release-notes/_2.x.x.adoc
@@ -37,6 +37,7 @@ This releases contains ...
 === Fixed
 
 * 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-x-x-updated]
@@ -48,7 +49,7 @@ This releases contains ...
 * Update `com.fasterxml.jackson:jackson-bom` to version `2.16.1` (https://github.com/apache/logging-log4j2/pull/2126[2126])
 * Update `com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to version `3.3.4` (https://github.com/apache/logging-log4j2/pull/2103[2103])
 * Update `github/codeql-action` to version `3.23.1` (https://github.com/apache/logging-log4j2/pull/2211[2211])
-* Update `io.netty:netty-bom` to version `4.1.105.Final` (https://github.com/apache/logging-log4j2/pull/2201[2201])
+* Update `io.netty:netty-bom` to version `4.1.106.Final` (https://github.com/apache/logging-log4j2/pull/2225[2225])
 * Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j2/pull/2197[2197])
 * Update `org.apache.maven.surefire:surefire-junit47` to version `3.2.5` (https://github.com/apache/logging-log4j2/pull/2178[2178])
 * Update `org.assertj:assertj-core` to version `3.25.1` (https://github.com/apache/logging-log4j2/pull/2153[2153])