Maintenance

Author: dnl50

.github/workflows/publish.yml …ithub/workflows/.publish.yml.deactivated.github/workflows/publish.yml renamed to .github/workflows/.publish.yml.deactivated .github/workflows/publish.yml renamed to .github/workflows/.publish.yml.deactivated

@@ -74,7 +74,7 @@ jobs:
           QUARKUS_NATIVE_ENABLED: false
           QUARKUS_PACKAGE_JAR_TYPE: mutable-jar
           QUARKUS_DOCKER_BUILDX_PLATFORM: linux/amd64,linux/arm64
-        run: ./gradlew clean build -PimageTagSuffix=jvm
+        run: ./gradlew build
 
       - name: Update Docker Hub description
         if: ${{ github.event.action == 'released' }}

.github/workflows/check.yml

@@ -11,20 +11,48 @@ on:
       - feature/**
 
 jobs:
-  check:
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Run Gradle 'build' Task
         run: ./gradlew build
+
+  check:
+    name: "e2e tests ${{ matrix.type.name }}"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        type:
+          - name: jvm
+            native: false
+          - name: native
+            native: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '25'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: execute e2e tests
+        env:
+          ORG_GRADLE_PROJECT_nativeImage: ${{ matrix.type.native }}
+        run: ./gradlew testNative

.gitignore

@@ -1,6 +1,7 @@
 # Gradle
 .gradle/
 build/
+.kotlin/
 
 # Eclipse
 .project

README.md

@@ -146,6 +146,28 @@ openssl pkcs12 -export -CAfile cacert.pem -chain -in tsacert.pem -inkey tsa.priv
 
 ## Development
 
+### Building an OCI image with a GraalVM native executable
+
+Due to restrictions of the [Quarkus Gradle Plugin](https://github.com/quarkusio/quarkus/discussions/40679)
+you can either build an OCI image with a GraalVM native executable or a JVM based OCI image.
+
+The name of the `testNative` Gradle task is therefore extremely misleading, because it can either use the JVM based
+image or the GraalVM native executable image.
+
+By default, a JVM based OCI image is built and used in the `testNative` task. To build a GraalVM native executable
+image, set the `nativeImage` Gradle property to `true` when executing Gradle tasks:
+
+```bash
+# build the native image without executing end-to-end-tests (just execute the regular JUnit tests)
+./gradlew build -PnativeImage=true
+
+# build the native image and execute the end-to-end-tests (without the regular JUnit tests)
+./gradlew testNative -PnativeImage=true
+```
+
+This Gradle property will properly configure the `quarkus.package.jar.enabled`, `quarkus.native.enabled` and
+`quarkus.container-image.tag` configuration parameters.
+
 ### Running in development mode
 
 In normal operation, no signing certificate is configured by default since you probably want to use your own/your

app/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
 
     implementation("jakarta.validation:jakarta.validation-api")
     implementation("jakarta.ws.rs:jakarta.ws.rs-api")
-    implementation(libs.bouncycastle)
+    implementation("org.bouncycastle:bcpkix-jdk18on")
     implementation(libs.mapstruct.runtime)
 
     runtimeOnly("io.quarkus:quarkus-jdbc-h2")
@@ -42,13 +42,13 @@ dependencies {
     testImplementation("org.mockito:mockito-junit-jupiter")
     testImplementation("io.quarkus:quarkus-junit5-mockito")
     testImplementation("io.rest-assured:rest-assured")
-    testImplementation(testLibs.assertj)
-    testImplementation(testLibs.archunit)
+    testImplementation(libs.assertj)
+    testImplementation(libs.archunit)
 }
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
@@ -61,6 +61,11 @@ tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.add("-parameters")
 }
 
+val compileAll by tasks.registering {
+    description = "Lifecycle Task to compile all source sets"
+    dependsOn(tasks.withType<JavaCompile>())
+}
+
 // this file is used in the publish-workflow as well
 val openApiSpecificationFile = layout.buildDirectory.file("openapi-specification.json")
 
@@ -84,25 +89,28 @@ spotless {
     }
 }
 
+// setting "quarkus.native.enabled" is not enough when using Gradle, you also have to disable jar packaging
+// see https://github.com/quarkusio/quarkus/discussions/40679
+val buildNativeImage = providers.gradleProperty("nativeImage")
+    .map { it.toBoolean() }
+    .orElse(false)
+
 quarkus {
+    set("package.jar.enabled", buildNativeImage.map { !it }.map(Boolean::toString))
+    set("native.enabled", buildNativeImage.map(Boolean::toString))
     set("native.container-build", "true")
     set("container-image.build", "true")
     set("container-image.group", "dnl50")
     set("container-image.name", "tsa-server")
-    set("container-image.tag", provider {
-        if (project.hasProperty("imageTagSuffix")) {
-            "${project.version}-${project.property("imageTagSuffix")}"
-        } else {
-            project.version.toString()
+    set(
+        "container-image.tag",
+        buildNativeImage.map { native ->
+            "${project.version}${if (native) "" else "-jvm"}"
         }
-    })
+    )
     finalName.set("tsa-${project.version}")
 }
 
-tasks.check {
-    dependsOn(tasks.testNative)
-}
-
 // for some reason quarkus does recognize that the JDBC URL is set in the prod profile. therefore it
 // creates a h2 db in server mode (using the H2DevServicesProcessor) which runs on the host machine and sets the JDBC URL
 // to something like "jdbc:h2:tcp://localhost:53233/mem:test" which obviously does not work inside the docker container

app/src/main/docker/Dockerfile.jvm

@@ -1,5 +1,5 @@
 # Based on Quarkus' Dockerfile.jvm template for Gradle
-FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:1.20
+FROM registry.access.redhat.com/ubi9/openjdk-25:1.24
 
 ENV LANGUAGE='en_US:en'
 

app/src/main/docker/Dockerfile.native

@@ -1,14 +1,14 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
 WORKDIR /work/
 RUN chown 1001 /work \
     && mkdir /work/data \
     && chmod -R "g+rwX" /work \
     && chown -R 1001:root /work
-COPY --chown=1001:root build/*-runner /work/application
+COPY --chown=1001:root --chmod=0755 build/*-runner /work/application
 
 EXPOSE 8080
 USER 1001
 
 VOLUME ["/work/data"]
 
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

app/src/native-test/java/dev/mieser/tsa/nativetest/KeystoreResourceLifecycleManager.java

@@ -13,8 +13,7 @@
 
 /**
  * {@link QuarkusTestResourceLifecycleManager} which copies a PKCS#12 keystore to a temporary directory on the host
- * system and adds an argument to the {@code docker run} command executed by Quarkus so that the temporary file on the
- * host system is mounted in the container.
+ * system and mounts the temporary file inside the container.
  */
 @Slf4j
 public class KeystoreResourceLifecycleManager implements QuarkusTestResourceLifecycleManager {
@@ -25,7 +24,9 @@ public class KeystoreResourceLifecycleManager implements QuarkusTestResourceLife
     public Map<String, String> start() {
         temporaryFile = copyKeystoreToTemporaryFile();
 
-        return Map.of("quarkus.test.arg-line", String.format("-v %s:/work/keystore.p12", temporaryFile.toAbsolutePath()));
+        return Map.of(
+            "quarkus.test.container.volume-mounts.\"%s\"".formatted(temporaryFile.toAbsolutePath()),
+            "/work/keystore.p12");
     }
 
     @Override

build-logic/gradle.properties

@@ -0,0 +1,2 @@
+org.gradle.configuration-cache=true
+org.gradle.parallel=true

build-logic/settings.gradle.kts

@@ -0,0 +1,3 @@
+rootProject.name = "build-logic"
+
+include("versioning")