diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36788b519..84f236229 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Setup clj-kondo uses: DeLaGuardo/setup-clj-kondo@master with: - version: '2021.10.19' + version: '2021.12.01' - name: Check out Git repository uses: actions/checkout@v2 @@ -83,7 +83,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1029' + tools-deps: '1.10.3.1040' - name: Check out Git repository uses: actions/checkout@v2 @@ -149,7 +149,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1029' + tools-deps: '1.10.3.1040' - name: Check out Git repository uses: actions/checkout@v2 @@ -191,7 +191,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1029' + tools-deps: '1.10.3.1040' - name: Check out Git repository uses: actions/checkout@v2 @@ -219,7 +219,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1029' + tools-deps: '1.10.3.1040' - name: Check out Git repository uses: actions/checkout@v2 @@ -291,7 +291,7 @@ jobs: output: trivy-results.sarif - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@codeql-bundle-20211115 + uses: github/codeql-action/upload-sarif@codeql-bundle-20211208 with: sarif_file: trivy-results.sarif @@ -510,7 +510,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1029' + tools-deps: '1.10.3.1040' - name: Check out Git repository uses: actions/checkout@v2 @@ -779,7 +779,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1029' + tools-deps: '1.10.3.1040' - name: Check out Git repository uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5babd7402..6fe3153f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## v0.14.1 + +### Other + +* Update Dependencies ([#561](https://github.com/samply/blaze/pull/561)) + +The full changelog can be found [here](https://github.com/samply/blaze/milestone/22?closed=1). + ## v0.14.0 ### New Features diff --git a/README.md b/README.md index 32e283d05..294a0f894 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.14.0][5] +Latest release: [v0.14.1][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/deps.edn b/deps.edn index e45c0ee23..15d179e94 100644 --- a/deps.edn +++ b/deps.edn @@ -67,7 +67,7 @@ {:mvn/version "1.60.945"} org.clojure/tools.namespace - {:mvn/version "1.1.0"}} + {:mvn/version "1.1.1"}} :main-opts ["-m" "kaocha.runner"]} @@ -76,7 +76,7 @@ :extra-deps {org.clojure/tools.namespace - {:mvn/version "1.1.0"}}} + {:mvn/version "1.1.1"}}} :outdated {:replace-deps diff --git a/docs/deployment/docker-deployment.md b/docs/deployment/docker-deployment.md index 979f948ff..21a6dd217 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.14.0 in 8.2 seconds +2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.14.1 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.14.0" + "version": "0.14.1" } ``` diff --git a/docs/deployment/manual-deployment.md b/docs/deployment/manual-deployment.md index e2c2513e0..f402bd793 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.14.0). Look for `blaze-0.14.0-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.14.1). Look for `blaze-0.14.1-standalone.jar`. After the download, you can start blaze with the following command (Linux, macOS): ```sh -java -jar blaze-0.14.0-standalone.jar -m blaze.core +java -jar blaze-0.14.1-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.14.0-standalone.jar -m blaze.core +STORAGE=standalone java -jar blaze-0.14.1-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.14.0-standalone.jar -m blaze.core +java -jar blaze-0.14.1-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.14.0 in 8.2 seconds +2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.14.1 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.14.0" + "version": "0.14.1" } ``` diff --git a/modules/db-resource-store-cassandra/test/blaze/db/resource_store/cassandra_test.clj b/modules/db-resource-store-cassandra/test/blaze/db/resource_store/cassandra_test.clj index a0997c1ce..ef8a0c7c7 100644 --- a/modules/db-resource-store-cassandra/test/blaze/db/resource_store/cassandra_test.clj +++ b/modules/db-resource-store-cassandra/test/blaze/db/resource_store/cassandra_test.clj @@ -26,10 +26,11 @@ Statement Row AsyncResultSet SimpleStatement] [com.datastax.oss.driver.api.core.metadata Node EndPoint] [com.datastax.oss.driver.api.core.servererrors WriteTimeoutException WriteType] + [com.fasterxml.jackson.dataformat.cbor CBORFactory] [java.net InetSocketAddress] [java.nio ByteBuffer] - [java.util.concurrent CompletionStage] - [com.fasterxml.jackson.dataformat.cbor CBORFactory])) + #_{:clj-kondo/ignore [:unused-import]} + [java.util.concurrent CompletionStage])) (st/instrument) diff --git a/modules/fhir-structure/deps.edn b/modules/fhir-structure/deps.edn index abec673aa..293a1c504 100644 --- a/modules/fhir-structure/deps.edn +++ b/modules/fhir-structure/deps.edn @@ -11,7 +11,7 @@ {:mvn/version "0.3.3"} com.github.ben-manes.caffeine/caffeine - {:mvn/version "3.0.4"} + {:mvn/version "3.0.5"} com.google.guava/guava {:mvn/version "31.0.1-jre"} @@ -32,7 +32,7 @@ {:mvn/version "2021.05.29-0"} metosin/jsonista - {:mvn/version "0.3.4"} + {:mvn/version "0.3.5"} org.clojure/alpha.spec {:git/url "https://github.com/alexanderkiel/spec-alpha2.git" diff --git a/modules/fhir-structure/src/blaze/fhir/spec/impl/specs.clj b/modules/fhir-structure/src/blaze/fhir/spec/impl/specs.clj index b2f7d30fb..81aceaa3a 100644 --- a/modules/fhir-structure/src/blaze/fhir/spec/impl/specs.clj +++ b/modules/fhir-structure/src/blaze/fhir/spec/impl/specs.clj @@ -61,7 +61,7 @@ ret)) ::s/invalid)) (unform* [_ x] x) - (explain* [_ path via in x _ _]) + (explain* [_ _path _via _in _x _ _]) (gen* [_ _ _ _]) (with-gen* [_ _]) (describe* [_] `(record ~class-sym ~spec-forms))))) diff --git a/modules/page-store/deps.edn b/modules/page-store/deps.edn index 8a5343108..001f78c4d 100644 --- a/modules/page-store/deps.edn +++ b/modules/page-store/deps.edn @@ -11,7 +11,7 @@ {:local/root "../module-base"} com.github.ben-manes.caffeine/caffeine - {:mvn/version "3.0.4"} + {:mvn/version "3.0.5"} com.google.guava/guava {:mvn/version "31.0.1-jre"}} diff --git a/modules/rest-api/src/blaze/rest_api/capabilities.clj b/modules/rest-api/src/blaze/rest_api/capabilities.clj index 55cbab276..de64332e2 100644 --- a/modules/rest-api/src/blaze/rest_api/capabilities.clj +++ b/modules/rest-api/src/blaze/rest_api/capabilities.clj @@ -111,7 +111,7 @@ :copyright #fhir/markdown"Copyright 2019 - 2021 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"2021-12-03" + :date #fhir/dateTime"2021-12-09" :software {:name "Blaze" :version version} diff --git a/modules/rest-util/deps.edn b/modules/rest-util/deps.edn index 129c32784..5f2533435 100644 --- a/modules/rest-util/deps.edn +++ b/modules/rest-util/deps.edn @@ -9,7 +9,7 @@ {:local/root "../fhir-structure"} org.apache.httpcomponents/httpcore - {:mvn/version "4.4.14"} + {:mvn/version "4.4.15"} metosin/reitit-ring {:mvn/version "0.5.15"} diff --git a/modules/structure-definition/deps.edn b/modules/structure-definition/deps.edn index 4dcf302d1..bd610e978 100644 --- a/modules/structure-definition/deps.edn +++ b/modules/structure-definition/deps.edn @@ -5,4 +5,4 @@ {:local/root "../module-base"} metosin/jsonista - {:mvn/version "0.3.4"}}} + {:mvn/version "0.3.5"}}} diff --git a/modules/test-util/deps.edn b/modules/test-util/deps.edn index 580fd19f3..d82d8e692 100644 --- a/modules/test-util/deps.edn +++ b/modules/test-util/deps.edn @@ -10,4 +10,4 @@ {:mvn/version "0.1"} org.clojure/test.check - {:mvn/version "1.1.0"}}} + {:mvn/version "1.1.1"}}} diff --git a/perf-test/gatling/pom.xml b/perf-test/gatling/pom.xml index 636c77bda..f6f891b55 100644 --- a/perf-test/gatling/pom.xml +++ b/perf-test/gatling/pom.xml @@ -5,7 +5,7 @@ samply.blaze gatling - 0.14.0 + 0.14.1 1.8 diff --git a/pom.xml b/pom.xml index f83ee2929..c0b17e4e5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 samply blaze - 0.14.0 + 0.14.1 blaze A FHIR Store with internal, fast CQL Evaluation Engine diff --git a/src/blaze/system.clj b/src/blaze/system.clj index 67c9b6ffd..3a4c6f6b0 100644 --- a/src/blaze/system.clj +++ b/src/blaze/system.clj @@ -87,7 +87,7 @@ (def ^:private root-config - {:blaze/version "0.14.0" + {:blaze/version "0.14.1" :blaze/clock {}