Merge pull request #96 from navikt/dependabot/gradle/all-dependencies-f12ea1a956

Bump the all-dependencies group across 1 directory with 15 updates

Author: olekvernberg

build.gradle.kts

@@ -1,18 +1,18 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val mockkVersion = "1.13.9"
+val mockkVersion = "1.13.11"
 val tokenSupportVersion = "3.2.0"
-val springdocVersion = "1.7.0"
+val springdocVersion = "1.8.0"
 val navFoedselsnummerVersion = "1.0-SNAPSHOT.6"
-val kontrakterVersion = "3.0_20240116082529_ee44807"
+val kontrakterVersion = "3.0_20240515103524_00490ae"
 val mainClass = "no.nav.familie.ef.infotrygd.Main"
 val ktlint by configurations.creating
 
 plugins {
-    val kotlinVersion = "1.9.22"
-    val springBootVersion = "3.2.1"
+    val kotlinVersion = "2.0.0"
+    val springBootVersion = "3.2.6"
     id("org.springframework.boot") version springBootVersion
-    id("io.spring.dependency-management") version "1.1.4"
+    id("io.spring.dependency-management") version "1.1.5"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.spring") version kotlinVersion
     kotlin("plugin.jpa") version kotlinVersion
@@ -72,11 +72,11 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-jdbc")
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     runtimeOnly("org.postgresql:postgresql")
-    implementation("com.oracle.database.jdbc:ojdbc8:23.3.0.23.09")
+    implementation("com.oracle.database.jdbc:ojdbc8:23.4.0.24.05")
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.9.2")
-    testImplementation("org.testcontainers:oracle-xe:1.19.3")
+    testImplementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.9.3")
+    testImplementation("org.testcontainers:oracle-xe:1.19.8")
     testImplementation("com.h2database:h2")
     testImplementation("org.flywaydb:flyway-core")
     testImplementation("io.mockk:mockk-jvm:$mockkVersion")

src/main/kotlin/no/nav/familie/ef/infotrygd/config/JacksonJsonConfig.kt

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
-import com.fasterxml.jackson.module.kotlin.KotlinModule
+import com.fasterxml.jackson.module.kotlin.kotlinModule
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
@@ -23,7 +23,7 @@ class JacksonJsonConfig {
             OM.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY)
             OM.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
             OM.registerModule(JavaTimeModule())
-            OM.registerModule(KotlinModule())
+            OM.registerModule(kotlinModule())
         }
     }
 

src/main/kotlin/no/nav/familie/ef/infotrygd/rest/filter/AuthorizationFilter.kt

@@ -33,7 +33,7 @@ class AuthorizationFilter : OncePerRequestFilter() {
 
     private fun acceptedClient(): Boolean {
         return try {
-            val claims = SpringTokenValidationContextHolder().tokenValidationContext.getClaims("azure")
+            val claims = SpringTokenValidationContextHolder().getTokenValidationContext().getClaims("azure")
 
             @Suppress("UNCHECKED_CAST")
             val accessAsApplication =