From 9aef1231359278f1827d7523afd3369935b89f5b Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Sat, 20 Aug 2022 18:12:07 +0100
Subject: [PATCH] Remove vulnerable dependency

Remove/update org.apache.tinkerpop:gremlin-core

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Id41e2d0d089e5071c9923297c55bf31d9a57189f
Issue-ID: SDC-4017
---
 asdctool/pom.xml          | 4 ++++
 catalog-be/pom.xml        | 4 ++++
 catalog-dao/pom.xml       | 9 +++++++++
 catalog-model/pom.xml     | 6 +++++-
 integration-tests/pom.xml | 4 ++++
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 2559a9fe5e..fd059438b1 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -304,8 +304,12 @@
       <scope>compile</scope>
       <exclusions>
         <exclusion>
+          <groupId>org.apache.tinkerpop</groupId>
           <artifactId>gremlin-groovy</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.apache.tinkerpop</groupId>
+          <artifactId>gremlin-core</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.json</groupId>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 1ade155d1a..bacdda38fd 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -474,8 +474,12 @@
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
+                    <groupId>org.apache.tinkerpop</groupId>
                     <artifactId>gremlin-groovy</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.apache.tinkerpop</groupId>
+                    <artifactId>gremlin-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.json</groupId>
diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml
index 1bb9c95ce2..e2a1effc57 100644
--- a/catalog-dao/pom.xml
+++ b/catalog-dao/pom.xml
@@ -285,6 +285,11 @@ Modifications copyright (c) 2018 Nokia
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.tinkerpop</groupId>
+      <artifactId>gremlin-core</artifactId>
+      <version>3.4.13</version>
+    </dependency>
     <dependency>
       <groupId>org.janusgraph</groupId>
       <artifactId>janusgraph-core</artifactId>
@@ -292,8 +297,12 @@ Modifications copyright (c) 2018 Nokia
       <scope>provided</scope>
       <exclusions>
         <exclusion>
+          <groupId>org.apache.tinkerpop</groupId>
           <artifactId>gremlin-groovy</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.apache.tinkerpop</groupId>
+          <artifactId>gremlin-core</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.json</groupId>
diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml
index 9fcc01c4e8..1c37f0d935 100644
--- a/catalog-model/pom.xml
+++ b/catalog-model/pom.xml
@@ -189,8 +189,12 @@
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
-                    <artifactId>gremlin-groovy</artifactId>
                     <groupId>org.apache.tinkerpop</groupId>
+                    <artifactId>gremlin-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tinkerpop</groupId>
+                    <artifactId>gremlin-groovy</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.json</groupId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index a811093d2a..175e45b19e 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -146,8 +146,12 @@ limitations under the License.
             <scope>test</scope>
             <exclusions>
                 <exclusion>
+                    <groupId>org.apache.tinkerpop</groupId>
                     <artifactId>gremlin-groovy</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.apache.tinkerpop</groupId>
+                    <artifactId>gremlin-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <artifactId>slf4j-log4j12</artifactId>
-- 
2.16.6