v3.8.7

ahdis · Jun 24, 2024 · dbf86be · dbf86be
1 parent 623a1fe
commit dbf86be
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 14 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,13 +1,17 @@
+2024/06/24 Release 3.8.7
+
+- docker image for v3.8.6 not starting up [#258](https://github.com/ahdis/matchbox/issues/258)
+
 2024/06/24 Release 3.8.6
 
 - fhirpath date add/minus with variables in fml [#243](https://github.com/ahdis/matchbox/issues/243)
 - update to published CDA FHIR logical model with matcbhox patches 2.0.0-sd [#241](https://github.com/ahdis/matchbox/issues/241)
-- update frontend for high security vulnerabilities [#246](https://github.com/ahdis/matchbox/issues/#246)
-- CH:IPS validation problem [#248](https://github.com/ahdis/matchbox/issues/#248)
-- improved the validation GUI [#242](https://github.com/ahdis/matchbox/issues/#242), upgraded to angular@18
-- update to hl7.fhir.core 6.3.11 [#254](https://github.com/ahdis/matchbox/issues/#254)
-- fixed validation problems [#250](https://github.com/ahdis/matchbox/issues/#250),[#251](https://github.com/ahdis/matchbox/issues/#251),[#252](https://github.com/ahdis/matchbox/issues/#252)
-- enable Terminology Caching [#257](https://github.com/ahdis/matchbox/issues/#257)
+- update frontend for high security vulnerabilities [#246](https://github.com/ahdis/matchbox/issues/246)
+- CH:IPS validation problem [#248](https://github.com/ahdis/matchbox/issues/248)
+- improved the validation GUI [#242](https://github.com/ahdis/matchbox/issues/242), upgraded to angular@18
+- update to hl7.fhir.core 6.3.11 [#254](https://github.com/ahdis/matchbox/issues/254)
+- fixed validation problems [#250](https://github.com/ahdis/matchbox/issues/250),[#251](https://github.com/ahdis/matchbox/issues/251),[#252](https://github.com/ahdis/matchbox/issues/252)
+- enable Terminology Caching [#257](https://github.com/ahdis/matchbox/issues/257)
 
 2024/06/14 Release 3.8.5
 

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.8.6</version>
+        <version>3.8.7</version>
     </parent>
 
     <artifactId>matchbox-engine</artifactId>

diff --git a/matchbox-frontend/package.json b/matchbox-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matchbox",
-  "version": "3.8.6",
+  "version": "3.8.7",
   "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.8.6</version>
+        <version>3.8.7</version>
     </parent>
 
     <artifactId>matchbox-server</artifactId>

diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/MatchboxEngineSupport.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/MatchboxEngineSupport.java
@@ -437,12 +437,18 @@ public void setInitialized(boolean initialized) {
 	}
 
 	private String getTxCachePath(String txServer) {
-		String path = System.getProperty("home");
+		String path = System.getenv("HOME");
 		if (path == null || path.isEmpty()) {
 			path = System.getProperty("user.dir");
 		}
 		String md5Hex = DigestUtils.md5Hex(txServer).toLowerCase();
-		return path + File.separator +"txCache" +File.separator + md5Hex;
+		if (path==null) {
+			path = "";
+		}
+		if (!path.endsWith(File.separator)) {
+			path += File.separator;
+		}
+		return path +"txCache" +File.separator + md5Hex;
 	}
 
 	/**

diff --git a/matchbox-server/with-cda-r5/application.yaml b/matchbox-server/with-cda-r5/application.yaml
@@ -19,7 +19,7 @@ hapi:
         url: classpath:/hl7.fhir.uv.extensions#1.0.0.tgz
       cda:
         name: hl7.cda.uv.core
-        version: 2.0.0-sd-202312-matchbox-patch
+        version: 2.0.0-sd-202406-matchbox-patch
         url: classpath:/hl7.cda.uv.core#2.0.0-sd-202406-matchbox-patch.tgz
     staticLocation: file:/apps/
     fhir_version: R5

diff --git a/matchbox-server/with-cda/application.yaml b/matchbox-server/with-cda/application.yaml
@@ -19,7 +19,7 @@ hapi:
         url: classpath:/hl7.fhir.uv.extensions.r4#1.0.0.tgz
       cda:
         name: hl7.cda.uv.core
-        version: 2.0.0-sd-202312-matchbox-patch
+        version: 2.0.0-sd-202406-matchbox-patch
         url: classpath:/hl7.cda.uv.core#2.0.0-sd-202406-matchbox-patch.tgz
     staticLocation: file:/apps/
 matchbox:

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>health.matchbox</groupId>
     <artifactId>matchbox</artifactId>
-    <version>3.8.6</version>
+    <version>3.8.7</version>
     <packaging>pom</packaging>
     <name>matchbox</name>
     <description>An open-source implementation to support testing and implementation of FHIR based solutions and map or