From 258baaac52428de1729c8bbf03df4447e01c173c Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Thu, 31 Mar 2022 14:00:09 -0400
Subject: [PATCH] Fixes dependency management now that stream is a monorepo

---
 binders/kafka-binder/pom.xml  | 48 ++---------------------------------
 binders/rabbit-binder/pom.xml | 37 ++-------------------------
 pom.xml                       | 37 +++++++++------------------
 3 files changed, 16 insertions(+), 106 deletions(-)

diff --git a/binders/kafka-binder/pom.xml b/binders/kafka-binder/pom.xml
index da4ff50e9..73fa244bf 100644
--- a/binders/kafka-binder/pom.xml
+++ b/binders/kafka-binder/pom.xml
@@ -6,9 +6,8 @@
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.1</version>
-		<relativePath />
+		<artifactId>spring-cloud-stream-binders</artifactId>
+		<version>3.2.3-SNAPSHOT</version>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-stream-binder-kafka</url>
@@ -39,49 +38,6 @@
 
 	<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</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.kafka</groupId>
-				<artifactId>kafka-clients</artifactId>
-				<version>${kafka.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.springframework.kafka</groupId>
-				<artifactId>spring-kafka</artifactId>
-				<version>${spring-kafka.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.integration</groupId>
-				<artifactId>spring-integration-kafka</artifactId>
-				<version>${spring-integration-kafka.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-test</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.kafka</groupId>
-				<artifactId>spring-kafka-test</artifactId>
-				<scope>test</scope>
-				<version>${spring-kafka.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.kafka</groupId>
 				<artifactId>kafka-streams</artifactId>
diff --git a/binders/rabbit-binder/pom.xml b/binders/rabbit-binder/pom.xml
index e75d70f1e..f76688f48 100644
--- a/binders/rabbit-binder/pom.xml
+++ b/binders/rabbit-binder/pom.xml
@@ -6,9 +6,8 @@
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.1</version>
-		<relativePath />
+		<artifactId>spring-cloud-stream-binders</artifactId>
+		<version>3.2.3-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<spring-cloud-stream.version>3.2.3-SNAPSHOT</spring-cloud-stream.version>
@@ -27,38 +26,6 @@
 		<module>spring-cloud-stream-binder-rabbit-test-support</module>
 		<module>docs</module>
 	</modules>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-test</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-rabbit-test-support</artifactId>
-				<version>${project.version}</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>org.junit.vintage</groupId>
diff --git a/pom.xml b/pom.xml
index 0e4f6022e..7086b03a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,18 @@
   
         <dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-dependencies</artifactId>
+				<version>${project.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-stream-test-support-internal</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-actuator</artifactId>
@@ -60,21 +72,6 @@
 				<artifactId>spring-cloud-function-context</artifactId>
 				<version>${spring-cloud-function.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-tools</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-binder-test</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-tuple</artifactId>
@@ -85,16 +82,6 @@
 				<artifactId>spring-integration-tuple</artifactId>
 				<version>${spring.integration.tuple.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-test-support</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-test-support-internal</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>io.projectreactor</groupId>
 				<artifactId>reactor-bom</artifactId>