From 071ba2f415b27550828b42471c2b0a0e42a6f51e Mon Sep 17 00:00:00 2001 From: Derek Troy-West Date: Mon, 9 Dec 2024 15:48:43 +1100 Subject: [PATCH] update jetty9 dependencies --- common/src/slipway/security.clj | 4 ++-- slipway-jetty9/project.clj | 6 +++--- slipway-jetty9/src/slipway/websockets.clj | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/src/slipway/security.clj b/common/src/slipway/security.clj index 55aabd20..523da1c0 100644 --- a/common/src/slipway/security.clj +++ b/common/src/slipway/security.clj @@ -19,7 +19,7 @@ (if config (when (slurp config) (doto (JAASLoginService. realm) (.setConfiguration (Configuration/getConfiguration)))) - (throw (ex-info (str "start with -Djava.security.auth.login.config=/some/path/to/jaas.config to use Jetty/JAAS auth provider") {}))))) + (throw (ex-info "start with -Djava.security.auth.login.config=/some/path/to/jaas.config to use Jetty/JAAS auth provider" {}))))) (defmethod login-service "hash" [{::keys [realm hash-user-file]}] @@ -27,7 +27,7 @@ (if hash-user-file (when (slurp hash-user-file) (HashLoginService. realm hash-user-file)) - (throw (ex-info (str "set the path to your hash user realm properties file") {})))) + (throw (ex-info "set the path to your hash user realm properties file" {})))) (defn user [^Request base-request] diff --git a/slipway-jetty9/project.clj b/slipway-jetty9/project.clj index d7f590a5..9ff4bbd5 100644 --- a/slipway-jetty9/project.clj +++ b/slipway-jetty9/project.clj @@ -7,8 +7,8 @@ :license {:name "MIT License" :url "https://github.com/factorhosue/slipway/blob/main/LICENSE"} - :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.17.2"] ;; required for internal inconsistency within clj-kondo, kept at latest for CVE avoidance - [clj-kondo "2023.12.15"] ;; https://github.com/clj-kondo/clj-kondo/issues/2277 leave at this version until we move to Clojure 1.12.x and can fix + :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.18.2"] ;; required for internal inconsistency within clj-kondo, kept at latest for CVE avoidance + [clj-kondo "2024.11.14"] [clj-http "3.13.0"] [ch.qos.logback/logback-classic "1.3.14"] ;; Logback 1.3.x supports the Java EE edition whereas logback 1.4.x supports Jakarta EE, otherwise the two versions are feature identical. The 1.5.x continues the 1.4.x series but with logback-access relocated to its own repository. [ring/ring-anti-forgery "1.3.1"] @@ -21,7 +21,7 @@ "kondo" ["with-profile" "+smoke" "run" "-m" "clj-kondo.main" "--lint" "src:common/src:test:common/test" "--parallel"] "fmt" ["with-profile" "+smoke" "cljfmt" "check"]} - :dependencies [[org.clojure/clojure "1.11.4"] + :dependencies [[org.clojure/clojure "1.12.0"] [org.clojure/tools.logging "1.3.0"] [ring/ring-servlet "1.9.6"] [com.taoensso/sente "1.17.0"] diff --git a/slipway-jetty9/src/slipway/websockets.clj b/slipway-jetty9/src/slipway/websockets.clj index f1f4d373..693b2c46 100644 --- a/slipway-jetty9/src/slipway/websockets.clj +++ b/slipway-jetty9/src/slipway/websockets.clj @@ -32,6 +32,7 @@ (extend-protocol common.ws/WebSocketSend + #_:clj-kondo/ignore (Class/forName "[B") (-send! ([ba ws] @@ -70,6 +71,7 @@ (extend-protocol common.ws/WebSocketPing + #_:clj-kondo/ignore (Class/forName "[B") (-ping! [ba ws] (common.ws/-ping! (ByteBuffer/wrap ba) ws)))