Merge pull request #187 from ahdis/ql_v354

Version 3.5.4
ahdis · Jan 31, 2024 · 29da3b9 · 29da3b9
2 parents 8c74f0e + 0cff192
commit 29da3b9
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -141,7 +141,8 @@ mvn -Dtest=CapabilityStatementTests test
    command in documentation, the changelog, etc.).
 2. Merge the pull request if all tests have succeeded.
 3. Wait for the [Angular workflow](https://github.com/ahdis/matchbox/blob/main/.github/workflows/angular_build.yml)
-   to complete. Since the package.json was modified, the Angular project is rebuilt.
+   to complete. Since the package.json was modified, the Angular project is rebuilt, unless you also have built the 
+   Angular project in your commit ; in that case, the Angular workflow won't commit anything.
 4. Create a [release](https://github.com/ahdis/matchbox/releases) with the changelog (e.g. "matchbox v3.4.1") and a
    [tag](https://github.com/ahdis/matchbox/tags) (e.g. `v.3.4.1`) in GitHub.
 5. It will trigger two workflows:

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,8 +1,11 @@
-YYYY/MM/DD Release 3.5.4
+2024/01/31 Release 3.5.4
 
 - `docker pull europe-west6-docker.pkg.dev/ahdis-ch/ahdis/matchbox:v3.5.4`
 - The application now stops if it fails to load an IG, instead of continuing running without an engine [#171](https://github.com/ahdis/matchbox/issues/171)
 - GUI: improved the validation interface [#177](https://github.com/ahdis/matchbox/issues/177)
+- Dependency upgrade to fix various security issues (see https://github.com/ahdis/matchbox/security/dependabot and 
+  https://github.com/ahdis/matchbox/security/code-scanning)
+- Added security scanners for the Java code, Java dependencies and Docker image
 
 2024/01/05 Release 3.5.3
 

diff --git a/docs/docker.md b/docs/docker.md
@@ -3,7 +3,7 @@
 if you have the rights you can download Matchbox as a docker container:
 
 ```
-docker pull europe-west6-docker.pkg.dev/ahdis-ch/ahdis/matchbox:v3.5.3
+docker pull europe-west6-docker.pkg.dev/ahdis-ch/ahdis/matchbox:v3.5.4
 ```
 
 ## Configurable base image:

diff --git a/docs/matchbox-engine.md b/docs/matchbox-engine.md
@@ -45,7 +45,7 @@ You can add the matchbox-engine dependency in your `pom.xml`:
 <dependency>
     <groupId>health.matchbox</groupId>
     <artifactId>matchbox-engine</artifactId>
-    <version>3.5.3</version>
+    <version>3.5.4</version>
 </dependency>
 ```
 

diff --git a/matchbox-engine/pom.xml b/matchbox-engine/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>matchbox</artifactId>
         <groupId>health.matchbox</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
 
     <artifactId>matchbox-engine</artifactId>

diff --git a/matchbox-frontend/package-lock.json b/matchbox-frontend/package-lock.json
diff --git a/matchbox-frontend/package.json b/matchbox-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matchbox",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

diff --git a/matchbox-server/pom.xml b/matchbox-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matchbox</artifactId>
         <groupId>health.matchbox</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
 
     <artifactId>matchbox-server</artifactId>

diff --git a/matchbox-server/src/main/resources/static/index.html b/matchbox-server/src/main/resources/static/index.html
diff --git a/...resources/static/main.6a82cb6480af5c26.js → ...resources/static/main.e6fbf97f7eeae7c5.js b/...resources/static/main.6a82cb6480af5c26.js → ...resources/static/main.e6fbf97f7eeae7c5.js
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>health.matchbox</groupId>
     <artifactId>matchbox</artifactId>
-    <version>3.5.3</version>
+    <version>3.5.4</version>
     <packaging>pom</packaging>
     <name>matchbox</name>
     <description>An open-source implementation to support testing and implementation of FHIR based solutions and map or