Issue/406 start new development cycle

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: DSF 2.x CodeQL
 
 on:
   push:
-    branches: [ "develop_2", "hotfix/2*", "release/2*" ]
+    branches: [ "main", "develop", "hotfix/2*", "release/2*" ]
   pull_request:
-    branches: [ "develop_2", "hotfix/2*", "release/2*" ]
+    branches: [ "main", "develop", "hotfix/2*", "release/2*" ]
   schedule:
     - cron: '11 15 * * 0' # Sundays, 15:11
 

CITATION.cff

@@ -25,7 +25,7 @@ preferred-citation:
   type: proceedings
 title: "Data Sharing Framework (DSF)"
 version: 2.0.0
-date-released: 2025-05-31
+date-released: 2025-11-26
 url: https://dsf.dev
 repository-code: https://github.com/datasharingframework/dsf
 repository-artifact: https://github.com/datasharingframework/dsf/releases

README.md

@@ -2,7 +2,7 @@
 
 The Data Sharing Framework (DSF) implements a distributed process engine based on the BPMN 2.0 and FHIR R4 standards. The DSF is used to support biomedical research with real-world data. Every participating site runs a FHIR endpoint (dsf-fhir) accessible by other sites and a business process engine (dsf-bpe) in the local secured network. Authentication between sites is handled using X.509 client/server certificates. The process engines execute BPMN processes in order to coordinate local and remote steps necessary to enable cross-site data sharing and feasibility analyses. This includes access to local data repositories, use-and-access-committee decision support, consent filtering, and privacy preserving record-linkage and pseudonymization.  
 
-For [installation instructions](https://dsf.dev/stable/maintain/install.html), tutorials, publications, and other information about the DSF, visit [https://dsf.dev](https://dsf.dev).
+For [installation instructions](https://dsf.dev/operations/latest/install.html), tutorials, publications, and other information about the DSF, visit [https://dsf.dev](https://dsf.dev).
 
 ## Development
 Branching follows the git-flow model, for the latest development version see branch [develop](https://github.com/datasharingframework/dsf/tree/develop).

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -197,7 +197,7 @@
 								<artifactItem>
 									<groupId>com.nimbusds</groupId>
 									<artifactId>nimbus-jose-jwt</artifactId>
-									<version>9.37.3</version>
+									<version>9.37.4</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.github.stephenc.jcip</groupId>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java

@@ -355,13 +355,26 @@ protected void onMessage(String businessKey, String correlationKey, String proce
 		}
 	}
 
+	private static final Comparator<ProcessDefinition> BY_TENANT_ID_ASC_NULL_FIRST = (p1, p2) ->
+	{
+		String t1 = p1.getTenantId(), t2 = p2.getTenantId();
+
+		if (t1 == null)
+			return -1;
+		if (t2 == null)
+			return 1;
+
+		return t1.compareTo(t2);
+	};
+
 	private ProcessDefinition getProcessDefinition(String processDomain, String processDefinitionKey,
 			String processVersion)
 	{
 		if (processVersion != null && !processVersion.isBlank())
 			return repositoryService.createProcessDefinitionQuery().active()
 					.processDefinitionKey(processDomain + "_" + processDefinitionKey).versionTag(processVersion).list()
-					.stream().max(Comparator.comparing(ProcessDefinition::getVersion)).orElse(null);
+					.stream().max(BY_TENANT_ID_ASC_NULL_FIRST.thenComparing(ProcessDefinition::getVersion))
+					.orElse(null);
 		else
 			return repositoryService.createProcessDefinitionQuery().active()
 					.processDefinitionKey(processDomain + "_" + processDefinitionKey).latestVersion().singleResult();

dsf-bpe/dsf-bpe-test-plugin-v1/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-bpe/dsf-bpe-test-plugin-v2/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-bpe/dsf-bpe-test-plugin/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-bpe/pom.xml

@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<modules>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-common/dsf-common-build-info-reader/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-common/dsf-common-docker-secrets-reader/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-common/dsf-common-oidc/pom.xml

@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-common/dsf-common-status/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-common/dsf-common-ui/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-common-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-common/pom.xml

@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<modules>

dsf-fhir/dsf-fhir-rest-adapter/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

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

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-fhir/dsf-fhir-server/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-fhir/dsf-fhir-validation/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-fhir-pom</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
 	<properties>

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-bpmn-message-2.0.0.xml

@@ -30,7 +30,7 @@
 	<title value="DSF BPMN message values" />
 	<status value="active" />
 	<experimental value="false" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="CodeSystem with standard BPMN message values for Task resources" />
 	<caseSensitive value="true" />

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-organization-role-2.0.0.xml

@@ -30,7 +30,7 @@
 	<title value="DSF Organization Role" />
 	<status value="active" />
 	<experimental value="false" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="CodeSystem with DSF organization roles used in OrganizationAffiliation resources" />
 	<caseSensitive value="true" />

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-practitioner-role-2.0.0.xml

@@ -30,7 +30,7 @@
 	<title value="DSF Practitioner Role" />
 	<status value="active" />
 	<experimental value="false" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="CodeSystem with DSF practitioner roles" />
 	<caseSensitive value="true" />

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-process-authorization-2.0.0.xml

@@ -30,7 +30,7 @@
 	<title value="DSF Process Authorization" />
 	<status value="active" />
 	<experimental value="false" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="CodeSystem with proces authorization codes" />
 	<caseSensitive value="true" />

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-read-access-tag-2.0.0.xml

@@ -30,7 +30,7 @@
 	<title value="DSF Read Access Tag" />
 	<status value="active" />
 	<experimental value="false" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="CodeSystem with read access tags" />
 	<caseSensitive value="true" />

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-endpoint.xml

@@ -27,7 +27,7 @@
 	<name value="DsfEndpointIdentifier" />
 	<status value="active" />
 	<kind value="identifier" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="Shortest DNS that resolves a DSF endpoint, typically the domain name used in endpoint.address" />
 	<usage value="Used withing the DSF to identify endpoints" />

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-organization.xml

@@ -27,7 +27,7 @@
 	<name value="DsfOrganizationIdentifier" />
 	<status value="active" />
 	<kind value="identifier" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="Shortest DNS that resolves the homepage of the organization, e.g. hs-heilbronn.de, ukhd.de, uksh.de" />
 	<usage value="Used withing the DSF to identify organizations" />

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-practitioner.xml

@@ -27,7 +27,7 @@
 	<name value="DsfPractitionerIdentifier" />
 	<status value="active" />
 	<kind value="identifier" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="E-mail address identifying a practitioner" />
 	<usage value="Used withing the DSF to identify practitioners" />

dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-task.xml

@@ -27,7 +27,7 @@
 	<name value="DsfTaskIdentifier" />
 	<status value="active" />
 	<kind value="identifier" />
-	<date value="2025-10-27" />
+	<date value="2025-11-26" />
 	<publisher value="DSF" />
 	<description value="Name identifying a draft Task resource" />
 	<usage value="Used withing the DSF to identify draft Task resources, created as examples using process plugins. Values must be defined in the form {process-url}/{process-version}/{task-example-name} e.g. http://test.org/bpe/Process/someProcessName/1.0/someExampleName" />