From 89e4502de364421981e715a6667b34bc7d73aa1a Mon Sep 17 00:00:00 2001
From: sllynn <stuart.lynn@databricks.com>
Date: Wed, 20 Nov 2024 15:20:17 +0000
Subject: [PATCH] updated version of delta and dependencies

---
 pom.xml                                               | 11 ++++++++---
 .../com/databricks/labs/mosaic/gdal/MosaicGDAL.scala  |  1 -
 .../labs/mosaic/models/knn/SpatialKNNTest.scala       |  4 +---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d7c0e718..cc6ab42f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,10 +83,15 @@
         </dependency>
         <dependency>
             <groupId>io.delta</groupId>
-            <artifactId>delta-core_${scala.compat.version}</artifactId>
-            <version>2.4.0</version>
+            <artifactId>delta-spark_${scala.compat.version}</artifactId>
+            <version>3.2.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.15.2</version>
+        </dependency>
         <!-- log4j -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -193,7 +198,7 @@
                 <configuration>
                     <!-- Tests will be run with scalatest-maven-plugin instead -->
                     <skipTests>true</skipTests>
-                    <argLine>@{argLine} -Djava.library.path=/usr/local/lib;/usr/java/packages/lib;/usr/lib64;/lib64;/lib;/usr/lib</argLine>
+                    <argLine>@{argLine} -Djava.library.path=/usr/local/lib;/usr/java/packages/lib;/usr/lib64;/lib64;/lib;/usr/lib;/usr/lib/x86_64-linux-gnu;/usr/lib/x86_64-linux-gnu/jni</argLine>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/scala/com/databricks/labs/mosaic/gdal/MosaicGDAL.scala b/src/main/scala/com/databricks/labs/mosaic/gdal/MosaicGDAL.scala
index dfe70fe7d..32d2a1aa9 100644
--- a/src/main/scala/com/databricks/labs/mosaic/gdal/MosaicGDAL.scala
+++ b/src/main/scala/com/databricks/labs/mosaic/gdal/MosaicGDAL.scala
@@ -238,7 +238,6 @@ object MosaicGDAL extends Logging {
     // noinspection ScalaStyle
     private def loadOrNOOP(path: String): Unit = {
         try {
-//            if (Files.exists(Paths.get(path))) System.load(path)
             System.load(path)
         } catch {
             case t: Throwable =>
diff --git a/src/test/scala/com/databricks/labs/mosaic/models/knn/SpatialKNNTest.scala b/src/test/scala/com/databricks/labs/mosaic/models/knn/SpatialKNNTest.scala
index 3108891e2..276f1c240 100644
--- a/src/test/scala/com/databricks/labs/mosaic/models/knn/SpatialKNNTest.scala
+++ b/src/test/scala/com/databricks/labs/mosaic/models/knn/SpatialKNNTest.scala
@@ -3,11 +3,9 @@ package com.databricks.labs.mosaic.models.knn
 import com.databricks.labs.mosaic.core.geometry.api.JTS
 import com.databricks.labs.mosaic.core.index.{BNGIndexSystem, H3IndexSystem}
 import com.databricks.labs.mosaic.functions.MosaicContext
+import com.databricks.labs.mosaic.test.SparkSuite
 import com.databricks.labs.mosaic.{MOSAIC_GEOMETRY_API, MOSAIC_INDEX_SYSTEM, MOSAIC_RASTER_API}
-import com.databricks.labs.mosaic.sql.extensions.SQLExtensionsBehaviors
-import com.databricks.labs.mosaic.test.{MosaicSpatialQueryTest, SparkSuite}
 import org.apache.spark.SparkConf
-import org.apache.spark.sql.test.SharedSparkSession
 import org.scalatest.flatspec.AnyFlatSpec
 
 class SpatialKNNTest extends AnyFlatSpec with SpatialKNNBehaviors with SparkSuite {