From b706000e2904652f60d4fe8b332f7821b41de992 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Thu, 8 Jun 2023 23:05:50 +0200
Subject: [PATCH] [CI] Fix test support

---
 common/function-test-support/pom.xml    | 11 +++++++++++
 common/mongodb-common/pom.xml           |  1 +
 consumer/cassandra-consumer/pom.xml     |  1 +
 consumer/elasticsearch-consumer/pom.xml |  2 +-
 consumer/mongodb-consumer/pom.xml       |  1 +
 function/aggregator-function/pom.xml    |  1 +
 spring-functions-parent/pom.xml         | 11 +++++++++--
 supplier/mongodb-supplier/pom.xml       |  1 +
 8 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/common/function-test-support/pom.xml b/common/function-test-support/pom.xml
index e5f67fe9..cbd42ee9 100644
--- a/common/function-test-support/pom.xml
+++ b/common/function-test-support/pom.xml
@@ -43,18 +43,29 @@
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-sftp</artifactId>
             <version>${sshd-sftp.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
diff --git a/common/mongodb-common/pom.xml b/common/mongodb-common/pom.xml
index 1eaeb2c3..3b62ba45 100644
--- a/common/mongodb-common/pom.xml
+++ b/common/mongodb-common/pom.xml
@@ -18,6 +18,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>mongodb</artifactId>
+            <version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
     </dependencies>
diff --git a/consumer/cassandra-consumer/pom.xml b/consumer/cassandra-consumer/pom.xml
index 9e7de98e..f906614f 100644
--- a/consumer/cassandra-consumer/pom.xml
+++ b/consumer/cassandra-consumer/pom.xml
@@ -26,6 +26,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>cassandra</artifactId>
+			<version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/consumer/elasticsearch-consumer/pom.xml b/consumer/elasticsearch-consumer/pom.xml
index fb00f8af..17042c12 100644
--- a/consumer/elasticsearch-consumer/pom.xml
+++ b/consumer/elasticsearch-consumer/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>${test-containers.version}</version>
+            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/consumer/mongodb-consumer/pom.xml b/consumer/mongodb-consumer/pom.xml
index fd3d274d..1a5ffba9 100644
--- a/consumer/mongodb-consumer/pom.xml
+++ b/consumer/mongodb-consumer/pom.xml
@@ -26,6 +26,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>mongodb</artifactId>
+            <version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/function/aggregator-function/pom.xml b/function/aggregator-function/pom.xml
index 57a24503..6a8d350f 100644
--- a/function/aggregator-function/pom.xml
+++ b/function/aggregator-function/pom.xml
@@ -37,6 +37,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>mongodb</artifactId>
+            <version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-functions-parent/pom.xml b/spring-functions-parent/pom.xml
index 0a7bdb11..26c6221c 100644
--- a/spring-functions-parent/pom.xml
+++ b/spring-functions-parent/pom.xml
@@ -56,6 +56,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-test</artifactId>
@@ -68,12 +73,14 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>junit-jupiter</artifactId>
+			<artifactId>testcontainers</artifactId>
+			<version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/supplier/mongodb-supplier/pom.xml b/supplier/mongodb-supplier/pom.xml
index 465671b9..0b37beca 100644
--- a/supplier/mongodb-supplier/pom.xml
+++ b/supplier/mongodb-supplier/pom.xml
@@ -36,6 +36,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>mongodb</artifactId>
+            <version>${testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>