Merge remote-tracking branch 'origin/2.x' into 2.x-StatusLogger-revamp

Author: vy

log4j-parent/pom.xml

@@ -63,7 +63,7 @@
     <activemq.version>6.0.1</activemq.version>
     <angus-activation.version>2.0.1</angus-activation.version>
     <angus-mail.version>2.0.2</angus-mail.version>
-    <assertj.version>3.25.1</assertj.version>
+    <assertj.version>3.25.2</assertj.version>
     <awaitility.version>4.2.0</awaitility.version>
     <bsh.version>2.0b6</bsh.version>
     <cassandra.version>3.11.16</cassandra.version>

src/changelog/.2.x.x/update_org_assertj_assertj_core.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="2153" link="https://github.com/apache/logging-log4j2/pull/2153"/>
-  <description format="asciidoc">Update `org.assertj:assertj-core` to version `3.25.1`</description>
+  <issue id="2244" link="https://github.com/apache/logging-log4j2/pull/2244"/>
+  <description format="asciidoc">Update `org.assertj:assertj-core` to version `3.25.2`</description>
 </entry>

src/site/_release-notes/_2.x.x.adoc

@@ -54,5 +54,5 @@ This releases contains ...
 * 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])
+* Update `org.assertj:assertj-core` to version `3.25.2` (https://github.com/apache/logging-log4j2/pull/2244[2244])
 * Update `org.codehaus.groovy:groovy-bom` to version `3.0.20` (https://github.com/apache/logging-log4j2/pull/2125[2125])