Version 0.1.2.

build-image.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-VERSION=$(grep 'version' build.gradle | cut -f 2 -d "'")
+VERSION=$(grep 'version =' build.gradle.kts | cut -f 2 -d '"')
 
 if [ ! -f "build/httpbucket-$VERSION-runner" ]
 then

build.gradle.kts

@@ -1,6 +1,8 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
-    kotlin("jvm") version "1.9.24"
-    kotlin("plugin.allopen") version "1.9.24"
+    kotlin("jvm") version "2.0.21"
+    kotlin("plugin.allopen") version "2.0.21"
     id("io.quarkus")
 }
 
@@ -14,7 +16,11 @@ val quarkusPlatformArtifactId: String by project
 val quarkusPlatformVersion: String by project
 
 dependencies {
-    implementation(enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}"))
+    implementation(
+        enforcedPlatform(
+            "$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")
@@ -33,7 +39,7 @@ dependencies {
 }
 
 group = "com.testainers"
-version = "0.1.1"
+version = "0.1.2"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
@@ -43,7 +49,7 @@ java {
 tasks.withType<Test> {
     systemProperty(
         "java.util.logging.manager",
-        "org.jboss.logmanager.LogManager"
+        "org.jboss.logmanager.LogManager",
     )
 
     testLogging {
@@ -52,7 +58,7 @@ tasks.withType<Test> {
             "SKIPPED",
             "FAILED",
             "STANDARD_OUT",
-            "STANDARD_ERROR"
+            "STANDARD_ERROR",
         )
     }
 }
@@ -64,7 +70,9 @@ allOpen {
     annotation("io.quarkus.test.junit.QuarkusTest")
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_21.toString()
-    kotlinOptions.javaParameters = true
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_21
+        javaParameters = true
+    }
 }

gradle.properties

@@ -1,6 +1,6 @@
 #Gradle properties
 quarkusPluginId=io.quarkus
-quarkusPluginVersion=3.11.0
+quarkusPluginVersion=3.18.3
 quarkusPlatformGroupId=io.quarkus.platform
 quarkusPlatformArtifactId=quarkus-bom
-quarkusPlatformVersion=3.11.0
+quarkusPlatformVersion=3.18.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -10,4 +10,4 @@ pluginManagement {
         id(quarkusPluginId) version quarkusPluginVersion
     }
 }
-rootProject.name="httpbucket"
+rootProject.name = "httpbucket"

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.18
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.20
 
 ENV LANGUAGE='en_US:en'
 
@@ -88,7 +88,9 @@ COPY --chown=185 build/quarkus-app/app/ /deployments/app/
 COPY --chown=185 build/quarkus-app/quarkus/ /deployments/quarkus/
 
 EXPOSE 8080
+
 USER 185
+
 ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
 

src/main/docker/Dockerfile.legacy-jar

@@ -77,16 +77,17 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-21:1.18
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.20
 
 ENV LANGUAGE='en_US:en'
 
-
 COPY build/lib/* /deployments/lib/
 COPY build/*-runner.jar /deployments/quarkus-run.jar
 
 EXPOSE 8080
+
 USER 185
+
 ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
 

src/main/docker/Dockerfile.native

@@ -14,14 +14,18 @@
 # docker run -i --rm -p 8080:8080 quarkus/httpbucket
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10
+
 WORKDIR /work/
+
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
     && chown 1001:root /work
+
 COPY --chown=1001:root build/*-runner /work/application
 
 EXPOSE 8080
+
 USER 1001
 
 ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

src/main/docker/Dockerfile.native-micro

@@ -18,7 +18,9 @@
 #
 ###
 FROM quay.io/quarkus/quarkus-micro-image:2.0
+
 WORKDIR /work/
+
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
     && chown 1001:root /work

src/main/kotlin/com/testainers/BasicAuthResource.kt

@@ -64,6 +64,13 @@ class BasicAuthResource(
         body: Any?,
     ): Response = getResponse(auth, user, pass, body)
 
+    @HEAD
+    fun head(
+        @RestHeader(HttpHeaders.AUTHORIZATION) auth: String?,
+        user: String,
+        pass: String,
+    ): Response = getResponse(auth, user, pass, null)
+
     private fun getResponse(
         auth: String?,
         user: String,

src/main/kotlin/com/testainers/DelayResource.kt

@@ -66,6 +66,14 @@ class DelayResource(
         body: Any?,
     ): Response = internal(delay, body)
 
+    @HEAD
+    fun head(
+        @Parameter(
+            description = "Delay must be between 0 and 10 seconds.",
+            schema = Schema(minimum = "0", maximum = "10", defaultValue = "10"),
+        ) delay: Int,
+    ): Response = internal(delay, null)
+
     private fun internal(
         delay: Int,
         body: Any?,

src/main/kotlin/com/testainers/RedirectResource.kt

@@ -82,6 +82,18 @@ class RedirectResource {
         ) @QueryParam("code") @DefaultValue("302") code: Int,
     ): Response = internal(url, code)
 
+    @HEAD
+    fun head(
+        @Parameter(
+            description = "URL to redirect.",
+            required = true,
+        ) @QueryParam("url") @DefaultValue("") url: String,
+        @Parameter(
+            description = "Response status code.",
+            schema = Schema(minimum = "300", maximum = "399"),
+        ) @QueryParam("code") @DefaultValue("302") code: Int,
+    ): Response = internal(url, code)
+
     private fun internal(
         url: String,
         code: Int,

src/main/kotlin/com/testainers/StatusResource.kt

@@ -69,6 +69,16 @@ class StatusResource(
         body: Any?,
     ): Response = internal(code, body)
 
+    @HEAD
+    fun head(
+        @Parameter(
+            description =
+                "Code must be between 200 and 599. " +
+                    "Informational responses (1XX) are not supported.",
+            schema = Schema(minimum = "200", maximum = "599"),
+        ) code: Int,
+    ): Response = internal(code, null)
+
     private fun internal(
         code: Int,
         body: Any?,

src/main/resources/application.properties

@@ -18,7 +18,6 @@ quarkus.http.cors.access-control-max-age=24H
 #
 quarkus.info.path=/info
 #
-quarkus.health.openapi.included=true
 quarkus.smallrye-health.root-path=/health
 #
 quarkus.micrometer.export.prometheus.path=/metrics

src/test/kotlin/com/testainers/BaseResourceTest.kt

@@ -22,6 +22,7 @@ abstract class BaseResourceTest {
                 Method.PUT,
                 Method.DELETE,
                 Method.PATCH,
+                Method.HEAD,
             )
 
         @JvmStatic
@@ -32,12 +33,17 @@ abstract class BaseResourceTest {
             argumentGenerator(listOf(null, "", " ", "a", "1.8"))
 
         @JvmStatic
-        fun argumentGenerator(list: List<Any?>): List<Arguments> {
+        fun argumentGenerator(
+            list: List<Any?>,
+            remove: List<Method> = listOf(),
+        ): List<Arguments> {
             val result = mutableListOf<Arguments>()
 
             methods.forEach { method ->
-                list.forEach { status ->
-                    result.add(Arguments.of(method, status))
+                if(method !in remove) {
+                    list.forEach { status ->
+                        result.add(Arguments.of(method, status))
+                    }
                 }
             }