bump to beta6

xtdb · Feb 15, 2025 · 72c21ab · 72c21ab
1 parent 56a32d8
commit 72c21ab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/cloudformation/03-lambda.yml b/cloudformation/03-lambda.yml
@@ -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-beta5'
+          XTDB_VERSION: '2.0.0-beta6'
 
   SSMPlayLambdaName:
     Type: AWS::SSM::Parameter

diff --git a/deps.edn b/deps.edn
@@ -4,11 +4,13 @@
  {org.clojure/clojure {:mvn/version "1.12.0"}
 
   ;; XTDB dependencies
-  com.xtdb/xtdb-api {:mvn/version "2.0.0-beta5"}
-  com.xtdb/xtdb-core {:mvn/version "2.0.0-beta5"}
-  ;; needed only for beta5
-  org.jetbrains.kotlin/kotlin-reflect     {:mvn/version "2.1.0"} ; added for beta5
-  org.jetbrains.kotlin/kotlin-stdlib-jdk8 {:mvn/version "2.1.0"}
+  com.xtdb/xtdb-api {:mvn/version "2.0.0-beta6"}
+  com.xtdb/xtdb-core {:mvn/version "2.0.0-beta6"
+                      ;; needed since beta6 introduced a protobuf dep
+                      ;; see https://github.com/xtdb/xtdb/issues/4172
+                      :exclusions [com.google.protobuf/protobuf-java]}
+  ;; explicit version, instead of the exclusion
+  com.google.protobuf/protobuf-java {:mvn/version "3.25.5"}
 
   org.postgresql/postgresql {:mvn/version "42.7.4"}
   com.github.seancorfield/next.jdbc {:mvn/version "1.3.939"}

diff --git a/test/cljs/xt_play/model/run_test.cljs b/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-beta5",
+  {:version "2.0.0-beta6",
    :type :sql,
    :query "SELECT *, _valid_from FROM docs",
    ::batch/list [::batch/tx5],