diff --git a/Dockerfile b/Dockerfile index 925685a3..4be6e468 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/gradle:8.9.0-jdk21@sha256:0c13b320f227a67179fca5d5746ab889c011ed143023c80c5fc8520609fe427f AS build +FROM docker.io/library/gradle:8.10.0-jdk21@sha256:1b5482e7726517fe340e44879e4083c30a6fc1a285cacba5ed665a995241fa86 AS build WORKDIR /home/gradle/project COPY --chown=gradle:gradle . . diff --git a/build.gradle b/build.gradle index f09e33a8..8f96f3d0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'jacoco' id 'java' id 'com.diffplug.spotless' version '6.25.0' - id "io.freefair.lombok" version "8.6" + id "io.freefair.lombok" version "8.7.1" } group = 'org.miracum.streams.ume' @@ -34,8 +34,8 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-web" implementation "ca.uhn.hapi.fhir:hapi-fhir-structures-r4:${hapiVersion}" - implementation 'io.micrometer:micrometer-registry-prometheus:1.13.2' - implementation 'io.micrometer:micrometer-core:1.13.2' + implementation 'io.micrometer:micrometer-registry-prometheus:1.13.3' + implementation 'io.micrometer:micrometer-core:1.13.3' implementation "org.miracum:kafka-fhir-serializer:1.0.6" implementation "org.apache.commons:commons-text:1.12.0" implementation "org.scala-lang:scala-library:2.13.14" @@ -52,7 +52,7 @@ dependencies { testImplementation "ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:${hapiVersion}" testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation "org.springframework.cloud:spring-cloud-stream-test-support" - testImplementation "com.approvaltests:approvaltests:24.3.0" + testImplementation "com.approvaltests:approvaltests:24.4.0" } dependencyManagement { diff --git a/deploy/compose.yaml b/deploy/compose.yaml index e62eb0b4..f82877c9 100644 --- a/deploy/compose.yaml +++ b/deploy/compose.yaml @@ -1,7 +1,7 @@ #checkov:skip=CKV_SECRET_6: all dev setup services: oracle: - image: docker.io/gvenzl/oracle-free:23.4-slim-faststart@sha256:7d40f1174fd64070aecec7722db0156b5c935b8a2ae1277bac656d0346662fad + image: docker.io/gvenzl/oracle-free:23.5-slim-faststart@sha256:1af6ddc85a3efafdc47e1f235694af2d8ea566556ff968f722d9a1f95f07507a cap_drop: - ALL privileged: false @@ -17,7 +17,7 @@ services: - ./oracle/init:/docker-entrypoint-initdb.d/setup kafka: - image: docker.io/bitnami/kafka:3.7.1@sha256:dfa51517c4823ad8ce97cd5b5ed06798067c40634c06144384ee91097ceeabb2 + image: docker.io/bitnami/kafka:3.8.0@sha256:864379e966cad4c2a37843a9c25f258df21250e70d6d1ce4ef6cfd88acb2205d restart: unless-stopped cap_drop: - ALL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e..9355b415 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/package.json b/package.json index cfdb3310..d3916289 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Creates FHIR resources from oBDS-XML data", "dependencies": { "hl7.fhir.r4.core": "4.0.1", - "de.dktk.oncology": "1.3.0", + "de.dktk.oncology": "1.6.0", "de.medizininformatikinitiative.kerndatensatz.person": "2024.0.0" }, "fhirVersions": [