From 22726a776a607e230fb4d5425c5184893c224934 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Mon, 22 Apr 2024 23:33:19 -0500 Subject: [PATCH 1/7] creds --- .github/workflows/clojure.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clojure.yml b/.github/workflows/clojure.yml index fd5cfa1..3d36bd9 100644 --- a/.github/workflows/clojure.yml +++ b/.github/workflows/clojure.yml @@ -70,8 +70,8 @@ jobs: java-version: '11' - name: deploy env: - CLOJARS_USER: ${{ secrets.CLOJARS_USER }} - CLOJARS_TOKEN: ${{ secrets.CLOJARS_TOKEN }} + CLOJARS_USER: metosinci + CLOJARS_TOKEN: "${{ secrets.CLOJARS_DEPLOY_TOKEN }}" COMMIT_MSG: ${{ github.event.head_commit.message }} run: | if [[ "$COMMIT_MSG" == "Release :major" ]]; then From ba4fc93109780a1961de0541e4d7b80b7d3f27f8 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Tue, 30 Apr 2024 20:31:34 -0500 Subject: [PATCH 2/7] Release :patch --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90925b0..c4c41b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## NEXT +## 0.26.3 (30.4.2024) + * Fix memory leaks via multimethods caching default dispatch values: https://github.com/metosin/compojure-api/issues/454 ## 0.26.2 (1.4.2019) From d98316521e41ac8d20aa4fdf3d444b9465b6c016 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Tue, 30 Apr 2024 20:39:43 -0500 Subject: [PATCH 3/7] Release :patch --- .github/workflows/clojure.yml | 3 +++ CHANGELOG.md | 2 +- project.clj | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clojure.yml b/.github/workflows/clojure.yml index 3d36bd9..7cc2b1d 100644 --- a/.github/workflows/clojure.yml +++ b/.github/workflows/clojure.yml @@ -74,6 +74,9 @@ jobs: CLOJARS_TOKEN: "${{ secrets.CLOJARS_DEPLOY_TOKEN }}" COMMIT_MSG: ${{ github.event.head_commit.message }} run: | + git config --global user.email "abonnairesergeant@gmail.com" + git config --global user.name "Ambrose Bonnaire-Sergeant" + if [[ "$COMMIT_MSG" == "Release :major" ]]; then lein release :major elif [[ "$COMMIT_MSG" == "Release :minor" ]]; then diff --git a/CHANGELOG.md b/CHANGELOG.md index c4c41b8..4e529b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## NEXT -## 0.26.3 (30.4.2024) +## 1.0.0 (30.4.2024) * Fix memory leaks via multimethods caching default dispatch values: https://github.com/metosin/compojure-api/issues/454 diff --git a/project.clj b/project.clj index 925e9ff..456c35c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject metosin/ring-swagger "0.26.3-SNAPSHOT" +(defproject metosin/ring-swagger "1.0.0-SNAPSHOT" :description "Swagger Spec for Ring Apps" :url "https://github.com/metosin/ring-swagger" :license {:name "Eclipse Public License" From 8516504980493192e3c4d48d50bee94f34e3ea9c Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Tue, 30 Apr 2024 20:46:27 -0500 Subject: [PATCH 4/7] Release :patch --- project.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 456c35c..70333e5 100644 --- a/project.clj +++ b/project.clj @@ -39,10 +39,10 @@ :username [:gpg :env/clojars_user] :password [:gpg :env/clojars_token] :sign-releases false}] - ["releases" {:url "https://clojars.org/repo" - :username [:gpg :env/clojars_user] - :password [:gpg :env/clojars_token] - :sign-releases false}]] + ["release" {:url "https://clojars.org/repo" + :username [:gpg :env/clojars_user] + :password [:gpg :env/clojars_token] + :sign-releases false}]] :release-tasks [["clean"] ["vcs" "assert-committed"] ["change" "version" "leiningen.release/bump-version" "release"] From 4e5e5d949438cd42aadcbfd46b226d36e25cbfa2 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Wed, 1 May 2024 01:48:48 +0000 Subject: [PATCH 5/7] Version 1.0.0 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 70333e5..1c2cb82 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject metosin/ring-swagger "1.0.0-SNAPSHOT" +(defproject metosin/ring-swagger "1.0.0" :description "Swagger Spec for Ring Apps" :url "https://github.com/metosin/ring-swagger" :license {:name "Eclipse Public License" From d3f11cc28402d489bc10b4e69a4bfd3606b9b255 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Wed, 1 May 2024 01:48:54 +0000 Subject: [PATCH 6/7] Version 1.0.1-SNAPSHOT --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 1c2cb82..d26968e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject metosin/ring-swagger "1.0.0" +(defproject metosin/ring-swagger "1.0.1-SNAPSHOT" :description "Swagger Spec for Ring Apps" :url "https://github.com/metosin/ring-swagger" :license {:name "Eclipse Public License" From 612685336a7265f820dc6dd362ef300adcbc1977 Mon Sep 17 00:00:00 2001 From: Ambrose Bonnaire-Sergeant Date: Mon, 8 Jul 2024 16:10:20 -0500 Subject: [PATCH 7/7] style + fix doc --- src/ring/swagger/json_schema.clj | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ring/swagger/json_schema.clj b/src/ring/swagger/json_schema.clj index b730a4b..c54d883 100644 --- a/src/ring/swagger/json_schema.clj +++ b/src/ring/swagger/json_schema.clj @@ -257,7 +257,7 @@ (defn properties "Take a map schema and turn them into json-schema properties. The result is put into collection of same type as input schema. - Thus linked/map should keep the order of items. Returnes nil + Thus linked/map should keep the order of items. Returns nil if no properties are found." [schema] {:pre [(common/plain-map? schema)]} @@ -265,11 +265,10 @@ (for [[k v] schema :when (s/specific-key? k) :let [key-meta (meta k) - k (s/explicit-schema-key k)] - :let [v (try->swagger v k key-meta)]] + k (s/explicit-schema-key k) + v (try->swagger v k key-meta)]] (and v [k v])))] - (if (seq props) - props))) + (not-empty props))) (defn additional-properties "Generates json-schema additional properties from a plain map