From 5013b7b5eb95678583e44ef20fda4506973bc372 Mon Sep 17 00:00:00 2001
From: dhanyavg-atlan <dhanya.v@atlan.com>
Date: Tue, 20 May 2025 17:41:55 +0530
Subject: [PATCH 1/2] Upgraded spark-core_2.12 to 3.3.3

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index c82810ad1d..8d508507b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
         <htrace.version>4.1.5</htrace.version>
         <bigtable.version>1.24.0</bigtable.version>
         <!-- align with org.apache.spark:spark-core_2.12 -->
+        <spark.version>3.3.3</spark.version>
         <jackson2.version>2.16.0</jackson2.version>
         <lucene-solr.version>8.11.2</lucene-solr.version>
         <elasticsearch.version>8.10.4</elasticsearch.version>
@@ -509,6 +510,12 @@
     </build>
     <dependencyManagement>
         <dependencies>
+            <!-- Override TinkerPop’s transitive Spark 3.3.2 -->
+            <dependency>
+                <groupId>org.apache.spark</groupId>
+                <artifactId>spark-core_2.12</artifactId>
+                <version>${spark.version}</version>
+            </dependency>
             <!-- Tinkerpop 3.x -->
             <dependency>
                 <groupId>org.apache.tinkerpop</groupId>

From 16edad6210756d69e2a93b68160bfb75b91d6836 Mon Sep 17 00:00:00 2001
From: dhanyavg-atlan <dhanya.v@atlan.com>
Date: Tue, 20 May 2025 23:40:15 +0530
Subject: [PATCH 2/2] Upgraded calcite to 1.32.0

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8d508507b0..64e57ffd1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,7 @@
         <caffeine.version>2.9.3</caffeine.version>
         <checker-qual.version>3.40.0</checker-qual.version>
         <curator.version>5.5.0</curator.version>
+        <calcite.version>1.32.0</calcite.version>
     </properties>
     <modules>
         <module>janusgraph-grpc</module>
@@ -510,6 +511,11 @@
     </build>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.apache.calcite</groupId>
+                <artifactId>calcite-core</artifactId>
+                <version>${calcite.version}</version>
+            </dependency>
             <!-- Override TinkerPop’s transitive Spark 3.3.2 -->
             <dependency>
                 <groupId>org.apache.spark</groupId>