From bb719ca8d392857b5c9a29a1dcb23a1d2576a375 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Sat, 28 May 2022 23:31:45 -0500
Subject: [PATCH] Revert "Fix CI build - source app share repositories in new
 parent pom.xml (#290)"

This reverts commit 43bf9558dabb39b43f31a755cf2944254b7a0a63.
---
 .../source/cdc-debezium-source/pom.xml        | 224 +++++++++---------
 applications/source/file-source/pom.xml       |   6 +-
 applications/source/ftp-source/pom.xml        |   3 +-
 applications/source/geode-source/pom.xml      |   2 +-
 applications/source/http-source/pom.xml       |   3 +-
 applications/source/jdbc-source/pom.xml       |   3 +-
 applications/source/jms-source/pom.xml        |   3 +-
 .../source/load-generator-source/pom.xml      |   3 +-
 applications/source/mail-source/pom.xml       |   3 +-
 applications/source/mongodb-source/pom.xml    |   3 +-
 applications/source/mqtt-source/pom.xml       |   3 +-
 applications/source/pom.xml                   |   4 +-
 applications/source/rabbit-source/pom.xml     |   3 +-
 applications/source/s3-source/pom.xml         |   3 +-
 applications/source/sftp-source/pom.xml       |   3 +-
 applications/source/syslog-source/pom.xml     |   3 +-
 applications/source/tcp-source/pom.xml        |   3 +-
 applications/source/time-source/pom.xml       |   3 +-
 .../source/twitter-search-source/pom.xml      |   5 +-
 .../source/twitter-stream-source/pom.xml      |   7 +-
 applications/source/websocket-source/pom.xml  |   3 +-
 applications/source/zeromq-source/pom.xml     |   3 +-
 22 files changed, 160 insertions(+), 136 deletions(-)

diff --git a/applications/source/cdc-debezium-source/pom.xml b/applications/source/cdc-debezium-source/pom.xml
index 312ca21d..ce3b1232 100644
--- a/applications/source/cdc-debezium-source/pom.xml
+++ b/applications/source/cdc-debezium-source/pom.xml
@@ -1,125 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <version>3.2.1-SNAPSHOT</version>
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<version>3.2.1-SNAPSHOT</version>
 
-    <parent>
-        <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
-        <version>3.2.1-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>org.springframework.cloud.stream.app</groupId>
+		<artifactId>stream-applications-core</artifactId>
+		<version>3.2.1-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
 
-    <properties>
-        <json-unit.version>1.25.1</json-unit.version>
-        <mysql-connector-java.version>8.0.13</mysql-connector-java.version>
-    </properties>
+	<properties>
+		<json-unit.version>1.25.1</json-unit.version>
+		<mysql-connector-java.version>8.0.13</mysql-connector-java.version>
+	</properties>
 
-    <artifactId>cdc-debezium-source</artifactId>
-    <name>cdc-debezium-source</name>
-    <description>CDC Debezium source apps</description>
-    <packaging>jar</packaging>
+	<artifactId>cdc-debezium-source</artifactId>
+	<name>cdc-debezium-source</name>
+	<description>CDC Debezium source apps</description>
+	<packaging>jar</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud.fn</groupId>
-            <artifactId>cdc-debezium-supplier</artifactId>
-            <version>${java-functions.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud.fn</groupId>
-            <artifactId>function-test-support</artifactId>
-            <version>${java-functions.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud.stream.app</groupId>
-            <artifactId>stream-applications-test-support</artifactId>
-            <version>${stream-apps-core.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.javacrumbs.json-unit</groupId>
-            <artifactId>json-unit</artifactId>
-            <version>${json-unit.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream-binder-kafka</artifactId>
-            <scope>test</scope>
-        </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>cdc-debezium-supplier</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>function-test-support</artifactId>
+			<version>${java-functions.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.stream.app</groupId>
+			<artifactId>stream-applications-test-support</artifactId>
+			<version>${stream-apps-core.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jdbc</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.javacrumbs.json-unit</groupId>
+			<artifactId>json-unit</artifactId>
+			<version>${json-unit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-stream-binder-kafka</artifactId>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>mysql</artifactId>
+			<scope>test</scope>
+		</dependency>
 
-    </dependencies>
+	</dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dataflow-apps-docs-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dataflow-apps-generator-plugin</artifactId>
-                <configuration>
-                    <application>
-                        <name>cdc-debezium</name>
-                        <type>source</type>
-                        <version>${project.version}</version>
-                        <configClass>org.springframework.cloud.fn.supplier.cdc.CdcSupplierConfiguration.class
-                        </configClass>
-                        <functionDefinition>cdcSupplier</functionDefinition>
-                        <properties>
-                            <spring.autoconfigure.exclude>org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration</spring.autoconfigure.exclude>
-                            <spring.cloud.stream.kafka.default.producer.messageKeyExpression>headers['cdc_key']</spring.cloud.stream.kafka.default.producer.messageKeyExpression>
-                        </properties>
-                        <maven>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.springframework.cloud.fn</groupId>
-                                    <artifactId>cdc-debezium-supplier</artifactId>
-                                </dependency>
-                            </dependencies>
-                        </maven>
-                    </application>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dataflow-apps-docs-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dataflow-apps-generator-plugin</artifactId>
+				<configuration>
+					<application>
+						<name>cdc-debezium</name>
+						<type>source</type>
+						<version>${project.version}</version>
+						<configClass>org.springframework.cloud.fn.supplier.cdc.CdcSupplierConfiguration.class
+						</configClass>
+						<functionDefinition>cdcSupplier</functionDefinition>
+
+						<properties>
+							<spring.autoconfigure.exclude>org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration</spring.autoconfigure.exclude>
+							<spring.cloud.stream.kafka.default.producer.messageKeyExpression>headers['cdc_key']</spring.cloud.stream.kafka.default.producer.messageKeyExpression>
+						</properties>
+						<maven>
+							<dependencies>
+								<dependency>
+									<groupId>org.springframework.cloud.fn</groupId>
+									<artifactId>cdc-debezium-supplier</artifactId>
+								</dependency>
+							</dependencies>
+						</maven>
+					</application>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>
diff --git a/applications/source/file-source/pom.xml b/applications/source/file-source/pom.xml
index ba15dd20..56582e20 100644
--- a/applications/source/file-source/pom.xml
+++ b/applications/source/file-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-source</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
@@ -61,4 +62,7 @@
             </plugin>
         </plugins>
     </build>
+
+
+
 </project>
diff --git a/applications/source/ftp-source/pom.xml b/applications/source/ftp-source/pom.xml
index 9f70a93c..b99b05f8 100644
--- a/applications/source/ftp-source/pom.xml
+++ b/applications/source/ftp-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/geode-source/pom.xml b/applications/source/geode-source/pom.xml
index 914e04bd..4f5e83b8 100644
--- a/applications/source/geode-source/pom.xml
+++ b/applications/source/geode-source/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-source</artifactId>
         <version>3.2.1-SNAPSHOT</version>
     </parent>
 
diff --git a/applications/source/http-source/pom.xml b/applications/source/http-source/pom.xml
index 98bdd7e0..95db9fb9 100644
--- a/applications/source/http-source/pom.xml
+++ b/applications/source/http-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/jdbc-source/pom.xml b/applications/source/jdbc-source/pom.xml
index 7673941c..6ec88d13 100644
--- a/applications/source/jdbc-source/pom.xml
+++ b/applications/source/jdbc-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/jms-source/pom.xml b/applications/source/jms-source/pom.xml
index 3d06e735..d4030271 100644
--- a/applications/source/jms-source/pom.xml
+++ b/applications/source/jms-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/load-generator-source/pom.xml b/applications/source/load-generator-source/pom.xml
index 9322220f..e56c1e6a 100644
--- a/applications/source/load-generator-source/pom.xml
+++ b/applications/source/load-generator-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/mail-source/pom.xml b/applications/source/mail-source/pom.xml
index 2e4513b5..8dec09b9 100644
--- a/applications/source/mail-source/pom.xml
+++ b/applications/source/mail-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/mongodb-source/pom.xml b/applications/source/mongodb-source/pom.xml
index 09a45311..28d94786 100644
--- a/applications/source/mongodb-source/pom.xml
+++ b/applications/source/mongodb-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/mqtt-source/pom.xml b/applications/source/mqtt-source/pom.xml
index 6bcbe422..9a4fe52c 100644
--- a/applications/source/mqtt-source/pom.xml
+++ b/applications/source/mqtt-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/pom.xml b/applications/source/pom.xml
index 9c1493cd..d112f9fd 100644
--- a/applications/source/pom.xml
+++ b/applications/source/pom.xml
@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.springframework.cloud.stream.app</groupId>
-    <artifactId>source-parent</artifactId>
+    <artifactId>stream-applications-source</artifactId>
     <version>3.2.1-SNAPSHOT</version>
     <name>source</name>
-    <description>Stream Applications Source Apps Parent</description>
+    <description>Stream Applications Source Parent</description>
     <packaging>pom</packaging>
 
     <parent>
diff --git a/applications/source/rabbit-source/pom.xml b/applications/source/rabbit-source/pom.xml
index 565213d6..b93db8fd 100644
--- a/applications/source/rabbit-source/pom.xml
+++ b/applications/source/rabbit-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/s3-source/pom.xml b/applications/source/s3-source/pom.xml
index 1147515c..5aa4fce1 100644
--- a/applications/source/s3-source/pom.xml
+++ b/applications/source/s3-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/sftp-source/pom.xml b/applications/source/sftp-source/pom.xml
index a9457f35..3fd8452c 100644
--- a/applications/source/sftp-source/pom.xml
+++ b/applications/source/sftp-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/syslog-source/pom.xml b/applications/source/syslog-source/pom.xml
index a92c7ec0..5c8b28a6 100644
--- a/applications/source/syslog-source/pom.xml
+++ b/applications/source/syslog-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/tcp-source/pom.xml b/applications/source/tcp-source/pom.xml
index eca32e34..47922dd0 100644
--- a/applications/source/tcp-source/pom.xml
+++ b/applications/source/tcp-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/time-source/pom.xml b/applications/source/time-source/pom.xml
index 8720c4d3..acfd3b29 100644
--- a/applications/source/time-source/pom.xml
+++ b/applications/source/time-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/twitter-search-source/pom.xml b/applications/source/twitter-search-source/pom.xml
index ee611d3d..cb099a8f 100644
--- a/applications/source/twitter-search-source/pom.xml
+++ b/applications/source/twitter-search-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
@@ -33,7 +34,7 @@
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-client-java</artifactId>
-            <version>${mockserver.version}</version>
+	        <version>${mockserver.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/applications/source/twitter-stream-source/pom.xml b/applications/source/twitter-stream-source/pom.xml
index 102573e5..dc1648c5 100644
--- a/applications/source/twitter-stream-source/pom.xml
+++ b/applications/source/twitter-stream-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
@@ -27,13 +28,13 @@
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-netty</artifactId>
-            <version>${mockserver.version}</version>
+	        <version>${mockserver.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-client-java</artifactId>
-            <version>${mockserver.version}</version>
+	        <version>${mockserver.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/applications/source/websocket-source/pom.xml b/applications/source/websocket-source/pom.xml
index 7905f919..5427ea76 100644
--- a/applications/source/websocket-source/pom.xml
+++ b/applications/source/websocket-source/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>
diff --git a/applications/source/zeromq-source/pom.xml b/applications/source/zeromq-source/pom.xml
index 00c54859..4a9a9cea 100644
--- a/applications/source/zeromq-source/pom.xml
+++ b/applications/source/zeromq-source/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
-        <artifactId>source-parent</artifactId>
+        <artifactId>stream-applications-core</artifactId>
         <version>3.2.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <dependencies>