chore: bumped to jdk25

.github/workflows/analyze.yml

@@ -27,11 +27,11 @@ jobs:
       with:
         languages: kotlin
 
-    - name: Set up Java 21
+    - name: Set up Java 25
       uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
-        java-version: '21'
+        java-version: '25'
         architecture: x64
 
     - name: Build gradle artifacts

.github/workflows/build.yml

@@ -17,11 +17,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-      - name: Set up Java 21
+      - name: Set up Java 25
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
           architecture: x64
           cache: 'gradle'
       - name: Build gradle artifacts

.github/workflows/pull-requests.yml

@@ -17,11 +17,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
-      - name: Set up Java 21
+      - name: Set up Java 25
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
           architecture: x64
           cache: 'gradle'
       - name: Run tests

Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/java21-debian12@sha256:320d27b74347b6baaf35bcbe21bae51f738b07ed2c0741ead5cf050a3b5c3487
+FROM gcr.io/distroless/java25-debian13@sha256:0ea0c4491a57effa3c49c669564b3642d591ed52a3928f22b4cf829bd2736a57
 
 WORKDIR /app
 

README.md

@@ -15,7 +15,7 @@ Repository for `pdfgen`, an application written in Kotlin used to create PDFs an
 * Junit
 * Handlebars
 * VeraPDF-validation
-* JDK 21
+* JDK 25
 * Docker
 * [pdfgen-core](https://github.com/navikt/pdfgen-core)
 

build.gradle.kts

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 group = "no.nav.pdfgen"
 version = "2.0.0" //This will never change. See GitHub releases for docker image release
 
-val javaVersion = JvmTarget.JVM_21
+val javaVersion = JvmTarget.JVM_25
 
 
 val handlebarsVersion = "4.3.1"
@@ -18,15 +18,16 @@ val junitJupiterVersion = "6.0.2"
 val verapdfVersion = "1.28.2"
 val ktfmtVersion = "0.44"
 val testcontainersVersion = "2.0.3"
-val pdfgencoreVersion = "1.1.68"
+val pdfgencoreVersion = "1.1.69"
 
 ///Due to vulnerabilities
 val commonsCompressVersion = "1.28.0"
 val commonsIoVersion = "2.21.0"
+val rhinoVersion = "1.7.14.1"
 
 plugins {
     id("application")
-    kotlin("jvm") version "2.2.21"
+    kotlin("jvm") version "2.3.0"
     id("com.diffplug.spotless") version "8.1.0"
     id("com.github.ben-manes.versions") version "0.53.0"
 }
@@ -106,6 +107,11 @@ dependencies {
     implementation("io.prometheus:simpleclient_hotspot:$prometheusVersion")
 
     implementation("org.verapdf:validation-model:$verapdfVersion")
+    constraints {
+        implementation("org.mozilla:rhino:$rhinoVersion") {
+            because("Due to vulnerabilities in org.verapdf:validation-model")
+        }
+    }
 
     implementation("ch.qos.logback:logback-classic:$logbackVersion")
     implementation("net.logstash.logback:logstash-logback-encoder:$logstashEncoderVersion")

src/test/kotlin/no/nav/pdfgen/ApplicationTest.kt

@@ -17,8 +17,8 @@ internal class ApplicationTest {
     @Test
     internal fun `App is ready only after ServerReady is raised`() {
         testApplication {
-           lateinit var raiseApplicationStarted: () -> Any
-           lateinit var raiseServerReady: () -> Any
+            lateinit var raiseApplicationStarted: () -> Any
+            lateinit var raiseServerReady: () -> Any
             application {
                 routing {
                     val applicationState = ApplicationState()

src/test/kotlin/no/nav/pdfgen/DockerImageTest.kt

@@ -29,8 +29,7 @@ internal class DockerImageTest {
         val network = Network.newNetwork()
 
         val pdfgenContainer =
-            GenericContainer(ImageFromDockerfile()
-                .withDockerfile(Path("./Dockerfile")))
+            GenericContainer(ImageFromDockerfile().withDockerfile(Path("./Dockerfile")))
                 .withNetwork(network)
                 .withCopyToContainer(MountableFile.forHostPath("templates"), "/app/templates")
                 .withCopyToContainer(MountableFile.forHostPath("fonts"), "/app/fonts")

src/test/kotlin/no/nav/pdfgen/PdfGenITest.kt

@@ -51,7 +51,10 @@ internal class PdfGenITest {
                         }
                     }
                     assertEquals(true, response.status.isSuccess())
-                    assertEquals(true, response.headers["Content-Type"]!!.contains("application/pdf"))
+                    assertEquals(
+                        true,
+                        response.headers["Content-Type"]!!.contains("application/pdf")
+                    )
                     val bytes = runBlocking { response.readRawBytes() }
                     assertNotEquals(null, bytes)
                     // Load the document in pdfbox to ensure it's valid