From 18ac9003a8c04fba5559b5cfc20d39cc179905ba Mon Sep 17 00:00:00 2001
From: Michele Rastelli <michele@arangodb.com>
Date: Mon, 9 Dec 2024 21:39:51 +0100
Subject: [PATCH 1/2] updated Java driver

---
 .../spark/sql/arangodb/commons/ArangoClient.scala |  4 ++--
 pom.xml                                           | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/arangodb-spark-commons/src/main/scala/org/apache/spark/sql/arangodb/commons/ArangoClient.scala b/arangodb-spark-commons/src/main/scala/org/apache/spark/sql/arangodb/commons/ArangoClient.scala
index 3e1a307f..40c26245 100644
--- a/arangodb-spark-commons/src/main/scala/org/apache/spark/sql/arangodb/commons/ArangoClient.scala
+++ b/arangodb-spark-commons/src/main/scala/org/apache/spark/sql/arangodb/commons/ArangoClient.scala
@@ -176,8 +176,8 @@ class ArangoClient(options: ArangoDBConf) extends Logging {
     val response = arangoDB.execute(request, classOf[RawBytes])
 
     import scala.collection.JavaConverters.asScalaIteratorConverter
-    val errors = serde.parse(response.getBody.get).iterator().asScala
-      .zip(serde.parse(data.get).iterator().asScala)
+    val errors = serde.parse(response.getBody.get, "/").iterator().asScala
+      .zip(serde.parse(data.get, "/").iterator().asScala)
       .filter(_._1.has("error"))
       .filter(_._1.get("error").booleanValue())
       .map(it => (
diff --git a/pom.xml b/pom.xml
index d7074d9f..7cb4f720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,7 @@
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>arangodb-java-driver-shaded</artifactId>
-            <version>7.9.0</version>
+            <version>7.15.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -478,4 +478,17 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>arangodb-snapshots</id>
+            <url>https://oss.sonatype.org/content/groups/staging</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
 </project>

From f8d8f34b467d20308b0dead6f87863a736071fdb Mon Sep 17 00:00:00 2001
From: Michele Rastelli <michele@arangodb.com>
Date: Tue, 10 Dec 2024 10:50:04 +0100
Subject: [PATCH 2/2] test fix

---
 .../org/apache/spark/sql/arangodb/commons/ArangoClient.scala  | 4 ++--
 pom.xml                                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arangodb-spark-commons/src/main/scala/org/apache/spark/sql/arangodb/commons/ArangoClient.scala b/arangodb-spark-commons/src/main/scala/org/apache/spark/sql/arangodb/commons/ArangoClient.scala
index 40c26245..6c73a6db 100644
--- a/arangodb-spark-commons/src/main/scala/org/apache/spark/sql/arangodb/commons/ArangoClient.scala
+++ b/arangodb-spark-commons/src/main/scala/org/apache/spark/sql/arangodb/commons/ArangoClient.scala
@@ -176,8 +176,8 @@ class ArangoClient(options: ArangoDBConf) extends Logging {
     val response = arangoDB.execute(request, classOf[RawBytes])
 
     import scala.collection.JavaConverters.asScalaIteratorConverter
-    val errors = serde.parse(response.getBody.get, "/").iterator().asScala
-      .zip(serde.parse(data.get, "/").iterator().asScala)
+    val errors = serde.parse(response.getBody.get, "").iterator().asScala
+      .zip(serde.parse(data.get, "").iterator().asScala)
       .filter(_._1.has("error"))
       .filter(_._1.get("error").booleanValue())
       .map(it => (
diff --git a/pom.xml b/pom.xml
index 7cb4f720..6ac28ca2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,7 +192,7 @@
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>jackson-dataformat-velocypack</artifactId>
-            <version>4.3.0</version>
+            <version>4.5.0-SNAPSHOT</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>