From e216210d01764de9865c0461c9ca5d51d0c545bf Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 23 Aug 2023 01:44:47 +0200 Subject: [PATCH 1/3] move html adapter classes and improved data sanitation (XSS fix) --- .../ActivityDefinitionHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/BinaryHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/BundleHtmlFhirAdapter.java | 0 .../CapabilityStatementHtmlFhirAdapter.java | 0 .../fhir/adapter/CodeSystemHtmlFhirAdapter.java | 0 .../adapter/DocumentReferenceHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/EndpointHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/GroupHtmlFhirAdapter.java | 0 .../adapter/HealthcareServiceHtmlFhirAdapter.java | 0 .../highmed/dsf/fhir/adapter/HtmlFhirAdapter.java | 15 +++++++++------ .../dsf/fhir/adapter/LibraryHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/LocationHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/MeasureHtmlFhirAdapter.java | 0 .../adapter/MeasureReportHtmlFhirAdapter.java | 0 .../fhir/adapter/NamingSystemHtmlFhirAdapter.java | 0 .../adapter/OperationOutcomeHtmlFhirAdapter.java | 0 .../OrganizationAffiliationHtmlFhirAdapter.java | 0 .../fhir/adapter/OrganizationHtmlFhirAdapter.java | 0 .../fhir/adapter/ParametersHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/PatientHtmlFhirAdapter.java | 0 .../fhir/adapter/PractitionerHtmlFhirAdapter.java | 0 .../adapter/PractitionerRoleHtmlFhirAdapter.java | 0 .../fhir/adapter/ProvenanceHtmlFhirAdapter.java | 0 .../adapter/QuestionnaireHtmlFhirAdapter.java | 0 .../QuestionnaireResponseHtmlFhirAdapter.java | 0 .../adapter/ResearchStudyHtmlFhirAdapter.java | 0 .../StructureDefinitionHtmlFhirAdapter.java | 0 .../fhir/adapter/SubscriptionHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/TaskHtmlFhirAdapter.java | 0 .../dsf/fhir/adapter/ValueSetHtmlFhirAdapter.java | 0 30 files changed, 9 insertions(+), 6 deletions(-) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/ActivityDefinitionHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/BinaryHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/BundleHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/CapabilityStatementHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/CodeSystemHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/DocumentReferenceHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/EndpointHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/GroupHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/HealthcareServiceHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/HtmlFhirAdapter.java (97%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/LibraryHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/LocationHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/MeasureHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/MeasureReportHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/NamingSystemHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/OperationOutcomeHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationAffiliationHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/ParametersHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/PatientHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerRoleHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/ProvenanceHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireResponseHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/ResearchStudyHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/StructureDefinitionHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/SubscriptionHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/TaskHtmlFhirAdapter.java (100%) rename dsf-fhir/{dsf-fhir-rest-adapter => dsf-fhir-server}/src/main/java/org/highmed/dsf/fhir/adapter/ValueSetHtmlFhirAdapter.java (100%) diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ActivityDefinitionHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ActivityDefinitionHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ActivityDefinitionHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ActivityDefinitionHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/BinaryHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/BinaryHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/BinaryHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/BinaryHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/BundleHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/BundleHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/BundleHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/BundleHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/CapabilityStatementHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/CapabilityStatementHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/CapabilityStatementHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/CapabilityStatementHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/CodeSystemHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/CodeSystemHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/CodeSystemHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/CodeSystemHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/DocumentReferenceHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/DocumentReferenceHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/DocumentReferenceHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/DocumentReferenceHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/EndpointHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/EndpointHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/EndpointHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/EndpointHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/GroupHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/GroupHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/GroupHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/GroupHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/HealthcareServiceHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/HealthcareServiceHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/HealthcareServiceHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/HealthcareServiceHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/HtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/HtmlFhirAdapter.java similarity index 97% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/HtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/HtmlFhirAdapter.java index bcfa6d5f4..babdf2c90 100644 --- a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/HtmlFhirAdapter.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/HtmlFhirAdapter.java @@ -34,6 +34,7 @@ import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.Resource; +import org.springframework.web.util.HtmlUtils; import com.google.common.base.Objects; @@ -140,7 +141,7 @@ public void writeTo(T t, Class type, Type genericType, Annotation[] annotatio out.write("\n"); out.write("\n"); out.write("DSF" + (uriInfo.getPath() == null || uriInfo.getPath().isEmpty() ? "" : ": ") - + uriInfo.getPath() + "\n\n"); + + HtmlUtils.htmlEscape(uriInfo.getPath()) + "\n\n"); out.write("\n"); out.write("
\n"); @@ -222,19 +223,21 @@ private String getUrlHeading(T t) throws MalformedURLException URI uri = getResourceUrl(t).map(this::toURI).orElse(uriInfo.getRequestUri()); String[] pathSegments = uri.getPath().split("/"); - String u = serverBaseProvider.getServerBase(); + String u = HtmlUtils.htmlEscape(serverBaseProvider.getServerBase()); String heading = "" + u + ""; for (int i = 2; i < pathSegments.length; i++) { - u += "/" + pathSegments[i]; - heading += "/" + pathSegments[i] + ""; + String pathSegment = HtmlUtils.htmlEscape(pathSegments[i]); + u += "/" + pathSegment; + heading += "/" + pathSegment + ""; } if (uri.getQuery() != null) { - u += "?" + uri.getQuery(); - heading += "?" + uri.getQuery() + ""; + String queryValue = HtmlUtils.htmlEscape(uri.getQuery()); + u += "?" + queryValue; + heading += "?" + queryValue + ""; } return heading; diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/LibraryHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/LibraryHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/LibraryHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/LibraryHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/LocationHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/LocationHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/LocationHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/LocationHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/MeasureHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/MeasureHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/MeasureHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/MeasureHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/MeasureReportHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/MeasureReportHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/MeasureReportHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/MeasureReportHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/NamingSystemHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/NamingSystemHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/NamingSystemHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/NamingSystemHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/OperationOutcomeHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/OperationOutcomeHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/OperationOutcomeHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/OperationOutcomeHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationAffiliationHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationAffiliationHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationAffiliationHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationAffiliationHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/OrganizationHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ParametersHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ParametersHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ParametersHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ParametersHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/PatientHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/PatientHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/PatientHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/PatientHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerRoleHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerRoleHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerRoleHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/PractitionerRoleHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ProvenanceHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ProvenanceHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ProvenanceHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ProvenanceHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireResponseHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireResponseHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireResponseHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/QuestionnaireResponseHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ResearchStudyHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ResearchStudyHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ResearchStudyHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ResearchStudyHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/StructureDefinitionHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/StructureDefinitionHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/StructureDefinitionHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/StructureDefinitionHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/SubscriptionHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/SubscriptionHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/SubscriptionHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/SubscriptionHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/TaskHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/TaskHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/TaskHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/TaskHtmlFhirAdapter.java diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ValueSetHtmlFhirAdapter.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ValueSetHtmlFhirAdapter.java similarity index 100% rename from dsf-fhir/dsf-fhir-rest-adapter/src/main/java/org/highmed/dsf/fhir/adapter/ValueSetHtmlFhirAdapter.java rename to dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/adapter/ValueSetHtmlFhirAdapter.java From de84e971bd62424b073416d6e7fae2f416f79136 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 23 Aug 2023 01:46:37 +0200 Subject: [PATCH 2/3] dependency and maven plugin version upgrades --- pom.xml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 0a3e1dc53..ee581ebb2 100755 --- a/pom.xml +++ b/pom.xml @@ -28,9 +28,9 @@ 2.20.0 9.4.51.v20230217 - 2.39.1 + 2.40 1.20 - 5.3.28 + 5.3.29 5.1.0 2.3 @@ -102,7 +102,7 @@ org.bouncycastle bcmail-jdk18on - 1.74 + 1.76 @@ -119,7 +119,7 @@ org.bouncycastle bcprov-jdk18on - 1.74 + 1.76 @@ -131,7 +131,7 @@ org.liquibase liquibase-core - 4.22.0 + 4.23.1 org.postgresql @@ -143,12 +143,12 @@ de.hs-heilbronn.mi jetty-utils - 0.20.0 + 0.21.0 de.hs-heilbronn.mi crypto-utils - 3.6.0 + 3.8.0 de.hs-heilbronn.mi @@ -158,7 +158,7 @@ de.hs-heilbronn.mi db-test-utils - 0.21.0 + 0.22.0 @@ -211,7 +211,7 @@ com.fasterxml.jackson.core jackson-databind - 2.14.2 + 2.15.2 @@ -345,7 +345,7 @@ com.google.guava guava - 32.0.1-jre + 32.1.2-jre com.google.code.gson @@ -374,7 +374,7 @@ commons-io commons-io - 2.11.0 + 2.13.0 @@ -411,7 +411,7 @@ org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.4.0 @@ -428,7 +428,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 org.apache.maven.plugins @@ -438,22 +438,22 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.1.2 org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.5.0 org.apache.maven.plugins maven-assembly-plugin - 3.5.0 + 3.6.0 org.apache.maven.plugins @@ -463,7 +463,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 org.codehaus.mojo @@ -474,22 +474,22 @@ org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.3.1 net.revelc.code.formatter formatter-maven-plugin - 2.22.0 + 2.23.0 net.revelc.code impsort-maven-plugin - 1.8.0 + 1.9.0 org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.0 org.codehaus.mojo @@ -499,7 +499,7 @@ io.fabric8 docker-maven-plugin - 0.42.1 + 0.43.4 From c40a5f8fd7b480ab300916d1f419c56717e1df62 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Wed, 23 Aug 2023 01:49:48 +0200 Subject: [PATCH 3/3] 0.9.3 release --- CITATION.cff | 4 ++-- dsf-bpe/dsf-bpe-process-base/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/dsf-bpe-webservice-client/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-consent/dsf-consent-client-stub/pom.xml | 2 +- dsf-consent/dsf-consent-client/pom.xml | 2 +- dsf-consent/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-mpi/dsf-mpi-client-pdq/pom.xml | 2 +- dsf-mpi/dsf-mpi-client-stub/pom.xml | 2 +- dsf-mpi/dsf-mpi-client/pom.xml | 2 +- dsf-mpi/pom.xml | 2 +- dsf-openehr/dsf-openehr-client-impl/pom.xml | 2 +- dsf-openehr/dsf-openehr-client-stub/pom.xml | 2 +- dsf-openehr/dsf-openehr-client/pom.xml | 2 +- dsf-openehr/dsf-openehr-model/pom.xml | 2 +- dsf-openehr/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-base/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-client-stub/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-client/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml | 2 +- dsf-pseudonymization/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-documentation-generator/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index bc21c7fdd..ec6c2be39 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -24,8 +24,8 @@ preferred-citation: doi: 10.3233/SHTI210060 type: proceedings title: "HiGHmed Data Sharing Framework (HiGHmed DSF)" -version: 0.9.2 -date-released: 2023-06-21 +version: 0.9.3 +date-released: 2023-08-23 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 diff --git a/dsf-bpe/dsf-bpe-process-base/pom.xml b/dsf-bpe/dsf-bpe-process-base/pom.xml index 2f53358de..6dfcbcd32 100755 --- a/dsf-bpe/dsf-bpe-process-base/pom.xml +++ b/dsf-bpe/dsf-bpe-process-base/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.9.2 + 0.9.3 diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index d624ede2f..87e2c3a43 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.9.2 + 0.9.3 diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index ecce392f6..8f8262abf 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.9.2 + 0.9.3 diff --git a/dsf-bpe/dsf-bpe-webservice-client/pom.xml b/dsf-bpe/dsf-bpe-webservice-client/pom.xml index b9b19c457..0616ec2d7 100755 --- a/dsf-bpe/dsf-bpe-webservice-client/pom.xml +++ b/dsf-bpe/dsf-bpe-webservice-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.9.2 + 0.9.3 diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index 1522e8bd5..202b78263 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.9.2 + 0.9.3 diff --git a/dsf-consent/dsf-consent-client-stub/pom.xml b/dsf-consent/dsf-consent-client-stub/pom.xml index 358ba4128..7a6da398c 100644 --- a/dsf-consent/dsf-consent-client-stub/pom.xml +++ b/dsf-consent/dsf-consent-client-stub/pom.xml @@ -9,7 +9,7 @@ dsf-consent-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-consent/dsf-consent-client/pom.xml b/dsf-consent/dsf-consent-client/pom.xml index f053d3866..e6e18acfe 100644 --- a/dsf-consent/dsf-consent-client/pom.xml +++ b/dsf-consent/dsf-consent-client/pom.xml @@ -9,7 +9,7 @@ dsf-consent-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-consent/pom.xml b/dsf-consent/pom.xml index def5b0a2a..7e98159ae 100644 --- a/dsf-consent/pom.xml +++ b/dsf-consent/pom.xml @@ -10,7 +10,7 @@ dsf-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index 55e4a77f0..838d95f2b 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.9.2 + 0.9.3 diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 19814ba17..7436c8be6 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.9.2 + 0.9.3 diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index 9a29f8cbb..131ee0081 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.9.2 + 0.9.3 diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index f9e1be658..2af97fea7 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.9.2 + 0.9.3 diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 4d0260217..d068c7bbd 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.9.2 + 0.9.3 @@ -93,7 +93,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index b708ca4b8..b6a2fcf69 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.9.2 + 0.9.3 diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index 7e9aee0aa..a3729be09 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.9.2 + 0.9.3 diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index 3f771eae4..0c7bc412d 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.9.2 + 0.9.3 diff --git a/dsf-mpi/dsf-mpi-client-pdq/pom.xml b/dsf-mpi/dsf-mpi-client-pdq/pom.xml index 7a2b6241b..70ce7cfc8 100644 --- a/dsf-mpi/dsf-mpi-client-pdq/pom.xml +++ b/dsf-mpi/dsf-mpi-client-pdq/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-mpi/dsf-mpi-client-stub/pom.xml b/dsf-mpi/dsf-mpi-client-stub/pom.xml index 68cc1724b..1c454c674 100644 --- a/dsf-mpi/dsf-mpi-client-stub/pom.xml +++ b/dsf-mpi/dsf-mpi-client-stub/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-mpi/dsf-mpi-client/pom.xml b/dsf-mpi/dsf-mpi-client/pom.xml index 6e0511130..9eb0d01ef 100644 --- a/dsf-mpi/dsf-mpi-client/pom.xml +++ b/dsf-mpi/dsf-mpi-client/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-mpi/pom.xml b/dsf-mpi/pom.xml index 98c699c02..c5ecc79ab 100644 --- a/dsf-mpi/pom.xml +++ b/dsf-mpi/pom.xml @@ -10,7 +10,7 @@ dsf-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-openehr/dsf-openehr-client-impl/pom.xml b/dsf-openehr/dsf-openehr-client-impl/pom.xml index b9a3e2131..b7d01b8f4 100644 --- a/dsf-openehr/dsf-openehr-client-impl/pom.xml +++ b/dsf-openehr/dsf-openehr-client-impl/pom.xml @@ -9,7 +9,7 @@ dsf-openehr-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-openehr/dsf-openehr-client-stub/pom.xml b/dsf-openehr/dsf-openehr-client-stub/pom.xml index 222bc3403..a3a05f712 100644 --- a/dsf-openehr/dsf-openehr-client-stub/pom.xml +++ b/dsf-openehr/dsf-openehr-client-stub/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-openehr/dsf-openehr-client/pom.xml b/dsf-openehr/dsf-openehr-client/pom.xml index c3e43e793..d189fca54 100644 --- a/dsf-openehr/dsf-openehr-client/pom.xml +++ b/dsf-openehr/dsf-openehr-client/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-openehr/dsf-openehr-model/pom.xml b/dsf-openehr/dsf-openehr-model/pom.xml index b885899e0..a1b310067 100644 --- a/dsf-openehr/dsf-openehr-model/pom.xml +++ b/dsf-openehr/dsf-openehr-model/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-openehr/pom.xml b/dsf-openehr/pom.xml index ea766535a..566d50080 100755 --- a/dsf-openehr/pom.xml +++ b/dsf-openehr/pom.xml @@ -10,7 +10,7 @@ dsf-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml index 73b703a71..da51fa27a 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.9.2 + 0.9.3 diff --git a/dsf-pseudonymization/dsf-pseudonymization-client-stub/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-client-stub/pom.xml index ecc8a8482..2b48a1fc6 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-client-stub/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-client-stub/pom.xml @@ -9,7 +9,7 @@ dsf-pseudonymization-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-pseudonymization/dsf-pseudonymization-client/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-client/pom.xml index 42ff7d8f1..4d0fdcccd 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-client/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-client/pom.xml @@ -9,7 +9,7 @@ dsf-pseudonymization-pom org.highmed.dsf - 0.9.2 + 0.9.3 diff --git a/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml index a10cb52f7..828649ea5 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.9.2 + 0.9.3 diff --git a/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml index 96cd3cbb5..952f97544 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.9.2 + 0.9.3 diff --git a/dsf-pseudonymization/pom.xml b/dsf-pseudonymization/pom.xml index 49b4a82c0..6b92ba100 100644 --- a/dsf-pseudonymization/pom.xml +++ b/dsf-pseudonymization/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.9.2 + 0.9.3 diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index d01f081ea..aaf4894b9 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.9.2 + 0.9.3 diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index 7550f7ba0..1cb09727f 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.9.2 + 0.9.3 diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index 5668bcefb..f1ec13416 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.9.2 + 0.9.3 diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index 4c0a68929..7bfb02acc 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.9.2 + 0.9.3 diff --git a/dsf-tools/dsf-tools-documentation-generator/pom.xml b/dsf-tools/dsf-tools-documentation-generator/pom.xml index 4c38dd1f7..09300263b 100644 --- a/dsf-tools/dsf-tools-documentation-generator/pom.xml +++ b/dsf-tools/dsf-tools-documentation-generator/pom.xml @@ -9,7 +9,7 @@ org.highmed.dsf dsf-tools-pom - 0.9.2 + 0.9.3 diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index bcad321ef..735acd1a0 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.9.2 + 0.9.3 diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 37f46a9db..d47db7436 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.9.2 + 0.9.3 diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index bfccff3d8..866652d3e 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.9.2 + 0.9.3 diff --git a/pom.xml b/pom.xml index ee581ebb2..b0f1f56df 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.highmed.dsf dsf-pom - 0.9.2 + 0.9.3 pom