From 52aedfcd4b92625e705060a477154f309afa9cc3 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Sun, 3 Aug 2025 15:56:27 -0700
Subject: [PATCH 1/2] [SPARK-53089][BUILD] Upgrade `Ammonite` to 3.0.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bd2d47192b1a..8ba337fb1c26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,7 +231,7 @@
     ./python/packaging/client/setup.py, and ./python/packaging/connect/setup.py too.
     -->
     <arrow.version>18.3.0</arrow.version>
-    <ammonite.version>3.0.1</ammonite.version>
+    <ammonite.version>3.0.2</ammonite.version>
     <jjwt.version>0.12.6</jjwt.version>
 
     <!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->

From 70bd703ee43b0e8db3a47476049af5b839987938 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Sun, 3 Aug 2025 17:28:58 -0700
Subject: [PATCH 2/2] Tune Maven dependency tree to exclude old Scala version
 of Ammonite

(cherry picked from commit a6b4cd1f9b2877b26e407c9405b1bfe0079b64bd)
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
---
 sql/connect/client/jvm/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sql/connect/client/jvm/pom.xml b/sql/connect/client/jvm/pom.xml
index ea9073057031..a26b638cad76 100644
--- a/sql/connect/client/jvm/pom.xml
+++ b/sql/connect/client/jvm/pom.xml
@@ -101,6 +101,18 @@
       </exclusions>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.scalameta</groupId>
+      <artifactId>semanticdb-shared_${scala.binary.version}</artifactId>
+      <version>4.13.1.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.scala-lang</groupId>
+          <artifactId>scalap</artifactId>
+        </exclusion>
+      </exclusions>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-tags_${scala.binary.version}</artifactId>