diff --git a/Dockerfile b/Dockerfile index b0e80ea2..445c260b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/gradle:8.11.0-jdk21@sha256:09f2f9448e8d490fc7d8f041cf03502c9749ec72aef6307a0042e5d03494b044 AS build +FROM docker.io/library/gradle:8.12.0-jdk21@sha256:eb37f58646a901dc7727cf448cae36daaefaba79de33b5058dab79aa4c04aefb AS build WORKDIR /home/gradle/project COPY --chown=gradle:gradle . . diff --git a/build.gradle b/build.gradle index 0e57e572..9f65fa1b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '3.3.5' - id 'io.spring.dependency-management' version '1.1.6' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' id 'jacoco' id 'java' id 'com.diffplug.spotless' version '6.25.0' @@ -23,8 +23,8 @@ repositories { } ext { - set('springCloudVersion', "2023.0.3") - set('hapiVersion', "7.4.5") + set('springCloudVersion', "2023.0.4") + set('hapiVersion', "7.6.1") } dependencies { @@ -34,10 +34,10 @@ 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.14.1' - implementation 'io.micrometer:micrometer-core:1.14.1' + implementation 'io.micrometer:micrometer-registry-prometheus:1.14.2' + implementation 'io.micrometer:micrometer-core:1.14.2' implementation "org.miracum:kafka-fhir-serializer:1.0.8" - implementation "org.apache.commons:commons-text:1.12.0" + implementation "org.apache.commons:commons-text:1.13.0" implementation "org.scala-lang:scala-library:2.13.15" implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' @@ -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.9.0" + testImplementation "com.approvaltests:approvaltests:24.12.0" } dependencyManagement { diff --git a/deploy/compose.yaml b/deploy/compose.yaml index 804bc109..8095c663 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.5-slim-faststart@sha256:a628d0978579ff8cdc8cc68192ed79d2ab1b27ab78be9ae8fc40d5235838b84c + image: docker.io/gvenzl/oracle-free:23.6-slim-faststart@sha256:7bb324e0048081b4f69f549437f5b2b905f7ad0486e397dbdb05ac8171dd5ecd cap_drop: - ALL privileged: false @@ -42,7 +42,7 @@ services: - 127.0.0.1:9094:9094 kafka-connect: - image: ghcr.io/miracum/util-images/cricketeerone-kafka-connect:v1.6.1@sha256:9a5db59dcb79f53d1526fcab7cd78d9dc430af0258f96dddc53694f3f266070d + image: ghcr.io/miracum/util-images/cricketeerone-kafka-connect:v1.6.2@sha256:66fa69028dffe5aabe2323a782aa365fbe45394393f8da53cc283375bc910399 restart: unless-stopped cap_drop: - ALL diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c352119..a4b76b95 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 e2847c82..cea7a793 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.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d..f3b75f3b 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum