diff --git a/altinn/gradle.properties b/altinn/gradle.properties index 6133ebee8a..1f4f60ee09 100644 --- a/altinn/gradle.properties +++ b/altinn/gradle.properties @@ -1,2 +1,2 @@ mockwebserverVersion=5.0.0-alpha.14 -nimbusJoseJwtVersion=9.40 \ No newline at end of file +nimbusJoseJwtVersion=9.47 diff --git a/feil-behandler/gradle.properties b/feil-behandler/gradle.properties index 33dc05abb0..eaebc30646 100644 --- a/feil-behandler/gradle.properties +++ b/feil-behandler/gradle.properties @@ -1,6 +1,6 @@ # Dependency versions bakgrunnsjobbVersion=1.0.4 -flywayVersion=10.8.1 -hikariVersion=5.1.0 -postgresqlVersion=42.7.2 -testcontainersPostgresqlVersion=1.19.6 +flywayVersion=10.21.0 +hikariVersion=6.2.1 +postgresqlVersion=42.7.4 +testcontainersPostgresqlVersion=1.20.3 diff --git a/felles-db-exposed/build.gradle.kts b/felles-db-exposed/build.gradle.kts index 4f81d31acc..a240bc1c43 100644 --- a/felles-db-exposed/build.gradle.kts +++ b/felles-db-exposed/build.gradle.kts @@ -23,5 +23,6 @@ dependencies { testFixturesApi("io.kotest:kotest-assertions-core:$kotestVersion") testFixturesApi("io.kotest:kotest-runner-junit5:$kotestVersion") + testFixturesImplementation("org.flywaydb:flyway-database-postgresql:$flywayVersion") testFixturesImplementation("org.testcontainers:postgresql:$testcontainersPostgresqlVersion") } diff --git a/felles-db-exposed/gradle.properties b/felles-db-exposed/gradle.properties index e580e417fd..a2562c731e 100644 --- a/felles-db-exposed/gradle.properties +++ b/felles-db-exposed/gradle.properties @@ -1,6 +1,6 @@ # Dependency versions -exposedVersion=0.48.0 -flywayVersion=10.8.1 -hikariVersion=5.1.0 -postgresqlVersion=42.7.2 -testcontainersPostgresqlVersion=1.19.6 +exposedVersion=0.56.0 +flywayVersion=10.21.0 +hikariVersion=6.2.1 +postgresqlVersion=42.7.4 +testcontainersPostgresqlVersion=1.20.3 diff --git a/felles/build.gradle.kts b/felles/build.gradle.kts index 15674457d9..52beba70c4 100644 --- a/felles/build.gradle.kts +++ b/felles/build.gradle.kts @@ -1,5 +1,7 @@ +val hagDomeneInntektsmeldingVersion: String by project val kotestVersion: String by project val lettuceVersion: String by project +val micrometerPrometheusVersion: String by project val mockkVersion: String by project val prometheusVersion: String by project val rapidsAndRiversTestVersion: String by project @@ -16,11 +18,13 @@ dependencies { api("org.slf4j:slf4j-api:$slf4jVersion") implementation("io.lettuce:lettuce-core:$lettuceVersion") + implementation("io.micrometer:micrometer-registry-prometheus:$micrometerPrometheusVersion") implementation("io.prometheus:simpleclient_common:$prometheusVersion") - testFixturesApi("com.github.navikt:rapids-and-rivers:$rapidsAndRiversVersion") testFixturesApi("com.github.navikt.tbd-libs:rapids-and-rivers-test:$rapidsAndRiversTestVersion") + testFixturesApi("com.github.navikt:rapids-and-rivers:$rapidsAndRiversVersion") testFixturesApi("io.lettuce:lettuce-core:$lettuceVersion") + testFixturesApi("no.nav.helsearbeidsgiver:domene-inntektsmelding:$hagDomeneInntektsmeldingVersion") testFixturesImplementation("io.kotest:kotest-assertions-core:$kotestVersion") testFixturesImplementation("io.kotest:kotest-runner-junit5:$kotestVersion") diff --git a/felles/gradle.properties b/felles/gradle.properties index 3cc7eeb4f5..39fb6468e7 100644 --- a/felles/gradle.properties +++ b/felles/gradle.properties @@ -1,6 +1,7 @@ # Dependency versions -lettuceVersion=6.3.2.RELEASE +lettuceVersion=6.5.0.RELEASE +micrometerPrometheusVersion=1.14.1 prometheusVersion=0.16.0 rapidsAndRiversTestVersion=2024.09.23-08.33-8839f9a1 rapidsAndRiversVersion=2024082715011724763661.50d7efb40f0f -slf4jVersion=2.0.12 +slf4jVersion=2.0.16 diff --git a/gradle.properties b/gradle.properties index 0b608f612e..3a6c94277d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ kotlin.code.style=official # Plugin versions -kotlinVersion=2.0.0 +kotlinVersion=2.0.21 kotlinterVersion=4.4.0 # Dependency versions hagDomeneInntektsmeldingVersion=0.1.5 -junitJupiterVersion=5.10.3 +junitJupiterVersion=5.11.3 kotestVersion=5.9.1 -kotlinCoroutinesVersion=1.8.1 -kotlinSerializationVersion=1.7.1 +kotlinCoroutinesVersion=1.9.0 +kotlinSerializationVersion=1.7.3 ktorVersion=2.3.12 -mockkVersion=1.13.11 +mockkVersion=1.13.13 tokenProviderVersion=0.4.0 utilsVersion=0.9.0 diff --git a/integrasjonstest/gradle.properties b/integrasjonstest/gradle.properties index 72cb23d1e4..7eeec9503e 100644 --- a/integrasjonstest/gradle.properties +++ b/integrasjonstest/gradle.properties @@ -1,5 +1,5 @@ # Dependency versions bakgrunnsjobbVersion=1.0.4 -junitJupiterVersion=5.10.2 +junitJupiterVersion=5.11.3 testcontainersRedisJunitVersion=1.6.4 -testcontainersVersion=1.19.8 +testcontainersVersion=1.20.3