From 4ad3d30a40d30a9733ed0e080e90af60154185f0 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Sun, 25 Aug 2013 08:20:32 -0700
Subject: [PATCH] Fixup CLI POM

Fix classloader issues by excluding spring JARs from test classpath
and also include spring-integration-groovy-dsl as a managed dependency.
---
 spring-boot-cli/pom.xml          | 45 ++++++++++++++++++--------------
 spring-boot-dependencies/pom.xml |  6 +++++
 spring-boot-parent/pom.xml       |  4 +--
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
index d4cbd60eace..1a0f99dbbd6 100644
--- a/spring-boot-cli/pom.xml
+++ b/spring-boot-cli/pom.xml
@@ -34,6 +34,12 @@
 			<artifactId>groovy-templates</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<!-- Provided (to ensure in m2 repo for @grab to resolve) -->
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-dsl-groovy-core</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<!-- Test -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -43,26 +49,8 @@
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-context</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-context</artifactId>
+					<groupId>${project.groupId}</groupId>
+					<artifactId>spring-boot</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -81,6 +69,23 @@
 			</resource>
 		</resources>
 		<plugins>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework:spring-core</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework:spring-beans</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework:spring-aop</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework:spring-tx</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework:spring-expression</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework:spring-context</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework:spring-test</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework.retry:spring-retry</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework.integration:spring-integration-core</classpathDependencyExcludes>
+						<classpathDependencyExcludes>org.springframework.integration:spring-integration-dsl-groovy-core</classpathDependencyExcludes>
+					</classpathDependencyExcludes>
+				</configuration>
+			</plugin>
 			<plugin>
 				<artifactId>maven-shade-plugin</artifactId>
 				<configuration>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 57aa71b37a4..3f022b6d457 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -10,6 +10,7 @@
 		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
 		<spring.security.version>3.2.0.RC1</spring.security.version>
 		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
+		<spring.integration.groovydsl.version>1.0.0.M1</spring.integration.groovydsl.version>
 		<spring.batch.version>2.2.0.RELEASE</spring.batch.version>
 		<groovy.version>2.1.6</groovy.version>
 		<gradle.version>1.6</gradle.version>
@@ -354,6 +355,11 @@
 				<artifactId>spring-integration-stream</artifactId>
 				<version>${spring.integration.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-dsl-groovy-core</artifactId>
+				<version>${spring.integration.groovydsl.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.security</groupId>
 				<artifactId>spring-security-core</artifactId>
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 94f5ca236ce..5458f5e8a2d 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -34,7 +34,7 @@
 	</scm>
 	<dependencyManagement>
 		<dependencies>
-			<!-- Additional Dependencies the consumers of spring-boot-dependencies 
+			<!-- Additional Dependencies the consumers of spring-boot-dependencies
 				will generally not need -->
 			<dependency>
 				<groupId>net.sf.jopt-simple</groupId>
@@ -294,7 +294,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<!-- Allow snapshots and milestones when building locally, this profile 
+			<!-- Allow snapshots and milestones when building locally, this profile
 				should not be enabled during release. -->
 			<id>spring-snapshot-build</id>
 			<activation>