Merge remote-tracking branch 'origin/release/1.9.0' into main

Author: hhund

CITATION.cff

@@ -24,8 +24,8 @@ preferred-citation:
   doi: 10.3233/SHTI210060
   type: proceedings
 title: "Data Sharing Framework (DSF)"
-version: 1.8.0
-date-released: 2025-06-01
+version: 1.9.0
+date-released: 2025-10-21
 url: https://dsf.dev
 repository-code: https://github.com/datasharingframework/dsf
 repository-artifact: https://github.com/datasharingframework/dsf/releases

dsf-bpe/dsf-bpe-process-api-v1/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>1.8.0</version>
+		<version>1.9.0</version>
 	</parent>
 
 	<name>DSF BPE Process API v1</name>

dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile

@@ -1,11 +1,10 @@
-FROM debian:buster-slim AS builder
-RUN adduser --system --no-create-home --group --uid 2202 java
+FROM debian:trixie-slim AS builder
 WORKDIR /opt/bpe
-COPY --chown=root:java ./ ./
-RUN chown root:java ./ && \
+COPY --chown=root:2202 ./ ./
+RUN chown root:2202 ./ && \
     chmod 750 ./ ./ca ./conf ./lib ./lib_external ./process ./ui ./dsf_bpe_start.sh ./healthcheck.sh && \
-	chmod 440 ./ca/client_cert_ca_chains.pem ./ca/server_cert_root_cas.pem ./conf/log4j2.xml ./dsf_bpe.jar ./lib/*.jar && \
-	chmod 1775 ./log
+    chmod 440 ./ca/client_cert_ca_chains.pem ./ca/server_cert_root_cas.pem ./conf/log4j2.xml ./dsf_bpe.jar ./lib/*.jar && \
+    chmod 1775 ./log
 
 
 FROM azul/zulu-openjdk:17-jre-headless
@@ -15,8 +14,10 @@ LABEL org.opencontainers.image.licenses="Apache License, Version 2.0"
 
 EXPOSE 8080
 
-RUN adduser --system --no-create-home --group --uid 2202 java && \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt update && apt dist-upgrade -y && apt install curl -y
+RUN adduser --system --no-create-home --group --uid 2202 java
 
 WORKDIR /opt/bpe
 COPY --from=builder /opt/bpe ./

dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe_start.sh

@@ -3,11 +3,11 @@
 echo "Executing DSF BPE with"
 java --version
 
-trap 'kill -TERM $PID' TERM INT
-java $EXTRA_JVM_ARGS -Djdk.tls.acknowledgeCloseNotify=true -cp lib/*:lib_external/*:dsf_bpe.jar dev.dsf.bpe.BpeJettyServer &
+trap 'kill -TERM $PID' TERM
+java $EXTRA_JVM_ARGS -Djdk.tls.acknowledgeCloseNotify=true -cp lib/*:lib_external/*:dsf_bpe.jar dev.dsf.bpe.BpeJettyServer
 PID=$!
 wait $PID
-trap - TERM INT
+trap - TERM
 wait $PID
 
 JAVA_EXIT=$?

dsf-bpe/dsf-bpe-server-jetty/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>1.8.0</version>
+		<version>1.9.0</version>
 	</parent>
 
 	<name>DSF BPE Server Jetty</name>

dsf-bpe/dsf-bpe-server/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>1.8.0</version>
+		<version>1.9.0</version>
 	</parent>
 
 	<name>DSF BPE Server</name>

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java

@@ -2,6 +2,7 @@
 
 import org.hl7.fhir.r4.model.Resource;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,7 +19,9 @@ private ObjectMapperFactory()
 
 	public static ObjectMapper createObjectMapper(FhirContext fhirContext)
 	{
-		return JsonMapper.builder().serializationInclusion(Include.NON_NULL).serializationInclusion(Include.NON_EMPTY)
+		return JsonMapper.builder()
+				.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL))
+				.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY))
 				.addModule(fhirModule(fhirContext)).disable(MapperFeature.AUTO_DETECT_CREATORS)
 				.disable(MapperFeature.AUTO_DETECT_FIELDS)
 				// .disable(MapperFeature.AUTO_DETECT_GETTERS).disable(MapperFeature.AUTO_DETECT_IS_GETTERS)

dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.23_to_7.24.sql

@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless 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.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1300', CURRENT_TIMESTAMP, '7.24.0');

dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+	<changeSet author="camunda.org" id="db.camunda_engine.changelog-1.9.0">
+		<sqlFile dbms="postgresql" encoding="utf8" path="db/camunda/postgres_engine_7.23_to_7.24.sql" />
+	</changeSet>
+
+</databaseChangeLog>

dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml

@@ -21,4 +21,6 @@
 	<include file="db/db.camunda_engine.changelog-1.6.0.xml" />
 
 	<include file="db/db.camunda_engine.changelog-1.8.0.xml" />
+
+	<include file="db/db.camunda_engine.changelog-1.9.0.xml" />
 </databaseChangeLog>