From: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Date: Thu, 10 Feb 2022 09:13:59 +0000 (+0100)
Subject: Remove vulnerability
X-Git-Tag: 1.8.0~3
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=25f7419b16e1fc090d65465f2fa1c72662c872bf;p=dcaegen2%2Fservices%2Fpm-mapper.git

Remove vulnerability

Issue-ID: DCAEGEN2-3049
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I60694bfbd008304c564e900436d68c362d31f4b1
---

diff --git a/Changelog.md b/Changelog.md
index f3c171a..c5fee1a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.8.0] - 2022/01/24
 ### Changed
 - [DCAEGEN2-2964] Switch configuration provider to CBS Client - DCAE SDK
+- [DCAEGEN2-3049] Remove vulnerability
 
 ## [1.7.2] - 2021/08/26
 ### Changed
diff --git a/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml b/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml
index 090d9fd..62d1cd3 100644
--- a/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml
+++ b/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   datarouter-prov:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:latest
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.9
     container_name: datarouter-prov
     hostname: dmaap-dr-prov
     ports:
@@ -26,7 +26,7 @@ services:
       - "dcae-pm-mapper:$PMMAPPER_IP"
 
   datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:latest
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.9
     container_name: datarouter-node
     hostname: dmaap-dr-node
     ports:
@@ -82,7 +82,7 @@ services:
 
   cbs:
     container_name: cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.3.0
     environment:
        CONSUL_HOST: $CONSUL_IP
     networks:
diff --git a/csit/plans/pmmapper/docker-compose.yml b/csit/plans/pmmapper/docker-compose.yml
index 91f7b26..87a56b3 100644
--- a/csit/plans/pmmapper/docker-compose.yml
+++ b/csit/plans/pmmapper/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   datarouter-prov:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:latest
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.9
     container_name: datarouter-prov
     hostname: dmaap-dr-prov
     ports:
@@ -28,7 +28,7 @@ services:
       - "dcae-pm-mapper:$PMMAPPER_IP"
 
   datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:latest
+    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.9
     container_name: datarouter-node
     hostname: dmaap-dr-node
     ports:
@@ -84,7 +84,7 @@ services:
 
   cbs:
     container_name: cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.3.0
     environment:
        CONSUL_HOST: $CONSUL_IP
     networks:
diff --git a/pom.xml b/pom.xml
index 5b0d9a4..43733bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,16 +45,16 @@
         <!-- Dependency Versions -->
         <lombok.version>1.18.4</lombok.version>
         <sl4j.version>1.7.25</sl4j.version>
-        <logback.version>1.2.3</logback.version>
+        <logback.version>1.2.10</logback.version>
         <reactor.version>3.4.0</reactor.version>
-        <undertow.version>2.2.9.Final</undertow.version>
-        <gson.version>2.8.6</gson.version>
+        <undertow.version>2.2.16.Final</undertow.version>
+        <gson.version>2.8.9</gson.version>
         <freemarker.version>2.3.31</freemarker.version>
         <commons.io.version>2.8.0</commons.io.version>
         <xml.version>2.3.1</xml.version>
         <jaxb.version>2.3.0.1</jaxb.version>
         <!-- DCAE SDK -->
-        <sdk.version>1.8.7</sdk.version>
+        <sdk.version>1.8.8</sdk.version>
         <!-- Testing Test Dependencies -->
         <junit.version>5.3.2</junit.version>
         <mockito.version>2.23.4</mockito.version>
@@ -215,6 +215,12 @@
             <artifactId>mockserver-netty</artifactId>
             <version>${mockserver.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>*</artifactId>
+                    <groupId>io.netty</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mock-server</groupId>