[SPARK-47118][BUILD][CORE][SQL][UI] Migrate from Jetty 10 to Jetty 11

connector/connect/server/pom.xml

@@ -156,6 +156,16 @@
       <groupId>org.scala-lang.modules</groupId>
       <artifactId>scala-parallel-collections_${scala.binary.version}</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala

@@ -19,10 +19,11 @@ package org.apache.spark.sql.connect.ui
 
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets.UTF_8
-import javax.servlet.http.HttpServletRequest
 
 import scala.xml.Node
 
+import jakarta.servlet.http.HttpServletRequest
+
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.connect.ui.ToolTips._
 import org.apache.spark.ui._

connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala

@@ -17,10 +17,10 @@
 
 package org.apache.spark.sql.connect.ui
 
-import javax.servlet.http.HttpServletRequest
-
 import scala.xml.Node
 
+import jakarta.servlet.http.HttpServletRequest
+
 import org.apache.spark.internal.Logging
 import org.apache.spark.ui._
 import org.apache.spark.ui.UIUtils._

connector/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPageSuite.scala

@@ -18,8 +18,8 @@
 package org.apache.spark.sql.connect.ui
 
 import java.util.{Calendar, Locale}
-import javax.servlet.http.HttpServletRequest
 
+import jakarta.servlet.http.HttpServletRequest
 import org.mockito.Mockito.{mock, when, RETURNS_SMART_NULLS}
 import org.scalatest.BeforeAndAfter
 

core/pom.xml

@@ -166,10 +166,13 @@
       <artifactId>jetty-servlets</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>${jakartaservlet.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

core/src/main/scala/org/apache/spark/deploy/Utils.scala

@@ -18,7 +18,8 @@
 package org.apache.spark.deploy
 
 import java.io.File
-import javax.servlet.http.HttpServletRequest
+
+import jakarta.servlet.http.HttpServletRequest
 
 import org.apache.spark.SparkConf
 import org.apache.spark.internal.Logging

core/src/main/scala/org/apache/spark/deploy/history/ApplicationCache.scala

@@ -18,14 +18,14 @@
 package org.apache.spark.deploy.history
 
 import java.util.concurrent.{ConcurrentHashMap, CountDownLatch, ExecutionException}
-import javax.servlet.{DispatcherType, Filter, FilterChain, FilterConfig, ServletException, ServletRequest, ServletResponse}
-import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 
 import scala.jdk.CollectionConverters._
 
 import com.codahale.metrics.{Counter, MetricRegistry, Timer}
 import com.google.common.cache.{CacheBuilder, CacheLoader, LoadingCache, RemovalListener, RemovalNotification}
 import com.google.common.util.concurrent.UncheckedExecutionException
+import jakarta.servlet.{DispatcherType, Filter, FilterChain, FilterConfig, ServletException, ServletRequest, ServletResponse}
+import jakarta.servlet.http.{HttpServletRequest, HttpServletResponse}
 import org.eclipse.jetty.servlet.FilterHolder
 
 import org.apache.spark.internal.Logging

core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala

@@ -17,10 +17,10 @@
 
 package org.apache.spark.deploy.history
 
-import javax.servlet.http.HttpServletRequest
-
 import scala.xml.{Node, Unparsed}
 
+import jakarta.servlet.http.HttpServletRequest
+
 import org.apache.spark.status.api.v1.ApplicationInfo
 import org.apache.spark.ui.{UIUtils, WebUIPage}
 import org.apache.spark.ui.UIUtils.formatImportJavaScript

core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala

@@ -18,11 +18,11 @@
 package org.apache.spark.deploy.history
 
 import java.util.zip.ZipOutputStream
-import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
 
 import scala.util.control.NonFatal
 import scala.xml.Node
 
+import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
 import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder}
 
 import org.apache.spark.{SecurityManager, SparkConf}

core/src/main/scala/org/apache/spark/deploy/history/LogPage.scala

@@ -17,10 +17,10 @@
 
 package org.apache.spark.deploy.history
 
-import javax.servlet.http.HttpServletRequest
-
 import scala.xml.{Node, Unparsed}
 
+import jakarta.servlet.http.HttpServletRequest
+
 import org.apache.spark.SparkConf
 import org.apache.spark.deploy.Utils.{getLog, DEFAULT_BYTES}
 import org.apache.spark.internal.Logging

core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala

@@ -17,10 +17,10 @@
 
 package org.apache.spark.deploy.master.ui
 
-import javax.servlet.http.HttpServletRequest
-
 import scala.xml.Node
 
+import jakarta.servlet.http.HttpServletRequest
+
 import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState}
 import org.apache.spark.deploy.ExecutorState
 import org.apache.spark.deploy.StandaloneResourceUtils.{formatResourceRequirements, formatResourcesAddresses}

core/src/main/scala/org/apache/spark/deploy/master/ui/LogPage.scala

@@ -17,10 +17,10 @@
 
 package org.apache.spark.deploy.master.ui
 
-import javax.servlet.http.HttpServletRequest
-
 import scala.xml.{Node, Unparsed}
 
+import jakarta.servlet.http.HttpServletRequest
+
 import org.apache.spark.deploy.Utils.{getLog, DEFAULT_BYTES}
 import org.apache.spark.internal.Logging
 import org.apache.spark.ui.{UIUtils, WebUIPage}

core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala

@@ -17,10 +17,9 @@
 
 package org.apache.spark.deploy.master.ui
 
-import javax.servlet.http.HttpServletRequest
-
 import scala.xml.Node
 
+import jakarta.servlet.http.HttpServletRequest
 import org.json4s.JValue
 
 import org.apache.spark.deploy.DeployMessages.{KillDriverResponse, MasterStateResponse, RequestKillDriver, RequestMasterState}

core/src/main/scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala

@@ -18,7 +18,8 @@
 package org.apache.spark.deploy.master.ui
 
 import java.net.{InetAddress, NetworkInterface, SocketException}
-import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
+
+import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
 
 import org.apache.spark.deploy.DeployMessages.{DecommissionWorkersOnHosts, MasterStateResponse, RequestMasterState}
 import org.apache.spark.deploy.Utils.addRenderLogHandler

core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionClient.scala

@@ -21,7 +21,6 @@ import java.io.{DataOutputStream, FileNotFoundException}
 import java.net.{ConnectException, HttpURLConnection, SocketException, URL}
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.TimeoutException
-import javax.servlet.http.HttpServletResponse
 
 import scala.collection.mutable
 import scala.concurrent.{Await, Future}
@@ -30,6 +29,7 @@ import scala.io.Source
 import scala.util.control.NonFatal
 
 import com.fasterxml.jackson.core.JsonProcessingException
+import jakarta.servlet.http.HttpServletResponse
 
 import org.apache.spark.{SPARK_VERSION => sparkVersion, SparkConf, SparkException}
 import org.apache.spark.deploy.SparkApplication

core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala

@@ -17,11 +17,10 @@
 
 package org.apache.spark.deploy.rest
 
-import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
-
 import scala.io.Source
 
 import com.fasterxml.jackson.core.JsonProcessingException
+import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
 import org.eclipse.jetty.server.{HttpConnectionFactory, Server, ServerConnector}
 import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder}
 import org.eclipse.jetty.util.thread.{QueuedThreadPool, ScheduledExecutorScheduler}

core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala

@@ -18,7 +18,8 @@
 package org.apache.spark.deploy.rest
 
 import java.io.File
-import javax.servlet.http.HttpServletResponse
+
+import jakarta.servlet.http.HttpServletResponse
 
 import org.apache.spark.{SPARK_VERSION => sparkVersion, SparkConf}
 import org.apache.spark.deploy.{Command, DeployMessages, DriverDescription}

core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala

@@ -18,10 +18,11 @@
 package org.apache.spark.deploy.worker.ui
 
 import java.io.File
-import javax.servlet.http.HttpServletRequest
 
 import scala.xml.{Node, Unparsed}
 
+import jakarta.servlet.http.HttpServletRequest
+
 import org.apache.spark.internal.Logging
 import org.apache.spark.ui.{UIUtils, WebUIPage}
 import org.apache.spark.util.Utils

core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala

@@ -17,10 +17,9 @@
 
 package org.apache.spark.deploy.worker.ui
 
-import javax.servlet.http.HttpServletRequest
-
 import scala.xml.Node
 
+import jakarta.servlet.http.HttpServletRequest
 import org.json4s.JValue
 
 import org.apache.spark.deploy.{ExecutorState, JsonProtocol}

core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala

@@ -18,7 +18,8 @@
 package org.apache.spark.deploy.worker.ui
 
 import java.io.File
-import javax.servlet.http.HttpServletRequest
+
+import jakarta.servlet.http.HttpServletRequest
 
 import org.apache.spark.deploy.worker.Worker
 import org.apache.spark.internal.Logging

core/src/main/scala/org/apache/spark/metrics/sink/MetricsServlet.scala

@@ -19,11 +19,11 @@ package org.apache.spark.metrics.sink
 
 import java.util.Properties
 import java.util.concurrent.TimeUnit
-import javax.servlet.http.HttpServletRequest
 
 import com.codahale.metrics.MetricRegistry
 import com.codahale.metrics.json.MetricsModule
 import com.fasterxml.jackson.databind.ObjectMapper
+import jakarta.servlet.http.HttpServletRequest
 import org.eclipse.jetty.servlet.ServletContextHandler
 
 import org.apache.spark.SparkConf

core/src/main/scala/org/apache/spark/metrics/sink/PrometheusServlet.scala

@@ -18,9 +18,9 @@
 package org.apache.spark.metrics.sink
 
 import java.util.Properties
-import javax.servlet.http.HttpServletRequest
 
 import com.codahale.metrics.MetricRegistry
+import jakarta.servlet.http.HttpServletRequest
 import org.eclipse.jetty.servlet.ServletContextHandler
 
 import org.apache.spark.SparkConf

core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala

@@ -17,11 +17,11 @@
 package org.apache.spark.status.api.v1
 
 import java.util.zip.ZipOutputStream
-import javax.servlet.ServletContext
-import javax.servlet.http.HttpServletRequest
-import javax.ws.rs._
-import javax.ws.rs.core.{Context, Response}
 
+import jakarta.servlet.ServletContext
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.ws.rs._
+import jakarta.ws.rs.core.{Context, Response}
 import org.eclipse.jetty.server.handler.ContextHandler
 import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder}
 import org.glassfish.jersey.server.ServerProperties

core/src/main/scala/org/apache/spark/status/api/v1/ApplicationListResource.scala

@@ -17,8 +17,9 @@
 package org.apache.spark.status.api.v1
 
 import java.util.{List => JList}
-import javax.ws.rs.{DefaultValue, GET, Produces, QueryParam}
-import javax.ws.rs.core.MediaType
+
+import jakarta.ws.rs.{DefaultValue, GET, Produces, QueryParam}
+import jakarta.ws.rs.core.MediaType
 
 @Produces(Array(MediaType.APPLICATION_JSON))
 private[v1] class ApplicationListResource extends ApiRequestContext {

core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala

@@ -21,12 +21,12 @@ import java.lang.annotation.Annotation
 import java.lang.reflect.Type
 import java.text.SimpleDateFormat
 import java.util.{Calendar, Locale, SimpleTimeZone}
-import javax.ws.rs.Produces
-import javax.ws.rs.core.{MediaType, MultivaluedMap}
-import javax.ws.rs.ext.{MessageBodyWriter, Provider}
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.{ObjectMapper, SerializationFeature}
+import jakarta.ws.rs.Produces
+import jakarta.ws.rs.core.{MediaType, MultivaluedMap}
+import jakarta.ws.rs.ext.{MessageBodyWriter, Provider}
 
 /**
  * This class converts the POJO metric responses into json, using jackson.

core/src/main/scala/org/apache/spark/status/api/v1/OneApplicationResource.scala

@@ -19,11 +19,12 @@ package org.apache.spark.status.api.v1
 import java.io.OutputStream
 import java.util.{List => JList}
 import java.util.zip.ZipOutputStream
-import javax.ws.rs.{NotFoundException => _, _}
-import javax.ws.rs.core.{MediaType, Response, StreamingOutput}
 
 import scala.util.control.NonFatal
 
+import jakarta.ws.rs.{NotFoundException => _, _}
+import jakarta.ws.rs.core.{MediaType, Response, StreamingOutput}
+
 import org.apache.spark.{JobExecutionStatus, SparkContext}
 import org.apache.spark.status.api.v1
 import org.apache.spark.util.Utils

core/src/main/scala/org/apache/spark/status/api/v1/PrometheusResource.scala

@@ -16,9 +16,8 @@
  */
 package org.apache.spark.status.api.v1
 
-import javax.ws.rs._
-import javax.ws.rs.core.MediaType
-
+import jakarta.ws.rs._
+import jakarta.ws.rs.core.MediaType
 import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder}
 import org.glassfish.jersey.server.ServerProperties
 import org.glassfish.jersey.servlet.ServletContainer

core/src/main/scala/org/apache/spark/status/api/v1/SimpleDateParam.scala

@@ -18,9 +18,10 @@ package org.apache.spark.status.api.v1
 
 import java.text.{ParseException, SimpleDateFormat}
 import java.util.{Locale, TimeZone}
-import javax.ws.rs.WebApplicationException
-import javax.ws.rs.core.Response
-import javax.ws.rs.core.Response.Status
+
+import jakarta.ws.rs.WebApplicationException
+import jakarta.ws.rs.core.Response
+import jakarta.ws.rs.core.Response.Status
 
 private[v1] class SimpleDateParam(val originalValue: String) {
 

core/src/main/scala/org/apache/spark/status/api/v1/StagesResource.scala

@@ -17,11 +17,12 @@
 package org.apache.spark.status.api.v1
 
 import java.util.{HashMap, List => JList, Locale}
-import javax.ws.rs.{NotFoundException => _, _}
-import javax.ws.rs.core.{Context, MediaType, MultivaluedMap, UriInfo}
 
 import scala.jdk.CollectionConverters._
 
+import jakarta.ws.rs.{NotFoundException => _, _}
+import jakarta.ws.rs.core.{Context, MediaType, MultivaluedMap, UriInfo}
+
 import org.apache.spark.status.api.v1.TaskStatus._
 import org.apache.spark.ui.UIUtils
 import org.apache.spark.ui.jobs.ApiHelper._

core/src/main/scala/org/apache/spark/ui/DriverLogPage.scala

@@ -16,10 +16,10 @@
  */
 package org.apache.spark.ui
 
-import javax.servlet.http.HttpServletRequest
-
 import scala.xml.{Node, Unparsed}
 
+import jakarta.servlet.http.HttpServletRequest
+
 import org.apache.spark.SparkConf
 import org.apache.spark.internal.Logging
 import org.apache.spark.internal.config.DRIVER_LOG_LOCAL_DIR