From 7248ac6c0947e5da1dccbdeda4fa4c4e472067b5 Mon Sep 17 00:00:00 2001
From: Soby Chacko <chackos@vmware.com>
Date: Tue, 29 Nov 2022 17:35:12 -0500
Subject: [PATCH] Test support dependency cleanup

---
 .../pom.xml                                   |  9 ++-------
 .../pom.xml                                   |  4 ++--
 .../pom.xml                                   | 20 ++++++++++++-------
 .../pom.xml                                   |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml
index 0f7f8f7a6..079a8be5f 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-core/pom.xml
@@ -29,19 +29,14 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml
index bfcb46632..fb4e8a6ec 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-reactive/pom.xml
@@ -61,8 +61,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<!-- Following dependencies are needed to support Kafka 1.1.0 client-->
diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml
index 0ea16528f..44ae712eb 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/pom.xml
@@ -45,19 +45,14 @@
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-test-support</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -79,6 +74,17 @@
 			<artifactId>awaitility</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-test</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.avro</groupId>
+					<artifactId>avro-compiler</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/pom.xml b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/pom.xml
index 241e9fcd4..e204054fc 100644
--- a/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/pom.xml
+++ b/binders/kinesis-binder/spring-cloud-stream-binder-kinesis/pom.xml
@@ -73,7 +73,7 @@
 			<artifactId>spring-cloud-stream-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>junit-jupiter</artifactId>