From 3171a8b0e2d7a4bfbdf27739f1c5beab565e25c9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 14 Jun 2023 11:18:18 +0200 Subject: [PATCH 1/2] Align with 5.3.28 javadoc for isSimpleValueType See gh-30661 --- .../src/main/java/org/springframework/util/ObjectUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java index fd4fb575883..bf873018f16 100644 --- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java @@ -941,6 +941,7 @@ public abstract class ObjectUtils { /** * Derived from {@link org.springframework.beans.BeanUtils#isSimpleValueType}. + * As of 5.3.28, considering {@code UUID} in addition to the bean-level check. */ private static boolean isSimpleValueType(Class type) { return (Void.class != type && void.class != type && @@ -950,7 +951,7 @@ public abstract class ObjectUtils { Number.class.isAssignableFrom(type) || Date.class.isAssignableFrom(type) || Temporal.class.isAssignableFrom(type) || - UUID.class.isAssignableFrom(type) || + UUID.class == type || URI.class == type || URL.class == type || Locale.class == type || From 13c32d80bac8ac8349f6c5a01d24ee19302e8623 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 14 Jun 2023 11:18:37 +0200 Subject: [PATCH 2/2] Upgrade to Undertow 2.3.7 and JRuby 9.4.3 --- framework-platform/framework-platform.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index ed708f9f303..fca0e6e7485 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -55,9 +55,9 @@ dependencies { api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE") api("io.reactivex.rxjava3:rxjava:3.1.6") api("io.smallrye.reactive:mutiny:1.9.0") - api("io.undertow:undertow-core:2.3.6.Final") - api("io.undertow:undertow-servlet:2.3.6.Final") - api("io.undertow:undertow-websockets-jsr:2.3.6.Final") + api("io.undertow:undertow-core:2.3.7.Final") + api("io.undertow:undertow-servlet:2.3.7.Final") + api("io.undertow:undertow-websockets-jsr:2.3.7.Final") api("io.vavr:vavr:0.10.4") api("jakarta.activation:jakarta.activation-api:2.0.1") api("jakarta.annotation:jakarta.annotation-api:2.0.0") @@ -128,7 +128,7 @@ dependencies { api("org.hibernate:hibernate-validator:7.0.5.Final") api("org.hsqldb:hsqldb:2.7.1") api("org.javamoney:moneta:1.4.2") - api("org.jruby:jruby:9.4.2.0") + api("org.jruby:jruby:9.4.3.0") api("org.junit.support:testng-engine:1.0.4") api("org.mozilla:rhino:1.7.14") api("org.ogce:xpp3:1.1.6")