diff --git a/Dockerfile b/Dockerfile index 0a66ed0..5472e05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# syntax=docker/dockerfile:1.7@sha256:dbbd5e059e8a07ff7ea6233b213b36aa516b4c53c645f1817a4dd18b83cbea56 -FROM docker.io/library/gradle:8.7.0-jdk17@sha256:77a48f339b2bbc261d4448bc5ce7c5aa7c46e1e07b6d8480955aedf6891b7107 AS build +# syntax=docker/dockerfile:1.9@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 +FROM docker.io/library/gradle:8.8.0-jdk17@sha256:6ff0b959f7da8ba5109f815697f174549668f1a44659d1177eaf8ef11132f476 AS build WORKDIR /home/gradle/src ENV GRADLE_USER_HOME /gradle diff --git a/build.gradle b/build.gradle index cccf22e..b9c45ca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.2.4' - 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 'java' id 'jacoco' id 'com.diffplug.spotless' version '6.25.0' @@ -21,8 +21,8 @@ repositories { } ext { - set('springCloudVersion', '2023.0.1') - set('hapiVersion', '7.0.2') + set('springCloudVersion', '2023.0.3') + set('hapiVersion', '7.2.1') } dependencies { @@ -35,10 +35,10 @@ dependencies { implementation 'org.apache.kafka:kafka-streams' - implementation 'io.micrometer:micrometer-registry-prometheus:1.12.4' - implementation 'io.micrometer:micrometer-core:1.12.4' + implementation 'io.micrometer:micrometer-registry-prometheus:1.13.2' + implementation 'io.micrometer:micrometer-core:1.13.2' - implementation 'org.miracum:kafka-fhir-serializer:1.0.5' + implementation 'org.miracum:kafka-fhir-serializer:1.0.6' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' @@ -49,11 +49,11 @@ dependencies { implementation "ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:${hapiVersion}" // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0' + implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2' implementation 'org.fhir:ucum:1.0.8' - implementation 'io.minio:minio:8.5.9' + implementation 'io.minio:minio:8.5.11' testImplementation 'org.springframework.boot:spring-boot-starter-test' } @@ -81,7 +81,7 @@ jacocoTestReport { } jacoco { - toolVersion = "0.8.11" + toolVersion = "0.8.12" } spotless { diff --git a/compose.yml b/compose.yml index a0b105a..7759d78 100644 --- a/compose.yml +++ b/compose.yml @@ -1,6 +1,6 @@ services: fhir: - image: docker.io/hapiproject/hapi:v7.0.3@sha256:73ff82fec42e5cbb7e66338d47af09ba91c140e98beeaee41a5459572d5ae1ce + image: docker.io/hapiproject/hapi:v7.2.0@sha256:9bcafa8342b572eee248cb7c48c496863d352bbd0347e1d98ea238d09620e89b environment: HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "true" HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "false" @@ -11,7 +11,7 @@ services: - 127.0.0.1:8082:8080 kafka: - image: docker.io/bitnami/kafka:3.7.0@sha256:c1e54c8bc46edfc23c25d53f6de1b1433e2e919870c679fa7a846a8af0b03427 + image: docker.io/bitnami/kafka:3.7.1@sha256:9140af16013783e5a144c2e232c6777eb3b9d0341c7ed6423f412a3f947b0494 restart: unless-stopped cap_drop: - ALL @@ -35,7 +35,7 @@ services: - 127.0.0.1:9094:9094 akhq: - image: docker.io/tchiotludo/akhq:0.24.0@sha256:6ccf8323ae6e93a893107f857cd9f7210add3569743b2c8528c6567967cc636f + image: docker.io/tchiotludo/akhq:0.25.1@sha256:cfaef8f419c4e4b78c583597d6428b63166e90eeb194af890264d68051a22180 environment: AKHQ_CONFIGURATION: | akhq: @@ -49,7 +49,7 @@ services: - kafka mock-data-loader: - image: docker.io/confluentinc/cp-kafkacat:7.1.11@sha256:b32a0fc2e8dd0ab25201cc62f856d41a7133e3def9e622471d15383af30b5111 + image: docker.io/confluentinc/cp-kafkacat:7.1.12@sha256:372168153cc7ca0c6ac1a4e5345709e67c4e0c78badc2a4abcffd1e4e62d0204 entrypoint: ["/bin/bash", "-c"] restart: on-failure command: @@ -62,7 +62,7 @@ services: - kafka minio: - image: docker.io/bitnami/minio:2024.2.17-debian-12-r2@sha256:4d04a41f9d385d51ecd9be8dafca13fe9d56be2cc1c5ea8f98e6cfb235d87ae5 + image: docker.io/bitnami/minio:2024.7.10-debian-12-r0@sha256:9a1a49c6c460733f6b4070dbf2f189c5523666b7be22993fe20c7fb4b51b19d6 environment: MINIO_ROOT_USER: "admin" # kics-scan ignore-line diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..09523c0 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME