Skip to content

Commit 8b22702

Browse files
authored
DRILL-8541: Update Nashorn for Java 17 Compatibility (#3034)
1 parent ef80860 commit 8b22702

4 files changed

Lines changed: 41 additions & 1 deletion

File tree

exec/java-exec/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,11 @@
604604
<groupId>sqlline</groupId>
605605
<artifactId>sqlline</artifactId>
606606
</dependency>
607+
<!-- Nashorn script engine for Java 15+ compatibility with sqlline -->
608+
<dependency>
609+
<groupId>org.openjdk.nashorn</groupId>
610+
<artifactId>nashorn-core</artifactId>
611+
</dependency>
607612
<dependency>
608613
<groupId>org.apache.drill.metastore</groupId>
609614
<artifactId>drill-iceberg-metastore</artifactId>

exec/jdbc-all/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"package.namespace.prefix" equals to "oadd.". It can be overridden if necessary within any profile -->
3434
<properties>
3535
<package.namespace.prefix>oadd.</package.namespace.prefix>
36-
<jdbc-all-jar.maxsize>58000000</jdbc-all-jar.maxsize>
36+
<jdbc-all-jar.maxsize>59000000</jdbc-all-jar.maxsize>
3737
</properties>
3838

3939
<dependencies>

exec/jdbc/pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,23 @@
7171
<artifactId>sqlline</artifactId>
7272
<scope>test</scope>
7373
</dependency>
74+
<!-- Nashorn script engine for Java 15+ compatibility with sqlline -->
75+
<dependency>
76+
<groupId>org.openjdk.nashorn</groupId>
77+
<artifactId>nashorn-core</artifactId>
78+
<scope>test</scope>
79+
<exclusions>
80+
<!-- Exclude ASM dependencies - Drill uses ASM 9.2 -->
81+
<exclusion>
82+
<groupId>org.ow2.asm</groupId>
83+
<artifactId>asm</artifactId>
84+
</exclusion>
85+
<exclusion>
86+
<groupId>org.ow2.asm</groupId>
87+
<artifactId>asm-tree</artifactId>
88+
</exclusion>
89+
</exclusions>
90+
</dependency>
7491
<!-- Specify xerces versions to avoid setXIncludeAware error. -->
7592
<dependency>
7693
<groupId>xerces</groupId>

pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
<mockito_inline.version>5.2.0</mockito_inline.version>
125125
<mongo.version>5.5.1</mongo.version>
126126
<msgpack.version>0.6.6</msgpack.version>
127+
<nashorn.version>15.4</nashorn.version>
127128
<netty.tcnative.classifier />
128129
<netty.tcnative.version>2.0.65.Final</netty.tcnative.version>
129130
<netty.version>4.1.118.Final</netty.version>
@@ -1525,6 +1526,23 @@
15251526
<artifactId>sqlline</artifactId>
15261527
<version>${sqlline.version}</version>
15271528
</dependency>
1529+
<!-- Nashorn script engine for Java 15+ compatibility with sqlline -->
1530+
<dependency>
1531+
<groupId>org.openjdk.nashorn</groupId>
1532+
<artifactId>nashorn-core</artifactId>
1533+
<version>${nashorn.version}</version>
1534+
<exclusions>
1535+
<!-- Exclude ASM dependencies - Drill uses ASM 9.2 -->
1536+
<exclusion>
1537+
<groupId>org.ow2.asm</groupId>
1538+
<artifactId>asm</artifactId>
1539+
</exclusion>
1540+
<exclusion>
1541+
<groupId>org.ow2.asm</groupId>
1542+
<artifactId>asm-tree</artifactId>
1543+
</exclusion>
1544+
</exclusions>
1545+
</dependency>
15281546
<dependency>
15291547
<groupId>commons-net</groupId>
15301548
<artifactId>commons-net</artifactId>

0 commit comments

Comments
 (0)