From 8706d5d4814092203068721a891a567765de5b90 Mon Sep 17 00:00:00 2001
From: James McMullan <jpmcmu@gmail.com>
Date: Mon, 11 Nov 2024 10:49:44 -0500
Subject: [PATCH] HPCC4J-662 Upgrade out of date Spark dependencies

- Added overrides for outdated dependencies

Signed-off-by: James McMullan James.McMullan@lexisnexis.com
---
 DataAccess/pom.xml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/DataAccess/pom.xml b/DataAccess/pom.xml
index 9a90c46c..c3165853 100644
--- a/DataAccess/pom.xml
+++ b/DataAccess/pom.xml
@@ -29,6 +29,9 @@
     <scala.version>2.11</scala.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <javadoc.excludePackageNames>net.razorvine.*:org.apache.*:org.hpccsystems.commons.*:org.hpccsystems.generated.*:org.hpccsystems.dfs.*:org.hpccsystems.ws.*:org.hpccsystems.ws.client.antlr.*</javadoc.excludePackageNames>
+    <commons-io.version>2.14.0</commons-io.version>
+    <xalan.version>2.7.3</xalan.version>
+    <commons-fileupload.version>1.5</commons-fileupload.version>
   </properties>
   <scm>
     <connection>scm:git:https://github.com/hpcc-systems/Spark-HPCC.git</connection>
@@ -154,6 +157,28 @@
       <version>4.13</version>
       <scope>provided</scope>
     </dependency>
+    <!-- Out-dated dependency overrides -->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>${commons-io.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>${xalan.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>${commons-fileupload.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>serializer</artifactId>
+        <version>${xalan.version}</version>
+    </dependency>
+    <!-- End Out-dated dependency overrides -->
   </dependencies>
   <build>
     <pluginManagement>
@@ -210,7 +235,6 @@
             <additionalparam>-Xdoclint:none</additionalparam>
             <header>Copyright © 2021 HPCC Systems®. All rights reserved</header>
             <footer>Copyright © 2021 HPCC Systems®. All rights reserved</footer>
-            <includeDependencySources>true</includeDependencySources>
           </configuration>
         </plugin>
       </plugins>