Skip to content

Commit 9352d2d

Browse files
d-t-wd-t-w
authored
Merge pull request #14 from factorhouse/update-jetty
update-jetty
2 parents cdeec5a + 6c75644 commit 9352d2d

10 files changed

+59
-25
lines changed

‎.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Setup Java8
2020
if: ${{ matrix.project == 'slipway-jetty9' }}
21-
uses: actions/setup-java@v3
21+
uses: actions/setup-java@v4
2222
with:
2323
distribution: 'temurin'
2424
java-version: '8'
2525

2626
- name: Setup Java11
2727
if: ${{ matrix.project != 'slipway-jetty9' }}
28-
uses: actions/setup-java@v3
28+
uses: actions/setup-java@v4
2929
with:
3030
distribution: 'temurin'
3131
java-version: '11'
3232

3333
- name: Install clojure tools
34-
uses: DeLaGuardo/setup-clojure@10.3
34+
uses: DeLaGuardo/setup-clojure@12.3
3535
with:
3636
lein: 'latest'
3737
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -62,8 +62,8 @@ jobs:
6262

6363
- name: Persist NVD
6464
if: always()
65-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4
6666
with:
67-
name: NVD result
67+
name: nvd-${{ matrix.project }}-${{ github.sha }}
6868
path: ./${{ matrix.project }}/dependency-check/report/*
6969
retention-days: 1

‎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-02-05
5+
6+
Bump to latest Jetty version (11.0.20 or equivalent)
7+
48
## [1.1.11] - 2024-01-08
59

610
Bump to latest Jetty version (11.0.19 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.53.v20231009 | [![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.19 | [![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.19 | [![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.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) |
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="8.4.0"
3+
VERSION="9.0.9"
44

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

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

+10
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,14 @@
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>
1020
</suppressions>

‎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.11"
1+
(defproject io.factorhouse/slipway-jetty10 "1.1.12"
22

33
:description "A Clojure Companion for Jetty"
44

@@ -25,12 +25,12 @@
2525
[org.clojure/tools.logging "1.2.4"]
2626
[ring/ring-servlet "1.9.6"]
2727
[com.taoensso/sente "1.17.0"]
28-
[org.eclipse.jetty.websocket/websocket-jetty-api "10.0.19"]
29-
[org.eclipse.jetty.websocket/websocket-jetty-server "10.0.19" :exclusions [org.slf4j/slf4j-api]]
30-
[org.eclipse.jetty.websocket/websocket-servlet "10.0.19" :exclusions [org.slf4j/slf4j-api]]
31-
[org.eclipse.jetty/jetty-server "10.0.19" :exclusions [org.slf4j/slf4j-api]]
32-
[org.eclipse.jetty/jetty-jaas "10.0.19" :exclusions [org.slf4j/slf4j-api]]
33-
[org.slf4j/slf4j-api "2.0.10"]]
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.11"]]
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,4 +7,14 @@
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>
1020
</suppressions>

‎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.11"
1+
(defproject io.factorhouse/slipway-jetty11 "1.1.12"
22

33
:description "A Clojure Companion for Jetty"
44

@@ -25,12 +25,12 @@
2525
[org.clojure/tools.logging "1.2.4"]
2626
[ring/ring-servlet "1.9.6"]
2727
[com.taoensso/sente "1.17.0"]
28-
[org.eclipse.jetty.websocket/websocket-jetty-api "11.0.19"]
29-
[org.eclipse.jetty.websocket/websocket-jetty-server "11.0.19" :exclusions [org.slf4j/slf4j-api]]
30-
[org.eclipse.jetty.websocket/websocket-servlet "11.0.19" :exclusions [org.slf4j/slf4j-api]]
31-
[org.eclipse.jetty/jetty-server "11.0.19" :exclusions [org.slf4j/slf4j-api]]
32-
[org.eclipse.jetty/jetty-jaas "11.0.19" :exclusions [org.slf4j/slf4j-api]]
33-
[org.slf4j/slf4j-api "2.0.10"]]
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.11"]]
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,4 +7,14 @@
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>
1020
</suppressions>

‎slipway-jetty9/project.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject io.factorhouse/slipway-jetty9 "1.1.11"
1+
(defproject io.factorhouse/slipway-jetty9 "1.1.12"
22

33
:description "A Clojure Companion for Jetty"
44

@@ -29,7 +29,7 @@
2929
[org.eclipse.jetty.websocket/websocket-server "9.4.53.v20231009"]
3030
[org.eclipse.jetty.websocket/websocket-servlet "9.4.53.v20231009"]
3131
[org.eclipse.jetty/jetty-jaas "9.4.53.v20231009"]
32-
[org.slf4j/slf4j-api "2.0.10"]]
32+
[org.slf4j/slf4j-api "2.0.11"]]
3333

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

0 commit comments

Comments
 (0)