Skip to content

Commit

Permalink
Merge pull request #887 from samply/release-v0.18.6
Browse files Browse the repository at this point in the history
Merge Back Release v0.18.6
  • Loading branch information
alexanderkiel authored Jan 25, 2023
2 parents bf10d4e + 63f37bd commit 0619211
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: blaze-uberjar
path: target/blaze-0.18.5-standalone.jar
path: target/blaze-0.18.6-standalone.jar

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -1220,7 +1220,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: blaze-uberjar
path: target/blaze-0.18.5-standalone.jar
path: target/blaze-0.18.6-standalone.jar

- name: Download Blaze Image
uses: actions/download-artifact@v3
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## v0.18.6

### Documentation

* Enhance Development Docs ([#878](https://github.com/samply/blaze/issues/878))

The full changelog can be found [here](https://github.com/samply/blaze/milestone/57?closed=1).

## v0.18.5

### New Features
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.5-standalone.jar /app/
COPY target/blaze-0.18.6-standalone.jar /app/

WORKDIR /app
USER 1001
Expand All @@ -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.5-standalone.jar"]
CMD ["java", "-jar", "blaze-0.18.6-standalone.jar"]
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5][5]
Latest release: [v0.18.6][5]

## Quick Start

Expand Down Expand Up @@ -73,7 +73,7 @@ Unless required by applicable law or agreed to in writing, software distributed

[3]: <https://cql.hl7.org/tests.html>
[4]: <https://alexanderkiel.gitbook.io/blaze/deployment>
[5]: <https://github.com/samply/blaze/releases/tag/v0.18.5>
[5]: <https://github.com/samply/blaze/releases/tag/v0.18.6>
[6]: <https://www.yourkit.com/java/profiler/>
[7]: <https://www.yourkit.com/.net/profiler/>
[8]: <https://www.yourkit.com/youmonitor/>
Expand Down
2 changes: 1 addition & 1 deletion build.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
(:require [clojure.tools.build.api :as b]))

(def lib 'samply/blaze)
(def version "0.18.5")
(def version "0.18.6")
(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))
Expand Down
4 changes: 2 additions & 2 deletions docs/deployment/docker-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 in 8.2 seconds
2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.18.6 in 8.2 seconds
```

In order to test connectivity, query the health endpoint:
Expand All @@ -47,7 +47,7 @@ that should return:
```json
{
"name": "Blaze",
"version": "0.18.5"
"version": "0.18.6"
}
```

Expand Down
12 changes: 6 additions & 6 deletions docs/deployment/manual-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5). Look for `blaze-0.18.5-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.18.6). Look for `blaze-0.18.6-standalone.jar`.

After the download, you can start blaze with the following command (Linux, macOS):

```sh
java -jar blaze-0.18.5-standalone.jar
java -jar blaze-0.18.6-standalone.jar
```

Blaze will run with an in-memory, volatile database for testing and demo purposes.
Expand All @@ -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.5-standalone.jar
STORAGE=standalone java -jar blaze-0.18.6-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.5-standalone.jar
java -jar blaze-0.18.6-standalone.jar
```

This will create three directories called `index`, `transaction` and `resource` inside the current working directory, one for each database part used.
Expand All @@ -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.5 in 8.2 seconds
2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.18.6 in 8.2 seconds
```

In order to test connectivity, query the health endpoint:
Expand All @@ -62,7 +62,7 @@ that should return:
```json
{
"name": "Blaze",
"version": "0.18.5"
"version": "0.18.6"
}
```

Expand Down
4 changes: 2 additions & 2 deletions modules/rest-api/src/blaze/rest_api/capabilities.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"2022-12-17"
:date #fhir/dateTime"2023-01-24"
:software
{:name "Blaze"
:version version
:releaseDate #fhir/dateTime"2022-12-17"}
:releaseDate #fhir/dateTime"2023-01-24"}
:implementation
{:description "Blaze"}
:fhirVersion #fhir/code"4.0.1"
Expand Down
2 changes: 1 addition & 1 deletion perf-test/gatling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>samply.blaze</groupId>
<artifactId>gatling</artifactId>
<version>0.18.5</version>
<version>0.18.6</version>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion src/blaze/system.clj
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@


(def ^:private root-config
{:blaze/version "0.18.5"
{:blaze/version "0.18.6"

:blaze/clock {}

Expand Down

0 comments on commit 0619211

Please sign in to comment.