From 2caa330f1744c40b8f2bf35c4dc9438bad0d7d69 Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 16 Oct 2023 21:24:19 +1100 Subject: [PATCH 1/5] update jetty9 --- slipway-jetty9/project.clj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/slipway-jetty9/project.clj b/slipway-jetty9/project.clj index 5ce0f09a..a3201c63 100644 --- a/slipway-jetty9/project.clj +++ b/slipway-jetty9/project.clj @@ -8,7 +8,7 @@ :url "https://github.com/factorhosue/slipway/blob/main/LICENSE"} :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.2"] ;; required for internal inconsistency within clj-kondo - [clj-kondo "2023.07.13"] + [clj-kondo "2023.09.07"] [clj-http "3.12.3" :exclusions [commons-io]] [ch.qos.logback/logback-classic "1.3.11"] [ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random]] @@ -25,10 +25,10 @@ [org.clojure/tools.logging "1.2.4"] [ring/ring-servlet "1.9.5"] [com.taoensso/sente "1.17.0"] - [org.eclipse.jetty/jetty-server "9.4.52.v20230823"] - [org.eclipse.jetty.websocket/websocket-server "9.4.52.v20230823"] - [org.eclipse.jetty.websocket/websocket-servlet "9.4.52.v20230823"] - [org.eclipse.jetty/jetty-jaas "9.4.52.v20230823"] + [org.eclipse.jetty/jetty-server "9.4.53.v20231009"] + [org.eclipse.jetty.websocket/websocket-server "9.4.53.v20231009"] + [org.eclipse.jetty.websocket/websocket-servlet "9.4.53.v20231009"] + [org.eclipse.jetty/jetty-jaas "9.4.53.v20231009"] [org.slf4j/slf4j-api "2.0.9"]] :source-paths ["src" "common/src" "common-javax/src"] From c48ad50b34a0552d9cc7c1adf22b73c23f35234b Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 16 Oct 2023 21:28:16 +1100 Subject: [PATCH 2/5] update jetty10 --- slipway-jetty10/project.clj | 14 +++++++------- slipway-jetty9/project.clj | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/slipway-jetty10/project.clj b/slipway-jetty10/project.clj index 7bdab3f8..29ee7bb5 100644 --- a/slipway-jetty10/project.clj +++ b/slipway-jetty10/project.clj @@ -7,8 +7,8 @@ :license {:name "MIT License" :url "https://github.com/factorhouse/slipway/blob/main/LICENSE"} - :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.2"] ;; required for internal inconsistency within clj-kondo - [clj-kondo "2023.07.13"] + :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.3"] ;; required for internal inconsistency within clj-kondo + [clj-kondo "2023.09.07"] [clj-http "3.12.3" :exclusions [commons-io]] [ch.qos.logback/logback-classic "1.3.11"] [ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random]] @@ -25,11 +25,11 @@ [org.clojure/tools.logging "1.2.4"] [ring/ring-servlet "1.9.5"] [com.taoensso/sente "1.17.0"] - [org.eclipse.jetty.websocket/websocket-jetty-api "10.0.16"] - [org.eclipse.jetty.websocket/websocket-jetty-server "10.0.16" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty.websocket/websocket-servlet "10.0.16" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty/jetty-server "10.0.16" :exclusions [org.slf4j/slf4j-api]] - [org.eclipse.jetty/jetty-jaas "10.0.16" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty.websocket/websocket-jetty-api "10.0.17"] + [org.eclipse.jetty.websocket/websocket-jetty-server "10.0.17" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty.websocket/websocket-servlet "10.0.17" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty/jetty-server "10.0.17" :exclusions [org.slf4j/slf4j-api]] + [org.eclipse.jetty/jetty-jaas "10.0.17" :exclusions [org.slf4j/slf4j-api]] [org.slf4j/slf4j-api "2.0.9"]] :source-paths ["common/src" "common-jetty1x/src" "common-javax/src"] diff --git a/slipway-jetty9/project.clj b/slipway-jetty9/project.clj index a3201c63..59477aa0 100644 --- a/slipway-jetty9/project.clj +++ b/slipway-jetty9/project.clj @@ -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.15.2"] ;; required for internal inconsistency within clj-kondo + :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.3"] ;; required for internal inconsistency within clj-kondo [clj-kondo "2023.09.07"] [clj-http "3.12.3" :exclusions [commons-io]] [ch.qos.logback/logback-classic "1.3.11"] From 93aef4b1ac0172a47aa6bac0e0033574ee31b89a Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 16 Oct 2023 21:36:47 +1100 Subject: [PATCH 3/5] update jetty11 --- slipway-jetty11/project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slipway-jetty11/project.clj b/slipway-jetty11/project.clj index 17dd0fac..e7578200 100644 --- a/slipway-jetty11/project.clj +++ b/slipway-jetty11/project.clj @@ -7,8 +7,8 @@ :license {:name "MIT License" :url "https://github.com/factorhouse/slipway/blob/main/LICENSE"} - :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.2"] ;; required for internal inconsistency within clj-kondo - [clj-kondo "2023.07.13"] + :profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.3"] ;; required for internal inconsistency within clj-kondo + [clj-kondo "2023.09.07"] [clj-http "3.12.3" :exclusions [commons-io]] [ch.qos.logback/logback-classic "1.3.11"] [ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random]] From 7bf52dbb004355a2735603357b0ddec73574cb8e Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 16 Oct 2023 21:41:59 +1100 Subject: [PATCH 4/5] update readme and changelog --- CHANGELOG.md | 4 ++++ README.md | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3713039e..ad7147ad 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.9] - 2023-16-05 + +Bump to latest Jetty version (11.0.17 or equivalent) + ## [1.1.8] - 2023-09-05 - Bump to latest Jetty version (11.0.16 or equivalent) diff --git a/README.md b/README.md index c7f3fa48..1887a8fa 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ | Jetty Version | Current Jetty Dependency | Clojars Project | | ------------- | ------------------------ | --------------- | -| Jetty 9 | 9.4.52.v20230823 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty9.svg)](https://clojars.org/io.factorhouse/slipway-jetty9) | -| Jetty 10 | 10.0.16 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty10.svg)](https://clojars.org/io.factorhouse/slipway-jetty10) | -| Jetty 11 | 11.0.16 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty11.svg)](https://clojars.org/io.factorhouse/slipway-jetty11) | +| Jetty 9 | 9.4.53.v20231009 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty9.svg)](https://clojars.org/io.factorhouse/slipway-jetty9) | +| Jetty 10 | 10.0.17 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty10.svg)](https://clojars.org/io.factorhouse/slipway-jetty10) | +| Jetty 11 | 11.0.17 | [![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 179af5c5f957e457884cfe3992570473f01c5ff3 Mon Sep 17 00:00:00 2001 From: d-t-w Date: Mon, 16 Oct 2023 21:42:41 +1100 Subject: [PATCH 5/5] bump project versions --- slipway-jetty10/project.clj | 2 +- slipway-jetty11/project.clj | 2 +- slipway-jetty9/project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slipway-jetty10/project.clj b/slipway-jetty10/project.clj index 29ee7bb5..ddc9560b 100644 --- a/slipway-jetty10/project.clj +++ b/slipway-jetty10/project.clj @@ -1,4 +1,4 @@ -(defproject io.factorhouse/slipway-jetty10 "1.1.8" +(defproject io.factorhouse/slipway-jetty10 "1.1.9" :description "A Clojure Companion for Jetty" diff --git a/slipway-jetty11/project.clj b/slipway-jetty11/project.clj index e7578200..cde1a59c 100644 --- a/slipway-jetty11/project.clj +++ b/slipway-jetty11/project.clj @@ -1,4 +1,4 @@ -(defproject io.factorhouse/slipway-jetty11 "1.1.8" +(defproject io.factorhouse/slipway-jetty11 "1.1.9" :description "A Clojure Companion for Jetty" diff --git a/slipway-jetty9/project.clj b/slipway-jetty9/project.clj index 59477aa0..a52368ed 100644 --- a/slipway-jetty9/project.clj +++ b/slipway-jetty9/project.clj @@ -1,4 +1,4 @@ -(defproject io.factorhouse/slipway-jetty9 "1.1.8" +(defproject io.factorhouse/slipway-jetty9 "1.1.9" :description "A Clojure Companion for Jetty"