From f5d922c71253ea14c102c5c71fd8d4a671ef7cfa Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 21 Aug 2018 09:03:14 +0200
Subject: [PATCH] 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
---
 .../IntegrationGraphEndpointAutoConfiguration.java            | 4 ++--
 spring-boot-project/spring-boot-dependencies/pom.xml          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java
index 328e2feb2c..4136ba13a6 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java
@@ -26,8 +26,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.config.IntegrationConfigurationBeanFactoryPostProcessor;
 import org.springframework.integration.graph.IntegrationGraphServer;
-import org.springframework.integration.support.channel.HeaderChannelRegistry;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for the
@@ -39,7 +39,7 @@ import org.springframework.integration.support.channel.HeaderChannelRegistry;
  */
 @Configuration
 @ConditionalOnClass(IntegrationGraphServer.class)
-@ConditionalOnBean(HeaderChannelRegistry.class)
+@ConditionalOnBean(IntegrationConfigurationBeanFactoryPostProcessor.class)
 @AutoConfigureAfter(IntegrationAutoConfiguration.class)
 public class IntegrationGraphEndpointAutoConfiguration {
 
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 1b1c7b8862..16e1de4526 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -159,7 +159,7 @@
 		<spring-cloud-connectors.version>2.0.2.RELEASE</spring-cloud-connectors.version>
 		<spring-data-releasetrain.version>Lovelace-RC2</spring-data-releasetrain.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-ldap.version>2.3.2.RELEASE</spring-ldap.version>
 		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>