From 88dc464211b464e5e570a4d8dfcf1fddae3e7f38 Mon Sep 17 00:00:00 2001 From: Alexander Kiel Date: Wed, 8 Jun 2022 14:06:42 +0200 Subject: [PATCH 1/6] Allow For Spaces in CQL File Path --- evaluate-measure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evaluate-measure.sh b/evaluate-measure.sh index 1bb589a87..0604157aa 100755 --- a/evaluate-measure.sh +++ b/evaluate-measure.sh @@ -121,7 +121,7 @@ BASE=$1 [[ -z "$BASE" ]] && usage SUBJECT_TYPE_LOWER=$(echo $SUBJECT_TYPE | tr '[:upper:]' '[:lower:]') -DATA=$(cat ${FILE} | base64 | tr -d '\n') +DATA=$(base64 < "$FILE" | tr -d '\n') LIBRARY_URI=$(uuidgen | tr '[:upper:]' '[:lower:]') MEASURE_URI=$(uuidgen | tr '[:upper:]' '[:lower:]') From 48c1afc2a737ebc5c70be98d2c716b76b2ee0426 Mon Sep 17 00:00:00 2001 From: Marlena Meyer Date: Mon, 30 May 2022 12:37:19 +0200 Subject: [PATCH 2/6] Implement CQL ConvertsTo: Decimal, Integer, Long, Quantity and String --- modules/cql/src/blaze/elm/boolean.clj | 14 ++ modules/cql/src/blaze/elm/compiler/core.clj | 3 +- .../src/blaze/elm/compiler/type_operators.clj | 30 ++- modules/cql/src/blaze/elm/date_time.clj | 39 ++- modules/cql/src/blaze/elm/quantity.clj | 5 +- modules/cql/src/blaze/elm/string.clj | 6 + modules/cql/src/blaze/elm/tuple.clj | 8 +- .../elm/compiler/type_operators_test.clj | 237 +++++++++++++++++- modules/cql/test/blaze/elm/literal.clj | 25 ++ modules/cql/test/data_readers.clj | 5 + 10 files changed, 343 insertions(+), 29 deletions(-) diff --git a/modules/cql/src/blaze/elm/boolean.clj b/modules/cql/src/blaze/elm/boolean.clj index 4cbab8c6b..75f130d61 100644 --- a/modules/cql/src/blaze/elm/boolean.clj +++ b/modules/cql/src/blaze/elm/boolean.clj @@ -16,6 +16,13 @@ (to-boolean [x] x)) +;; 22.24. ToDecimal +(extend-protocol p/ToDecimal + Boolean + (to-decimal [x] + (if (true? x) 1.0 0.0))) + + ;; 22.25. ToInteger (extend-protocol p/ToInteger Boolean @@ -28,3 +35,10 @@ Boolean (to-long [x] (if (true? x) 1 0))) + + +;; 22.30. ToString +(extend-protocol p/ToString + Boolean + (to-string [x] + (str x))) diff --git a/modules/cql/src/blaze/elm/compiler/core.clj b/modules/cql/src/blaze/elm/compiler/core.clj index ef4694cd7..0bdc4e32c 100644 --- a/modules/cql/src/blaze/elm/compiler/core.clj +++ b/modules/cql/src/blaze/elm/compiler/core.clj @@ -109,5 +109,4 @@ (extend-protocol p/ToString Object - (to-string [x] - (str x))) + (to-string [_])) diff --git a/modules/cql/src/blaze/elm/compiler/type_operators.clj b/modules/cql/src/blaze/elm/compiler/type_operators.clj index be445ad52..a68c76237 100644 --- a/modules/cql/src/blaze/elm/compiler/type_operators.clj +++ b/modules/cql/src/blaze/elm/compiler/type_operators.clj @@ -134,17 +134,37 @@ ;; TODO 22.9. ConvertsToDateTime -;; TODO 22.10. ConvertsToDecimal +;; 22.10. ConvertsToDecimal +(defunop converts-to-decimal [operand] + (when (some? operand) + (some? (p/to-decimal operand)))) + + +;; 22.11. ConvertsToLong +(defunop converts-to-long [operand] + (when (some? operand) + (some? (p/to-long operand)))) + + +;; 22.12. ConvertsToInteger +(defunop converts-to-integer [operand] + (when (some? operand) + (some? (p/to-integer operand)))) -;; TODO 22.11. ConvertsToLong -;; TODO 22.12. ConvertsToInteger +;; 22.13. ConvertsToQuantity +(defunop converts-to-quantity [operand] + (when (some? operand) + (some? (p/to-quantity operand)))) -;; TODO 22.13. ConvertsToQuantity ;; TODO 22.14. ConvertsToRatio -;; TODO 22.15. ConvertsToString +;; 22.15. ConvertsToString +(defunop converts-to-string [operand] + (when (some? operand) + (some? (p/to-string operand)))) + ;; TODO 22.16. ConvertsToTime diff --git a/modules/cql/src/blaze/elm/date_time.clj b/modules/cql/src/blaze/elm/date_time.clj index bd8670094..fb808c279 100644 --- a/modules/cql/src/blaze/elm/date_time.clj +++ b/modules/cql/src/blaze/elm/date_time.clj @@ -13,8 +13,7 @@ [blaze.fhir.spec.type OffsetInstant] [blaze.fhir.spec.type.system DateTimeYear DateTimeYearMonth DateTimeYearMonthDay] [java.time LocalDate LocalDateTime LocalTime OffsetDateTime Year YearMonth Instant] - [java.time.temporal ChronoField ChronoUnit Temporal TemporalAccessor] - [java.util Map])) + [java.time.temporal ChronoField ChronoUnit Temporal TemporalAccessor])) (set! *warn-on-reflection* true) @@ -1325,15 +1324,39 @@ String (to-date-time [s now] - (p/to-date-time (system/parse-date-time s) now)) - - ;; for the anomaly - Map - (to-date-time [_ _])) + (p/to-date-time (system/parse-date-time s) now))) ;; 22.30. ToString (extend-protocol p/ToString PrecisionLocalTime (to-string [{:keys [local-time]}] - (str local-time))) + (str local-time)) + + Year + (to-string [x] + (str x)) + + DateTimeYear + (to-string [x] + (str x)) + + YearMonth + (to-string [x] + (str x)) + + DateTimeYearMonth + (to-string [x] + (str x)) + + LocalDate + (to-string [x] + (str x)) + + DateTimeYearMonthDay + (to-string [x] + (str x)) + + LocalDateTime + (to-string [x] + (str x))) diff --git a/modules/cql/src/blaze/elm/quantity.clj b/modules/cql/src/blaze/elm/quantity.clj index 7792a56a9..d5793054d 100644 --- a/modules/cql/src/blaze/elm/quantity.clj +++ b/modules/cql/src/blaze/elm/quantity.clj @@ -223,9 +223,10 @@ String (to-quantity [s] ;; (+|-)?#0(.0#)?('')? - (let [[_ value unit] (re-matches #"(\d+(?:\.\d+)?)\s*('[^']+')?" s)] + (let [[_ value unit] (re-matches #"([+-]?\d+(?:\.\d+)?)\s*('[^']+')?" s)] (when value - (quantity (p/to-decimal value) (or (str/trim unit "'") "1")))))) + (when-let [value (p/to-decimal value)] + (quantity value (or (str/trim unit "'") "1"))))))) ;; 22.30. ToString diff --git a/modules/cql/src/blaze/elm/string.clj b/modules/cql/src/blaze/elm/string.clj index a630ff8b9..84f3ea707 100644 --- a/modules/cql/src/blaze/elm/string.clj +++ b/modules/cql/src/blaze/elm/string.clj @@ -52,3 +52,9 @@ (try (p/to-decimal (BigDecimal. s)) (catch Exception _)))) + +;; 22.30. ToString +(extend-protocol p/ToString + String + (to-string [s] + (str s))) diff --git a/modules/cql/src/blaze/elm/tuple.clj b/modules/cql/src/blaze/elm/tuple.clj index 65f5acf44..d8ee15747 100644 --- a/modules/cql/src/blaze/elm/tuple.clj +++ b/modules/cql/src/blaze/elm/tuple.clj @@ -5,7 +5,7 @@ (:import [java.util Map])) - +;; 12.1. Equal (extend-protocol p/Equal Map (equal [x y] @@ -17,3 +17,9 @@ false) false) true)))) + +;; 22.23. ToDateTime +(extend-protocol p/ToDateTime + ;; for the anomaly + Map + (to-date-time [_ _])) diff --git a/modules/cql/test/blaze/elm/compiler/type_operators_test.clj b/modules/cql/test/blaze/elm/compiler/type_operators_test.clj index edcc85f30..eec3eebd4 100644 --- a/modules/cql/test/blaze/elm/compiler/type_operators_test.clj +++ b/modules/cql/test/blaze/elm/compiler/type_operators_test.clj @@ -14,6 +14,7 @@ [blaze.elm.literal-spec] [blaze.elm.protocols :as p] [blaze.elm.quantity :as quantity] + [blaze.elm.quantity-spec] [blaze.fhir.spec.type.system :as system] [clojure.spec.test.alpha :as st] [clojure.test :as test :refer [are deftest is testing]])) @@ -277,7 +278,7 @@ (is (= '(convert-quantity (param-ref "q") "g") (core/-form expr)))))) -;; TODO 22.7. ConvertsToBoolean +;; 22.7. ConvertsToBoolean ;; ;; The ConvertsToBoolean operator returns true if the value of its argument is ;; or can be converted to a Boolean value. @@ -429,7 +430,7 @@ ;; If the argument is null, the result is null. -;; TODO 22.10. ConvertsToDecimal +;; 22.10. ConvertsToDecimal ;; ;; The ConvertsToDecimal operator returns true if the value of its argument is ;; or can be converted to a Decimal value. The operator accepts strings using @@ -455,9 +456,44 @@ ;; If the input is a Boolean, the result is true. ;; ;; If the argument is null, the result is null. +(deftest compile-converts-to-decimal-test + (testing "String" + (are [x] (true? (tu/compile-unop elm/converts-to-decimal elm/string x)) + (str decimal/min) + "-1" + "0" + "1" + (str decimal/max)) + (are [x] (false? (tu/compile-unop elm/converts-to-decimal elm/string x)) + (str (- decimal/min 1e-8M)) + (str (+ decimal/max 1e-8M)) + "a")) -;; TODO 22.11. ConvertsToLong + (testing "Boolean" + (are [x] (true? (tu/compile-unop elm/converts-to-decimal elm/boolean x)) + "true")) + + (testing "Decimal" + (are [x] (true? (tu/compile-unop elm/converts-to-decimal elm/decimal x)) + "1.1")) + + (testing "dynamic" + (are [x] (false? (tu/dynamic-compile-eval (elm/converts-to-decimal x))) + #elm/parameter-ref "A") + (are [x] (true? (tu/dynamic-compile-eval (elm/converts-to-decimal x))) + #elm/parameter-ref "1")) + + (tu/testing-unary-null elm/converts-to-decimal) + + (testing "form" + (let [compile-ctx {:library {:parameters {:def [{:name "x"}]}}} + elm #elm/converts-to-decimal #elm/parameter-ref "x" + expr (c/compile compile-ctx elm)] + (is (= '(converts-to-decimal (param-ref "x")) (core/-form expr)))))) + + +;; 22.11. ConvertsToLong ;; ;; The ConvertsToLong operator returns true if the value of its argument is or ;; can be converted to a Long value. The operator accepts strings using the @@ -480,8 +516,44 @@ ;; If the input is a Boolean, the result is true. ;; ;; If the argument is null, the result is null. +(deftest compile-converts-to-long-test + (testing "String" + (are [x] (true? (tu/compile-unop elm/converts-to-long elm/string x)) + (str Long/MIN_VALUE) + "-1" + "0" + "1" + (str Long/MAX_VALUE)) + + (are [x] (false? (tu/compile-unop elm/converts-to-long elm/string x)) + (str (dec (bigint Long/MIN_VALUE))) + (str (inc (bigint Long/MAX_VALUE))) + "a")) + + (testing "Boolean" + (are [x] (true? (tu/compile-unop elm/converts-to-long elm/boolean x)) + "true")) + + (testing "Long" + (are [x] (true? (tu/compile-unop elm/converts-to-long elm/long x)) + "1")) + + (testing "dynamic" + (are [x] (false? (tu/dynamic-compile-eval (elm/converts-to-long x))) + #elm/parameter-ref "A") + (are [x] (true? (tu/dynamic-compile-eval (elm/converts-to-long x))) + #elm/parameter-ref "1")) + + (tu/testing-unary-null elm/converts-to-long) + + (testing "form" + (let [compile-ctx {:library {:parameters {:def [{:name "x"}]}}} + elm #elm/converts-to-long #elm/parameter-ref "x" + expr (c/compile compile-ctx elm)] + (is (= '(converts-to-long (param-ref "x")) (core/-form expr)))))) + -;; TODO 22.12. ConvertsToInteger +;; 22.12. ConvertsToInteger ;; ;; The ConvertsToInteger operator returns true if the value of its argument is ;; or can be converted to an Integer value. The operator accepts strings using @@ -504,8 +576,43 @@ ;; If the input is a Boolean, the result is true ;; ;; If the argument is null, the result is null. +(deftest compile-converts-to-integer-test + (testing "String" + (are [x] (true? (tu/compile-unop elm/converts-to-integer elm/string x)) + (str Integer/MIN_VALUE) + "-1" + "0" + "1" + (str Integer/MAX_VALUE)) + (are [x] (false? (tu/compile-unop elm/converts-to-integer elm/string x)) + (str (dec Integer/MIN_VALUE)) + (str (inc Integer/MAX_VALUE)) + "a")) + + (testing "Boolean" + (are [x] (true? (tu/compile-unop elm/converts-to-integer elm/boolean x)) + "true")) -;; TODO 22.13. ConvertsToQuantity + (testing "Integer" + (are [x] (true? (tu/compile-unop elm/converts-to-integer elm/integer x)) + "1")) + + (testing "dynamic" + (are [x] (false? (tu/dynamic-compile-eval (elm/converts-to-integer x))) + #elm/parameter-ref "A") + (are [x] (true? (tu/dynamic-compile-eval (elm/converts-to-integer x))) + #elm/parameter-ref "1")) + + (tu/testing-unary-null elm/converts-to-integer) + + (testing "form" + (let [compile-ctx {:library {:parameters {:def [{:name "x"}]}}} + elm #elm/converts-to-integer #elm/parameter-ref "x" + expr (c/compile compile-ctx elm)] + (is (= '(converts-to-integer (param-ref "x")) (core/-form expr)))))) + + +;; 22.13. ConvertsToQuantity ;; ;; The ConvertsToQuantity operator returns true if the value of its argument is ;; or can be converted to a Quantity value. The operator may be used with @@ -534,6 +641,45 @@ ;; For Integer, Decimal, and Ratio values, the operator simply returns true. ;; ;; If the argument is null, the result is null. +(deftest compile-converts-to-quantity-test + (testing "String" + (are [x] (true? (tu/compile-unop elm/converts-to-quantity elm/string x)) + (str decimal/min "'m'") + "-1'm'" + "0'm'" + "1'm'" + (str decimal/max "'m'")) + + (are [x] (false? (tu/compile-unop elm/converts-to-quantity elm/string x)) + (str (- decimal/min 1e-8M)) + (str (+ decimal/max 1e-8M)) + (str (- decimal/min 1e-8M) "'m'") + (str (+ decimal/max 1e-8M) "'m'") + "" + "a")) + + (testing "Integer" + (is (true? (tu/compile-unop elm/converts-to-quantity elm/integer "1")))) + + (testing "Decimal" + (is (true? (tu/compile-unop elm/converts-to-quantity elm/decimal "1.1")))) + + ;; TODO: Ratio + + (testing "dynamic" + (are [x] (false? (tu/dynamic-compile-eval (elm/converts-to-quantity x))) + #elm/parameter-ref "A") + (are [x] (true? (tu/dynamic-compile-eval (elm/converts-to-quantity x))) + #elm/parameter-ref "1")) + + (tu/testing-unary-null elm/converts-to-quantity) + + (testing "form" + (let [compile-ctx {:library {:parameters {:def [{:name "x"}]}}} + elm #elm/converts-to-quantity #elm/parameter-ref "x" + expr (c/compile compile-ctx elm)] + (is (= '(converts-to-quantity (param-ref "x")) (core/-form expr)))))) + ;; TODO 22.14. ConvertsToRatio ;; @@ -552,7 +698,7 @@ ;; ;; If the argument is null, the result is null. -;; TODO 22.15. ConvertsToString +;; 22.15. ConvertsToString ;; ;; The ConvertsToString operator returns true if the value of its argument is ;; or can be converted to a String value. @@ -571,6 +717,60 @@ ;; String ;; ;; If the argument is null, the result is null. +(deftest compile-converts-to-string-test + (testing "String" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/string x)) + "foo")) + + (testing "Long" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/long x)) + "1")) + + (testing "Boolean" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/boolean x)) + "true")) + + (testing "Integer" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/integer x)) + "1")) + + (testing "Decimal" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/decimal x)) + "1.1")) + + (testing "Quantity" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/quantity x)) + [1M "m"])) + + (testing "Date" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/date x)) + "2019-01-01")) + + (testing "DateTime" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/date-time x)) + "2019-01-01T01:00")) + + (testing "Time" + (are [x] (true? (tu/compile-unop elm/converts-to-string elm/time x)) + "01:00")) + + ;; TODO: Ratio + + (testing "Tuple" + (are [x] (false? (c/compile {} (elm/converts-to-string (elm/tuple x)))) + {"foo" #elm/integer "1"})) + + (testing "dynamic" + (are [x] (true? (tu/dynamic-compile-eval (elm/converts-to-string x))) + #elm/parameter-ref "A")) + + (tu/testing-unary-null elm/converts-to-string) + + (testing "form" + (let [compile-ctx {:library {:parameters {:def [{:name "x"}]}}} + elm #elm/converts-to-string #elm/parameter-ref "x" + expr (c/compile compile-ctx elm)] + (is (= '(converts-to-string (param-ref "x")) (core/-form expr)))))) ;; TODO 22.16. ConvertsToTime ;; @@ -881,8 +1081,8 @@ ;; 22.24. ToDecimal ;; -;; The ToDecimal operator converts the value of its argument to a Decimal value. -;; The operator accepts strings using the following format: +;; The ToDecimal operator converts the value of its argument to a Decimal +;; value. The operator accepts strings using the following format: ;; ;; (+|-)?#0(.0#)? ;; @@ -891,13 +1091,18 @@ ;; decimal point, at least one digit, and any number of additional digits ;; (including none). ;; -;; Note that the decimal value returned by this operator must be limited in -;; precision and scale to the maximum precision and scale representable for -;; Decimal values within CQL. +;; See Formatting Strings for a description of the formatting strings used in +;; this specification. +;; +;; Note that the Decimal value returned by this operator will be limited in +;; precision and scale to the maximum precision and scale representable by the +;; implementation (at least 28 digits of precision, and 8 digits of scale). ;; ;; If the input string is not formatted correctly, or cannot be interpreted as ;; a valid Decimal value, the result is null. ;; +;; If the input is Boolean, true will result in 1.0, false will result in 0.0. +;; ;; If the argument is null, the result is null. (deftest compile-to-decimal-test (testing "String" @@ -913,6 +1118,11 @@ (str (+ decimal/max 1e-8M)) nil "a" nil)) + (testing "Boolean" + (are [x res] (= res (tu/compile-unop elm/to-decimal elm/boolean x)) + "true" 1.0 + "false" 0.0)) + (tu/testing-unary-null elm/to-decimal) (testing "form" @@ -1086,6 +1296,7 @@ (are [x res] (p/equal res (core/-eval (tu/compile-unop elm/to-quantity elm/string x) {} nil nil)) + "-1" (quantity/quantity -1 "1") "1" (quantity/quantity 1 "1") "1'm'" (quantity/quantity 1 "m") @@ -1098,6 +1309,10 @@ (are [x] (nil? (core/-eval (tu/compile-unop elm/to-quantity elm/string x) {} nil nil)) + (str (- decimal/min 1e-8M)) + (str (+ decimal/max 1e-8M)) + (str (- decimal/min 1e-8M) "'m'") + (str (+ decimal/max 1e-8M) "'m'") "" "a")) diff --git a/modules/cql/test/blaze/elm/literal.clj b/modules/cql/test/blaze/elm/literal.clj index 405ff5aa1..fd4a48676 100644 --- a/modules/cql/test/blaze/elm/literal.clj +++ b/modules/cql/test/blaze/elm/literal.clj @@ -803,6 +803,31 @@ {:type "ConvertsToBoolean" :operand operand}) +;; 22.10. ConvertsToDecimal +(defn converts-to-decimal [operand] + {:type "ConvertsToDecimal" :operand operand}) + + +;; 22.11. ConvertsToLong +(defn converts-to-long [operand] + {:type "ConvertsToLong" :operand operand}) + + +;; 22.12. ConvertsToInteger +(defn converts-to-integer [operand] + {:type "ConvertsToInteger" :operand operand}) + + +;; 22.13. ConvertsToQuantity +(defn converts-to-quantity [operand] + {:type "ConvertsToQuantity" :operand operand}) + + +;; 22.15. ConvertsToString +(defn converts-to-string [operand] + {:type "ConvertsToString" :operand operand}) + + ;; 22.17. Descendents (defn descendents [source] {:type "Descendents" :source source}) diff --git a/modules/cql/test/data_readers.clj b/modules/cql/test/data_readers.clj index a004caa95..d501bc3b4 100644 --- a/modules/cql/test/data_readers.clj +++ b/modules/cql/test/data_readers.clj @@ -71,6 +71,11 @@ elm/can-convert-quantity blaze.elm.literal/can-convert-quantity elm/convert-quantity blaze.elm.literal/convert-quantity elm/converts-to-boolean blaze.elm.literal/converts-to-boolean + elm/converts-to-decimal blaze.elm.literal/converts-to-decimal + elm/converts-to-long blaze.elm.literal/converts-to-long + elm/converts-to-integer blaze.elm.literal/converts-to-integer + elm/converts-to-quantity blaze.elm.literal/converts-to-quantity + elm/converts-to-string blaze.elm.literal/converts-to-string elm/children blaze.elm.literal/children elm/descendents blaze.elm.literal/descendents elm/to-boolean blaze.elm.literal/to-boolean From f05fcfc4731b2048944eee6bf986851180c3f468 Mon Sep 17 00:00:00 2001 From: Alexander Kiel Date: Mon, 20 Jun 2022 12:13:53 +0200 Subject: [PATCH 3/6] Update Dependencies --- .github/workflows/build.yml | 12 ++++++------ deps.edn | 4 ++-- modules/anomaly/deps.edn | 2 +- modules/async/deps.edn | 2 +- modules/byte-buffer/deps.edn | 2 +- modules/cassandra/deps.edn | 4 ++-- modules/coll/deps.edn | 2 +- modules/cql/deps.edn | 2 +- modules/db-resource-store-cassandra/deps.edn | 2 +- modules/db-resource-store/deps.edn | 2 +- modules/db-tx-log-kafka/deps.edn | 2 +- modules/db-tx-log/deps.edn | 2 +- modules/db/deps.edn | 2 +- modules/executor/deps.edn | 2 +- modules/extern-terminology-service/deps.edn | 2 +- modules/fhir-client/deps.edn | 2 +- modules/fhir-path/deps.edn | 2 +- modules/fhir-structure/deps.edn | 4 ++-- modules/http-client/deps.edn | 2 +- modules/interaction/deps.edn | 2 +- modules/jepsen/deps.edn | 2 +- modules/kv/deps.edn | 2 +- modules/luid/deps.edn | 2 +- modules/metrics/deps.edn | 4 ++-- modules/module-base/deps.edn | 2 +- modules/openid-auth/deps.edn | 2 +- modules/operation-measure-evaluate-measure/deps.edn | 2 +- modules/page-store-cassandra/deps.edn | 2 +- modules/page-store/deps.edn | 2 +- modules/rest-api/deps.edn | 2 +- modules/rest-util/deps.edn | 2 +- modules/rocksdb/deps.edn | 4 ++-- modules/scheduler/deps.edn | 2 +- modules/server/deps.edn | 2 +- modules/thread-pool-executor-collector/deps.edn | 2 +- 35 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ceb193801..0eb50a6e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1113' + cli: '1.11.1.1145' - name: Check out Git repository uses: actions/checkout@v3 @@ -116,7 +116,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1113' + cli: '1.11.1.1145' - name: Check out Git repository uses: actions/checkout@v3 @@ -158,7 +158,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1113' + cli: '1.11.1.1145' - name: Check out Git repository uses: actions/checkout@v3 @@ -186,7 +186,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1113' + cli: '1.11.1.1145' - name: Check out Git repository uses: actions/checkout@v3 @@ -583,7 +583,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1113' + cli: '1.11.1.1145' - name: Check out Git repository uses: actions/checkout@v3 @@ -894,7 +894,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1113' + cli: '1.11.1.1145' - name: Check out Git repository uses: actions/checkout@v3 diff --git a/deps.edn b/deps.edn index b11df8276..51beafe35 100644 --- a/deps.edn +++ b/deps.edn @@ -66,7 +66,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} @@ -80,7 +80,7 @@ :outdated {:replace-deps {com.github.liquidz/antq - {:mvn/version "1.7.798"} + {:mvn/version "1.7.804"} org.slf4j/slf4j-nop {:mvn/version "1.7.36"}} diff --git a/modules/anomaly/deps.edn b/modules/anomaly/deps.edn index d2fd0ee00..920c42a29 100644 --- a/modules/anomaly/deps.edn +++ b/modules/anomaly/deps.edn @@ -16,7 +16,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/async/deps.edn b/modules/async/deps.edn index 935bda138..5b3f42aae 100644 --- a/modules/async/deps.edn +++ b/modules/async/deps.edn @@ -19,7 +19,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/byte-buffer/deps.edn b/modules/byte-buffer/deps.edn index cd410fbdc..6f0697cdd 100644 --- a/modules/byte-buffer/deps.edn +++ b/modules/byte-buffer/deps.edn @@ -13,6 +13,6 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]}}} diff --git a/modules/cassandra/deps.edn b/modules/cassandra/deps.edn index 26aa4d15d..9489f4844 100644 --- a/modules/cassandra/deps.edn +++ b/modules/cassandra/deps.edn @@ -11,7 +11,7 @@ ;; current version of transitive dependency of com.datastax.oss/java-driver-core io.netty/netty-handler - {:mvn/version "4.1.77.Final"}} + {:mvn/version "4.1.78.Final"}} :aliases {:test @@ -27,7 +27,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/coll/deps.edn b/modules/coll/deps.edn index 307969909..ad0e55f49 100644 --- a/modules/coll/deps.edn +++ b/modules/coll/deps.edn @@ -8,7 +8,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/cql/deps.edn b/modules/cql/deps.edn index 719646fdd..481b06cc7 100644 --- a/modules/cql/deps.edn +++ b/modules/cql/deps.edn @@ -42,7 +42,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db-resource-store-cassandra/deps.edn b/modules/db-resource-store-cassandra/deps.edn index 343fbaaf7..ce42f0269 100644 --- a/modules/db-resource-store-cassandra/deps.edn +++ b/modules/db-resource-store-cassandra/deps.edn @@ -25,7 +25,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db-resource-store/deps.edn b/modules/db-resource-store/deps.edn index 25a762857..dd9c91ffa 100644 --- a/modules/db-resource-store/deps.edn +++ b/modules/db-resource-store/deps.edn @@ -34,7 +34,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db-tx-log-kafka/deps.edn b/modules/db-tx-log-kafka/deps.edn index b1fb42b1f..c4b2e8bc7 100644 --- a/modules/db-tx-log-kafka/deps.edn +++ b/modules/db-tx-log-kafka/deps.edn @@ -28,7 +28,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db-tx-log/deps.edn b/modules/db-tx-log/deps.edn index b89260e43..6f9b1fbdc 100644 --- a/modules/db-tx-log/deps.edn +++ b/modules/db-tx-log/deps.edn @@ -22,7 +22,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db/deps.edn b/modules/db/deps.edn index 3565d7b41..397d144df 100644 --- a/modules/db/deps.edn +++ b/modules/db/deps.edn @@ -52,7 +52,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/executor/deps.edn b/modules/executor/deps.edn index 8c3396f14..37d2ed48c 100644 --- a/modules/executor/deps.edn +++ b/modules/executor/deps.edn @@ -9,7 +9,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/extern-terminology-service/deps.edn b/modules/extern-terminology-service/deps.edn index 258739d79..74f2e770b 100644 --- a/modules/extern-terminology-service/deps.edn +++ b/modules/extern-terminology-service/deps.edn @@ -22,7 +22,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/fhir-client/deps.edn b/modules/fhir-client/deps.edn index b146282ea..23a790d7b 100644 --- a/modules/fhir-client/deps.edn +++ b/modules/fhir-client/deps.edn @@ -31,7 +31,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/fhir-path/deps.edn b/modules/fhir-path/deps.edn index b081b3be2..80ae770c8 100644 --- a/modules/fhir-path/deps.edn +++ b/modules/fhir-path/deps.edn @@ -19,7 +19,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/fhir-structure/deps.edn b/modules/fhir-structure/deps.edn index 1fb7e6387..22b854846 100644 --- a/modules/fhir-structure/deps.edn +++ b/modules/fhir-structure/deps.edn @@ -26,7 +26,7 @@ {:mvn/version "5.2.1"} funcool/cuerdas - {:mvn/version "2022.03.27-397"} + {:mvn/version "2022.06.16-403"} metosin/jsonista {:mvn/version "0.3.6"} @@ -49,7 +49,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/http-client/deps.edn b/modules/http-client/deps.edn index cf8aa5581..2f218eb60 100644 --- a/modules/http-client/deps.edn +++ b/modules/http-client/deps.edn @@ -27,7 +27,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/interaction/deps.edn b/modules/interaction/deps.edn index 8d6e7de32..5e3a5e856 100644 --- a/modules/interaction/deps.edn +++ b/modules/interaction/deps.edn @@ -28,7 +28,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/jepsen/deps.edn b/modules/jepsen/deps.edn index 60a42b26d..affbe5530 100644 --- a/modules/jepsen/deps.edn +++ b/modules/jepsen/deps.edn @@ -12,7 +12,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/kv/deps.edn b/modules/kv/deps.edn index 96cfce248..564ce6aad 100644 --- a/modules/kv/deps.edn +++ b/modules/kv/deps.edn @@ -19,7 +19,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/luid/deps.edn b/modules/luid/deps.edn index 85ce1873e..eb22f41a9 100644 --- a/modules/luid/deps.edn +++ b/modules/luid/deps.edn @@ -16,7 +16,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/metrics/deps.edn b/modules/metrics/deps.edn index f1dc8ac32..f8cb9f6e6 100644 --- a/modules/metrics/deps.edn +++ b/modules/metrics/deps.edn @@ -6,7 +6,7 @@ {:mvn/version "0.0.8"} io.prometheus/simpleclient_hotspot - {:mvn/version "0.15.0"}} + {:mvn/version "0.16.0"}} :aliases {:test @@ -19,7 +19,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/module-base/deps.edn b/modules/module-base/deps.edn index 79ee3bfd6..d566238e0 100644 --- a/modules/module-base/deps.edn +++ b/modules/module-base/deps.edn @@ -10,4 +10,4 @@ :git/sha "32a46f5dca8a6b563a6dddf88bec887be3201b08"} prom-metrics/prom-metrics - {:mvn/version "0.6-alpha.5"}}} + {:mvn/version "0.6-alpha.6"}}} diff --git a/modules/openid-auth/deps.edn b/modules/openid-auth/deps.edn index 3cb648439..fbf0687a5 100644 --- a/modules/openid-auth/deps.edn +++ b/modules/openid-auth/deps.edn @@ -25,7 +25,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/operation-measure-evaluate-measure/deps.edn b/modules/operation-measure-evaluate-measure/deps.edn index c24400998..8337e567a 100644 --- a/modules/operation-measure-evaluate-measure/deps.edn +++ b/modules/operation-measure-evaluate-measure/deps.edn @@ -34,7 +34,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/page-store-cassandra/deps.edn b/modules/page-store-cassandra/deps.edn index fa13f4d49..f78a5a048 100644 --- a/modules/page-store-cassandra/deps.edn +++ b/modules/page-store-cassandra/deps.edn @@ -25,7 +25,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/page-store/deps.edn b/modules/page-store/deps.edn index c4f7ff88b..64479023d 100644 --- a/modules/page-store/deps.edn +++ b/modules/page-store/deps.edn @@ -27,7 +27,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/rest-api/deps.edn b/modules/rest-api/deps.edn index 7a6bf0b9b..0dfb64d8d 100644 --- a/modules/rest-api/deps.edn +++ b/modules/rest-api/deps.edn @@ -33,7 +33,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/rest-util/deps.edn b/modules/rest-util/deps.edn index 69af437b4..ca3e29834 100644 --- a/modules/rest-util/deps.edn +++ b/modules/rest-util/deps.edn @@ -32,7 +32,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/rocksdb/deps.edn b/modules/rocksdb/deps.edn index 0df0d9515..abd455215 100644 --- a/modules/rocksdb/deps.edn +++ b/modules/rocksdb/deps.edn @@ -9,7 +9,7 @@ {:local/root "../module-base"} org.rocksdb/rocksdbjni - {:mvn/version "7.2.2"}} + {:mvn/version "7.3.1"}} :aliases {:test @@ -22,7 +22,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/scheduler/deps.edn b/modules/scheduler/deps.edn index a9c80226a..3a6839f1a 100644 --- a/modules/scheduler/deps.edn +++ b/modules/scheduler/deps.edn @@ -13,7 +13,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/server/deps.edn b/modules/server/deps.edn index 4ff54be2b..01e255625 100644 --- a/modules/server/deps.edn +++ b/modules/server/deps.edn @@ -30,7 +30,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/thread-pool-executor-collector/deps.edn b/modules/thread-pool-executor-collector/deps.edn index b138c2836..ff97693e2 100644 --- a/modules/thread-pool-executor-collector/deps.edn +++ b/modules/thread-pool-executor-collector/deps.edn @@ -16,7 +16,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.66.1034"}} + {:mvn/version "1.67.1055"}} :main-opts ["-m" "kaocha.runner"]} From 783f42ef54e175c6ebeb3b04ddbd5b6511b2ee0e Mon Sep 17 00:00:00 2001 From: Alexander Kiel Date: Wed, 29 Jun 2022 11:13:33 +0200 Subject: [PATCH 4/6] Switch to Media Type text/cql-identifier for CQL Expressions However text/cql will still work. --- .../scripts/evaluate-measure-subject-list.sh | 2 +- .github/scripts/evaluate-measure.sh | 2 +- .../scripts/evaluate-patient-q1-measure.sh | 2 +- docs/cql-queries/api.md | 2 +- evaluate-measure.sh | 2 +- .../evaluate_measure/measure/util.clj | 2 +- .../evaluate_measure/measure/util_test.clj | 21 +++++++++++++++++-- .../evaluate_measure/measure_test.clj | 2 +- .../operation/evaluate_measure/q1-data.json | 2 +- .../operation/evaluate_measure/q10-data.json | 2 +- .../operation/evaluate_measure/q11-data.json | 2 +- .../operation/evaluate_measure/q12-data.json | 2 +- .../operation/evaluate_measure/q13-data.json | 2 +- .../operation/evaluate_measure/q14-data.json | 2 +- .../operation/evaluate_measure/q15-data.json | 2 +- .../operation/evaluate_measure/q16-data.json | 2 +- .../operation/evaluate_measure/q17-data.json | 2 +- .../q18-specimen-bmi-data.json | 2 +- .../q19-stratifier-ageclass-data.json | 4 ++-- .../operation/evaluate_measure/q2-data.json | 2 +- .../q20-stratifier-city-data.json | 4 ++-- ...21-stratifier-city-of-only-women-data.json | 4 ++-- ...-stratifier-multiple-cities-fail-data.json | 4 ++-- ...3-stratifier-ageclass-and-gender-data.json | 6 +++--- .../operation/evaluate_measure/q24-data.json | 2 +- .../q25-stratifier-collection-data.json | 4 ++-- .../q26-stratifier-bmi-data.json | 4 ++-- .../q27-stratifier-calculated-bmi-data.json | 4 ++-- ...relationship-procedure-condition-data.json | 2 +- ...-stratifier-sample-material-type-data.json | 4 ++-- .../operation/evaluate_measure/q3-data.json | 2 +- ...ratifier-with-missing-expression-data.json | 4 ++-- ...1-stratifier-storage-temperature-data.json | 4 ++-- .../q32-stratifier-underweight-data.json | 4 ++-- .../q33-incompatible-quantities-data.json | 2 +- .../evaluate_measure/q34-medication-data.json | 2 +- .../q35-literal-library-ref-data.json | 2 +- .../evaluate_measure/q36-parameter-data.json | 2 +- .../evaluate_measure/q37-overlaps-data.json | 2 +- .../evaluate_measure/q38-di-surv-data.json | 2 +- .../operation/evaluate_measure/q4-data.json | 2 +- .../operation/evaluate_measure/q5-data.json | 2 +- .../operation/evaluate_measure/q6-data.json | 2 +- .../operation/evaluate_measure/q7-data.json | 2 +- .../operation/evaluate_measure/q8-data.json | 2 +- .../operation/evaluate_measure/q9-data.json | 2 +- .../fhir/operation/evaluate_measure_test.clj | 2 +- .../src/test/resources/default/measure.json | 2 +- 48 files changed, 79 insertions(+), 62 deletions(-) diff --git a/.github/scripts/evaluate-measure-subject-list.sh b/.github/scripts/evaluate-measure-subject-list.sh index b4506f737..f608c2168 100755 --- a/.github/scripts/evaluate-measure-subject-list.sh +++ b/.github/scripts/evaluate-measure-subject-list.sh @@ -53,7 +53,7 @@ cat < Date: Wed, 29 Jun 2022 11:59:35 +0200 Subject: [PATCH 5/6] Update Dependencies --- .github/workflows/build.yml | 14 +++++++------- deps.edn | 2 +- modules/anomaly/deps.edn | 2 +- modules/async/deps.edn | 2 +- modules/byte-buffer/deps.edn | 4 ++-- modules/byte-string/deps.edn | 2 +- modules/cassandra/deps.edn | 2 +- modules/coll/deps.edn | 2 +- modules/cql/deps.edn | 4 ++-- modules/db-resource-store-cassandra/deps.edn | 2 +- modules/db-resource-store/deps.edn | 4 ++-- modules/db-tx-log-kafka/deps.edn | 2 +- modules/db-tx-log/deps.edn | 2 +- modules/db/deps.edn | 2 +- modules/executor/deps.edn | 2 +- modules/extern-terminology-service/deps.edn | 2 +- modules/fhir-client/deps.edn | 2 +- modules/fhir-path/deps.edn | 4 ++-- modules/fhir-structure/deps.edn | 2 +- modules/http-client/deps.edn | 2 +- modules/interaction/deps.edn | 2 +- modules/jepsen/deps.edn | 2 +- modules/kv/deps.edn | 2 +- modules/luid/deps.edn | 2 +- modules/metrics/deps.edn | 2 +- modules/openid-auth/deps.edn | 2 +- .../operation-measure-evaluate-measure/deps.edn | 2 +- modules/page-store-cassandra/deps.edn | 2 +- modules/page-store/deps.edn | 2 +- modules/rest-api/deps.edn | 2 +- modules/rest-util/deps.edn | 2 +- modules/rocksdb/deps.edn | 2 +- modules/scheduler/deps.edn | 2 +- modules/server/deps.edn | 2 +- modules/thread-pool-executor-collector/deps.edn | 2 +- 35 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0eb50a6e8..4e09aeb81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Setup clj-kondo uses: DeLaGuardo/setup-clj-kondo@master with: - version: '2022.05.31' + version: '2022.06.22' - name: Check out Git repository uses: actions/checkout@v3 @@ -85,7 +85,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1145' + cli: '1.11.1.1149' - name: Check out Git repository uses: actions/checkout@v3 @@ -116,7 +116,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1145' + cli: '1.11.1.1149' - name: Check out Git repository uses: actions/checkout@v3 @@ -158,7 +158,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1145' + cli: '1.11.1.1149' - name: Check out Git repository uses: actions/checkout@v3 @@ -186,7 +186,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1145' + cli: '1.11.1.1149' - name: Check out Git repository uses: actions/checkout@v3 @@ -583,7 +583,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1145' + cli: '1.11.1.1149' - name: Check out Git repository uses: actions/checkout@v3 @@ -894,7 +894,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - cli: '1.11.1.1145' + cli: '1.11.1.1149' - name: Check out Git repository uses: actions/checkout@v3 diff --git a/deps.edn b/deps.edn index 51beafe35..0b9533a40 100644 --- a/deps.edn +++ b/deps.edn @@ -66,7 +66,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/anomaly/deps.edn b/modules/anomaly/deps.edn index 920c42a29..8f82afc7b 100644 --- a/modules/anomaly/deps.edn +++ b/modules/anomaly/deps.edn @@ -16,7 +16,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/async/deps.edn b/modules/async/deps.edn index 5b3f42aae..38526a4b4 100644 --- a/modules/async/deps.edn +++ b/modules/async/deps.edn @@ -19,7 +19,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/byte-buffer/deps.edn b/modules/byte-buffer/deps.edn index 6f0697cdd..fb6cc90de 100644 --- a/modules/byte-buffer/deps.edn +++ b/modules/byte-buffer/deps.edn @@ -1,6 +1,6 @@ {:deps {com.google.protobuf/protobuf-java - {:mvn/version "3.21.1"}} + {:mvn/version "3.21.2"}} :aliases {:test @@ -13,6 +13,6 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]}}} diff --git a/modules/byte-string/deps.edn b/modules/byte-string/deps.edn index 4980d4e15..c4bb26b0b 100644 --- a/modules/byte-string/deps.edn +++ b/modules/byte-string/deps.edn @@ -5,7 +5,7 @@ {:mvn/version "31.1-jre"} com.google.protobuf/protobuf-java - {:mvn/version "3.21.1"} + {:mvn/version "3.21.2"} com.fasterxml.jackson.core/jackson-databind {:mvn/version "2.13.3"}}} diff --git a/modules/cassandra/deps.edn b/modules/cassandra/deps.edn index 9489f4844..54d541d36 100644 --- a/modules/cassandra/deps.edn +++ b/modules/cassandra/deps.edn @@ -27,7 +27,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/coll/deps.edn b/modules/coll/deps.edn index ad0e55f49..888290546 100644 --- a/modules/coll/deps.edn +++ b/modules/coll/deps.edn @@ -8,7 +8,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/cql/deps.edn b/modules/cql/deps.edn index 481b06cc7..f4cd77227 100644 --- a/modules/cql/deps.edn +++ b/modules/cql/deps.edn @@ -8,7 +8,7 @@ {:mvn/version "2.13.3"} info.cqframework/cql-to-elm - {:mvn/version "1.5.8" + {:mvn/version "1.5.9" :exclusions [com.google.code.javaparser/javaparser info.cqframework/qdm @@ -42,7 +42,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db-resource-store-cassandra/deps.edn b/modules/db-resource-store-cassandra/deps.edn index ce42f0269..ca9b31be2 100644 --- a/modules/db-resource-store-cassandra/deps.edn +++ b/modules/db-resource-store-cassandra/deps.edn @@ -25,7 +25,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db-resource-store/deps.edn b/modules/db-resource-store/deps.edn index dd9c91ffa..8c61e481d 100644 --- a/modules/db-resource-store/deps.edn +++ b/modules/db-resource-store/deps.edn @@ -29,12 +29,12 @@ {:mvn/version "0.4.6"} mvxcvi/clj-cbor - {:mvn/version "1.1.0"}}} + {:mvn/version "1.1.1"}}} :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db-tx-log-kafka/deps.edn b/modules/db-tx-log-kafka/deps.edn index c4b2e8bc7..ecb5ffc9e 100644 --- a/modules/db-tx-log-kafka/deps.edn +++ b/modules/db-tx-log-kafka/deps.edn @@ -28,7 +28,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db-tx-log/deps.edn b/modules/db-tx-log/deps.edn index 6f9b1fbdc..f308ab978 100644 --- a/modules/db-tx-log/deps.edn +++ b/modules/db-tx-log/deps.edn @@ -22,7 +22,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/db/deps.edn b/modules/db/deps.edn index 397d144df..a6215312c 100644 --- a/modules/db/deps.edn +++ b/modules/db/deps.edn @@ -52,7 +52,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/executor/deps.edn b/modules/executor/deps.edn index 37d2ed48c..21db138ba 100644 --- a/modules/executor/deps.edn +++ b/modules/executor/deps.edn @@ -9,7 +9,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/extern-terminology-service/deps.edn b/modules/extern-terminology-service/deps.edn index 74f2e770b..44207fa02 100644 --- a/modules/extern-terminology-service/deps.edn +++ b/modules/extern-terminology-service/deps.edn @@ -22,7 +22,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/fhir-client/deps.edn b/modules/fhir-client/deps.edn index 23a790d7b..de1227643 100644 --- a/modules/fhir-client/deps.edn +++ b/modules/fhir-client/deps.edn @@ -31,7 +31,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/fhir-path/deps.edn b/modules/fhir-path/deps.edn index 80ae770c8..0b005d9d7 100644 --- a/modules/fhir-path/deps.edn +++ b/modules/fhir-path/deps.edn @@ -3,7 +3,7 @@ {:local/root "../fhir-structure"} info.cqframework/cql - {:mvn/version "1.5.8"}} + {:mvn/version "1.5.9"}} :aliases {:test @@ -19,7 +19,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/fhir-structure/deps.edn b/modules/fhir-structure/deps.edn index 22b854846..b64d3a836 100644 --- a/modules/fhir-structure/deps.edn +++ b/modules/fhir-structure/deps.edn @@ -49,7 +49,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/http-client/deps.edn b/modules/http-client/deps.edn index 2f218eb60..2ced4be5f 100644 --- a/modules/http-client/deps.edn +++ b/modules/http-client/deps.edn @@ -27,7 +27,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/interaction/deps.edn b/modules/interaction/deps.edn index 5e3a5e856..40ae0796f 100644 --- a/modules/interaction/deps.edn +++ b/modules/interaction/deps.edn @@ -28,7 +28,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/jepsen/deps.edn b/modules/jepsen/deps.edn index affbe5530..5ca789b91 100644 --- a/modules/jepsen/deps.edn +++ b/modules/jepsen/deps.edn @@ -12,7 +12,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/kv/deps.edn b/modules/kv/deps.edn index 564ce6aad..e4cf0b647 100644 --- a/modules/kv/deps.edn +++ b/modules/kv/deps.edn @@ -19,7 +19,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/luid/deps.edn b/modules/luid/deps.edn index eb22f41a9..6c8460e85 100644 --- a/modules/luid/deps.edn +++ b/modules/luid/deps.edn @@ -16,7 +16,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/metrics/deps.edn b/modules/metrics/deps.edn index f8cb9f6e6..67a6f50b8 100644 --- a/modules/metrics/deps.edn +++ b/modules/metrics/deps.edn @@ -19,7 +19,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/openid-auth/deps.edn b/modules/openid-auth/deps.edn index fbf0687a5..5d9deefc4 100644 --- a/modules/openid-auth/deps.edn +++ b/modules/openid-auth/deps.edn @@ -25,7 +25,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/operation-measure-evaluate-measure/deps.edn b/modules/operation-measure-evaluate-measure/deps.edn index 8337e567a..fa8bba9da 100644 --- a/modules/operation-measure-evaluate-measure/deps.edn +++ b/modules/operation-measure-evaluate-measure/deps.edn @@ -34,7 +34,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/page-store-cassandra/deps.edn b/modules/page-store-cassandra/deps.edn index f78a5a048..036c5b106 100644 --- a/modules/page-store-cassandra/deps.edn +++ b/modules/page-store-cassandra/deps.edn @@ -25,7 +25,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/page-store/deps.edn b/modules/page-store/deps.edn index 64479023d..c0ea62c82 100644 --- a/modules/page-store/deps.edn +++ b/modules/page-store/deps.edn @@ -27,7 +27,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/rest-api/deps.edn b/modules/rest-api/deps.edn index 0dfb64d8d..5ba8149d5 100644 --- a/modules/rest-api/deps.edn +++ b/modules/rest-api/deps.edn @@ -33,7 +33,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/rest-util/deps.edn b/modules/rest-util/deps.edn index ca3e29834..b4e3ddae7 100644 --- a/modules/rest-util/deps.edn +++ b/modules/rest-util/deps.edn @@ -32,7 +32,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/rocksdb/deps.edn b/modules/rocksdb/deps.edn index abd455215..b930d741c 100644 --- a/modules/rocksdb/deps.edn +++ b/modules/rocksdb/deps.edn @@ -22,7 +22,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/scheduler/deps.edn b/modules/scheduler/deps.edn index 3a6839f1a..326657e09 100644 --- a/modules/scheduler/deps.edn +++ b/modules/scheduler/deps.edn @@ -13,7 +13,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/server/deps.edn b/modules/server/deps.edn index 01e255625..b674854e3 100644 --- a/modules/server/deps.edn +++ b/modules/server/deps.edn @@ -30,7 +30,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} diff --git a/modules/thread-pool-executor-collector/deps.edn b/modules/thread-pool-executor-collector/deps.edn index ff97693e2..34124b5ee 100644 --- a/modules/thread-pool-executor-collector/deps.edn +++ b/modules/thread-pool-executor-collector/deps.edn @@ -16,7 +16,7 @@ :kaocha {:extra-deps {lambdaisland/kaocha - {:mvn/version "1.67.1055"}} + {:mvn/version "1.68.1059"}} :main-opts ["-m" "kaocha.runner"]} From 5d276e3860cbbe671056e0d476c2fd1febbaf525 Mon Sep 17 00:00:00 2001 From: Alexander Kiel Date: Thu, 30 Jun 2022 12:26:36 +0200 Subject: [PATCH 6/6] Release v0.17.8 --- CHANGELOG.md | 12 +++++++++++- README.md | 4 ++-- docs/deployment/docker-deployment.md | 4 ++-- docs/deployment/manual-deployment.md | 12 ++++++------ modules/rest-api/src/blaze/rest_api/capabilities.clj | 2 +- perf-test/gatling/pom.xml | 2 +- pom.xml | 2 +- src/blaze/system.clj | 2 +- 8 files changed, 25 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd8d6d930..86567202b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Changelog -## v0.17.6 +## v0.17.8 + +### Other + +* Switch to Media Type text/cql-identifier for CQL Expressions ([#748](https://github.com/samply/blaze/pull/748)) +* Update Dependencies ([#749](https://github.com/samply/blaze/pull/749)) +* Update Dependencies ([#746](https://github.com/samply/blaze/pull/746)) + +The full changelog can be found [here](https://github.com/samply/blaze/milestone/46?closed=1). + +## v0.17.7 ### Other diff --git a/README.md b/README.md index 041533bad..8a48ee0ae 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The goal of this project is to provide a FHIR® Store with an internal CQL Evalu Blaze passes all [Touchstone FHIR 4.0.1 Basic Tests][12] and almost all [CQL Tests][3]. Please refer to the [Conformance](docs/conformance.md) section and report any issues you encounter during evaluation. -Latest release: [v0.17.7][5] +Latest release: [v0.17.8][5] ## Quick Start @@ -72,7 +72,7 @@ Unless required by applicable law or agreed to in writing, software distributed [3]: [4]: -[5]: +[5]: [6]: [7]: [8]: diff --git a/docs/deployment/docker-deployment.md b/docs/deployment/docker-deployment.md index 828b3c801..f8ea6894c 100644 --- a/docs/deployment/docker-deployment.md +++ b/docs/deployment/docker-deployment.md @@ -27,7 +27,7 @@ Blaze should log something like this: 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8 -2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.7 in 8.2 seconds +2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.8 in 8.2 seconds ``` In order to test connectivity, query the health endpoint: @@ -47,7 +47,7 @@ that should return: ```json { "name": "Blaze", - "version": "0.17.7" + "version": "0.17.8" } ``` diff --git a/docs/deployment/manual-deployment.md b/docs/deployment/manual-deployment.md index 7523ff7e2..299e7a41e 100644 --- a/docs/deployment/manual-deployment.md +++ b/docs/deployment/manual-deployment.md @@ -2,12 +2,12 @@ The installation works under Windows, Linux and macOS. The only dependency is an installed OpenJDK 11. Blaze is tested with [AdoptOpenJDK][1]. -Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.17.7). Look for `blaze-0.17.7-standalone.jar`. +Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.17.8). Look for `blaze-0.17.8-standalone.jar`. After the download, you can start blaze with the following command (Linux, macOS): ```sh -java -jar blaze-0.17.7-standalone.jar -m blaze.core +java -jar blaze-0.17.8-standalone.jar -m blaze.core ``` Blaze will run with an in-memory, volatile database for testing and demo purposes. @@ -17,14 +17,14 @@ Blaze can be run with durable storage by setting the environment variables `STOR Under Linux/macOS: ```sh -STORAGE=standalone java -jar blaze-0.17.7-standalone.jar -m blaze.core +STORAGE=standalone java -jar blaze-0.17.8-standalone.jar -m blaze.core ``` Under Windows, you need to set the Environment variables in the PowerShell before starting Blaze: ```powershell $Env:STORAGE="standalone" -java -jar blaze-0.17.7-standalone.jar -m blaze.core +java -jar blaze-0.17.8-standalone.jar -m blaze.core ``` This will create three directories called `index`, `transaction` and `resource` inside the current working directory, one for each database part used. @@ -42,7 +42,7 @@ The output should look like this: 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8 -2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.7 in 8.2 seconds +2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.8 in 8.2 seconds ``` In order to test connectivity, query the health endpoint: @@ -62,7 +62,7 @@ that should return: ```json { "name": "Blaze", - "version": "0.17.7" + "version": "0.17.8" } ``` diff --git a/modules/rest-api/src/blaze/rest_api/capabilities.clj b/modules/rest-api/src/blaze/rest_api/capabilities.clj index 2ff7f9fd4..0f6974d2d 100644 --- a/modules/rest-api/src/blaze/rest_api/capabilities.clj +++ b/modules/rest-api/src/blaze/rest_api/capabilities.clj @@ -117,7 +117,7 @@ :copyright #fhir/markdown"Copyright 2019 - 2022 The Samply Community\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License." :kind #fhir/code"instance" - :date #fhir/dateTime"2022-06-05" + :date #fhir/dateTime"2022-06-30" :software {:name "Blaze" :version version} diff --git a/perf-test/gatling/pom.xml b/perf-test/gatling/pom.xml index c3b9c61af..6464d4f17 100644 --- a/perf-test/gatling/pom.xml +++ b/perf-test/gatling/pom.xml @@ -5,7 +5,7 @@ samply.blaze gatling - 0.17.7 + 0.17.8 1.8 diff --git a/pom.xml b/pom.xml index ea749e4a9..633f6e89e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 samply blaze - 0.17.7 + 0.17.8 blaze A FHIR Store with internal, fast CQL Evaluation Engine diff --git a/src/blaze/system.clj b/src/blaze/system.clj index f7f0f87cd..bac30e8c3 100644 --- a/src/blaze/system.clj +++ b/src/blaze/system.clj @@ -85,7 +85,7 @@ (def ^:private root-config - {:blaze/version "0.17.7" + {:blaze/version "0.17.8" :blaze/clock {}