From 7155ca39c399332d31d14a6fe2606f8a82bc46d3 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Fri, 11 Aug 2023 10:56:19 -0700
Subject: [PATCH] bump tools.build to 0.9.5

---
 CHANGELOG.md | 1 +
 build.clj    | 5 +----
 deps.edn     | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ec12d2..41e6c37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Only accretive/fixative changes will be made from now on.
 
 * 1.3.next in progress
   * Address [#256](https://github.com/seancorfield/next-jdbc/issues/256) by adding `with-transaction+options` and `on-connection+options`. Documentation TBD.
+  * Update `tools.build` to 0.9.5 (and remove `:java-opts` from `build/test`)
 
 * 1.3.883 -- 2023-06-25
   * Address [#254](https://github.com/seancorfield/next-jdbc/issues/254) by adding `next.jdbc/active-tx?` and adding more explanation to [**Transactions**](https://cljdoc.org/d/com.github.seancorfield/next.jdbc/CURRENT/doc/getting-started/transactions) about the conventions behind transactions and the limitations of thread-local tracking of active transactions in `next.jdbc`.
diff --git a/build.clj b/build.clj
index 860b4dc..705dfa5 100644
--- a/build.clj
+++ b/build.clj
@@ -12,7 +12,6 @@
   clojure -A:deps -T:build help/doc"
   (:refer-clojure :exclude [test])
   (:require [clojure.tools.build.api :as b]
-            [clojure.tools.deps :as t]
             [deps-deploy.deps-deploy :as dd]))
 
 (def lib 'com.github.seancorfield/next.jdbc)
@@ -25,10 +24,8 @@
   (doseq [alias [:1.10 :1.11 :master]]
     (println "\nRunning tests for Clojure" (name alias))
     (let [basis    (b/create-basis {:aliases [:test alias]})
-          combined (t/combine-aliases basis [:test alias])
           cmds     (b/java-command
-                    {:basis basis
-                     :java-opts (:jvm-opts combined)
+                    {:basis     basis
                      :main      'clojure.main
                      :main-args ["-m" "cognitect.test-runner"]})
           {:keys [exit]} (b/process cmds)]
diff --git a/deps.edn b/deps.edn
index 55e198c..a4b46d7 100644
--- a/deps.edn
+++ b/deps.edn
@@ -6,8 +6,7 @@
         camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}}
  :aliases
  {;; for help: clojure -A:deps -T:build help/doc
-  :build {:deps {io.github.clojure/tools.build
-                 {:git/tag "v0.9.4" :git/sha "76b78fe"}
+  :build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.4"}
                  slipset/deps-deploy {:mvn/version "0.2.1"}}
           :ns-default build}