diff --git a/apps/etterlatte-notifikasjoner/build.gradle.kts b/apps/etterlatte-notifikasjoner/build.gradle.kts index fad4e63c..a4b5ecb8 100644 --- a/apps/etterlatte-notifikasjoner/build.gradle.kts +++ b/apps/etterlatte-notifikasjoner/build.gradle.kts @@ -3,17 +3,14 @@ plugins { } dependencies { - implementation(libs.ktor.jackson) implementation(libs.rapidAndRivers) implementation(libs.brukernotifikasjonSchemas) { exclude("org.apache.commons", "commons-compress") } - implementation(libs.commons.compress) implementation(libs.kafka.avro.serializer) { exclude(group = "org.slf4j", module = "slf4j-log4j12") } - implementation(libs.kafka.clients) testImplementation(libs.mockk) } diff --git a/apps/etterlatte-proxy/build.gradle.kts b/apps/etterlatte-proxy/build.gradle.kts index 3425c870..aefa9a5a 100644 --- a/apps/etterlatte-proxy/build.gradle.kts +++ b/apps/etterlatte-proxy/build.gradle.kts @@ -10,19 +10,14 @@ repositories { dependencies { implementation(libs.ktor.serverAuth) - implementation(libs.ktor.clientCore) implementation(libs.ktor.callLogging) implementation(libs.ktor.clientApache) - implementation(libs.ktor.clientAuth) implementation(libs.ktor.clientLogging) implementation(libs.ktor.jackson) implementation(libs.ktor.serverContentNegotiation) implementation(libs.ktor.clientContentNegotiation) - implementation(libs.ktor.serverCore) implementation(libs.ktor.serverNetty) implementation(libs.ktor.serverAuthJwt) - implementation(libs.ktor.okHttp) - implementation(libs.navFellesTokenClientCore) implementation(libs.tjenestespesifikasjonerTilbakekreving) implementation(libs.tjenestespesifikasjonerOppdragSimulering) implementation(libs.cxf.logging) @@ -36,7 +31,6 @@ dependencies { exclude("org.eclipse.angus:angus-mail") } implementation(libs.micrometer.prometheus) - implementation(libs.jacksonDatatypejsr310) testImplementation(libs.mockOauth2Server) testImplementation(libs.ktor.serverTests) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a44f543e..5c9b9c1e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,6 @@ cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.10.0" } [versions] -navfelles-token-version = "5.0.1" ktor-version = "2.3.12" jupiter-version = "5.10.3" cxf-version = "4.0.5" # Obs: Når vi oppgraderer denne, bør vi også kunne rydde bort guava og guava-workarounden @@ -16,33 +15,23 @@ angus-version = "1.1.0" rapidAndRivers = { module = "com.github.navikt:rapids-and-rivers", version = "2024010209171704183456.6d035b91ffb4" } brukernotifikasjonSchemas = { module = "com.github.navikt:brukernotifikasjon-schemas", version = "2.5.2"} mockOauth2Server = { module = "no.nav.security:mock-oauth2-server", version = "2.1.8"} -navFellesTokenClientCore = { module = "no.nav.security:token-client-core", version.ref = "navfelles-token-version"} tjenestespesifikasjonerTilbakekreving = { module = "com.github.navikt.pensjon-etterlatte-tjenestespesifikasjoner:tilbakekreving-v1-tjenestespesifikasjon", version = "1.d27898d"} tjenestespesifikasjonerOppdragSimulering = { module = "com.github.navikt.pensjon-etterlatte-tjenestespesifikasjoner:nav-system-os-simuler-fp-service-tjenestespesifikasjon", version = "1.d27898d"} #Ktor ktor-callLogging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktor-version"} -ktor-clientCore = { module = "io.ktor:ktor-client-core", version.ref = "ktor-version"} ktor-clientApache = { module = "io.ktor:ktor-client-apache", version.ref = "ktor-version"} -ktor-clientAuth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor-version"} ktor-clientContentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor-version"} ktor-clientLogging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor-version" } ktor-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktor-version" } ktor-serverAuth = { module = "io.ktor:ktor-server-auth", version.ref = "ktor-version" } ktor-serverAuthJwt = { module = "io.ktor:ktor-server-auth-jwt", version.ref = "ktor-version" } -ktor-serverCore = { module = "io.ktor:ktor-server-core", version.ref = "ktor-version" } ktor-serverContentNegotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor-version" } ktor-serverNetty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor-version" } -ktor-okHttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor-version" } ktor-serverTests = { module = "io.ktor:ktor-server-tests", version.ref = "ktor-version" } -#Jackson -jacksonDatatypejsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version = "2.17.2" } - #Kafka -kafka-clients = { module = "org.apache.kafka:kafka-clients", version = "3.8.0"} kafka-avro-serializer = { module = "io.confluent:kafka-avro-serializer", version = "7.6.0"} -commons-compress = { module = "org.apache.commons:commons-compress", version = "1.26.2" } #Jupiter jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter-version" }