From 0b96da4b6dfacf4b337f606cfa8fea117215fa53 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 10 Oct 2023 23:28:57 +0200 Subject: [PATCH 1/2] Revise javadoc for LifecycleProcessor bean etc --- .../support/AbstractApplicationContext.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) 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 4ef8c78b27b..36b2c76f838 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,25 +136,33 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader implements ConfigurableApplicationContext { /** - * Name of the MessageSource bean in the factory. - * If none is supplied, message resolution is delegated to the parent. - * @see MessageSource - */ - public static final String MESSAGE_SOURCE_BEAN_NAME = "messageSource"; - - /** - * 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 ApplicationEventMulticaster bean in the factory. - * If none is supplied, a default SimpleApplicationEventMulticaster is used. + * The name of the {@link MessageSource} bean in the context. + * If none is supplied, message resolution is delegated to the parent. + * @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"; + + /** + * 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"; From e0a55c2caad28a396555f8958128e91b3b837453 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 11 Oct 2023 00:13:51 +0200 Subject: [PATCH 2/2] Upgrade to Micrometer 1.10.12 and Reactor 2022.0.12 Includes Context Propagation 1.0.6, Netty 4.1.100, Jetty 11.0.17, Tomcat 10.1.14, Groovy 4.0.15, Mockito 5.6, Checkstyle 10.12.4 Closes gh-31404 Closes gh-31405 --- build.gradle | 2 +- framework-platform/framework-platform.gradle | 22 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 5584045fd96..5d8584284ba 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ configure([rootProject] + javaProjects) { project -> } checkstyle { - toolVersion = "10.12.3" + toolVersion = "10.12.4" configDirectory.set(rootProject.file("src/checkstyle")) } diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 48993d53d97..ea531e51c38 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -8,18 +8,18 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.14.3")) - api(platform("io.micrometer:micrometer-bom:1.10.11")) - api(platform("io.netty:netty-bom:4.1.97.Final")) + api(platform("io.micrometer:micrometer-bom:1.10.12")) + 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:2022.0.11")) + api(platform("io.projectreactor:reactor-bom:2022.0.12")) 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:11.0.16")) + api(platform("org.eclipse.jetty:jetty-bom:11.0.17")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.4.0")) api(platform("org.junit:junit-bom:5.9.3")) - 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") @@ -45,7 +45,7 @@ dependencies { api("com.thoughtworks.xstream:xstream:1.4.20") api("commons-io:commons-io:2.11.0") api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2") - api("io.micrometer:context-propagation:1.0.5") + api("io.micrometer:context-propagation:1.0.6") api("io.mockk:mockk:1.13.4") api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3") api("io.projectreactor.tools:blockhound:1.0.8.RELEASE") @@ -99,10 +99,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")