switch to Maven SNAPSHOTs prior to upcoming 2.1.0 release

Author: refset

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '24'
       - name: Setup Clojure
         uses: DeLaGuardo/[email protected]
         with:

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '24'
 
       - name: Setup Clojure
         uses: DeLaGuardo/[email protected]

.github/workflows/test+deploy.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '24'
 
       - name: Setup Clojure
         uses: DeLaGuardo/[email protected]
@@ -44,7 +44,7 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '24'
 
       - name: Setup Clojure
         uses: DeLaGuardo/[email protected]
@@ -75,7 +75,7 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '24'
       - name: Setup Clojure
         uses: DeLaGuardo/[email protected]
         with:

cloudformation/03-lambda.yml

@@ -16,7 +16,7 @@ Resources:
   PlayLambda:
     Type: 'AWS::Serverless::Function'
     Properties:
-      Runtime: java21
+      Runtime: java24
       Role: '{{resolve:ssm:xt-play_lambda-execution-role-arn}}'
       Handler: xt_play.lambda
       CodeUri:
@@ -43,7 +43,7 @@ Resources:
       Environment:
         Variables:
           JAVA_TOOL_OPTIONS: '--add-opens=java.base/java.nio=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true'
-          XTDB_VERSION: '2.0.0'
+          XTDB_VERSION: '2.x-SNAPSHOT'
 
   SSMPlayLambdaName:
     Type: AWS::SSM::Parameter

deps.edn

@@ -4,10 +4,8 @@
  {org.clojure/clojure {:mvn/version "1.12.0"}
 
   ;; XTDB dependencies
-  com.xtdb/xtdb-api {:mvn/version "2.0.0"}
-  com.xtdb/xtdb-core {:mvn/version "2.0.0"
-                      :exclusions [info.sunng/ring-jetty9-adapter
-                                   info.sunng/ring-jetty9-adapter-http2]}
+  com.xtdb/xtdb-api {:mvn/version "2.x-SNAPSHOT"}
+  com.xtdb/xtdb-core {:mvn/version "2.x-SNAPSHOT"}
 
   org.postgresql/postgresql {:mvn/version "42.7.4"}
   com.github.seancorfield/next.jdbc {:mvn/version "1.3.939"}
@@ -23,7 +21,7 @@
   ring-cors/ring-cors {:mvn/version "0.1.13"}
 
   ;; TODO: dev deps?
-  ring/ring-jetty-adapter {:mvn/version "1.13.0"}
+  info.sunng/ring-jetty9-adapter {:mvn/version "0.38.0"}
   integrant/integrant {:mvn/version "0.8.1"}
 
   ;; SSR
@@ -79,4 +77,4 @@
  :mvn/repos
  {"central"         {:url "https://repo1.maven.org/maven2/"}
   "clojars"         {:url "https://clojars.org/repo"}
-  "ossrh-snapshots" {:url "https://s01.oss.sonatype.org/content/repositories/snapshots"}}}
+  "sonatype-snapshots" {:url "https://central.sonatype.com/repository/maven-snapshots/"}}}

src/clj/xt_play/handler.clj

@@ -13,8 +13,7 @@
             [ring.middleware.params :as params]
             [ring.util.response :as response]
             [xt-play.transactions :as txs]
-            [xt-play.view :as view])
-  (:import (xtdb.error Anomaly)))
+            [xt-play.view :as view]))
 
 (s/def ::system-time (s/nilable string?))
 (s/def ::txs string?)
@@ -40,8 +39,7 @@
   (exception/create-exception-middleware
    (merge
     exception/default-handlers
-    {; Not sure if this is the right error to catch here
-     Anomaly handle-client-error
+    {xtdb.error.Incorrect handle-client-error
      clojure.lang.ExceptionInfo handle-client-error
      ::exception/default handle-other-error})))
 

src/clj/xt_play/server.clj

@@ -1,7 +1,7 @@
 (ns xt-play.server
   (:require [clojure.tools.logging :as log]
             [integrant.core :as ig]
-            [ring.adapter.jetty :as jetty]
+            [ring.adapter.jetty9 :as jetty]
             [xt-play.config :as config]
             [xtdb.api :as xt]
             [xtdb.node :as xtn]))

test/cljs/xt_play/model/run_test.cljs

@@ -5,7 +5,7 @@
    [xt-play.model.tx-batch :as batch]))
 
 (def app-db
-  {:version "2.0.0",
+  {:version "2.x-SNAPSHOT",
    :type :sql,
    :query "SELECT *, _valid_from FROM docs",
    ::batch/list [::batch/tx5],