From 1e8989a45abc789119d6326a911908b18332549b Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Fri, 21 Aug 2015 15:33:31 -0700
Subject: [PATCH] Remove cloud connector dependencies from S-C-S

 - Remove lattice and cf connector dependencies from core S-C-S and binder
  - The idea is to have these dependencies defined in s-c-s-modules so that they
are specified in one place and make the module run on local/cloud environment in a
self contained manner
  - Keep the `spring-cloud-core` dependency to binder so that the Cloud configuration
is used to get the appropriate services for the redis/rabbit binder
---
 pom.xml                                              |  6 ------
 .../spring-cloud-stream-binder-rabbit/pom.xml        |  2 +-
 .../spring-cloud-stream-binder-redis/pom.xml         |  2 +-
 spring-cloud-stream/pom.xml                          | 12 ------------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5fd5c3d19..ad85bc212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
 		<spring-boot.version>1.3.0.BUILD-SNAPSHOT</spring-boot.version>
 		<spring-framework.version>4.2.1.BUILD-SNAPSHOT</spring-framework.version>
 		<spring-integration.version>4.2.0.BUILD-SNAPSHOT</spring-integration.version>
-		<spring-cloud-lattice.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-lattice.version>
 	</properties>
 	<modules>
 		<module>spring-cloud-stream</module>
@@ -49,11 +48,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-lattice-connector</artifactId>
-				<version>${spring-cloud-lattice.version}</version>
-			</dependency>
 		    <dependency>
 			  <groupId>org.springframework.cloud</groupId>
 			  <artifactId>spring-cloud-stream</artifactId>
diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/pom.xml
index c83cae5ec..3088d135a 100644
--- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/pom.xml
+++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/pom.xml
@@ -39,7 +39,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-lattice-connector</artifactId>
+			<artifactId>spring-cloud-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml
index 027142f03..9b9cb7680 100644
--- a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml
+++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/pom.xml
@@ -39,7 +39,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-lattice-connector</artifactId>
+			<artifactId>spring-cloud-core</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-stream/pom.xml b/spring-cloud-stream/pom.xml
index 8ad1b238c..004fef3bf 100644
--- a/spring-cloud-stream/pom.xml
+++ b/spring-cloud-stream/pom.xml
@@ -31,18 +31,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-messaging</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-spring-service-connector</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-lattice-connector</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-local</artifactId>