Skip to content

Commit

Permalink
Merge pull request #557 from Swirrl/bump-drafter-deps
Browse files Browse the repository at this point in the history 
Bump drafter deps
  • Loading branch information
@ricroberts
ricroberts authored Jan 26, 2022
2 parents 966fc3b + b71ee9c commit e047dca
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 104 deletions.
48 changes: 24 additions & 24 deletions drafter-client/deps.edn
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{:paths ["src" "resources/base"]

:deps {
buddy/buddy-sign {:mvn/version "3.0.0"}
cheshire/cheshire {:mvn/version "5.8.0"}
clj-http/clj-http {:mvn/version "3.9.0"}
grafter/grafter {:mvn/version "2.1.2"}
buddy/buddy-sign {:mvn/version "3.4.1"}
cheshire/cheshire {:mvn/version "5.10.1"}
clj-http/clj-http {:mvn/version "3.12.3"}
grafter/grafter {:mvn/version "2.1.18"}
grafter/url {:mvn/version "0.2.5"}
grafter/vocabularies {:mvn/version "0.2.6"}
integrant/integrant {:mvn/version "0.6.3"}
martian/martian {:mvn/version "0.1.10"}
martian-clj-http/martian-clj-http {:mvn/version "0.1.10"}
org.clojure/clojure {:mvn/version "1.9.0"}
grafter/vocabularies {:mvn/version "0.3.8"}
integrant/integrant {:mvn/version "0.8.0"}
martian/martian {:mvn/version "0.1.16"}
martian-clj-http/martian-clj-http {:mvn/version "0.1.16"}
org.clojure/clojure {:mvn/version "1.10.3"}
org.clojure/tools.logging {:mvn/version "1.2.2"}
ring/ring-core {:mvn/version "1.6.3"}
clj-time/clj-time {:mvn/version "0.15.1"}
grafter.db/grafter.db {:mvn/version "0.8.5"}
com.cemerick/url {:mvn/version "0.1.1"}
ring/ring-core {:mvn/version "1.9.4"}
clj-time/clj-time {:mvn/version "0.15.2"}
grafter.db/grafter.db {:mvn/version "0.8.8"}
com.widdindustries/uri {:mvn/version "0.1.3"} ;; fork of com.cemerick/url
swirrl/auth0 {:git/url "[email protected]:Swirrl/swirrl-auth0"
:sha "11fbe37324ab238752502f275d3a321fd012a65b"}
:sha "8f0694b6449bb2ec7d7a4b8b2d09acb67dc8dab4"}
}

:mvn/repos
Expand All @@ -26,23 +26,23 @@

:aliases {:dev {:extra-paths ["env/dev/clj" "env/dev/resources"]
:extra-deps {
lambdaisland/kaocha {:mvn/version "0.0-418"}
environ/environ {:mvn/version "1.0.3"}
integrant/repl {:mvn/version "0.3.1"}
lambdaisland/kaocha {:mvn/version "1.60.972"}
environ/environ {:mvn/version "1.2.0"}
integrant/repl {:mvn/version "0.3.2"}

org.apache.logging.log4j/log4j-api {:mvn/version "2.16.0"} ; Import log4j2 as the logging backend
org.apache.logging.log4j/log4j-core {:mvn/version "2.16.0"} ; Import log4j2 as the logging backend
org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.16.0"} ; Redirect all SLF4J logs over the log4j2 backend
org.apache.logging.log4j/log4j-api {:mvn/version "2.17.0"} ; Import log4j2 as the logging backend
org.apache.logging.log4j/log4j-core {:mvn/version "2.17.0"} ; Import log4j2 as the logging backend
org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.17.0"} ; Redirect all SLF4J logs over the log4j2 backend


}}

:test {:extra-paths ["test" "test/resources"]
:extra-deps {drafter/drafter {:local/root "../drafter"}
org.clojure/test.check {:mvn/version "0.9.0"}
lambdaisland/kaocha {:mvn/version "1.0.629"}
environ/environ {:mvn/version "1.0.3"}
integrant/repl {:mvn/version "0.3.1"}
org.clojure/test.check {:mvn/version "1.1.1"}
lambdaisland/kaocha {:mvn/version "1.60.972"}
environ/environ {:mvn/version "1.2.0"}
integrant/repl {:mvn/version "0.3.2"}

}}
}
Expand Down
30 changes: 15 additions & 15 deletions drafter-client/project.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
:description "Client for the Drafter HTTP API"
:url "http://github.com/swirrl/drafter-client"
:source-paths ["src" "generated/src"]
:dependencies [[buddy/buddy-sign "3.0.0"]
[cheshire "5.8.0"]
[clj-http "3.9.0"]
[grafter "2.0.1"]
:dependencies [[buddy/buddy-sign "3.4.1"]
[cheshire "5.10.1"]
[clj-http "3.12.3"]
[grafter "2.1.18"]
[grafter/url "0.2.5"]
[grafter/vocabularies "0.2.6"]
[integrant "0.6.3"]
[martian "0.1.10"]
[martian-clj-http "0.1.10"]
[org.clojure/clojure "1.9.0"]
[org.clojure/tools.logging "0.4.1"]
[ring/ring-core "1.6.3"]]
[grafter/vocabularies "0.3.8"]
[integrant "0.8.0"]
[martian "0.1.16"]
[martian-clj-http "0.1.16"]
[org.clojure/clojure "1.10.3"]
[org.clojure/tools.logging "1.2.2"]
[ring/ring-core "1.9.4"]]
:profiles
{:dev {:dependencies [[environ "1.0.3"]
[integrant/repl "0.3.1"]
[org.slf4j/slf4j-log4j12 "1.7.25"]]
{:dev {:dependencies [[environ "1.2.0"]
[integrant/repl "0.3.2"]
[org.slf4j/slf4j-log4j12 "1.7.32"]]
:source-paths ["env/dev/clj"]
:resource-paths ["env/dev/resources"]
:plugins [[lein-environ "1.0.2"]]}})
:plugins [[lein-environ "1.2.0"]]}})
10 changes: 5 additions & 5 deletions drafter-client/src/drafter_client/client/repo.clj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns drafter-client.client.repo
(:require [cemerick.url :as url]
(:require [cemerick.uri :as uri]
[drafter-client.client.draftset :as draftset]
[drafter-client.client.impl :as i]
[grafter-2.rdf4j.repository :as repo]
Expand Down Expand Up @@ -45,8 +45,8 @@
(get-query-request query-endpoint-key params :query))
sparql-repo (if update-endpoint-key
(let [{update-url :url update-params :query-params} (get-query-request client update-endpoint-key params :update)]
(repo/sparql-repo (str query-url \? (url/map->query query-params))
(str update-url \? (url/map->query update-params))))
(repo/sparql-repo (str query-url \? (url/map->query query-params))))]
(repo/sparql-repo (str query-url \? (uri/map->query query-params))
(str update-url \? (uri/map->query update-params))))
(repo/sparql-repo (str query-url \? (uri/map->query query-params))))]
(.setAdditionalHttpHeaders sparql-repo (select-keys headers ["Authorization"]))
sparql-repo))
sparql-repo))
2 changes: 1 addition & 1 deletion drafter/bin/deploy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi

echo Deploying drafter version $DRAFTER_VERSION to repository $REPOSITORY

clojure -A:krunk krunk.edn \
clojure -M:krunk krunk.edn \
:repository-id "\"$REPOSITORY\"" \
:group-id drafter \
:artifact-id drafter \
Expand Down
2 changes: 1 addition & 1 deletion drafter/bin/kaocha
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env sh

clojure -A:dev:test -m kaocha.runner "$@"
clojure -M:dev:test -m kaocha.runner "$@"
2 changes: 1 addition & 1 deletion drafter/bin/pack
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ fi
pushd "${DRAFTER_DIR}" || exit
trap "popd" EXIT

clojure -C:prod -A:pack -m mach.pack.alpha.skinny -e env/prod/clj --lib-dir "${LIB_DIR}" --project-path "${DRAFTER_JAR}"
clojure -M:prod:pack -e env/prod/clj --lib-dir "${LIB_DIR}" --project-path "${DRAFTER_JAR}"
4 changes: 2 additions & 2 deletions drafter/bin/package
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ pushd "${REPO_DIR}" || exit
# build packages
env TRAVIS_BRANCH="${TRAVIS_BRANCH_ESC}" \
TRAVIS_BUILD_NUMBER="${TRAVIS_BUILD_NUMBER}" \
clojure -A:omni package -m "${TEMP_PACKAGE_DIR}/pmd3-manifest.edn" -o "${TARGET_DIR}"
clojure -M:omni package -m "${TEMP_PACKAGE_DIR}/pmd3-manifest.edn" -o "${TARGET_DIR}"

env TRAVIS_BRANCH="${TRAVIS_BRANCH_ESC}" \
TRAVIS_BUILD_NUMBER="${TRAVIS_BUILD_NUMBER}" \
clojure -A:omni package -m "${TEMP_PACKAGE_DIR}/pmd4-manifest.edn" -o "${TARGET_DIR}"
clojure -M:omni package -m "${TEMP_PACKAGE_DIR}/pmd4-manifest.edn" -o "${TARGET_DIR}"

popd || exit
120 changes: 68 additions & 52 deletions drafter/deps.edn
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,54 @@
{:paths ["src" "resources"]

:deps {buddy/buddy-auth {:mvn/version "2.2.0"}
buddy/buddy-core {:mvn/version "1.5.0"}
:deps {buddy/buddy-auth {:mvn/version "3.0.1"}
buddy/buddy-core {:mvn/version "1.10.1"}

org.clojure/clojure {:mvn/version "1.10.1"}
;; override cheshire a transitive dep of buddy-core which
;; otherwise introduces CVE-2020-28491 via its
;; jackson-dataformat-cbor dep.
;;
;; The cbor dep can't be excluded as cheshire has a hard
;; dependency on it, so we bump cheshire here.
;;
;; NOTE: If we bump buddy-core from 1.10.1 we may be able to
;; remove this dep.
cheshire/cheshire {:mvn/version "5.10.1"}

org.clojure/clojure {:mvn/version "1.10.3"}

org.clojure/math.combinatorics {:mvn/version "0.1.4"}
org.clojure/math.combinatorics {:mvn/version "0.1.6"}

cognician/dogstatsd-clj {:mvn/version "0.1.2"}

commons-codec/commons-codec {:mvn/version "1.12"}
commons-codec/commons-codec {:mvn/version "1.15"}

clj-commons/clj-yaml {:mvn/version "0.7.0"} ;; for loading our Swagger schemas
metosin/scjsv {:mvn/version "0.5.0"} ;; for validating our Swagger/JSON schemas
clj-time/clj-time {:mvn/version "0.15.2"}
clj-commons/clj-yaml {:mvn/version "0.7.107"} ;; for loading our Swagger schemas
metosin/scjsv {:mvn/version "0.6.2"} ;; for validating our Swagger/JSON schemas

aero/aero {:mvn/version "1.1.3"}
aero/aero {:mvn/version "1.1.6"}

integrant/integrant {:mvn/version "0.7.0"}
integrant/integrant {:mvn/version "0.8.0"}
meta-merge/meta-merge {:mvn/version "1.0.0"}

;; Lock dependency of jackson to a version that
;; works with sesame's sparql json results renderer
;; and the scjsv json schema validator.
;;
;; NOTE: When we upgrade sesame to RDF4j we can possibly
;; drop this override.
;;
;; Without this you get errors like:
;; java.lang.NoClassDefFoundError: com/fasterxml/jackson/core/FormatFeature, compiling:(cheshire/factory.clj:54:7)
com.fasterxml.jackson.core/jackson-core {:mvn/version "2.9.8"}

com.novemberain/monger {:mvn/version "3.5.0"}

com.sun.mail/javax.mail {:mvn/version "1.6.2"}
;;[com.taoensso/tower "2.0.2"]

grafter/grafter {:mvn/version "2.1.15"}
grafter/grafter {:mvn/version "2.1.18"}
org.eclipse.rdf4j/rdf4j-queryrender {:mvn/version "3.1.4"}

;; The beanutils dep below is a transitive dep of grafter ->
;; rdf4j -> com.opencsv/opencsv. However 1.9.3 has
;; CVE-2019-10086 against it, so bumping the dep here until we
;; can upgrade rdf4j or other deps such that we no longer need
;; to.
commons-beanutils/commons-beanutils {:mvn/version "1.9.4"}

org.apache.tika/tika-core {:mvn/version "1.23"} ;; mime types
org.eclipse.rdf4j/rdf4j-runtime {:mvn/version "3.0.0"
:exclusions [ch.qos.logback/logback-classic]}
org.apache.tika/tika-core {:mvn/version "1.27"} ;; mime types

org.apache.commons/commons-compress {:mvn/version "1.21"}

grafter/url {:mvn/version "0.2.5"}

Expand All @@ -54,45 +62,53 @@
metosin/ring-swagger-ui {:mvn/version "3.20.1"}

;; Use JENA for our query rewriting
org.apache.jena/jena-arq {:mvn/version "3.10.0"
org.apache.jena/jena-arq {:mvn/version "3.17.0"
:exclusions [org.slf4j/slf4j-api
org.slf4j/jcl-over-slf4j
org.apache.httpcomponents/httpclient]}

org.apache.jena/jena-base {:mvn/version "3.10.0" :exclusions [org.slf4j/slf4j-api]}
org.apache.jena/jena-core {:mvn/version "3.10.0" :exclusions [org.slf4j/slf4j-api]}
org.apache.jena/jena-iri {:mvn/version "3.10.0" :exclusions [org.slf4j/slf4j-api]}
;; libthrift is a transitive dep of jena-arq, override version
;; to mitigate CVEs: CVE-2019-0205, CVE-2020-13949,
;; CVE-2019-0210, CVE-2018-1320, CVE-2018-11798.
;;
;; We may be able to remove this when we upgrade jena
org.apache.thrift/libthrift {:mvn/version "0.15.0"}

org.apache.jena/jena-base {:mvn/version "3.17.0" :exclusions [org.slf4j/slf4j-api]}
org.apache.jena/jena-core {:mvn/version "3.17.0" :exclusions [org.slf4j/slf4j-api]}
org.apache.jena/jena-iri {:mvn/version "3.17.0" :exclusions [org.slf4j/slf4j-api]}

org.mindrot/jbcrypt {:mvn/version "0.4"}

org.clojure/tools.logging {:mvn/version "1.2.2"}
org.apache.logging.log4j/log4j-api {:mvn/version "2.16.0"} ; Import log4j2 as the logging backend
org.apache.logging.log4j/log4j-core {:mvn/version "2.16.0"} ; Import log4j2 as the logging backend
org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.16.0"} ; Redirect all SLF4J logs over the log4j2 backend
org.apache.logging.log4j/log4j-api {:mvn/version "2.17.0"} ; Import log4j2 as the logging backend
org.apache.logging.log4j/log4j-core {:mvn/version "2.17.0"} ; Import log4j2 as the logging backend
org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.17.0"} ; Redirect all SLF4J logs over the log4j2 backend

org.slf4j/log4j-over-slf4j {:mvn/version "1.7.25"} ; redirect log4j 1.x logs
org.slf4j/jcl-over-slf4j {:mvn/version "1.7.25"} ; redirect commons logging
org.slf4j/jul-to-slf4j {:mvn/version "1.7.25"}
org.slf4j/log4j-over-slf4j {:mvn/version "1.7.32"} ; redirect log4j 1.x logs
org.slf4j/jcl-over-slf4j {:mvn/version "1.7.32"} ; redirect commons logging
org.slf4j/jul-to-slf4j {:mvn/version "1.7.32"}

ring-middleware-format/ring-middleware-format {:mvn/version "0.7.4"}
ring/ring {:mvn/version "1.7.1" :exclusions [org.clojure/java.classpath]}
ring/ring {:mvn/version "1.9.4" :exclusions [org.clojure/java.classpath]}
org.eclipse.jetty/jetty-server {:mvn/version "9.4.44.v20210927"}

ring-middleware-accept/ring-middleware-accept {:mvn/version "2.0.3"}
ring-server/ring-server {:mvn/version "0.5.0"}
ring/ring-core {:mvn/version "1.7.1"}
ring/ring-core {:mvn/version "1.9.4"}
ring-cors/ring-cors {:mvn/version "0.1.13"}

wrap-verbs/wrap-verbs {:mvn/version "0.1.1"}

com.auth0/jwks-rsa {:mvn/version "0.8.1"}
com.auth0/java-jwt {:mvn/version "3.8.0"}
martian/martian {:mvn/version "0.1.10"}
martian-clj-http/martian-clj-http {:mvn/version "0.1.10"
com.auth0/jwks-rsa {:mvn/version "0.20.0"}
com.auth0/java-jwt {:mvn/version "3.18.2"}
martian/martian {:mvn/version "0.1.16"}
martian-clj-http/martian-clj-http {:mvn/version "0.1.16"
:exclusions [clj-http/clj-http]}
medley/medley {:mvn/version "1.3.0"}
clj-http/clj-http {:mvn/version "3.10.0"}
clj-http/clj-http {:mvn/version "3.12.3"}
swirrl/auth0 {:git/url "[email protected]:Swirrl/swirrl-auth0"
:sha "11fbe37324ab238752502f275d3a321fd012a65b"}
}
:sha "8f0694b6449bb2ec7d7a4b8b2d09acb67dc8dab4"}}

:mvn/repos
{"swirrl-jars-releases" {:url "s3://swirrl-jars/releases/"}
Expand All @@ -102,25 +118,25 @@

:aliases {:dev {:extra-paths ["env/dev/clj" "env/dev/resources"]
:extra-deps {clojure-csv/clojure-csv {:mvn/version "2.0.2"}
environ/environ {:mvn/version "1.0.3"}
lambdaisland/kaocha {:mvn/version "1.0.629"}
org.clojure/data.json {:mvn/version "0.2.6"}
org.clojure/test.check {:mvn/version "0.9.0"}
environ/environ {:mvn/version "1.2.0"}
lambdaisland/kaocha {:mvn/version "1.60.972"}
org.clojure/data.json {:mvn/version "2.4.0"}
org.clojure/test.check {:mvn/version "1.1.1"}
ring-mock/ring-mock {:mvn/version "0.1.5"}
ring/ring-devel {:mvn/version "1.7.1" :exclusions [org.clojure/java.classpath org.clojure/tools.reader]}}}
ring/ring-devel {:mvn/version "1.9.4" :exclusions [org.clojure/java.classpath org.clojure/tools.reader]}}}

:test {:extra-paths ["env/dev/clj" "test" "test/resources"]}

:prod {:extra-paths ["env/prod/clj" "env/prod/resources"]}

:krunk {:extra-deps {swirrl/krunk {:git/url "[email protected]:Swirrl/krunk.git"
:sha "dc2666a4550c219a8ce1eea326c82d9871d6908f"}}
:sha "3cdfae90133eef26dc32090d5d555871c49a529b"}}
:main-opts ["-m" "krunk.deploy"]}

:pack {:extra-deps {pack/pack.alpha {:git/url "https://github.com/juxt/pack.alpha.git"
:sha "81b9e47d992b17aa3e3af1a47aed1f0287ebe9b8"}}}
:sha "53544484a2594b90432075f1efb73268de1f7e1f"}}
:main-opts ["-m" "mach.pack.alpha.skinny"]}

:java9 {:jvm-opts ["--add-modules" "java.xml.bind"]}

:spec {:main-opts ["-m" "drafter.check-specs" "100" "true"]}
}}
:spec {:main-opts ["-m" "drafter.check-specs" "100" "true"]}}}
7 changes: 4 additions & 3 deletions travis/install_clojure.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
set -o errexit

apt-get install rlwrap
curl -O https://download.clojure.org/install/linux-install-1.10.1.561.sh
chmod +x linux-install-1.10.1.561.sh
sudo ./linux-install-1.10.1.561.sh

curl -O https://download.clojure.org/install/linux-install-1.10.3.1040.sh
chmod +x linux-install-1.10.3.1040.sh
sudo ./linux-install-1.10.3.1040.sh

0 comments on commit e047dca

Please sign in to comment.