Skip to content

Issue/5 update to dsf 2 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hhund merged 26 commits into from
Nov 4, 2025
Merged

Issue/5 update to dsf 2 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a4f76d8
Update LICENSE
wetret Feb 14, 2022
009493d
0.6.0 release
hhund May 10, 2022
ca75622
Merge branch 'main' into release/0.6.0
hhund May 10, 2022
511118f
Merge remote-tracking branch 'origin/release/0.6.0' into main
hhund May 10, 2022
ff2146c
prepare release 0.9.0
wetret Oct 24, 2022
ddbfa37
Merge branch 'release/0.9.0'
wetret Oct 24, 2022
2039a95
1.0.0.0 release
hhund Aug 22, 2023
9214c0e
Merge remote-tracking branch 'origin/release/1.0.0.0' into main
hhund Aug 22, 2023
90ad2e6
v1.5.0.0 release
hhund Feb 21, 2024
367439e
v1.5.0.0 release
hhund Feb 21, 2024
94af86e
Merge remote-tracking branch 'origin/release/1.5.0.0' into main
hhund Feb 21, 2024
2cc5468
Merge remote-tracking branch 'origin/main' into issue/5_Update_to_DSF_2
hhund Oct 20, 2025
bda4ec1
initial round of changes for DSF 2.0.0
hhund Oct 20, 2025
dc89668
add quantity and choice examples, update dependencies
wetret Oct 31, 2025
8c4ff05
DSF 2.0.0 does not deploy questionnaire with profile version set
wetret Oct 31, 2025
0a9736e
removed not needed repo config
hhund Oct 31, 2025
2498ccd
modifications for datasharingframework/dsf#379
hhund Oct 31, 2025
4b241cc
Merge remote-tracking branch 'origin/issue/5_Update_to_DSF_2' into is…
wetret Oct 31, 2025
b66951b
Merge remote-tracking branch
hhund Oct 31, 2025
07a5267
formatting
hhund Oct 31, 2025
4ca795c
profile and task modifications
hhund Oct 31, 2025
99ac306
formatting
hhund Oct 31, 2025
045da83
dsf version to 2.0.0-RC1, additional entries in plugin.properties
hhund Nov 4, 2025
952e430
plugin version back to ...-SNAPSHOT
hhund Nov 4, 2025
43c338d
updated copyright year
hhund Nov 4, 2025
678dbe0
github actions config
hhund Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/maven-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v1
- uses: actions/checkout@v5
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: 17
distribution: 'zulu'
java-version: 25
cache: 'maven'
- name: Build with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/maven-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v1
- uses: actions/checkout@v5
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: 17
distribution: 'zulu'
java-version: 25
cache: 'maven'
- name: Publish with Maven
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
195 changes: 120 additions & 75 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,28 @@

<groupId>dev.dsf</groupId>
<artifactId>dsf-process-hello-world</artifactId>
<version>1.5.0.0-SNAPSHOT</version>
<version>2.0.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<project.build.outputTimestamp>2025-11-04T20:15:00Z</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compileSource>17</compileSource>
<compileTarget>17</compileTarget>
<maven.compiler.source>25</maven.compiler.source>
<maven.compiler.target>25</maven.compiler.target>
<maven.compiler.release>25</maven.compiler.release>

<dsf.version>1.5.0-SNAPSHOT</dsf.version>
<dsf.version>2.0.0-RC1</dsf.version>
<dsf.location>../dsf</dsf.location>
</properties>

<name>dsf-process-hello-world</name>
<description>Hello World DSF process</description>
<description>Hello World Process Plugin</description>
<url>https://github.com/datasharingframework/dsf-process-hello-world</url>

<organization>
<name>Heilbronn University of Applied Sciences</name>
<url>https://www.hs-heilbronn.de</url>
</organization>

<scm>
<connection>scm:git:git://github.com/datasharingframework/dsf-process-hello-world.git</connection>
Expand All @@ -38,32 +45,19 @@
<dependencies>
<dependency>
<groupId>dev.dsf</groupId>
<artifactId>dsf-bpe-process-api-v1</artifactId>
<artifactId>dsf-bpe-process-api-v2</artifactId>
<version>${dsf.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.12</version>
<version>2.0.17</version>
<scope>provided</scope>
</dependency>

<!-- testing -->
<dependency>
<groupId>dev.dsf</groupId>
<artifactId>dsf-bpe-process-api-v1</artifactId>
<version>${dsf.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-validation</artifactId>
<version>${dsf.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -73,31 +67,59 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>2.22.1</version>
<version>2.25.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>dev.dsf</groupId>
<artifactId>dsf-fhir-validation</artifactId>
<version>${dsf.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>plugin.properties</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>plugin.properties</include>
</includes>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.14.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<source>${compileSource}</source>
<target>${compileTarget}</target>
<propertiesEncoding>UTF-8</propertiesEncoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.3</version>
<version>3.5.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifest>
Expand All @@ -111,25 +133,20 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<version>3.9.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<executions>
<execution>
<phase>validate</phase>
Expand All @@ -145,15 +162,15 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.23.0</version>
<version>2.29.0</version>
<configuration>
<configFile>eclipse-formatter-config.xml</configFile>
</configuration>
</plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.9.0</version>
<version>1.12.0</version>
<configuration>
<compliance>17</compliance>
<groups>java.,javax.,org.,com.</groups>
Expand All @@ -162,22 +179,78 @@
</plugin>
<plugin>
<groupId>dev.dsf</groupId>
<artifactId>dsf-tools-documentation-generator</artifactId>
<artifactId>dsf-maven-plugin</artifactId>
<version>${dsf.version}</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
<goal>generate-config-doc</goal>
</goals>
</execution>
</executions>
<configuration>
<workingPackages>
<workingPackage>dev.dsf.bpe</workingPackage>
</workingPackages>
<configDocPackages>
<configDocPackage>dev.dsf.bpe</configDocPackage>
</configDocPackages>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.6.2</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.3</version>
</requireMavenVersion>
<bannedDependencies>
<excludes>
<exclude>commons-logging:commons-logging</exclude>
</excludes>
</bannedDependencies>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>dev.dsf</groupId>
<artifactId>dsf-maven-plugin</artifactId>
<versionRange>[2.0.0-SNAPSHOT,)</versionRange>
<goals>
<goal>generate-config-doc</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<distributionManagement>
Expand All @@ -191,34 +264,6 @@
</repository>
</distributionManagement>

<repositories>
<repository>
<id>github</id>
<name>GitHub DSF Apache Maven Packages</name>
<url>https://maven.pkg.github.com/datasharingframework/dsf</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>github</id>
<name>GitHub DSF Apache Maven Packages</name>
<url>https://maven.pkg.github.com/datasharingframework/dsf</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<profiles>
<profile>
<id>validate-and-check</id>
Expand Down Expand Up @@ -293,7 +338,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-process-plugin-to-docker-test-setup</id>
<id>copy-process-plugin-to-docker-dev-setup</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
Expand All @@ -306,11 +351,11 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup/bpe/process</outputDirectory>
<outputDirectory>${dsf.location}/dsf-docker-dev-setup/bpe/process</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-process-plugin-to-docker-test-setup-3dic-ttp/dic1</id>
<id>copy-process-plugin-to-docker-dev-setup-3dic-ttp/dic1</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
Expand All @@ -323,7 +368,7 @@
<version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic1/bpe/process</outputDirectory>
<outputDirectory>${dsf.location}/dsf-docker-dev-setup-3dic-ttp/dic1/bpe/process</outputDirectory>
</configuration>
</execution>
</executions>
Expand All @@ -334,14 +379,14 @@
<configuration>
<filesets>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup/bpe/process</directory>
<directory>${dsf.location}/dsf-docker-dev-setup/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>${dsf.location}/dsf-docker-test-setup-3dic-ttp/dic1/bpe/process</directory>
<directory>${dsf.location}/dsf-docker-dev-setup-3dic-ttp/dic1/bpe/process</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
Expand Down
Loading