From 6c2d8de53f20e565ef6387c02dd73d5a879f5e75 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Wed, 12 Jun 2024 23:06:43 -0700
Subject: [PATCH] update java test matrix

Signed-off-by: Sean Corfield <sean@corfield.org>
---
 .github/workflows/test-and-release.yml  | 2 +-
 .github/workflows/test-and-snapshot.yml | 6 +++---
 .github/workflows/test.yml              | 4 ++--
 CHANGELOG.md                            | 3 +++
 deps.edn                                | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index 7096f33..410921d 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '11'
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml
index 3956929..2ad25c6 100644
--- a/.github/workflows/test-and-snapshot.yml
+++ b/.github/workflows/test-and-snapshot.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '11'
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
@@ -39,12 +39,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '14', '17', '19' ]
+        java: [ '8', '14', '17', '21' ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Clojure CLI
         uses: DeLaGuardo/setup-clojure@master
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 47ea95c..68dc97c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,12 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '14', '17', '19' ]
+        java: [ '8', '11', '14', '17', '21' ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Clojure CLI
         uses: DeLaGuardo/setup-clojure@master
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4762e6c..723bca8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changes
 
+* 2.6.next in progress
+  * Update JDK test matrix (adopt -> temurin, 19 -> 21).
+
 * 2.6.1147 -- 2024-06-12
   * Address [#531](https://github.com/seancorfield/honeysql/issues/531) and [#527](https://github.com/seancorfield/honeysql/issues/527) by adding tests and more documentation for `:composite`; fix bug in `set-dialect!` where clause order is not restored.
   * Address [#530](https://github.com/seancorfield/honeysql/issues/530) by adding support for `:using-gin` to `:create-index`.
diff --git a/deps.edn b/deps.edn
index 8e425a5..b8b57d4 100644
--- a/deps.edn
+++ b/deps.edn
@@ -3,7 +3,7 @@
  :deps {org.clojure/clojure {:mvn/version "1.9.0"}}
  :aliases
  {;; for help: clojure -A:deps -T:build help/doc
-  :build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.3"}
+  :build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.4"}
                  slipset/deps-deploy {:mvn/version "0.2.2"}}
           :ns-default build}