From b3c3d36266493a93cb40a5d76de9fc5b80fec789 Mon Sep 17 00:00:00 2001
From: ToineSiebelink <toine.siebelink@est.tech>
Date: Thu, 20 Apr 2023 18:15:54 +0100
Subject: [PATCH] Align dependencies with DMI-Plugin

- Use bom for testcontainer versions
- Remove 'version' jib-maven-plugin.version (i.e. use latest or defined by oparent?)
- remove 'version from swagger-codegen-maven-plugin (i.e. use latest or defined by oparent?)

Issue-ID: CPS-1627

Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: Ic76302ae39e9ed723af3d6d496046daa9eccbd42
---
 cps-application/pom.xml  |  2 --
 cps-dependencies/pom.xml | 16 ++++------------
 cps-parent/pom.xml       |  1 -
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index 5d3fbf873..7cfbf4edd 100755
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -36,7 +36,6 @@
 
     <properties>
         <app>org.onap.cps.Application</app>
-        <jib-maven-plugin.version>2.8.0</jib-maven-plugin.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <minimum-coverage>0.82</minimum-coverage>
         <base.image>${docker.pull.registry}/onap/integration-java11:8.0.0</base.image>
@@ -127,7 +126,6 @@
                 <plugin>
                     <groupId>com.google.cloud.tools</groupId>
                     <artifactId>jib-maven-plugin</artifactId>
-                    <version>${jib-maven-plugin.version}</version>
                     <configuration>
                         <container>
                             <mainClass>${app}</mainClass>
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 6f8595b69..ab1e41039 100755
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -158,18 +158,10 @@
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
-                <artifactId>kafka</artifactId>
-                <version>${testcontainers.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>postgresql</artifactId>
-                <version>${testcontainers.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>spock</artifactId>
-                <version>${testcontainers.version}</version>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>1.17.3</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.github.spotbugs</groupId>
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml
index 9c229aa8c..6951ac9e2 100755
--- a/cps-parent/pom.xml
+++ b/cps-parent/pom.xml
@@ -135,7 +135,6 @@
                 <plugin>
                     <groupId>io.swagger.codegen.v3</groupId>
                     <artifactId>swagger-codegen-maven-plugin</artifactId>
-                    <version>3.0.27</version>
                     <executions>
                         <execution>
                             <id>openapi-yaml-gen</id>
-- 
2.16.6