inline :defaults

Author: frenchy64

Makefile

@@ -1,30 +1,30 @@
 .PHONY: check
 check:
-	clojure -M:defaults:check
+	clojure -M:check
 
 .PHONY: lint
 lint:
 	./bin/clj-kondo --lint src test
 
 .PHONY: migrate-db
 migrate-db:
-	clojure -M:defaults:migrate-db
+	clojure -M:migrate-db
 
 .PHONY: nvd-check
 nvd-check:
 	./bin/nvd-check
 
 .PHONY: prep-deps
 prep-deps:
-	clojure -A:defaults -X:deps prep
+	clojure -X:deps prep
 
 .PHONY: repl
 repl:
-	clj -A:defaults:dev
+	clj -A:dev
 
 .PHONY: setup-dev-repo
 setup-dev-repo:
-	clojure -M:defaults:setup-dev-repo
+	clojure -M:setup-dev-repo
 
 .PHONY: tag-release
 tag-release:

README.md

@@ -39,7 +39,7 @@ Development
 
 ### Development system
 
-To begin developing, start with a REPL (Note: if you are instead starting a repl from your editor, you will need to include the `:default` and `:dev` aliases).
+To begin developing, start with a REPL (Note: if you are instead starting a repl from your editor, you will need to include the `:dev` alias).
 
 ```sh
 make repl

bin/kaocha

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-clojure -M:defaults:dev:test "$@"
+clojure -M:dev:test "$@"

bin/nvd-check

@@ -17,5 +17,5 @@ clojure -Ttools install nvd-clojure/nvd-clojure '{:mvn/version "5.0.0"}' :as nvd
 
 cd "$ROOT"
 clojure -J-Dclojure.main.report=stderr -Tnvd nvd.task/check \
-    :classpath '"'"$(clojure -Spath -A:defaults)"'"' \
+    :classpath '"'"$(clojure -Spath)"'"' \
     :config-filename '".nvd-clojure.edn"'

build.clj

@@ -6,7 +6,7 @@
     LocalDate)))
 
 (def class-dir "target/classes")
-(def basis (b/create-basis {:aliases [:defaults]}))
+(def basis (b/create-basis))
 (def uber-file "target/clojars-web-standalone.jar")
 
 (defn clean [_]

deps.edn

@@ -85,24 +85,22 @@
   ring-jetty-component/ring-jetty-component {:mvn/version "0.3.1"}
   ring-middleware-format/ring-middleware-format {:mvn/version "0.7.5"}
 
-  valip/valip {:mvn/version "0.2.0"}}
-
- :aliases {:defaults
-           ;; We use override-deps to address CVEs
-           {:override-deps
-            {;; Addresses CVE-2022-42004, CVE-2022-42003, CVE-2021-46877, CVE-2020-36518
-             com.fasterxml.jackson.core/jackson-databind {:mvn/version "2.15.2"}
-             ;; Addresses CVE-2019-10086, CVE-2014-0114, CVE-2025-48734
-             commons-beanutils/commons-beanutils {:mvn/version "1.11.0"}
-             ;; Addresses CVE-2015-6420
-             commons-collections/commons-collections {:mvn/version "3.2.2"}
-
-             ;; Addresses CVE-2015-0886
-             org.mindrot/jbcrypt {:mvn/version "0.4"}
-             ;; Addresses CVE-2022-25857, CVE-2022-38749, CVE-2022-41854, CVE-2022-38751, CVE-2022-38752, CVE-2022-38750
-             org.yaml/snakeyaml {:mvn/version "1.33"}}}
-
-           :build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.5"}}
+  valip/valip {:mvn/version "0.2.0"}
+
+  ;; # Address CVEs
+  ;; Addresses CVE-2022-42004, CVE-2022-42003, CVE-2021-46877, CVE-2020-36518
+  com.fasterxml.jackson.core/jackson-databind {:mvn/version "2.15.2"}
+  ;; Addresses CVE-2019-10086, CVE-2014-0114, CVE-2025-48734
+  commons-beanutils/commons-beanutils {:mvn/version "1.11.0"}
+  ;; Addresses CVE-2015-6420
+  commons-collections/commons-collections {:mvn/version "3.2.2"}
+
+  ;; Addresses CVE-2015-0886
+  org.mindrot/jbcrypt {:mvn/version "0.4"}
+  ;; Addresses CVE-2022-25857, CVE-2022-38749, CVE-2022-41854, CVE-2022-38751, CVE-2022-38752, CVE-2022-38750
+  org.yaml/snakeyaml {:mvn/version "1.33"}}
+
+ :aliases {:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.5"}}
                    :ns-default build}
 
            :check {:extra-deps {athos/clj-check {:git/url "https://github.com/athos/clj-check.git"