Merge branch '3.3.x' into 3.4.x

Closes gh-45194

Author: philwebb

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 
 import io.rsocket.transport.netty.server.TcpServerTransport;
 
-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
@@ -46,6 +45,7 @@
 import org.springframework.boot.context.properties.source.MutuallyExclusiveConfigurationPropertiesException;
 import org.springframework.boot.task.SimpleAsyncTaskSchedulerBuilder;
 import org.springframework.boot.task.ThreadPoolTaskSchedulerBuilder;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
@@ -208,14 +208,21 @@ public SimpleAsyncTaskScheduler taskSchedulerVirtualThreads(
 	protected static class IntegrationJmxConfiguration {
 
 		@Bean
-		public IntegrationMBeanExporter integrationMbeanExporter(BeanFactory beanFactory, JmxProperties properties) {
-			IntegrationMBeanExporter exporter = new IntegrationMBeanExporter();
-			String defaultDomain = properties.getDefaultDomain();
-			if (StringUtils.hasLength(defaultDomain)) {
-				exporter.setDefaultDomain(defaultDomain);
-			}
-			exporter.setServer(beanFactory.getBean(properties.getServer(), MBeanServer.class));
-			return exporter;
+		public static IntegrationMBeanExporter integrationMbeanExporter(ApplicationContext applicationContext) {
+			return new IntegrationMBeanExporter() {
+
+				@Override
+				public void afterSingletonsInstantiated() {
+					JmxProperties properties = applicationContext.getBean(JmxProperties.class);
+					String defaultDomain = properties.getDefaultDomain();
+					if (StringUtils.hasLength(defaultDomain)) {
+						setDefaultDomain(defaultDomain);
+					}
+					setServer(applicationContext.getBean(properties.getServer(), MBeanServer.class));
+					super.afterSingletonsInstantiated();
+				}
+
+			};
 		}
 
 	}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java

@@ -149,7 +149,7 @@ void enableJmxIntegration() {
 		this.contextRunner.withPropertyValues("spring.jmx.enabled=true").run((context) -> {
 			MBeanServer mBeanServer = context.getBean(MBeanServer.class);
 			assertThat(mBeanServer.getDomains()).contains("org.springframework.integration",
-					"org.springframework.integration.monitor");
+					"org.springframework.boot.autoconfigure.integration");
 			assertThat(context).hasBean(IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME);
 		});
 	}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/build.gradle

@@ -9,6 +9,7 @@ dependencies {
 
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-integration"))
 	implementation("org.springframework.integration:spring-integration-file")
+	implementation("org.springframework.integration:spring-integration-jmx")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	testImplementation("org.awaitility:awaitility")

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/resources/application.properties

@@ -2,3 +2,4 @@ logging.level.org.springframework.integration.file=DEBUG
 service.greeting=Hello
 service.input-dir=input
 service.output-dir=output
+spring.jmx.enabled=true

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/consumer/SampleIntegrationApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,18 +25,22 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.io.TempDir;
 import smoketest.integration.SampleIntegrationApplication;
 import smoketest.integration.ServiceProperties;
 import smoketest.integration.producer.ProducerApplication;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternUtils;
 import org.springframework.util.StreamUtils;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
 
 /**
@@ -45,12 +49,14 @@
  * @author Dave Syer
  * @author Andy Wilkinson
  */
+@ExtendWith(OutputCaptureExtension.class)
 class SampleIntegrationApplicationTests {
 
 	private ConfigurableApplicationContext context;
 
 	@AfterEach
-	void stop() {
+	void stopAndCheck(CapturedOutput output) {
+		assertThat(output).doesNotContain("WARN");
 		if (this.context != null) {
 			this.context.close();
 		}