From c6b4587408be2e20223a74a58c5787a41a6173f4 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Sun, 24 Sep 2023 15:57:35 -0700
Subject: [PATCH] bump CI versions; streamline JDK matrix

---
 .github/workflows/test-and-release.yml  |  4 ++--
 .github/workflows/test-and-snapshot.yml | 14 +++++++-------
 .github/workflows/test.yml              | 10 +++++-----
 deps.edn                                | 16 ++++++++--------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index 56b381a..c37731f 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -9,7 +9,7 @@ jobs:
   build-and-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1347'
+          cli: '1.11.1.1413'
       - 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 23c3e9c..31b1b9b 100644
--- a/.github/workflows/test-and-snapshot.yml
+++ b/.github/workflows/test-and-snapshot.yml
@@ -9,7 +9,7 @@ jobs:
   build-and-snapshot:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1347'
+          cli: '1.11.1.1413'
       - name: Cache All The Things
         uses: actions/cache@v3
         with:
@@ -54,9 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11', '17' ]
+        java: [ '11', '17', '20' ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -64,7 +64,7 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1347'
+          cli: '1.11.1.1413'
       - name: Cache All The Things
         uses: actions/cache@v3
         with:
@@ -84,7 +84,7 @@ jobs:
         graalvm: [ '21.1.0' ]
         base: [ 'java11', 'java16' ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup GraalVM
         uses: DeLaGuardo/setup-graalvm@5.0
         with:
@@ -93,7 +93,7 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1347'
+          cli: '1.11.1.1413'
       - name: Cache All The Things
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9a73309..88ae7ab 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11', '16', '17', '18' ]
+        java: [ '11', '17', '20' ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1347'
+          cli: '1.11.1.1413'
       - name: Cache All The Things
         uses: actions/cache@v3
         with:
@@ -52,7 +52,7 @@ jobs:
         graalvm: [ '21.1.0' ]
         base: [ 'java11', 'java16' ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup GraalVM
         uses: DeLaGuardo/setup-graalvm@5.0
         with:
@@ -61,7 +61,7 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1347'
+          cli: '1.11.1.1413'
       - name: Cache All The Things
         uses: actions/cache@v3
         with:
diff --git a/deps.edn b/deps.edn
index f0b8f4b..59825f4 100644
--- a/deps.edn
+++ b/deps.edn
@@ -28,17 +28,17 @@
                       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.2"}
-                      com.h2database/h2 {:mvn/version "2.1.214"}
+                      com.h2database/h2 {:mvn/version "2.2.224"}
                       net.sourceforge.jtds/jtds {:mvn/version "1.3.1"}
-                      org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.1.4"}
-                      com.mysql/mysql-connector-j {:mvn/version "8.0.33"}
+                      org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.2.0"}
+                      com.mysql/mysql-connector-j {:mvn/version "8.1.0"}
                       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"}
+                      io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "16.0.0"}
+                      io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "16.0.0"}
+                      io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "16.0.0"}
+                      org.xerial/sqlite-jdbc {:mvn/version "3.43.0.0"}
+                      com.microsoft.sqlserver/mssql-jdbc {:mvn/version "12.4.1.jre11"}
                       ;; supplementary test stuff
                       ;; use log4j 2.x:
                       org.apache.logging.log4j/log4j-api {:mvn/version "2.20.0"}