diff --git a/build.gradle.kts b/build.gradle.kts index 00bcea8..25c42ab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,6 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget - plugins { - kotlin("jvm") version "2.0.21" - kotlin("plugin.allopen") version "2.0.21" + kotlin("jvm") version "2.1.21" + kotlin("plugin.allopen") version "2.1.21" id("io.quarkus") } @@ -21,7 +19,6 @@ dependencies { "$quarkusPlatformGroupId:$quarkusPlatformArtifactId:$quarkusPlatformVersion", ), ) - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("io.smallrye.config:smallrye-config-source-file-system") implementation("io.quarkus:quarkus-micrometer-registry-prometheus") implementation("io.quarkus:quarkus-smallrye-openapi") @@ -32,6 +29,7 @@ dependencies { implementation("io.quarkus:quarkus-info") implementation("io.quarkus:quarkus-kotlin") implementation("io.quarkus:quarkus-arc") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") testImplementation("io.quarkus:quarkus-junit5") testImplementation("io.rest-assured:rest-assured") testImplementation("io.rest-assured:kotlin-extensions") @@ -39,7 +37,7 @@ dependencies { } group = "com.testainers" -version = "0.1.2" +version = "0.2.0" java { sourceCompatibility = JavaVersion.VERSION_21 @@ -72,7 +70,7 @@ allOpen { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_21 + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 javaParameters = true } } diff --git a/gradle.properties b/gradle.properties index d5994ed..4509cfa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #Gradle properties quarkusPluginId=io.quarkus -quarkusPluginVersion=3.18.3 +quarkusPluginVersion=3.23.4 quarkusPlatformGroupId=io.quarkus.platform quarkusPlatformArtifactId=quarkus-bom -quarkusPlatformVersion=3.18.3 +quarkusPlatformVersion=3.23.4 diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 89041cb..14fed84 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi8/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/src/main/docker/Dockerfile.legacy-jar b/src/main/docker/Dockerfile.legacy-jar index 8a2f8c3..4a2fd38 100644 --- a/src/main/docker/Dockerfile.legacy-jar +++ b/src/main/docker/Dockerfile.legacy-jar @@ -77,7 +77,7 @@ # accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM registry.access.redhat.com/ubi8/openjdk-21:1.20 +FROM registry.access.redhat.com/ubi8/openjdk-21:1.21 ENV LANGUAGE='en_US:en' diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native index 2072720..0454814 100644 --- a/src/main/docker/Dockerfile.native +++ b/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/httpbucket # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5 WORKDIR /work/ @@ -22,7 +22,7 @@ RUN chown 1001 /work \ && chmod "g+rwX" /work \ && chown 1001:root /work -COPY --chown=1001:root build/*-runner /work/application +COPY --chown=1001:root --chmod=0755 build/*-runner /work/application EXPOSE 8080 diff --git a/src/main/docker/Dockerfile.native-micro b/src/main/docker/Dockerfile.native-micro index dfcbab3..dbec105 100644 --- a/src/main/docker/Dockerfile.native-micro +++ b/src/main/docker/Dockerfile.native-micro @@ -31,7 +31,7 @@ ADD --chown=1001:root \ RUN chmod +x /usr/bin/check -COPY --chown=1001:root build/*-runner /work/application +COPY --chown=1001:root --chmod=0755 build/*-runner /work/application COPY --chown=1001:root cert.pem /work/cert.pem COPY --chown=1001:root key.pem /work/key.pem diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 49e7a4e..a84bb57 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -30,7 +30,7 @@ quarkus.swagger-ui.always-include=true quarkus.swagger-ui.path=/swagger-ui quarkus.swagger-ui.theme=flattop quarkus.swagger-ui.title=httpbucket -quarkus.swagger-ui.footer=© 2024 - Testainers +quarkus.swagger-ui.footer=© 2025 - Testainers # %test.quarkus.jacoco.footer=httpbucket %test.quarkus.jacoco.title=httpbucket