diff --git a/Dockerfile b/Dockerfile index aab3ecfc..6c354d4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM bellsoft/liberica-openjdk-alpine-musl:21.0.4 AS build +FROM bellsoft/liberica-openjdk-alpine-musl:21.0.5 AS build WORKDIR /usr/src/app # cache dependencies COPY ./gradlew ./ @@ -20,7 +20,7 @@ COPY ./server ./server ARG BUILD_ARG="bootJar --parallel" RUN ./gradlew ${BUILD_ARG} -FROM bellsoft/liberica-openjre-alpine-musl:21.0.4 AS app +FROM bellsoft/liberica-openjre-alpine-musl:21.0.5 AS app # use non-root user RUN addgroup -S spring && adduser -S spring -G spring USER spring:spring diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 944c94cc..92d15ec8 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,10 +10,10 @@ dependencies { implementation(libs.plugin.springBoot) implementation(libs.plugin.springDependencyManagement) implementation(libs.plugin.spotless) - implementation(kotlin("allopen", "2.0.20")) - implementation(kotlin("gradle-plugin", "2.0.20")) + implementation(kotlin("allopen", "2.1.0")) + implementation(kotlin("gradle-plugin", "2.1.0")) // required for kotlin plugin jpa - implementation(kotlin("reflect", "2.0.20")) - implementation(kotlin("stdlib-jdk8", "2.0.20")) - implementation(kotlin("noarg", "2.0.20")) + implementation(kotlin("reflect", "2.1.0")) + implementation(kotlin("stdlib-jdk8", "2.1.0")) + implementation(kotlin("noarg", "2.1.0")) } diff --git a/buildSrc/src/main/kotlin/dependency-management.gradle.kts b/buildSrc/src/main/kotlin/dependency-management.gradle.kts index d5147e3b..b500d124 100644 --- a/buildSrc/src/main/kotlin/dependency-management.gradle.kts +++ b/buildSrc/src/main/kotlin/dependency-management.gradle.kts @@ -10,5 +10,5 @@ repositories { dependencies { api(enforcedPlatform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) api(enforcedPlatform("org.springframework.shell:spring-shell-dependencies:3.3.3")) - api(enforcedPlatform("org.springframework.cloud:spring-cloud-dependencies:2023.0.3")) + api(enforcedPlatform("org.springframework.cloud:spring-cloud-dependencies:2023.0.4")) } diff --git a/buildSrc/src/main/kotlin/kotlin-testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-testing-conventions.gradle.kts index b97e0c44..539c8169 100644 --- a/buildSrc/src/main/kotlin/kotlin-testing-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-testing-conventions.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - testImplementation("io.mockk:mockk-jvm:1.13.12") + testImplementation("io.mockk:mockk-jvm:1.13.13") testImplementation("com.ninja-squad:springmockk:4.0.2") testImplementation("io.kotest:kotest-assertions-core-jvm:5.9.1") } diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts index e05ad922..5a41d319 100644 --- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { testImplementation("org.springframework.boot:spring-boot-starter-test") // kotlin related dependencies should move to kotlin-testing-conventions - testImplementation("io.mockk:mockk-jvm:1.13.12") + testImplementation("io.mockk:mockk-jvm:1.13.13") testImplementation("com.ninja-squad:springmockk:4.0.2") testImplementation("io.kotest:kotest-assertions-core-jvm:5.9.1") } diff --git a/docker-compose.yml b/docker-compose.yml index 06d11289..e9382a00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,7 +49,7 @@ services: volumes: - "./stubs:/home/wiremock/mappings" prometheus: - image: "prom/prometheus:v2.54.1" + image: "prom/prometheus:v2.55.1" ports: - "127.0.0.1:9090:9090" volumes: @@ -63,7 +63,7 @@ services: timeout: 5s retries: 3 grafana: - image: "grafana/grafana:11.2.2-ubuntu" + image: "grafana/grafana:11.3.1-ubuntu" ports: - "127.0.0.1:3000:3000" volumes: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 74ea22cb..f484bb1c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -springdoc = "2.6.0" -springBoot = "3.3.4" +springdoc = "2.7.0" +springBoot = "3.4.0" springDependencyManagementPlugin = "1.1.6" kotest = "5.9.1" spotless = "6.25.0"