Skip to content

Commit f5d922c

Browse files
committed
Upgrade to Spring Integration 5.1.0.M2
Upgrade to M2 broke a test that was looking for a particular bean that is configured by Spring Integration (`HeaderChannelRegistry`). It looks like INT-4517 is related to the regression as it registers the bean too late for the auto-configuration to see it. This commit changes the condition to a more central bean that is created very early on. Closes gh-14142
1 parent 4dc8b71 commit f5d922c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
29+
import org.springframework.integration.config.IntegrationConfigurationBeanFactoryPostProcessor;
2930
import org.springframework.integration.graph.IntegrationGraphServer;
30-
import org.springframework.integration.support.channel.HeaderChannelRegistry;
3131

3232
/**
3333
* {@link EnableAutoConfiguration Auto-configuration} for the
@@ -39,7 +39,7 @@
3939
*/
4040
@Configuration
4141
@ConditionalOnClass(IntegrationGraphServer.class)
42-
@ConditionalOnBean(HeaderChannelRegistry.class)
42+
@ConditionalOnBean(IntegrationConfigurationBeanFactoryPostProcessor.class)
4343
@AutoConfigureAfter(IntegrationAutoConfiguration.class)
4444
public class IntegrationGraphEndpointAutoConfiguration {
4545

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<spring-cloud-connectors.version>2.0.2.RELEASE</spring-cloud-connectors.version>
160160
<spring-data-releasetrain.version>Lovelace-RC2</spring-data-releasetrain.version>
161161
<spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version>
162-
<spring-integration.version>5.1.0.M1</spring-integration.version>
162+
<spring-integration.version>5.1.0.M2</spring-integration.version>
163163
<spring-kafka.version>2.2.0.M2</spring-kafka.version>
164164
<spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>
165165
<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>

0 commit comments

Comments
 (0)