diff --git a/Dockerfile b/Dockerfile index 97d4d187..c714b6ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:8.6.0-jdk17-alpine@sha256:9c5f1d6b88d7c6e97db10d4cacfbb44cfdf957fa4e11a3012316e811ab9da49c AS build +FROM gradle:8.8.0-jdk17-alpine@sha256:bbb264cb9b7aca0213f849f9b2f4989edea4b32fe85f026f3852f2f956d08fd4 AS build WORKDIR /home/gradle/src ENV GRADLE_USER_HOME /gradle diff --git a/build.gradle b/build.gradle index f30d0c94..f618035e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'org.springframework.boot' version '3.2.2' - id 'io.spring.dependency-management' version '1.1.4' + id 'org.springframework.boot' version '3.3.1' + id 'io.spring.dependency-management' version '1.1.6' id 'jacoco' id 'java' id 'com.diffplug.spotless' version '6.25.0' - id "io.freefair.lombok" version "8.4" + id "io.freefair.lombok" version "8.6" } group = 'org.miracum.streams.ume' @@ -23,8 +23,8 @@ repositories { } ext { - set('springCloudVersion', "2023.0.0") - set('hapiVersion', "6.10.4") + set('springCloudVersion', "2023.0.2") + set('hapiVersion', "6.10.5") } dependencies { @@ -34,11 +34,11 @@ 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.12.2' - implementation 'io.micrometer:micrometer-core:1.12.2' - implementation "org.miracum:kafka-fhir-serializer:1.0.4" - implementation "org.apache.commons:commons-text:1.11.0" - implementation "org.scala-lang:scala-library:2.13.12" + implementation 'io.micrometer:micrometer-registry-prometheus:1.13.1' + implementation 'io.micrometer:micrometer-core:1.13.1' + 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" implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' @@ -48,7 +48,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:22.3.3" + testImplementation "com.approvaltests:approvaltests:22.4.0" } dependencyManagement { @@ -62,7 +62,7 @@ tasks.named('test') { } jacoco { - toolVersion = "0.8.11" + toolVersion = "0.8.12" } spotless { diff --git a/deploy/docker-compose.dev.yml b/deploy/docker-compose.dev.yml index 5f5ac867..adc08eac 100644 --- a/deploy/docker-compose.dev.yml +++ b/deploy/docker-compose.dev.yml @@ -13,7 +13,7 @@ services: - ./oracle/init:/docker-entrypoint-initdb.d/setup zoo1: - image: zookeeper:3.9.1 + image: zookeeper:3.9.2 restart: unless-stopped hostname: zoo1 ports: @@ -24,7 +24,7 @@ services: ZOO_SERVERS: server.1=zoo1:2888:3888;2181 kafka1: - image: confluentinc/cp-kafka:7.5.3@sha256:51145a40d23336a11085ca695d02bdeee66fe01b582837c6d223384952226be9 + image: confluentinc/cp-kafka:7.6.1@sha256:620734d9fc0bb1f9886932e5baf33806074469f40e3fe246a3fdbb59309535fa hostname: kafka1 ports: - "9092:9092" @@ -40,7 +40,7 @@ services: - zoo1 kafka-connect: - image: confluentinc/cp-kafka-connect:7.5.3@sha256:e6bc1b88b43a23de290da574b0bbc06135b0005ecb9cac0c95155d3ff50f283a + image: confluentinc/cp-kafka-connect:7.6.1@sha256:4539c1f3169f6dca603b29fd42a693295e849bc48cdc0583dff7708748659d76 hostname: kafka-connect ports: - "8083:8083" @@ -67,7 +67,7 @@ services: - kafka1 akhq: - image: tchiotludo/akhq:0.24.0 + image: tchiotludo/akhq:0.25.1 environment: AKHQ_CONFIGURATION: | akhq: diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd491..e6441136 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce..a4413138 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..b740cf13 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..7101f8e4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/package.json b/package.json index 6b88d8dd..3d229623 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "Creates FHIR resources from oBDS-XML data", "dependencies": { "hl7.fhir.r4.core": "4.0.1", - "de.dktk.oncology": "1.3.0", - "de.medizininformatikinitiative.kerndatensatz.person": "2024.0.0-ballot" + "de.dktk.oncology": "1.5.0", + "de.medizininformatikinitiative.kerndatensatz.person": "2024.0.0" }, "fhirVersions": [ "4.0.1"