From b9974c080454c45f4fc86e4b96faadf016b1f8e3 Mon Sep 17 00:00:00 2001 From: Reto Wettstein Date: Thu, 4 Jan 2024 09:08:49 +0100 Subject: [PATCH 1/4] adapts questionnaire to new profile 1.5.0 --- .../fhir/Questionnaire/dsf-hello-user.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml b/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml index 76f8958..9fed9da 100644 --- a/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml +++ b/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml @@ -1,6 +1,6 @@ - + @@ -17,11 +17,13 @@ + + @@ -32,50 +34,60 @@ + + + + + + + + + + \ No newline at end of file From a0b451a345a29a0124123f34cf7ad94ad6b86718 Mon Sep 17 00:00:00 2001 From: Reto Wettstein Date: Mon, 12 Feb 2024 15:43:29 +0100 Subject: [PATCH 2/4] fix ordering of business-key and user-task-id --- src/main/resources/fhir/Questionnaire/dsf-hello-user.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml b/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml index 9fed9da..f298789 100644 --- a/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml +++ b/src/main/resources/fhir/Questionnaire/dsf-hello-user.xml @@ -14,15 +14,15 @@ - + - + - + - + From 046afb221fe92084375e2f5ba5cf43707460c35f Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 13 Feb 2024 11:42:50 +0100 Subject: [PATCH 3/4] version to 1.5.0.0, dependency and maven plugin upgrades --- pom.xml | 24 +++++++++++-------- .../HelloWorldProcessPluginDefinition.java | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 90f2e95..673b77d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ dev.dsf dsf-process-hello-world - 1.0.0.0-SNAPSHOT + 1.5.0.0-SNAPSHOT jar @@ -13,7 +13,7 @@ 17 17 - 1.0.0 + 1.5.0-SNAPSHOT ../dsf @@ -46,7 +46,7 @@ org.slf4j slf4j-api - 2.0.7 + 2.0.12 provided @@ -70,6 +70,12 @@ 4.13.2 test + + org.apache.logging.log4j + log4j-slf4j2-impl + 2.22.1 + test + @@ -86,7 +92,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.3 org.apache.maven.plugins @@ -108,23 +114,22 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.0 + 3.5.1 org.apache.maven.plugins maven-dependency-plugin - 3.6.0 + 3.6.1 org.apache.maven.plugins maven-clean-plugin - 3.3.1 + 3.3.2 org.codehaus.mojo buildnumber-maven-plugin - - 1.4 + 3.2.0 validate @@ -135,7 +140,6 @@ ? - true diff --git a/src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java b/src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java index ac70141..72293ff 100644 --- a/src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java +++ b/src/main/java/dev/dsf/bpe/HelloWorldProcessPluginDefinition.java @@ -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 From c0ecd45f3c8c4781a6dfed64c4b572f719794d40 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 21 Feb 2024 11:57:20 +0100 Subject: [PATCH 4/4] maven-plugin github repo config, disabled releases for github repos --- pom.xml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 673b77d..1bf7d5d 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ manual - + dev.dsf @@ -196,11 +196,28 @@ github GitHub DSF Apache Maven Packages https://maven.pkg.github.com/datasharingframework/dsf + + false + true + + + + github + GitHub DSF Apache Maven Packages + https://maven.pkg.github.com/datasharingframework/dsf + + false + + + true + + +