commit b25665e47b903411aad6faa5be8c90db73d87e66
author James Turton <9107319+jnturton@users.noreply.github.com> Wed Jan 03 16:01:14 2024 +0200
committer GitHub <noreply@github.com> Wed Jan 03 16:01:14 2024 +0200
tree f6a5516f67ec9a2300dce59098960df4ba1fb3e3
parent 9c591b4388056e904f5fa1db93e9fd0b94e8862a

DRILL-8445: Upgrade Janino 3.1.8 → 3.1.11 (#2864)

* Upgrade Janino 3.1.8 → 3.1.11.
* Update classb/ and 3rdparty/ lib separation for jakarta packages.

distribution/src/assemble/component.xml

diff --git a/distribution/src/assemble/component.xml b/distribution/src/assemble/component.xml
index 48a6360..ad84f6a 100644
--- a/distribution/src/assemble/component.xml
+++ b/distribution/src/assemble/component.xml
@@ -103,19 +103,20 @@
       <includes>
         <!-- Please keep this list sorted. -->
         <include>ch.qos.logback</include>
-        <include>ch.qos.logback</include>
         <include>com.sun.codemodel</include>
+        <include>jakarta.activation</include>
+        <include>jakarta.annotation</include>
+        <include>jakarta.ws.rs</include>
+        <include>jakarta.xml.bind</include>
         <include>javax.activation</include>
         <include>javax.annotation</include>
         <include>javax.servlet</include>
-        <include>javax.ws.rs</include>
+        <include>javax.servlet.*</include>
         <include>javax.xml.bind</include>
         <include>org.eclipse.jetty</include>
         <include>org.glassfish.hk2.external</include>
         <include>org.glassfish.hk2</include>
         <include>org.glassfish.jersey.containers</include>
-        <include>org.glassfish.jersey.containers</include>
-        <include>org.glassfish.jersey.core</include>
         <include>org.glassfish.jersey.core</include>
         <include>org.glassfish.jersey.ext</include>
         <include>org.glassfish.jersey.media</include>
@@ -130,14 +131,17 @@
       <useProjectArtifact>false</useProjectArtifact>
       <excludes>
         <!-- Please keep this list sorted. -->
-        <exclude>ch.qos.logback </exclude>
         <exclude>ch.qos.logback</exclude>
         <exclude>com.sun.codemodel</exclude>
         <exclude>io.netty:netty-tcnative</exclude>
+        <exclude>jakarta.activation</exclude>
+        <exclude>jakarta.annotation</exclude>
+        <exclude>jakarta.ws.rs</exclude>
+        <exclude>jakarta.xml.bind</exclude>
         <exclude>javax.activation</exclude>
         <exclude>javax.annotation</exclude>
         <exclude>javax.servlet</exclude>
-        <exclude>javax.ws.rs </exclude>
+        <exclude>javax.servlet.*</exclude>
         <exclude>javax.xml.bind</exclude>
         <exclude>junit:junit:jar</exclude>
         <exclude>org.apache.drill.contrib.data</exclude>
@@ -152,8 +156,6 @@
         <exclude>org.glassfish.hk2</exclude>
         <exclude>org.glassfish.hk2.external</exclude>
         <exclude>org.glassfish.jersey.containers</exclude>
-        <exclude>org.glassfish.jersey.containers</exclude>
-        <exclude>org.glassfish.jersey.core</exclude>
         <exclude>org.glassfish.jersey.core</exclude>
         <exclude>org.glassfish.jersey.ext</exclude>
         <exclude>org.glassfish.jersey.media</exclude>

pom.xml

diff --git a/pom.xml b/pom.xml
index ea258bc..ed1b0a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
     <calcite.groupId>org.apache.calcite</calcite.groupId>
     <calcite.version>1.34.0</calcite.version>
     <avatica.version>1.23.0</avatica.version>
-    <janino.version>3.1.8</janino.version>
+    <janino.version>3.1.11</janino.version>
     <sqlline.version>1.12.0</sqlline.version>
     <jackson.version>2.14.3</jackson.version>
     <zookeeper.version>3.5.7</zookeeper.version>