Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/0.9.3' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hhund committed Aug 22, 2023
2 parents 2448ee9 + c40a5f8 commit d3c9bc8
Show file tree
Hide file tree
Showing 71 changed files with 75 additions and 72 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-process-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-server-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-webservice-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-bpe-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-consent/dsf-consent-client-stub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>dsf-consent-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-consent/dsf-consent-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>dsf-consent-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-consent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<artifactId>dsf-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-rest-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -140,7 +141,7 @@ public void writeTo(T t, Class<?> type, Type genericType, Annotation[] annotatio
out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"/fhir/static/highmed.css\">\n");
out.write("<link rel=\"stylesheet\" type=\"text/css\" href=\"/fhir/static/form.css\">\n");
out.write("<title>DSF" + (uriInfo.getPath() == null || uriInfo.getPath().isEmpty() ? "" : ": ")
+ uriInfo.getPath() + "</title>\n</head>\n");
+ HtmlUtils.htmlEscape(uriInfo.getPath()) + "</title>\n</head>\n");
out.write("<body onload=\"prettyPrint();openInitialTab(" + String.valueOf(isHtmlEnabled())
+ ");checkBookmarked();\">\n");
out.write("<div id=\"icons\">\n");
Expand Down Expand Up @@ -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 = "<a href=\"" + u + "\" title=\"Open " + u + "\">" + u + "</a>";

for (int i = 2; i < pathSegments.length; i++)
{
u += "/" + pathSegments[i];
heading += "<a href=\"" + u + "\" title=\"Open " + u + "\">/" + pathSegments[i] + "</a>";
String pathSegment = HtmlUtils.htmlEscape(pathSegments[i]);
u += "/" + pathSegment;
heading += "<a href=\"" + u + "\" title=\"Open " + u + "\">/" + pathSegment + "</a>";
}

if (uri.getQuery() != null)
{
u += "?" + uri.getQuery();
heading += "<a href=\"" + u + "\" title=\"Open " + u + "\">?" + uri.getQuery() + "</a>";
String queryValue = HtmlUtils.htmlEscape(uri.getQuery());
u += "?" + queryValue;
heading += "<a href=\"" + u + "\" title=\"Open " + u + "\">?" + queryValue + "</a>";
}

return heading;
Expand Down
4 changes: 2 additions & 2 deletions dsf-fhir/dsf-fhir-validation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down Expand Up @@ -93,7 +93,7 @@
</configuration>
<!-- Workaround for exec maven plugin issue -->
<!-- https://github.com/mojohaus/exec-maven-plugin/issues/76 -->
<!-- <dependencies> <dependency> <groupId>org.highmed.dsf</groupId> <artifactId>dsf-tools-bundle-generator</artifactId> <version>0.9.2</version> </dependency>
<!-- <dependencies> <dependency> <groupId>org.highmed.dsf</groupId> <artifactId>dsf-tools-bundle-generator</artifactId> <version>0.9.3</version> </dependency>
</dependencies> -->
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-webservice-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-websocket-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-fhir-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-mpi/dsf-mpi-client-pdq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>dsf-mpi-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-mpi/dsf-mpi-client-stub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>dsf-mpi-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-mpi/dsf-mpi-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>dsf-mpi-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-mpi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<artifactId>dsf-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-openehr/dsf-openehr-client-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>dsf-openehr-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-openehr/dsf-openehr-client-stub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>dsf-openehr-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-openehr/dsf-openehr-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>dsf-openehr-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-openehr/dsf-openehr-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>dsf-openehr-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-openehr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<artifactId>dsf-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-pseudonymization/dsf-pseudonymization-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-pseudonymization-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>dsf-pseudonymization-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-pseudonymization/dsf-pseudonymization-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>dsf-pseudonymization-pom</artifactId>
<groupId>org.highmed.dsf</groupId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-pseudonymization-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-pseudonymization-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-pseudonymization/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-build-info-reader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-bundle-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-db-migration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-docker-secrets-reader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-documentation-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion dsf-tools/dsf-tools-proxy-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.highmed.dsf</groupId>
<artifactId>dsf-tools-pom</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
</parent>

<properties>
Expand Down
Loading

0 comments on commit d3c9bc8

Please sign in to comment.