From d1e02fd0a12fb404eab40c3b1789016e2d7fcd9e Mon Sep 17 00:00:00 2001
From: Tommi Reiman <tommi@iki.fi>
Date: Mon, 9 Jan 2023 17:13:04 +0200
Subject: [PATCH] Update dependencies

---
 CHANGELOG.md                      | 13 +++++++++
 project.clj                       | 44 +++++++++++++++----------------
 test/cljc/reitit/swagger_test.clj |  2 ++
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d77091f8..bda4b055 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,19 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 
 [breakver]: https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md
 
+## UNRELEASED
+
+* NEW option `:meta-merge` on a router for custom merge strategy on route data
+* Updated dependencies:
+
+```clojure
+[metosin/ring-swagger-ui "4.15.5"] is available but we use "4.3.0"
+[metosin/jsonista "0.3.7"] is available but we use "0.3.5"
+[metosin/malli "0.9.2"] is available but we use "0.8.2"
+[fipp "0.6.26"] is available but we use "0.6.25"
+[ring/ring-core "1.9.6"] is available but we use "1.9.5"
+```
+
 ## 0.5.18 (2022-04-05)
 
 * FIX [#334](https://github.com/metosin/reitit/pull/334) - Frontend: there is no way to catch the exception if coercion fails (via [#549](https://github.com/metosin/reitit/pull/549))
diff --git a/project.clj b/project.clj
index edfe3e1b..7a163232 100644
--- a/project.clj
+++ b/project.clj
@@ -27,11 +27,11 @@
                          [metosin/reitit-frontend "0.5.18"]
                          [metosin/reitit-sieppari "0.5.18"]
                          [metosin/reitit-pedestal "0.5.18"]
-                         [metosin/ring-swagger-ui "4.3.0"]
+                         [metosin/ring-swagger-ui "4.15.5"]
                          [metosin/spec-tools "0.10.5"]
                          [metosin/schema-tools "0.12.3"]
                          [metosin/muuntaja "0.6.8"]
-                         [metosin/jsonista "0.3.5"]
+                         [metosin/jsonista "0.3.7"]
                          [metosin/sieppari "0.0.0-alpha13"]
                          [metosin/malli "0.8.2"]
 
@@ -40,11 +40,11 @@
                          [com.fasterxml.jackson.core/jackson-databind "2.14.1"]
 
                          [meta-merge "1.0.0"]
-                         [fipp "0.6.25" :exclusions [org.clojure/core.rrb-vector]]
+                         [fipp "0.6.26" :exclusions [org.clojure/core.rrb-vector]]
                          [expound "0.9.0"]
                          [lambdaisland/deep-diff "0.0-47"]
                          [com.bhauman/spell-spec "0.1.2"]
-                         [ring/ring-core "1.9.5"]
+                         [ring/ring-core "1.9.6"]
 
                          [io.pedestal/pedestal.service "0.5.10"]]
 
@@ -85,33 +85,33 @@
                                   [metosin/spec-tools "0.10.5"]
                                   [metosin/muuntaja "0.6.8"]
                                   [metosin/sieppari "0.0.0-alpha13"]
-                                  [metosin/jsonista "0.3.5"]
-                                  [metosin/malli "0.8.2"]
+                                  [metosin/jsonista "0.3.7"]
+                                  [metosin/malli "0.9.2"]
                                   [lambdaisland/deep-diff "0.0-47"]
                                   [meta-merge "1.0.0"]
                                   [com.bhauman/spell-spec "0.1.2"]
                                   [expound "0.9.0"]
-                                  [fipp "0.6.25"]
+                                  [fipp "0.6.26"]
 
                                   [orchestra "2021.01.01-1"]
 
-                                  [ring "1.9.5"]
+                                  [ring "1.9.6"]
                                   [ikitommi/immutant-web "3.0.0-alpha1"]
                                   [metosin/ring-http-response "0.9.3"]
-                                  [metosin/ring-swagger-ui "4.3.0"]
+                                  [metosin/ring-swagger-ui "4.15.5"]
 
                                   [criterium "0.4.6"]
                                   [org.clojure/test.check "1.1.1"]
-                                  [org.clojure/tools.namespace "1.2.0"]
+                                  [org.clojure/tools.namespace "1.3.0"]
                                   [com.gfredericks/test.chuck "0.2.13"]
 
                                   [io.pedestal/pedestal.service "0.5.10"]
 
-                                  [org.clojure/core.async "1.5.648"]
-                                  [manifold "0.2.3"]
-                                  [funcool/promesa "6.1.434"]
+                                  [org.clojure/core.async "1.6.673"]
+                                  [manifold "0.3.0"]
+                                  [funcool/promesa "10.0.594"]
 
-                                  [com.clojure-goes-fast/clj-async-profiler "0.5.1"]
+                                  [com.clojure-goes-fast/clj-async-profiler "1.0.3"]
                                   [ring-cors "0.1.13"]
 
                                   [com.bhauman/rebel-readline "0.1.4"]]}
@@ -120,20 +120,20 @@
                                          "-Xmx4096m"
                                          "-Dclojure.compiler.direct-linking=true"]
                     :test-paths ["perf-test/clj"]
-                    :dependencies [[compojure "1.6.2"]
-                                   [ring/ring-defaults "0.3.3"]
+                    :dependencies [[compojure "1.7.0"]
+                                   [ring/ring-defaults "0.3.4"]
                                    [ikitommi/immutant-web "3.0.0-alpha1"]
                                    [io.pedestal/pedestal.service "0.5.10"]
                                    [io.pedestal/pedestal.jetty "0.5.10"]
                                    [calfpath "0.8.1"]
-                                   [org.clojure/core.async "1.5.648"]
-                                   [manifold "0.2.3"]
-                                   [funcool/promesa "6.1.434"]
+                                   [org.clojure/core.async "1.6.673"]
+                                   [manifold "0.3.0"]
+                                   [funcool/promesa "10.0.594"]
                                    [metosin/sieppari]
                                    [yada "1.2.16"]
-                                   [aleph "0.4.6"]
-                                   [ring/ring-defaults "0.3.3"]
-                                   [ataraxy "0.4.2"]
+                                   [aleph "0.6.0"]
+                                   [ring/ring-defaults "0.3.4"]
+                                   [ataraxy "0.4.3"]
                                    [bidi "2.1.6"]
                                    [janus "1.3.2"]]}
              :analyze {:jvm-opts ^:replace ["-server"
diff --git a/test/cljc/reitit/swagger_test.clj b/test/cljc/reitit/swagger_test.clj
index 96dfed23..1db2aec1 100644
--- a/test/cljc/reitit/swagger_test.clj
+++ b/test/cljc/reitit/swagger_test.clj
@@ -206,6 +206,7 @@
                                                          :responses {200 {:schema {:type "object"
                                                                                    :properties {:total {:format "int64"
                                                                                                         :type "integer"}}
+                                                                                   :additionalProperties false
                                                                                    :required [:total]}
                                                                           :description ""}
                                                                      400 {:schema {:type "string"}
@@ -229,6 +230,7 @@
                                                           :responses {200 {:description ""
                                                                            :schema {:properties {:total {:format "int64"
                                                                                                          :type "integer"}}
+                                                                                    :additionalProperties false
                                                                                     :required [:total]
                                                                                     :type "object"}}
                                                                       400 {:schema {:type "string"}