diff --git a/backend/deps.edn b/backend/deps.edn index 46b1b426ba..5659d1a62c 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -4,10 +4,10 @@ "jcenter" {:url "https://jcenter.bintray.com/"}} :deps {org.clojure/clojure {:mvn/version "1.10.3"} - org.clojure/clojurescript {:mvn/version "1.10.773"} - org.clojure/data.json {:mvn/version "1.1.0"} + org.clojure/data.json {:mvn/version "2.2.1"} org.clojure/core.async {:mvn/version "1.3.610"} org.clojure/tools.cli {:mvn/version "1.0.206"} + org.clojure/clojurescript {:mvn/version "1.10.844"} ;; Logging org.clojure/tools.logging {:mvn/version "1.1.0"} @@ -20,7 +20,7 @@ org.zeromq/jeromq {:mvn/version "0.5.2"} com.taoensso/nippy {:mvn/version "3.1.1"} - com.github.luben/zstd-jni {:mvn/version "1.4.9-1"} + com.github.luben/zstd-jni {:mvn/version "1.4.9-5"} ;; NOTE: don't upgrade to latest version, breaking change is ;; introduced on 0.10.0 that suffixes counters with _total if they @@ -36,10 +36,10 @@ expound/expound {:mvn/version "0.8.9"} com.cognitect/transit-clj {:mvn/version "1.0.324"} - io.lettuce/lettuce-core {:mvn/version "6.0.2.RELEASE"} + io.lettuce/lettuce-core {:mvn/version "6.1.1.RELEASE"} java-http-clj/java-http-clj {:mvn/version "0.4.2"} - info.sunng/ring-jetty9-adapter {:mvn/version "0.15.0"} + info.sunng/ring-jetty9-adapter {:mvn/version "0.15.1"} com.github.seancorfield/next.jdbc {:mvn/version "1.1.646"} metosin/reitit-ring {:mvn/version "0.5.12"} metosin/jsonista {:mvn/version "0.3.1"} @@ -64,12 +64,12 @@ org.im4java/im4java {:mvn/version "1.4.0"} org.lz4/lz4-java {:mvn/version "1.7.1"} commons-io/commons-io {:mvn/version "2.8.0"} - com.sun.mail/jakarta.mail {:mvn/version "2.0.0"} + com.sun.mail/jakarta.mail {:mvn/version "2.0.1"} org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"} integrant/integrant {:mvn/version "0.8.0"} - software.amazon.awssdk/s3 {:mvn/version "2.16.19"} + software.amazon.awssdk/s3 {:mvn/version "2.16.44"} ;; exception printing io.aviso/pretty {:mvn/version "0.1.37"} @@ -96,7 +96,7 @@ :main-opts ["-m" "kaocha.runner"]} :outdated - {:extra-deps {com.github.liquidz/antq {:mvn/version "0.12.0"}} + {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}} :main-opts ["-m" "antq.core"]} :jmx-remote diff --git a/backend/src/app/http/assets.clj b/backend/src/app/http/assets.clj index e6e815c21b..678c4bdddd 100644 --- a/backend/src/app/http/assets.clj +++ b/backend/src/app/http/assets.clj @@ -9,13 +9,13 @@ (:require [app.common.exceptions :as ex] [app.common.spec :as us] + [app.common.uri :as u] [app.db :as db] [app.metrics :as mtx] [app.storage :as sto] [app.util.time :as dt] [clojure.spec.alpha :as s] - [integrant.core :as ig] - [lambdaisland.uri :as u])) + [integrant.core :as ig])) (def ^:private cache-max-age (dt/duration {:hours 24})) diff --git a/backend/src/app/http/oauth.clj b/backend/src/app/http/oauth.clj index fd1b3241ec..60e0a90c88 100644 --- a/backend/src/app/http/oauth.clj +++ b/backend/src/app/http/oauth.clj @@ -8,6 +8,7 @@ (:require [app.common.exceptions :as ex] [app.common.spec :as us] + [app.common.uri :as u] [app.config :as cf] [app.util.http :as http] [app.util.logging :as l] @@ -16,8 +17,7 @@ [clojure.set :as set] [clojure.spec.alpha :as s] [cuerdas.core :as str] - [integrant.core :as ig] - [lambdaisland.uri :as u])) + [integrant.core :as ig])) (defn redirect-response [uri] diff --git a/backend/src/app/storage/fs.clj b/backend/src/app/storage/fs.clj index 88ae8510bc..4f9d059693 100644 --- a/backend/src/app/storage/fs.clj +++ b/backend/src/app/storage/fs.clj @@ -8,13 +8,13 @@ (:require [app.common.exceptions :as ex] [app.common.spec :as us] + [app.common.uri :as u] [app.storage.impl :as impl] [clojure.java.io :as io] [clojure.spec.alpha :as s] [cuerdas.core :as str] [datoteka.core :as fs] - [integrant.core :as ig] - [lambdaisland.uri :as u]) + [integrant.core :as ig]) (:import java.io.InputStream java.io.OutputStream @@ -40,7 +40,7 @@ :uri (u/uri (str "file://" dir)))))) (s/def ::type ::us/keyword) -(s/def ::uri #(instance? lambdaisland.uri.URI %)) +(s/def ::uri u/uri?) (s/def ::backend (s/keys :req-un [::type ::directory ::uri])) diff --git a/backend/src/app/storage/s3.clj b/backend/src/app/storage/s3.clj index d3adcff0fe..da7928bdff 100644 --- a/backend/src/app/storage/s3.clj +++ b/backend/src/app/storage/s3.clj @@ -10,12 +10,12 @@ [app.common.data :as d] [app.common.exceptions :as ex] [app.common.spec :as us] + [app.common.uri :as u] [app.storage.impl :as impl] [app.util.time :as dt] [clojure.java.io :as io] [clojure.spec.alpha :as s] - [integrant.core :as ig] - [lambdaisland.uri :as u]) + [integrant.core :as ig]) (:import java.time.Duration java.util.Collection diff --git a/common/app/common/uri.cljc b/common/app/common/uri.cljc index 45bb2cb61f..d381ee7b0a 100644 --- a/common/app/common/uri.cljc +++ b/common/app/common/uri.cljc @@ -5,6 +5,7 @@ ;; Copyright (c) UXBOX Labs SL (ns app.common.uri + (:refer-clojure :exclude [uri?]) (:require [app.common.data :as d] [lambdaisland.uri :as u] @@ -12,8 +13,13 @@ (d/export u/uri) (d/export u/join) +(d/export u/query-encode) (d/export un/percent-encode) +(defn uri? + [o] + (instance? lambdaisland.uri.URI o)) + (defn query-string->map [s] (u/query-string->map s))