Skip to content

Commit

Permalink
Merge pull request #12 from factorhouse/update-jetty
Browse files Browse the repository at this point in the history
update-jetty
  • Loading branch information
d-t-w authored Oct 16, 2023
2 parents 0cf3384 + 179af5c commit a745807
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 21 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
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.9] - 2023-16-05

Bump to latest Jetty version (11.0.17 or equivalent)

## [1.1.8] - 2023-09-05

- Bump to latest Jetty version (11.0.16 or equivalent)
Expand Down
6 changes: 3 additions & 3 deletions README.md
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.52.v20230823 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty9.svg)](https://clojars.org/io.factorhouse/slipway-jetty9) |
| Jetty 10 | 10.0.16 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty10.svg)](https://clojars.org/io.factorhouse/slipway-jetty10) |
| Jetty 11 | 11.0.16 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty11.svg)](https://clojars.org/io.factorhouse/slipway-jetty11) |
| 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 10 | 10.0.17 | [![Clojars Project](https://img.shields.io/clojars/v/io.factorhouse/slipway-jetty10.svg)](https://clojars.org/io.factorhouse/slipway-jetty10) |
| Jetty 11 | 11.0.17 | [![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
16 changes: 8 additions & 8 deletions slipway-jetty10/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject io.factorhouse/slipway-jetty10 "1.1.8"
(defproject io.factorhouse/slipway-jetty10 "1.1.9"

:description "A Clojure Companion for Jetty"

Expand All @@ -7,8 +7,8 @@
:license {:name "MIT License"
:url "https://github.com/factorhouse/slipway/blob/main/LICENSE"}

:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.2"] ;; required for internal inconsistency within clj-kondo
[clj-kondo "2023.07.13"]
:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.3"] ;; required for internal inconsistency within clj-kondo
[clj-kondo "2023.09.07"]
[clj-http "3.12.3" :exclusions [commons-io]]
[ch.qos.logback/logback-classic "1.3.11"]
[ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random]]
Expand All @@ -25,11 +25,11 @@
[org.clojure/tools.logging "1.2.4"]
[ring/ring-servlet "1.9.5"]
[com.taoensso/sente "1.17.0"]
[org.eclipse.jetty.websocket/websocket-jetty-api "10.0.16"]
[org.eclipse.jetty.websocket/websocket-jetty-server "10.0.16" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty.websocket/websocket-servlet "10.0.16" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-server "10.0.16" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-jaas "10.0.16" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty.websocket/websocket-jetty-api "10.0.17"]
[org.eclipse.jetty.websocket/websocket-jetty-server "10.0.17" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty.websocket/websocket-servlet "10.0.17" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-server "10.0.17" :exclusions [org.slf4j/slf4j-api]]
[org.eclipse.jetty/jetty-jaas "10.0.17" :exclusions [org.slf4j/slf4j-api]]
[org.slf4j/slf4j-api "2.0.9"]]

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

:description "A Clojure Companion for Jetty"

Expand All @@ -7,8 +7,8 @@
:license {:name "MIT License"
:url "https://github.com/factorhouse/slipway/blob/main/LICENSE"}

:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.2"] ;; required for internal inconsistency within clj-kondo
[clj-kondo "2023.07.13"]
:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.3"] ;; required for internal inconsistency within clj-kondo
[clj-kondo "2023.09.07"]
[clj-http "3.12.3" :exclusions [commons-io]]
[ch.qos.logback/logback-classic "1.3.11"]
[ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random]]
Expand Down
14 changes: 7 additions & 7 deletions slipway-jetty9/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject io.factorhouse/slipway-jetty9 "1.1.8"
(defproject io.factorhouse/slipway-jetty9 "1.1.9"

:description "A Clojure Companion for Jetty"

Expand All @@ -7,8 +7,8 @@
:license {:name "MIT License"
:url "https://github.com/factorhosue/slipway/blob/main/LICENSE"}

:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.2"] ;; required for internal inconsistency within clj-kondo
[clj-kondo "2023.07.13"]
:profiles {:dev {:dependencies [[com.fasterxml.jackson.core/jackson-core "2.15.3"] ;; required for internal inconsistency within clj-kondo
[clj-kondo "2023.09.07"]
[clj-http "3.12.3" :exclusions [commons-io]]
[ch.qos.logback/logback-classic "1.3.11"]
[ring/ring-anti-forgery "1.3.0" :exclusions [crypto-random]]
Expand All @@ -25,10 +25,10 @@
[org.clojure/tools.logging "1.2.4"]
[ring/ring-servlet "1.9.5"]
[com.taoensso/sente "1.17.0"]
[org.eclipse.jetty/jetty-server "9.4.52.v20230823"]
[org.eclipse.jetty.websocket/websocket-server "9.4.52.v20230823"]
[org.eclipse.jetty.websocket/websocket-servlet "9.4.52.v20230823"]
[org.eclipse.jetty/jetty-jaas "9.4.52.v20230823"]
[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.9"]]

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

0 comments on commit a745807

Please sign in to comment.