diff --git a/CITATION.cff b/CITATION.cff index 7d99f92dd..40fa129e5 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -24,8 +24,8 @@ preferred-citation: doi: 10.3233/SHTI210060 type: proceedings title: "Data Sharing Framework (DSF)" -version: 1.5.1 -date-released: 2024-04-17 +version: 1.5.2 +date-released: 2024-07-09 url: https://dsf.dev repository-code: https://github.com/datasharingframework/dsf repository-artifact: https://github.com/datasharingframework/dsf/releases diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 055d25311..749e4a153 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.5.1 + 1.5.2 diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index a5be25686..bfce51d6e 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.5.1 + 1.5.2 diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index 8eb99274b..5e52cfb0c 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-bpe-pom - 1.5.1 + 1.5.2 diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index 26e3ee87a..0bf1178ff 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.5.1 + 1.5.2 diff --git a/dsf-common/dsf-common-auth/pom.xml b/dsf-common/dsf-common-auth/pom.xml index 47ccc7b82..7c70022af 100644 --- a/dsf-common/dsf-common-auth/pom.xml +++ b/dsf-common/dsf-common-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.5.1 + 1.5.2 diff --git a/dsf-common/dsf-common-config/pom.xml b/dsf-common/dsf-common-config/pom.xml index eaee57ead..c40a7494c 100644 --- a/dsf-common/dsf-common-config/pom.xml +++ b/dsf-common/dsf-common-config/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.5.1 + 1.5.2 diff --git a/dsf-common/dsf-common-db/pom.xml b/dsf-common/dsf-common-db/pom.xml index cf96185ae..0d5e294d3 100644 --- a/dsf-common/dsf-common-db/pom.xml +++ b/dsf-common/dsf-common-db/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.5.1 + 1.5.2 diff --git a/dsf-common/dsf-common-documentation/pom.xml b/dsf-common/dsf-common-documentation/pom.xml index a7b7eb9ee..27b967bae 100644 --- a/dsf-common/dsf-common-documentation/pom.xml +++ b/dsf-common/dsf-common-documentation/pom.xml @@ -6,6 +6,6 @@ dev.dsf dsf-common-pom - 1.5.1 + 1.5.2 \ No newline at end of file diff --git a/dsf-common/dsf-common-jetty/pom.xml b/dsf-common/dsf-common-jetty/pom.xml index e9c0f7347..6cff8c1b1 100644 --- a/dsf-common/dsf-common-jetty/pom.xml +++ b/dsf-common/dsf-common-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.5.1 + 1.5.2 diff --git a/dsf-common/dsf-common-status/pom.xml b/dsf-common/dsf-common-status/pom.xml index 79ac7e577..dbab31ebe 100644 --- a/dsf-common/dsf-common-status/pom.xml +++ b/dsf-common/dsf-common-status/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.5.1 + 1.5.2 diff --git a/dsf-common/dsf-common-ui/pom.xml b/dsf-common/dsf-common-ui/pom.xml index a959759c5..1da1d0ef7 100644 --- a/dsf-common/dsf-common-ui/pom.xml +++ b/dsf-common/dsf-common-ui/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-common-pom - 1.5.1 + 1.5.2 diff --git a/dsf-common/pom.xml b/dsf-common/pom.xml index 1ae773392..9ea2cbfb0 100644 --- a/dsf-common/pom.xml +++ b/dsf-common/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.5.1 + 1.5.2 diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index 3bb917968..c171a9611 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.5.1 + 1.5.2 diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 2b9c54d28..e62bab08f 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.5.1 + 1.5.2 diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index 6fc180712..2320bfc02 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.5.1 + 1.5.2 diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index 6d85872a2..08c40903e 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.5.1 + 1.5.2 diff --git a/dsf-fhir/dsf-fhir-server/src/main/resources/static/main.js b/dsf-fhir/dsf-fhir-server/src/main/resources/static/main.js index c78a99012..9bcf9f691 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/resources/static/main.js +++ b/dsf-fhir/dsf-fhir-server/src/main/resources/static/main.js @@ -86,7 +86,10 @@ window.addEventListener('DOMContentLoaded', () => { }) // complete questionnaire response - document.querySelector('form > fieldset#form-fieldset > div.row-submit > button#complete-questionnaire-response')?.addEventListener('click', () => completeQuestionnaireResponse()) + document.querySelector('form')?.addEventListener('submit', event => { + completeQuestionnaireResponse() + event.preventDefault() + }) } if (resourceType != null && resourceType[1] === 'Task' && resourceType[2] && (resourceType[3] === undefined || resourceType[4])) { @@ -120,7 +123,10 @@ window.addEventListener('DOMContentLoaded', () => { }) // start process button - document.querySelector('form > fieldset#form-fieldset > div.row-submit > button#start-process')?.addEventListener('click', () => startProcess()) + document.querySelector('form')?.addEventListener('submit', event => { + startProcess() + event.preventDefault() + }) } }) diff --git a/dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceQuestionnaireResponse.html b/dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceQuestionnaireResponse.html index 7b3ffbe9d..d94d77427 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceQuestionnaireResponse.html +++ b/dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceQuestionnaireResponse.html @@ -68,7 +68,7 @@
    - +
    diff --git a/dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceTask.html b/dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceTask.html index b9415cad5..a1cff26e4 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceTask.html +++ b/dsf-fhir/dsf-fhir-server/src/main/resources/template/resourceTask.html @@ -73,7 +73,7 @@

    Input

      - +
      diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 33482673a..25506e6f6 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.5.1 + 1.5.2 @@ -104,7 +104,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index decbf30b4..b45859068 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.5.1 + 1.5.2 diff --git a/dsf-fhir/dsf-fhir-webservice-client/src/main/java/dev/dsf/fhir/client/FhirWebserviceClientJersey.java b/dsf-fhir/dsf-fhir-webservice-client/src/main/java/dev/dsf/fhir/client/FhirWebserviceClientJersey.java index fdfa0142f..b4cdce0af 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/src/main/java/dev/dsf/fhir/client/FhirWebserviceClientJersey.java +++ b/dsf-fhir/dsf-fhir-webservice-client/src/main/java/dev/dsf/fhir/client/FhirWebserviceClientJersey.java @@ -134,8 +134,7 @@ private PreferReturn toPreferReturn(PreferReturnType returnType, Class - { + case REPRESENTATION -> { // TODO remove workaround if HAPI bug fixed Resource resource = referenceCleaner.cleanReferenceResourcesIfBundle(response.readEntity(resourceType)); yield PreferReturn.resource(resource); diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index c4f160b9b..dfb45ce50 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-fhir-pom - 1.5.1 + 1.5.2 diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index 8f4f7e4f6..8fa929cce 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.5.1 + 1.5.2 diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index e63ff93e8..5de248caa 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.5.1 + 1.5.2 diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index e7d8a92d7..98ef64ec1 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.5.1 + 1.5.2 diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index 7de4e7081..ce8ea756f 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.5.1 + 1.5.2 diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index ab484929b..4cc95498a 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.5.1 + 1.5.2 diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index c1febd155..5bdf37031 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-tools-pom - 1.5.1 + 1.5.2 diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index e1008384d..aef1e34dd 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.5.1 + 1.5.2 diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 847370fdf..e79e3bb1c 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -6,7 +6,7 @@ dev.dsf dsf-tools-pom - 1.5.1 + 1.5.2 diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index cb1d15a28..5b4c13635 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -7,7 +7,7 @@ dev.dsf dsf-pom - 1.5.1 + 1.5.2 diff --git a/pom.xml b/pom.xml index 9472c3b5c..32e949867 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ dev.dsf dsf-pom - 1.5.1 + 1.5.2 pom @@ -23,14 +23,14 @@ 2.0.13 2.23.1 - 11.0.20 - 3.1.6 + 11.0.22 + 3.1.7 2.1.5 - 6.1.6 - 2.17.0 + 6.1.10 + 2.17.2 7.21.0 5.1.0 - 1.78 + 1.78.1 DSF @@ -134,7 +134,7 @@ org.mockito mockito-core - 5.11.0 + 5.12.0 org.bouncycastle @@ -156,7 +156,7 @@ org.liquibase liquibase-core - 4.27.0 + 4.28.0 org.postgresql @@ -392,12 +392,12 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 org.apache.commons commons-text - 1.11.0 + 1.12.0 org.apache.httpcomponents @@ -412,7 +412,7 @@ com.google.code.gson gson - 2.10.1 + 2.11.0 org.thymeleaf @@ -428,7 +428,7 @@ commons-codec commons-codec - 1.16.1 + 1.17.0 @@ -463,17 +463,17 @@ org.apache.maven maven-core - 3.9.6 + 3.9.8 org.apache.maven maven-plugin-api - 3.9.6 + 3.9.8 org.apache.maven.plugin-tools maven-plugin-annotations - 3.12.0 + 3.13.1 @@ -489,7 +489,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.0 + 3.4.2 @@ -511,22 +511,22 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.3.0 org.apache.maven.plugins maven-failsafe-plugin - 3.2.5 + 3.3.0 org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.6.0 org.apache.maven.plugins @@ -541,33 +541,33 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 org.codehaus.mojo exec-maven-plugin - + 3.0.0 org.apache.maven.plugins maven-clean-plugin - 3.3.2 + 3.4.0 net.revelc.code.formatter formatter-maven-plugin - 2.23.0 + 2.24.1 net.revelc.code impsort-maven-plugin - 1.9.0 + 1.11.0 org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 org.codehaus.mojo @@ -577,7 +577,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.12.0 + 3.13.1 dev.dsf @@ -587,7 +587,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 org.apache.maven.plugins @@ -597,17 +597,17 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.4.0 + 4.8.6.2 org.apache.maven.plugins maven-project-info-reports-plugin - 3.5.0 + 3.6.1 org.apache.maven.plugins maven-pmd-plugin - 3.21.2 + 3.23.0