From dd14d24e4f88be9622876c7eed9e389d1716d072 Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Thu, 31 Mar 2022 15:31:37 -0400
Subject: [PATCH] Pin to Spring Kafka snapshot

---
 binders/kafka-binder/pom.xml     | 5 +++++
 core/spring-cloud-stream/pom.xml | 7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/binders/kafka-binder/pom.xml b/binders/kafka-binder/pom.xml
index 73fa244bf..debf9dc57 100644
--- a/binders/kafka-binder/pom.xml
+++ b/binders/kafka-binder/pom.xml
@@ -38,6 +38,11 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework.kafka</groupId>
+				<artifactId>spring-kafka</artifactId>
+				<version>2.8.4-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.kafka</groupId>
 				<artifactId>kafka-streams</artifactId>
diff --git a/core/spring-cloud-stream/pom.xml b/core/spring-cloud-stream/pom.xml
index 5ca5e0215..296aab416 100644
--- a/core/spring-cloud-stream/pom.xml
+++ b/core/spring-cloud-stream/pom.xml
@@ -11,13 +11,8 @@
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-<<<<<<< HEAD
-		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>3.2.3-SNAPSHOT</version>
-=======
 		<artifactId>spring-cloud-stream-core</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
->>>>>>> a951837e4... Fixes parent
+		<version>3.2.3-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>