Commit f5d922c7 authored by Stephane Nicoll's avatar Stephane Nicoll

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
parent 4dc8b712
...@@ -26,8 +26,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean ...@@ -26,8 +26,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration; import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.integration.config.IntegrationConfigurationBeanFactoryPostProcessor;
import org.springframework.integration.graph.IntegrationGraphServer; import org.springframework.integration.graph.IntegrationGraphServer;
import org.springframework.integration.support.channel.HeaderChannelRegistry;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for the * {@link EnableAutoConfiguration Auto-configuration} for the
...@@ -39,7 +39,7 @@ import org.springframework.integration.support.channel.HeaderChannelRegistry; ...@@ -39,7 +39,7 @@ import org.springframework.integration.support.channel.HeaderChannelRegistry;
*/ */
@Configuration @Configuration
@ConditionalOnClass(IntegrationGraphServer.class) @ConditionalOnClass(IntegrationGraphServer.class)
@ConditionalOnBean(HeaderChannelRegistry.class) @ConditionalOnBean(IntegrationConfigurationBeanFactoryPostProcessor.class)
@AutoConfigureAfter(IntegrationAutoConfiguration.class) @AutoConfigureAfter(IntegrationAutoConfiguration.class)
public class IntegrationGraphEndpointAutoConfiguration { public class IntegrationGraphEndpointAutoConfiguration {
......
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<spring-cloud-connectors.version>2.0.2.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>2.0.2.RELEASE</spring-cloud-connectors.version>
<spring-data-releasetrain.version>Lovelace-RC2</spring-data-releasetrain.version> <spring-data-releasetrain.version>Lovelace-RC2</spring-data-releasetrain.version>
<spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version> <spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version>
<spring-integration.version>5.1.0.M1</spring-integration.version> <spring-integration.version>5.1.0.M2</spring-integration.version>
<spring-kafka.version>2.2.0.M2</spring-kafka.version> <spring-kafka.version>2.2.0.M2</spring-kafka.version>
<spring-ldap.version>2.3.2.RELEASE</spring-ldap.version> <spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>
<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version> <spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment