From c885ecd6f764934b5713d775172881c4fbf0bda0 Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 2 Sep 2024 19:02:28 +1000 Subject: [PATCH 1/5] update jetty9 deps --- slipway-jetty9/project.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/slipway-jetty9/project.clj b/slipway-jetty9/project.clj index d44b4570..c58fad3a 100644 --- a/slipway-jetty9/project.clj +++ b/slipway-jetty9/project.clj @@ -1,4 +1,4 @@ -(defproject io.factorhouse/slipway-jetty9 "1.1.15" +(defproject io.factorhouse/slipway-jetty9 "1.1.16" :description "A Clojure Companion for Jetty" @@ -7,7 +7,7 @@ :license {:name "MIT License" :url "https://github.com/factorhosue/slipway/blob/main/LICENSE"} - :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.16.2"] ;; required for internal inconsistency within clj-kondo, kept at latest for CVE avoidance + :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 [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. @@ -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.3"] + :dependencies [[org.clojure/clojure "1.11.4"] [org.clojure/tools.logging "1.3.0"] [ring/ring-servlet "1.9.6"] [com.taoensso/sente "1.17.0"] @@ -29,7 +29,7 @@ [org.eclipse.jetty.websocket/websocket-server "9.4.55.v20240627"] [org.eclipse.jetty.websocket/websocket-servlet "9.4.55.v20240627"] [org.eclipse.jetty/jetty-jaas "9.4.55.v20240627"] - [org.slf4j/slf4j-api "2.0.13"]] + [org.slf4j/slf4j-api "2.0.16"]] :source-paths ["src" "common/src" "common-javax/src"] :test-paths ["test" "common/test"] From 996bdcb53ddcf7ebaf97f8864896db0671e32b5c Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 2 Sep 2024 19:08:29 +1000 Subject: [PATCH 2/5] update jetty10 deps --- slipway-jetty10/project.clj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/slipway-jetty10/project.clj b/slipway-jetty10/project.clj index 741fe756..4f85ece6 100644 --- a/slipway-jetty10/project.clj +++ b/slipway-jetty10/project.clj @@ -1,4 +1,4 @@ -(defproject io.factorhouse/slipway-jetty10 "1.1.15" +(defproject io.factorhouse/slipway-jetty10 "1.1.16" :description "A Clojure Companion for Jetty" @@ -7,7 +7,7 @@ :license {:name "MIT License" :url "https://github.com/factorhouse/slipway/blob/main/LICENSE"} - :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.16.2"] ;; required for internal inconsistency within clj-kondo, kept at latest for CVE avoidance + :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"] [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. @@ -21,16 +21,16 @@ "kondo" ["with-profile" "+smoke" "run" "-m" "clj-kondo.main" "--lint" "common/src:common-jetty1x/src:test:common/test" "--parallel"] "fmt" ["with-profile" "+smoke" "cljfmt" "check"]} - :dependencies [[org.clojure/clojure "1.11.3"] + :dependencies [[org.clojure/clojure "1.11.4"] [org.clojure/tools.logging "1.3.0"] [ring/ring-servlet "1.9.6"] [com.taoensso/sente "1.17.0"] - [org.eclipse.jetty.websocket/websocket-jetty-api "10.0.22"] - [org.eclipse.jetty.websocket/websocket-jetty-server "10.0.22" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty.websocket/websocket-servlet "10.0.22" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty/jetty-server "10.0.22" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty/jetty-jaas "10.0.22" :exclusions [org.slf4j/slf4j-api]] - [org.slf4j/slf4j-api "2.0.13"]] + [org.eclipse.jetty.websocket/websocket-jetty-api "10.0.23"] + [org.eclipse.jetty.websocket/websocket-jetty-server "10.0.23" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty.websocket/websocket-servlet "10.0.23" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty/jetty-server "10.0.23" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty/jetty-jaas "10.0.23" :exclusions [org.slf4j/slf4j-api]] + [org.slf4j/slf4j-api "2.0.16"]] :source-paths ["common/src" "common-jetty1x/src" "common-javax/src"] :test-paths ["test" "common/test"]) From 3affec42211a813101cb68648943924ea93d1d2e Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 2 Sep 2024 19:18:17 +1000 Subject: [PATCH 3/5] update jetty11 deps --- slipway-jetty11/project.clj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/slipway-jetty11/project.clj b/slipway-jetty11/project.clj index 2bae5502..738a9bb9 100644 --- a/slipway-jetty11/project.clj +++ b/slipway-jetty11/project.clj @@ -1,4 +1,4 @@ -(defproject io.factorhouse/slipway-jetty11 "1.1.15" +(defproject io.factorhouse/slipway-jetty11 "1.1.16" :description "A Clojure Companion for Jetty" @@ -7,7 +7,7 @@ :license {:name "MIT License" :url "https://github.com/factorhouse/slipway/blob/main/LICENSE"} - :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.16.2"] ;; required for internal inconsistency within clj-kondo, kept at latest for CVE avoidance + :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"] [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. @@ -21,16 +21,16 @@ "kondo" ["with-profile" "+smoke" "run" "-m" "clj-kondo.main" "--lint" "common/src:common-jetty1x/src:test:common/test" "--parallel"] "fmt" ["with-profile" "+smoke" "cljfmt" "check"]} - :dependencies [[org.clojure/clojure "1.11.3"] + :dependencies [[org.clojure/clojure "1.11.4"] [org.clojure/tools.logging "1.3.0"] [ring/ring-servlet "1.9.6"] [com.taoensso/sente "1.17.0"] - [org.eclipse.jetty.websocket/websocket-jetty-api "11.0.22"] - [org.eclipse.jetty.websocket/websocket-jetty-server "11.0.22" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty.websocket/websocket-servlet "11.0.22" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty/jetty-server "11.0.22" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty/jetty-jaas "11.0.22" :exclusions [org.slf4j/slf4j-api]] - [org.slf4j/slf4j-api "2.0.13"]] + [org.eclipse.jetty.websocket/websocket-jetty-api "11.0.23"] + [org.eclipse.jetty.websocket/websocket-jetty-server "11.0.23" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty.websocket/websocket-servlet "11.0.23" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty/jetty-server "11.0.23" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty/jetty-jaas "11.0.23" :exclusions [org.slf4j/slf4j-api]] + [org.slf4j/slf4j-api "2.0.16"]] :source-paths ["common/src" "common-jetty1x/src" "common-jakarta/src"] :test-paths ["test" "common/test"]) From e4bd55f997251631d44110f13d22526a9df204ce Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 2 Sep 2024 19:18:44 +1000 Subject: [PATCH 4/5] prepare for v1.1.16 release --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a8f31391..6e79612d 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ | Jetty Version | Current Jetty Dependency | Clojars Project | | ------------- | ------------------------ | --------------- | | Jetty 9 | 9.4.55.v20240627 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty9.svg)](https://clojars.org/io.factorhouse/slipway-jetty9) | -| Jetty 10 | 10.0.22 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty10.svg)](https://clojars.org/io.factorhouse/slipway-jetty10) | -| Jetty 11 | 11.0.22 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty11.svg)](https://clojars.org/io.factorhouse/slipway-jetty11) | +| Jetty 10 | 10.0.23 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty10.svg)](https://clojars.org/io.factorhouse/slipway-jetty10) | +| Jetty 11 | 11.0.23 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty11.svg)](https://clojars.org/io.factorhouse/slipway-jetty11) | | Jetty 12 | - | Available once Jetty 12 stabilises. | ---- From 72caaed3f821e73081c3ebdd17be47ff9df8f450 Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 2 Sep 2024 19:58:10 +1000 Subject: [PATCH 5/5] update changelog.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 153f4ae5..c26cae64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/) +## [1.1.16] - 2024-09-02 + +Bump to latest Jetty version (11.0.23 or equivalent) + ## [1.1.15] - 2024-07-24 Bump to latest Jetty version (11.0.22 or equivalent)