From b4eb7a08d003ef0b50903ec2e1fa75aa279fdb3f Mon Sep 17 00:00:00 2001 From: Alexander Kiel Date: Thu, 20 Jan 2022 10:36:18 +0100 Subject: [PATCH 1/2] Update Dependencies --- .github/workflows/build.yml | 14 +++++++------- deps.edn | 4 ++-- modules/byte-string/deps.edn | 2 +- modules/cassandra/deps.edn | 2 +- modules/fhir-structure/deps.edn | 2 +- modules/openid-auth/deps.edn | 5 +---- modules/rest-api/deps.edn | 2 +- modules/rest-util/deps.edn | 2 +- modules/server/deps.edn | 6 +++--- 9 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff0d73400..217fca8ce 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: '2021.12.19' + version: '2022.01.15' - name: Check out Git repository uses: actions/checkout@v2 @@ -86,7 +86,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1053' + tools-deps: '1.10.3.1058' - name: Check out Git repository uses: actions/checkout@v2 @@ -117,7 +117,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1053' + tools-deps: '1.10.3.1058' - name: Check out Git repository uses: actions/checkout@v2 @@ -159,7 +159,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1053' + tools-deps: '1.10.3.1058' - name: Check out Git repository uses: actions/checkout@v2 @@ -187,7 +187,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1053' + tools-deps: '1.10.3.1058' - name: Check out Git repository uses: actions/checkout@v2 @@ -478,7 +478,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1053' + tools-deps: '1.10.3.1058' - name: Check out Git repository uses: actions/checkout@v2 @@ -747,7 +747,7 @@ jobs: - name: Setup Clojure uses: DeLaGuardo/setup-clojure@master with: - tools-deps: '1.10.3.1053' + tools-deps: '1.10.3.1058' - name: Check out Git repository uses: actions/checkout@v2 diff --git a/deps.edn b/deps.edn index c4c6d7736..ae43ef4a6 100644 --- a/deps.edn +++ b/deps.edn @@ -44,7 +44,7 @@ {:mvn/version "1.3.6"} org.slf4j/slf4j-nop - {:mvn/version "1.7.32"}} + {:mvn/version "1.7.33"}} :aliases {:depstar @@ -84,7 +84,7 @@ {:mvn/version "1.3.1"} org.slf4j/slf4j-nop - {:mvn/version "1.7.32"}} + {:mvn/version "1.7.33"}} :main-opts ["-m" "antq.core" diff --git a/modules/byte-string/deps.edn b/modules/byte-string/deps.edn index 5d5f32724..d31b49e5e 100644 --- a/modules/byte-string/deps.edn +++ b/modules/byte-string/deps.edn @@ -5,7 +5,7 @@ {:mvn/version "31.0.1-jre"} com.google.protobuf/protobuf-java - {:mvn/version "3.19.2"} + {:mvn/version "3.19.3"} com.fasterxml.jackson.core/jackson-databind {:mvn/version "2.13.1"}}} diff --git a/modules/cassandra/deps.edn b/modules/cassandra/deps.edn index b76f864d3..1380bda4c 100644 --- a/modules/cassandra/deps.edn +++ b/modules/cassandra/deps.edn @@ -13,7 +13,7 @@ ;; current version of transitive dependency of com.datastax.oss/java-driver-core io.netty/netty-handler - {:mvn/version "4.1.72.Final"}} + {:mvn/version "4.1.73.Final"}} :aliases {:test diff --git a/modules/fhir-structure/deps.edn b/modules/fhir-structure/deps.edn index c7011c07f..c618595ff 100644 --- a/modules/fhir-structure/deps.edn +++ b/modules/fhir-structure/deps.edn @@ -23,7 +23,7 @@ {:mvn/version "5.1.2"} funcool/cuerdas - {:mvn/version "2021.05.29-0"} + {:mvn/version "2022.01.14-391"} metosin/jsonista {:mvn/version "0.3.5"} diff --git a/modules/openid-auth/deps.edn b/modules/openid-auth/deps.edn index a47c73dc9..27441114d 100644 --- a/modules/openid-auth/deps.edn +++ b/modules/openid-auth/deps.edn @@ -9,10 +9,7 @@ {:local/root "../scheduler"} buddy/buddy-auth - {:mvn/version "3.0.1"} - - buddy/buddy-sign - {:mvn/version "3.4.1"}} + {:mvn/version "3.0.323"}} :aliases {:test diff --git a/modules/rest-api/deps.edn b/modules/rest-api/deps.edn index 91227d336..82c00cb28 100644 --- a/modules/rest-api/deps.edn +++ b/modules/rest-api/deps.edn @@ -15,7 +15,7 @@ {:local/root "../structure-definition"} buddy/buddy-auth - {:mvn/version "3.0.1"} + {:mvn/version "3.0.323"} org.clojure/data.xml {:mvn/version "0.2.0-alpha6"}} diff --git a/modules/rest-util/deps.edn b/modules/rest-util/deps.edn index 62eadc129..9950b0d9d 100644 --- a/modules/rest-util/deps.edn +++ b/modules/rest-util/deps.edn @@ -15,7 +15,7 @@ {:mvn/version "0.5.15"} ring/ring-core - {:mvn/version "1.9.4" + {:mvn/version "1.9.5" :exclusions [commons-fileupload/commons-fileupload crypto-equality/crypto-equality diff --git a/modules/server/deps.edn b/modules/server/deps.edn index aa2b07b71..c724096d3 100644 --- a/modules/server/deps.edn +++ b/modules/server/deps.edn @@ -9,7 +9,7 @@ {:mvn/version "9.4.44.v20210927"} ring/ring-jetty-adapter - {:mvn/version "1.9.4" + {:mvn/version "1.9.5" :exclusions [clj-time/clj-time commons-fileupload/commons-fileupload @@ -31,7 +31,7 @@ {:mvn/version "1.60.977"} org.slf4j/slf4j-nop - {:mvn/version "1.7.32"}} + {:mvn/version "1.7.33"}} :main-opts ["-m" "kaocha.runner"]} @@ -49,7 +49,7 @@ {:mvn/version "0.8.2"} org.slf4j/slf4j-nop - {:mvn/version "1.7.32"}} + {:mvn/version "1.7.33"}} :main-opts ["-m" "cloverage.coverage" "--codecov" "-p" "src" "-s" "test" "-e" ".*spec$"]}}} From 04d5e956292234abcb4f0b1bb0268ff0f799c25f Mon Sep 17 00:00:00 2001 From: Alexander Kiel Date: Thu, 20 Jan 2022 11:07:52 +0100 Subject: [PATCH 2/2] Release v0.15.3 --- CHANGELOG.md | 8 ++++++++ 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, 22 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b39f00567..bd218edc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## v0.15.3 + +### Security + +* Update Dependencies ([#585](https://github.com/samply/blaze/pull/585)) + +The full changelog can be found [here](https://github.com/samply/blaze/milestone/26?closed=1). + ## v0.15.2 ### Security diff --git a/README.md b/README.md index dfd164558..2a77ee298 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.15.2][5] +Latest release: [v0.15.3][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 748ae42c1..95e66ef26 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.15.2 in 8.2 seconds +2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.15.3 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.15.2" + "version": "0.15.3" } ``` diff --git a/docs/deployment/manual-deployment.md b/docs/deployment/manual-deployment.md index 99e364356..296c4c4de 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.15.2). Look for `blaze-0.15.2-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.15.3). Look for `blaze-0.15.3-standalone.jar`. After the download, you can start blaze with the following command (Linux, macOS): ```sh -java -jar blaze-0.15.2-standalone.jar -m blaze.core +java -jar blaze-0.15.3-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.15.2-standalone.jar -m blaze.core +STORAGE=standalone java -jar blaze-0.15.3-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.15.2-standalone.jar -m blaze.core +java -jar blaze-0.15.3-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.15.2 in 8.2 seconds +2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.15.3 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.15.2" + "version": "0.15.3" } ``` diff --git a/modules/rest-api/src/blaze/rest_api/capabilities.clj b/modules/rest-api/src/blaze/rest_api/capabilities.clj index 1692030b5..7ca3f34b6 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 - 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-01-11" + :date #fhir/dateTime"2022-01-20" :software {:name "Blaze" :version version} diff --git a/perf-test/gatling/pom.xml b/perf-test/gatling/pom.xml index 5c45fcdde..7653dbc0f 100644 --- a/perf-test/gatling/pom.xml +++ b/perf-test/gatling/pom.xml @@ -5,7 +5,7 @@ samply.blaze gatling - 0.15.2 + 0.15.3 1.8 diff --git a/pom.xml b/pom.xml index 2dfe5ba63..12900722c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 samply blaze - 0.15.2 + 0.15.3 blaze A FHIR Store with internal, fast CQL Evaluation Engine diff --git a/src/blaze/system.clj b/src/blaze/system.clj index 22a8f6368..421605254 100644 --- a/src/blaze/system.clj +++ b/src/blaze/system.clj @@ -87,7 +87,7 @@ (def ^:private root-config - {:blaze/version "0.15.2" + {:blaze/version "0.15.3" :blaze/clock {}