2.0.0 Release Preparation (1/2)

.github/workflows/codeql.yml

@@ -1,10 +1,10 @@
-name: "CodeQL"
+name: DSF 1.x CodeQL
 
 on:
   push:
-    branches: [ "main", "develop", "hotfix/*", "release/*" ]
+    branches: [ "main", "develop", "hotfix/1*", "release/1*" ]
   pull_request:
-    branches: [ "main", "develop", "hotfix/*", "release/*" ]
+    branches: [ "main", "develop", "hotfix/1*", "release/1*" ]
   schedule:
     - cron: '21 15 * * 0' # Sundays, 15:21
 
@@ -41,7 +41,7 @@ jobs:
 
     - name: Compile with Maven
       if: ${{ matrix.language == 'java-kotlin' }}
-      run: mvn --batch-mode --fail-at-end --threads 1C -Dmaven.javadoc.skip=true -Dimpsort.skip=true -Dformatter.skip=true -Dgpg.skip -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests clean package
+      run: mvn --batch-mode --fail-at-end --threads 1C -Dimpsort.skip=true -Dformatter.skip=true -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests -DskipShadePlugin=true -P!generate-source-and-javadoc-jars clean package
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3

.github/workflows/maven-build.yml

@@ -1,6 +1,8 @@
-name: Java CI Build with Maven
+name: DSF 1.x Java CI Build with Maven
 
-on: push
+on:
+  pull_request:
+    branches: develop
 
 jobs:
   build:
@@ -16,4 +18,4 @@ jobs:
         java-version: 17
         cache: 'maven'
     - name: Build with Maven
-      run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 -Dgpg.skip clean verify
+      run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 clean verify

.github/workflows/maven-publish.yml

@@ -1,4 +1,4 @@
-name: Java CI Publish with Maven
+name: DSF 1.x Java CI Publish with Maven
 
 on:
   pull_request:
@@ -25,4 +25,4 @@ jobs:
       - name: Publish with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 -Dgpg.skip clean deploy
+        run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 clean deploy

CITATION.cff

@@ -24,8 +24,8 @@ preferred-citation:
   doi: 10.3233/SHTI210060
   type: proceedings
 title: "Data Sharing Framework (DSF)"
-version: 1.7.1
-date-released: 2025-01-22
+version: 2.0.0
+date-released: 2025-11-25
 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,9 +6,11 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
-
+
+	<name>DSF BPE Process API v1</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>dev.dsf</groupId>

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,9 +6,11 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
+	<name>DSF BPE Server Jetty</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>dev.dsf</groupId>

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

@@ -6,9 +6,11 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
+	<name>DSF BPE Server</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>dev.dsf</groupId>

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PropertiesConfig.java

@@ -110,11 +110,11 @@ public class PropertiesConfig implements InitializingBean
 	private boolean webserviceClientLocalVerbose;
 
 	@Documentation(description = "Subscription to receive notifications about task resources from the DSF FHIR server")
-	@Value("${dev.dsf.bpe.fhir.task.subscription.search.parameter:?criteria=Task%3Fstatus%3Drequested&status=active&type=websocket&payload=application/fhir%2Bjson}")
+	@Value("${dev.dsf.bpe.fhir.task.subscription.search.parameter:?criteria:exact=Task%3Fstatus%3Drequested&status=active&type=websocket&payload=application/fhir%2Bjson}")
 	private String taskSubscriptionSearchParameter;
 
 	@Documentation(description = "Subscription to receive notifications about questionnaire response resources from the DSF FHIR server")
-	@Value("${dev.dsf.bpe.fhir.questionnaire.response.subscription.search.parameter:?criteria=QuestionnaireResponse%3Fstatus%3Dcompleted&status=active&type=websocket&payload=application/fhir%2Bjson}")
+	@Value("${dev.dsf.bpe.fhir.questionnaire.response.subscription.search.parameter:?criteria:exact=QuestionnaireResponse%3Fstatus%3Dcompleted&status=active&type=websocket&payload=application/fhir%2Bjson}")
 	private String questionnaireResponseSubscriptionSearchParameter;
 
 	@Documentation(description = "Number of retries until a websocket connection can be established with the DSF FHIR server, `-1` means infinite number of retries")
@@ -126,7 +126,7 @@ public class PropertiesConfig implements InitializingBean
 	private long websocketRetrySleepMillis;
 
 	@Documentation(description = "Directory containing the DSF BPE process plugins for deployment on startup of the DSF BPE server", recommendation = "Change only if you don't use the provided directory structure from the installation guide or made changes to tit")
-	@Value("${dev.dsf.bpe.process.plugin.directroy:process}")
+	@Value("${dev.dsf.bpe.process.plugin.directory:process}")
 	private String processPluginDirectory;
 
 	@Documentation(description = "List of process names that should be excluded from deployment during startup of the DSF BPE server; comma or space separated list, YAML block scalars supported", recommendation = "Only deploy processes that can be started depending on your organization's roles in the Allow-List", example = "dsfdev_updateAllowList|1.0, another_process|x.y")

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.22_to_7.23.sql

@@ -0,0 +1,25 @@
+--
+-- 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 ('1200', CURRENT_TIMESTAMP, '7.23.0');
+
+alter table ACT_HI_COMMENT
+    add column REV_ integer not null
+    default 1;
+
+alter table ACT_RU_EXECUTION add column PROC_DEF_KEY_ varchar(255);

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.8.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.8.0">
+		<sqlFile dbms="postgresql" encoding="utf8" path="db/camunda/postgres_engine_7.22_to_7.23.sql" />
+	</changeSet>
+
+</databaseChangeLog>

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

@@ -19,4 +19,8 @@
 	<include file="db/db.camunda_engine.changelog-1.5.1.xml" />
 
 	<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>

dsf-bpe/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<modules>
@@ -20,6 +20,8 @@
 		<main.basedir>${project.basedir}/../..</main.basedir>
 	</properties>
 
+	<name>DSF BPE Parent POM</name>
+
 	<repositories>
 		<repository>
 			<id>camunda-bpm</id>

dsf-common/dsf-common-auth/pom.xml

@@ -6,9 +6,11 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
+	<name>DSF Common Auth</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
@@ -18,7 +20,7 @@
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
@@ -31,7 +33,7 @@
 			<groupId>jakarta.annotation</groupId>
 			<artifactId>jakarta.annotation-api</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>

dsf-common/dsf-common-config/pom.xml

@@ -6,9 +6,11 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
+	<name>DSF Common Config</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>

dsf-common/dsf-common-db/pom.xml

@@ -6,9 +6,11 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
+	<name>DSF Common DB</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

dsf-common/dsf-common-documentation/pom.xml

@@ -6,6 +6,8 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
+
+	<name>DSF Common Documentation</name>
 </project>

dsf-common/dsf-common-jetty/pom.xml

@@ -6,25 +6,27 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>1.7.1-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
-
+
+	<name>DSF Common Jetty</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>dev.dsf</groupId>
-			<artifactId>dsf-common-auth</artifactId>			
+			<artifactId>dsf-common-auth</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>dev.dsf</groupId>
-			<artifactId>dsf-common-config</artifactId>			
+			<artifactId>dsf-common-config</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>dev.dsf</groupId>
-			<artifactId>dsf-common-documentation</artifactId>			
+			<artifactId>dsf-common-documentation</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>dev.dsf</groupId>
-			<artifactId>dsf-tools-docker-secrets-reader</artifactId>			
+			<artifactId>dsf-tools-docker-secrets-reader</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>