diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f8284fa42..7519dbb95 100644
--- a/.github/workflows/codeql.yml
+++ b/.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
diff --git a/CITATION.cff b/CITATION.cff
index 4585ed851..a6f66250a 100644
--- a/CITATION.cff
+++ b/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
diff --git a/README.md b/README.md
index 2e9097f93..d71553d5d 100755
--- a/README.md
+++ b/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).
diff --git a/dsf-bpe/dsf-bpe-process-api-v1-base/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1-base/pom.xml
index f00f8c3d8..997978fbc 100644
--- a/dsf-bpe/dsf-bpe-process-api-v1-base/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api-v1-base/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml
index abe5b4941..a90df623e 100644
--- a/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-process-api-v1-operaton/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1-operaton/pom.xml
index 0968582e8..6fd0f798d 100644
--- a/dsf-bpe/dsf-bpe-process-api-v1-operaton/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api-v1-operaton/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml
index 28b3ed222..eb295ef5d 100644
--- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml b/dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml
index fddf678df..519aae34f 100644
--- a/dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
@@ -197,7 +197,7 @@
com.nimbusds
nimbus-jose-jwt
- 9.37.3
+ 9.37.4
com.github.stephenc.jcip
diff --git a/dsf-bpe/dsf-bpe-process-api-v2/pom.xml b/dsf-bpe/dsf-bpe-process-api-v2/pom.xml
index 769b0dbb0..c8b0b968d 100644
--- a/dsf-bpe/dsf-bpe-process-api-v2/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api-v2/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-process-api/pom.xml b/dsf-bpe/dsf-bpe-process-api/pom.xml
index d9adbe142..2257d9512 100644
--- a/dsf-bpe/dsf-bpe-process-api/pom.xml
+++ b/dsf-bpe/dsf-bpe-process-api/pom.xml
@@ -25,7 +25,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml
index 165a28bd2..ff55844eb 100755
--- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml
+++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml
index 0e12e7b5f..29d11e9f1 100755
--- a/dsf-bpe/dsf-bpe-server/pom.xml
+++ b/dsf-bpe/dsf-bpe-server/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java
index 26c6674ed..01718752e 100644
--- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java
+++ b/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 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();
diff --git a/dsf-bpe/dsf-bpe-test-plugin-v1/pom.xml b/dsf-bpe/dsf-bpe-test-plugin-v1/pom.xml
index 5005a6264..4380bc1c2 100644
--- a/dsf-bpe/dsf-bpe-test-plugin-v1/pom.xml
+++ b/dsf-bpe/dsf-bpe-test-plugin-v1/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-test-plugin-v2/pom.xml b/dsf-bpe/dsf-bpe-test-plugin-v2/pom.xml
index 23c149f1d..01826834d 100644
--- a/dsf-bpe/dsf-bpe-test-plugin-v2/pom.xml
+++ b/dsf-bpe/dsf-bpe-test-plugin-v2/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/dsf-bpe-test-plugin/pom.xml b/dsf-bpe/dsf-bpe-test-plugin/pom.xml
index 58c83f4a9..57b10f2d7 100644
--- a/dsf-bpe/dsf-bpe-test-plugin/pom.xml
+++ b/dsf-bpe/dsf-bpe-test-plugin/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-bpe-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml
index 95906a23e..b597292e7 100755
--- a/dsf-bpe/pom.xml
+++ b/dsf-bpe/pom.xml
@@ -24,7 +24,7 @@
dev.dsf
dsf-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml
index ebd0fc9b6..b4c60c7ee 100644
--- a/dsf-common/dsf-common-auth/pom.xml
+++ b/dsf-common/dsf-common-auth/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-build-info-reader/pom.xml b/dsf-common/dsf-common-build-info-reader/pom.xml
index 30a74c437..0b7299756 100644
--- a/dsf-common/dsf-common-build-info-reader/pom.xml
+++ b/dsf-common/dsf-common-build-info-reader/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml
index 1ad6a3648..59033f5d2 100644
--- a/dsf-common/dsf-common-config/pom.xml
+++ b/dsf-common/dsf-common-config/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml
index c97d3ada0..604254f8c 100644
--- a/dsf-common/dsf-common-db/pom.xml
+++ b/dsf-common/dsf-common-db/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-docker-secrets-reader/pom.xml b/dsf-common/dsf-common-docker-secrets-reader/pom.xml
index 9c350ea60..30f569dd0 100644
--- a/dsf-common/dsf-common-docker-secrets-reader/pom.xml
+++ b/dsf-common/dsf-common-docker-secrets-reader/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml
index f8ee8bf21..a679c4f70 100644
--- a/dsf-common/dsf-common-documentation/pom.xml
+++ b/dsf-common/dsf-common-documentation/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml
index 8f5f46f2e..1b3ae16b1 100644
--- a/dsf-common/dsf-common-jetty/pom.xml
+++ b/dsf-common/dsf-common-jetty/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-oidc/pom.xml b/dsf-common/dsf-common-oidc/pom.xml
index 488dcdd55..3b251218d 100644
--- a/dsf-common/dsf-common-oidc/pom.xml
+++ b/dsf-common/dsf-common-oidc/pom.xml
@@ -25,7 +25,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml
index abb5fbe0d..fc6f31727 100644
--- a/dsf-common/dsf-common-status/pom.xml
+++ b/dsf-common/dsf-common-status/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml
index 798c86e03..b65e447f2 100644
--- a/dsf-common/dsf-common-ui/pom.xml
+++ b/dsf-common/dsf-common-ui/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-common-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml
index a5560c30d..649b4f10c 100644
--- a/dsf-common/pom.xml
+++ b/dsf-common/pom.xml
@@ -24,7 +24,7 @@
dev.dsf
dsf-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml
index 256e6b994..db6c714ea 100755
--- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml
+++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-fhir-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml
index 394a8ca7b..b58e02d82 100755
--- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml
+++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-fhir-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml
index a8a8fa592..83a96efff 100755
--- a/dsf-fhir/dsf-fhir-server/pom.xml
+++ b/dsf-fhir/dsf-fhir-server/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-fhir-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml
index 2b6ecee7f..4f4b3b358 100644
--- a/dsf-fhir/dsf-fhir-validation/pom.xml
+++ b/dsf-fhir/dsf-fhir-validation/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-fhir-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-bpmn-message-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-bpmn-message-2.0.0.xml
index 2a626e6a2..520c7f731 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-bpmn-message-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-bpmn-message-2.0.0.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-organization-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-organization-role-2.0.0.xml
index 43b07fe9d..29ece2263 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-organization-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-organization-role-2.0.0.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-practitioner-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-practitioner-role-2.0.0.xml
index 72a96b85d..e2ca9664e 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-practitioner-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-practitioner-role-2.0.0.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-process-authorization-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-process-authorization-2.0.0.xml
index c52d73033..669759089 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-process-authorization-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-process-authorization-2.0.0.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-read-access-tag-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-read-access-tag-2.0.0.xml
index e28c26adc..51dfce38d 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-read-access-tag-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/CodeSystem/dsf-read-access-tag-2.0.0.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-endpoint.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-endpoint.xml
index 693a41cd0..f4a6590b8 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-endpoint.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-endpoint.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-organization.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-organization.xml
index 98e1e6520..f9e94cb30 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-organization.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-organization.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-practitioner.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-practitioner.xml
index 5d603202e..225805ebe 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-practitioner.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-practitioner.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-task.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-task.xml
index 23082a4be..270178cd8 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-task.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/NamingSystem/dsf-task.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-activity-definition-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-activity-definition-2.0.0.xml
index e3c512a31..9d2597dfc 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-activity-definition-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-activity-definition-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-binary-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-binary-2.0.0.xml
index 23c990105..309443a21 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-binary-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-binary-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-bundle-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-bundle-2.0.0.xml
index 7fdafa1b4..bbf894a50 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-bundle-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-bundle-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-code-system-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-code-system-2.0.0.xml
index 5526cbe8b..acd4b65e1 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-code-system-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-code-system-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-all-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-all-2.0.0.xml
index 156a465b6..4c37d5099 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-all-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-all-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-all-practitioner-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-all-practitioner-2.0.0.xml
index 3fe36cde6..1688ab840 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-all-practitioner-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-all-practitioner-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-organization-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-organization-2.0.0.xml
index 1a2996a75..e8ed911e5 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-organization-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-organization-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-organization-practitioner-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-organization-practitioner-2.0.0.xml
index 88c586358..2234d2ab6 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-organization-practitioner-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-organization-practitioner-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-parent-organization-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-parent-organization-role-2.0.0.xml
index c43445fec..de0c196d0 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-parent-organization-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-parent-organization-role-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-parent-organization-role-practitioner-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-parent-organization-role-practitioner-2.0.0.xml
index 8e66501fc..cfd5ed8ae 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-parent-organization-role-practitioner-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-local-parent-organization-role-practitioner-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-all-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-all-2.0.0.xml
index 962eec85e..9dbccf050 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-all-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-all-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-organization-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-organization-2.0.0.xml
index 60ae506c3..bd44c1616 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-organization-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-organization-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-parent-organization-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-parent-organization-role-2.0.0.xml
index 15f2d6b6c..ed01fc5b3 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-parent-organization-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-coding-process-authorization-remote-parent-organization-role-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-document-reference-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-document-reference-2.0.0.xml
index ed0c5cfa4..af400bc07 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-document-reference-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-document-reference-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-endpoint-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-endpoint-2.0.0.xml
index c53bacb89..b3da3c50a 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-endpoint-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-endpoint-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-certificate-thumbprint-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-certificate-thumbprint-2.0.0.xml
index 339f20a67..5c6c32986 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-certificate-thumbprint-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-certificate-thumbprint-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-check-logical-reference-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-check-logical-reference-2.0.0.xml
index d104c56a7..8d8dbf6d3 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-check-logical-reference-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-check-logical-reference-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-2.0.0.xml
index f1644788e..d8ba2c75e 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-organization-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-organization-2.0.0.xml
index 00c7ed5dc..fa371ab3a 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-organization-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-organization-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-organization-practitioner-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-organization-practitioner-2.0.0.xml
index ef95d2ae0..0ba8f90c2 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-organization-practitioner-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-organization-practitioner-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-parent-organization-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-parent-organization-role-2.0.0.xml
index 0dff16690..2cf5ac4d1 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-parent-organization-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-parent-organization-role-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-parent-organization-role-practitioner-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-parent-organization-role-practitioner-2.0.0.xml
index 80e78dbd7..e82d1ea7a 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-parent-organization-role-practitioner-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-parent-organization-role-practitioner-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-practitioner-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-practitioner-2.0.0.xml
index 40ac4c9d2..b58f00c1d 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-practitioner-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-process-authorization-practitioner-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-questionnaire-authorization-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-questionnaire-authorization-2.0.0.xml
index 96a3439bf..d1a643dfe 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-questionnaire-authorization-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-questionnaire-authorization-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-read-access-organization-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-read-access-organization-2.0.0.xml
index 34e1a3fc8..6a2c7e686 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-read-access-organization-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-read-access-organization-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-read-access-parent-organization-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-read-access-parent-organization-role-2.0.0.xml
index 1548c5c44..cbd724cb6 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-read-access-parent-organization-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-extension-read-access-parent-organization-role-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-group-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-group-2.0.0.xml
index f154e085b..e6b2c8f55 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-group-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-group-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-healthcare-service-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-healthcare-service-2.0.0.xml
index e7a567aa3..db16ec6d0 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-healthcare-service-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-healthcare-service-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-library-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-library-2.0.0.xml
index 6db6f8d84..5e12234a2 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-library-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-library-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-location-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-location-2.0.0.xml
index e9bce15d8..e0e97bca1 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-location-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-location-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-measure-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-measure-2.0.0.xml
index e48332954..98c96172d 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-measure-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-measure-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-measure-report-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-measure-report-2.0.0.xml
index 32a15c3be..6e14a29a8 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-measure-report-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-measure-report-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-meta-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-meta-2.0.0.xml
index 1637393ce..9dcc6513f 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-meta-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-meta-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-naming-system-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-naming-system-2.0.0.xml
index d501735ae..99d926545 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-naming-system-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-naming-system-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-2.0.0.xml
index 23430c403..1d552a676 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-affiliation-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-affiliation-2.0.0.xml
index c4390fd00..bbe6beeca 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-affiliation-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-affiliation-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-parent-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-parent-2.0.0.xml
index 99bbde6c2..c09ed3f2f 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-parent-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-organization-parent-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-patient-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-patient-2.0.0.xml
index ed5da93c4..cb0235900 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-patient-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-patient-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-practitioner-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-practitioner-2.0.0.xml
index 6c5d2ee15..79810f48b 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-practitioner-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-practitioner-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-practitioner-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-practitioner-role-2.0.0.xml
index eaa207d55..5758a513b 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-practitioner-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-practitioner-role-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-provenance-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-provenance-2.0.0.xml
index 02d226b52..126d0c3bc 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-provenance-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-provenance-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-questionnaire-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-questionnaire-2.0.0.xml
index 1f007f309..78c2491a1 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-questionnaire-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-questionnaire-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-questionnaire-response-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-questionnaire-response-2.0.0.xml
index 7cbccb221..02f7544db 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-questionnaire-response-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-questionnaire-response-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-research-study-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-research-study-2.0.0.xml
index 545ec0e94..951992e07 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-research-study-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-research-study-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-structure-definition-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-structure-definition-2.0.0.xml
index d1e024118..bdf2e1013 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-structure-definition-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-structure-definition-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-subscription-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-subscription-2.0.0.xml
index c70892564..d3cdd249d 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-subscription-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-subscription-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-task-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-task-2.0.0.xml
index 84e8cf544..2331fb9a0 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-task-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-task-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-value-set-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-value-set-2.0.0.xml
index 7e7075d20..230b16a15 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-value-set-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/StructureDefinition/dsf-value-set-2.0.0.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-bpmn-message-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-bpmn-message-2.0.0.xml
index 193efe1b4..c620b2c6b 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-bpmn-message-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-bpmn-message-2.0.0.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-organization-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-organization-role-2.0.0.xml
index b4ceec2e4..b317cd4c5 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-organization-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-organization-role-2.0.0.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-practitioner-role-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-practitioner-role-2.0.0.xml
index a789b0f25..771701c9b 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-practitioner-role-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-practitioner-role-2.0.0.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-process-authorization-recipient-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-process-authorization-recipient-2.0.0.xml
index 99b37de0c..ca6270331 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-process-authorization-recipient-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-process-authorization-recipient-2.0.0.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-process-authorization-requester-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-process-authorization-requester-2.0.0.xml
index 5619a0c83..87c8cd5de 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-process-authorization-requester-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-process-authorization-requester-2.0.0.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-read-access-tag-2.0.0.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-read-access-tag-2.0.0.xml
index 3c46dbaa2..10783eba3 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-read-access-tag-2.0.0.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/dsf-read-access-tag-2.0.0.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/valueset-mimetypes.xml b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/valueset-mimetypes.xml
index d64e1786e..c02a744bb 100644
--- a/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/valueset-mimetypes.xml
+++ b/dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/ValueSet/valueset-mimetypes.xml
@@ -61,7 +61,7 @@
-
+
diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml
index 60d506fa4..db8026af6 100755
--- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml
+++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-fhir-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml
index 5e47b9a91..25e340731 100755
--- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml
+++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml
@@ -23,7 +23,7 @@
dev.dsf
dsf-fhir-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml
index 637f9fd21..760cf963b 100755
--- a/dsf-fhir/pom.xml
+++ b/dsf-fhir/pom.xml
@@ -24,7 +24,7 @@
dev.dsf
dsf-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-maven/dsf-maven-plugin/pom.xml b/dsf-maven/dsf-maven-plugin/pom.xml
index 3978b20ec..bdd96afea 100644
--- a/dsf-maven/dsf-maven-plugin/pom.xml
+++ b/dsf-maven/dsf-maven-plugin/pom.xml
@@ -26,7 +26,7 @@
dev.dsf
dsf-maven-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/dsf-maven/pom.xml b/dsf-maven/pom.xml
index 213495e3e..b34f1d796 100644
--- a/dsf-maven/pom.xml
+++ b/dsf-maven/pom.xml
@@ -26,7 +26,7 @@
dev.dsf
dsf-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 39d9656ef..3fac5f5c3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
dev.dsf
dsf-pom
- 2.0.0-SNAPSHOT
+ 2.0.1-SNAPSHOT
pom
@@ -446,6 +446,11 @@
thymeleaf
3.1.3.RELEASE
+
+ com.nimbusds
+ nimbus-jose-jwt
+ 9.37.4
+
commons-io