diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 26823c040f7..9c0c5454628 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -604,6 +604,11 @@
       <groupId>sqlline</groupId>
       <artifactId>sqlline</artifactId>
     </dependency>
+    <!-- Nashorn script engine for Java 15+ compatibility with sqlline -->
+    <dependency>
+      <groupId>org.openjdk.nashorn</groupId>
+      <artifactId>nashorn-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.drill.metastore</groupId>
       <artifactId>drill-iceberg-metastore</artifactId>
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index e5211f6db96..987ff47cbac 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -33,7 +33,7 @@
        "package.namespace.prefix" equals to "oadd.". It can be overridden if necessary within any profile -->
   <properties>
     <package.namespace.prefix>oadd.</package.namespace.prefix>
-    <jdbc-all-jar.maxsize>58000000</jdbc-all-jar.maxsize>
+    <jdbc-all-jar.maxsize>59000000</jdbc-all-jar.maxsize>
   </properties>
 
   <dependencies>
diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml
index f4da9524f7a..a0539995037 100644
--- a/exec/jdbc/pom.xml
+++ b/exec/jdbc/pom.xml
@@ -71,6 +71,23 @@
       <artifactId>sqlline</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Nashorn script engine for Java 15+ compatibility with sqlline -->
+    <dependency>
+      <groupId>org.openjdk.nashorn</groupId>
+      <artifactId>nashorn-core</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <!-- Exclude ASM dependencies - Drill uses ASM 9.2 -->
+        <exclusion>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-tree</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <!-- Specify xerces versions to avoid setXIncludeAware error. -->
     <dependency>
       <groupId>xerces</groupId>
diff --git a/pom.xml b/pom.xml
index f229eb67d0f..46270fc8f72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,7 @@
     <mockito_inline.version>5.2.0</mockito_inline.version>
     <mongo.version>5.5.1</mongo.version>
     <msgpack.version>0.6.6</msgpack.version>
+    <nashorn.version>15.4</nashorn.version>
     <netty.tcnative.classifier />
     <netty.tcnative.version>2.0.65.Final</netty.tcnative.version>
     <netty.version>4.1.118.Final</netty.version>
@@ -1525,6 +1526,23 @@
         <artifactId>sqlline</artifactId>
         <version>${sqlline.version}</version>
       </dependency>
+      <!-- Nashorn script engine for Java 15+ compatibility with sqlline -->
+      <dependency>
+        <groupId>org.openjdk.nashorn</groupId>
+        <artifactId>nashorn-core</artifactId>
+        <version>${nashorn.version}</version>
+        <exclusions>
+          <!-- Exclude ASM dependencies - Drill uses ASM 9.2 -->
+          <exclusion>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>commons-net</groupId>
         <artifactId>commons-net</artifactId>