From 42a2932087a43b05cdcd2247108246b3ccdb0b2b Mon Sep 17 00:00:00 2001
From: ERIMROB <robertas.rimkus@est.tech>
Date: Fri, 14 Aug 2020 13:39:24 +0100
Subject: [PATCH] Remove DFC Vulnerabilities

Issue-ID: DCAEGEN2-2267
Change-Id: Id9110c8b4b747bba3fcce1c1411a40062aa40740
Signed-off-by: ERIMROB <robertas.rimkus@est.tech>
---
 datafile-app-server/pom.xml |  1 +
 pom.xml                     | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml
index a4670557..b06ed824 100644
--- a/datafile-app-server/pom.xml
+++ b/datafile-app-server/pom.xml
@@ -143,6 +143,7 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
+      <version>9.0.36</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/pom.xml b/pom.xml
index b06dc8d2..a807a426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
     <apache.httpcomponents.version>4.1.4</apache.httpcomponents.version>
     <apache.commons.version>3.6</apache.commons.version>
     <immutable.version>2.7.1</immutable.version>
-    <spring.version>5.1.4.RELEASE</spring.version>
-    <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
+    <spring.version>5.2.8.RELEASE</spring.version>
+    <spring-boot.version>2.2.9.RELEASE</spring-boot.version>
     <commons-io.version>1.3.2</commons-io.version>
     <commons-net.version>3.3</commons-net.version>
 
@@ -61,17 +61,16 @@
     <!--TEST SETTINGS -->
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
     <junit-jupiter.version>5.5.2</junit-jupiter.version>
-    <junit.version>5.3.2</junit.version>
-    <junit-platform.version>1.1.0</junit-platform.version>
+    <junit-platform.version>1.3.2</junit-platform.version>
     <mockito.version>2.23.4</mockito.version>
     <testng.version>6.14.2</testng.version>
     <jcraft.version>0.1.54</jcraft.version>
-    <springfox.version>2.8.0</springfox.version>
+    <springfox.version>2.9.2</springfox.version>
     <awaitility.version>3.1.6</awaitility.version>
 
     <!-- Plugin versions -->
     <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-    <maven-compiler-plugin.version>2.19.1</maven-compiler-plugin.version>
+    <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
     <docker-maven-plugin.version>1.1.1</docker-maven-plugin.version>
     <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
     <sonar.coverage.jacoco.xmlReportPaths>
@@ -154,7 +153,6 @@
         <artifactId>jsch</artifactId>
         <version>${jcraft.version}</version>
       </dependency>
-
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
@@ -166,7 +164,6 @@
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
@@ -260,13 +257,18 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven-compiler-plugin.version}</version>
+          <version>${maven-surefire-plugin.version}</version>
           <dependencies>
             <dependency>
               <groupId>org.junit.platform</groupId>
               <artifactId>junit-platform-surefire-provider</artifactId>
               <version>${junit-platform.version}</version>
             </dependency>
+            <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            </dependency>
           </dependencies>
         </plugin>
         <plugin>
@@ -332,4 +334,3 @@
     </pluginManagement>
   </build>
 </project>
-
-- 
2.16.6