Ryddet i libs.version.toml

navikt · Oct 2, 2024 · 33d16a4 · 33d16a4
1 parent 51193a8
commit 33d16a4
Show file tree

Hide file tree

Showing 23 changed files with 329 additions and 329 deletions.
diff --git a/apps/api-start-stopp-perioder/build.gradle.kts b/apps/api-start-stopp-perioder/build.gradle.kts
@@ -25,40 +25,40 @@ dependencies {
     implementation(project(":lib:kafka-key-generator-client"))
     implementation(project(":domain:arbeidssoeker-regler"))
     implementation(libs.bundles.ktorServerWithNettyAndMicrometer)
-    implementation(libs.micrometerRegistryPrometheus)
-    implementation(libs.opentelemetryAnnotations)
-    implementation(libs.hopliteCore)
-    implementation(libs.hopliteToml)
-    implementation(libs.hopliteYaml)
-    implementation(libs.tokenValidationKtorV2)
-    implementation(libs.tokenClientCore)
-    implementation(libs.tokenClient)
-    implementation(libs.auditLog)
-    implementation(libs.log)
-    implementation(libs.tilgangClient)
-    implementation(libs.pawPdlClient)
+    implementation(libs.micrometer.registryPrometheus)
+    implementation(libs.opentelemetry.annotations)
+    implementation(libs.hoplite.core)
+    implementation(libs.hoplite.toml)
+    implementation(libs.hoplite.yaml)
+    implementation(libs.nav.security.tokenValidationKtorV2)
+    implementation(libs.nav.security.tokenClientCore)
+    implementation(libs.nav.common.tokenClient)
+    implementation(libs.nav.common.auditLog)
+    implementation(libs.nav.common.log)
+    implementation(libs.poao.tilgangClient)
+    implementation(libs.paw.pdl.client)
     implementation(libs.logbackClassic)
     implementation(libs.logstashLogbackEncoder)
-    implementation(libs.kafkaClients)
-    implementation(libs.ktorClientContentNegotiation)
-    implementation(libs.ktorClientCore)
-    implementation(libs.ktorClientCio)
-    implementation(libs.ktorServerCors)
-    implementation(libs.ktorServerSwagger)
-    implementation(libs.ktorServerCallId)
-    implementation(libs.ktorServerStatusPages)
-    implementation(libs.ktorServerContentNegotiation)
-    implementation(libs.ktorSerializationJvm)
-    implementation(libs.ktorSerializationJackson)
-    implementation(libs.jacksonDatatypeJsr310)
-    implementation(libs.ktorServerCoreJvm)
-    implementation(libs.ktorServerOpenapi)
-    testImplementation(libs.ktorServerTestsJvm)
-    testImplementation(libs.runnerJunit5)
-    testImplementation(libs.assertionsCore)
-    testImplementation(libs.testContainers)
-    testImplementation(libs.mockOauth2Server)
-    testImplementation(libs.mockk)
+    implementation(libs.paw.kafkaClients)
+    implementation(libs.ktor.client.contentNegotiation)
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.cio)
+    implementation(libs.ktor.server.cors)
+    implementation(libs.ktor.server.swagger)
+    implementation(libs.ktor.server.callId)
+    implementation(libs.ktor.server.statusPages)
+    implementation(libs.ktor.server.contentNegotiation)
+    implementation(libs.ktor.serialization.jvm)
+    implementation(libs.ktor.serialization.jackson)
+    implementation(libs.jackson.datatypeJsr310)
+    implementation(libs.ktor.server.coreJvm)
+    implementation(libs.ktor.server.openapi)
+    testImplementation(libs.ktor.server.testJvm)
+    testImplementation(libs.test.junit5.runner)
+    testImplementation(libs.test.kotest.assertionsCore)
+    testImplementation(libs.test.testContainers.core)
+    testImplementation(libs.test.mockOauth2Server)
+    testImplementation(libs.test.mockk.core)
 }
 sourceSets {
     main {

diff --git a/apps/bekreftelse-api/build.gradle.kts b/apps/bekreftelse-api/build.gradle.kts
@@ -22,52 +22,52 @@ dependencies {
 
     // Server
     implementation(libs.bundles.ktorServerWithNettyAndMicrometer)
-    implementation(libs.ktorServerContentNegotiation)
-    implementation(libs.ktorServerStatusPages)
-    implementation(libs.ktorServerCors)
-    implementation(libs.ktorServerCallId)
-    implementation(libs.ktorServerAuth)
+    implementation(libs.ktor.server.contentNegotiation)
+    implementation(libs.ktor.server.statusPages)
+    implementation(libs.ktor.server.cors)
+    implementation(libs.ktor.server.callId)
+    implementation(libs.ktor.server.auth)
 
     // Client
-    implementation(libs.ktorClientCore)
-    implementation(libs.ktorClientCio)
-    implementation(libs.ktorClientContentNegotiation)
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.cio)
+    implementation(libs.ktor.client.contentNegotiation)
 
     // Serialization
-    implementation(libs.ktorSerializationJackson)
-    implementation(libs.ktorSerializationJson)
-    implementation(libs.jacksonDatatypeJsr310)
+    implementation(libs.ktor.serialization.jackson)
+    implementation(libs.ktor.serialization.json)
+    implementation(libs.jackson.datatypeJsr310)
 
     // Authentication
-    implementation(libs.tokenValidationKtorV2)
+    implementation(libs.nav.security.tokenValidationKtorV2)
 
     // Authorization
-    implementation(libs.tilgangClient)
+    implementation(libs.poao.tilgangClient)
 
     // Documentation
-    implementation(libs.ktorServerOpenapi)
-    implementation(libs.ktorServerSwagger)
+    implementation(libs.ktor.server.openapi)
+    implementation(libs.ktor.server.swagger)
 
     // Logging
     implementation(libs.logbackClassic)
     implementation(libs.logstashLogbackEncoder)
-    implementation(libs.log)
-    implementation(libs.auditLog)
+    implementation(libs.nav.common.log)
+    implementation(libs.nav.common.auditLog)
 
     // Instrumentation
-    implementation(libs.micrometerRegistryPrometheus)
-    implementation(libs.opentelemetryApi)
-    implementation(libs.opentelemetryAnnotations)
+    implementation(libs.micrometer.registryPrometheus)
+    implementation(libs.opentelemetry.api)
+    implementation(libs.opentelemetry.annotations)
 
     // Kafka
-    implementation(libs.kafkaStreams)
-    implementation(libs.kafkaStreamsAvroSerde)
+    implementation(libs.kafka.streams.core)
+    implementation(libs.avro.kafkaStreamsSerde)
 
     // Test
-    testImplementation(libs.ktorServerTestsJvm)
-    testImplementation(libs.ktorClientMock)
+    testImplementation(libs.ktor.server.testJvm)
+    testImplementation(libs.ktor.client.mock)
     testImplementation(libs.bundles.testLibsWithUnitTesting)
-    testImplementation(libs.mockOauth2Server)
+    testImplementation(libs.test.mockOauth2Server)
 }
 
 java {

diff --git a/apps/bekreftelse-min-side-oppgaver/build.gradle.kts b/apps/bekreftelse-min-side-oppgaver/build.gradle.kts
@@ -16,21 +16,21 @@ dependencies {
     implementation(project(":domain:bekreftelse-interne-hendelser"))
     implementation(project(":lib:error-handling"))
     implementation(project(":domain:main-avro-schema"))
-    implementation(libs.jacksonDatatypeJsr310)
-    implementation(libs.jacksonKotlin)
+    implementation(libs.jackson.datatypeJsr310)
+    implementation(libs.jackson.kotlin)
     implementation(libs.arrowCore)
-    implementation(libs.hopliteYaml)
-    implementation(libs.log)
+    implementation(libs.hoplite.yaml)
+    implementation(libs.nav.common.log)
     implementation(libs.logbackClassic)
     implementation(libs.logstashLogbackEncoder)
-    implementation(libs.kafkaClients)
-    implementation(libs.kafkaStreams)
-    implementation(libs.avro)
-    implementation(libs.kafkaStreamsAvroSerde)
+    implementation(libs.paw.kafkaClients)
+    implementation(libs.kafka.streams.core)
+    implementation(libs.avro.core)
+    implementation(libs.avro.kafkaStreamsSerde)
     implementation(libs.bundles.ktorServerWithNettyAndMicrometer)
-    implementation(libs.micrometerRegistryPrometheus)
+    implementation(libs.micrometer.registryPrometheus)
     implementation("no.nav.tms.varsel:kotlin-builder:1.1.0")
-    testImplementation(libs.streamsTest)
+    testImplementation(libs.kafka.streams.test)
     testImplementation(libs.bundles.testLibsWithUnitTesting)
     testImplementation(project(":lib:kafka-key-generator-client"))
     testImplementation(project(":test:test-data-lib"))

diff --git a/apps/bekreftelse-tjeneste/build.gradle.kts b/apps/bekreftelse-tjeneste/build.gradle.kts
@@ -25,30 +25,30 @@ dependencies {
     implementation(libs.bundles.ktorServerWithNettyAndMicrometer)
 
     // Serialization
-    implementation(libs.ktorSerializationJackson)
-    implementation(libs.ktorSerializationJson)
-    implementation(libs.jacksonDatatypeJsr310)
+    implementation(libs.ktor.serialization.jackson)
+    implementation(libs.ktor.serialization.json)
+    implementation(libs.jackson.datatypeJsr310)
 
     // Tooling
     implementation(libs.arrowCore)
 
     // Logging
     implementation(libs.logbackClassic)
     implementation(libs.logstashLogbackEncoder)
-    implementation(libs.log)
-    implementation(libs.auditLog)
+    implementation(libs.nav.common.log)
+    implementation(libs.nav.common.auditLog)
 
     // Instrumentation
-    implementation(libs.micrometerRegistryPrometheus)
-    implementation(libs.opentelemetryAnnotations)
+    implementation(libs.micrometer.registryPrometheus)
+    implementation(libs.opentelemetry.annotations)
 
     // Kafka
-    implementation(libs.kafkaStreams)
-    implementation(libs.kafkaStreamsAvroSerde)
+    implementation(libs.kafka.streams.core)
+    implementation(libs.avro.kafkaStreamsSerde)
 
     // Testing
-    testImplementation(libs.ktorServerTestsJvm)
-    testImplementation(libs.streamsTest)
+    testImplementation(libs.ktor.server.testJvm)
+    testImplementation(libs.kafka.streams.test)
     testImplementation(libs.bundles.testLibsWithUnitTesting)
     testImplementation(project(":test:test-data-lib"))
 }

diff --git a/apps/hendelselogg-backup/build.gradle.kts b/apps/hendelselogg-backup/build.gradle.kts
@@ -23,46 +23,46 @@ dependencies {
 
     implementation(libs.arrowCore)
     implementation(libs.bundles.ktorServerWithNettyAndMicrometer)
-    implementation(libs.ktorServerCors)
-    implementation(libs.ktorServerSwagger)
-    implementation(libs.ktorServerCallId)
-    implementation(libs.ktorServerStatusPages)
-    implementation(libs.ktorServerContentNegotiation)
-    implementation(libs.ktorClientCore)
-    implementation(libs.ktorClientContentNegotiation)
-    implementation(libs.ktorSerializationJvm)
-    implementation(libs.ktorSerializationJackson)
-    implementation(libs.tokenValidationKtorV2)
-    implementation(libs.tokenClient)
-    implementation(libs.tokenClient)
-    implementation(libs.auditLog)
-    implementation(libs.log)
-
-    implementation(libs.micrometerRegistryPrometheus)
-    implementation(libs.opentelemetryAnnotations)
-    implementation(libs.hopliteCore)
-    implementation(libs.hopliteToml)
-    implementation(libs.auditLog)
-    implementation(libs.log)
+    implementation(libs.ktor.server.cors)
+    implementation(libs.ktor.server.swagger)
+    implementation(libs.ktor.server.callId)
+    implementation(libs.ktor.server.statusPages)
+    implementation(libs.ktor.server.contentNegotiation)
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.contentNegotiation)
+    implementation(libs.ktor.serialization.jvm)
+    implementation(libs.ktor.serialization.jackson)
+    implementation(libs.nav.security.tokenValidationKtorV2)
+    implementation(libs.nav.common.tokenClient)
+    implementation(libs.nav.common.tokenClient)
+    implementation(libs.nav.common.auditLog)
+    implementation(libs.nav.common.log)
+
+    implementation(libs.micrometer.registryPrometheus)
+    implementation(libs.opentelemetry.annotations)
+    implementation(libs.hoplite.core)
+    implementation(libs.hoplite.toml)
+    implementation(libs.nav.common.auditLog)
+    implementation(libs.nav.common.log)
     implementation(libs.logbackClassic)
     implementation(libs.logstashLogbackEncoder)
-    implementation(libs.kafkaClients)
-    implementation(libs.exposedCore)
-    implementation(libs.exposedJdbc)
-    implementation(libs.exposedJavaTime)
-    implementation(libs.postgresDriver)
-    implementation(libs.flywayCore)
-    implementation(libs.flywayPostgres)
-
-    implementation(libs.jacksonDatatypeJsr310)
-    implementation(libs.jacksonKotlin)
-
-    testImplementation(libs.runnerJunit5)
-    testImplementation(libs.assertionsCore)
-    testImplementation(libs.mockk)
-    testImplementation(libs.testContainers)
-    testImplementation(libs.postgresql)
-    testImplementation(libs.ktorServerTestsJvm)
+    implementation(libs.paw.kafkaClients)
+    implementation(libs.exposed.core)
+    implementation(libs.exposed.jdbc)
+    implementation(libs.exposed.javaTime)
+    implementation(libs.database.postgres.driver)
+    implementation(libs.database.flyway.core)
+    implementation(libs.database.flyway.postgres)
+
+    implementation(libs.jackson.datatypeJsr310)
+    implementation(libs.jackson.kotlin)
+
+    testImplementation(libs.test.junit5.runner)
+    testImplementation(libs.test.kotest.assertionsCore)
+    testImplementation(libs.test.mockk.core)
+    testImplementation(libs.test.testContainers.core)
+    testImplementation(libs.test.testContainers.postgresql)
+    testImplementation(libs.ktor.server.testJvm)
 }
 
 java {

diff --git a/apps/hendelseprosessor/build.gradle.kts b/apps/hendelseprosessor/build.gradle.kts
@@ -16,23 +16,23 @@ dependencies {
     implementation(project(":domain:main-avro-schema"))
     implementation(project(":lib:hoplite-config"))
 
-    implementation(libs.opentelemetryAnnotations)
-    implementation(libs.jacksonDatatypeJsr310)
-    implementation(libs.jacksonKotlin)
-    implementation(libs.log)
-    implementation(libs.kafkaClients)
-    implementation(libs.kafkaStreams)
-    implementation(libs.avro)
-    implementation(libs.kafkaStreamsAvroSerde)
-
-    implementation(libs.micrometerRegistryPrometheus)
-    implementation(libs.ktorServerCore)
+    implementation(libs.opentelemetry.annotations)
+    implementation(libs.jackson.datatypeJsr310)
+    implementation(libs.jackson.kotlin)
+    implementation(libs.nav.common.log)
+    implementation(libs.paw.kafkaClients)
+    implementation(libs.kafka.streams.core)
+    implementation(libs.avro.core)
+    implementation(libs.avro.kafkaStreamsSerde)
+
+    implementation(libs.micrometer.registryPrometheus)
+    implementation(libs.ktor.server.core)
     implementation(libs.bundles.ktorServerWithNettyAndMicrometer)
-    implementation(libs.ktorServerNetty)
-    implementation(libs.ktorServerCoreJvm)
+    implementation(libs.ktor.server.netty)
+    implementation(libs.ktor.server.coreJvm)
 
-    testImplementation(libs.runnerJunit5)
-    testImplementation(libs.streamsTest)
+    testImplementation(libs.test.junit5.runner)
+    testImplementation(libs.kafka.streams.test)
 }
 
 java {