diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 55f6d7d13af..863d1ea3aa6 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -9,18 +9,18 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.15.2")) api(platform("io.micrometer:micrometer-bom:1.12.0-RC1")) - api(platform("io.netty:netty-bom:4.1.97.Final")) + api(platform("io.netty:netty-bom:4.1.100.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2023.0.0-M3")) api(platform("io.rsocket:rsocket-bom:1.1.3")) - api(platform("org.apache.groovy:groovy-bom:4.0.14")) + api(platform("org.apache.groovy:groovy-bom:4.0.15")) api(platform("org.apache.logging.log4j:log4j-bom:2.20.0")) api(platform("org.eclipse.jetty:jetty-bom:12.0.1")) api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.1")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0")) api(platform("org.junit:junit-bom:5.10.0")) - api(platform("org.mockito:mockito-bom:5.5.0")) + api(platform("org.mockito:mockito-bom:5.6.0")) constraints { api("com.fasterxml:aalto-xml:1.3.2") @@ -103,10 +103,10 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.2.1") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.2") api("org.apache.poi:poi-ooxml:5.2.3") - api("org.apache.tomcat.embed:tomcat-embed-core:10.1.13") - api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.13") - api("org.apache.tomcat:tomcat-util:10.1.13") - api("org.apache.tomcat:tomcat-websocket:10.1.13") + api("org.apache.tomcat.embed:tomcat-embed-core:10.1.14") + api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.14") + api("org.apache.tomcat:tomcat-util:10.1.14") + api("org.apache.tomcat:tomcat-websocket:10.1.14") api("org.aspectj:aspectjrt:1.9.20") api("org.aspectj:aspectjtools:1.9.20") api("org.aspectj:aspectjweaver:1.9.20") diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index a51070cf138..7ddd510abf2 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -136,26 +136,33 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader implements ConfigurableApplicationContext { /** - * Name of the LifecycleProcessor bean in the factory. - * If none is supplied, a DefaultLifecycleProcessor is used. + * The name of the {@link LifecycleProcessor} bean in the context. + * If none is supplied, a {@link DefaultLifecycleProcessor} is used. * @since 3.0 * @see org.springframework.context.LifecycleProcessor * @see org.springframework.context.support.DefaultLifecycleProcessor + * @see #start() + * @see #stop() */ public static final String LIFECYCLE_PROCESSOR_BEAN_NAME = "lifecycleProcessor"; /** - * Name of the MessageSource bean in the factory. + * The name of the {@link MessageSource} bean in the context. * If none is supplied, message resolution is delegated to the parent. - * @see MessageSource + * @see org.springframework.context.MessageSource + * @see org.springframework.context.support.ResourceBundleMessageSource + * @see org.springframework.context.support.ReloadableResourceBundleMessageSource + * @see #getMessage(MessageSourceResolvable, Locale) */ public static final String MESSAGE_SOURCE_BEAN_NAME = "messageSource"; /** - * Name of the ApplicationEventMulticaster bean in the factory. - * If none is supplied, a default SimpleApplicationEventMulticaster is used. + * The name of the {@link ApplicationEventMulticaster} bean in the context. + * If none is supplied, a {@link SimpleApplicationEventMulticaster} is used. * @see org.springframework.context.event.ApplicationEventMulticaster * @see org.springframework.context.event.SimpleApplicationEventMulticaster + * @see #publishEvent(ApplicationEvent) + * @see #addApplicationListener(ApplicationListener) */ public static final String APPLICATION_EVENT_MULTICASTER_BEAN_NAME = "applicationEventMulticaster";