fixup! [mod] [taoensso#424] reintroduce fixed jetty9-ring-adapter s…

…upport
TimoKramer · Apr 11, 2023 · 5ef90bd · 5ef90bd
1 parent bb0317d
commit 5ef90bd
Show file tree

Hide file tree

Showing 3 changed files with 352 additions and 344 deletions.
diff --git a/example-project/src/example/server.clj b/example-project/src/example/server.clj
@@ -266,11 +266,9 @@
         ;;   [(aleph.netty/port server)
         ;;    (fn [] (.close ^java.io.Closeable server) (deliver p nil))])
 
-        (let [#_#_ws-handshake (:ajax-get-or-ws-handshake-fn (sente/make-channel-socket! (get-sch-adapter)))
-              server (jetty/run-jetty ring-handler {:port port
+        (let [server (jetty/run-jetty ring-handler {:port port
                                                     :async? true
-                                                    :join? false
-                                                    :websockets {"/chsk" ws-handshake}})]
+                                                    :join? false})]
           [port (fn [] (jetty/stop-server server))])
         ;; ------------------------------------------------------------------
 

diff --git a/project.clj b/project.clj
@@ -35,18 +35,30 @@
    :1.10     {:dependencies [[org.clojure/clojure "1.10.2"]]}
    :1.11     {:dependencies [[org.clojure/clojure "1.11.1"]]}
    :depr     {:jvm-opts ["-Dtaoensso.elide-deprecated=true"]}
-   :dev      [:1.11 :test :server-jvm :depr]
-   :test     {:dependencies
-              [[com.cognitect/transit-clj  "1.0.329"]
-               [com.cognitect/transit-cljs "0.8.280"]
-               [org.clojure/test.check     "1.1.1"]
-               [http-kit         "2.6.0"]
-               [org.immutant/web "2.1.10"]
-               [nginx-clojure    "0.5.3"]
-               [aleph            "0.6.1"]
-               [macchiato/core   "0.2.22"]
-               [luminus/ring-undertow-adapter  "1.3.0"]
-               [info.sunng/ring-jetty9-adapter "0.18.5"]]}}
+   :dev      [:1.11 :test :server-jvm :depr :community]
+
+   :community
+   {:dependencies
+    [[org.immutant/web               "2.1.10"]
+     [nginx-clojure                  "0.6.0"]
+     [aleph                          "0.6.1"]
+     [macchiato/core                 "0.2.22"]
+     [luminus/ring-undertow-adapter  "1.3.0"]
+     [info.sunng/ring-jetty9-adapter "0.20.0"]]
+
+    ;; For nginx-clojure on Java 17+,
+    ;; Ref. https://github.com/nginx-clojure/nginx-clojure/issues/273
+    :jvm-opts
+    ["--add-opens=java.base/java.lang=ALL-UNNAMED"
+     "--add-opens=java.base/sun.nio.cs=ALL-UNNAMED"
+     "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"]}
+
+   :test
+   {:dependencies
+    [[com.cognitect/transit-clj  "1.0.333"]
+     [com.cognitect/transit-cljs "0.8.280"]
+     [org.clojure/test.check     "1.1.1"]
+     [http-kit                   "2.6.0"]]}}
 
   :cljsbuild
   {:test-commands {"node"    ["node" :node-runner "target/main.js"]