From 41e9bf2d6c9b8bab0b2a90c34e0542e62a35cab1 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Fri, 16 Jun 2023 20:39:11 -0700 Subject: [PATCH] update dev/test dependencies --- .github/workflows/test-and-release.yml | 2 +- .github/workflows/test-and-snapshot.yml | 6 ++--- .github/workflows/test.yml | 4 ++-- CHANGELOG.md | 1 + deps.edn | 32 ++++++++++++------------- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 3cc9555..56b381a 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.11.1.1208' + cli: '1.11.1.1347' - name: Cache All The Things uses: actions/cache@v3 with: diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml index 42f3caa..23c3e9c 100644 --- a/.github/workflows/test-and-snapshot.yml +++ b/.github/workflows/test-and-snapshot.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.11.1.1208' + cli: '1.11.1.1347' - name: Cache All The Things uses: actions/cache@v3 with: @@ -64,7 +64,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.11.1.1208' + cli: '1.11.1.1347' - name: Cache All The Things uses: actions/cache@v3 with: @@ -93,7 +93,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.11.1.1208' + cli: '1.11.1.1347' - name: Cache All The Things uses: actions/cache@v3 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 53d6c44..9a73309 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.11.1.1208' + cli: '1.11.1.1347' - name: Cache All The Things uses: actions/cache@v3 with: @@ -61,7 +61,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.11.1.1208' + cli: '1.11.1.1347' - name: Cache All The Things uses: actions/cache@v3 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b33be9..f178414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Only accretive/fixative changes will be made from now on. * 1.3.next in progress * 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`. * Address [#251](https://github.com/seancorfield/next-jdbc/issues/251) by updating `next.jdbc/with-logging` docstring. + * Update dev/test dependencies. * 1.3.874 -- 2023-04-15 * Fix [#248](https://github.com/seancorfield/next-jdbc/issues/248) by allowing `:port` to be `:none`. diff --git a/deps.edn b/deps.edn index b8b9505..f843b69 100644 --- a/deps.edn +++ b/deps.edn @@ -7,8 +7,8 @@ :aliases {;; for help: clojure -A:deps -T:build help/doc :build {:deps {io.github.clojure/tools.build - {:git/tag "v0.9.2" :git/sha "fe6b140"} - slipset/deps-deploy {:mvn/version "0.2.0"}} + {:git/tag "v0.9.4" :git/sha "76b78fe"} + slipset/deps-deploy {:mvn/version "0.2.1"}} :ns-default build} ;; versions to test against: @@ -28,25 +28,25 @@ ;; 10.16.x is JDK17+ org.apache.derby/derby {:mvn/version "10.15.2.0"} org.apache.derby/derbyshared {:mvn/version "10.15.2.0"} - org.hsqldb/hsqldb {:mvn/version "2.7.0"} + org.hsqldb/hsqldb {:mvn/version "2.7.2"} com.h2database/h2 {:mvn/version "2.1.214"} net.sourceforge.jtds/jtds {:mvn/version "1.3.1"} - org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.0.7"} - mysql/mysql-connector-java {:mvn/version "8.0.30"} - org.postgresql/postgresql {:mvn/version "42.5.0"} - io.zonky.test/embedded-postgres {:mvn/version "2.0.1"} - io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "14.5.0"} - io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "14.5.0"} - io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "14.5.0"} - org.xerial/sqlite-jdbc {:mvn/version "3.39.2.1"} + org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.1.4"} + mysql/mysql-connector-java {:mvn/version "8.0.33"} + org.postgresql/postgresql {:mvn/version "42.6.0"} + io.zonky.test/embedded-postgres {:mvn/version "2.0.4"} + io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "15.3.0"} + io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "15.3.0"} + io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "15.3.0"} + org.xerial/sqlite-jdbc {:mvn/version "3.42.0.0"} com.microsoft.sqlserver/mssql-jdbc {:mvn/version "11.2.0.jre11"} ;; supplementary test stuff ;; use log4j 2.x: - org.apache.logging.log4j/log4j-api {:mvn/version "2.19.0"} + org.apache.logging.log4j/log4j-api {:mvn/version "2.20.0"} ;; bridge into log4j: - org.apache.logging.log4j/log4j-1.2-api {:mvn/version "2.19.0"} - org.apache.logging.log4j/log4j-jcl {:mvn/version "2.19.0"} - org.apache.logging.log4j/log4j-jul {:mvn/version "2.19.0"} - org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.19.0"}} + org.apache.logging.log4j/log4j-1.2-api {:mvn/version "2.20.0"} + org.apache.logging.log4j/log4j-jcl {:mvn/version "2.20.0"} + org.apache.logging.log4j/log4j-jul {:mvn/version "2.20.0"} + org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.20.0"}} :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"] :exec-fn cognitect.test-runner.api/test}}}