From a854e986aa2fd3101bcc325f49376b131966d22f Mon Sep 17 00:00:00 2001
From: Marius Bogoevici <mbogoevici@pivotal.io>
Date: Thu, 4 Feb 2016 11:36:12 -0500
Subject: [PATCH] Revert to Rabbit version provided by Spring Boot/Cloud

At the time of the commit it is 1.5.3.RELEASE, but it will pull the version as per the Spring Cloud parent version.
---
 spring-cloud-stream-binders/pom.xml                         | 1 -
 spring-cloud-stream-dependencies/pom.xml                    | 6 ------
 .../spring-cloud-starter-stream-rabbit/pom.xml              | 3 +--
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/spring-cloud-stream-binders/pom.xml b/spring-cloud-stream-binders/pom.xml
index 267a08c92..202960a9b 100644
--- a/spring-cloud-stream-binders/pom.xml
+++ b/spring-cloud-stream-binders/pom.xml
@@ -17,7 +17,6 @@
 	<properties>
 		<kafka.version>0.8.2.1</kafka.version>
 		<curator.version>2.6.0</curator.version>
-		<spring-amqp.version>1.5.4.BUILD-SNAPSHOT</spring-amqp.version>
 	</properties>
 	<modules>
 		<module>spring-cloud-stream-binder-test</module>
diff --git a/spring-cloud-stream-dependencies/pom.xml b/spring-cloud-stream-dependencies/pom.xml
index 5b66ba356..02a81cf80 100644
--- a/spring-cloud-stream-dependencies/pom.xml
+++ b/spring-cloud-stream-dependencies/pom.xml
@@ -16,7 +16,6 @@
 	<properties>
 		<rxjava.version>1.0.14</rxjava.version>
 		<spring-integration.version>4.2.4.RELEASE</spring-integration.version>
-		<spring-amqp.version>1.5.4.BUILD-SNAPSHOT</spring-amqp.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -120,11 +119,6 @@
 				<artifactId>objenesis</artifactId>
 				<version>2.1</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.amqp</groupId>
-				<artifactId>spring-rabbit</artifactId>
-				<version>${spring-amqp.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.integration</groupId>
 				<artifactId>spring-integration-bom</artifactId>
diff --git a/spring-cloud-stream-starters/spring-cloud-starter-stream-rabbit/pom.xml b/spring-cloud-stream-starters/spring-cloud-starter-stream-rabbit/pom.xml
index f566c50a8..97967372b 100644
--- a/spring-cloud-stream-starters/spring-cloud-starter-stream-rabbit/pom.xml
+++ b/spring-cloud-stream-starters/spring-cloud-starter-stream-rabbit/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
@@ -17,7 +17,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-amqp.version>1.5.4.BUILD-SNAPSHOT</spring-amqp.version>
 	</properties>
 	<dependencies>
 		<dependency>