Skip to content

Commit a032319

Browse files
d-t-wd-t-w
authored
Merge pull request #19 from factorhouse/update-jetty
Update Jetty to Latest Version
2 parents dcec160 + d35412a commit a032319

File tree

6 files changed

+29
-25
lines changed

6 files changed

+29
-25
lines changed

‎CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# Change Log
22
All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/)
33

4-
## [1.1.12] - 2024-06-04
4+
## [1.1.15] - 2024-07-24
5+
6+
Bump to latest Jetty version (11.0.22 or equivalent)
7+
8+
## [1.1.14] - 2024-06-04
59

610
Bump to latest Jetty version (11.0.21 or equivalent)
711

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
| Jetty Version | Current Jetty Dependency | Clojars Project |
88
| ------------- | ------------------------ | --------------- |
9-
| 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) |
10-
| 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) |
11-
| 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) |
9+
| 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) |
10+
| 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) |
11+
| 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) |
1212
| Jetty 12 | - | Available once Jetty 12 stabilises. |
1313

1414
----

‎scripts/dependency-checker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
VERSION="9.0.9"
3+
VERSION="10.0.2"
44

55
if [ ! -d "dependency-check" ]
66
then

‎slipway-jetty10/project.clj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject io.factorhouse/slipway-jetty10 "1.1.14"
1+
(defproject io.factorhouse/slipway-jetty10 "1.1.15"
22

33
:description "A Clojure Companion for Jetty"
44

@@ -12,7 +12,7 @@
1212
[clj-http "3.13.0"]
1313
[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.
1414
[ring/ring-anti-forgery "1.3.1"]
15-
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
15+
[metosin/reitit-ring "0.7.1" :exclusions [ring/ring-core]]]
1616
:resource-paths ["dev-resources" "common/dev-resources"]
1717
:plugins [[lein-cljfmt "0.9.2"]]}
1818
:smoke {:pedantic? :abort}}
@@ -25,11 +25,11 @@
2525
[org.clojure/tools.logging "1.3.0"]
2626
[ring/ring-servlet "1.9.6"]
2727
[com.taoensso/sente "1.17.0"]
28-
[org.eclipse.jetty.websocket/websocket-jetty-api "10.0.21"]
29-
[org.eclipse.jetty.websocket/websocket-jetty-server "10.0.21" :exclusions [org.slf4j/slf4j-api]]
30-
[org.eclipse.jetty.websocket/websocket-servlet "10.0.21" :exclusions [org.slf4j/slf4j-api]]
31-
[org.eclipse.jetty/jetty-server "10.0.21" :exclusions [org.slf4j/slf4j-api]]
32-
[org.eclipse.jetty/jetty-jaas "10.0.21" :exclusions [org.slf4j/slf4j-api]]
28+
[org.eclipse.jetty.websocket/websocket-jetty-api "10.0.22"]
29+
[org.eclipse.jetty.websocket/websocket-jetty-server "10.0.22" :exclusions [org.slf4j/slf4j-api]]
30+
[org.eclipse.jetty.websocket/websocket-servlet "10.0.22" :exclusions [org.slf4j/slf4j-api]]
31+
[org.eclipse.jetty/jetty-server "10.0.22" :exclusions [org.slf4j/slf4j-api]]
32+
[org.eclipse.jetty/jetty-jaas "10.0.22" :exclusions [org.slf4j/slf4j-api]]
3333
[org.slf4j/slf4j-api "2.0.13"]]
3434

3535
:source-paths ["common/src" "common-jetty1x/src" "common-javax/src"]

‎slipway-jetty11/project.clj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject io.factorhouse/slipway-jetty11 "1.1.14"
1+
(defproject io.factorhouse/slipway-jetty11 "1.1.15"
22

33
:description "A Clojure Companion for Jetty"
44

@@ -12,7 +12,7 @@
1212
[clj-http "3.13.0"]
1313
[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.
1414
[ring/ring-anti-forgery "1.3.1"]
15-
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
15+
[metosin/reitit-ring "0.7.1" :exclusions [ring/ring-core]]]
1616
:resource-paths ["dev-resources" "common/dev-resources"]
1717
:plugins [[lein-cljfmt "0.9.2"]]}
1818
:smoke {:pedantic? :abort}}
@@ -25,11 +25,11 @@
2525
[org.clojure/tools.logging "1.3.0"]
2626
[ring/ring-servlet "1.9.6"]
2727
[com.taoensso/sente "1.17.0"]
28-
[org.eclipse.jetty.websocket/websocket-jetty-api "11.0.21"]
29-
[org.eclipse.jetty.websocket/websocket-jetty-server "11.0.21" :exclusions [org.slf4j/slf4j-api]]
30-
[org.eclipse.jetty.websocket/websocket-servlet "11.0.21" :exclusions [org.slf4j/slf4j-api]]
31-
[org.eclipse.jetty/jetty-server "11.0.21" :exclusions [org.slf4j/slf4j-api]]
32-
[org.eclipse.jetty/jetty-jaas "11.0.21" :exclusions [org.slf4j/slf4j-api]]
28+
[org.eclipse.jetty.websocket/websocket-jetty-api "11.0.22"]
29+
[org.eclipse.jetty.websocket/websocket-jetty-server "11.0.22" :exclusions [org.slf4j/slf4j-api]]
30+
[org.eclipse.jetty.websocket/websocket-servlet "11.0.22" :exclusions [org.slf4j/slf4j-api]]
31+
[org.eclipse.jetty/jetty-server "11.0.22" :exclusions [org.slf4j/slf4j-api]]
32+
[org.eclipse.jetty/jetty-jaas "11.0.22" :exclusions [org.slf4j/slf4j-api]]
3333
[org.slf4j/slf4j-api "2.0.13"]]
3434

3535
:source-paths ["common/src" "common-jetty1x/src" "common-jakarta/src"]

‎slipway-jetty9/project.clj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject io.factorhouse/slipway-jetty9 "1.1.14"
1+
(defproject io.factorhouse/slipway-jetty9 "1.1.15"
22

33
:description "A Clojure Companion for Jetty"
44

@@ -12,7 +12,7 @@
1212
[clj-http "3.13.0"]
1313
[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.
1414
[ring/ring-anti-forgery "1.3.1"]
15-
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
15+
[metosin/reitit-ring "0.7.1" :exclusions [ring/ring-core]]]
1616
:resource-paths ["dev-resources" "common/dev-resources"]
1717
:plugins [[lein-cljfmt "0.9.2"]]}
1818
:smoke {:pedantic? :abort}}
@@ -25,10 +25,10 @@
2525
[org.clojure/tools.logging "1.3.0"]
2626
[ring/ring-servlet "1.9.6"]
2727
[com.taoensso/sente "1.17.0"]
28-
[org.eclipse.jetty/jetty-server "9.4.54.v20240208"]
29-
[org.eclipse.jetty.websocket/websocket-server "9.4.54.v20240208"]
30-
[org.eclipse.jetty.websocket/websocket-servlet "9.4.54.v20240208"]
31-
[org.eclipse.jetty/jetty-jaas "9.4.54.v20240208"]
28+
[org.eclipse.jetty/jetty-server "9.4.55.v20240627"]
29+
[org.eclipse.jetty.websocket/websocket-server "9.4.55.v20240627"]
30+
[org.eclipse.jetty.websocket/websocket-servlet "9.4.55.v20240627"]
31+
[org.eclipse.jetty/jetty-jaas "9.4.55.v20240627"]
3232
[org.slf4j/slf4j-api "2.0.13"]]
3333

3434
:source-paths ["src" "common/src" "common-javax/src"]

0 commit comments

Comments
 (0)