Merge branch '2.x' into ScopedContext

Author: rgoers

.github/workflows/scorecards-analysis.yaml

@@ -70,6 +70,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2    # 2.1.22
+        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a    # 2.1.22
         with:
           sarif_file: results.sarif

antora-playbook.yaml

@@ -96,6 +96,11 @@ ui:
                 <img src="{{{uiRootPath}}}/../_images/logo-small-white.png" alt="Apache Log4j"/>
               </div>
             </div>
+            <div id="topbar-nav" class="navbar-menu">
+              <div class="navbar-end">
+                <a class="navbar-item" href="https://logging.apache.org">a subproject of&nbsp;<strong>Apache Logging Services</strong></a>
+              </div>
+            </div>
           </nav>
         </header>
 

log4j-parent/pom.xml

@@ -60,7 +60,7 @@
     <!-- =====================================================
          Direct dependency version properties (in alphabetical order)
          ===================================================== -->
-    <activemq.version>6.1.0</activemq.version>
+    <activemq.version>6.1.1</activemq.version>
     <angus-activation.version>2.0.2</angus-activation.version>
     <angus-mail.version>2.0.3</angus-mail.version>
     <assertj.version>3.25.3</assertj.version>
@@ -72,13 +72,13 @@
     <commons-compress.version>1.26.1</commons-compress.version>
     <commons-csv.version>1.10.0</commons-csv.version>
     <commons-dbcp2.version>2.12.0</commons-dbcp2.version>
-    <commons-io.version>2.16.0</commons-io.version>
+    <commons-io.version>2.16.1</commons-io.version>
     <commons-lang3.version>3.14.0</commons-lang3.version>
     <commons-logging.version>1.3.1</commons-logging.version>
     <!-- `com.conversantmedia:disruptor` version 1.2.16 requires Java 9: -->
     <conversant.disruptor.version>1.2.15</conversant.disruptor.version>
     <disruptor.version>3.4.4</disruptor.version>
-    <elasticsearch-java.version>8.13.1</elasticsearch-java.version>
+    <elasticsearch-java.version>8.13.2</elasticsearch-java.version>
     <embedded-ldap.version>0.9.0</embedded-ldap.version>
     <felix.version>7.0.5</felix.version>
     <flapdoodle-embed.version>4.9.0</flapdoodle-embed.version>
@@ -136,7 +136,7 @@
     <pax-exam.version>4.13.5</pax-exam.version>
     <plexus-utils.version>3.5.1</plexus-utils.version>
     <spring-boot.version>2.7.18</spring-boot.version>
-    <spring-framework.version>5.3.33</spring-framework.version>
+    <spring-framework.version>5.3.34</spring-framework.version>
     <system-stubs.version>2.0.3</system-stubs.version>
     <tomcat-juli.version>10.0.27</tomcat-juli.version>
     <velocity.version>1.7</velocity.version>

pom.xml

@@ -130,7 +130,7 @@
       <roles>
         <role>Committer</role>
       </roles>
-      <timezone>Asia/Kolkata</timezone>
+      <timezone>America/New York</timezone>
     </developer>
 
     <developer>

src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.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="2437" link="https://github.com/apache/logging-log4j2/pull/2437"/>
-  <description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.13.1`</description>
+  <issue id="2458" link="https://github.com/apache/logging-log4j2/pull/2458"/>
+  <description format="asciidoc">Update `co.elastic.clients:elasticsearch-java` to version `8.13.2`</description>
 </entry>

src/changelog/.2.x.x/update_commons_io_commons_io.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="2430" link="https://github.com/apache/logging-log4j2/pull/2430"/>
-  <description format="asciidoc">Update `commons-io:commons-io` to version `2.16.0`</description>
+  <issue id="2459" link="https://github.com/apache/logging-log4j2/pull/2459"/>
+  <description format="asciidoc">Update `commons-io:commons-io` to version `2.16.1`</description>
 </entry>

src/changelog/.2.x.x/update_github_codeql_action.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="2403" link="https://github.com/apache/logging-log4j2/pull/2403"/>
-  <description format="asciidoc">Update `github/codeql-action` to version `3.24.9`</description>
+  <issue id="2451" link="https://github.com/apache/logging-log4j2/pull/2451"/>
+  <description format="asciidoc">Update `github/codeql-action` to version `3.24.10`</description>
 </entry>

src/changelog/.2.x.x/update_org_apache_activemq_activemq_broker.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="2387" link="https://github.com/apache/logging-log4j2/pull/2387"/>
-  <description format="asciidoc">Update `org.apache.activemq:activemq-broker` to version `6.1.0`</description>
+  <issue id="2452" link="https://github.com/apache/logging-log4j2/pull/2452"/>
+  <description format="asciidoc">Update `org.apache.activemq:activemq-broker` to version `6.1.1`</description>
 </entry>

src/changelog/.2.x.x/update_org_springframework_spring_framework_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="2378" link="https://github.com/apache/logging-log4j2/pull/2378"/>
-  <description format="asciidoc">Update `org.springframework:spring-framework-bom` to version `5.3.33`</description>
+  <issue id="2464" link="https://github.com/apache/logging-log4j2/pull/2464"/>
+  <description format="asciidoc">Update `org.springframework:spring-framework-bom` to version `5.3.34`</description>
 </entry>