From 5700275b3e147e0053ae7872271a9f2fbfa13e06 Mon Sep 17 00:00:00 2001
From: Adam Wudzinski <adam.wudzinski@nokia.com>
Date: Wed, 2 Dec 2020 18:07:22 +0100
Subject: [SDC] Validate PMDictionary content in Deployment artifacts tab

Validate PMDictionary file content when adding or updating PMDictionary in Deployment artifacts tab. Fix dependencies conflict.

Issue-ID: SDC-3390
Signed-off-by: Adam Wudzinski <adam.wudzinski@nokia.com>
Change-Id: I6f6bb196ef061419a309a8ded5fdbe116982a037
---
 .../backend/openecomp-sdc-vendor-software-product-manager/pom.xml   | 6 ++++++
 .../openecomp-sdc-validation-impl/pom.xml                           | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'openecomp-be')

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml
index 98092c79fd..e185f78229 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml
@@ -211,6 +211,12 @@
       <groupId>org.onap.vnfsdk.validation</groupId>
       <artifactId>validation-pmdictionary</artifactId>
       <version>${onap.vnfsdk.validation.pmdictionary.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml
index 2119ee8108..c8f0622b13 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/pom.xml
@@ -83,6 +83,12 @@
       <groupId>org.onap.vnfsdk.validation</groupId>
       <artifactId>validation-pmdictionary</artifactId>
       <version>${onap.vnfsdk.validation.pmdictionary.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.vavr</groupId>
-- 
cgit 1.2.3-korg