From 9cbd35d1260b8e97e79865f905d0c5b2df82142c Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Wed, 5 Mar 2025 13:45:54 +0100 Subject: [PATCH 01/12] Skriv oss over til Gradle Version Catalog --- brevbaker-dsl/build.gradle.kts | 12 +-- brevbaker/build.gradle.kts | 25 +++--- build.gradle.kts | 10 +-- etterlattemaler/build.gradle.kts | 16 ++-- gradle.properties | 13 --- gradle/libs.versions.toml | 87 ++++++++++++++++++ pdf-bygger/build.gradle.kts | 44 ++++----- pensjon-brevbaker-api-model/build.gradle.kts | 6 +- pensjon-brevbaker/build.gradle.kts | 59 ++++++------ pensjonsmaler/build.gradle.kts | 6 +- skribenten-backend/build.gradle.kts | 95 +++++++++----------- template-model-generator/build.gradle.kts | 16 ++-- tjenestebuss-integrasjon/build.gradle.kts | 49 +++++----- 13 files changed, 223 insertions(+), 215 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/brevbaker-dsl/build.gradle.kts b/brevbaker-dsl/build.gradle.kts index 8aabb4ef06..12fd5b7e14 100644 --- a/brevbaker-dsl/build.gradle.kts +++ b/brevbaker-dsl/build.gradle.kts @@ -1,9 +1,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget val apiModelJavaTarget: String by System.getProperties() -val commonVersion: String by project -val hamkrestVersion: String by project -val jupiterVersion: String by project plugins { kotlin("jvm") @@ -25,13 +22,12 @@ repositories { dependencies { implementation(kotlin("stdlib")) - implementation("no.nav.pensjon.brevbaker:brevbaker-api-model-common:$commonVersion") + implementation(libs.brevbaker.common) // 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(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter) + testImplementation(libs.hamkrest) testImplementation(kotlin("reflect")) } diff --git a/brevbaker/build.gradle.kts b/brevbaker/build.gradle.kts index d84e2a2a88..1f5ae7e8aa 100644 --- a/brevbaker/build.gradle.kts +++ b/brevbaker/build.gradle.kts @@ -1,11 +1,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget val apiModelJavaTarget: String by System.getProperties() -val hamkrestVersion: String by project -val commonVersion: String by project -val logstashVersion: String by project -val ktorVersion: String by System.getProperties() -val jacksonJsr310Version: String by project plugins { kotlin("jvm") @@ -25,22 +20,22 @@ repositories { dependencies { api(project(":brevbaker-dsl")) - api("no.nav.pensjon.brevbaker:brevbaker-api-model-common:$commonVersion") + api(libs.brevbaker.common) ksp(project(":template-model-generator")) - implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.12.0") + implementation(libs.kotlinx.html) testImplementation(kotlin("test")) - testImplementation("com.natpryce:hamkrest:$hamkrestVersion") + testImplementation(libs.hamkrest) + testFixturesImplementation(libs.ktor.serialization.jackson) + testFixturesImplementation(libs.ktor.client.cio) + testFixturesImplementation(libs.ktor.client.content.negotiation) + testFixturesImplementation(libs.ktor.client.encoding) + testFixturesImplementation(libs.ktor.server.call.id) - testFixturesImplementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion") - testFixturesImplementation("io.ktor:ktor-serialization-jackson:$ktorVersion") - testFixturesImplementation("io.ktor:ktor-client-cio:$ktorVersion") - testFixturesImplementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") - testFixturesImplementation("io.ktor:ktor-client-encoding:$ktorVersion") - testFixturesImplementation("io.ktor:ktor-server-call-id:$ktorVersion") + testFixturesImplementation(libs.logback.encoder) - testFixturesImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonJsr310Version") { + testFixturesImplementation(libs.jackson.datatype.jsr310) { because("we require deserialization/serialization of java.time.LocalDate") } } diff --git a/build.gradle.kts b/build.gradle.kts index a1a72293b8..66fb71884d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,7 @@ plugins { - val kotlinVersion: String by System.getProperties() - val ktorVersion: String by System.getProperties() - val kspVersion: String by System.getProperties() - - kotlin("jvm") version kotlinVersion apply false - id("com.google.devtools.ksp") version "$kotlinVersion-$kspVersion" apply false - id("io.ktor.plugin") version ktorVersion apply false + kotlin("jvm") version libs.versions.kotlinVersion apply false + id("com.google.devtools.ksp") version libs.versions.kotlinKspVersion apply false + id("io.ktor.plugin") version libs.versions.ktorVersion apply false } allprojects { diff --git a/etterlattemaler/build.gradle.kts b/etterlattemaler/build.gradle.kts index a019afd5a2..316b5bc7cb 100644 --- a/etterlattemaler/build.gradle.kts +++ b/etterlattemaler/build.gradle.kts @@ -2,11 +2,6 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent import org.jetbrains.kotlin.gradle.dsl.JvmTarget val apiModelJavaTarget: String by System.getProperties() -val jacksonJsr310Version: String by project -val jupiterVersion: String by project -val logstashVersion: String by project -val ktorVersion: String by System.getProperties() -val mockkVersion: String by project plugins { kotlin("jvm") @@ -27,18 +22,17 @@ dependencies { ksp(project(":template-model-generator")) - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonJsr310Version") { + implementation(libs.jackson.datatype.jsr310) { because("we require deserialization/serialization of java.time.LocalDate") } // 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(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter) + testImplementation(libs.mockk) testImplementation(testFixtures(project(":brevbaker"))) - testImplementation("io.ktor:ktor-server-call-id:$ktorVersion") + testImplementation(libs.ktor.server.call.id) } tasks.test { diff --git a/gradle.properties b/gradle.properties index 99920d1d55..53ee9ca21b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,17 +6,4 @@ org.gradle.caching=true systemProp.javaTarget=21 systemProp.apiModelJavaTarget=21 -systemProp.kotlinVersion=2.1.10 -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.4 -commonVersion=1.8.8 -jacksonJsr310Version=2.18.3 -mockkVersion=1.13.17 -exposedVersion=0.60.0 -flywayVersion=11.3.4 ksp.incremental=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000000..7f18891250 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,87 @@ +[versions] +kotlinVersion = "2.1.10" +kotlinKspVersion = "2.1.10-1.0.29" # TODO: Denne er kombinasjon av kotlinVersion og kspVersion. Har ikkje funne ein måte å slå saman desse to automatisk på +ktorVersion = "3.0.2" +assertJVersion = "3.27.3" +commonsCodecVersion = "1.18.0" +logbackVersion = "1.5.16" +jupiterVersion = "5.11.3" +hamkrestVersion = "1.8.0.1" +hikariVersion = "6.2.1" +kotlinxHtmlVersion = "0.12.0" +kspKctVersion = "0.7.0" +logstashVersion = "8.0" +micrometerVersion = "1.14.1" +postgresqlVersion = "42.7.3" +testcontainersPostgresqlVersion = "1.20.5" +commonVersion = "1.8.7" +jacksonJsr310Version = "2.18.2" +mockkVersion = "1.13.13" +exposedVersion = "0.58.0" +flywayVersion = "11.2.0" +unleashVersion = "10.0.2" + +[libraries] +brevbaker-common = { module = "no.nav.pensjon.brevbaker:brevbaker-api-model-common", version.ref = "commonVersion" } +commons-codec = { module = "commons-codec:commons-codec", version.ref = "commonsCodecVersion" } +hikari-cp = { module = "com.zaxxer:HikariCP", version.ref = "hikariVersion" } +kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinxHtmlVersion" } +ksp-symbol-processing-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "kotlinKspVersion"} +ksp-kotlin-compile-testing = { module = "dev.zacsweers.kctfork:ksp", version.ref = "kspKctVersion" } +logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logbackVersion" } +logback-encoder = { module = "net.logstash.logback:logstash-logback-encoder", version.ref = "logstashVersion" } +jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jacksonJsr310Version" } +micrometer-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "micrometerVersion" } +postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresqlVersion" } +unleash = { module = "io.getunleash:unleash-client-java", version.ref = "unleashVersion" } + +# Ktor +ktor-serialization-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktorVersion" } +ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktorVersion" } +ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktorVersion" } +ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" } +ktor-client-encoding = { module = "io.ktor:ktor-client-encoding", version.ref = "ktorVersion" } +ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktorVersion" } +ktor-server-auth = { module = "io.ktor:ktor-server-auth", version.ref = "ktorVersion" } +ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt", version.ref = "ktorVersion" } +ktor-server-caching-headers = { module = "io.ktor:ktor-server-caching-headers", version.ref = "ktorVersion" } +ktor-server-caching-headers-jvm = { module = "io.ktor:ktor-server-caching-headers-jvm", version.ref = "ktorVersion"} +ktor-server-call-id = { module = "io.ktor:ktor-server-call-id", version.ref = "ktorVersion" } +ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktorVersion" } +ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktorVersion" } +ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktorVersion" } +ktor-server-core-jvm = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktorVersion" } +ktor-server-cors = { module = "io.ktor:ktor-server-cors", version.ref = "ktorVersion" } +ktor-server-metrics = { module = "io.ktor:ktor-server-metrics", version.ref = "ktorVersion" } +ktor-server-metrics-micrometer = { module = "io.ktor:ktor-server-metrics-micrometer", version.ref = "ktorVersion" } +ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktorVersion" } +ktor-server-netty-jvm = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktorVersion" } +ktor-server-request-validation = { module = "io.ktor:ktor-server-auth", version.ref = "ktorVersion" } +ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktorVersion" } +ktor-server-swagger = { module = "io.ktor:ktor-server-swagger", version.ref = "ktorVersion" } +ktor-server-compression-jvm = { module = "io.ktor:ktor-server-compression-jvm", version.ref = "ktorVersion" } +ktor-server-test-host = { module = "io.ktor:ktor-server-test-host", version.ref = "ktorVersion" } + +# Exposed +exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposedVersion" } +exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposedVersion" } +exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposedVersion" } +exposed-json = { module = "org.jetbrains.exposed:exposed-json", version.ref = "exposedVersion" } +exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposedVersion" } + +# Flyway +flyway-core = { module = "org.flywaydb:flyway-core", version.ref = "flywayVersion" } +flyway-database-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version.ref = "flywayVersion" } + +# Test +assertJ = { module = "org.assertj:assertj-core", version.ref = "assertJVersion" } +hamkrest = { module = "com.natpryce:hamkrest", version.ref = "hamkrestVersion" } +junit-bom = { module = "org.junit:junit-bom", version.ref = "jupiterVersion" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "jupiterVersion" } +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiterVersion" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiterVersion" } +kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" } +mockk = { module = "io.mockk:mockk", version.ref = "mockkVersion" } +testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainersPostgresqlVersion"} + +[bundles] \ No newline at end of file diff --git a/pdf-bygger/build.gradle.kts b/pdf-bygger/build.gradle.kts index 72475f69dd..37b181d34a 100644 --- a/pdf-bygger/build.gradle.kts +++ b/pdf-bygger/build.gradle.kts @@ -1,14 +1,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget val javaTarget: String by System.getProperties() -val ktorVersion: String by System.getProperties() -val kotlinVersion: String by System.getProperties() -val commonVersion: String by project -val hamkrestVersion: String by project -val logbackVersion: String by project -val logstashVersion: String by project -val micrometerVersion: String by project -val jacksonJsr310Version: String by project plugins { kotlin("jvm") @@ -36,32 +28,32 @@ tasks { dependencies { implementation(kotlin("stdlib")) - implementation("ch.qos.logback:logback-classic:$logbackVersion") - implementation("io.ktor:ktor-serialization-jackson:$ktorVersion") - implementation("io.ktor:ktor-server-call-id:$ktorVersion") - implementation("io.ktor:ktor-server-call-logging:$ktorVersion") - implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion") - implementation("io.ktor:ktor-server-core:$ktorVersion") - implementation("io.ktor:ktor-server-netty:$ktorVersion") - implementation("io.ktor:ktor-server-status-pages:$ktorVersion") - implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion") - implementation("io.ktor:ktor-server-compression-jvm:$ktorVersion") + implementation(libs.logback.classic) + implementation(libs.ktor.serialization.jackson) + implementation(libs.ktor.server.call.id) + implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.content.negotiation) + implementation(libs.ktor.server.core) + implementation(libs.ktor.server.netty) + implementation(libs.ktor.server.status.pages) + implementation(libs.logback.encoder) + implementation(libs.ktor.server.compression.jvm) // Metrics - implementation("io.ktor:ktor-server-metrics:$ktorVersion") - implementation("io.ktor:ktor-server-metrics-micrometer:$ktorVersion") - implementation("io.micrometer:micrometer-registry-prometheus:$micrometerVersion") + implementation(libs.ktor.server.metrics) + implementation(libs.ktor.server.metrics.micrometer) + implementation(libs.micrometer.prometheus) implementation(project(":brevbaker-dsl")) - implementation("no.nav.pensjon.brevbaker:brevbaker-api-model-common:$commonVersion") + implementation(libs.brevbaker.common) - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonJsr310Version") { + implementation(libs.jackson.datatype.jsr310) { because("we require deserialization/serialization of java.time.LocalDate") } - testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion") - testImplementation("com.natpryce:hamkrest:$hamkrestVersion") - testImplementation("io.ktor:ktor-server-test-host:$ktorVersion") + testImplementation(libs.kotlin.test.junit) + testImplementation(libs.hamkrest) + testImplementation(libs.ktor.server.test.host) testImplementation(project(":brevbaker")) testImplementation(testFixtures(project(":brevbaker"))) diff --git a/pensjon-brevbaker-api-model/build.gradle.kts b/pensjon-brevbaker-api-model/build.gradle.kts index 9ce88abeff..9bb83ecfb6 100644 --- a/pensjon-brevbaker-api-model/build.gradle.kts +++ b/pensjon-brevbaker-api-model/build.gradle.kts @@ -1,8 +1,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget val apiModelJavaTarget: String by System.getProperties() -val commonVersion: String by project -val kotlinVersion: String by System.getProperties() plugins { kotlin("jvm") @@ -23,8 +21,8 @@ repositories { dependencies { compileOnly(kotlin("stdlib")) - api("no.nav.pensjon.brevbaker:brevbaker-api-model-common:$commonVersion") - testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion") + api(libs.brevbaker.common) + testImplementation(libs.kotlin.test.junit) } publishing { diff --git a/pensjon-brevbaker/build.gradle.kts b/pensjon-brevbaker/build.gradle.kts index 54f5cdd488..31745569e2 100644 --- a/pensjon-brevbaker/build.gradle.kts +++ b/pensjon-brevbaker/build.gradle.kts @@ -2,14 +2,6 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent import org.jetbrains.kotlin.gradle.dsl.JvmTarget val javaTarget: String by System.getProperties() -val logbackVersion: String by project -val ktorVersion: String by System.getProperties() -val jupiterVersion: String by project -val hamkrestVersion: String by project -val logstashVersion: String by project -val micrometerVersion: String by project -val jacksonJsr310Version: String by project -val mockkVersion: String by project plugins { application @@ -105,45 +97,44 @@ kotlin { dependencies { implementation(kotlin("stdlib")) - implementation("ch.qos.logback:logback-classic:$logbackVersion") - implementation("io.ktor:ktor-client-cio:$ktorVersion") - implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") - implementation("io.ktor:ktor-serialization-jackson:$ktorVersion") - implementation("io.ktor:ktor-server-auth:$ktorVersion") - implementation("io.ktor:ktor-server-auth-jwt:$ktorVersion") - implementation("io.ktor:ktor-server-call-id:$ktorVersion") - implementation("io.ktor:ktor-server-call-logging:$ktorVersion") - implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion") - implementation("io.ktor:ktor-server-core:$ktorVersion") - implementation("io.ktor:ktor-server-netty:$ktorVersion") - implementation("io.ktor:ktor-server-status-pages:$ktorVersion") - implementation("io.ktor:ktor-server-swagger:$ktorVersion") - implementation("io.ktor:ktor-client-encoding:$ktorVersion") - implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion") + implementation(libs.logback.classic) + implementation(libs.ktor.client.cio) + implementation(libs.ktor.client.content.negotiation) + implementation(libs.ktor.serialization.jackson) + implementation(libs.ktor.server.auth) + implementation(libs.ktor.server.auth.jwt) + implementation(libs.ktor.server.call.id) + implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.content.negotiation) + implementation(libs.ktor.server.core) + implementation(libs.ktor.server.netty) + implementation(libs.ktor.server.status.pages) + implementation(libs.ktor.server.swagger) + implementation(libs.ktor.client.encoding) + implementation(libs.logback.encoder) implementation(project(":pensjonsmaler")) implementation(project(":etterlattemaler")) implementation(project(":brevbaker")) ksp(project(":template-model-generator")) - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonJsr310Version") { + implementation(libs.jackson.datatype.jsr310) { because("we require deserialization/serialization of java.time.LocalDate") } - implementation("io.getunleash:unleash-client-java:10.0.2") + implementation(libs.unleash) // Metrics - implementation("io.ktor:ktor-server-metrics:$ktorVersion") - implementation("io.ktor:ktor-server-metrics-micrometer:$ktorVersion") - implementation("io.micrometer:micrometer-registry-prometheus:$micrometerVersion") + implementation(libs.ktor.server.metrics) + implementation(libs.ktor.server.metrics.micrometer) + implementation(libs.micrometer.prometheus) // 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}") + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter) + testImplementation(libs.hamkrest) + testImplementation(libs.ktor.server.test.host) + testImplementation(libs.mockk) testImplementation(testFixtures(project(":brevbaker"))) } diff --git a/pensjonsmaler/build.gradle.kts b/pensjonsmaler/build.gradle.kts index 8986c90956..1ff1c638bc 100644 --- a/pensjonsmaler/build.gradle.kts +++ b/pensjonsmaler/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget val apiModelVersion = 132 val apiModelJavaTarget: String by System.getProperties() -val jupiterVersion: String by project plugins { kotlin("jvm") @@ -26,9 +25,8 @@ dependencies { api("no.nav.pensjon.brev:pensjon-brevbaker-api-model:$apiModelVersion") - testImplementation(platform("org.junit:junit-bom:$jupiterVersion")) - testImplementation("org.junit.jupiter:junit-jupiter") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter) testImplementation(testFixtures(project(":brevbaker"))) } diff --git a/skribenten-backend/build.gradle.kts b/skribenten-backend/build.gradle.kts index 3bb4f86537..e1fe422820 100644 --- a/skribenten-backend/build.gradle.kts +++ b/skribenten-backend/build.gradle.kts @@ -1,18 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.jetbrains.kotlin.gradle.dsl.JvmTarget -val exposedVersion: String by project -val commonVersion: String by project -val jacksonJsr310Version: String by project val javaTarget: String by System.getProperties() -val jupiterVersion: String by project -val kotlinVersion: String by System.getProperties() -val ktorVersion: String by System.getProperties() -val logbackVersion: String by project -val logstashVersion: String by project -val micrometerVersion: String by project -val mockkVersion: String by project -val flywayVersion: String by project plugins { application @@ -70,66 +59,64 @@ sourceSets { dependencies { // Ktor - implementation("io.ktor:ktor-client-auth:$ktorVersion") - implementation("io.ktor:ktor-client-cio:$ktorVersion") - implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") - implementation("io.ktor:ktor-serialization-jackson:$ktorVersion") - implementation("io.ktor:ktor-server-auth:$ktorVersion") - implementation("io.ktor:ktor-server-auth-jwt:$ktorVersion") - implementation("io.ktor:ktor-server-call-id:$ktorVersion") - implementation("io.ktor:ktor-server-call-logging:$ktorVersion") - implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion") - implementation("io.ktor:ktor-server-core-jvm:$ktorVersion") - implementation("io.ktor:ktor-server-cors:$ktorVersion") - implementation("io.ktor:ktor-server-netty-jvm:$ktorVersion") - implementation("io.ktor:ktor-server-status-pages:$ktorVersion") - implementation("io.ktor:ktor-server-caching-headers:$ktorVersion") - implementation("io.ktor:ktor-server-request-validation:$ktorVersion") + implementation(libs.ktor.client.auth) + implementation(libs.ktor.client.cio) + implementation(libs.ktor.client.content.negotiation) + implementation(libs.ktor.serialization.jackson) + implementation(libs.ktor.server.auth) + implementation(libs.ktor.server.auth.jwt) + implementation(libs.ktor.server.call.id) + implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.content.negotiation) + implementation(libs.ktor.server.core.jvm) + implementation(libs.ktor.server.cors) + implementation(libs.ktor.server.netty.jvm) + implementation(libs.ktor.server.status.pages) + implementation(libs.ktor.server.caching.headers) + implementation(libs.ktor.server.request.validation) // Exposed - implementation("org.jetbrains.exposed:exposed-core:$exposedVersion") - implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion") - implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion") - implementation("org.jetbrains.exposed:exposed-json:$exposedVersion") - implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion") - implementation("org.postgresql:postgresql:42.7.3") - implementation("com.zaxxer:HikariCP:6.2.1") - + implementation(libs.exposed.core) + implementation(libs.exposed.dao) + implementation(libs.exposed.jdbc) + implementation(libs.exposed.json) + implementation(libs.exposed.java.time) + implementation(libs.postgresql) + implementation(libs.hikari.cp) // Databasemigrering - implementation("org.flywaydb:flyway-core:$flywayVersion") - implementation("org.flywaydb:flyway-database-postgresql:$flywayVersion") + implementation(libs.flyway.core) + implementation(libs.flyway.database.postgresql) // Unleash - implementation("io.getunleash:unleash-client-java:10.0.2") + implementation(libs.unleash) // Domenemodell - implementation("no.nav.pensjon.brevbaker:brevbaker-api-model-common:$commonVersion") + implementation(libs.brevbaker.common) // Logging - implementation("ch.qos.logback:logback-classic:$logbackVersion") - implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion") + implementation(libs.logback.classic) + implementation(libs.logback.encoder) // Necessary for java.time.LocalDate - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonJsr310Version") + implementation(libs.jackson.datatype.jsr310) // Hashing - implementation("commons-codec:commons-codec:1.18.0") + implementation(libs.commons.codec) // Metrics - implementation("io.ktor:ktor-server-metrics:$ktorVersion") - implementation("io.ktor:ktor-server-metrics-micrometer:$ktorVersion") - implementation("io.micrometer:micrometer-registry-prometheus:$micrometerVersion") - implementation("io.ktor:ktor-server-caching-headers-jvm:$ktorVersion") + implementation(libs.ktor.server.metrics) + implementation(libs.ktor.server.metrics.micrometer) + implementation(libs.micrometer.prometheus) + implementation(libs.ktor.server.caching.headers.jvm) // 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}") - testImplementation("org.assertj:assertj-core:3.27.3") - testImplementation("org.testcontainers:postgresql:1.20.5") + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter) + testImplementation(libs.ktor.server.test.host) + testImplementation(libs.ktor.client.mock) + testImplementation(libs.mockk) + testImplementation(libs.assertJ) + testImplementation(libs.testcontainers.postgresql) } \ No newline at end of file diff --git a/template-model-generator/build.gradle.kts b/template-model-generator/build.gradle.kts index 5df74d5b26..c384c16453 100644 --- a/template-model-generator/build.gradle.kts +++ b/template-model-generator/build.gradle.kts @@ -2,10 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask val javaTarget: String by System.getProperties() -val kotlinVersion: String by System.getProperties() -val kspVersion: String by System.getProperties() -val jupiterVersion: String by project -val hamkrestVersion: String by project plugins { kotlin("jvm") @@ -44,15 +40,13 @@ tasks { dependencies { compileOnly(kotlin("reflect")) - implementation("com.google.devtools.ksp:symbol-processing-api:$kotlinVersion-$kspVersion") + implementation(libs.ksp.symbol.processing.api) implementation(project(":brevbaker-dsl")) + testImplementation(libs.junit.jupiter.api) // 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") - - testImplementation(platform("org.junit:junit-bom:$jupiterVersion")) - testImplementation("org.junit.jupiter:junit-jupiter") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation(libs.ksp.kotlin.compile.testing) + testImplementation(libs.hamkrest) + testRuntimeOnly(libs.junit.jupiter.engine) } diff --git a/tjenestebuss-integrasjon/build.gradle.kts b/tjenestebuss-integrasjon/build.gradle.kts index 72d0916a56..e06aead995 100644 --- a/tjenestebuss-integrasjon/build.gradle.kts +++ b/tjenestebuss-integrasjon/build.gradle.kts @@ -4,13 +4,6 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransfor import org.jetbrains.kotlin.gradle.dsl.JvmTarget val javaTarget: String by System.getProperties() -val kotlinVersion: String by System.getProperties() -val ktorVersion: String by System.getProperties() -val hamkrestVersion: String by project -val logbackVersion: String by project -val logstashVersion: String by project -val micrometerVersion: String by project -val jupiterVersion: String by project plugins { application @@ -41,19 +34,19 @@ ktor { val cxfVersion = "3.6.3" val tjenestespesifikasjonerVersion = "1.858e92e" dependencies { - implementation("io.ktor:ktor-serialization-jackson:$ktorVersion") - implementation("io.ktor:ktor-server-call-id:$ktorVersion") - implementation("io.ktor:ktor-server-call-logging:$ktorVersion") - implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion") - implementation("io.ktor:ktor-server-core-jvm:$ktorVersion") - implementation("io.ktor:ktor-server-netty-jvm:$ktorVersion") - implementation("io.ktor:ktor-server-status-pages:$ktorVersion") - implementation("io.ktor:ktor-client-auth:$ktorVersion") - implementation("io.ktor:ktor-server-auth-jwt:$ktorVersion") - implementation("io.ktor:ktor-client-cio:$ktorVersion") - implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") - implementation("ch.qos.logback:logback-classic:$logbackVersion") - implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion") + implementation(libs.ktor.serialization.jackson) + implementation(libs.ktor.server.call.id) + implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.content.negotiation) + implementation(libs.ktor.server.core.jvm) + implementation(libs.ktor.server.netty.jvm) + implementation(libs.ktor.server.status.pages) + implementation(libs.ktor.client.auth) + implementation(libs.ktor.server.auth.jwt) + implementation(libs.ktor.client.cio) + implementation(libs.ktor.client.content.negotiation) + implementation(libs.logback.classic) + implementation(libs.logback.encoder) implementation("no.nav.tjenestespesifikasjoner:samhandler-tjenestespesifikasjon:$tjenestespesifikasjonerVersion") @@ -67,19 +60,19 @@ dependencies { implementation("org.apache.cxf:cxf-rt-transports-http:$cxfVersion") // Metrics - implementation("io.ktor:ktor-server-metrics:$ktorVersion") - implementation("io.ktor:ktor-server-metrics-micrometer:$ktorVersion") - implementation("io.micrometer:micrometer-registry-prometheus:$micrometerVersion") + implementation(libs.ktor.server.metrics) + implementation(libs.ktor.server.metrics.micrometer) + implementation(libs.micrometer.prometheus) // Test - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion") - testImplementation(platform("org.junit:junit-bom:$jupiterVersion")) - testImplementation("io.ktor:ktor-server-test-host:$ktorVersion") + testImplementation(libs.junit.jupiter) + testImplementation(libs.kotlin.test.junit) + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.ktor.server.test.host) testImplementation("com.sun.xml.bind:jaxb-core:2.2.11") testImplementation("org.apache.cxf:cxf-rt-transports-http-jetty:$cxfVersion") - testImplementation("com.natpryce:hamkrest:$hamkrestVersion") + testImplementation(libs.hamkrest) } repositories { From f265f8a6f68edf8384286032e625f98a76374f06 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Wed, 5 Mar 2025 14:14:34 +0100 Subject: [PATCH 02/12] Plugins --- brevbaker-dsl/build.gradle.kts | 6 ------ brevbaker/build.gradle.kts | 2 +- build.gradle.kts | 4 ++-- etterlattemaler/build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 ++++ pdf-bygger/build.gradle.kts | 2 +- pensjon-brevbaker/build.gradle.kts | 4 ++-- pensjonsmaler/build.gradle.kts | 2 +- tjenestebuss-integrasjon/build.gradle.kts | 2 +- 9 files changed, 13 insertions(+), 15 deletions(-) diff --git a/brevbaker-dsl/build.gradle.kts b/brevbaker-dsl/build.gradle.kts index 12fd5b7e14..20b69a69f7 100644 --- a/brevbaker-dsl/build.gradle.kts +++ b/brevbaker-dsl/build.gradle.kts @@ -4,7 +4,6 @@ val apiModelJavaTarget: String by System.getProperties() plugins { kotlin("jvm") - id("com.google.devtools.ksp") } group = "no.nav.pensjon.brevbaker" @@ -35,11 +34,6 @@ kotlin { compilerOptions { jvmTarget.set(JvmTarget.fromTarget(apiModelJavaTarget)) } - sourceSets { - test { - kotlin.srcDir("build/generated/ksp/test/kotlin") - } - } } tasks { test { diff --git a/brevbaker/build.gradle.kts b/brevbaker/build.gradle.kts index 1f5ae7e8aa..8a443bc894 100644 --- a/brevbaker/build.gradle.kts +++ b/brevbaker/build.gradle.kts @@ -6,7 +6,7 @@ plugins { kotlin("jvm") id("java-library") id("java-test-fixtures") - id("com.google.devtools.ksp") + alias(libs.plugins.ksp) apply true } group = "no.nav.brev.brevbaker" diff --git a/build.gradle.kts b/build.gradle.kts index 66fb71884d..26a4af5480 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") version libs.versions.kotlinVersion apply false - id("com.google.devtools.ksp") version libs.versions.kotlinKspVersion apply false - id("io.ktor.plugin") version libs.versions.ktorVersion apply false + alias(libs.plugins.ksp) apply false + alias(libs.plugins.ktor) apply false } allprojects { diff --git a/etterlattemaler/build.gradle.kts b/etterlattemaler/build.gradle.kts index 316b5bc7cb..71075d7f60 100644 --- a/etterlattemaler/build.gradle.kts +++ b/etterlattemaler/build.gradle.kts @@ -5,7 +5,7 @@ val apiModelJavaTarget: String by System.getProperties() plugins { kotlin("jvm") - id("com.google.devtools.ksp") + alias(libs.plugins.ksp) apply true } group = "no.nav.pensjon.brev" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7f18891250..a55df410bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,6 +21,10 @@ exposedVersion = "0.58.0" flywayVersion = "11.2.0" unleashVersion = "10.0.2" +[plugins] +ktor = { id = "io.ktor.plugin", version.ref = "ktorVersion" } +ksp = { id = "com.google.devtools.ksp", version.ref = "kotlinKspVersion" } + [libraries] brevbaker-common = { module = "no.nav.pensjon.brevbaker:brevbaker-api-model-common", version.ref = "commonVersion" } commons-codec = { module = "commons-codec:commons-codec", version.ref = "commonsCodecVersion" } diff --git a/pdf-bygger/build.gradle.kts b/pdf-bygger/build.gradle.kts index 37b181d34a..fde74c7656 100644 --- a/pdf-bygger/build.gradle.kts +++ b/pdf-bygger/build.gradle.kts @@ -5,7 +5,7 @@ val javaTarget: String by System.getProperties() plugins { kotlin("jvm") application - id("io.ktor.plugin") + alias(libs.plugins.ktor) apply true } group="no.nav.pensjon.brev" diff --git a/pensjon-brevbaker/build.gradle.kts b/pensjon-brevbaker/build.gradle.kts index 31745569e2..2a5ee7c5f9 100644 --- a/pensjon-brevbaker/build.gradle.kts +++ b/pensjon-brevbaker/build.gradle.kts @@ -6,8 +6,8 @@ val javaTarget: String by System.getProperties() plugins { application kotlin("jvm") - id("com.google.devtools.ksp") - id("io.ktor.plugin") + alias(libs.plugins.ksp) apply true + alias(libs.plugins.ktor) apply true } group = "no.nav.pensjon.brev" diff --git a/pensjonsmaler/build.gradle.kts b/pensjonsmaler/build.gradle.kts index 1ff1c638bc..b4404d5cbd 100644 --- a/pensjonsmaler/build.gradle.kts +++ b/pensjonsmaler/build.gradle.kts @@ -7,7 +7,7 @@ val apiModelJavaTarget: String by System.getProperties() plugins { kotlin("jvm") - id("com.google.devtools.ksp") + alias(libs.plugins.ksp) apply true } group = "no.nav.pensjon.brev" diff --git a/tjenestebuss-integrasjon/build.gradle.kts b/tjenestebuss-integrasjon/build.gradle.kts index e06aead995..e2dee87256 100644 --- a/tjenestebuss-integrasjon/build.gradle.kts +++ b/tjenestebuss-integrasjon/build.gradle.kts @@ -8,7 +8,7 @@ val javaTarget: String by System.getProperties() plugins { application kotlin("jvm") - id("io.ktor.plugin") + alias(libs.plugins.ktor) apply true } group = "no.nav.pensjon.brev.tjenestebuss" From 7b152c5d4c3d78585dbf9c58570711598aa6ff60 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Wed, 5 Mar 2025 14:16:11 +0100 Subject: [PATCH 03/12] Sorterer versjonar --- gradle/libs.versions.toml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a55df410bd..c3cef28ce0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,23 +2,24 @@ kotlinVersion = "2.1.10" kotlinKspVersion = "2.1.10-1.0.29" # TODO: Denne er kombinasjon av kotlinVersion og kspVersion. Har ikkje funne ein måte å slå saman desse to automatisk på ktorVersion = "3.0.2" + assertJVersion = "3.27.3" commonsCodecVersion = "1.18.0" -logbackVersion = "1.5.16" -jupiterVersion = "5.11.3" +commonVersion = "1.8.7" +exposedVersion = "0.58.0" +flywayVersion = "11.2.0" hamkrestVersion = "1.8.0.1" hikariVersion = "6.2.1" +jacksonJsr310Version = "2.18.2" +jupiterVersion = "5.11.3" kotlinxHtmlVersion = "0.12.0" kspKctVersion = "0.7.0" +logbackVersion = "1.5.16" logstashVersion = "8.0" micrometerVersion = "1.14.1" +mockkVersion = "1.13.13" postgresqlVersion = "42.7.3" testcontainersPostgresqlVersion = "1.20.5" -commonVersion = "1.8.7" -jacksonJsr310Version = "2.18.2" -mockkVersion = "1.13.13" -exposedVersion = "0.58.0" -flywayVersion = "11.2.0" unleashVersion = "10.0.2" [plugins] From 1e5b5386c855ce2130b008935639e21aa770d13f Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Wed, 5 Mar 2025 14:19:16 +0100 Subject: [PATCH 04/12] Sorterer versjonar --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c3cef28ce0..1a20905680 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,18 +41,19 @@ postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresqlVe unleash = { module = "io.getunleash:unleash-client-java", version.ref = "unleashVersion" } # Ktor -ktor-serialization-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktorVersion" } ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktorVersion" } ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktorVersion" } ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" } ktor-client-encoding = { module = "io.ktor:ktor-client-encoding", version.ref = "ktorVersion" } ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktorVersion" } +ktor-serialization-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktorVersion" } ktor-server-auth = { module = "io.ktor:ktor-server-auth", version.ref = "ktorVersion" } ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt", version.ref = "ktorVersion" } ktor-server-caching-headers = { module = "io.ktor:ktor-server-caching-headers", version.ref = "ktorVersion" } ktor-server-caching-headers-jvm = { module = "io.ktor:ktor-server-caching-headers-jvm", version.ref = "ktorVersion"} ktor-server-call-id = { module = "io.ktor:ktor-server-call-id", version.ref = "ktorVersion" } ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktorVersion" } +ktor-server-compression-jvm = { module = "io.ktor:ktor-server-compression-jvm", version.ref = "ktorVersion" } ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktorVersion" } ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktorVersion" } ktor-server-core-jvm = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktorVersion" } @@ -64,7 +65,6 @@ ktor-server-netty-jvm = { module = "io.ktor:ktor-server-netty-jvm", version.ref ktor-server-request-validation = { module = "io.ktor:ktor-server-auth", version.ref = "ktorVersion" } ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktorVersion" } ktor-server-swagger = { module = "io.ktor:ktor-server-swagger", version.ref = "ktorVersion" } -ktor-server-compression-jvm = { module = "io.ktor:ktor-server-compression-jvm", version.ref = "ktorVersion" } ktor-server-test-host = { module = "io.ktor:ktor-server-test-host", version.ref = "ktorVersion" } # Exposed From 6762c4889e1df7c4cc748ff4e6f9124ab158477b Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Wed, 5 Mar 2025 14:48:48 +0100 Subject: [PATCH 05/12] =?UTF-8?q?Tar=20inn=20oppgraderingane=20fr=C3=A5=20?= =?UTF-8?q?main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a20905680..232cb81379 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,23 @@ [versions] kotlinVersion = "2.1.10" -kotlinKspVersion = "2.1.10-1.0.29" # TODO: Denne er kombinasjon av kotlinVersion og kspVersion. Har ikkje funne ein måte å slå saman desse to automatisk på -ktorVersion = "3.0.2" +kotlinKspVersion = "2.1.10-1.0.31" # TODO: Denne er kombinasjon av kotlinVersion og kspVersion. Har ikkje funne ein måte å slå saman desse to automatisk på +ktorVersion = "3.1.1" assertJVersion = "3.27.3" commonsCodecVersion = "1.18.0" -commonVersion = "1.8.7" -exposedVersion = "0.58.0" -flywayVersion = "11.2.0" +commonVersion = "1.8.8" +exposedVersion = "0.60.0" +flywayVersion = "11.3.4" hamkrestVersion = "1.8.0.1" hikariVersion = "6.2.1" -jacksonJsr310Version = "2.18.2" -jupiterVersion = "5.11.3" +jacksonJsr310Version = "2.18.3" +jupiterVersion = "5.12.0" kotlinxHtmlVersion = "0.12.0" kspKctVersion = "0.7.0" -logbackVersion = "1.5.16" +logbackVersion = "1.5.17" logstashVersion = "8.0" -micrometerVersion = "1.14.1" -mockkVersion = "1.13.13" +micrometerVersion = "1.14.4" +mockkVersion = "1.13.17" postgresqlVersion = "42.7.3" testcontainersPostgresqlVersion = "1.20.5" unleashVersion = "10.0.2" From 471c3e9ff057464f281b1e587425a5e9ed138106 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Wed, 5 Mar 2025 15:15:11 +0100 Subject: [PATCH 06/12] Tar inn igjen junit-fiksen --- brevbaker-dsl/build.gradle.kts | 1 + etterlattemaler/build.gradle.kts | 1 + gradle/libs.versions.toml | 2 ++ pensjon-brevbaker/build.gradle.kts | 1 + pensjonsmaler/build.gradle.kts | 1 + skribenten-backend/build.gradle.kts | 1 + template-model-generator/build.gradle.kts | 1 + 7 files changed, 8 insertions(+) diff --git a/brevbaker-dsl/build.gradle.kts b/brevbaker-dsl/build.gradle.kts index 20b69a69f7..bc90ec89c7 100644 --- a/brevbaker-dsl/build.gradle.kts +++ b/brevbaker-dsl/build.gradle.kts @@ -28,6 +28,7 @@ dependencies { testImplementation(libs.junit.jupiter) testImplementation(libs.hamkrest) testImplementation(kotlin("reflect")) + testRuntimeOnly(libs.junit.platform.launcher) } kotlin { diff --git a/etterlattemaler/build.gradle.kts b/etterlattemaler/build.gradle.kts index 71075d7f60..e13b1411e0 100644 --- a/etterlattemaler/build.gradle.kts +++ b/etterlattemaler/build.gradle.kts @@ -29,6 +29,7 @@ dependencies { // JUnit 5 testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) + testRuntimeOnly(libs.junit.platform.launcher) testImplementation(libs.mockk) testImplementation(testFixtures(project(":brevbaker"))) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 232cb81379..52eb1454d5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,6 +11,7 @@ flywayVersion = "11.3.4" hamkrestVersion = "1.8.0.1" hikariVersion = "6.2.1" jacksonJsr310Version = "2.18.3" +junitPlatformVersion = "1.12.0" jupiterVersion = "5.12.0" kotlinxHtmlVersion = "0.12.0" kspKctVersion = "0.7.0" @@ -85,6 +86,7 @@ junit-bom = { module = "org.junit:junit-bom", version.ref = "jupiterVersion" } junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "jupiterVersion" } junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiterVersion" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiterVersion" } +junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatformVersion" } kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" } mockk = { module = "io.mockk:mockk", version.ref = "mockkVersion" } testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainersPostgresqlVersion"} diff --git a/pensjon-brevbaker/build.gradle.kts b/pensjon-brevbaker/build.gradle.kts index 2a5ee7c5f9..aa275507ef 100644 --- a/pensjon-brevbaker/build.gradle.kts +++ b/pensjon-brevbaker/build.gradle.kts @@ -132,6 +132,7 @@ dependencies { // JUnit 5 testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) + testRuntimeOnly(libs.junit.platform.launcher) testImplementation(libs.hamkrest) testImplementation(libs.ktor.server.test.host) testImplementation(libs.mockk) diff --git a/pensjonsmaler/build.gradle.kts b/pensjonsmaler/build.gradle.kts index b4404d5cbd..268cae62b7 100644 --- a/pensjonsmaler/build.gradle.kts +++ b/pensjonsmaler/build.gradle.kts @@ -27,6 +27,7 @@ dependencies { testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) + testRuntimeOnly(libs.junit.platform.launcher) testImplementation(testFixtures(project(":brevbaker"))) } diff --git a/skribenten-backend/build.gradle.kts b/skribenten-backend/build.gradle.kts index e1fe422820..8f47447129 100644 --- a/skribenten-backend/build.gradle.kts +++ b/skribenten-backend/build.gradle.kts @@ -113,6 +113,7 @@ dependencies { // Test testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) + testRuntimeOnly(libs.junit.platform.launcher) testImplementation(libs.ktor.server.test.host) testImplementation(libs.ktor.client.mock) testImplementation(libs.mockk) diff --git a/template-model-generator/build.gradle.kts b/template-model-generator/build.gradle.kts index c384c16453..64bd04911e 100644 --- a/template-model-generator/build.gradle.kts +++ b/template-model-generator/build.gradle.kts @@ -44,6 +44,7 @@ dependencies { implementation(project(":brevbaker-dsl")) testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.platform.launcher) // Byttet til fork som støtter kotlin > 2.0 // testImplementation("com.github.tschuchortdev:kotlin-compile-testing-ksp:1.6.0") testImplementation(libs.ksp.kotlin.compile.testing) From 7daf10c371b7f29224f86617f81517aa079ca9aa Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Thu, 6 Mar 2025 08:54:29 +0100 Subject: [PATCH 07/12] =?UTF-8?q?Bruker=20bundle=20for=20junit,=20for=20?= =?UTF-8?q?=C3=A5=20unng=C3=A5=20=C3=A5=20ha=20platform-launcher-workaroun?= =?UTF-8?q?d=20overalt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- brevbaker-dsl/build.gradle.kts | 4 +--- etterlattemaler/build.gradle.kts | 4 +--- gradle/libs.versions.toml | 12 +++++------- pensjon-brevbaker/build.gradle.kts | 4 +--- pensjonsmaler/build.gradle.kts | 4 +--- skribenten-backend/build.gradle.kts | 4 +--- template-model-generator/build.gradle.kts | 4 +--- 7 files changed, 11 insertions(+), 25 deletions(-) diff --git a/brevbaker-dsl/build.gradle.kts b/brevbaker-dsl/build.gradle.kts index bc90ec89c7..4b01abb8d3 100644 --- a/brevbaker-dsl/build.gradle.kts +++ b/brevbaker-dsl/build.gradle.kts @@ -24,11 +24,9 @@ dependencies { implementation(libs.brevbaker.common) // JUnit 5 - testImplementation(platform(libs.junit.bom)) - testImplementation(libs.junit.jupiter) + testImplementation(libs.bundles.junit) testImplementation(libs.hamkrest) testImplementation(kotlin("reflect")) - testRuntimeOnly(libs.junit.platform.launcher) } kotlin { diff --git a/etterlattemaler/build.gradle.kts b/etterlattemaler/build.gradle.kts index e13b1411e0..ad057704e4 100644 --- a/etterlattemaler/build.gradle.kts +++ b/etterlattemaler/build.gradle.kts @@ -27,9 +27,7 @@ dependencies { } // JUnit 5 - testImplementation(platform(libs.junit.bom)) - testImplementation(libs.junit.jupiter) - testRuntimeOnly(libs.junit.platform.launcher) + testImplementation(libs.bundles.junit) testImplementation(libs.mockk) testImplementation(testFixtures(project(":brevbaker"))) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52eb1454d5..200025ab1f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,6 @@ flywayVersion = "11.3.4" hamkrestVersion = "1.8.0.1" hikariVersion = "6.2.1" jacksonJsr310Version = "2.18.3" -junitPlatformVersion = "1.12.0" jupiterVersion = "5.12.0" kotlinxHtmlVersion = "0.12.0" kspKctVersion = "0.7.0" @@ -82,13 +81,12 @@ flyway-database-postgresql = { module = "org.flywaydb:flyway-database-postgresql # Test assertJ = { module = "org.assertj:assertj-core", version.ref = "assertJVersion" } hamkrest = { module = "com.natpryce:hamkrest", version.ref = "hamkrestVersion" } -junit-bom = { module = "org.junit:junit-bom", version.ref = "jupiterVersion" } -junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "jupiterVersion" } -junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiterVersion" } -junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiterVersion" } -junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatformVersion" } +junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "jupiterVersion" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "jupiterVersion" } +junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version = "1.12.0" } kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" } mockk = { module = "io.mockk:mockk", version.ref = "mockkVersion" } testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainersPostgresqlVersion"} -[bundles] \ No newline at end of file +[bundles] +junit = ["junit-jupiter", "junit-platform-launcher"] \ No newline at end of file diff --git a/pensjon-brevbaker/build.gradle.kts b/pensjon-brevbaker/build.gradle.kts index aa275507ef..63763a1710 100644 --- a/pensjon-brevbaker/build.gradle.kts +++ b/pensjon-brevbaker/build.gradle.kts @@ -130,9 +130,7 @@ dependencies { implementation(libs.micrometer.prometheus) // JUnit 5 - testImplementation(platform(libs.junit.bom)) - testImplementation(libs.junit.jupiter) - testRuntimeOnly(libs.junit.platform.launcher) + testImplementation(libs.bundles.junit) testImplementation(libs.hamkrest) testImplementation(libs.ktor.server.test.host) testImplementation(libs.mockk) diff --git a/pensjonsmaler/build.gradle.kts b/pensjonsmaler/build.gradle.kts index 268cae62b7..01c3a4db19 100644 --- a/pensjonsmaler/build.gradle.kts +++ b/pensjonsmaler/build.gradle.kts @@ -25,9 +25,7 @@ dependencies { api("no.nav.pensjon.brev:pensjon-brevbaker-api-model:$apiModelVersion") - testImplementation(platform(libs.junit.bom)) - testImplementation(libs.junit.jupiter) - testRuntimeOnly(libs.junit.platform.launcher) + testImplementation(libs.bundles.junit) testImplementation(testFixtures(project(":brevbaker"))) } diff --git a/skribenten-backend/build.gradle.kts b/skribenten-backend/build.gradle.kts index 8f47447129..c6b58e21ce 100644 --- a/skribenten-backend/build.gradle.kts +++ b/skribenten-backend/build.gradle.kts @@ -111,9 +111,7 @@ dependencies { implementation(libs.ktor.server.caching.headers.jvm) // Test - testImplementation(platform(libs.junit.bom)) - testImplementation(libs.junit.jupiter) - testRuntimeOnly(libs.junit.platform.launcher) + testImplementation(libs.bundles.junit) testImplementation(libs.ktor.server.test.host) testImplementation(libs.ktor.client.mock) testImplementation(libs.mockk) diff --git a/template-model-generator/build.gradle.kts b/template-model-generator/build.gradle.kts index 64bd04911e..c04310572f 100644 --- a/template-model-generator/build.gradle.kts +++ b/template-model-generator/build.gradle.kts @@ -43,11 +43,9 @@ dependencies { implementation(libs.ksp.symbol.processing.api) implementation(project(":brevbaker-dsl")) - testImplementation(libs.junit.jupiter.api) - testRuntimeOnly(libs.junit.platform.launcher) + testImplementation(libs.bundles.junit) // Byttet til fork som støtter kotlin > 2.0 // testImplementation("com.github.tschuchortdev:kotlin-compile-testing-ksp:1.6.0") testImplementation(libs.ksp.kotlin.compile.testing) testImplementation(libs.hamkrest) - testRuntimeOnly(libs.junit.jupiter.engine) } From ab538a27e0896173e590b766cc562bdcd5283ded Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Thu, 6 Mar 2025 08:57:44 +0100 Subject: [PATCH 08/12] =?UTF-8?q?Innf=C3=B8rer=20bundle=20ogs=C3=A5=20for?= =?UTF-8?q?=20metrics,=20her=20er=20det=20jo=20dei=20samme=20tre=20avhengn?= =?UTF-8?q?adane=20vi=20bruker=20overalt,=20s=C3=A5=20gjer=20det=20enklare?= =?UTF-8?q?=20for=20oss=20sj=C3=B8lve=20ved=20=C3=A5=20kun=20deklarere=20d?= =?UTF-8?q?ei=20her?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 3 ++- pdf-bygger/build.gradle.kts | 5 +---- pensjon-brevbaker/build.gradle.kts | 5 +---- skribenten-backend/build.gradle.kts | 4 +--- tjenestebuss-integrasjon/build.gradle.kts | 6 +----- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 200025ab1f..bbd91c2149 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -89,4 +89,5 @@ mockk = { module = "io.mockk:mockk", version.ref = "mockkVersion" } testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainersPostgresqlVersion"} [bundles] -junit = ["junit-jupiter", "junit-platform-launcher"] \ No newline at end of file +junit = ["junit-jupiter", "junit-platform-launcher"] +metrics = ["micrometer-prometheus", "ktor-server-metrics", "ktor-server-metrics-micrometer"] \ No newline at end of file diff --git a/pdf-bygger/build.gradle.kts b/pdf-bygger/build.gradle.kts index fde74c7656..baf2f22e9a 100644 --- a/pdf-bygger/build.gradle.kts +++ b/pdf-bygger/build.gradle.kts @@ -39,10 +39,7 @@ dependencies { implementation(libs.logback.encoder) implementation(libs.ktor.server.compression.jvm) - // Metrics - implementation(libs.ktor.server.metrics) - implementation(libs.ktor.server.metrics.micrometer) - implementation(libs.micrometer.prometheus) + implementation(libs.bundles.metrics) implementation(project(":brevbaker-dsl")) implementation(libs.brevbaker.common) diff --git a/pensjon-brevbaker/build.gradle.kts b/pensjon-brevbaker/build.gradle.kts index 63763a1710..0d901e2c98 100644 --- a/pensjon-brevbaker/build.gradle.kts +++ b/pensjon-brevbaker/build.gradle.kts @@ -124,10 +124,7 @@ dependencies { implementation(libs.unleash) - // Metrics - implementation(libs.ktor.server.metrics) - implementation(libs.ktor.server.metrics.micrometer) - implementation(libs.micrometer.prometheus) + implementation(libs.bundles.metrics) // JUnit 5 testImplementation(libs.bundles.junit) diff --git a/skribenten-backend/build.gradle.kts b/skribenten-backend/build.gradle.kts index c6b58e21ce..3c0d39e2e4 100644 --- a/skribenten-backend/build.gradle.kts +++ b/skribenten-backend/build.gradle.kts @@ -105,9 +105,7 @@ dependencies { implementation(libs.commons.codec) // Metrics - implementation(libs.ktor.server.metrics) - implementation(libs.ktor.server.metrics.micrometer) - implementation(libs.micrometer.prometheus) + implementation(libs.bundles.metrics) implementation(libs.ktor.server.caching.headers.jvm) // Test diff --git a/tjenestebuss-integrasjon/build.gradle.kts b/tjenestebuss-integrasjon/build.gradle.kts index e2dee87256..d183d70bec 100644 --- a/tjenestebuss-integrasjon/build.gradle.kts +++ b/tjenestebuss-integrasjon/build.gradle.kts @@ -59,11 +59,7 @@ dependencies { implementation("org.apache.cxf:cxf-rt-ws-policy:$cxfVersion") implementation("org.apache.cxf:cxf-rt-transports-http:$cxfVersion") - // Metrics - implementation(libs.ktor.server.metrics) - implementation(libs.ktor.server.metrics.micrometer) - implementation(libs.micrometer.prometheus) - + implementation(libs.bundles.metrics) // Test testImplementation(libs.junit.jupiter) From 8cca783817c75902f078ab933325c8fece4c4e16 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Thu, 6 Mar 2025 09:06:26 +0100 Subject: [PATCH 09/12] =?UTF-8?q?Logging=20gjer=20vi=20ogs=C3=A5=20alltid?= =?UTF-8?q?=20med=20kombinasjonen=20classic=20og=20encoder,=20s=C3=A5=20gj?= =?UTF-8?q?er=20om=20dei=20ogs=C3=A5=20til=20bundle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- brevbaker/build.gradle.kts | 2 +- gradle/libs.versions.toml | 1 + pdf-bygger/build.gradle.kts | 3 +-- pensjon-brevbaker/build.gradle.kts | 3 +-- skribenten-backend/build.gradle.kts | 4 +--- tjenestebuss-integrasjon/build.gradle.kts | 3 +-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/brevbaker/build.gradle.kts b/brevbaker/build.gradle.kts index 8a443bc894..94ff3fc16b 100644 --- a/brevbaker/build.gradle.kts +++ b/brevbaker/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { testFixturesImplementation(libs.ktor.client.encoding) testFixturesImplementation(libs.ktor.server.call.id) - testFixturesImplementation(libs.logback.encoder) + testFixturesImplementation(libs.bundles.logging) testFixturesImplementation(libs.jackson.datatype.jsr310) { because("we require deserialization/serialization of java.time.LocalDate") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bbd91c2149..976e5c82a8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -90,4 +90,5 @@ testcontainers-postgresql = { module = "org.testcontainers:postgresql", version. [bundles] junit = ["junit-jupiter", "junit-platform-launcher"] +logging = ["logback-classic", "logback-encoder"] metrics = ["micrometer-prometheus", "ktor-server-metrics", "ktor-server-metrics-micrometer"] \ No newline at end of file diff --git a/pdf-bygger/build.gradle.kts b/pdf-bygger/build.gradle.kts index baf2f22e9a..71df1a7533 100644 --- a/pdf-bygger/build.gradle.kts +++ b/pdf-bygger/build.gradle.kts @@ -28,7 +28,7 @@ tasks { dependencies { implementation(kotlin("stdlib")) - implementation(libs.logback.classic) + implementation(libs.bundles.logging) implementation(libs.ktor.serialization.jackson) implementation(libs.ktor.server.call.id) implementation(libs.ktor.server.call.logging) @@ -36,7 +36,6 @@ dependencies { implementation(libs.ktor.server.core) implementation(libs.ktor.server.netty) implementation(libs.ktor.server.status.pages) - implementation(libs.logback.encoder) implementation(libs.ktor.server.compression.jvm) implementation(libs.bundles.metrics) diff --git a/pensjon-brevbaker/build.gradle.kts b/pensjon-brevbaker/build.gradle.kts index 0d901e2c98..da1d5795e9 100644 --- a/pensjon-brevbaker/build.gradle.kts +++ b/pensjon-brevbaker/build.gradle.kts @@ -97,7 +97,7 @@ kotlin { dependencies { implementation(kotlin("stdlib")) - implementation(libs.logback.classic) + implementation(libs.bundles.logging) implementation(libs.ktor.client.cio) implementation(libs.ktor.client.content.negotiation) implementation(libs.ktor.serialization.jackson) @@ -111,7 +111,6 @@ dependencies { implementation(libs.ktor.server.status.pages) implementation(libs.ktor.server.swagger) implementation(libs.ktor.client.encoding) - implementation(libs.logback.encoder) implementation(project(":pensjonsmaler")) implementation(project(":etterlattemaler")) diff --git a/skribenten-backend/build.gradle.kts b/skribenten-backend/build.gradle.kts index 3c0d39e2e4..4ad6658a2f 100644 --- a/skribenten-backend/build.gradle.kts +++ b/skribenten-backend/build.gradle.kts @@ -94,9 +94,7 @@ dependencies { // Domenemodell implementation(libs.brevbaker.common) - // Logging - implementation(libs.logback.classic) - implementation(libs.logback.encoder) + implementation(libs.bundles.logging) // Necessary for java.time.LocalDate implementation(libs.jackson.datatype.jsr310) diff --git a/tjenestebuss-integrasjon/build.gradle.kts b/tjenestebuss-integrasjon/build.gradle.kts index d183d70bec..5a0e6c947b 100644 --- a/tjenestebuss-integrasjon/build.gradle.kts +++ b/tjenestebuss-integrasjon/build.gradle.kts @@ -45,8 +45,7 @@ dependencies { implementation(libs.ktor.server.auth.jwt) implementation(libs.ktor.client.cio) implementation(libs.ktor.client.content.negotiation) - implementation(libs.logback.classic) - implementation(libs.logback.encoder) + implementation(libs.bundles.logging) implementation("no.nav.tjenestespesifikasjoner:samhandler-tjenestespesifikasjon:$tjenestespesifikasjonerVersion") From fb84fc08aeac125cfdab9c39bbef63443026b16a Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Thu, 6 Mar 2025 12:21:32 +0100 Subject: [PATCH 10/12] =?UTF-8?q?Sm=C3=A5endringar=20etter=20QA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- brevbaker/build.gradle.kts | 2 +- etterlattemaler/build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 ++-- pdf-bygger/build.gradle.kts | 4 ++-- pensjon-brevbaker/build.gradle.kts | 4 ++-- skribenten-backend/build.gradle.kts | 4 ++-- tjenestebuss-integrasjon/build.gradle.kts | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/brevbaker/build.gradle.kts b/brevbaker/build.gradle.kts index 94ff3fc16b..896551d50f 100644 --- a/brevbaker/build.gradle.kts +++ b/brevbaker/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { testFixturesImplementation(libs.ktor.client.cio) testFixturesImplementation(libs.ktor.client.content.negotiation) testFixturesImplementation(libs.ktor.client.encoding) - testFixturesImplementation(libs.ktor.server.call.id) + testFixturesImplementation(libs.ktor.server.callId) testFixturesImplementation(libs.bundles.logging) diff --git a/etterlattemaler/build.gradle.kts b/etterlattemaler/build.gradle.kts index ad057704e4..508f51915a 100644 --- a/etterlattemaler/build.gradle.kts +++ b/etterlattemaler/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { testImplementation(libs.mockk) testImplementation(testFixtures(project(":brevbaker"))) - testImplementation(libs.ktor.server.call.id) + testImplementation(libs.ktor.server.callId) } tasks.test { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 976e5c82a8..e0c52488c0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,8 +51,8 @@ ktor-server-auth = { module = "io.ktor:ktor-server-auth", version.ref = "ktorVer ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt", version.ref = "ktorVersion" } ktor-server-caching-headers = { module = "io.ktor:ktor-server-caching-headers", version.ref = "ktorVersion" } ktor-server-caching-headers-jvm = { module = "io.ktor:ktor-server-caching-headers-jvm", version.ref = "ktorVersion"} -ktor-server-call-id = { module = "io.ktor:ktor-server-call-id", version.ref = "ktorVersion" } -ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktorVersion" } +ktor-server-callId = { module = "io.ktor:ktor-server-call-id", version.ref = "ktorVersion" } +ktor-server-callLogging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktorVersion" } ktor-server-compression-jvm = { module = "io.ktor:ktor-server-compression-jvm", version.ref = "ktorVersion" } ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktorVersion" } ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktorVersion" } diff --git a/pdf-bygger/build.gradle.kts b/pdf-bygger/build.gradle.kts index 71df1a7533..f3bd3dcd2d 100644 --- a/pdf-bygger/build.gradle.kts +++ b/pdf-bygger/build.gradle.kts @@ -30,8 +30,8 @@ dependencies { implementation(kotlin("stdlib")) implementation(libs.bundles.logging) implementation(libs.ktor.serialization.jackson) - implementation(libs.ktor.server.call.id) - implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.callId) + implementation(libs.ktor.server.callLogging) implementation(libs.ktor.server.content.negotiation) implementation(libs.ktor.server.core) implementation(libs.ktor.server.netty) diff --git a/pensjon-brevbaker/build.gradle.kts b/pensjon-brevbaker/build.gradle.kts index da1d5795e9..90afa8e48f 100644 --- a/pensjon-brevbaker/build.gradle.kts +++ b/pensjon-brevbaker/build.gradle.kts @@ -103,8 +103,8 @@ dependencies { implementation(libs.ktor.serialization.jackson) implementation(libs.ktor.server.auth) implementation(libs.ktor.server.auth.jwt) - implementation(libs.ktor.server.call.id) - implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.callId) + implementation(libs.ktor.server.callLogging) implementation(libs.ktor.server.content.negotiation) implementation(libs.ktor.server.core) implementation(libs.ktor.server.netty) diff --git a/skribenten-backend/build.gradle.kts b/skribenten-backend/build.gradle.kts index 4ad6658a2f..42db70893c 100644 --- a/skribenten-backend/build.gradle.kts +++ b/skribenten-backend/build.gradle.kts @@ -65,8 +65,8 @@ dependencies { implementation(libs.ktor.serialization.jackson) implementation(libs.ktor.server.auth) implementation(libs.ktor.server.auth.jwt) - implementation(libs.ktor.server.call.id) - implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.callId) + implementation(libs.ktor.server.callLogging) implementation(libs.ktor.server.content.negotiation) implementation(libs.ktor.server.core.jvm) implementation(libs.ktor.server.cors) diff --git a/tjenestebuss-integrasjon/build.gradle.kts b/tjenestebuss-integrasjon/build.gradle.kts index 5a0e6c947b..037deacc9d 100644 --- a/tjenestebuss-integrasjon/build.gradle.kts +++ b/tjenestebuss-integrasjon/build.gradle.kts @@ -35,8 +35,8 @@ val cxfVersion = "3.6.3" val tjenestespesifikasjonerVersion = "1.858e92e" dependencies { implementation(libs.ktor.serialization.jackson) - implementation(libs.ktor.server.call.id) - implementation(libs.ktor.server.call.logging) + implementation(libs.ktor.server.callId) + implementation(libs.ktor.server.callLogging) implementation(libs.ktor.server.content.negotiation) implementation(libs.ktor.server.core.jvm) implementation(libs.ktor.server.netty.jvm) From 094add95f17e201ae3f78c2efb0b4253fd4af729 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Thu, 6 Mar 2025 12:22:54 +0100 Subject: [PATCH 11/12] =?UTF-8?q?Treng=20ikkje=20=C3=A5=20ha=20jackson-jsr?= =?UTF-8?q?-avhengnaden=20der=20vi=20har=20malane?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etterlattemaler/build.gradle.kts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/etterlattemaler/build.gradle.kts b/etterlattemaler/build.gradle.kts index 508f51915a..7dda2dba19 100644 --- a/etterlattemaler/build.gradle.kts +++ b/etterlattemaler/build.gradle.kts @@ -21,11 +21,6 @@ dependencies { implementation(project(":brevbaker")) ksp(project(":template-model-generator")) - - implementation(libs.jackson.datatype.jsr310) { - because("we require deserialization/serialization of java.time.LocalDate") - } - // JUnit 5 testImplementation(libs.bundles.junit) testImplementation(libs.mockk) From a6bd30252124f6fbfac896d9b62a2d5e9734c744 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Thu, 6 Mar 2025 12:27:06 +0100 Subject: [PATCH 12/12] =?UTF-8?q?Revert=20"Treng=20ikkje=20=C3=A5=20ha=20j?= =?UTF-8?q?ackson-jsr-avhengnaden=20der=20vi=20har=20malane"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 094add95f17e201ae3f78c2efb0b4253fd4af729. --- etterlattemaler/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etterlattemaler/build.gradle.kts b/etterlattemaler/build.gradle.kts index 7dda2dba19..508f51915a 100644 --- a/etterlattemaler/build.gradle.kts +++ b/etterlattemaler/build.gradle.kts @@ -21,6 +21,11 @@ dependencies { implementation(project(":brevbaker")) ksp(project(":template-model-generator")) + + implementation(libs.jackson.datatype.jsr310) { + because("we require deserialization/serialization of java.time.LocalDate") + } + // JUnit 5 testImplementation(libs.bundles.junit) testImplementation(libs.mockk)