Skip to content

Commit 1e6d95f

Browse files
rurorujj
ruroru
and
jj
authored
Update luminus to use jdk 25 (#10235)
* Cleanup luminus deps * update jdk version to 25 * update deps --------- Co-authored-by: jj <[email protected]>
1 parent c1d18c5 commit 1e6d95f

File tree

7 files changed

+38
-68
lines changed

7 files changed

+38
-68
lines changed

‎frameworks/Clojure/luminus/luminus.dockerfile‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
FROM clojure:lein-2.8.1
1+
FROM clojure:lein as lein
22
WORKDIR /luminus
33
COPY env env
4+
COPY project.clj project.clj
45
COPY resources resources
56
COPY src src
6-
COPY test test
7-
COPY Procfile Procfile
8-
COPY project.clj project.clj
97
RUN lein uberjar
108

11-
EXPOSE 3000
9+
FROM openjdk:25-jdk-slim
10+
WORKDIR /luminus
11+
COPY --from=lein /luminus/target/hello.jar app.jar
12+
13+
EXPOSE 8080
1214

13-
CMD ["java", "-server", "-jar", "target/hello.jar"]
15+
CMD ["java", "-server", "-XX:+UseParallelGC", "-jar", "app.jar"]

‎frameworks/Clojure/luminus/project.clj‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,21 @@
33
:description "TechEmpower Luminus benchmark"
44
:url "https://github.com/TechEmpower/FrameworkBenchmarks"
55

6-
:dependencies [[org.clojure/clojure "1.10.0"]
7-
[cheshire "5.7.0"]
8-
[selmer "1.10.7"]
9-
[markdown-clj "0.9.98"]
10-
[metosin/muuntaja "0.2.1"]
11-
[metosin/ring-http-response "0.8.2"]
12-
[bouncer "1.0.1"]
13-
[org.webjars/bootstrap "4.2.1"]
14-
[org.webjars/font-awesome "5.6.1"]
15-
[org.webjars.bower/tether "1.4.4"]
16-
[org.webjars/jquery "3.3.1"]
17-
[org.clojure/tools.logging "0.4.1"]
18-
[com.taoensso/tower "3.0.2"]
19-
[compojure "1.5.2"]
20-
[ring-webjars "0.1.1"]
21-
[ring/ring-defaults "0.2.3"]
22-
[mount "0.1.11"]
23-
[cprop "0.1.10"]
24-
[org.clojure/tools.cli "0.3.5"]
25-
[luminus-nrepl "0.1.4"]
26-
[org.webjars/webjars-locator-jboss-vfs "0.1.0"]
27-
[luminus-immutant "0.2.3"]
28-
[luminus-migrations "0.3.0"]
29-
[conman "0.6.3"]
30-
[org.postgresql/postgresql "42.2.5"]
31-
[luminus-log4j "0.1.5"]]
6+
:dependencies [[org.clojure/clojure "1.12.3"]
7+
[cheshire "6.1.0"]
8+
[selmer "1.12.67"]
9+
[metosin/ring-http-response "0.9.5"]
10+
[org.webjars/bootstrap "5.3.8"]
11+
[org.clojure/tools.logging "1.3.0"]
12+
[compojure "1.7.2"]
13+
[mount "0.1.23"]
14+
[cprop "0.1.21"]
15+
[org.clojure/tools.cli "1.2.245"]
16+
[luminus-immutant "0.2.5"]
17+
[luminus-migrations "0.7.5"]
18+
[conman "0.9.6"]
19+
[org.postgresql/postgresql "42.7.8"]
20+
[luminus-log4j "0.1.7"]]
3221

3322
:min-lein-version "2.0.0"
3423

@@ -39,8 +28,6 @@
3928
:main hello.core
4029
:migratus {:store :database :db ~(get (System/getenv) "DATABASE_URL")}
4130

42-
:plugins [[lein-cprop "1.0.1"]
43-
[migratus-lein "0.2.6"]]
4431
:profiles
4532
{:uberjar {:omit-source true
4633
:jvm-opts ["-D\"clojure.compiler.direct-linking=true\""]

‎frameworks/Clojure/luminus/src/clj/hello/core.clj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
(ns hello.core
22
(:require [hello.handler :as handler]
3-
[luminus.repl-server :as repl]
43
[luminus.http-server :as http]
54
[hello.config :refer [env]]
65
[clojure.tools.cli :refer [parse-opts]]
@@ -28,14 +27,6 @@
2827
:stop
2928
(http/stop http-server))
3029

31-
(mount/defstate repl-server
32-
:start
33-
(when-let [nrepl-port (env :nrepl-port)]
34-
(repl/start {:port nrepl-port}))
35-
:stop
36-
(when repl-server
37-
(repl/stop repl-server)))
38-
3930
(defn stop-app []
4031
(doseq [component (:stopped (mount/stop))]
4132
(log/info component "stopped"))

‎frameworks/Clojure/luminus/src/clj/hello/db/core.clj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
(ns hello.db.core
22
(:require
3-
[cheshire.core :refer [generate-string parse-string]]
4-
[clojure.java.jdbc :as jdbc]
53
[conman.core :as conman]
64
[hello.config :refer [env]]
7-
[mount.core :refer [defstate]]))
5+
[mount.core :refer [defstate]])
6+
(:import (java.sql BatchUpdateException)))
87

98
(defstate ^:dynamic *db*
109
:start (conman/connect!
@@ -53,7 +52,7 @@
5352
(let [w {:id id :randomnumber (unchecked-inc ^long (rand-int 9999))}]
5453
(try
5554
(update-world! w)
56-
(catch java.sql.BatchUpdateException e
55+
(catch BatchUpdateException e
5756
(throw (.getNextException e))))
5857
w))
5958

‎frameworks/Clojure/luminus/src/clj/hello/handler.clj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
(ns hello.handler
2-
(:require [compojure.core :refer [routes wrap-routes]]
2+
(:require [compojure.core :refer [routes]]
3+
[compojure.route :as route]
34
[hello.layout :refer [error-page]]
4-
[hello.routes.home :refer [default-routes io-routes]]
5-
[compojure.route :as route]))
5+
[hello.routes.home :refer [default-routes io-routes]]))
66

77
(def default-handler
88
(routes

‎frameworks/Clojure/luminus/src/clj/hello/layout.clj‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
(ns hello.layout
2-
(:require [selmer.parser :as parser]
3-
[selmer.filters :as filters]
4-
[markdown.core :refer [md-to-html-string]]
5-
[ring.util.http-response :refer [content-type ok]]
6-
[ring.util.anti-forgery :refer [anti-forgery-field]]
7-
[ring.middleware.anti-forgery :refer [*anti-forgery-token*]]))
2+
(:require
3+
[ring.util.http-response :refer [content-type ok]]
4+
[selmer.parser :as parser]))
85

9-
10-
(parser/set-resource-path! (clojure.java.io/resource "templates"))
11-
(parser/add-tag! :csrf-field (fn [_ _] (anti-forgery-field)))
12-
(filters/add-filter! :markdown (fn [content] [:safe (md-to-html-string content)]))
6+
(parser/set-resource-path! (clojure.java.io/resource "templates"))
137

148
(defn render
159
"renders the HTML template located relative to resources/templates"
@@ -18,9 +12,7 @@
1812
(ok
1913
(parser/render-file
2014
template
21-
(assoc params
22-
:page template
23-
:csrf-token *anti-forgery-token*)))
15+
(assoc params :page template)))
2416
"text/html; charset=utf-8"))
2517

2618
(defn error-page

‎frameworks/Clojure/luminus/src/clj/hello/routes/home.clj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
(ns hello.routes.home
2-
(:require [hello.layout :as layout]
2+
(:require [cheshire.core :refer [generate-string]]
3+
[compojure.core :refer [GET defroutes]]
34
[hello.db.core :as db]
4-
[compojure.core :refer [defroutes GET]]
5+
[hello.layout :as layout]
56
[ring.util.http-response :as response]
6-
[clojure.java.io :as io]
7-
[ring.util.response :refer [content-type]]
8-
[cheshire.core :refer [generate-string]]))
7+
[ring.util.response :refer [content-type]]))
98

109
(defn encode-json-response [rsp]
1110
(-> rsp

0 commit comments

Comments
 (0)