Merge branch 'kamalika/master' into 'master'

vulnerability fix for master

See merge request !280

provider/unit-azure/unit-aks/pom.xml

@@ -28,6 +28,7 @@
         <osdu.corelibazure.version>0.21.0</osdu.corelibazure.version>
         <jackson-databind.version>2.14.0</jackson-databind.version>
         <jackson.version>2.13.2</jackson.version>
+        <net-minidev.version>2.4.9</net-minidev.version>
     </properties>
 
     <prerequisites>
@@ -81,6 +82,12 @@
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>core-lib-azure</artifactId>
             <version>${osdu.corelibazure.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>json-smart</artifactId>
+                    <groupId>net.minidev</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Compile/runtime dependencies -->
         <dependency>
@@ -102,6 +109,10 @@
             <groupId>com.azure.spring</groupId>
             <artifactId>azure-spring-boot-starter-active-directory</artifactId>
             <exclusions>
+                <exclusion>
+                    <artifactId>json-smart</artifactId>
+                    <groupId>net.minidev</groupId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-logging</artifactId>
@@ -143,6 +154,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>${net-minidev.version}</version>
+        </dependency>
 
     </dependencies>
 

unit-core/pom.xml

@@ -25,6 +25,7 @@
         <jackson-databind.version>2.14.0</jackson-databind.version>
         <jackson.version>2.13.2</jackson.version>
         <spring-webmvc.version>5.3.22</spring-webmvc.version>
+        <org-eclipse-jetty.version>9.4.51.v20230217</org-eclipse-jetty.version>
     </properties>
 
     <prerequisites>
@@ -85,6 +86,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jetty-server</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -207,6 +214,11 @@
 		    <artifactId>okhttp</artifactId>
 		    <version>4.10.0</version>
 		</dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${org-eclipse-jetty.version}</version>
+        </dependency>
 
     </dependencies>