Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions exec/java-exec/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion exec/jdbc-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
17 changes: 17 additions & 0 deletions exec/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 18 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading