Update Jetty to 12.0.18

Turns out to be easier than anticipated.

Author: weavejester

ring-jetty-adapter/project.clj

@@ -4,19 +4,21 @@
   :scm {:dir ".."}
   :license {:name "The MIT License"
             :url "http://opensource.org/licenses/MIT"}
-  :dependencies [[org.clojure/clojure "1.9.0"]
-                 [ring/ring-core "1.13.1"]
-                 [org.ring-clojure/ring-jakarta-servlet "1.13.1"]
-                 [org.eclipse.jetty/jetty-server "11.0.25"]
-                 [org.eclipse.jetty/jetty-unixdomain-server "11.0.25"]
-                 [org.eclipse.jetty.websocket/websocket-jetty-server "11.0.25"]]
+  :dependencies
+  [[org.clojure/clojure "1.9.0"]
+   [ring/ring-core "1.13.1"]
+   [org.ring-clojure/ring-jakarta-servlet "1.13.1"]
+   [org.eclipse.jetty/jetty-server "12.0.18"]
+   [org.eclipse.jetty/jetty-unixdomain-server "12.0.18"]
+   [org.eclipse.jetty.ee9/jetty-ee9-servlet "12.0.18"]
+   [org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server "12.0.18"]]
   :aliases {"test-all" ["with-profile" "default:+1.10:+1.11:+1.12" "test"]}
   :profiles
   {:dev  {:dependencies [[clj-http "3.13.0"]
                          [less-awful-ssl "1.0.6"]
                          [hato "1.0.0"]]
           :jvm-opts ["-Dorg.eclipse.jetty.server.HttpChannelState.DEFAULT_TIMEOUT=500"]}
-   :test {:dependencies [[org.eclipse.jetty/jetty-client "11.0.25"]]}
+   :test {:dependencies [[org.eclipse.jetty/jetty-client "12.0.18"]]}
    :1.10 {:dependencies [[org.clojure/clojure "1.10.3"]]}
    :1.11 {:dependencies [[org.clojure/clojure "1.11.4"]]}
    :1.12 {:dependencies [[org.clojure/clojure "1.12.0"]]}})

ring-jetty-adapter/src/ring/adapter/jetty.clj

@@ -17,22 +17,22 @@
             SslConnectionFactory
             SecureRequestCustomizer]
            [org.eclipse.jetty.unixdomain.server UnixDomainServerConnector]
-           [org.eclipse.jetty.servlet ServletContextHandler ServletHandler]
+           [org.eclipse.jetty.ee9.servlet ServletContextHandler ServletHandler]
            [org.eclipse.jetty.util BlockingArrayQueue]
            [org.eclipse.jetty.util.thread ThreadPool QueuedThreadPool]
            [org.eclipse.jetty.util.ssl SslContextFactory$Server KeyStoreScanner]
-           [org.eclipse.jetty.websocket.server
+           [org.eclipse.jetty.ee9.websocket.server
             JettyServerUpgradeRequest
             JettyServerUpgradeResponse
             JettyWebSocketServerContainer
             JettyWebSocketCreator]
-           [org.eclipse.jetty.websocket.api
+           [org.eclipse.jetty.ee9.websocket.api
             Session
             WebSocketConnectionListener
             WebSocketListener
             WebSocketPingPongListener
             WriteCallback]
-           [org.eclipse.jetty.websocket.server.config
+           [org.eclipse.jetty.ee9.websocket.server.config
             JettyWebSocketServletContainerInitializer]
            [jakarta.servlet AsyncContext AsyncEvent AsyncListener]
            [jakarta.servlet.http HttpServletRequest HttpServletResponse]))

ring-jetty-adapter/test/ring/adapter/test/jetty.clj

@@ -16,7 +16,7 @@
            [org.eclipse.jetty.server.handler AbstractHandler]
            [org.eclipse.jetty.io ClientConnector]
            [org.eclipse.jetty.client HttpClient]
-           [org.eclipse.jetty.client.http HttpClientTransportOverHTTP]
+           [org.eclipse.jetty.client.transport HttpClientTransportOverHTTP]
            [java.net ServerSocket ConnectException]
            [java.security KeyStore]
            [java.io SequenceInputStream ByteArrayInputStream InputStream