From c81c95bf4879c805aa91c60653fc0e781ff2d4e9 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Mon, 31 May 2021 23:08:39 +0100
Subject: Fix dependencies with Critical Violations

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ic4fb2577c260c80e0204bc68df508f41d9835734
Issue-ID: SDC-3572
---
 catalog-dao/pom.xml | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

(limited to 'catalog-dao/pom.xml')

diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 8d82dd2ce7..5aaf3a6190 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -33,6 +33,10 @@ Modifications copyright (c) 2018 Nokia
     <version>1.9.0-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <thrift.version>0.13.0</thrift.version>
+    <cassandra-all.version>3.11.10</cassandra-all.version>
+  </properties>
   <dependencies>
 
     <!-- Common of SDC -->
@@ -288,6 +292,14 @@ Modifications copyright (c) 2018 Nokia
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.thrift</groupId>
+          <artifactId>libthrift</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -298,6 +310,13 @@ Modifications copyright (c) 2018 Nokia
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.thrift</groupId>
+      <artifactId>libthrift</artifactId>
+      <version>${thrift.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- CASSANDRA -->
     <dependency>
       <groupId>com.datastax.cassandra</groupId>
@@ -347,7 +366,17 @@ Modifications copyright (c) 2018 Nokia
     <dependency>
       <groupId>org.apache.cassandra</groupId>
       <artifactId>cassandra-all</artifactId>
-      <version>3.11.3</version>
+      <version>${cassandra-all.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.thrift</groupId>
+          <artifactId>libthrift</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-validator</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
     <!-- CASSANDRA END -->
@@ -356,12 +385,12 @@ Modifications copyright (c) 2018 Nokia
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
     </dependency>
-      <dependency>
-          <groupId>org.togglz</groupId>
-          <artifactId>togglz-testing</artifactId>
-          <version>${togglz.version}</version>
-          <scope>test</scope>
-      </dependency>
+    <dependency>
+      <groupId>org.togglz</groupId>
+      <artifactId>togglz-testing</artifactId>
+      <version>${togglz.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
-- 
cgit 1.2.3-korg