diff --git a/Dockerfile b/Dockerfile index 8a8aa45..fc46759 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# syntax=docker/dockerfile:1.4 -FROM docker.io/library/gradle:8.4.0-jdk17@sha256:9fde0212a97ab5c96e17797bba1f4f63c223a5ca04131d8dbafce038c53c4eb3 AS build +# syntax=docker/dockerfile:1.6@sha256:ac85f380a63b13dfcefa89046420e1781752bab202122f8f50032edf31be0021 +FROM docker.io/library/gradle:8.5.0-jdk17@sha256:7020357eb6032236390ef34a8903fbcb4dc2bf29e81d89bd93bdaa844e098518 AS build WORKDIR /home/gradle/src ENV GRADLE_USER_HOME /gradle diff --git a/build.gradle b/build.gradle index 3c39de3..861fd3f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ plugins { - id 'org.springframework.boot' version '3.1.5' - id 'io.spring.dependency-management' version '1.1.3' + id 'org.springframework.boot' version '3.2.2' + id 'io.spring.dependency-management' version '1.1.4' id 'java' id 'jacoco' - id 'com.diffplug.spotless' version '6.22.0' + id 'com.diffplug.spotless' version '6.24.0' } group = 'org.miracum.streams' @@ -22,7 +22,7 @@ repositories { ext { set('springCloudVersion', '2022.0.4') - set('hapiVersion', '6.8.5') + set('hapiVersion', '6.10.2') } dependencies { @@ -35,8 +35,8 @@ dependencies { implementation 'org.apache.kafka:kafka-streams' - implementation 'io.micrometer:micrometer-registry-prometheus:1.11.5' - implementation 'io.micrometer:micrometer-core:1.11.5' + 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' diff --git a/compose.yml b/compose.yml index 2db296f..6ae2f54 100644 --- a/compose.yml +++ b/compose.yml @@ -1,6 +1,6 @@ services: fhir: - image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27 + image: docker.io/hapiproject/hapi:v6.10.1@sha256:4eac1b3481180b028616d1fab7e657e368538063d75f7ed3be2032e34c657dd4 environment: HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "true" HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "false" @@ -11,7 +11,7 @@ services: - 8082:8080 kafka: - image: docker.io/bitnami/kafka:3.6.0@sha256:2d065103d482dd0b985e15e39eaf17dc7627a755321952be807335d7ae67533c + image: docker.io/bitnami/kafka:3.6.1@sha256:ba72423025b923b366219dacd95a16c8eacc2d1d488bc7bd00ac877638f2da98 restart: unless-stopped cap_drop: - ALL @@ -49,7 +49,7 @@ services: - kafka mock-data-loader: - image: docker.io/confluentinc/cp-kafkacat:7.1.9@sha256:97584651f761151dde33a90321ee09ca0a1f2e5be2075ddf88379bad78b60148 + image: docker.io/confluentinc/cp-kafkacat:7.1.11@sha256:b32a0fc2e8dd0ab25201cc62f856d41a7133e3def9e622471d15383af30b5111 entrypoint: ["/bin/bash", "-c"] restart: on-failure command: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..1af9e09 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME