Uplift version of TestContainers to 2.03

- Note 1: artifact names of testcontainers changed (as per 2.0 update notes)
- Note 2: springboot 3.5.9 still inlcudes 1.21.4 version of testcontainer hence I needed to declare test containers first

Issue-ID: CPS-3146
Change-Id: I68d3f35b3ab291de9e4a2ac6265fe8e82e6a2cd5
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>

diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index ac39b7b..66a2e32 100644 (file)
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -70,7 +70,16 @@
     </distributionManagement>
 
     <dependencyManagement>
+
         <dependencies>
+            <!-- Prioritizing latest testcontainers to prevent override by older versions embedded in springboot -->
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>2.0.3</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- S P R I N G   D E P E N D E N C I E S -->
             <dependency>
                 <groupId>org.springdoc</groupId>
@@ -277,13 +286,6 @@
                 <artifactId>lombok</artifactId>
                 <version>1.18.32</version>
             </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers-bom</artifactId>
-                <version>1.20.4</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.spockframework</groupId>
                 <artifactId>spock-core</artifactId>

diff --git a/cps-ncmp-service/pom.xml b/cps-ncmp-service/pom.xml
index fe8db6e..519ffad 100644 (file)
--- a/cps-ncmp-service/pom.xml
+++ b/cps-ncmp-service/pom.xml
@@ -106,12 +106,12 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>kafka</artifactId>
+            <artifactId>testcontainers-kafka</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>spock</artifactId>
+            <artifactId>testcontainers-spock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/cps-service/pom.xml b/cps-service/pom.xml
index 70c1f58..4be9001 100644 (file)
--- a/cps-service/pom.xml
+++ b/cps-service/pom.xml
@@ -186,7 +186,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>kafka</artifactId>
+      <artifactId>testcontainers-kafka</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 8a6881b..5d61d7d 100644 (file)
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>kafka</artifactId>
+            <artifactId>testcontainers-kafka</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -74,7 +74,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -104,7 +104,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>spock</artifactId>
+            <artifactId>testcontainers-spock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>