From b24e2892b145db3f57945198cc4e8e04a143315a Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Fri, 18 Jun 2021 00:50:38 +0000
Subject: [PATCH] fix: pom.xml &
 spring-cloud-data-flow/apache-spark-job/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-CHQOSLOGBACK-30208
- https://snyk.io/vuln/SNYK-JAVA-CHQOSLOGBACK-31407
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-30430
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-32473
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHADOOP-174575
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHADOOP-174576
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHADOOP-30631
---
 pom.xml                                         | 6 +++---
 spring-cloud-data-flow/apache-spark-job/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 697273628865..284c3878e00f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,7 +264,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore/>
 									</action>
 								</pluginExecution>
 								<pluginExecution>
@@ -283,7 +283,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>
@@ -1620,7 +1620,7 @@
 
 		<!-- logging -->
 		<org.slf4j.version>1.7.21</org.slf4j.version>
-		<logback.version>1.1.7</logback.version>
+		<logback.version>1.1.11</logback.version>
 
 		<!-- plugins -->
 		<!-- can't upgrade the plugin yet; as there is an issue with 2.22 no longer running all the tests-->
diff --git a/spring-cloud-data-flow/apache-spark-job/pom.xml b/spring-cloud-data-flow/apache-spark-job/pom.xml
index 306b23c60a0e..78312c1db442 100644
--- a/spring-cloud-data-flow/apache-spark-job/pom.xml
+++ b/spring-cloud-data-flow/apache-spark-job/pom.xml
@@ -36,7 +36,7 @@
     </dependencies>
 
     <properties>
-        <spark.version>1.6.2</spark.version>
+        <spark.version>2.2.0</spark.version>
         <scala.version>2.10</scala.version>
         <spring-cloud-task-core.version>2.0.0.RELEASE</spring-cloud-task-core.version>
     </properties>