Skip to content

Commit

Permalink
Merge pull request #19 from factorhouse/update-jetty
Browse files Browse the repository at this point in the history 
Update Jetty to Latest Version
  • Loading branch information
@d-t-w
d-t-w authored Jul 24, 2024
2 parents dcec160 + d35412a commit a032319
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 25 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# 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.12] - 2024-06-04
## [1.1.15] - 2024-07-24

Bump to latest Jetty version (11.0.22 or equivalent)

## [1.1.14] - 2024-06-04

Bump to latest Jetty version (11.0.21 or equivalent)

Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

| Jetty Version | Current Jetty Dependency | Clojars Project |
| ------------- | ------------------------ | --------------- |
| Jetty 9 | 9.4.54.v20240208 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty9.svg)](https://clojars.org/io.factorhouse/slipway-jetty9) |
| Jetty 10 | 10.0.21 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty10.svg)](https://clojars.org/io.factorhouse/slipway-jetty10) |
| Jetty 11 | 11.0.21 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty11.svg)](https://clojars.org/io.factorhouse/slipway-jetty11) |
| 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 12 | - | Available once Jetty 12 stabilises. |

----
Expand Down
2 changes: 1 addition & 1 deletion scripts/dependency-checker.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

VERSION="9.0.9"
VERSION="10.0.2"

if [ ! -d "dependency-check" ]
then
Expand Down
14 changes: 7 additions & 7 deletions slipway-jetty10/project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject io.factorhouse/slipway-jetty10 "1.1.14"
(defproject io.factorhouse/slipway-jetty10 "1.1.15"

:description "A Clojure Companion for Jetty"

Expand All @@ -12,7 +12,7 @@
[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"]
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
[metosin/reitit-ring "0.7.1" :exclusions [ring/ring-core]]]
:resource-paths ["dev-resources" "common/dev-resources"]
:plugins [[lein-cljfmt "0.9.2"]]}
:smoke {:pedantic? :abort}}
Expand All @@ -25,11 +25,11 @@
[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.21"]
[org.eclipse.jetty.websocket/websocket-jetty-server "10.0.21" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty.websocket/websocket-servlet "10.0.21" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-server "10.0.21" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-jaas "10.0.21" :exclusions [org.slf4j/slf4j-api]]
[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"]]

:source-paths ["common/src" "common-jetty1x/src" "common-javax/src"]
Expand Down
14 changes: 7 additions & 7 deletions slipway-jetty11/project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject io.factorhouse/slipway-jetty11 "1.1.14"
(defproject io.factorhouse/slipway-jetty11 "1.1.15"

:description "A Clojure Companion for Jetty"

Expand All @@ -12,7 +12,7 @@
[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"]
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
[metosin/reitit-ring "0.7.1" :exclusions [ring/ring-core]]]
:resource-paths ["dev-resources" "common/dev-resources"]
:plugins [[lein-cljfmt "0.9.2"]]}
:smoke {:pedantic? :abort}}
Expand All @@ -25,11 +25,11 @@
[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.21"]
[org.eclipse.jetty.websocket/websocket-jetty-server "11.0.21" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty.websocket/websocket-servlet "11.0.21" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-server "11.0.21" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-jaas "11.0.21" :exclusions [org.slf4j/slf4j-api]]
[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"]]

:source-paths ["common/src" "common-jetty1x/src" "common-jakarta/src"]
Expand Down
12 changes: 6 additions & 6 deletions slipway-jetty9/project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject io.factorhouse/slipway-jetty9 "1.1.14"
(defproject io.factorhouse/slipway-jetty9 "1.1.15"

:description "A Clojure Companion for Jetty"

Expand All @@ -12,7 +12,7 @@
[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"]
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
[metosin/reitit-ring "0.7.1" :exclusions [ring/ring-core]]]
:resource-paths ["dev-resources" "common/dev-resources"]
:plugins [[lein-cljfmt "0.9.2"]]}
:smoke {:pedantic? :abort}}
Expand All @@ -25,10 +25,10 @@
[org.clojure/tools.logging "1.3.0"]
[ring/ring-servlet "1.9.6"]
[com.taoensso/sente "1.17.0"]
[org.eclipse.jetty/jetty-server "9.4.54.v20240208"]
[org.eclipse.jetty.websocket/websocket-server "9.4.54.v20240208"]
[org.eclipse.jetty.websocket/websocket-servlet "9.4.54.v20240208"]
[org.eclipse.jetty/jetty-jaas "9.4.54.v20240208"]
[org.eclipse.jetty/jetty-server "9.4.55.v20240627"]
[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"]]

:source-paths ["src" "common/src" "common-javax/src"]
Expand Down

0 comments on commit a032319

Please sign in to comment.