diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java
index 2f34d738a..5be84ed80 100644
--- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java
+++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/variables/ObjectMapperFactory.java
@@ -2,6 +2,7 @@
import org.hl7.fhir.r4.model.Resource;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,7 +19,9 @@ private ObjectMapperFactory()
public static ObjectMapper createObjectMapper(FhirContext fhirContext)
{
- return JsonMapper.builder().serializationInclusion(Include.NON_NULL).serializationInclusion(Include.NON_EMPTY)
+ return JsonMapper.builder()
+ .defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL))
+ .defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY))
.addModule(fhirModule(fhirContext)).disable(MapperFeature.AUTO_DETECT_CREATORS)
.disable(MapperFeature.AUTO_DETECT_FIELDS)
// .disable(MapperFeature.AUTO_DETECT_GETTERS).disable(MapperFeature.AUTO_DETECT_IS_GETTERS)
diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.23_to_7.24.sql b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.23_to_7.24.sql
new file mode 100644
index 000000000..26a3a358f
--- /dev/null
+++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.23_to_7.24.sql
@@ -0,0 +1,19 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1300', CURRENT_TIMESTAMP, '7.24.0');
diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml
new file mode 100644
index 000000000..0459e4f85
--- /dev/null
+++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml
index 2885e3f16..f5f1d3f96 100644
--- a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml
+++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml
@@ -21,4 +21,6 @@
+
+
\ No newline at end of file
diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java
index 6d6b789f2..286424073 100755
--- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java
+++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/spring/config/JsonConfig.java
@@ -3,6 +3,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonGenerator.Feature;
import com.fasterxml.jackson.databind.MapperFeature;
@@ -16,7 +17,8 @@ public class JsonConfig
public ObjectMapper objectMapper()
{
JsonMapper jsonMapper = JsonMapper.builder().disable(MapperFeature.DEFAULT_VIEW_INCLUSION)
- .serializationInclusion(Include.NON_NULL).serializationInclusion(Include.NON_EMPTY)
+ .defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL))
+ .defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY))
.disable(Feature.AUTO_CLOSE_TARGET).build();
return jsonMapper;
diff --git a/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js b/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js
index 6346221f6..04fd12ab1 100644
--- a/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js
+++ b/dsf-fhir/dsf-fhir-server/src/main/resources/static/form.js
@@ -224,6 +224,7 @@ function readQuestionnaireResponseAnswersFromForm() {
})
questionnaireResponse.status = "completed"
+ questionnaireResponse.authored = new Date().toISOString()
questionnaireResponse.item = newItems
return valid ? questionnaireResponse : null
diff --git a/pom.xml b/pom.xml
index fe616f4fb..589c1dc06 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,15 +22,15 @@
${project.basedir}
2.0.17
- 2.24.3
- 11.0.25
- 3.1.10
+ 2.25.2
+ 11.0.26
+ 3.1.11
2.2.0
- 6.2.7
- 2.19.0
- 7.23.0
+ 6.2.11
+ 2.20.0
+ 7.24.0
5.1.0
- 1.80
+ 1.82
DSF Parent POM
@@ -117,7 +117,7 @@
com.sun.mail
jakarta.mail
- 1.6.7
+ 1.6.8
org.bouncycastle
@@ -134,7 +134,7 @@
org.mockito
mockito-core
- 5.18.0
+ 5.20.0
org.bouncycastle
@@ -156,12 +156,12 @@
org.liquibase
liquibase-core
- 4.32.0
+ 4.33.0
org.postgresql
postgresql
- 42.7.6
+ 42.7.8
@@ -258,7 +258,8 @@
com.fasterxml.jackson.core
jackson-annotations
- ${jackson.version}
+ 2.20
+
com.fasterxml.jackson.core
@@ -287,7 +288,7 @@
org.glassfish.jaxb
jaxb-runtime
- 4.0.5
+ 4.0.6
@@ -402,17 +403,17 @@
org.apache.commons
commons-compress
- 1.27.1
+ 1.28.0
org.apache.commons
commons-text
- 1.13.1
+ 1.14.0
org.apache.commons
commons-lang3
- 3.17.0
+ 3.19.0
org.apache.httpcomponents
@@ -427,7 +428,7 @@
com.google.code.gson
gson
- 2.13.1
+ 2.13.2
org.thymeleaf
@@ -438,12 +439,12 @@
commons-io
commons-io
- 2.19.0
+ 2.20.0
commons-codec
commons-codec
- 1.18.0
+ 1.19.0
@@ -465,7 +466,7 @@
org.yaml
snakeyaml
- 2.4
+ 2.5
@@ -478,12 +479,12 @@
org.apache.maven
maven-core
- 3.9.9
+ 3.9.11
org.apache.maven
maven-plugin-api
- 3.9.9
+ 3.9.11
org.apache.maven.plugin-tools
@@ -499,7 +500,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.14.0
+ 3.14.1
org.apache.maven.plugins
@@ -526,22 +527,22 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.11.2
+ 3.12.0
org.apache.maven.plugins
maven-surefire-plugin
- 3.5.3
+ 3.5.4
org.apache.maven.plugins
maven-failsafe-plugin
- 3.5.3
+ 3.5.4
org.apache.maven.plugins
maven-shade-plugin
- 3.6.0
+ 3.6.1
org.apache.maven.plugins
@@ -556,7 +557,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- 3.2.7
+ 3.2.8
org.codehaus.mojo
@@ -567,12 +568,12 @@
org.apache.maven.plugins
maven-clean-plugin
- 3.4.1
+ 3.5.0
net.revelc.code.formatter
formatter-maven-plugin
- 2.26.0
+ 2.29.0
net.revelc.code
@@ -582,7 +583,7 @@
org.apache.maven.plugins
maven-dependency-plugin
- 3.8.1
+ 3.9.0
org.codehaus.mojo
@@ -602,7 +603,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.5.0
+ 3.6.2
org.apache.maven.plugins
@@ -612,7 +613,7 @@
com.github.spotbugs
spotbugs-maven-plugin
- 4.9.3.0
+ 4.9.6.0
org.apache.maven.plugins
@@ -622,12 +623,12 @@
org.apache.maven.plugins
maven-pmd-plugin
- 3.26.0
+ 3.28.0
org.sonatype.central
central-publishing-maven-plugin
- 0.7.0
+ 0.9.0