Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions slipway-jetty12/project.clj
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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"]
Expand All @@ -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"]
Expand Down
11 changes: 7 additions & 4 deletions slipway-jetty12/test/slipway/server_http_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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))))
Expand Down Expand Up @@ -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))))
Expand All @@ -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))))
Expand Down
11 changes: 7 additions & 4 deletions slipway-jetty12/test/slipway/server_https_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -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})
Expand All @@ -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})
Expand Down
Loading