From 99832c7e1bec956c1102d0436dc390955e0f3101 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 10 Mar 2026 20:15:16 +0200 Subject: [PATCH 01/10] Bump data.json to 2.5.2 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 4c1833d..0f331b1 100644 --- a/project.clj +++ b/project.clj @@ -8,7 +8,7 @@ :url "https://www.eclipse.org/legal/epl-v10.html"} :dependencies [[nrepl "1.3.1" :exclusions [org.clojure/clojure]] ^:inline-dep [http-kit "2.5.0"] - ^:inline-dep [org.clojure/data.json "2.5.0"] + ^:inline-dep [org.clojure/data.json "2.5.2"] ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.2"] ^:inline-dep [org.clojure/tools.namespace "1.5.0" :exclusions [org.clojure/tools.reader]] ^:inline-dep [org.clojure/tools.reader "1.5.2"] From 720c768e859ea552f1fb834e3829e5ed0ad295fa Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 10 Mar 2026 20:26:28 +0200 Subject: [PATCH 02/10] Bump tools.namespace to 1.5.1 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 0f331b1..b89b6bf 100644 --- a/project.clj +++ b/project.clj @@ -10,7 +10,7 @@ ^:inline-dep [http-kit "2.5.0"] ^:inline-dep [org.clojure/data.json "2.5.2"] ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.2"] - ^:inline-dep [org.clojure/tools.namespace "1.5.0" :exclusions [org.clojure/tools.reader]] + ^:inline-dep [org.clojure/tools.namespace "1.5.1" :exclusions [org.clojure/tools.reader]] ^:inline-dep [org.clojure/tools.reader "1.5.2"] ^:inline-dep [cider/orchard "0.35.0" :exclusions [org.clojure/clojure]] ^:inline-dep [cljfmt "0.9.2" :exclusions [rewrite-clj rewrite-cljs]] From 83d2565978052646c071e4caa9978ea69b9bb095 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 11 Mar 2026 09:44:38 +0200 Subject: [PATCH 03/10] Bump tools.analyzer.jvm to 1.3.4 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index b89b6bf..b179819 100644 --- a/project.clj +++ b/project.clj @@ -9,7 +9,7 @@ :dependencies [[nrepl "1.3.1" :exclusions [org.clojure/clojure]] ^:inline-dep [http-kit "2.5.0"] ^:inline-dep [org.clojure/data.json "2.5.2"] - ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.2"] + ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.4"] ^:inline-dep [org.clojure/tools.namespace "1.5.1" :exclusions [org.clojure/tools.reader]] ^:inline-dep [org.clojure/tools.reader "1.5.2"] ^:inline-dep [cider/orchard "0.35.0" :exclusions [org.clojure/clojure]] From 7cc6e9eaf93cc171fd5c15bde0b4a04152c6e390 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 11 Mar 2026 09:45:11 +0200 Subject: [PATCH 04/10] Bump tools.reader to 1.6.0 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index b179819..4263234 100644 --- a/project.clj +++ b/project.clj @@ -11,7 +11,7 @@ ^:inline-dep [org.clojure/data.json "2.5.2"] ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.4"] ^:inline-dep [org.clojure/tools.namespace "1.5.1" :exclusions [org.clojure/tools.reader]] - ^:inline-dep [org.clojure/tools.reader "1.5.2"] + ^:inline-dep [org.clojure/tools.reader "1.6.0"] ^:inline-dep [cider/orchard "0.35.0" :exclusions [org.clojure/clojure]] ^:inline-dep [cljfmt "0.9.2" :exclusions [rewrite-clj rewrite-cljs]] ^:inline-dep [clj-commons/fs "1.6.310"] From c80f1bcc87ac5d4149dd233fca2e95002cab0124 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 11 Mar 2026 09:49:23 +0200 Subject: [PATCH 05/10] Bump clj-commons/fs to 1.6.312 --- project.clj | 2 +- test/refactor_nrepl/ns/class_search_test.clj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 4263234..f04b3ae 100644 --- a/project.clj +++ b/project.clj @@ -14,7 +14,7 @@ ^:inline-dep [org.clojure/tools.reader "1.6.0"] ^:inline-dep [cider/orchard "0.35.0" :exclusions [org.clojure/clojure]] ^:inline-dep [cljfmt "0.9.2" :exclusions [rewrite-clj rewrite-cljs]] - ^:inline-dep [clj-commons/fs "1.6.310"] + ^:inline-dep [clj-commons/fs "1.6.312"] ^:inline-dep [rewrite-clj "1.1.49"] ^:inline-dep [version-clj "2.0.3"]] ; see versions matrix below diff --git a/test/refactor_nrepl/ns/class_search_test.clj b/test/refactor_nrepl/ns/class_search_test.clj index eb49108..2a76a49 100644 --- a/test/refactor_nrepl/ns/class_search_test.clj +++ b/test/refactor_nrepl/ns/class_search_test.clj @@ -33,6 +33,7 @@ "org.apache.commons.compress.harmony.pack200.Segment can not implement" "javax/xml/bind/ModuleUtil (wrong name: META-INF/versions/9/javax/xml/bind/ModuleUtil)" "META-INF/versions/9/javax/xml/bind/ModuleUtil (wrong name: javax/xml/bind/ModuleUtil)" + "META-INF/versions/9/module-info" ;; Stuff brought in by the `leiningen-core` dependency: "com/google/inject" "org/osgi" From c88c975ce8cd2b1248c2a56e3025693a2b9b6aae Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 11 Mar 2026 09:54:11 +0200 Subject: [PATCH 06/10] Bump rewrite-clj to 1.2.52 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index f04b3ae..0f546b9 100644 --- a/project.clj +++ b/project.clj @@ -15,7 +15,7 @@ ^:inline-dep [cider/orchard "0.35.0" :exclusions [org.clojure/clojure]] ^:inline-dep [cljfmt "0.9.2" :exclusions [rewrite-clj rewrite-cljs]] ^:inline-dep [clj-commons/fs "1.6.312"] - ^:inline-dep [rewrite-clj "1.1.49"] + ^:inline-dep [rewrite-clj "1.2.52"] ^:inline-dep [version-clj "2.0.3"]] ; see versions matrix below From 3e14679a8a486aff1b4eaddc784c5c94bf14d06b Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 11 Mar 2026 09:57:49 +0200 Subject: [PATCH 07/10] Bump http-kit to 2.8.1 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 0f546b9..ca16b9c 100644 --- a/project.clj +++ b/project.clj @@ -7,7 +7,7 @@ :license {:name "Eclipse Public License" :url "https://www.eclipse.org/legal/epl-v10.html"} :dependencies [[nrepl "1.3.1" :exclusions [org.clojure/clojure]] - ^:inline-dep [http-kit "2.5.0"] + ^:inline-dep [http-kit "2.8.1"] ^:inline-dep [org.clojure/data.json "2.5.2"] ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.4"] ^:inline-dep [org.clojure/tools.namespace "1.5.1" :exclusions [org.clojure/tools.reader]] From 7389d81075d687b5dd1cd2f2ecd577ce54c7dbbc Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 11 Mar 2026 10:03:40 +0200 Subject: [PATCH 08/10] Bump orchard to 0.39.0 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index ca16b9c..4f76c3a 100644 --- a/project.clj +++ b/project.clj @@ -12,7 +12,7 @@ ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.4"] ^:inline-dep [org.clojure/tools.namespace "1.5.1" :exclusions [org.clojure/tools.reader]] ^:inline-dep [org.clojure/tools.reader "1.6.0"] - ^:inline-dep [cider/orchard "0.35.0" :exclusions [org.clojure/clojure]] + ^:inline-dep [cider/orchard "0.39.0" :exclusions [org.clojure/clojure]] ^:inline-dep [cljfmt "0.9.2" :exclusions [rewrite-clj rewrite-cljs]] ^:inline-dep [clj-commons/fs "1.6.312"] ^:inline-dep [rewrite-clj "1.2.52"] From dd5ef575d0e3cb9d3713355687304cae4cc45a6a Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 11 Mar 2026 12:42:57 +0200 Subject: [PATCH 09/10] Bump nrepl to 1.6.0 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 4f76c3a..f031d30 100644 --- a/project.clj +++ b/project.clj @@ -6,7 +6,7 @@ :url "https://github.com/clojure-emacs/refactor-nrepl" :license {:name "Eclipse Public License" :url "https://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[nrepl "1.3.1" :exclusions [org.clojure/clojure]] + :dependencies [[nrepl "1.6.0" :exclusions [org.clojure/clojure]] ^:inline-dep [http-kit "2.8.1"] ^:inline-dep [org.clojure/data.json "2.5.2"] ^:inline-dep [org.clojure/tools.analyzer.jvm "1.3.4"] From 2434fa866fe41e4ade7daca4ba7325f0718e58c5 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Wed, 11 Mar 2026 13:13:27 +0200 Subject: [PATCH 10/10] Fix flaky artifact tests by retrying on empty results The Maven/Clojars tests would fail when the HTTP request returned an empty result instead of throwing an exception, since the retry logic only caught exceptions. Now empty collections also trigger a retry. --- test/refactor_nrepl/artifacts_test.clj | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/test/refactor_nrepl/artifacts_test.clj b/test/refactor_nrepl/artifacts_test.clj index 637f4ad..36d84f0 100644 --- a/test/refactor_nrepl/artifacts_test.clj +++ b/test/refactor_nrepl/artifacts_test.clj @@ -22,18 +22,26 @@ "Retries a flaky fn `f`. In our case the flakiness is outside of our control since Maven Central, - Clojars, etc can always have hiccups." + Clojars, etc can always have hiccups. Retries on both exceptions and + empty results." ([f] (retry-flaky f 0)) ([f ^long attempts] - (try - (f) - (catch Exception e - ;; give Maven a break: - (Thread/sleep 18000) - (if (< attempts 7) - (retry-flaky f (inc attempts)) - (throw e)))))) + (let [result (try + (f) + (catch Exception e + (if (< attempts 7) + ::retry + (throw e))))] + (if (or (= result ::retry) + (and (coll? result) (empty? result))) + (do + ;; give Maven a break: + (Thread/sleep 18000) + (if (< attempts 7) + (retry-flaky f (inc attempts)) + result)) + result)))) (deftest get-mvn-artifacts!-test (is (> (count (retry-flaky (fn []