From cdfe5816c88d27e8f64174ea673b3865df9496b0 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 12 Jun 2024 14:23:14 +0200 Subject: [PATCH 1/2] Upgrade to Netty 4.1.111 and Awaitility 4.2.1 --- framework-platform/framework-platform.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 11344a1543..cd811cf949 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -9,7 +9,7 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.15.4")) api(platform("io.micrometer:micrometer-bom:1.12.7")) - api(platform("io.netty:netty-bom:4.1.110.Final")) + api(platform("io.netty:netty-bom:4.1.111.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2023.0.7")) api(platform("io.rsocket:rsocket-bom:1.1.3")) @@ -110,7 +110,7 @@ dependencies { api("org.aspectj:aspectjrt:1.9.22.1") api("org.aspectj:aspectjtools:1.9.22.1") api("org.aspectj:aspectjweaver:1.9.22.1") - api("org.awaitility:awaitility:4.2.0") + api("org.awaitility:awaitility:4.2.1") api("org.bouncycastle:bcpkix-jdk18on:1.72") api("org.codehaus.jettison:jettison:1.5.4") api("org.crac:crac:1.4.0") From 24c8dfea1f3d166bae890efc8f5427e9b43124ac Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 12 Jun 2024 14:23:26 +0200 Subject: [PATCH 2/2] Remove duplicated javadoc paragraph --- .../context/support/DefaultLifecycleProcessor.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java index 8e685b14c0..1a81210d58 100644 --- a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java @@ -60,10 +60,6 @@ import org.springframework.util.ClassUtils; * groups for specific phases, on startup/shutdown as well as for explicit start/stop * interactions on a {@link org.springframework.context.ConfigurableApplicationContext}. * - *

Provides interaction with {@link Lifecycle} and {@link SmartLifecycle} beans in - * groups for specific phases, on startup/shutdown as well as for explicit start/stop - * interactions on a {@link org.springframework.context.ConfigurableApplicationContext}. - * *

As of 6.1, this also includes support for JVM checkpoint/restore (Project CRaC) * when the {@code org.crac:crac} dependency on the classpath. *