From 610bee5750cabd049be7b1abbe3281c42700814c Mon Sep 17 00:00:00 2001 From: Alexander Kiel Date: Thu, 26 Jan 2023 17:06:06 +0100 Subject: [PATCH] Release v0.19.0 --- .github/workflows/build.yml | 11 +++++++++-- CHANGELOG.md | 10 +++++++++- Dockerfile | 4 ++-- README.md | 6 +++--- build.clj | 2 +- docker-compose.yml | 2 +- docs/authentication/docker-compose.yml | 2 +- docs/cql-queries.md | 2 +- docs/cql-queries/blazectl.md | 2 +- docs/cql-queries/command-line.md | 2 +- docs/data-sync/docker-compose.yml | 2 +- docs/database/migration.md | 2 +- docs/deployment/distributed.md | 4 ++-- docs/deployment/distributed/docker-compose.yml | 4 ++-- docs/deployment/docker-deployment.md | 8 ++++---- docs/deployment/manual-deployment.md | 12 ++++++------ docs/performance/fhir-search/simple-code-search.sh | 2 +- docs/performance/import.sh | 2 +- modules/rest-api/src/blaze/rest_api/capabilities.clj | 4 ++-- perf-test/gatling/pom.xml | 2 +- src/blaze/system.clj | 2 +- 21 files changed, 51 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b20ef7a83..7207e4eb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,7 +204,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: blaze-uberjar - path: target/blaze-0.18.6-standalone.jar + path: target/blaze-*-standalone.jar - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -246,6 +246,7 @@ jobs: format: sarif output: trivy-results.sarif severity: 'CRITICAL,HIGH' + timeout: '15m0s' - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v2 @@ -1259,7 +1260,7 @@ jobs: uses: actions/download-artifact@v3 with: name: blaze-uberjar - path: target/blaze-0.18.6-standalone.jar + path: target - name: Download Blaze Image uses: actions/download-artifact@v3 @@ -1311,3 +1312,9 @@ jobs: push: true tags: ${{ steps.docker-meta.outputs.tags }} labels: ${{ steps.docker-meta.outputs.labels }} + + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: target/blaze-*-standalone.jar diff --git a/CHANGELOG.md b/CHANGELOG.md index 998a9574c..81149e770 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,18 @@ # Changelog +## v0.19.0 + +### Documentation + +* Add Evaluate Measure Timeout ([#888](https://github.com/samply/blaze/pull/888)) + +The full changelog can be found [here](https://github.com/samply/blaze/milestone/38?closed=1). + ## v0.18.6 ### Documentation -* Enhance Development Docs ([#878](https://github.com/samply/blaze/issues/878)) +* Enhance Development Docs ([#878](https://github.com/samply/blaze/pull/878)) The full changelog can be found [here](https://github.com/samply/blaze/milestone/57?closed=1). diff --git a/Dockerfile b/Dockerfile index e909bc8fd..fcd1268d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get upgrade -y && \ rm -rf /var/lib/apt/lists/ RUN mkdir -p /app/data && chown 1001:1001 /app/data -COPY target/blaze-0.18.6-standalone.jar /app/ +COPY target/blaze-0.19.0-standalone.jar /app/ WORKDIR /app USER 1001 @@ -16,4 +16,4 @@ ENV INDEX_DB_DIR="/app/data/index" ENV TRANSACTION_DB_DIR="/app/data/transaction" ENV RESOURCE_DB_DIR="/app/data/resource" -CMD ["java", "-jar", "blaze-0.18.6-standalone.jar"] +CMD ["java", "-jar", "blaze-0.19.0-standalone.jar"] diff --git a/README.md b/README.md index 77ab07ff7..7bc57eee6 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,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.18.6][5] +Latest release: [v0.19.0][5] ## Quick Start @@ -25,7 +25,7 @@ In order to run Blaze just execute the following: ```sh docker volume create blaze-data -docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.18 +docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.19 ``` Blaze will create multiple directories inside the `blaze-data` volume on its first start and use the same directories on subsequent starts. @@ -73,7 +73,7 @@ Unless required by applicable law or agreed to in writing, software distributed [3]: [4]: -[5]: +[5]: [6]: [7]: [8]: diff --git a/build.clj b/build.clj index 08260fb98..8af30a865 100644 --- a/build.clj +++ b/build.clj @@ -2,7 +2,7 @@ (:require [clojure.tools.build.api :as b])) (def lib 'samply/blaze) -(def version "0.18.6") +(def version "0.19.0") (def class-dir "target/classes") (def basis (b/create-basis {:project "deps.edn"})) (def uber-file (format "target/%s-%s-standalone.jar" (name lib) version)) diff --git a/docker-compose.yml b/docker-compose.yml index 0861b0c04..73c08ef69 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.2' services: blaze: - image: "samply/blaze:0.18" + image: "samply/blaze:0.19" environment: BASE_URL: "http://localhost:8080" JAVA_TOOL_OPTIONS: "-Xmx2g" diff --git a/docs/authentication/docker-compose.yml b/docs/authentication/docker-compose.yml index ce7e07cf5..6e7f3ccd0 100644 --- a/docs/authentication/docker-compose.yml +++ b/docs/authentication/docker-compose.yml @@ -11,7 +11,7 @@ services: volumes: - "../../.github/openid-auth-test/realm.json:/tmp/realm.json" blaze: - image: "samply/blaze:0.18" + image: "samply/blaze:0.19" environment: BASE_URL: "http://localhost:8080" JAVA_TOOL_OPTIONS: "-Xmx2g" diff --git a/docs/cql-queries.md b/docs/cql-queries.md index a27272398..5e31853d8 100644 --- a/docs/cql-queries.md +++ b/docs/cql-queries.md @@ -22,7 +22,7 @@ The most accessible way to create and execute CQL queries is to use the Quality If you don't already have Blaze running, you can read about how to do it in [Deployment](deployment/README.md). If you have Docker available just run: ``` -docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.18 +docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.19 ``` Start the Quality Reporting UI. You should see an empty measure list. diff --git a/docs/cql-queries/blazectl.md b/docs/cql-queries/blazectl.md index fa10f9f17..30f704108 100644 --- a/docs/cql-queries/blazectl.md +++ b/docs/cql-queries/blazectl.md @@ -20,7 +20,7 @@ cd blaze If you don't already have Blaze running, you can read about how to do it in [Deployment](../deployment/README.md). If you have Docker available just run: ```sh -docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.18 +docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.19 ``` ## Import some data diff --git a/docs/cql-queries/command-line.md b/docs/cql-queries/command-line.md index 2c0de785d..defedcdfd 100644 --- a/docs/cql-queries/command-line.md +++ b/docs/cql-queries/command-line.md @@ -16,7 +16,7 @@ cd blaze If you don't already have Blaze running, you can read about how to do it in [Deployment](../deployment/README.md). If you have Docker available just run: ```sh -docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.18 +docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.19 ``` ## Import some data diff --git a/docs/data-sync/docker-compose.yml b/docs/data-sync/docker-compose.yml index c2db92559..43cc90c39 100644 --- a/docs/data-sync/docker-compose.yml +++ b/docs/data-sync/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.2' services: blaze: - image: "samply/blaze:0.18" + image: "samply/blaze:0.19" environment: BASE_URL: "http://localhost:8080" JAVA_TOOL_OPTIONS: "-Xmx4g" diff --git a/docs/database/migration.md b/docs/database/migration.md index 6d9920cf6..240323b8e 100644 --- a/docs/database/migration.md +++ b/docs/database/migration.md @@ -22,7 +22,7 @@ backup of all the data Blaze has written to disk, **plan for a downtime**, delet Please start Blaze with a shell assuming that you use the volume `blaze-data`: ```sh -docker run -it -v blaze-data:/app/data samply/blaze:0.18 sh +docker run -it -v blaze-data:/app/data samply/blaze:0.19 sh ``` in that shell, go into `/app/data` and list all directories: diff --git a/docs/deployment/distributed.md b/docs/deployment/distributed.md index 01623ef02..3f73e4f49 100644 --- a/docs/deployment/distributed.md +++ b/docs/deployment/distributed.md @@ -172,7 +172,7 @@ docker-compose exec cassandra-1 cqlsh -u cassandra -p cassandra ```yaml blaze-1: - image: "samply/blaze:0.18" + image: "samply/blaze:0.19" hostname: "blaze-1" environment: JAVA_TOOL_OPTIONS: "-Xmx4g" @@ -202,7 +202,7 @@ blaze-1: - cassandra-3 blaze-2: - image: "samply/blaze:0.18" + image: "samply/blaze:0.19" hostname: "blaze-2" environment: JAVA_TOOL_OPTIONS: "-Xmx4g" diff --git a/docs/deployment/distributed/docker-compose.yml b/docs/deployment/distributed/docker-compose.yml index f84d95b44..ffd043d23 100644 --- a/docs/deployment/distributed/docker-compose.yml +++ b/docs/deployment/distributed/docker-compose.yml @@ -72,7 +72,7 @@ services: HEAP_NEWSIZE: "200M" blaze-1: - image: "samply/blaze:0.18" + image: "samply/blaze:0.19" hostname: "blaze-1" environment: JAVA_TOOL_OPTIONS: "-Xmx4g" @@ -102,7 +102,7 @@ services: - cassandra-3 blaze-2: - image: "samply/blaze:0.18" + image: "samply/blaze:0.19" hostname: "blaze-2" environment: JAVA_TOOL_OPTIONS: "-Xmx4g" diff --git a/docs/deployment/docker-deployment.md b/docs/deployment/docker-deployment.md index d65b812c1..71566773b 100644 --- a/docs/deployment/docker-deployment.md +++ b/docs/deployment/docker-deployment.md @@ -11,7 +11,7 @@ docker volume create blaze-data ## Blaze ```sh -docker run -d --name blaze -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.18 +docker run -d --name blaze -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.19 ``` Blaze should log something like this: @@ -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.18.6 in 8.2 seconds +2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.19.0 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.18.6" + "version": "0.19.0" } ``` @@ -61,7 +61,7 @@ A Docker Compose file looks like this: version: '3.2' services: blaze: - image: "samply/blaze:0.18" + image: "samply/blaze:0.19" environment: BASE_URL: "http://localhost:8080" JAVA_TOOL_OPTIONS: "-Xmx2g" diff --git a/docs/deployment/manual-deployment.md b/docs/deployment/manual-deployment.md index 8c19d71a3..647a7041a 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 or 17 with 17 recommended. Blaze is tested with [Eclipse Temurin][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.18.6). Look for `blaze-0.18.6-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.19.0). Look for `blaze-0.19.0-standalone.jar`. After the download, you can start blaze with the following command (Linux, macOS): ```sh -java -jar blaze-0.18.6-standalone.jar +java -jar blaze-0.19.0-standalone.jar ``` 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.18.6-standalone.jar +STORAGE=standalone java -jar blaze-0.19.0-standalone.jar ``` Under Windows, you need to set the Environment variables in the PowerShell before starting Blaze: ```powershell $Env:STORAGE="standalone" -java -jar blaze-0.18.6-standalone.jar +java -jar blaze-0.19.0-standalone.jar ``` 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.18.6 in 8.2 seconds +2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.19.0 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.18.6" + "version": "0.19.0" } ``` diff --git a/docs/performance/fhir-search/simple-code-search.sh b/docs/performance/fhir-search/simple-code-search.sh index 9f51c4d69..689ea05f3 100644 --- a/docs/performance/fhir-search/simple-code-search.sh +++ b/docs/performance/fhir-search/simple-code-search.sh @@ -19,7 +19,7 @@ start-blaze() { -e DB_RESOURCE_INDEXER_THREADS=16 \ -p 8080:8080 \ -p 8081:8081 \ - -d samply/blaze:0.18 + -d samply/blaze:0.19 ../../.github/scripts/wait-for-url.sh http://localhost:8080/health echo "Finished" diff --git a/docs/performance/import.sh b/docs/performance/import.sh index 7d6db519f..8526ffca2 100644 --- a/docs/performance/import.sh +++ b/docs/performance/import.sh @@ -12,7 +12,7 @@ import-once() { -e DB_RESOURCE_INDEXER_THREADS=16 \ -p 8080:8080 \ -p 8081:8081 \ - -d samply/blaze:0.18 + -d samply/blaze:0.19 ../../.github/scripts/wait-for-url.sh http://localhost:8080/health diff --git a/modules/rest-api/src/blaze/rest_api/capabilities.clj b/modules/rest-api/src/blaze/rest_api/capabilities.clj index 7d5b832b5..11ab9dce5 100644 --- a/modules/rest-api/src/blaze/rest_api/capabilities.clj +++ b/modules/rest-api/src/blaze/rest_api/capabilities.clj @@ -117,11 +117,11 @@ :copyright #fhir/markdown"Copyright 2019 - 2023 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"2023-01-24" + :date #fhir/dateTime"2023-01-26" :software {:name "Blaze" :version version - :releaseDate #fhir/dateTime"2023-01-24"} + :releaseDate #fhir/dateTime"2023-01-26"} :implementation {:description "Blaze"} :fhirVersion #fhir/code"4.0.1" diff --git a/perf-test/gatling/pom.xml b/perf-test/gatling/pom.xml index 9ff7f4f39..a2bd285fc 100644 --- a/perf-test/gatling/pom.xml +++ b/perf-test/gatling/pom.xml @@ -5,7 +5,7 @@ samply.blaze gatling - 0.18.6 + 0.19.0 1.8 diff --git a/src/blaze/system.clj b/src/blaze/system.clj index ab457fb16..b6d67701c 100644 --- a/src/blaze/system.clj +++ b/src/blaze/system.clj @@ -85,7 +85,7 @@ (def ^:private root-config - {:blaze/version "0.18.6" + {:blaze/version "0.19.0" :blaze/clock {}