Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to dependency-check-core 12.1.0 & support datafeed downloads #183

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
clansi/clansi {:mvn/version "1.0.0"}
org.clojure/data.json {:mvn/version "2.5.0"}
org.slf4j/slf4j-simple {:mvn/version "2.0.10"}
org.owasp/dependency-check-core {:mvn/version "9.0.8"}
org.owasp/dependency-check-core {:mvn/version "12.1.0"}
rm-hull/table {:mvn/version "0.7.1"}
trptcolin/versioneer {:mvn/version "0.2.0"}}
:mvn/repos {"central" {:url "https://repo1.maven.org/maven2/"}
Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[clansi "1.0.0"]
[org.clojure/data.json "2.5.0"]
[org.slf4j/slf4j-simple "2.0.10"]
[org.owasp/dependency-check-core "9.0.8"]
[org.owasp/dependency-check-core "12.1.0"]
[rm-hull/table "0.7.1"]
[trptcolin/versioneer "0.2.0"]
;; Explicitly depend on a certain Jackson, consistently.
Expand Down
4 changes: 3 additions & 1 deletion src/nvd/config.clj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
(:import
(java.io File)
(org.owasp.dependencycheck Engine)
(org.owasp.dependencycheck.utils Settings Settings$KEYS)))
(org.owasp.dependencycheck.utils Downloader Settings Settings$KEYS)))

(def ^:private string-mappings
{Settings$KEYS/ANALYZER_NEXUS_URL [:analyzer :nexus-url]
Expand Down Expand Up @@ -209,6 +209,8 @@ You can pass an empty string for an .edn file to be automatically created."

(.setString settings Settings$KEYS/NVD_API_KEY api-key)))

(.configure (Downloader/getInstance) settings)

(-> project
(assoc-in [:nvd :data-directory] (.getDataDirectory settings))
(assoc :engine (Engine. settings)
Expand Down