Merge pull request #15 from factorhouse/update-jetty

bump-jetty
factorhouse · Feb 23, 2024 · b905b0f · b905b0f
2 parents e0f772b + 687323d
commit b905b0f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)

diff --git a/README.md b/README.md
@@ -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. |

diff --git a/slipway-jetty10/project.clj b/slipway-jetty10/project.clj
@@ -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"
 
@@ -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"])
diff --git a/slipway-jetty11/project.clj b/slipway-jetty11/project.clj
@@ -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"
 
@@ -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"])
diff --git a/slipway-jetty9/project.clj b/slipway-jetty9/project.clj
@@ -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"
 
@@ -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"]