Skip to content
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

Jump to bottom

Adapts questionnaire to new profile 1.5.0 #3

Merged
merged 4 commits into from
Feb 21, 2024
Merged

Adapts questionnaire to new profile 1.5.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9974c0
adapts questionnaire to new profile 1.5.0
wetret Jan 4, 2024
a0b451a
fix ordering of business-key and user-task-id
wetret Feb 12, 2024
046afb2
version to 1.5.0.0, dependency and maven plugin upgrades
hhund Feb 13, 2024
c0ecd45
maven-plugin github repo config, disabled releases for github repos
hhund Feb 21, 2024
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
43 changes: 32 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

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

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compileSource>17</compileSource>
<compileTarget>17</compileTarget>

<dsf.version>1.0.0</dsf.version>
<dsf.version>1.5.0-SNAPSHOT</dsf.version>
<dsf.location>../dsf</dsf.location>
</properties>

Expand All @@ -34,7 +34,7 @@
<distribution>manual</distribution>
</license>
</licenses>

<dependencies>
<dependency>
<groupId>dev.dsf</groupId>
Expand All @@ -46,7 +46,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.7</version>
<version>2.0.12</version>
<scope>provided</scope>
</dependency>

Expand All @@ -70,6 +70,12 @@
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>2.22.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -86,7 +92,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -108,23 +114,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<!-- 3.1.0 not working, no git commit hash as buildnumber -->
<version>1.4</version>
<version>3.2.0</version>
<executions>
<execution>
<phase>validate</phase>
Expand All @@ -135,7 +140,6 @@
</executions>
<configuration>
<revisionOnScmFailure>?</revisionOnScmFailure>
<useLastCommittedRevision>true</useLastCommittedRevision>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -192,11 +196,28 @@
<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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

public class HelloWorldProcessPluginDefinition implements ProcessPluginDefinition
{
public static final String VERSION = "1.0.0.0";
public static final String VERSION = "1.5.0.0";
public static final LocalDate RELEASE_DATE = LocalDate.of(2023, 5, 20);

@Override
Expand Down
22 changes: 17 additions & 5 deletions src/main/resources/fhir/Questionnaire/dsf-hello-user.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Questionnaire xmlns="http://hl7.org/fhir">
<meta>
<profile value="http://dsf.dev/fhir/StructureDefinition/questionnaire|1.0.0"/>
<profile value="http://dsf.dev/fhir/StructureDefinition/questionnaire|1.5.0"/>
<tag>
<system value="http://dsf.dev/fhir/CodeSystem/read-access-tag"/>
<code value="ALL"/>
Expand All @@ -14,14 +14,16 @@
<!-- status managed by bpe -->
<status value="unknown"/>
<item>
<linkId value="user-task-id"/>
<linkId value="business-key"/>
<type value="string"/>
<text value="The user-task-id of the process execution"/>
<text value="The business-key of the process execution"/>
<required value="true"/>
</item>
<item>
<linkId value="business-key"/>
<linkId value="user-task-id"/>
<type value="string"/>
<text value="The business-key of the process execution"/>
<text value="The user-task-id of the process execution"/>
<required value="true"/>
</item>
<item>
<linkId value="display-example"/>
Expand All @@ -32,50 +34,60 @@
<linkId value="string-example"/>
<type value="string"/>
<text value="Add a string to test the string type"/>
<required value="true"/>
</item>
<item>
<linkId value="text-example"/>
<type value="text"/>
<text value="Add a text to test the text type"/>
<required value="true"/>
</item>
<item>
<linkId value="integer-example"/>
<type value="integer"/>
<text value="Add an integer number to test the integer type"/>
<required value="false"/>
</item>
<item>
<linkId value="decimal-example"/>
<type value="decimal"/>
<text value="Add a decimal number to test the decimal type"/>
<required value="false"/>
</item>
<item>
<linkId value="date-example"/>
<type value="date"/>
<text value="Add a date to test the date type"/>
<required value="false"/>
</item>
<item>
<linkId value="time-example"/>
<type value="time"/>
<text value="Add a time to test the time type"/>
<required value="false"/>
</item>
<item>
<linkId value="date-time-example"/>
<type value="dateTime"/>
<text value="Add a date-time to test the dateTime type"/>
<required value="false"/>
</item>
<item>
<linkId value="url-example"/>
<type value="url"/>
<text value="Add the location of the pdf contract"/>
<required value="false"/>
</item>
<item>
<linkId value="reference-example"/>
<type value="reference"/>
<text value="Add the location (url) of the data-set that should be approved"/>
<required value="false"/>
</item>
<item>
<linkId value="boolean-example"/>
<type value="boolean"/>
<text value="Do you approve the release of the data-set?"/>
<required value="false"/>
</item>
</Questionnaire>
Loading