From bafa7b2133df95870b752542022e63170c4f28d2 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Thu, 4 May 2023 16:19:16 +0200
Subject: [PATCH] Fix repositories

---
 .settings.xml                                    |  8 ++++----
 applications/processor/script-processor/pom.xml  |  1 +
 applications/source/debezium-source/pom.xml      |  5 +++++
 functions/supplier/debezium-supplier/pom.xml     | 16 ++++++++++++++++
 stream-applications-build/pom.xml                |  8 ++++----
 stream-applications-release-train/pom.xml        |  8 ++++----
 .../stream-applications-descriptor/pom.xml       |  4 ++--
 7 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/.settings.xml b/.settings.xml
index 4fe0ec3c..20d49284 100644
--- a/.settings.xml
+++ b/.settings.xml
@@ -25,7 +25,7 @@
                 <repository>
                     <id>spring-snapshots</id>
                     <name>Spring Snapshots</name>
-                    <url>https://repo.spring.io/libs-snapshot</url>
+                    <url>https://repo.spring.io/snapshot</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
@@ -33,7 +33,7 @@
                 <repository>
                     <id>spring-milestones</id>
                     <name>Spring Milestones</name>
-                    <url>https://repo.spring.io/libs-milestone</url>
+                    <url>https://repo.spring.io/milestone</url>
                     <snapshots>
                         <enabled>false</enabled>
                     </snapshots>
@@ -51,7 +51,7 @@
                 <pluginRepository>
                     <id>spring-snapshots</id>
                     <name>Spring Snapshots</name>
-                    <url>https://repo.spring.io/libs-snapshot</url>
+                    <url>https://repo.spring.io/snapshot</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
@@ -59,7 +59,7 @@
                 <pluginRepository>
                     <id>spring-milestones</id>
                     <name>Spring Milestones</name>
-                    <url>https://repo.spring.io/libs-milestone</url>
+                    <url>https://repo.spring.io/milestone</url>
                     <snapshots>
                         <enabled>false</enabled>
                     </snapshots>
diff --git a/applications/processor/script-processor/pom.xml b/applications/processor/script-processor/pom.xml
index d57dc44c..56c17fd8 100644
--- a/applications/processor/script-processor/pom.xml
+++ b/applications/processor/script-processor/pom.xml
@@ -93,6 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0</version>
                 <configuration>
                     <argLine>
                         --add-opens java.base/sun.nio.ch=ALL-UNNAMED
diff --git a/applications/source/debezium-source/pom.xml b/applications/source/debezium-source/pom.xml
index e0664a7d..38ce1903 100644
--- a/applications/source/debezium-source/pom.xml
+++ b/applications/source/debezium-source/pom.xml
@@ -158,6 +158,11 @@
 									<groupId>org.springframework.cloud.fn</groupId>
 									<artifactId>debezium-supplier</artifactId>
 								</dependency>
+								<dependency>
+									<groupId>org.springframework.cloud.stream.app</groupId>
+									<artifactId>stream-applications-composite-function-support</artifactId>
+									<version>${stream-apps-core.version}</version>
+								</dependency>
 							</dependencies>
 						</maven>
 					</application>
diff --git a/functions/supplier/debezium-supplier/pom.xml b/functions/supplier/debezium-supplier/pom.xml
index 089f14f6..b8a21677 100644
--- a/functions/supplier/debezium-supplier/pom.xml
+++ b/functions/supplier/debezium-supplier/pom.xml
@@ -20,6 +20,21 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>io.debezium</groupId>
+            <artifactId>debezium-api</artifactId>
+            <version>${version.debezium}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-reload4j</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.debezium</groupId>
             <artifactId>debezium-embedded</artifactId>
@@ -170,6 +185,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0</version>
                 <configuration>
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index f854b4c2..5645ae69 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -254,7 +254,7 @@
         <repository>
             <id>spring-snapshots</id>
             <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/libs-snapshot</url>
+            <url>https://repo.spring.io/snapshot</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -262,7 +262,7 @@
         <repository>
             <id>spring-milestones</id>
             <name>Spring milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
+            <url>https://repo.spring.io/milestone</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
@@ -280,7 +280,7 @@
         <pluginRepository>
             <id>spring-snapshots</id>
             <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/libs-snapshot</url>
+            <url>https://repo.spring.io/snapshot</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -288,7 +288,7 @@
         <pluginRepository>
             <id>spring-milestones</id>
             <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
+            <url>https://repo.spring.io/milestone</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
diff --git a/stream-applications-release-train/pom.xml b/stream-applications-release-train/pom.xml
index 9e8cd85f..29112f97 100644
--- a/stream-applications-release-train/pom.xml
+++ b/stream-applications-release-train/pom.xml
@@ -41,12 +41,12 @@
         <repository>
             <id>spring-milestones</id>
             <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
+            <url>https://repo.spring.io/milestone</url>
         </repository>
         <repository>
             <id>spring-snapshots</id>
             <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/libs-snapshot</url>
+            <url>https://repo.spring.io/snapshot</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -56,7 +56,7 @@
         <pluginRepository>
             <id>spring-snapshots</id>
             <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/libs-snapshot</url>
+            <url>https://repo.spring.io/snapshot</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -64,7 +64,7 @@
         <pluginRepository>
             <id>spring-milestones</id>
             <name>Spring Milestones</name>
-            <url>https://repo.spring.io/libs-milestone</url>
+            <url>https://repo.spring.io/milestone</url>
         </pluginRepository>
         <pluginRepository>
             <id>maven-central</id>
diff --git a/stream-applications-release-train/stream-applications-descriptor/pom.xml b/stream-applications-release-train/stream-applications-descriptor/pom.xml
index 0c8af84d..6517301c 100644
--- a/stream-applications-release-train/stream-applications-descriptor/pom.xml
+++ b/stream-applications-release-train/stream-applications-descriptor/pom.xml
@@ -73,8 +73,8 @@
                             <scripts>
                                 <script>
                                     <![CDATA[
-                                def repoSpring = "${apps.version}".contains('SNAPSHOT') ? 'repo.spring.io/libs-snapshot' :
-                                                "${apps.version}".contains('-') ? 'repo.spring.io/libs-milestone' : 'repo.maven.apache.org/maven2'
+                                def repoSpring = "${apps.version}".contains('SNAPSHOT') ? 'repo.spring.io/snapshot' :
+                                                "${apps.version}".contains('-') ? 'repo.spring.io/milestone' : 'repo.maven.apache.org/maven2'
                                 project.properties.setProperty('repo-spring-io', repoSpring)
                                 println('repo-spring-io=$repoSpring')
                                 ]]>