Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump-jetty #15

Merged
merged 6 commits into from
Feb 23, 2024
Merged

bump-jetty #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40fd473
bump jetty9 version and minor deps
d-t-w Feb 23, 2024
0a54d9f
bump back kondo with a comment explaining avoidance of https://github…
d-t-w Feb 23, 2024
02c5984
comment on kondo bump back
d-t-w Feb 23, 2024
2e22fb9
update jetty10 minor deps and bump version
d-t-w Feb 23, 2024
24ec062
update jetty11 minor deps and bump version
d-t-w Feb 23, 2024
687323d
update changelog and readme
d-t-w Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13] - 2024-02-23

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

## [1.1.12] - 2024-02-05

Bump to latest Jetty version (11.0.20 or equivalent)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

| Jetty Version | Current Jetty Dependency | Clojars Project |
| ------------- | ------------------------ | --------------- |
| 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 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.20 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty10.svg)](https://clojars.org/io.factorhouse/slipway-jetty10) |
| 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) |
| Jetty 12 | - | Available once Jetty 12 stabilises. |
Expand Down
6 changes: 3 additions & 3 deletions slipway-jetty10/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject io.factorhouse/slipway-jetty10 "1.1.12"
(defproject io.factorhouse/slipway-jetty10 "1.1.13"

:description "A Clojure Companion for Jetty"

Expand All @@ -22,15 +22,15 @@
"fmt" ["with-profile" "+smoke" "cljfmt" "check"]}

:dependencies [[org.clojure/clojure "1.11.1"]
[org.clojure/tools.logging "1.2.4"]
[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.20"]
[org.eclipse.jetty.websocket/websocket-jetty-server "10.0.20" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty.websocket/websocket-servlet "10.0.20" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-server "10.0.20" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-jaas "10.0.20" :exclusions [org.slf4j/slf4j-api]]
[org.slf4j/slf4j-api "2.0.11"]]
[org.slf4j/slf4j-api "2.0.12"]]

:source-paths ["common/src" "common-jetty1x/src" "common-javax/src"]
:test-paths ["test" "common/test"])
6 changes: 3 additions & 3 deletions slipway-jetty11/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject io.factorhouse/slipway-jetty11 "1.1.12"
(defproject io.factorhouse/slipway-jetty11 "1.1.13"

:description "A Clojure Companion for Jetty"

Expand All @@ -22,15 +22,15 @@
"fmt" ["with-profile" "+smoke" "cljfmt" "check"]}

:dependencies [[org.clojure/clojure "1.11.1"]
[org.clojure/tools.logging "1.2.4"]
[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.20"]
[org.eclipse.jetty.websocket/websocket-jetty-server "11.0.20" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty.websocket/websocket-servlet "11.0.20" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-server "11.0.20" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-jaas "11.0.20" :exclusions [org.slf4j/slf4j-api]]
[org.slf4j/slf4j-api "2.0.11"]]
[org.slf4j/slf4j-api "2.0.12"]]

:source-paths ["common/src" "common-jetty1x/src" "common-jakarta/src"]
:test-paths ["test" "common/test"])
22 changes: 11 additions & 11 deletions slipway-jetty9/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject io.factorhouse/slipway-jetty9 "1.1.12"
(defproject io.factorhouse/slipway-jetty9 "1.1.13"

:description "A Clojure Companion for Jetty"

Expand All @@ -8,28 +8,28 @@
:url "https://github.com/factorhosue/slipway/blob/main/LICENSE"}

: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
[clj-kondo "2023.12.15"]
[clj-http "3.12.3" :exclusions [commons-io]]
[ch.qos.logback/logback-classic "1.3.14"]
[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
[clj-http "3.12.3" :exclusions [commons-io commons-codec]]
[ch.qos.logback/logback-classic "1.3.14"] ;; 1.3 branch is for Java EE / Java 8 so we will keep aligned here.
[ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random crypto-equality]]
[metosin/reitit-ring "0.6.0"]]
:resource-paths ["dev-resources" "common/dev-resources"]
:plugins [[lein-cljfmt "0.8.2"]]}
:plugins [[lein-cljfmt "0.9.2"]]}
:smoke {:pedantic? :abort}}

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

:dependencies [[org.clojure/clojure "1.11.1"]
[org.clojure/tools.logging "1.2.4"]
[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.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.11"]]
[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.slf4j/slf4j-api "2.0.12"]]

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