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

.github/workflows/maven-build.yml

@@ -11,10 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'zulu'
         java-version: 17
+        cache: 'maven'
     - name: Build with Maven
       run: mvn -B verify -fae --file pom.xml -Dgpg.skip

.github/workflows/maven-publish.yml

@@ -17,11 +17,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 17
+          cache: 'maven'
+          check-latest: true
       - name: Publish with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CITATION.cff

@@ -24,8 +24,8 @@ preferred-citation:
   doi: 10.3233/SHTI210060
   type: proceedings
 title: "Data Sharing Framework (DSF)"
-version: 1.2.0
-date-released: 2023-09-12
+version: 1.3.0
+date-released: 2023-10-11
 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.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 
 	<dependencies>
@@ -41,6 +41,11 @@
 			<artifactId>spring-web</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>dev.dsf</groupId>
+			<artifactId>dsf-fhir-validation</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>de.hs-heilbronn.mi</groupId>
 			<artifactId>crypto-utils</artifactId>

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

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 
 	<dependencies>

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

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>dev.dsf</groupId>
 		<artifactId>dsf-bpe-pom</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 
 	<dependencies>
@@ -51,6 +51,12 @@
 			<artifactId>crypto-utils</artifactId>
 		</dependency>
 
+		<!-- dependencies for process plugins -->
+		<dependency>
+			<groupId>dev.dsf</groupId>
+			<artifactId>dsf-fhir-validation</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/AbstractProcessPlugin.java

@@ -158,6 +158,8 @@ Resource getResource()
 	private static final String PROCESS_ID_PATTERN_STRING = "^(?<domainNoDots>[a-zA-Z0-9-]+)_(?<processName>[a-zA-Z0-9-]+)$";
 	private static final Pattern PROCESS_ID_PATTERN = Pattern.compile(PROCESS_ID_PATTERN_STRING);
 
+	private static final String DEFAULT_PROCESS_HISTORY_TIME_TO_LIVE = "P30D";
+
 	private final D processPluginDefinition;
 	private final A processPluginApi;
 	private final boolean draft;
@@ -679,6 +681,18 @@ file, getDefinitionName(), getDefinitionVersion(), VERSION_PLACEHOLDER_PATTERN_S
 
 					property.setCamundaName(MODEL_ATTRIBUTE_PROCESS_API_VERSION);
 					property.setCamundaValue(getProcessPluginApiVersion());
+
+					if (process.getCamundaHistoryTimeToLiveString() == null
+							|| process.getCamundaHistoryTimeToLiveString().isBlank())
+					{
+						if (isDraft())
+							logger.info("Setting process history time to live for process {} from {} to {}",
+									process.getId(), jarFile.toString(), DEFAULT_PROCESS_HISTORY_TIME_TO_LIVE);
+						else
+							logger.debug("Setting process history time to live for process {} from {} to {}",
+									process.getId(), jarFile.toString(), DEFAULT_PROCESS_HISTORY_TIME_TO_LIVE);
+						process.setCamundaHistoryTimeToLiveString(DEFAULT_PROCESS_HISTORY_TIME_TO_LIVE);
+					}
 				});
 
 				return new BpmnFileAndModel(draft, file, model, getJarFile());

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/BpmnProcessStateChangeServiceImpl.java

@@ -47,6 +47,9 @@ public void afterPropertiesSet() throws Exception
 	{
 		Objects.requireNonNull(repositoryService, "repositoryService");
 		Objects.requireNonNull(processStateDao, "processStateDao");
+
+		logger.info("Excluded processes: {}", excluded);
+		logger.info("Retired processes: {}", retired);
 	}
 
 	private Map<ProcessIdAndVersion, ProcessState> getStates()

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

@@ -48,7 +48,7 @@ public class PropertiesConfig implements InitializingBean
 	@Value("${dev.dsf.bpe.db.user.camunda.password}")
 	private char[] dbCamundaPassword;
 
-	@Documentation(required = true, description = "PEM encoded file with one or more trusted root certificates to validate server certificates for https connections to local and remote DSF FHIR servers", recommendation = "Use docker secret file to configure", example = "/run/secrets/app_server_trust_certificates.pem")
+	@Documentation(required = true, description = "PEM encoded file with one or more trusted root certificates to validate server certificates for https connections to local and remote DSF FHIR servers", recommendation = "Use docker secret file to configure", example = "/run/secrets/app_client_trust_certificates.pem")
 	@Value("${dev.dsf.bpe.fhir.client.trust.server.certificate.cas}")
 	private String clientCertificateTrustStoreFile;
 

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/v1/service/AbstractResourceProvider.java

@@ -1,5 +1,7 @@
 package dev.dsf.bpe.v1.service;
 
+import static org.hl7.fhir.instance.model.api.IBaseBundle.LINK_NEXT;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -61,7 +63,7 @@ protected final <R extends Resource> List<R> search(Class<? extends Resource> se
 					.map(BundleEntryComponent::getResource).filter(targetType::isInstance).map(targetType::cast)
 					.filter(filter).toList());
 
-			hasMore = resultBundle.getTotal() > organizations.size();
+			hasMore = resultBundle.getLink(LINK_NEXT) != null;
 		}
 
 		return organizations;

dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.19_to_7.20.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 ('900', CURRENT_TIMESTAMP, '7.20.0');

dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.3.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.3.0">
+		<sqlFile dbms="postgresql" encoding="utf8" path="db/camunda/postgres_engine_7.19_to_7.20.sql" />
+	</changeSet>
+
+</databaseChangeLog>

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

@@ -13,4 +13,6 @@
 	<include file="db/db.process_states.changelog-1.0.0.xml" />
 
 	<include file="db/db.last_event.changelog-1.0.0.xml" />
+
+	<include file="db/db.camunda_engine.changelog-1.3.0.xml" />
 </databaseChangeLog>