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

@@ -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>

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

spring-boot-starters/spring-boot-starter-integration/pom.xml

@@ -24,8 +24,9 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
+			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-aop</artifactId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>