Skip to content

Commit 3e559b6

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/release/1.8.0' into main
2 parents aa5849c + 841772e commit 3e559b6

File tree

38 files changed

+262
-114
lines changed

38 files changed

+262
-114
lines changed

‎.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: "CodeQL"
1+
name: DSF 1.x CodeQL
22

33
on:
44
push:
5-
branches: [ "main", "develop", "hotfix/*", "release/*" ]
5+
branches: [ "main", "develop", "hotfix/1*", "release/1*" ]
66
pull_request:
7-
branches: [ "main", "develop", "hotfix/*", "release/*" ]
7+
branches: [ "main", "develop", "hotfix/1*", "release/1*" ]
88
schedule:
99
- cron: '21 15 * * 0' # Sundays, 15:21
1010

@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Compile with Maven
4343
if: ${{ matrix.language == 'java-kotlin' }}
44-
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
44+
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
4545

4646
- name: Perform CodeQL Analysis
4747
uses: github/codeql-action/analyze@v3

‎.github/workflows/maven-build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
name: Java CI Build with Maven
1+
name: DSF 1.x Java CI Build with Maven
22

3-
on: push
3+
on:
4+
pull_request:
5+
branches: develop
46

57
jobs:
68
build:
@@ -16,4 +18,4 @@ jobs:
1618
java-version: 17
1719
cache: 'maven'
1820
- name: Build with Maven
19-
run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 -Dgpg.skip clean verify
21+
run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 clean verify

‎.github/workflows/maven-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Java CI Publish with Maven
1+
name: DSF 1.x Java CI Publish with Maven
22

33
on:
44
pull_request:
@@ -25,4 +25,4 @@ jobs:
2525
- name: Publish with Maven
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 -Dgpg.skip clean deploy
28+
run: mvn --batch-mode --fail-at-end --threads 1C -DforkCount=2 clean deploy

‎CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ preferred-citation:
2424
doi: 10.3233/SHTI210060
2525
type: proceedings
2626
title: "Data Sharing Framework (DSF)"
27-
version: 1.7.1
28-
date-released: 2025-03-24
27+
version: 1.8.0
28+
date-released: 2025-06-01
2929
url: https://dsf.dev
3030
repository-code: https://github.com/datasharingframework/dsf
3131
repository-artifact: https://github.com/datasharingframework/dsf/releases

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-bpe-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
11-
11+
12+
<name>DSF BPE Process API v1</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>dev.dsf</groupId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-bpe-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF BPE Server Jetty</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>dev.dsf</groupId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-bpe-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF BPE Server</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>dev.dsf</groupId>

‎dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.22_to_7.23.sql

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--
2+
-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
3+
-- under one or more contributor license agreements. See the NOTICE file
4+
-- distributed with this work for additional information regarding copyright
5+
-- ownership. Camunda licenses this file to you under the Apache License,
6+
-- Version 2.0; you may not use this file except in compliance with the License.
7+
-- You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing, software
12+
-- distributed under the License is distributed on an "AS IS" BASIS,
13+
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
-- See the License for the specific language governing permissions and
15+
-- limitations under the License.
16+
--
17+
18+
insert into ACT_GE_SCHEMA_LOG
19+
values ('1200', CURRENT_TIMESTAMP, '7.23.0');
20+
21+
alter table ACT_HI_COMMENT
22+
add column REV_ integer not null
23+
default 1;
24+
25+
alter table ACT_RU_EXECUTION add column PROC_DEF_KEY_ varchar(255);

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<databaseChangeLog
3+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
6+
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
7+
8+
<changeSet author="camunda.org" id="db.camunda_engine.changelog-1.8.0">
9+
<sqlFile dbms="postgresql" encoding="utf8" path="db/camunda/postgres_engine_7.22_to_7.23.sql" />
10+
</changeSet>
11+
12+
</databaseChangeLog>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@
1919
<include file="db/db.camunda_engine.changelog-1.5.1.xml" />
2020

2121
<include file="db/db.camunda_engine.changelog-1.6.0.xml" />
22+
23+
<include file="db/db.camunda_engine.changelog-1.8.0.xml" />
2224
</databaseChangeLog>

‎dsf-bpe/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>dev.dsf</groupId>
99
<artifactId>dsf-pom</artifactId>
10-
<version>1.7.1</version>
10+
<version>1.8.0</version>
1111
</parent>
1212

1313
<modules>
@@ -20,6 +20,8 @@
2020
<main.basedir>${project.basedir}/../..</main.basedir>
2121
</properties>
2222

23+
<name>DSF BPE Parent POM</name>
24+
2325
<repositories>
2426
<repository>
2527
<id>camunda-bpm</id>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-common-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF Common Auth</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>ca.uhn.hapi.fhir</groupId>
@@ -18,7 +20,7 @@
1820
<groupId>org.yaml</groupId>
1921
<artifactId>snakeyaml</artifactId>
2022
</dependency>
21-
23+
2224
<dependency>
2325
<groupId>jakarta.servlet</groupId>
2426
<artifactId>jakarta.servlet-api</artifactId>
@@ -31,7 +33,7 @@
3133
<groupId>jakarta.annotation</groupId>
3234
<artifactId>jakarta.annotation-api</artifactId>
3335
</dependency>
34-
36+
3537
<dependency>
3638
<groupId>org.springframework</groupId>
3739
<artifactId>spring-beans</artifactId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-common-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF Common Config</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>org.springframework</groupId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-common-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF Common DB</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>org.apache.commons</groupId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-common-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
11+
12+
<name>DSF Common Documentation</name>
1113
</project>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,27 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-common-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
11-
11+
12+
<name>DSF Common Jetty</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>dev.dsf</groupId>
15-
<artifactId>dsf-common-auth</artifactId>
17+
<artifactId>dsf-common-auth</artifactId>
1618
</dependency>
1719
<dependency>
1820
<groupId>dev.dsf</groupId>
19-
<artifactId>dsf-common-config</artifactId>
21+
<artifactId>dsf-common-config</artifactId>
2022
</dependency>
2123
<dependency>
2224
<groupId>dev.dsf</groupId>
23-
<artifactId>dsf-common-documentation</artifactId>
25+
<artifactId>dsf-common-documentation</artifactId>
2426
</dependency>
2527
<dependency>
2628
<groupId>dev.dsf</groupId>
27-
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
29+
<artifactId>dsf-tools-docker-secrets-reader</artifactId>
2830
</dependency>
2931
<dependency>
3032
<groupId>org.eclipse.jetty</groupId>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-common-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
11-
11+
12+
<name>DSF Common Status</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>jakarta.servlet</groupId>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-common-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
11-
11+
12+
<name>DSF Common UI</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>jakarta.ws.rs</groupId>

‎dsf-common/pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<parent>
88
<groupId>dev.dsf</groupId>
99
<artifactId>dsf-pom</artifactId>
10-
<version>1.7.1</version>
10+
<version>1.8.0</version>
1111
</parent>
12-
12+
1313
<modules>
1414
<module>dsf-common-auth</module>
1515
<module>dsf-common-config</module>
@@ -19,11 +19,13 @@
1919
<module>dsf-common-status</module>
2020
<module>dsf-common-ui</module>
2121
</modules>
22-
22+
2323
<properties>
2424
<main.basedir>${project.basedir}/../..</main.basedir>
2525
</properties>
26-
26+
27+
<name>DSF Common Parent POM</name>
28+
2729
<dependencies>
2830
<!-- Logging -->
2931
<dependency>
@@ -38,7 +40,7 @@
3840
<scope>test</scope>
3941
</dependency>
4042
</dependencies>
41-
43+
4244
<dependencyManagement>
4345
<dependencies>
4446
<dependency>

‎dsf-fhir/dsf-fhir-auth/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-fhir-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF FHIR Auth</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>dev.dsf</groupId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-fhir-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF FHIR Rest Adapter</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>ca.uhn.hapi.fhir</groupId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-fhir-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF FHIR Server Jetty</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>dev.dsf</groupId>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<parent>
77
<groupId>dev.dsf</groupId>
88
<artifactId>dsf-fhir-pom</artifactId>
9-
<version>1.7.1</version>
9+
<version>1.8.0</version>
1010
</parent>
1111

12+
<name>DSF FHIR Server</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>dev.dsf</groupId>

0 commit comments

Comments
 (0)