From a181da42a455614cc88fff820d18eda61acb18db Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Sun, 3 Jul 2022 00:54:33 +0100
Subject: [PATCH] Update vulnerable dependencies

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I24d9a59b483057187a57d2e43d82accebbf8fc57
Issue-ID: SDC-4017
---
 catalog-be/pom.xml            |  9 +++++++++
 common-app-api/pom.xml        | 16 ++++++++++++++++
 common-be-tests-utils/pom.xml | 13 ++++++++++++-
 common-be/pom.xml             | 13 ++++++++++++-
 pom.xml                       |  8 ++++++++
 5 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 11873926ee..58c2f240eb 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -288,8 +288,17 @@
                     <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-validator</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>jakarta.el</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
+            <version>${jakarta.el.version}</version>
+        </dependency>
 
         <!-- http client -->
         <dependency>
diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml
index d51fb570a0..7905404f82 100644
--- a/common-app-api/pom.xml
+++ b/common-app-api/pom.xml
@@ -17,6 +17,12 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
       <version>${spring.boot.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.yaml</groupId>
+          <artifactId>snakeyaml</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.onap.sdc.sdc-be-common</groupId>
@@ -55,8 +61,18 @@
           <groupId>org.onap.portal.sdk</groupId>
           <artifactId>epsdk-fw</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.glassfish</groupId>
+          <artifactId>jakarta.el</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>jakarta.el</artifactId>
+      <version>${jakarta.el.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml
index 4d0cfb413e..b2b04be736 100644
--- a/common-be-tests-utils/pom.xml
+++ b/common-be-tests-utils/pom.xml
@@ -22,7 +22,18 @@
         <dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
-            <version>8.3.4</version>
+            <version>${minio.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp.version}</version>
         </dependency>
 
         <!-- Common of SD&C -->
diff --git a/common-be/pom.xml b/common-be/pom.xml
index 3f8a97599f..02a3a3ad44 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -22,7 +22,18 @@
         <dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
-            <version>8.3.4</version>
+            <version>${minio.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp3</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp.version}</version>
         </dependency>
 
         <!-- Common of SD&C -->
diff --git a/pom.xml b/pom.xml
index 7e2165de87..fcd64aead5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,12 @@ Modifications copyright (c) 2018-2019 Nokia
         <janusgraph.version>0.3.3</janusgraph.version>
         <spring.version>5.3.18</spring.version>
         <spring.boot.version>2.2.13.RELEASE</spring.boot.version>
+
+        <!-- update to 2.36 bring error-->
+        <!-- java.lang.NoClassDefFoundError: com/fasterxml/jackson/databind/AnnotationIntrospector$XmlExtensions-->
         <jersey-bom.version>2.34</jersey-bom.version>
+        <jakarta.el.version>3.0.4</jakarta.el.version>
+
         <netty.version>4.1.77.Final</netty.version>
         <servlet-api.version>4.0.1</servlet-api.version>
         <wire-mock.version>2.26.3</wire-mock.version>
@@ -192,6 +197,9 @@ Modifications copyright (c) 2018-2019 Nokia
 
         <micrometer.version>1.8.4</micrometer.version>
 
+        <minio.version>8.3.4</minio.version>
+        <okhttp.version>4.9.3</okhttp.version>
+
         <verbose>false</verbose>
     </properties>
 
-- 
2.16.6