From 7a8fe391c974a697ac9c192e837db477f5829651 Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Thu, 31 Mar 2022 14:26:00 -0400
Subject: [PATCH] Fixes parent

---
 core/spring-cloud-stream-binder-test/pom.xml           | 2 +-
 core/spring-cloud-stream-integration-tests/pom.xml     | 2 +-
 core/spring-cloud-stream-test-support-internal/pom.xml | 2 +-
 core/spring-cloud-stream-test-support/pom.xml          | 2 +-
 core/spring-cloud-stream/pom.xml                       | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/spring-cloud-stream-binder-test/pom.xml b/core/spring-cloud-stream-binder-test/pom.xml
index 74cbf70dd..fcc62a9b3 100644
--- a/core/spring-cloud-stream-binder-test/pom.xml
+++ b/core/spring-cloud-stream-binder-test/pom.xml
@@ -12,7 +12,7 @@
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-parent</artifactId>
+		<artifactId>spring-cloud-stream-core</artifactId>
 		<version>3.2.3-SNAPSHOT</version>
 	</parent>
 
diff --git a/core/spring-cloud-stream-integration-tests/pom.xml b/core/spring-cloud-stream-integration-tests/pom.xml
index ca484c0dc..22e0ffc43 100644
--- a/core/spring-cloud-stream-integration-tests/pom.xml
+++ b/core/spring-cloud-stream-integration-tests/pom.xml
@@ -11,7 +11,7 @@
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-parent</artifactId>
+		<artifactId>spring-cloud-stream-core</artifactId>
 		<version>3.2.3-SNAPSHOT</version>
 	</parent>
 
diff --git a/core/spring-cloud-stream-test-support-internal/pom.xml b/core/spring-cloud-stream-test-support-internal/pom.xml
index e187bb102..6733cffc0 100644
--- a/core/spring-cloud-stream-test-support-internal/pom.xml
+++ b/core/spring-cloud-stream-test-support-internal/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-parent</artifactId>
+		<artifactId>spring-cloud-stream-core</artifactId>
 		<version>3.2.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support-internal</artifactId>
diff --git a/core/spring-cloud-stream-test-support/pom.xml b/core/spring-cloud-stream-test-support/pom.xml
index 528ace4b5..f22a1275b 100644
--- a/core/spring-cloud-stream-test-support/pom.xml
+++ b/core/spring-cloud-stream-test-support/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-stream-parent</artifactId>
+		<artifactId>spring-cloud-stream-core</artifactId>
 		<version>3.2.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support</artifactId>
diff --git a/core/spring-cloud-stream/pom.xml b/core/spring-cloud-stream/pom.xml
index 95c888410..5ca5e0215 100644
--- a/core/spring-cloud-stream/pom.xml
+++ b/core/spring-cloud-stream/pom.xml
@@ -11,8 +11,13 @@
 
 	<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
 	</parent>
 
 	<dependencies>