From f473b3b42f7d2be9b0d1decf27049e9abb97bb7d Mon Sep 17 00:00:00 2001
From: Marius Bogoevici <mbogoevici@pivotal.io>
Date: Wed, 19 Jul 2017 10:23:57 -0400
Subject: [PATCH] POM structure corrections

- move all intra-project deps to dependency management
- remove redundant overrides of Spring Integration Kafka
---
 pom.xml                                          | 16 ++++++++++++++++
 .../pom.xml                                      |  2 --
 .../pom.xml                                      |  1 -
 spring-cloud-stream-binder-kafka/pom.xml         |  3 ---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7762ae344..d67e8724d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,22 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-binder-kafka</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-binder-kafka-test-support</artifactId>
+				<version>${project.version}</version>
+				<scope>test</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream</artifactId>
diff --git a/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml b/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml
index a4be72cc6..4692e3887 100644
--- a/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml
+++ b/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml
@@ -16,8 +16,6 @@
     <properties>
         <main.basedir>${basedir}/../..</main.basedir>
         <kafka.version>0.10.1.1</kafka.version>
-        <spring-kafka.version>1.1.2.RELEASE</spring-kafka.version>
-        <spring-integration-kafka.version>2.1.1.RELEASE</spring-integration-kafka.version>
     </properties>
 
     <dependencies>
diff --git a/spring-cloud-stream-binder-kafka-0.10.2-test/pom.xml b/spring-cloud-stream-binder-kafka-0.10.2-test/pom.xml
index 3910f364d..474a94d07 100644
--- a/spring-cloud-stream-binder-kafka-0.10.2-test/pom.xml
+++ b/spring-cloud-stream-binder-kafka-0.10.2-test/pom.xml
@@ -17,7 +17,6 @@
         <main.basedir>${basedir}/../..</main.basedir>
         <kafka.version>0.10.2.1</kafka.version>
         <spring-kafka.version>1.2.2.RELEASE</spring-kafka.version>
-        <spring-integration-kafka.version>2.1.1.RELEASE</spring-integration-kafka.version>
     </properties>
 
     <dependencies>
diff --git a/spring-cloud-stream-binder-kafka/pom.xml b/spring-cloud-stream-binder-kafka/pom.xml
index 5fd54ce8f..5b259a6ad 100644
--- a/spring-cloud-stream-binder-kafka/pom.xml
+++ b/spring-cloud-stream-binder-kafka/pom.xml
@@ -17,7 +17,6 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kafka-core</artifactId>
-			<version>1.3.0.BUILD-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -58,7 +57,6 @@
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-kafka</artifactId>
-			<version>2.1.1.BUILD-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -84,7 +82,6 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-kafka-test-support</artifactId>
-			<version>1.3.0.BUILD-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>