From b12631d75de47af9eda2d58e72f427d57722b608 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Thu, 1 May 2014 12:57:12 +0100
Subject: [PATCH] Ensure Spring Integration 4.0 is used in CLI

There was an issue with the generated poms for the dependency
tools (I'm not sure the generation step works if you don't
do "mvn clean"). Anyway I verified that it works and removed
the (now) unnecessary provided dependency from spring-boot-cli.

Fixes gh-362
---
 spring-boot-cli/pom.xml                                      | 5 -----
 .../SpringIntegrationCompilerAutoConfiguration.java          | 3 ++-
 spring-boot-starters/spring-boot-starter-integration/pom.xml | 5 +++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
index 1eec2aeb29..d879bc74db 100644
--- a/spring-boot-cli/pom.xml
+++ b/spring-boot-cli/pom.xml
@@ -128,11 +128,6 @@
 			<artifactId>junit</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-core</artifactId>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
index 75e930b035..256f407041 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
@@ -32,7 +32,8 @@ public class SpringIntegrationCompilerAutoConfiguration extends CompilerAutoConf
 
 	@Override
 	public boolean matches(ClassNode classNode) {
-		return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableIntegration");
+		return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableIntegration")
+				|| AstUtils.hasAtLeastOneAnnotation(classNode, "MessageEndpoint");
 	}
 
 	@Override
diff --git a/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml
index 7d0947e667..f069afec8f 100644
--- a/spring-boot-starters/spring-boot-starter-integration/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-integration/pom.xml
@@ -24,8 +24,9 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>