Merge pull request #78 from pmonks/dev

pmonks · Nov 20, 2023 · 06b8ea1 · 06b8ea1
2 parents 786eb16 + 32ecb3d
commit 06b8ea1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/deps.edn b/deps.edn
@@ -25,16 +25,16 @@
     io.github.clojure/tools.build              {:mvn/version "0.9.6" :exclusions [org.slf4j/slf4j-nop]}
     com.github.pmonks/tools-convenience        {:mvn/version "1.0.142"}
     com.github.pmonks/tools-pom                {:mvn/version "1.0.127"}
-    com.github.pmonks/tools-licenses           {:mvn/version "2.0.172"}
+    com.github.pmonks/tools-licenses           {:mvn/version "2.0.175"}
     clj-kondo/clj-kondo                        {:mvn/version "2023.10.20"}
 
     ; Dynamic dependencies - any time any of these changes it MUST ALSO BE CHANGED IN pbr.tasks!!
-    org.apache.logging.log4j/log4j-api         {:mvn/version "2.21.1"}    ; Use log4j2 for logging, since logback has become a huge pita in recent times...
-    org.apache.logging.log4j/log4j-core        {:mvn/version "2.21.1"}
-    org.apache.logging.log4j/log4j-jul         {:mvn/version "2.21.1"}    ; Java utils clogging bridge
-    org.apache.logging.log4j/log4j-jcl         {:mvn/version "2.21.1"}    ; Apache commons clogging bridge
-    org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.21.1"}    ; SLF4J clogging bridge
-    org.apache.logging.log4j/log4j-1.2-api     {:mvn/version "2.21.1"}    ; log4j1 clogging bridge
+    org.apache.logging.log4j/log4j-api         {:mvn/version "2.22.0"}    ; Use log4j2 for logging, since logback has become a huge pita in recent times...
+    org.apache.logging.log4j/log4j-core        {:mvn/version "2.22.0"}
+    org.apache.logging.log4j/log4j-jul         {:mvn/version "2.22.0"}    ; Java utils clogging bridge
+    org.apache.logging.log4j/log4j-jcl         {:mvn/version "2.22.0"}    ; Apache commons clogging bridge
+    org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.22.0"}    ; SLF4J clogging bridge
+    org.apache.logging.log4j/log4j-1.2-api     {:mvn/version "2.22.0"}    ; log4j1 clogging bridge
 ;    org.slf4j/slf4j-nop                        {:mvn/version "2.0.9"}    ; Note: used for some commands invoked as sub-processes, but can't be used here or it will shadow log4j2
     jonase/eastwood                            {:mvn/version "1.4.0"}     ; Note: 1.4.2 uses a version of org.ow2.asm/asm that's incompatible with clj-kondo's dependent version
     codox/codox                                {:mvn/version "0.10.8"}

diff --git a/src/pbr/build.clj b/src/pbr/build.clj
@@ -115,20 +115,20 @@ clojure -A:deps -T:build help/doc"
     (require 'tools-licenses.tasks)
 
     (eval   ; I have no clue why this is necessary, unless tools.build is AOT compiling this ns or something weird...
-    '(defn licenses
-       "Attempts to list all licenses for the transitive set of dependencies of the project, as SPDX license identifiers."
-       [opts]
-       (-> opts
-           set-opts
-           tools-licenses.tasks/licenses)))
+      '(defn licenses
+         "Attempts to list all licenses for the transitive set of dependencies of the project, as SPDX license identifiers."
+         [opts]
+         (-> opts
+             set-opts
+             tools-licenses.tasks/licenses)))
 
     (eval   ; I have no clue why this is necessary, unless tools.build is AOT compiling this ns or something weird...
-    '(defn check-asf-policy
-       "Checks this project's dependencies' licenses against the ASF's 3rd party license policy (https://www.apache.org/legal/resolved.html)."
-       [opts]
-       (-> opts
-           set-opts
-           tools-licenses.tasks/check-asf-policy))))
+      '(defn check-asf-policy
+         "Checks this project's dependencies' licenses against the ASF's 3rd party license policy (https://www.apache.org/legal/resolved.html)."
+         [opts]
+         (-> opts
+             set-opts
+             tools-licenses.tasks/check-asf-policy))))
   (println "⚠️ Running on an old JVM (< v11) - some functionality is unavailable."))
 
 (defn check-release

diff --git a/src/pbr/tasks.clj b/src/pbr/tasks.clj
@@ -33,7 +33,7 @@
 (def ^:private ver-clj-check   {:git/sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"})
 (def ^:private ver-test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"})
 (def ^:private ver-slf4j       {:mvn/version "2.0.9"})
-(def ^:private ver-log4j2      {:mvn/version "2.21.1"})
+(def ^:private ver-log4j2      {:mvn/version "2.22.0"})
 (def ^:private ver-eastwood    {:mvn/version "1.4.0"})
 (def ^:private ver-codox       {:mvn/version "0.10.8"})
 (def ^:private ver-antq        {:mvn/version "2.7.1133"})