Merge remote-tracking branch 'origin/main' into develop

Conflicts:
	CITATION.cff
	dsf-bpe/dsf-bpe-process-base/pom.xml
	dsf-bpe/dsf-bpe-server-jetty/pom.xml
	dsf-bpe/dsf-bpe-server/pom.xml
	dsf-bpe/dsf-bpe-webservice-client/pom.xml
	dsf-bpe/pom.xml
	dsf-fhir/dsf-fhir-auth/pom.xml
	dsf-fhir/dsf-fhir-rest-adapter/pom.xml
	dsf-fhir/dsf-fhir-server-jetty/pom.xml
	dsf-fhir/dsf-fhir-server/pom.xml
	dsf-fhir/dsf-fhir-validation/pom.xml
	dsf-fhir/dsf-fhir-webservice-client/pom.xml
	dsf-fhir/dsf-fhir-websocket-client/pom.xml
	dsf-fhir/pom.xml
	dsf-mpi/dsf-mpi-client-pdq/pom.xml
	dsf-mpi/dsf-mpi-client-stub/pom.xml
	dsf-mpi/dsf-mpi-client/pom.xml
	dsf-mpi/pom.xml
	dsf-openehr/dsf-openehr-client-impl/pom.xml
	dsf-openehr/dsf-openehr-client-stub/pom.xml
	dsf-openehr/dsf-openehr-client/pom.xml
	dsf-openehr/dsf-openehr-model/pom.xml
	dsf-openehr/pom.xml
	dsf-pseudonymization/dsf-pseudonymization-base/pom.xml
	dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml
	dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml
	dsf-pseudonymization/pom.xml
	dsf-tools/dsf-tools-build-info-reader/pom.xml
	dsf-tools/dsf-tools-bundle-generator/pom.xml
	dsf-tools/dsf-tools-db-migration/pom.xml
	dsf-tools/dsf-tools-docker-secrets-reader/pom.xml
	dsf-tools/dsf-tools-proxy-test/pom.xml
	dsf-tools/dsf-tools-test-data-generator/pom.xml
	dsf-tools/pom.xml
	pom.xml

CITATION.cff

@@ -25,7 +25,7 @@ preferred-citation:
   type: proceedings
 title: "HiGHmed Data Sharing Framework (HiGHmed DSF)"
 version: 0.6.0
-date-released: 2021-10-20
+date-released: 2021-12-10
 url: https://github.com/highmed/highmed-dsf/wiki
 repository-code: https://github.com/highmed/highmed-dsf
 repository-artifact: https://github.com/highmed/highmed-dsf/releases

pom.xml

@@ -25,7 +25,7 @@
 		<main.basedir>${project.basedir}</main.basedir>
 
 		<slf4j.version>1.8.0-beta4</slf4j.version>
-		<log4j.version>2.14.1</log4j.version>
+		<log4j.version>2.15.0</log4j.version>
 
 		<jetty.version>9.4.44.v20210927</jetty.version>
 		<jersey.version>2.35</jersey.version>