Skip to content

Commit dcec160

Browse files
d-t-wd-t-w
authored
Merge pull request #18 from factorhouse/update-jetty
update-jetty
2 parents c564454 + 8aecd27 commit dcec160

8 files changed

+42
-68
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
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
5+
6+
Bump to latest Jetty version (11.0.21 or equivalent)
7+
48
## [1.1.13] - 2024-02-23
59

610
Bump to latest Jetty9 sponsored support version (9.4.54.v20240208) other Jetty versions remain the same at 11.0.20 or equivalent.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
| Jetty Version | Current Jetty Dependency | Clojars Project |
88
| ------------- | ------------------------ | --------------- |
99
| 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.20 | [![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.20 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty11.svg)](https://clojars.org/io.factorhouse/slipway-jetty11) |
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) |
1212
| Jetty 12 | - | Available once Jetty 12 stabilises. |
1313

1414
----

‎slipway-jetty10/dependency-check-suppressions.xml

-10
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,4 @@
77
<packageUrl regex="true">^pkg:maven/commons\-fileupload/commons\-fileupload@.*$</packageUrl>
88
<cve>CVE-2023-24998</cve>
99
</suppress>
10-
<suppress>
11-
<notes>Clojure false positive</notes>
12-
<packageUrl regex="true">^pkg:maven/org\.clojure/.*$</packageUrl>
13-
<cve>CVE-2017-20189</cve>
14-
</suppress>
15-
<suppress>
16-
<notes>Clojure false positive</notes>
17-
<packageUrl regex="true">^pkg:maven/ring/ring\-codec@.*$</packageUrl>
18-
<cve>CVE-2017-20189</cve>
19-
</suppress>
2010
</suppressions>

‎slipway-jetty10/project.clj

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

33
:description "A Clojure Companion for Jetty"
44

@@ -7,30 +7,30 @@
77
:license {:name "MIT License"
88
:url "https://github.com/factorhouse/slipway/blob/main/LICENSE"}
99

10-
:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.16.1"] ;; required for internal inconsistency within clj-kondo, kept at latest for CVE avoidance
10+
: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
1111
[clj-kondo "2023.12.15"]
12-
[clj-http "3.12.3" :exclusions [commons-io commons-codec]]
13-
[ch.qos.logback/logback-classic "1.3.14"]
14-
[ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random crypto-equality]]
15-
[metosin/reitit-ring "0.6.0"]]
12+
[clj-http "3.13.0"]
13+
[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.
14+
[ring/ring-anti-forgery "1.3.1"]
15+
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
1616
:resource-paths ["dev-resources" "common/dev-resources"]
17-
:plugins [[lein-cljfmt "0.8.2"]]}
17+
:plugins [[lein-cljfmt "0.9.2"]]}
1818
:smoke {:pedantic? :abort}}
1919

2020
:aliases {"check" ["with-profile" "+smoke" "check"]
2121
"kondo" ["with-profile" "+smoke" "run" "-m" "clj-kondo.main" "--lint" "common/src:common-jetty1x/src:test:common/test" "--parallel"]
2222
"fmt" ["with-profile" "+smoke" "cljfmt" "check"]}
2323

24-
:dependencies [[org.clojure/clojure "1.11.2"]
24+
:dependencies [[org.clojure/clojure "1.11.3"]
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.20"]
29-
[org.eclipse.jetty.websocket/websocket-jetty-server "10.0.20" :exclusions [org.slf4j/slf4j-api]]
30-
[org.eclipse.jetty.websocket/websocket-servlet "10.0.20" :exclusions [org.slf4j/slf4j-api]]
31-
[org.eclipse.jetty/jetty-server "10.0.20" :exclusions [org.slf4j/slf4j-api]]
32-
[org.eclipse.jetty/jetty-jaas "10.0.20" :exclusions [org.slf4j/slf4j-api]]
33-
[org.slf4j/slf4j-api "2.0.12"]]
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]]
33+
[org.slf4j/slf4j-api "2.0.13"]]
3434

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

‎slipway-jetty11/dependency-check-suppressions.xml

-10
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,4 @@
77
<packageUrl regex="true">^pkg:maven/commons\-fileupload/commons\-fileupload@.*$</packageUrl>
88
<cve>CVE-2023-24998</cve>
99
</suppress>
10-
<suppress>
11-
<notes>Clojure false positive</notes>
12-
<packageUrl regex="true">^pkg:maven/org\.clojure/.*$</packageUrl>
13-
<cve>CVE-2017-20189</cve>
14-
</suppress>
15-
<suppress>
16-
<notes>Clojure false positive</notes>
17-
<packageUrl regex="true">^pkg:maven/ring/ring\-codec@.*$</packageUrl>
18-
<cve>CVE-2017-20189</cve>
19-
</suppress>
2010
</suppressions>

‎slipway-jetty11/project.clj

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

33
:description "A Clojure Companion for Jetty"
44

@@ -7,30 +7,30 @@
77
:license {:name "MIT License"
88
:url "https://github.com/factorhouse/slipway/blob/main/LICENSE"}
99

10-
:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.16.1"] ;; required for internal inconsistency within clj-kondo, kept at latest for CVE avoidance
10+
: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
1111
[clj-kondo "2023.12.15"]
12-
[clj-http "3.12.3" :exclusions [commons-io commons-codec]]
13-
[ch.qos.logback/logback-classic "1.3.14"]
14-
[ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random crypto-equality]]
15-
[metosin/reitit-ring "0.6.0"]]
12+
[clj-http "3.13.0"]
13+
[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.
14+
[ring/ring-anti-forgery "1.3.1"]
15+
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
1616
:resource-paths ["dev-resources" "common/dev-resources"]
17-
:plugins [[lein-cljfmt "0.8.2"]]}
17+
:plugins [[lein-cljfmt "0.9.2"]]}
1818
:smoke {:pedantic? :abort}}
1919

2020
:aliases {"check" ["with-profile" "+smoke" "check"]
2121
"kondo" ["with-profile" "+smoke" "run" "-m" "clj-kondo.main" "--lint" "common/src:common-jetty1x/src:test:common/test" "--parallel"]
2222
"fmt" ["with-profile" "+smoke" "cljfmt" "check"]}
2323

24-
:dependencies [[org.clojure/clojure "1.11.2"]
24+
:dependencies [[org.clojure/clojure "1.11.3"]
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.20"]
29-
[org.eclipse.jetty.websocket/websocket-jetty-server "11.0.20" :exclusions [org.slf4j/slf4j-api]]
30-
[org.eclipse.jetty.websocket/websocket-servlet "11.0.20" :exclusions [org.slf4j/slf4j-api]]
31-
[org.eclipse.jetty/jetty-server "11.0.20" :exclusions [org.slf4j/slf4j-api]]
32-
[org.eclipse.jetty/jetty-jaas "11.0.20" :exclusions [org.slf4j/slf4j-api]]
33-
[org.slf4j/slf4j-api "2.0.12"]]
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]]
33+
[org.slf4j/slf4j-api "2.0.13"]]
3434

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

‎slipway-jetty9/dependency-check-suppressions.xml

-10
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,4 @@
77
<packageUrl regex="true">^pkg:maven/commons\-fileupload/commons\-fileupload@.*$</packageUrl>
88
<cve>CVE-2023-24998</cve>
99
</suppress>
10-
<suppress>
11-
<notes>Clojure false positive</notes>
12-
<packageUrl regex="true">^pkg:maven/org\.clojure/.*$</packageUrl>
13-
<cve>CVE-2017-20189</cve>
14-
</suppress>
15-
<suppress>
16-
<notes>Clojure false positive</notes>
17-
<packageUrl regex="true">^pkg:maven/ring/ring\-codec@.*$</packageUrl>
18-
<cve>CVE-2017-20189</cve>
19-
</suppress>
2010
</suppressions>

‎slipway-jetty9/project.clj

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

33
:description "A Clojure Companion for Jetty"
44

@@ -7,12 +7,12 @@
77
:license {:name "MIT License"
88
:url "https://github.com/factorhosue/slipway/blob/main/LICENSE"}
99

10-
:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.16.1"] ;; required for internal inconsistency within clj-kondo, kept at latest for CVE avoidance
10+
: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
1111
[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
12-
[clj-http "3.12.3" :exclusions [commons-io commons-codec]]
13-
[ch.qos.logback/logback-classic "1.3.14"] ;; 1.3 branch is for Java EE / Java 8 so we will keep aligned here.
14-
[ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random crypto-equality]]
15-
[metosin/reitit-ring "0.6.0"]]
12+
[clj-http "3.13.0"]
13+
[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.
14+
[ring/ring-anti-forgery "1.3.1"]
15+
[metosin/reitit-ring "0.7.0" :exclusions [ring/ring-core]]]
1616
:resource-paths ["dev-resources" "common/dev-resources"]
1717
:plugins [[lein-cljfmt "0.9.2"]]}
1818
:smoke {:pedantic? :abort}}
@@ -21,15 +21,15 @@
2121
"kondo" ["with-profile" "+smoke" "run" "-m" "clj-kondo.main" "--lint" "src:common/src:test:common/test" "--parallel"]
2222
"fmt" ["with-profile" "+smoke" "cljfmt" "check"]}
2323

24-
:dependencies [[org.clojure/clojure "1.11.2"]
24+
:dependencies [[org.clojure/clojure "1.11.3"]
2525
[org.clojure/tools.logging "1.3.0"]
2626
[ring/ring-servlet "1.9.6"]
2727
[com.taoensso/sente "1.17.0"]
2828
[org.eclipse.jetty/jetty-server "9.4.54.v20240208"]
2929
[org.eclipse.jetty.websocket/websocket-server "9.4.54.v20240208"]
3030
[org.eclipse.jetty.websocket/websocket-servlet "9.4.54.v20240208"]
3131
[org.eclipse.jetty/jetty-jaas "9.4.54.v20240208"]
32-
[org.slf4j/slf4j-api "2.0.12"]]
32+
[org.slf4j/slf4j-api "2.0.13"]]
3333

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

0 commit comments

Comments
 (0)