From 0368d07f22c4b9399f99376f5c9e66c2dfa86ada Mon Sep 17 00:00:00 2001
From: "Ross A. Baker" <ross@rossabaker.com>
Date: Fri, 6 Jan 2023 21:52:29 -0500
Subject: [PATCH] Jetty 11 and friends

---
 build.sbt                                                   | 6 +++---
 .../main/scala/org/http4s/jetty/server/JettyBuilder.scala   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.sbt b/build.sbt
index 7f27349..f3396d1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 import org.typelevel.sbt.gha
 
-ThisBuild / tlBaseVersion := "0.24" // your current series x.y
+ThisBuild / tlBaseVersion := "0.25" // your current series x.y
 
 ThisBuild / licenses := Seq(License.Apache2)
 ThisBuild / developers := List(
@@ -27,9 +27,9 @@ lazy val root = project
   .enablePlugins(NoPublishPlugin)
   .aggregate(jettyServer, jettyClient)
 
-val jettyVersion = "10.0.13"
+val jettyVersion = "11.0.13"
 val http4sVersion = "0.23.17"
-val http4sServletVersion = "0.24.0-M2"
+val http4sServletVersion = "0.25.0-M2"
 val munitCatsEffectVersion = "1.0.7"
 val slf4jVersion = "1.7.25"
 
diff --git a/jetty-server/src/main/scala/org/http4s/jetty/server/JettyBuilder.scala b/jetty-server/src/main/scala/org/http4s/jetty/server/JettyBuilder.scala
index d9d9254..993f31e 100644
--- a/jetty-server/src/main/scala/org/http4s/jetty/server/JettyBuilder.scala
+++ b/jetty-server/src/main/scala/org/http4s/jetty/server/JettyBuilder.scala
@@ -22,6 +22,9 @@ import cats.effect._
 import cats.effect.kernel.Async
 import cats.effect.std.Dispatcher
 import cats.syntax.all._
+import jakarta.servlet.DispatcherType
+import jakarta.servlet.http.HttpFilter
+import jakarta.servlet.http.HttpServlet
 import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory
 import org.eclipse.jetty.server.HttpConfiguration
 import org.eclipse.jetty.server.HttpConnectionFactory
@@ -51,9 +54,6 @@ import java.net.InetSocketAddress
 import java.util
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLParameters
-import javax.servlet.DispatcherType
-import javax.servlet.http.HttpFilter
-import javax.servlet.http.HttpServlet
 import scala.annotation.nowarn
 import scala.collection.immutable
 import scala.concurrent.duration._