Review maven configuration for testcontainers

Maven build was not failing when test containers are not able to run
because of following maven surefire plugin bug:

* https://github.com/junit-team/junit5/issues/2178
* https://issues.apache.org/jira/browse/SUREFIRE-1688

This bug is fixed in surefire 3.0.0-M5. Then, 3.0.0-M4 version coming
from oparent is now overridden in pom plugin management.

This commit also improves spock testcontainers integration by using
the appropriate spock dependency.

Issue-ID: CPS-515
Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca>
Change-Id: I3ad902e598ece31601115d6484e520b6321ce8dd

1 files changed, 13 insertions, 4 deletions

diff --git a/pom.xml b/pom.xml
index 161c7e5..4f5020a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>1.15.3</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -148,20 +155,17 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>1.15.2</version>
+            <artifactId>spock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
-            <version>1.15.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
-            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -421,6 +425,11 @@
        <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.0.0-M5</version>
+                </plugin>
+                <plugin>
                     <groupId>com.google.cloud.tools</groupId>
                     <artifactId>jib-maven-plugin</artifactId>
                     <version>3.0.0</version>