Oppgraderingar backend (#1341)

* Exposed * Jackson * mockk * Micrometer * Flyway * Logback * Aligner versjonering * Førebur til å oppgradere til JUnit 5.12 * Førebur til å oppgradere til JUnit 5.12 * JUnit 5.12 * Oppgraderer Ktor og KSP * Nye versjonar av våre modell-modular
navikt · Mar 5, 2025 · 2f5f229 · 2f5f229
1 parent 40ed5c8
commit 2f5f229
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 16 deletions.
diff --git a/brevbaker-api-model-common/build.gradle.kts b/brevbaker-api-model-common/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "no.nav.pensjon.brevbaker"
-version = "1.8.7"
+version = "1.8.8"
 
 java {
     withSourcesJar()

diff --git a/brevbaker-dsl/build.gradle.kts b/brevbaker-dsl/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {
     // JUnit 5
     testImplementation(platform("org.junit:junit-bom:$jupiterVersion"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("com.natpryce:hamkrest:$hamkrestVersion")
     testImplementation(kotlin("reflect"))
 }

diff --git a/etterlattemaler/build.gradle.kts b/etterlattemaler/build.gradle.kts
@@ -34,6 +34,7 @@ dependencies {
     // JUnit 5
     testImplementation(platform("org.junit:junit-bom:$jupiterVersion"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("io.mockk:mockk:${mockkVersion}")
 
     testImplementation(testFixtures(project(":brevbaker")))

diff --git a/gradle.properties b/gradle.properties
@@ -7,16 +7,16 @@ org.gradle.caching=true
 systemProp.javaTarget=21
 systemProp.apiModelJavaTarget=21
 systemProp.kotlinVersion=2.1.10
-systemProp.ktorVersion=3.0.2
-systemProp.kspVersion=1.0.29
-logbackVersion=1.5.16
-jupiterVersion=5.11.3
+systemProp.ktorVersion=3.1.1
+systemProp.kspVersion=1.0.31
+logbackVersion=1.5.17
+jupiterVersion=5.12.0
 hamkrestVersion=1.8.0.1
 logstashVersion=8.0
-micrometerVersion=1.14.1
-commonVersion=1.8.7
-jacksonJsr310Version=2.18.2
-mockkVersion=1.13.13
-exposedVersion=0.58.0
-flywayVersion=11.2.0
+micrometerVersion=1.14.4
+commonVersion=1.8.8
+jacksonJsr310Version=2.18.3
+mockkVersion=1.13.17
+exposedVersion=0.60.0
+flywayVersion=11.3.4
 ksp.incremental=false
diff --git a/pensjon-brevbaker-api-model/gradle.properties b/pensjon-brevbaker-api-model/gradle.properties
@@ -1 +1 @@
-version=131
+version=132
diff --git a/pensjon-brevbaker/build.gradle.kts b/pensjon-brevbaker/build.gradle.kts
@@ -140,6 +140,7 @@ dependencies {
     // JUnit 5
     testImplementation(platform("org.junit:junit-bom:$jupiterVersion"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("com.natpryce:hamkrest:$hamkrestVersion")
     testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
     testImplementation("io.mockk:mockk:${mockkVersion}")

diff --git a/pensjonsmaler/build.gradle.kts b/pensjonsmaler/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-val apiModelVersion = 131
+val apiModelVersion = 132
 
 val apiModelJavaTarget: String by System.getProperties()
 val jupiterVersion: String by project
@@ -28,6 +28,7 @@ dependencies {
 
     testImplementation(platform("org.junit:junit-bom:$jupiterVersion"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation(testFixtures(project(":brevbaker")))
 }
 

diff --git a/skribenten-backend/build.gradle.kts b/skribenten-backend/build.gradle.kts
@@ -125,6 +125,7 @@ dependencies {
     // Test
     testImplementation(platform("org.junit:junit-bom:$jupiterVersion"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
     testImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     testImplementation("io.mockk:mockk:${mockkVersion}")

diff --git a/...kend/src/test/kotlin/no/nav/pensjon/brev/skribenten/services/BrevredigeringServiceTest.kt b/...kend/src/test/kotlin/no/nav/pensjon/brev/skribenten/services/BrevredigeringServiceTest.kt
@@ -34,8 +34,12 @@ import org.apache.commons.codec.binary.Hex
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Condition
 import org.jetbrains.exposed.sql.transactions.transaction
-import org.junit.jupiter.api.*
+import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
 import org.testcontainers.containers.PostgreSQLContainer
 import java.time.Instant
 import java.time.LocalDate

diff --git a/template-model-generator/build.gradle.kts b/template-model-generator/build.gradle.kts
@@ -47,10 +47,12 @@ dependencies {
     implementation("com.google.devtools.ksp:symbol-processing-api:$kotlinVersion-$kspVersion")
     implementation(project(":brevbaker-dsl"))
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:$jupiterVersion")
     // Byttet til fork som støtter kotlin > 2.0
     //    testImplementation("com.github.tschuchortdev:kotlin-compile-testing-ksp:1.6.0")
     testImplementation("dev.zacsweers.kctfork:ksp:0.7.0")
     testImplementation("com.natpryce:hamkrest:$hamkrestVersion")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion")
+
+    testImplementation(platform("org.junit:junit-bom:$jupiterVersion"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }