From 8ee48dcb961d8909e9a3e75072ba84256bf189c6 Mon Sep 17 00:00:00 2001
From: Soby Chacko <chackos@vmware.com>
Date: Mon, 28 Aug 2023 18:02:55 -0400
Subject: [PATCH] Samples cleanup

---
 .../kafka-streams-interactive-query/pom.xml        |  8 ++++----
 kafka-streams-samples/pom.xml                      |  2 +-
 pom.xml                                            |  4 ++--
 .../pom.xml                                        | 14 +-------------
 .../schema-registry-consumer-kafka/pom.xml         |  7 ++++---
 .../schema-registry-producer1-kafka/pom.xml        |  7 ++++---
 .../schema-registry-producer2-kafka/pom.xml        |  7 ++++---
 stream-function-batch-producer-consumer/pom.xml    |  9 +++++----
 8 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/kafka-streams-samples/kafka-streams-interactive-query/pom.xml b/kafka-streams-samples/kafka-streams-interactive-query/pom.xml
index 00de9e5..56de449 100644
--- a/kafka-streams-samples/kafka-streams-interactive-query/pom.xml
+++ b/kafka-streams-samples/kafka-streams-interactive-query/pom.xml
@@ -8,10 +8,10 @@
 	<name>kafka-streams-interactive-query</name>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<groupId>io.spring.cloud.stream.sample</groupId>
+		<artifactId>spring-cloud-stream-samples-parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
 	</parent>
 
 	<properties>
diff --git a/kafka-streams-samples/pom.xml b/kafka-streams-samples/pom.xml
index 6e75fd6..69a4fed 100644
--- a/kafka-streams-samples/pom.xml
+++ b/kafka-streams-samples/pom.xml
@@ -24,7 +24,7 @@
         <module>kafka-streams-destination-pattern</module>
         <module>kafka-streams-jaas-security</module>
         <module>kafka-streams-multiple-input-topics</module>
-<!--        <module>kafka-streams-interactive-query</module>-->
+        <module>kafka-streams-interactive-query</module>
     </modules>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 84d45fe..801fe8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,8 @@
 		<module>multi-binder-samples</module>
 		<module>partitioning-samples</module>
 		<module>routing-samples</module>
-<!--		<module>spring-cloud-stream-schema-registry-integration</module>-->
-<!--		<module>stream-function-batch-producer-consumer</module>-->
+		<module>spring-cloud-stream-schema-registry-integration</module>
+		<module>stream-function-batch-producer-consumer</module>
 		<module>testing-samples</module>
 		<module>transaction-kafka-samples</module>
 	</modules>
diff --git a/spring-cloud-stream-schema-registry-integration/pom.xml b/spring-cloud-stream-schema-registry-integration/pom.xml
index 57ac4af..b76edfb 100644
--- a/spring-cloud-stream-schema-registry-integration/pom.xml
+++ b/spring-cloud-stream-schema-registry-integration/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-schema-registry-integration</artifactId>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-schema-registry-integration</name>
 	<description>SCSt Schema Registry Integration Sample App</description>
@@ -26,18 +26,6 @@
 		<spring-cloud.version>2023.0.0-SNAPSHOT</spring-cloud.version>
 	</properties>
 
-	<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>
-		</dependencies>
-	</dependencyManagement>
-
 	<build>
 		<pluginManagement>
 			<plugins>
diff --git a/spring-cloud-stream-schema-registry-integration/schema-registry-consumer-kafka/pom.xml b/spring-cloud-stream-schema-registry-integration/schema-registry-consumer-kafka/pom.xml
index 033d6bd..f0c0b97 100644
--- a/spring-cloud-stream-schema-registry-integration/schema-registry-consumer-kafka/pom.xml
+++ b/spring-cloud-stream-schema-registry-integration/schema-registry-consumer-kafka/pom.xml
@@ -3,15 +3,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>schema-registry-consumer-kafka</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>schema-registry-consumer-kafka</name>
     <description>SCSt Schema Registry Consumer</description>
 
 	<parent>
-		<groupId>org.springframework.cloud</groupId>
+		<groupId>io.spring.cloud.stream.sample</groupId>
 		<artifactId>spring-cloud-stream-schema-registry-integration</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 
 	<build>
diff --git a/spring-cloud-stream-schema-registry-integration/schema-registry-producer1-kafka/pom.xml b/spring-cloud-stream-schema-registry-integration/schema-registry-producer1-kafka/pom.xml
index 9959d61..66aec68 100644
--- a/spring-cloud-stream-schema-registry-integration/schema-registry-producer1-kafka/pom.xml
+++ b/spring-cloud-stream-schema-registry-integration/schema-registry-producer1-kafka/pom.xml
@@ -3,15 +3,16 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>schema-registry-producer1-kafka</artifactId>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>schema-registry-producer1-kafka</name>
 	<description>SCSt Schema Registry Producer 1</description>
 
 	<parent>
-		<groupId>org.springframework.cloud</groupId>
+		<groupId>io.spring.cloud.stream.sample</groupId>
 		<artifactId>spring-cloud-stream-schema-registry-integration</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 
 	<build>
diff --git a/spring-cloud-stream-schema-registry-integration/schema-registry-producer2-kafka/pom.xml b/spring-cloud-stream-schema-registry-integration/schema-registry-producer2-kafka/pom.xml
index 08d9372..e1fb1b0 100644
--- a/spring-cloud-stream-schema-registry-integration/schema-registry-producer2-kafka/pom.xml
+++ b/spring-cloud-stream-schema-registry-integration/schema-registry-producer2-kafka/pom.xml
@@ -3,15 +3,16 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>schema-registry-producer2-kafka</artifactId>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>schema-registry-producer2-kafka</name>
 	<description>SCSt Schema Registry Producer 2</description>
 
 	<parent>
-		<groupId>org.springframework.cloud</groupId>
+		<groupId>io.spring.cloud.stream.sample</groupId>
 		<artifactId>spring-cloud-stream-schema-registry-integration</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 
 	<build>
diff --git a/stream-function-batch-producer-consumer/pom.xml b/stream-function-batch-producer-consumer/pom.xml
index 8b69c8d..5cb1f6b 100644
--- a/stream-function-batch-producer-consumer/pom.xml
+++ b/stream-function-batch-producer-consumer/pom.xml
@@ -3,11 +3,12 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<groupId>io.spring.cloud.stream.sample</groupId>
+		<artifactId>spring-cloud-stream-samples-parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
+
 	<groupId>com.example</groupId>
 	<artifactId>stream-function-batch-producer-consumer</artifactId>
 	<version>0.0.1</version>