Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@
<artifactItem>
<groupId>org.fhir</groupId>
<artifactId>ucum</artifactId>
<version>1.0.2</version>
</artifactItem>
<artifactItem>
<groupId>com.github.ben-manes.caffeine</groupId>
Expand Down
1 change: 0 additions & 1 deletion dsf-bpe/dsf-bpe-process-api-v2-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@
<artifactItem>
<groupId>org.fhir</groupId>
<artifactId>ucum</artifactId>
<version>1.0.9</version>
</artifactItem>
<!--<artifactItem>
<groupId>com.google.code.gson</groupId>
Expand Down
2 changes: 1 addition & 1 deletion dsf-bpe/dsf-bpe-server-jetty/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN chown root:2202 ./ && \
chmod 1775 ./log


FROM azul/zulu-openjdk:25-jre-headless@sha256:9a30f9ac9b51aba2f0ee76daf6440c03d59a7690b4fd6070e85fba1da9fd32ff
FROM azul/zulu-openjdk:25-jre-headless@sha256:0f843579efd505efb0a0eef1d5a816cc4523ffcad458a54a4e9e52e60c4c030a
LABEL org.opencontainers.image.source=https://github.com/datasharingframework/dsf
LABEL org.opencontainers.image.description="DSF BPE Server"
LABEL org.opencontainers.image.licenses="Apache License, Version 2.0"
Expand Down
2 changes: 1 addition & 1 deletion dsf-docker-dev-setup-3dic-ttp/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ services:
read_only: true

keycloak:
image: quay.io/keycloak/keycloak:26.3
image: quay.io/keycloak/keycloak:26.6
restart: "no"
ports:
- 127.0.0.1:8443:8443
Expand Down
2 changes: 1 addition & 1 deletion dsf-docker/bpe_proxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

FROM httpd:2.4-alpine@sha256:8f26f33a7002658050e9ab2cd6b77502619dfc89d0a6ba2e9e4a202e0ef04596
FROM httpd:2.4-alpine@sha256:968c8b4098fcecb473762b45f6c541a3b2b2cfab2caccb1edbd2cece071ef160
LABEL org.opencontainers.image.source=https://github.com/datasharingframework/dsf
LABEL org.opencontainers.image.description="DSF BPE Reverse Proxy"
LABEL org.opencontainers.image.licenses="Apache License, Version 2.0"
Expand Down
2 changes: 1 addition & 1 deletion dsf-docker/fhir_proxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#

FROM httpd:2.4-alpine@sha256:8f26f33a7002658050e9ab2cd6b77502619dfc89d0a6ba2e9e4a202e0ef04596
FROM httpd:2.4-alpine@sha256:968c8b4098fcecb473762b45f6c541a3b2b2cfab2caccb1edbd2cece071ef160
LABEL org.opencontainers.image.source=https://github.com/datasharingframework/dsf
LABEL org.opencontainers.image.description="DSF FHIR Reverse Proxy"
LABEL org.opencontainers.image.licenses="Apache License, Version 2.0"
Expand Down
2 changes: 1 addition & 1 deletion dsf-fhir/dsf-fhir-server-jetty/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN chown root:2101 ./ && \
chmod 1775 ./log


FROM azul/zulu-openjdk:25-jre-headless@sha256:9a30f9ac9b51aba2f0ee76daf6440c03d59a7690b4fd6070e85fba1da9fd32ff
FROM azul/zulu-openjdk:25-jre-headless@sha256:0f843579efd505efb0a0eef1d5a816cc4523ffcad458a54a4e9e52e60c4c030a
LABEL org.opencontainers.image.source=https://github.com/datasharingframework/dsf
LABEL org.opencontainers.image.description="DSF FHIR Server"
LABEL org.opencontainers.image.licenses="Apache License, Version 2.0"
Expand Down
17 changes: 11 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
<jetty.version>12.1.8</jetty.version>
<jersey.version>3.1.11</jersey.version>
<tyrus.version>2.2.2</tyrus.version>
<spring.version>6.2.17</spring.version>
<spring.version>6.2.18</spring.version>
<jackson.version>2.21.2</jackson.version>
<operaton.version>1.1.1</operaton.version>
<hapi.fhir.version.v1>5.1.0</hapi.fhir.version.v1>
<hapi.fhir.version.v2>8.4.2</hapi.fhir.version.v2>
<hapi.fhir.org.hl7.version.v2>6.5.27</hapi.fhir.org.hl7.version.v2>
<hapi.fhir.version>8.4.2</hapi.fhir.version>
<bouncycastle.version>1.83</bouncycastle.version>
<bouncycastle.version>1.84</bouncycastle.version>
<crypto-utils.version.v1>3.8.0</crypto-utils.version.v1>
<crypto-utils.version.v2>5.2.1</crypto-utils.version.v2>
<crypto-utils.version>5.2.1</crypto-utils.version>
Expand Down Expand Up @@ -443,7 +443,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.5.0-jre</version>
<version>33.6.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand All @@ -453,13 +453,18 @@
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>3.1.3.RELEASE</version>
<version>3.1.4.RELEASE</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>10.9</version>
</dependency>
<dependency>
<groupId>org.fhir</groupId>
<artifactId>ucum</artifactId>
<version>1.0.10</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -516,12 +521,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.9.14</version>
<version>3.9.15</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.9.14</version>
<version>3.9.15</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
Expand Down
Loading