DRILL-8540: Update Jetty to Version 12

.github/workflows/ci.yml

@@ -33,8 +33,8 @@ jobs:
     timeout-minutes: 150
     strategy:
       matrix:
-        # Java versions to run unit tests
-        java: [ '11', '17', '21' ]
+        # Java versions to run unit tests (Jetty 12 requires Java 17+)
+        java: [ '17', '21' ]
         profile: ['default-hadoop']
       fail-fast: false
     steps:
@@ -79,7 +79,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
           cache: 'maven'
       # Caches built protobuf library
       - name: Cache protobufs

.github/workflows/codeql-analysis.yml

@@ -59,6 +59,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Setup java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+        cache: 'maven'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/publish-snapshot.yml

@@ -31,6 +31,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
       - name: Cache Maven Repository
         uses: actions/cache@v4
         with:

contrib/storage-hbase/pom.xml

@@ -149,6 +149,12 @@
                   <includes>
                     <!-- Needed by HBase test cluster -->
                     <include>commons-logging:commons-logging:*:jar:provided</include>
+                    <!-- Needed by HBase mini cluster (test scope) for embedded Jetty/web server -->
+                    <include>javax.servlet:*</include>
+                    <include>javax.servlet.jsp:*</include>
+                    <include>javax.websocket:*</include>
+                    <include>org.eclipse.jetty:*</include>
+                    <include>org.eclipse.jetty.websocket:*</include>
                   </includes>
                 </bannedDependencies>
               </rules>
@@ -254,6 +260,14 @@
               <groupId>commons-codec</groupId>
               <artifactId>commons-codec</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>javax.servlet</groupId>
+              <artifactId>javax.servlet-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.servlet.jsp</groupId>
+              <artifactId>jsp-api</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
       </dependencies>

contrib/storage-hive/core/pom.xml

@@ -126,6 +126,18 @@
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>javax.servlet.jsp-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -184,6 +196,14 @@
           <groupId>ch.qos.reload4j</groupId>
           <artifactId>reload4j</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -200,6 +220,14 @@
           <artifactId>reload4j</artifactId>
           <groupId>ch.qos.reload4j</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- Used by complex types tests for loading nested data -->
@@ -293,6 +321,18 @@
           <groupId>com.zaxxer</groupId>
           <artifactId>HikariCP-java7</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>javax.servlet.jsp-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 

contrib/storage-hive/hive-exec-shade/pom.xml

@@ -120,6 +120,14 @@
           <groupId>org.codehaus.jackson</groupId>
           <artifactId>jackson-xc</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>

contrib/storage-http/src/test/java/org/apache/drill/exec/store/http/TestHttpUDFWithAliases.java

@@ -42,7 +42,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
@@ -62,16 +61,21 @@ public class TestHttpUDFWithAliases extends ClusterTest {
 
   private static AliasRegistry storageAliasesRegistry;
   private static AliasRegistry tableAliasesRegistry;
-  private static final int MOCK_SERVER_PORT = 47778;
   private static String TEST_JSON_PAGE1;
-  private static final String DUMMY_URL = "http://localhost:" + MOCK_SERVER_PORT;
+  private static MockWebServer server;
+  private static String mockServerUrl;
 
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
 
     TEST_JSON_PAGE1 = Files.asCharSource(DrillFileUtils.getResourceAsFile("/data/p1.json"),
         StandardCharsets.UTF_8).read();
 
+    // Start MockWebServer with dynamic port allocation
+    server = new MockWebServer();
+    server.start(0); // Use port 0 for dynamic allocation
+    mockServerUrl = server.url("/").toString().replaceAll("/$", "");
+
     cluster = ClusterFixture.bareBuilder(dirTestWatcher)
       .configProperty(ExecConstants.USER_AUTHENTICATION_ENABLED, true)
       .configProperty(ExecConstants.IMPERSONATION_ENABLED, true)
@@ -106,7 +110,7 @@ public static void setUpBeforeClass() throws Exception {
       .build();
 
     HttpApiConfig basicJson = HttpApiConfig.builder()
-      .url(String.format("%s/json", DUMMY_URL))
+      .url(String.format("%s/json", mockServerUrl))
       .method("get")
       .jsonOptions(jsonOptions)
       .requireTail(false)
@@ -131,7 +135,7 @@ public void testSeveralRowsAndRequestsAndPublicStorageAlias() throws Exception {
     storageAliasesRegistry.getPublicAliases().put("`foobar`", "`local`", false);
 
     String sql = "SELECT http_request('foobar.basicJson', `col1`) as data FROM cp.`/data/p4.json`";
-    try (MockWebServer server = startServer()) {
+    try {
       server.enqueue(new MockResponse().setResponseCode(200).setBody(TEST_JSON_PAGE1));
       server.enqueue(new MockResponse().setResponseCode(200).setBody(TEST_JSON_PAGE1));
 
@@ -161,8 +165,7 @@ public void testSeveralRowsAndRequestsAndPublicStorageAlias() throws Exception {
   @Test
   public void testSeveralRowsAndRequestsAndUserStorageAlias() throws Exception {
     String sql = "SELECT http_request('foobar.basicJson', `col1`) as data FROM cp.`/data/p4.json`";
-    try (MockWebServer server = startServer()) {
-
+    try {
       ClientFixture client = cluster.clientBuilder()
         .property(DrillProperties.USER, TEST_USER_2)
         .property(DrillProperties.PASSWORD, TEST_USER_2_PASSWORD)
@@ -203,7 +206,7 @@ public void testSeveralRowsAndRequestsAndPublicTableAlias() throws Exception {
     tableAliasesRegistry.getPublicAliases().put("`foobar`", "`basicJson`", false);
 
     String sql = "SELECT http_request('local.foobar', `col1`) as data FROM cp.`/data/p4.json`";
-    try (MockWebServer server = startServer()) {
+    try {
       server.enqueue(new MockResponse().setResponseCode(200).setBody(TEST_JSON_PAGE1));
       server.enqueue(new MockResponse().setResponseCode(200).setBody(TEST_JSON_PAGE1));
 
@@ -233,8 +236,7 @@ public void testSeveralRowsAndRequestsAndPublicTableAlias() throws Exception {
   @Test
   public void testSeveralRowsAndRequestsAndUserTableAlias() throws Exception {
     String sql = "SELECT http_request('local.foobar', `col1`) as data FROM cp.`/data/p4.json`";
-    try (MockWebServer server = startServer()) {
-
+    try {
       ClientFixture client = cluster.clientBuilder()
         .property(DrillProperties.USER, TEST_USER_2)
         .property(DrillProperties.PASSWORD, TEST_USER_2_PASSWORD)
@@ -268,10 +270,4 @@ public void testSeveralRowsAndRequestsAndUserTableAlias() throws Exception {
       tableAliasesRegistry.deleteUserAliases(TEST_USER_2);
     }
   }
-
-  public static MockWebServer startServer() throws IOException {
-    MockWebServer server = new MockWebServer();
-    server.start(MOCK_SERVER_PORT);
-    return server;
-  }
 }