update Jetty to 12.0.16

.clj-kondo/config.edn

@@ -787,7 +787,6 @@
     ring.mock.request                                             ring.mock
     ring.util.codec                                               codec
     ring.util.response                                            response
-    ring.adapter.jetty9.servlet                                   servlet
     saml20-clj.core                                               saml
     toucan.db                                                     db
     toucan.models                                                 models}}}

deps.edn

@@ -162,9 +162,6 @@
   org.clojure/tools.namespace               {:mvn/version "1.5.0"}
   org.clojure/tools.reader                  {:mvn/version "1.5.0"}
   org.clojure/tools.trace                   {:mvn/version "0.8.0"}              ; function tracing
-  org.eclipse.jetty/jetty-server            ^:antq/exclude                      ; 12.x do not support Java 8
-                                            {:mvn/version "11.0.24"}            ; web server
-  org.eclipse.jetty.websocket/websocket-jetty-server {:mvn/version "11.0.24"}   ; ring-jetty-adapter needs that
   org.flatland/ordered                      {:mvn/version "1.15.12"}            ; ordered maps & sets
   org.graalvm.js/js                         ^:antq/exclude                      ; newer GraalVM is not compatible with Java 8
                                             {:mvn/version "22.3.5"}             ; JavaScript engine
@@ -188,9 +185,7 @@
                                              :sha "4a37feaf817a2a6b5ef688c927f6fd4375964433"}
   riddley/riddley                           {:mvn/version "0.2.0"}              ; code walking lib -- used interally by Potemkin, manifold, etc.
   ring/ring-core                            {:mvn/version "1.13.0"}             ; HTTP abstraction
-  ring/ring-jetty-adapter                   {:mvn/version "1.13.0"              ; Jetty adapter
-                                             :exclusions [org.eclipse.jetty/jetty-server
-                                                          org.eclipse.jetty.websocket/websocket-jetty-server]}
+  info.sunng/ring-jetty9-adapter            {:mvn/version "0.36.1"}             ; Jetty adapter, along with jetty itself
   slingshot/slingshot                       {:mvn/version "0.12.2"}             ; enhanced throw/catch, used by other deps
   stencil/stencil                           {:mvn/version "0.5.0"}              ; Mustache templates for Clojure
   user-agent/user-agent                     {:mvn/version "0.1.1"}              ; User-Agent string parser, for Login History page & elsewhere

src/metabase/analytics/prometheus.clj

@@ -17,7 +17,7 @@
    [metabase.util.log :as log]
    [potemkin :as p]
    [potemkin.types :as p.types]
-   [ring.adapter.jetty :as ring-jetty])
+   [ring.adapter.jetty9 :as ring-jetty])
   (:import
    (io.prometheus.client Collector GaugeMetricFamily)
    (io.prometheus.client.hotspot GarbageCollectorExports MemoryPoolsExports StandardExports ThreadExports)

src/metabase/server/instance.clj

@@ -7,8 +7,8 @@
    [metabase.server.protocols :as server.protocols]
    [metabase.util :as u]
    [metabase.util.log :as log]
-   [ring.adapter.jetty :as ring-jetty]
-   [ring.util.jakarta.servlet :as servlet])
+   [ring.adapter.jetty9 :as ring-jetty]
+   [ring.adapter.jetty9.common :as jetty-common])
   (:import
    (jakarta.servlet AsyncContext)
    (jakarta.servlet.http HttpServletRequest HttpServletResponse)
@@ -64,7 +64,7 @@
     (handle [_ ^Request base-request ^HttpServletRequest request ^HttpServletResponse response]
       (let [^AsyncContext context (doto (.startAsync request)
                                     (.setTimeout timeout))
-            request-map           (servlet/build-request-map request)
+            request-map           (jetty-common/build-request-map request)
             raise                 (fn raise [^Throwable e]
                                     (log/error e "Unexpected exception in endpoint")
                                     (try

src/metabase/server/protocols.clj

@@ -1,7 +1,7 @@
 (ns metabase.server.protocols
   (:require
    [potemkin.types :as p.types]
-   [ring.util.jakarta.servlet :as servlet]))
+   [ring.adapter.jetty9.common :as jetty-common]))
 
 (p.types/defprotocol+ Respond
   "Protocol for converting API endpoint responses to something Jetty can handle."
@@ -21,8 +21,8 @@
 (extend-protocol Respond
   nil
   (respond [_ {:keys [async-context response response-map]}]
-    (servlet/update-servlet-response response async-context response-map))
+    (jetty-common/update-response response async-context response-map))
 
   Object
   (respond [_ {:keys [async-context response response-map]}]
-    (servlet/update-servlet-response response async-context response-map)))
+    (jetty-common/update-response response async-context response-map)))

src/metabase/server/streaming_response.clj

@@ -11,7 +11,7 @@
    [metabase.util.log :as log]
    [potemkin.types :as p.types]
    [pretty.core :as pretty]
-   [ring.util.jakarta.servlet :as servlet]
+   [ring.adapter.jetty9.common :as jetty-common]
    [ring.util.response :as response])
   (:import
    (jakarta.servlet AsyncContext)
@@ -231,7 +231,7 @@
                                    ;; of the subsequent requests that come through the reused connection (see #46071).
                                    "Connection" "close")
                       gzip? (assoc "Content-Encoding" "gzip"))]
-        (#'servlet/set-headers response headers)
+        (jetty-common/set-headers! response headers)
         (let [output-stream-delay (output-stream-delay gzip? response)
               delay-os            (delay-output-stream output-stream-delay)]
           (start-async-cancel-loop! request finished-chan canceled-chan)

test/metabase/api/geojson_test.clj

@@ -10,7 +10,7 @@
    [metabase.util :as u]
    [metabase.util.json :as json]
    [metabase.util.malli.schema :as ms]
-   [ring.adapter.jetty :as ring-jetty])
+   [ring.adapter.jetty9 :as ring-jetty])
   (:import
    (org.eclipse.jetty.server Server)))
 

test/metabase/channel/impl/http_test.clj

@@ -12,7 +12,7 @@
    [metabase.server.middleware.json :as mw.json]
    [metabase.test :as mt]
    [metabase.util.i18n :refer [deferred-tru]]
-   [ring.adapter.jetty :as jetty]
+   [ring.adapter.jetty9 :as ring-jetty]
    [ring.middleware.params :refer [wrap-params]]
    [toucan2.core :as t2])
   (:import
@@ -59,7 +59,7 @@
                          (mapv :route routes+handlers)
                          (conj routes+handlers (compojure.route/not-found {:status-code 404 :body "Not found."}))
                          (apply #_{:clj-kondo/ignore [:discouraged-var]} compojure/routes routes+handlers))
-        ^Server server (jetty/run-jetty (apply-middleware handler middlewares) {:port 0 :join? false})]
+        ^Server server (ring-jetty/run-jetty (apply-middleware handler middlewares) {:port 0 :join? false})]
     (try
       (f (str "http://localhost:" (.. server getURI getPort)))
       (finally