Merge branch '6.1.x'

# Conflicts:
#	framework-platform/framework-platform.gradle

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.13.1"))
-	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:2024.0.0-M3"))
 	api(platform("io.rsocket:rsocket-bom:1.1.3"))
@@ -109,7 +109,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")

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}.
  *
- * <p>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}.
- *
  * <p>As of 6.1, this also includes support for JVM checkpoint/restore (Project CRaC)
  * when the {@code org.crac:crac} dependency on the classpath.
  *