Bump spring-framework.version from 6.1.3 to 6.1.4

log4j-parent/pom.xml

@@ -125,7 +125,7 @@
     <java-allocation-instrumenter.version>3.3.4</java-allocation-instrumenter.version>
     <jctools.version>4.0.3</jctools.version>
     <je.version>18.3.12</je.version>
-    <jetty.version>9.4.52.v20230823</jetty.version>
+    <jetty.version>9.4.54.v20240208</jetty.version>
     <jmdns.version>3.5.9</jmdns.version>
     <jmh.version>1.37</jmh.version>
     <json-unit.version>2.38.0</json-unit.version>
@@ -143,7 +143,7 @@
     <mockito.version>5.10.0</mockito.version>
     <mongodb.version>4.11.1</mongodb.version>
     <nashorn.version>15.4</nashorn.version>
-    <netty.version>4.1.106.Final</netty.version>
+    <netty.version>4.1.107.Final</netty.version>
     <opentest4j.version>1.3.0</opentest4j.version>
     <org.eclipse.osgi.version>3.18.600</org.eclipse.osgi.version>
     <oro.version>2.0.8</oro.version>

log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/OrderedComparator.java

@@ -53,20 +53,20 @@ public int compare(final AnnotatedElement lhs, final AnnotatedElement rhs) {
     }
 
     private static String getName(final AnnotatedElement element) {
-        if (element instanceof Class<?>) {
-            return Keys.getName((Class<?>) element);
+        if (element instanceof Class<?> clazz) {
+            return Keys.getName(clazz);
         }
-        if (element instanceof Field) {
-            return Keys.getName((Field) element);
+        if (element instanceof Field field) {
+            return Keys.getName(field);
         }
-        if (element instanceof Parameter) {
-            return Keys.getName((Parameter) element);
+        if (element instanceof Parameter parameter) {
+            return Keys.getName(parameter);
         }
-        if (element instanceof Method) {
-            return Keys.getName((Method) element);
+        if (element instanceof Method method) {
+            return Keys.getName(method);
         }
-        if (element instanceof AnnotatedType) {
-            return Keys.getName((AnnotatedType) element);
+        if (element instanceof AnnotatedType annotatedType) {
+            return Keys.getName(annotatedType);
         }
         return Strings.EMPTY;
     }

log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/validation/validators/ValidPortValidator.java

@@ -17,9 +17,6 @@
 package org.apache.logging.log4j.plugins.validation.validators;
 
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.plugins.Inject;
-import org.apache.logging.log4j.plugins.convert.TypeConverter;
-import org.apache.logging.log4j.plugins.convert.TypeConverterFactory;
 import org.apache.logging.log4j.plugins.validation.ConstraintValidator;
 import org.apache.logging.log4j.plugins.validation.constraints.ValidPort;
 import org.apache.logging.log4j.status.StatusLogger;
@@ -33,29 +30,29 @@ public class ValidPortValidator implements ConstraintValidator<ValidPort> {
 
     private static final Logger LOGGER = StatusLogger.getLogger();
 
-    private final TypeConverter<Integer> converter;
     private ValidPort annotation;
 
-    @Inject
-    public ValidPortValidator(final TypeConverterFactory factory) {
-        converter = factory.getTypeConverter(Integer.class);
-    }
-
     @Override
     public void initialize(final ValidPort annotation) {
         this.annotation = annotation;
     }
 
     @Override
     public boolean isValid(final String name, final Object value) {
-        if (value instanceof CharSequence) {
-            return isValid(name, converter.convert(value.toString(), -1));
-        }
-        if (!(value instanceof Integer)) {
+        final int port;
+        if (value instanceof Integer i) {
+            port = i;
+        } else if (value instanceof CharSequence cs) {
+            try {
+                port = Integer.parseInt(cs, 0, cs.length(), 10);
+            } catch (final NumberFormatException ignored) {
+                LOGGER.error(annotation.message());
+                return false;
+            }
+        } else {
             LOGGER.error(annotation.message());
             return false;
         }
-        final int port = (int) value;
         if (port < 0 || port > 65535) {
             LOGGER.error(annotation.message());
             return false;

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

@@ -36,7 +36,7 @@
     <!-- Dependency version -->
     <spring-boot.version>3.2.2</spring-boot.version>
     <spring-cloud.version>4.1.1</spring-cloud.version>
-    <spring-framework.version>6.1.3</spring-framework.version>
+    <spring-framework.version>6.1.4</spring-framework.version>
 
     <!--
       ~ OSGi and JPMS options

src/changelog/.3.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="2224" link="https://github.com/apache/logging-log4j2/pull/2224"/>
-  <description format="asciidoc">Update `io.netty:netty-bom` to version `4.1.106.Final`</description>
+  <issue id="2283" link="https://github.com/apache/logging-log4j2/pull/2283"/>
+  <description format="asciidoc">Update `io.netty:netty-bom` to version `4.1.107.Final`</description>
 </entry>

src/changelog/.3.x.x/update_org_eclipse_jetty_jetty_bom.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       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="2285" link="https://github.com/apache/logging-log4j2/pull/2285"/>
+  <description format="asciidoc">Update `org.eclipse.jetty:jetty-bom` to version `9.4.54.v20240208`</description>
+</entry>

src/changelog/.3.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="2223" link="https://github.com/apache/logging-log4j2/pull/2223"/>
-  <description format="asciidoc">Update `org.springframework:spring-framework-bom` to version `6.1.3`</description>
+  <issue id="2294" link="https://github.com/apache/logging-log4j2/pull/2294"/>
+  <description format="asciidoc">Update `org.springframework:spring-framework-bom` to version `6.1.4`</description>
 </entry>

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

@@ -70,12 +70,13 @@ This release contains...
 * Update `com.fasterxml.jackson:jackson-bom` to version `2.16.1` (https://github.com/apache/logging-log4j2/pull/2127[2127])
 * Update `com.github.h-thurow:simple-jndi` to version `0.24.0` (https://github.com/apache/logging-log4j2/pull/2195[2195])
 * Update `commons-codec:commons-codec` to version `1.16.1` (https://github.com/apache/logging-log4j2/pull/2276[2276])
-* Update `io.netty:netty-bom` to version `4.1.106.Final` (https://github.com/apache/logging-log4j2/pull/2224[2224])
+* Update `io.netty:netty-bom` to version `4.1.107.Final` (https://github.com/apache/logging-log4j2/pull/2283[2283])
 * Update `org.apache.groovy:groovy-bom` to version `4.0.18` (https://github.com/apache/logging-log4j2/pull/2217[2217])
 * Update `org.apache.logging:logging-parent` to version `10.6.0` (https://github.com/apache/logging-log4j2/pull/2193[2193])
 * Update `org.apache.maven.surefire:surefire-junit47` to version `3.2.5` (https://github.com/apache/logging-log4j2/pull/2177[2177])
 * Update `org.apache.tomcat:tomcat-juli` to version `10.1.18` (https://github.com/apache/logging-log4j2/pull/2176[2176])
 * Update `org.assertj:assertj-core` to version `3.25.3` (https://github.com/apache/logging-log4j2/pull/2263[2263])
+* Update `org.eclipse.jetty:jetty-bom` to version `9.4.54.v20240208` (https://github.com/apache/logging-log4j2/pull/2285[2285])
 * Update `org.elasticsearch.client:elasticsearch-rest-high-level-client` to version `7.17.18` (https://github.com/apache/logging-log4j2/pull/2268[2268])
 * Update `org.graalvm.truffle:truffle-api` to version `23.1.2` (https://github.com/apache/logging-log4j2/pull/2206[2206])
 * Update `org.jctools:jctools-core` to version `4.0.3` (https://github.com/apache/logging-log4j2/pull/2267[2267])
@@ -85,5 +86,5 @@ This release contains...
 * Update `org.springframework.boot:spring-boot-autoconfigure` to version `3.2.2` (https://github.com/apache/logging-log4j2/pull/2222[2222])
 * Update `org.springframework.boot:spring-boot-dependencies` to version `3.2.1` (https://github.com/apache/logging-log4j2/pull/2123[2123])
 * Update `org.springframework.cloud:spring-cloud-context` to version `4.1.1` (https://github.com/apache/logging-log4j2/pull/2236[2236])
-* Update `org.springframework:spring-framework-bom` to version `6.1.3` (https://github.com/apache/logging-log4j2/pull/2223[2223])
+* Update `org.springframework:spring-framework-bom` to version `6.1.4` (https://github.com/apache/logging-log4j2/pull/2294[2294])
 * Update `uk.org.webcompere:system-stubs-core` to version `2.1.6` (https://github.com/apache/logging-log4j2/pull/2196[2196])