Merge pull request #96 from pmonks/dev

Release 2.0.424
pmonks · Jul 3, 2024 · 4f8e766 · 4f8e766
2 parents 7a8316c + 5e37b80
commit 4f8e766
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/deps.edn b/deps.edn
@@ -22,7 +22,7 @@
     org.clojure/tools.deps                     {:mvn/version "0.19.1432"}
     org.clojure/data.json                      {:mvn/version "2.5.0"}
     slipset/deps-deploy                        {:mvn/version "0.2.2" :exclusions [org.slf4j/slf4j-nop ch.qos.logback/logback-classic]}
-    com.github.pmonks/tools-convenience        {:mvn/version "1.0.154"}
+    com.github.pmonks/tools-convenience        {:mvn/version "1.0.157"}
     com.github.pmonks/tools-pom                {:mvn/version "1.0.139"}
     com.github.pmonks/tools-licenses           {:mvn/version "2.0.243"}
     clj-kondo/clj-kondo                        {:mvn/version "2024.05.24"}

diff --git a/src/pbr/tasks.clj b/src/pbr/tasks.clj
@@ -380,8 +380,9 @@
   (let [output-dir         (str (target-dir opts) "/nvd")
         nvd-opts           (merge {:output-dir (str "../" output-dir)}   ; Write to the project's actual target directory
                                   (:nvd opts))
+        full-classpath     (s/trim (:out (tc/clojure-silent "-Spath" "-A:any:aliases")))
         classpath-to-check (s/replace
-                             (s/replace (s/trim (:out (tc/clojure-silent "-Spath" "-A:any:aliases")))
+                             (s/replace full-classpath
                                         #":[^:]*/org/owasp/dependency-check-core/[\d\.]+/dependency-check-core-[\d\.]+.jar:"   ; Remove dependency-check jar, if present
                                         ":")
                              #":[^:]*/nvd-clojure/nvd-clojure/[\d\.]+/nvd-clojure-[\d\.]+\.jar:"                               ; Remove nvd-clojure jar, if present
@@ -397,6 +398,9 @@
                              :name           (name      (:lib opts))
                              :version        (:version opts)
                              :nvd            nvd-opts}))
+      (when tc/debug
+        (println "In .nvd/, about to invoke: clojure -J-Dclojure.main.report=stderr -Srepro -Sdeps '{:deps {nvd-clojure/nvd-clojure {:mvn/version \"RELEASE\"}}}' -M -m nvd.task.check nvd-options.json"
+                 classpath-to-check))
       (let [nvd-result (sh/sh "clojure"
                               "-J-Dclojure.main.report=stderr"
                               "-Srepro"