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

bump jetty deps for CVE-2022-2048, CVE-2022-2047, CVE-2022-2191 #240

Merged
merged 2 commits into from Jul 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions .nvd/suppression.xml
Expand Up @@ -15,4 +15,11 @@
<cpe>cpe:/a:h2database:h2</cpe>
<vulnerabilityName>CVE-2018-14335</vulnerabilityName>
</suppress>
<suppress>
<notes><![CDATA[
file name: jetty-io-9.4.48.v20220622.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty/jetty\-io@.*$</packageUrl>
<vulnerabilityName>CVE-2022-2191</vulnerabilityName>
</suppress>
</suppressions>
43 changes: 29 additions & 14 deletions deps.edn
Expand Up @@ -24,8 +24,23 @@
com.zaxxer/HikariCP {:mvn/version "5.0.0"
:exclusions [org.slf4j/slf4j-api]}
;; Pedestal and Jetty webserver deps
io.pedestal/pedestal.jetty {:mvn/version "0.5.10"}
org.eclipse.jetty/jetty-alpn-java-server {:mvn/version "9.4.44.v20210927"}
io.pedestal/pedestal.jetty
{:mvn/version "0.5.10"
:exclusions
[org.eclipse.jetty/jetty-server
org.eclipse.jetty/jetty-servlet
org.eclipse.jetty.alpn/alpn-api
org.eclipse.jetty/jetty-alpn-server
org.eclipse.jetty.http2/http2-server
org.eclipse.jetty.websocket/websocket-api
org.eclipse.jetty.websocket/websocket-servlet
org.eclipse.jetty.websocket/websocket-server]}
org.eclipse.jetty/jetty-server {:mvn/version "9.4.48.v20220622"}
org.eclipse.jetty/jetty-servlet {:mvn/version "9.4.48.v20220622"}
org.eclipse.jetty.alpn/alpn-api {:mvn/version "1.1.3.v20160715"}
org.eclipse.jetty/jetty-alpn-server {:mvn/version "9.4.48.v20220622"}
org.eclipse.jetty/jetty-alpn-java-server {:mvn/version "9.4.48.v20220622"}
org.eclipse.jetty.http2/http2-server {:mvn/version "9.4.48.v20220622"}
;; Security deps
buddy/buddy-core {:mvn/version "1.10.1"}
buddy/buddy-sign {:mvn/version "3.4.1"}
Expand All @@ -34,20 +49,20 @@
;; Yet Analytics deps
com.yetanalytics/lrs
{:mvn/version "1.2.12"
:exclusions [org.clojure/clojure
org.clojure/clojurescript
com.yetanalytics/xapi-schema]}
:exclusions [org.clojure/clojure
org.clojure/clojurescript
com.yetanalytics/xapi-schema]}
com.yetanalytics/xapi-schema
{:mvn/version "1.2.0"
:exclusions [org.clojure/clojure
org.clojure/clojurescript]}
:exclusions [org.clojure/clojure
org.clojure/clojurescript]}
com.yetanalytics/colossal-squuid
{:mvn/version "0.1.4"
:exclusions [org.clojure/clojure
org.clojure/clojurescript]}
:exclusions [org.clojure/clojure
org.clojure/clojurescript]}
com.yetanalytics/pedestal-oidc
{:mvn/version "0.0.8"
:exclusions [org.clojure/clojure]}}
:exclusions [org.clojure/clojure]}}
:aliases
{:db-h2
{:extra-paths ["src/db/h2"]
Expand Down Expand Up @@ -81,9 +96,9 @@
org.postgresql/postgresql {:mvn/version "42.3.3"}
org.testcontainers/postgresql {:mvn/version "1.16.3"}
;; Other test deps
org.clojure/test.check {:mvn/version "1.0.0"}
babashka/babashka.curl {:mvn/version "0.0.3"}
orchestra/orchestra {:mvn/version "2021.01.01-1"}
org.clojure/test.check {:mvn/version "1.0.0"}
babashka/babashka.curl {:mvn/version "0.0.3"}
orchestra/orchestra {:mvn/version "2021.01.01-1"}
io.github.cognitect-labs/test-runner
{:git/url "https://github.com/cognitect-labs/test-runner.git"
:git/sha "2d69f33d7980c3353b246c28f72ffeafbd9f2fab"}
Expand Down Expand Up @@ -112,7 +127,7 @@
:ns-default nvd.task}
:doc
{:replace-deps {com.yetanalytics/markdoc {:git/url "https://github.com/yetanalytics/markdoc"
:sha "1a57b934dc92e539e858223ef33eb6a5fcf439a0"}}
:sha "1a57b934dc92e539e858223ef33eb6a5fcf439a0"}}
:exec-fn com.yetanalytics.markdoc/convert
:exec-args {:in-root "doc/"
:out-root "target/bundle/doc/"
Expand Down