Skip to content

Commit 1a734b4

Browse files
committed
2.10.0
1 parent 4bdc690 commit 1a734b4

File tree

8 files changed

+27
-13
lines changed

8 files changed

+27
-13
lines changed

.github/ISSUE_TEMPLATE/bug.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ body:
4848
label: Installation compliance
4949
description:
5050
options:
51-
- label: I have read again and made sure that I'm following **exactly** the instructions for my tool of choice ([Leiningen](https://github.com/rm-hull/nvd-clojure/tree/v2.9.0#leiningen), [Clojure CLI](https://github.com/rm-hull/nvd-clojure/tree/v2.9.0#clojure-cli), [Clojure CLI Tool](https://github.com/rm-hull/nvd-clojure/tree/v2.9.0#clojure-cli-tool)).
51+
- label: I have read again and made sure that I'm following **exactly** the instructions for my tool of choice ([Leiningen](https://github.com/rm-hull/nvd-clojure/tree/v2.10.0#leiningen), [Clojure CLI](https://github.com/rm-hull/nvd-clojure/tree/v2.10.0#clojure-cli), [Clojure CLI Tool](https://github.com/rm-hull/nvd-clojure/tree/v2.10.0#clojure-cli-tool)).
5252
required: true
53-
- label: I understand that false positives [can be skipped locally](https://github.com/rm-hull/nvd-clojure/tree/v2.9.0#configuration-options) and should be reported to [DependencyCheck](https://github.com/jeremylong/DependencyCheck).
53+
- label: I understand that false positives [can be skipped locally](https://github.com/rm-hull/nvd-clojure/tree/v2.10.0#configuration-options) and should be reported to [DependencyCheck](https://github.com/jeremylong/DependencyCheck).
5454
required: false
5555

.github/ISSUE_TEMPLATE/issue.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ body:
3232
label: Installation compliance
3333
description:
3434
options:
35-
- label: I have read again and made sure that I'm following **exactly** the instructions for my tool of choice ([Leiningen](https://github.com/rm-hull/nvd-clojure/tree/v2.9.0#leiningen), [Clojure CLI](https://github.com/rm-hull/nvd-clojure/tree/v2.9.0#clojure-cli), [Clojure CLI Tool](https://github.com/rm-hull/nvd-clojure/tree/v2.9.0#clojure-cli-tool)).
35+
- label: I have read again and made sure that I'm following **exactly** the instructions for my tool of choice ([Leiningen](https://github.com/rm-hull/nvd-clojure/tree/v2.10.0#leiningen), [Clojure CLI](https://github.com/rm-hull/nvd-clojure/tree/v2.10.0#clojure-cli), [Clojure CLI Tool](https://github.com/rm-hull/nvd-clojure/tree/v2.10.0#clojure-cli-tool)).
3636
required: true
37-
- label: I understand that false positives [can be skipped locally](https://github.com/rm-hull/nvd-clojure/tree/v2.9.0#configuration-options) and should be reported to [DependencyCheck](https://github.com/jeremylong/DependencyCheck).
37+
- label: I understand that false positives [can be skipped locally](https://github.com/rm-hull/nvd-clojure/tree/v2.10.0#configuration-options) and should be reported to [DependencyCheck](https://github.com/jeremylong/DependencyCheck).
3838
required: false
3939

.github/dogfooding_suppressions.xml

+4
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@
99
<filePath regex="true">.*\bh2-2\.1\.210\.jar</filePath>
1010
<cve>CVE-2018-14335</cve>
1111
</suppress>
12+
<suppress>
13+
<filePath regex="true">.*\bsnakeyaml-1\.33\.jar</filePath>
14+
<cve>CVE-2022-38752</cve>
15+
</suppress>
1216
</suppressions>

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## Changes from 2.9.0 to 2.10.0
2+
3+
* Update `dependency-check-core`.
4+
15
## Changes from 2.8.0 to 2.9.0
26

37
* Update `dependency-check-core`.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Example usage:
44
# copy a one-off Clojars token to your clipboard
5-
# GIT_TAG=v2.9.0 CLOJARS_USERNAME=$USER CLOJARS_PASSWORD=$(pbpaste) make deploy
5+
# GIT_TAG=v2.10.0 CLOJARS_USERNAME=$USER CLOJARS_PASSWORD=$(pbpaste) make deploy
66

77
deploy: check-env
88
lein clean

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ dependencies and passes them to a library called [Dependency-Check](https://gith
2626

2727
<details>
2828

29-
Please create a separate project consisting of `[nvd-clojure/nvd-clojure "2.9.0"]`. Said project can be located inside the targeted repo's Git repository.
29+
Please create a separate project consisting of `[nvd-clojure/nvd-clojure "2.10.0"]`. Said project can be located inside the targeted repo's Git repository.
3030

3131
```
3232
(defproject nvd-helper "local"
3333
:description "nvd-clojure helper project"
34-
:dependencies [[nvd-clojure "2.9.0"]
34+
:dependencies [[nvd-clojure "2.10.0"]
3535
[org.clojure/clojure "1.11.1"]]
3636
:jvm-opts ["-Dclojure.main.report=stderr"])
3737
```
@@ -56,7 +56,7 @@ If you are using a multi-modules solution (e.g. `lein-monolith`), you should ens
5656

5757
<details>
5858

59-
Please create a separate project consisting exclusively of `nvd-clojure/nvd-clojure {:mvn/version "2.9.0"}`. Said project can be located inside the targeted repo's Git repository.
59+
Please create a separate project consisting exclusively of `nvd-clojure/nvd-clojure {:mvn/version "2.10.0"}`. Said project can be located inside the targeted repo's Git repository.
6060

6161
Please do not add nvd-clojure as a dependency in the deps.edn of the project to be analysed.
6262

project.clj

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject nvd-clojure "2.9.0"
1+
(defproject nvd-clojure "2.10.0"
22
:description "National Vulnerability Database dependency checker"
33
:url "https://github.com/rm-hull/nvd-clojure"
44
:license {:name "The MIT License (MIT)"
@@ -17,6 +17,7 @@
1717
[com.fasterxml.jackson.core/jackson-core "2.13.4"]
1818
[com.fasterxml.jackson.module/jackson-module-afterburner "2.13.4"]
1919
[org.apache.maven.resolver/maven-resolver-transport-http "1.8.2" #_"Fixes a CVE"]
20+
[org.yaml/snakeyaml "1.33" #_"Fixes a CVE"]
2021
[org.apache.maven/maven-core "3.8.6" #_"Fixes a CVE"]
2122
[org.eclipse.jetty/jetty-client "12.0.0.alpha2" #_"Fixes a CVE" :exclusions [org.slf4j/slf4j-api]]
2223
[org.apache.maven.resolver/maven-resolver-spi "1.8.2" #_"Satisfies :pedantic?"]

test/nvd/config_test.clj

+9-4
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,21 @@
2222

2323
(ns nvd.config-test
2424
(:require
25-
[clojure.edn :as edn]
2625
[clojure.java.io :as io]
2726
[clojure.string :as string]
2827
[clojure.test :refer [deftest is]]
2928
[nvd.config :refer [app-name with-config]]))
3029

3130
(def dependency-check-version
32-
(let [v (-> "project.clj" io/file slurp edn/read-string (nth 2))]
33-
(assert (double? v))
34-
(str v)))
31+
(let [dependencies (-> "project.clj" io/file slurp read-string (nth 10))
32+
_ (assert (vector? dependencies))
33+
_ (assert (vector? (first dependencies)))
34+
found (->> dependencies
35+
(some (fn [[d v]]
36+
(when (= d 'org.owasp/dependency-check-core)
37+
v))))]
38+
(assert (string? found))
39+
found))
3540

3641
(deftest check-app-name
3742
(is (= "stdin" (app-name {:nome "hello-world" :version "0.0.1"})))

0 commit comments

Comments
 (0)