Issue/359 upgrade dependencies

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)

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');

dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.9.0.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+	<changeSet author="camunda.org" id="db.camunda_engine.changelog-1.9.0">
+		<sqlFile dbms="postgresql" encoding="utf8" path="db/camunda/postgres_engine_7.23_to_7.24.sql" />
+	</changeSet>
+
+</databaseChangeLog>

dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml

@@ -21,4 +21,6 @@
 	<include file="db/db.camunda_engine.changelog-1.6.0.xml" />
 
 	<include file="db/db.camunda_engine.changelog-1.8.0.xml" />
+
+	<include file="db/db.camunda_engine.changelog-1.9.0.xml" />
 </databaseChangeLog>

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;

pom.xml

@@ -22,15 +22,15 @@
 		<main.basedir>${project.basedir}</main.basedir>
 
 		<slf4j.version>2.0.17</slf4j.version>
-		<log4j.version>2.24.3</log4j.version>
-		<jetty.version>11.0.25</jetty.version>
-		<jersey.version>3.1.10</jersey.version>
+		<log4j.version>2.25.2</log4j.version>
+		<jetty.version>11.0.26</jetty.version>
+		<jersey.version>3.1.11</jersey.version>
 		<tyrus.version>2.2.0</tyrus.version>
-		<spring.version>6.2.7</spring.version>
-		<jackson.version>2.19.0</jackson.version>
-		<camunda.version>7.23.0</camunda.version>
+		<spring.version>6.2.11</spring.version>
+		<jackson.version>2.20.0</jackson.version>
+		<camunda.version>7.24.0</camunda.version>
 		<hapi.fhir.version>5.1.0</hapi.fhir.version>
-		<bouncycastle.version>1.80</bouncycastle.version>
+		<bouncycastle.version>1.82</bouncycastle.version>
 	</properties>
 
 	<name>DSF Parent POM</name>
@@ -117,7 +117,7 @@
 			<dependency>
 				<groupId>com.sun.mail</groupId>
 				<artifactId>jakarta.mail</artifactId>
-				<version>1.6.7</version>
+				<version>1.6.8</version>
 			</dependency>
 			<dependency>
 				<groupId>org.bouncycastle</groupId>
@@ -134,7 +134,7 @@
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>5.18.0</version>
+				<version>5.20.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.bouncycastle</groupId>
@@ -156,12 +156,12 @@
 			<dependency>
 				<groupId>org.liquibase</groupId>
 				<artifactId>liquibase-core</artifactId>
-				<version>4.32.0</version>
+				<version>4.33.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.postgresql</groupId>
 				<artifactId>postgresql</artifactId>
-				<version>42.7.6</version>
+				<version>42.7.8</version>
 			</dependency>
 
 			<!-- hhn rwh -->
@@ -258,7 +258,8 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.version}</version>
+				<version>2.20</version>
+				<!-- TODO change back to ${jackson.version} once jackson-annotations has same version as other jackson libs -->
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
@@ -287,7 +288,7 @@
 			<dependency>
 				<groupId>org.glassfish.jaxb</groupId>
 				<artifactId>jaxb-runtime</artifactId>
-				<version>4.0.5</version>
+				<version>4.0.6</version>
 			</dependency>
 
 			<!-- spring -->
@@ -402,17 +403,17 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-compress</artifactId>
-				<version>1.27.1</version>
+				<version>1.28.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-text</artifactId>
-				<version>1.13.1</version>
+				<version>1.14.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.17.0</version>
+				<version>3.19.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
@@ -427,7 +428,7 @@
 			<dependency>
 				<groupId>com.google.code.gson</groupId>
 				<artifactId>gson</artifactId>
-				<version>2.13.1</version>
+				<version>2.13.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.thymeleaf</groupId>
@@ -438,12 +439,12 @@
 			<dependency>
 				<groupId>commons-io</groupId>
 				<artifactId>commons-io</artifactId>
-				<version>2.19.0</version>
+				<version>2.20.0</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-codec</groupId>
 				<artifactId>commons-codec</artifactId>
-				<version>1.18.0</version>
+				<version>1.19.0</version>
 			</dependency>
 
 			<dependency>
@@ -465,7 +466,7 @@
 			<dependency>
 				<groupId>org.yaml</groupId>
 				<artifactId>snakeyaml</artifactId>
-				<version>2.4</version>
+				<version>2.5</version>
 			</dependency>
 
 			<dependency>
@@ -478,12 +479,12 @@
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-core</artifactId>
-				<version>3.9.9</version>
+				<version>3.9.11</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-plugin-api</artifactId>
-				<version>3.9.9</version>
+				<version>3.9.11</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.plugin-tools</groupId>
@@ -499,7 +500,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.14.0</version>
+					<version>3.14.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -526,22 +527,22 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.11.2</version>
+					<version>3.12.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.5.3</version>
+					<version>3.5.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.5.3</version>
+					<version>3.5.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>3.6.0</version>
+					<version>3.6.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -556,7 +557,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.2.7</version>
+					<version>3.2.8</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -567,12 +568,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-clean-plugin</artifactId>
-					<version>3.4.1</version>
+					<version>3.5.0</version>
 				</plugin>
 				<plugin>
 					<groupId>net.revelc.code.formatter</groupId>
 					<artifactId>formatter-maven-plugin</artifactId>
-					<version>2.26.0</version>
+					<version>2.29.0</version>
 				</plugin>
 				<plugin>
 					<groupId>net.revelc.code</groupId>
@@ -582,7 +583,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.8.1</version>
+					<version>3.9.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -602,7 +603,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.6.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -612,7 +613,7 @@
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>
-					<version>4.9.3.0</version>
+					<version>4.9.6.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -622,12 +623,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-pmd-plugin</artifactId>
-					<version>3.26.0</version>
+					<version>3.28.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.sonatype.central</groupId>
 					<artifactId>central-publishing-maven-plugin</artifactId>
-					<version>0.7.0</version>
+					<version>0.9.0</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>