2.0.0 Release Preparation (2/2)

.gitattributes

@@ -10,6 +10,7 @@
 # Declare files that will always have certain line endings on checkout.
 *.bat text eol=crlf
 *.sh text eol=lf
+*.conf text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary

.github/workflows/codeql.yml

@@ -1,12 +1,12 @@
-name: DSF 1.x CodeQL
+name: DSF 2.x CodeQL
 
 on:
   push:
-    branches: [ "main", "develop", "hotfix/1*", "release/1*" ]
+    branches: [ "develop_2", "hotfix/2*", "release/2*" ]
   pull_request:
-    branches: [ "main", "develop", "hotfix/1*", "release/1*" ]
+    branches: [ "develop_2", "hotfix/2*", "release/2*" ]
   schedule:
-    - cron: '21 15 * * 0' # Sundays, 15:21
+    - cron: '11 15 * * 0' # Sundays, 15:11
 
 jobs:
   analyze:
@@ -23,22 +23,26 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
-    - name: Set up JDK 17
+    - name: Set up JDK 25
       if: ${{ matrix.language == 'java-kotlin' }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 25
         cache: 'maven'
+        check-latest: true
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         queries: security-extended, security-and-quality
 
+    - name: Display Maven Version
+      run: mvn --version
+
     - name: Compile with Maven
       if: ${{ matrix.language == 'java-kotlin' }}
       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

.github/workflows/maven-build.yml

@@ -1,21 +1,22 @@
-name: DSF 1.x Java CI Build with Maven
+name: DSF 2.x Java CI Build with Maven
 
 on:
   pull_request:
-    branches: develop
+    branches: develop_2
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
+    - name: Checkout repository 
+      uses: actions/checkout@v5
+    - name: Set up JDK 25
+      uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
-        java-version: 17
+        java-version: 25
         cache: 'maven'
     - name: Build with Maven
-      run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 clean verify
+      run: mvn --batch-mode --fail-at-end -DforkCount=2 clean verify

.github/workflows/maven-publish.yml

@@ -1,9 +1,9 @@
-name: DSF 1.x Java CI Publish with Maven
+name: DSF 2.x Java CI Publish with Maven
 
 on:
   pull_request:
     types: closed
-    branches: develop
+    branches: develop_2
 
 jobs:
   publish:
@@ -14,15 +14,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Checkout repository
+        uses: actions/checkout@v5
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 25
           cache: 'maven'
           check-latest: true
       - name: Publish with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 clean deploy
+        run: mvn --batch-mode --fail-at-end -DforkCount=2 clean deploy

.gitignore

@@ -9,11 +9,22 @@
 
 **/*.iml
 
+## dev setup cert folder and files, folder and files generated by dsf-maven-plugin 
+cert
+cert/**
+
 ###
 # dsf-bpe ignores
 ###
+dsf-bpe/dsf-bpe-process-api-v1/dependency-reduced-pom.xml
+dsf-bpe/dsf-bpe-process-api-v1-operaton/dependency-reduced-pom.xml
+dsf-bpe/dsf-bpe-server-jetty/cert/*.crt
+dsf-bpe/dsf-bpe-server-jetty/cert/*.key
 dsf-bpe/dsf-bpe-server-jetty/conf/config.properties
-dsf-bpe/dsf-bpe-server-jetty/docker/ca/*.pem
+dsf-bpe/dsf-bpe-server-jetty/docker/api/v1/*.jar
+dsf-bpe/dsf-bpe-server-jetty/docker/api/v2/*.jar
+dsf-bpe/dsf-bpe-server-jetty/docker/ca/client_ca_chains/*.crt
+dsf-bpe/dsf-bpe-server-jetty/docker/ca/server_root_cas/*.crt
 dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe.jar
 dsf-bpe/dsf-bpe-server-jetty/docker/dsf_status_client.jar
 dsf-bpe/dsf-bpe-server-jetty/docker/lib/*.jar
@@ -24,62 +35,81 @@ dsf-bpe/dsf-bpe-server-jetty/ui
 ###
 # dsf-docker ignore
 ###
-dsf-docker/bpe_proxy/ca/*.pem
-dsf-docker/fhir_proxy/ca/*.pem
+dsf-docker/bpe_proxy/ca/client_ca_chains/*.crt
+dsf-docker/bpe_proxy/ca/client_issuing_cas/*.crt
+dsf-docker/fhir_proxy/ca/client_ca_chains/*.crt
+dsf-docker/fhir_proxy/ca/client_issuing_cas/*.crt
 
 ###
-# dsf-docker-test-setup ignores
+# dsf-docker-dev-setup ignores
 ###
-dsf-docker-test-setup/bpe/log/*.log
-dsf-docker-test-setup/bpe/log/*.log.gz
-dsf-docker-test-setup/bpe/lib_external/*.jar
-dsf-docker-test-setup/bpe/process/*.jar
-dsf-docker-test-setup/bpe/secrets/*.pem
-dsf-docker-test-setup/bpe/.env
+dsf-docker-dev-setup/bpe/log/*.log
+dsf-docker-dev-setup/bpe/log/*.log.gz
+dsf-docker-dev-setup/bpe/lib_external/*.jar
+dsf-docker-dev-setup/bpe/process/*.jar
+dsf-docker-dev-setup/bpe/secrets/bpe.crt
+dsf-docker-dev-setup/bpe/secrets/bpe.key
+dsf-docker-dev-setup/bpe/secrets/bpe.key.plain
+dsf-docker-dev-setup/bpe/secrets/ca_chain.crt
+dsf-docker-dev-setup/bpe/secrets/issuing_ca.crt
+dsf-docker-dev-setup/bpe/secrets/root_ca.crt
+dsf-docker-dev-setup/bpe/.env
+dsf-docker-dev-setup/bpe/docker-compose.override.yml
 
-dsf-docker-test-setup/fhir/log/*.log
-dsf-docker-test-setup/fhir/log/*.log.gz
-dsf-docker-test-setup/fhir/secrets/*.pem
-dsf-docker-test-setup/fhir/.env
+dsf-docker-dev-setup/fhir/log/*.log
+dsf-docker-dev-setup/fhir/log/*.log.gz
+dsf-docker-dev-setup/fhir/secrets/bpe.crt
+dsf-docker-dev-setup/fhir/secrets/bpe.key
+dsf-docker-dev-setup/fhir/secrets/ca_chain.crt
+dsf-docker-dev-setup/fhir/secrets/fhir.crt
+dsf-docker-dev-setup/fhir/secrets/fhir.key.plain
+dsf-docker-dev-setup/fhir/secrets/issuing_ca.crt
+dsf-docker-dev-setup/fhir/secrets/root_ca.crt
+dsf-docker-dev-setup/fhir/.env
+dsf-docker-dev-setup/fhir/docker-compose.override.yml
 
 ###
-# dsf-docker-test-setup-3dic-ttp ignores
+# dsf-docker-dev-setup-3dic-ttp ignores
 ###
-dsf-docker-test-setup-3dic-ttp/**/bpe/log/*.log
-dsf-docker-test-setup-3dic-ttp/**/bpe/log/*.log.gz
-dsf-docker-test-setup-3dic-ttp/**/bpe/lib_external/*.jar
-dsf-docker-test-setup-3dic-ttp/**/bpe/process/*.jar
+dsf-docker-dev-setup-3dic-ttp/**/bpe/log/*.log
+dsf-docker-dev-setup-3dic-ttp/**/bpe/log/*.log.gz
+dsf-docker-dev-setup-3dic-ttp/**/bpe/lib_external/*.jar
+dsf-docker-dev-setup-3dic-ttp/**/bpe/process/*.jar
 
-dsf-docker-test-setup-3dic-ttp/**/fhir/log/*.log
-dsf-docker-test-setup-3dic-ttp/**/fhir/log/*.log.gz
+dsf-docker-dev-setup-3dic-ttp/**/fhir/log/*.log
+dsf-docker-dev-setup-3dic-ttp/**/fhir/log/*.log.gz
 
-dsf-docker-test-setup-3dic-ttp/secrets/*.pem
-dsf-docker-test-setup-3dic-ttp/secrets/*.jks
-dsf-docker-test-setup-3dic-ttp/.env
-dsf-docker-test-setup-3dic-ttp/docker-compose.override.yml
+dsf-docker-dev-setup-3dic-ttp/secrets/ca_chain.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/dic1.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/dic1.key
+dsf-docker-dev-setup-3dic-ttp/secrets/dic2.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/dic2.key
+dsf-docker-dev-setup-3dic-ttp/secrets/dic3.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/dic3.key
+dsf-docker-dev-setup-3dic-ttp/secrets/issuing_ca.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/keycloak.chain.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/keycloak.key.plain
+dsf-docker-dev-setup-3dic-ttp/secrets/keycloak_trust_store.jks
+dsf-docker-dev-setup-3dic-ttp/secrets/localhost.chain.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/localhost.key.plain
+dsf-docker-dev-setup-3dic-ttp/secrets/root_ca.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/ttp.crt
+dsf-docker-dev-setup-3dic-ttp/secrets/ttp.key
+dsf-docker-dev-setup-3dic-ttp/secrets/ttp.key.password
+dsf-docker-dev-setup-3dic-ttp/.env
+dsf-docker-dev-setup-3dic-ttp/docker-compose.override.yml
 
 ###
 # dsf-fhir ignores
 ###
+dsf-fhir/dsf-fhir-server-jetty/cert/*.crt
+dsf-fhir/dsf-fhir-server-jetty/cert/*.key
 dsf-fhir/dsf-fhir-server-jetty/conf/bundle.xml
 dsf-fhir/dsf-fhir-server-jetty/conf/config.properties
-dsf-fhir/dsf-fhir-server-jetty/docker/ca/*.pem
+dsf-fhir/dsf-fhir-server-jetty/docker/ca/client_ca_chains/*.crt
+dsf-fhir/dsf-fhir-server-jetty/docker/ca/server_root_cas/*.crt
 dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir.jar
 dsf-fhir/dsf-fhir-server-jetty/docker/dsf_status_client.jar
 dsf-fhir/dsf-fhir-server-jetty/docker/lib/*.jar
 dsf-fhir/dsf-fhir-server-jetty/ui
-dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/bundle.xml
-
-###
-# dsf-tools ignores
-###
-dsf-tools/dsf-tools-default-ca-files-generator/cert/*.pem
-
-dsf-tools/dsf-tools-test-data-generator/bundle/*.xml
-
-dsf-tools/dsf-tools-test-data-generator/cert/**/*.pem
-dsf-tools/dsf-tools-test-data-generator/cert/**/*.csr
-dsf-tools/dsf-tools-test-data-generator/cert/**/*.p12
-dsf-tools/dsf-tools-test-data-generator/cert/thumbprints.txt
-
-dsf-tools/dsf-tools-test-data-generator/config/*.properties
+dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/bundle.xml

CITATION.cff

@@ -24,8 +24,8 @@ preferred-citation:
   doi: 10.3233/SHTI210060
   type: proceedings
 title: "Data Sharing Framework (DSF)"
-version: 1.7.2
-date-released: 2025-05-17
+version: 2.0.0
+date-released: 2025-05-31
 url: https://dsf.dev
 repository-code: https://github.com/datasharingframework/dsf
 repository-artifact: https://github.com/datasharingframework/dsf/releases

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Heilbronn University of Applied Sciences
+   Copyright 2018-2025 Heilbronn University of Applied Sciences
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,4 +1,4 @@
-![Data Sharing Framework (DSF) logo.](dsf-fhir/dsf-fhir-server/src/main/resources/static/logo.svg)
+![Data Sharing Framework (DSF) logo.](dsf-fhir/dsf-fhir-server/src/main/resources/fhir/static/logo.svg)
 
 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.  
 

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

@@ -0,0 +1,95 @@
+<!--
+
+    Copyright 2018-2025 Heilbronn University of Applied Sciences
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>dsf-bpe-process-api-v1-base</artifactId>
+
+	<parent>
+		<groupId>dev.dsf</groupId>
+		<artifactId>dsf-bpe-pom</artifactId>
+		<version>2.0.0-SNAPSHOT</version>
+	</parent>
+
+	<properties>
+		<main.basedir>${project.parent.parent.basedir}</main.basedir>
+	</properties>
+
+	<name>DSF BPE Process API v1 (Base)</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-r4</artifactId>
+			<version>${hapi.fhir.version.v1}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.mail</groupId>
+			<artifactId>jakarta.mail</artifactId>
+		</dependency>
+		<dependency>
+			<artifactId>jakarta.ws.rs-api</artifactId>
+			<groupId>jakarta.ws.rs</groupId>
+		</dependency>
+
+		<!-- optional dependencies provided by the DSF bpe -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>de.hs-heilbronn.mi</groupId>
+			<artifactId>crypto-utils</artifactId>
+			<version>${crypto-utils.version.v1}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation</artifactId>
+			<version>${hapi.fhir.version.v1}</version>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>