From 9196b342493968ac439418acfa6fd1a995821cd6 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Mon, 2 Dec 2024 19:01:20 -0800 Subject: [PATCH] update dev/test deps Signed-off-by: Sean Corfield --- .github/workflows/test-and-release.yml | 2 +- .github/workflows/test-and-snapshot.yml | 4 ++-- .github/workflows/test.yml | 2 +- .gitpod.dockerfile | 3 --- .gitpod.yml | 23 ------------------- CHANGELOG.md | 3 +++ deps.edn | 30 ++++++++++++------------- 7 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 .gitpod.dockerfile delete mode 100644 .gitpod.yml diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index d230216..ab4c541 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: - cli: '1.12.0.1479' + cli: '1.12.0.1488' - name: Cache All The Things uses: actions/cache@v4 with: diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml index ca60996..a932628 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: - cli: '1.12.0.1479' + cli: '1.12.0.1488' - name: Cache All The Things uses: actions/cache@v4 with: @@ -64,7 +64,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.12.0.1479' + cli: '1.12.0.1488' - name: Cache All The Things uses: actions/cache@v4 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a5a3833..87b2fc4 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: - cli: '1.12.0.1479' + cli: '1.12.0.1488' - name: Cache All The Things uses: actions/cache@v4 with: diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile deleted file mode 100644 index ad0dc02..0000000 --- a/.gitpod.dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM gitpod/workspace-full - -RUN brew install clojure/tools/clojure@1.12.0.1479 diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index c0ef6c2..0000000 --- a/.gitpod.yml +++ /dev/null @@ -1,23 +0,0 @@ -image: - file: .gitpod.dockerfile - -vscode: - extensions: - - betterthantomorrow.calva - - mauricioszabo.clover - -tasks: - - name: Prepare deps/clover - init: | - clojure -A:test -P - echo 50505 > .socket-repl-port - mkdir ~/.config/clover - cp .clover/config.cljs ~/.config/clover/ - - name: Start REPL - command: clojure -J-Dclojure.server.repl="{:address \"0.0.0.0\" :port 50505 :accept clojure.core.server/repl}" -A:test - - name: See Changes - command: code CHANGELOG.md - -github: - prebuilds: - develop: true diff --git a/CHANGELOG.md b/CHANGELOG.md index baa5c39..7a40ffd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ Only accretive/fixative changes will be made from now on. +* 1.3.next in progress + * Update dev/test dependencies. + * 1.3.967 -- 2024-12-02 * Address [#288](https://github.com/seancorfield/next-jdbc/issues/288) by adding speculative support for `:dbtype "xtdb"`. * Fix [#287](https://github.com/seancorfield/next-jdbc/issues/287) by merging user-supplied options over `:return-keys true`. diff --git a/deps.edn b/deps.edn index 13eba30..94de157 100644 --- a/deps.edn +++ b/deps.edn @@ -6,7 +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 {:mvn/version "0.10.5"} + :build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.6"} slipset/deps-deploy {:mvn/version "0.2.2"}} :ns-default build} @@ -21,31 +21,31 @@ io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"} ;; connection pooling - com.zaxxer/HikariCP {:mvn/version "6.0.0"} + com.zaxxer/HikariCP {:mvn/version "6.2.1"} com.mchange/c3p0 {:mvn/version "0.10.1"} ;; JDBC drivers ;; 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.3"} + org.hsqldb/hsqldb {:mvn/version "2.7.4"} com.h2database/h2 {:mvn/version "2.3.232"} net.sourceforge.jtds/jtds {:mvn/version "1.3.1"} - org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.4.1"} - com.mysql/mysql-connector-j {:mvn/version "9.0.0"} + org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.5.1"} + com.mysql/mysql-connector-j {:mvn/version "9.1.0"} ;; 42.7.4 changes update count (to -1) for stored procs: org.postgresql/postgresql {:mvn/version "42.7.4"} - io.zonky.test/embedded-postgres {:mvn/version "2.0.7"} - io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "17.0.0"} - io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "17.0.0"} - io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "17.0.0"} - org.xerial/sqlite-jdbc {:mvn/version "3.46.1.3"} + io.zonky.test/embedded-postgres {:mvn/version "2.1.0"} + io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "17.2.0"} + io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "17.2.0"} + io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "17.2.0"} + org.xerial/sqlite-jdbc {:mvn/version "3.47.1.0"} com.microsoft.sqlserver/mssql-jdbc {:mvn/version "12.8.1.jre11"} ;; use log4j2 to reduce log noise during testing: - org.apache.logging.log4j/log4j-api {:mvn/version "2.24.0"} + org.apache.logging.log4j/log4j-api {:mvn/version "2.24.2"} ;; bridge everything into log4j: - org.apache.logging.log4j/log4j-1.2-api {:mvn/version "2.24.0"} - org.apache.logging.log4j/log4j-jcl {:mvn/version "2.24.0"} - org.apache.logging.log4j/log4j-jul {:mvn/version "2.24.0"} - org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.24.0"}} + org.apache.logging.log4j/log4j-1.2-api {:mvn/version "2.24.2"} + org.apache.logging.log4j/log4j-jcl {:mvn/version "2.24.2"} + org.apache.logging.log4j/log4j-jul {:mvn/version "2.24.2"} + org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.24.2"}} :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"] :exec-fn cognitect.test-runner.api/test}}}