From 1c97d66af35b5614851409a19b2000ff75daaa5d Mon Sep 17 00:00:00 2001 From: Derek Troy-West Date: Mon, 20 Apr 2026 13:24:15 +1000 Subject: [PATCH 1/2] update dependencies --- slipway-jetty12/project.clj | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/slipway-jetty12/project.clj b/slipway-jetty12/project.clj index 14e3e99a..54daea29 100644 --- a/slipway-jetty12/project.clj +++ b/slipway-jetty12/project.clj @@ -1,4 +1,4 @@ -(defproject io.factorhouse/slipway-jetty12 "2.0.0-rc2" +(defproject io.factorhouse/slipway-jetty12 "2.0.0-rc3" :description "A Clojure Companion for Jetty 12" @@ -7,11 +7,11 @@ :license {:name "Apache 2.0 License" :url "https://github.com/factorhouse/slipway/blob/main/LICENSE"} - :profiles {:dev {:dependencies [[clj-kondo "2026.01.19"] + :profiles {:dev {:dependencies [[clj-kondo "2026.04.15"] [clj-http "3.13.1" :exclusions [commons-io]] ;; later version in reitit-ring [ch.qos.logback/logback-classic "1.5.32"] [hiccup "2.0.0"] - [ring/ring-core "1.15.3"] + [ring/ring-core "1.15.4"] [ring/ring-anti-forgery "1.4.0"] [metosin/reitit-ring "0.10.1"]] :resource-paths ["dev-resources"] @@ -27,15 +27,15 @@ :dependencies [[org.clojure/clojure "1.12.4"] [org.clojure/tools.logging "1.3.1"] - [org.ring-clojure/ring-core-protocols "1.15.3"] + [org.ring-clojure/ring-core-protocols "1.15.4"] [com.taoensso/sente "1.21.0"] - [org.eclipse.jetty.websocket/jetty-websocket-jetty-api "12.1.7"] - [org.eclipse.jetty.websocket/jetty-websocket-jetty-server "12.1.7"] - [org.eclipse.jetty/jetty-server "12.1.7"] - [org.eclipse.jetty/jetty-session "12.1.7"] - [org.eclipse.jetty/jetty-security "12.1.7"] - [org.eclipse.jetty.compression/jetty-compression-server "12.1.7"] - [org.eclipse.jetty.compression/jetty-compression-gzip "12.1.7"]] + [org.eclipse.jetty.websocket/jetty-websocket-jetty-api "12.1.8"] + [org.eclipse.jetty.websocket/jetty-websocket-jetty-server "12.1.8"] + [org.eclipse.jetty/jetty-server "12.1.8"] + [org.eclipse.jetty/jetty-session "12.1.8"] + [org.eclipse.jetty/jetty-security "12.1.8"] + [org.eclipse.jetty.compression/jetty-compression-server "12.1.8"] + [org.eclipse.jetty.compression/jetty-compression-gzip "12.1.8"]] :source-paths ["src"] :test-paths ["test"] From c4f3ac9d6ad99c035471fee0dcf485c5a9754e6e Mon Sep 17 00:00:00 2001 From: Derek Troy-West Date: Mon, 20 Apr 2026 13:32:59 +1000 Subject: [PATCH 2/2] fix tests --- slipway-jetty12/test/slipway/server_http_test.clj | 11 +++++++---- slipway-jetty12/test/slipway/server_https_test.clj | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/slipway-jetty12/test/slipway/server_http_test.clj b/slipway-jetty12/test/slipway/server_http_test.clj index 15cd048b..bd6f4300 100644 --- a/slipway-jetty12/test/slipway/server_http_test.clj +++ b/slipway-jetty12/test/slipway/server_http_test.clj @@ -33,8 +33,9 @@ :status 200 :reason-phrase "OK" :headers {"connection" "close" - "content-length" "2961" - "content-type" "text/html"} + "content-length" "2961" ;; this is the uncompressed bytes-size of content + "content-type" "text/html" + "vary" "Accept-Encoding"} :body (html/user-page {})} (-> (client/do-get "http://localhost:3000/user" {:decompress-body false}) (select-keys of-interest)))) @@ -62,7 +63,8 @@ :reason-phrase "OK" :headers {"connection" "close" "content-length" "2479" - "content-type" "text/html"} + "content-type" "text/html" + "vary" "Accept-Encoding"} :body (html/login-page false)} (-> (client/do-get "http" "localhost" 3000 "/login" {:decompress-body false}) (select-keys of-interest)))) @@ -88,7 +90,8 @@ :reason-phrase "OK" :headers {"connection" "close" "content-length" "2479" - "content-type" "text/html"} + "content-type" "text/html" + "vary" "Accept-Encoding"} :body (html/login-page false)} (-> (client/do-get "http" "localhost" 3000 "/login" {:decompress-body false}) (select-keys of-interest)))) diff --git a/slipway-jetty12/test/slipway/server_https_test.clj b/slipway-jetty12/test/slipway/server_https_test.clj index f302e6fb..1c9b1d2b 100644 --- a/slipway-jetty12/test/slipway/server_https_test.clj +++ b/slipway-jetty12/test/slipway/server_https_test.clj @@ -33,8 +33,9 @@ :status 200 :reason-phrase "OK" :headers {"connection" "close" - "content-length" "2961" - "content-type" "text/html"} + "content-length" "2961" ;; this is the uncompressed bytes-size of content + "content-type" "text/html" + "vary" "Accept-Encoding"} :body (html/user-page {})} (-> (client/do-get "https://localhost:3443/user" {:insecure? true :decompress-body false}) @@ -65,7 +66,8 @@ :reason-phrase "OK" :headers {"connection" "close" "content-length" "2479" - "content-type" "text/html"} + "content-type" "text/html" + "vary" "Accept-Encoding"} :body (html/login-page false)} (-> (client/do-get "https" "localhost" 3443 "/login" {:decompress-body false :insecure? true}) @@ -92,7 +94,8 @@ :reason-phrase "OK" :headers {"connection" "close" "content-length" "2479" - "content-type" "text/html"} + "content-type" "text/html" + "vary" "Accept-Encoding"} :body (html/login-page false)} (-> (client/do-get "https" "localhost" 3443 "/login" {:decompress-body false :insecure? true})