Merge branch 'apache:2.x' into 2.x

Author: Suvrat1629

log4j-parent/pom.xml

@@ -63,7 +63,7 @@
     <activemq.version>6.1.5</activemq.version>
     <angus-activation.version>2.0.2</angus-activation.version>
     <angus-mail.version>2.0.3</angus-mail.version>
-    <assertj.version>3.27.2</assertj.version>
+    <assertj.version>3.27.3</assertj.version>
     <awaitility.version>4.2.2</awaitility.version>
     <bsh.version>2.0b6</bsh.version>
     <cassandra.version>3.11.17</cassandra.version>

pom.xml

@@ -1059,7 +1059,7 @@
           <plugin>
             <groupId>org.openrewrite.maven</groupId>
             <artifactId>rewrite-maven-plugin</artifactId>
-            <version>5.15.0</version>
+            <version>6.0.1</version>
             <configuration>
               <activeRecipes>
                 <activeRecipe>org.openrewrite.java.logging.log4j.ParameterizedLogging</activeRecipe>

src/changelog/.2.x.x/update_org_assertj_assertj_core.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://logging.apache.org/xml/ns"
+       xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="updated">
+  <issue id="3404" link="https://github.com/apache/logging-log4j2/pull/3404"/>
+  <description format="asciidoc">Update `org.assertj:assertj-core` to version `3.27.3`</description>
+</entry>

src/changelog/.2.x.x/update_org_openrewrite_maven_rewrite_maven_plugin.xml

@@ -3,6 +3,6 @@
        xmlns="https://logging.apache.org/xml/ns"
        xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
        type="updated">
-  <issue id="2983" link="https://github.com/apache/logging-log4j2/pull/2983"/>
-  <description format="asciidoc">Update `org.openrewrite.maven:rewrite-maven-plugin` to version `5.15.0`</description>
+  <issue id="3397" link="https://github.com/apache/logging-log4j2/pull/3397"/>
+  <description format="asciidoc">Update `org.openrewrite.maven:rewrite-maven-plugin` to version `6.0.1`</description>
 </entry>

src/site/antora/modules/ROOT/pages/faq.adoc

@@ -325,7 +325,7 @@ https://logging.staged.apache.org/log4j/transform/log4j-transform-maven-shade-pl
 
 https://gradleup.com/shadow/[Gradle Shadow Plugin]:::
 You need to use the
-https://github.com/GradleUp/shadow/blob/main/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/Log4j2PluginsCacheFileTransformer.groovy[`Log4j2PluginsCacheFileTransformer`].
+https://gradleup.com/shadow/configuration/merging/#merging-log4j2-plugin-cache-files-log4j2plugins-dat[`Log4j2PluginsCacheFileTransformer`].
 ====
 
 [#android]