Merge branch 'apache:2.x' into pr_2769

Author: jaykataria1111

log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java

@@ -16,7 +16,6 @@
  */
 package org.apache.logging.log4j.internal.map;
 
-import java.io.Serializable;
 import java.util.AbstractMap;
 import java.util.AbstractSet;
 import java.util.Collection;
@@ -57,7 +56,7 @@
  * </ul>
  *
  */
-public class UnmodifiableArrayBackedMap extends AbstractMap<String, String> implements Serializable, ReadOnlyStringMap {
+public class UnmodifiableArrayBackedMap extends AbstractMap<String, String> implements ReadOnlyStringMap {
     /**
      * Implementation of Map.Entry. The implementation is simple since each instance
      * contains an index in the array, then getKey() and getValue() retrieve from

log4j-parent/pom.xml

@@ -86,7 +86,7 @@
     <hamcrest.version>3.0</hamcrest.version>
     <HdrHistogram.version>2.2.2</HdrHistogram.version>
     <hsqldb.version>2.7.4</hsqldb.version>
-    <jackson-bom.version>2.18.1</jackson-bom.version>
+    <jackson-bom.version>2.18.2</jackson-bom.version>
     <!-- Override the version in Jakarta EE 9 BOM: -->
     <jakarta-activation.version>2.1.3</jakarta-activation.version>
     <jakarta-mail.version>2.1.3</jakarta-mail.version>

log4j-spring-cloud-config-client/pom.xml

@@ -34,7 +34,7 @@
 
   <properties>
     <!-- Dependency versions -->
-    <spring-cloud.version>4.1.4</spring-cloud.version>
+    <spring-cloud.version>4.1.5</spring-cloud.version>
 
     <!--
       ~ OSGi and JPMS options

pom.xml

@@ -344,7 +344,7 @@
     <site-conversant.version>1.2.21</site-conversant.version>
     <site-disruptor.version>4.0.0</site-disruptor.version>
     <site-flume.version>1.11.0</site-flume.version>
-    <site-jackson.version>2.18.1</site-jackson.version>
+    <site-jackson.version>2.18.2</site-jackson.version>
     <site-javax-mail.version>1.6.2</site-javax-mail.version>
     <site-jctools.version>4.0.5</site-jctools.version>
     <site-je.version>18.3.12</site-je.version>

src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.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="3134" link="https://github.com/apache/logging-log4j2/pull/3134"/>
-  <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.18.1`</description>
+  <issue id="3244" link="https://github.com/apache/logging-log4j2/pull/3244"/>
+  <description format="asciidoc">Update `com.fasterxml.jackson:jackson-bom` to version `2.18.2`</description>
 </entry>

src/changelog/.2.x.x/update_org_springframework_cloud_spring_cloud_context.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="2985" link="https://github.com/apache/logging-log4j2/pull/2985"/>
-  <description format="asciidoc">Update `org.springframework.cloud:spring-cloud-context` to version `4.1.4`</description>
+  <issue id="3242" link="https://github.com/apache/logging-log4j2/pull/3242"/>
+  <description format="asciidoc">Update `org.springframework.cloud:spring-cloud-context` to version `4.1.5`</description>
 </entry>