update dependencies

Signed-off-by: Sean Corfield <sean@corfield.org>
seancorfield · Mar 8, 2024 · 1476c35 · 1476c35
1 parent e21a7ab
commit 1476c35
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 84 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -19,9 +19,9 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1429'
+          cli: '1.11.2.1441'
       - name: Cache All The Things
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml
@@ -17,9 +17,9 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1429'
+          cli: '1.11.2.1441'
       - name: Cache All The Things
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -64,38 +64,9 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1429'
+          cli: '1.11.2.1441'
       - name: Cache All The Things
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gitlibs
-            ~/.clojure
-            ~/.cpcache
-          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
-      - name: Run Tests
-        run: clojure -T:build test
-
-  build-graalvm-new:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        graalvm: [ '21.1.0' ]
-        base: [ 'java11', 'java16' ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@5.0
-        with:
-          graalvm: ${{ matrix.graalvm }}
-          java: ${{ matrix.base }}
-      - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@master
-        with:
-          cli: '1.11.1.1429'
-      - name: Cache All The Things
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,9 +17,9 @@ jobs:
       - name: Setup Clojure
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1429'
+          cli: '1.11.2.1441'
       - name: Cache All The Things
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -44,32 +44,3 @@ jobs:
           NEXT_JDBC_TEST_MYSQL: yes
           NEXT_JDBC_TEST_MSSQL: yes
           MSSQL_SA_PASSWORD: Str0ngP4ssw0rd
-
-  build-graalvm-new:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        graalvm: [ '21.1.0' ]
-        base: [ 'java11', 'java16' ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@5.0
-        with:
-          graalvm: ${{ matrix.graalvm }}
-          java: ${{ matrix.base }}
-      - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@master
-        with:
-          cli: '1.11.1.1429'
-      - name: Cache All The Things
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gitlibs
-            ~/.clojure
-            ~/.cpcache
-          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
-      - name: Run Tests
-        run: clojure -T:build test
diff --git 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 [#268](https://github.com/seancorfield/next-jdbc/issues/268) by expanding the documentation around `insert-multi!` and `insert!`.
+  * Update dependency versions (including Clojure).
   * Code cleanup per `clj-kondo`.
 
 * 1.3.909 -- 2023-12-16

diff --git a/deps.edn b/deps.edn
@@ -1,7 +1,7 @@
 {:mvn/repos {"sonatype" {:url "https://oss.sonatype.org/content/repositories/snapshots/"}}
  :paths ["src" "resources"]
- :deps {org.clojure/clojure {:mvn/version "1.11.1"}
-        org.clojure/java.data {:mvn/version "1.1.103"}
+ :deps {org.clojure/clojure {:mvn/version "1.11.2"}
+        org.clojure/java.data {:mvn/version "1.2.107"}
 
         camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}}
  :aliases
@@ -12,8 +12,8 @@
 
   ;; versions to test against:
   :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
-  :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}}
-  :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-alpha7"}}}
+  :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}}
+  :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-alpha9"}}}
 
   ;; running tests/checks of various kinds:
   :test {:extra-paths ["test"] ; can also run clojure -X:test
@@ -22,29 +22,29 @@
                       {:git/tag "v0.5.1" :git/sha "dfb30dd"}
                       ;; connection pooling
                       com.zaxxer/HikariCP {:mvn/version "5.1.0"}
-                      com.mchange/c3p0 {:mvn/version "0.9.5.5"}
+                      com.mchange/c3p0 {:mvn/version "0.10.0"}
                       ;; 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.2"}
                       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.3.1"}
-                      com.mysql/mysql-connector-j {:mvn/version "8.2.0"}
-                      org.postgresql/postgresql {:mvn/version "42.7.1"}
+                      org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.3.3"}
+                      com.mysql/mysql-connector-j {:mvn/version "8.3.0"}
+                      org.postgresql/postgresql {:mvn/version "42.7.2"}
                       io.zonky.test/embedded-postgres {:mvn/version "2.0.6"}
-                      io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "16.1.1"}
-                      io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "16.1.1"}
-                      io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "16.1.1"}
-                      org.xerial/sqlite-jdbc {:mvn/version "3.44.1.0"}
-                      com.microsoft.sqlserver/mssql-jdbc {:mvn/version "12.4.1.jre11"}
+                      io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "16.2.0"}
+                      io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "16.2.0"}
+                      io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "16.2.0"}
+                      org.xerial/sqlite-jdbc {:mvn/version "3.45.1.0"}
+                      com.microsoft.sqlserver/mssql-jdbc {:mvn/version "12.6.1.jre11"}
                       ;; use log4j2 to reduce log noise during testing:
-                      org.apache.logging.log4j/log4j-api {:mvn/version "2.22.0"}
+                      org.apache.logging.log4j/log4j-api {:mvn/version "2.23.0"}
                       ;; bridge everything into log4j:
-                      org.apache.logging.log4j/log4j-1.2-api {:mvn/version "2.22.0"}
-                      org.apache.logging.log4j/log4j-jcl {:mvn/version "2.22.0"}
-                      org.apache.logging.log4j/log4j-jul {:mvn/version "2.22.0"}
-                      org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.22.0"}}
+                      org.apache.logging.log4j/log4j-1.2-api {:mvn/version "2.23.0"}
+                      org.apache.logging.log4j/log4j-jcl {:mvn/version "2.23.0"}
+                      org.apache.logging.log4j/log4j-jul {:mvn/version "2.23.0"}
+                      org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.23.0"}}
          :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"]
          :exec-fn cognitect.test-runner.api/test}}}