Springboot3

build.gradle.kts

@@ -7,22 +7,22 @@ val mockkVersion = "1.13.8"
 val wireMockVersion = "2.19.0"
 val filformatVersion = "1.2019.06.26-14.50-746e7610cb12"
 val micrometerRegistryVersion = "1.1.2"
-val tokenValidationVersion = "2.1.7"
+val tokenValidationVersion = "3.0.4"
 val jacksonVersion = "2.9.9"
-val springdocVersion = "1.6.15"
+val springdocVersion = "2.2.0"
 val navFoedselsnummerVersion = "1.0-SNAPSHOT.6"
 val skattKontraktVersjon = "2.0_20230214104704_706e9c0"
-val fellesVersjon = "1.20230116145510_2afcc20"
-val kontrakterVersjon = "2.0_20230313140330_0086324"
+val fellesVersjon = "2.20231023162434_fa320ce"
+val kontrakterVersjon = "3.0_20231109091547_fd2cae7"
 val coroutinesVersion = "1.6.4"
-val okhttp3Version = "4.9.3"
+val okhttp3Version = "5.0.0-alpha.11"
 
 val mainClass = "no.nav.familie.ba.infotrygd.Main"
 
 
 plugins {
     val kotlinVersion = "1.8.21"
-    val springBootVersion = "2.6.6"
+    val springBootVersion = "3.0.5"
     id("org.springframework.boot") version springBootVersion
     id("io.spring.dependency-management") version "1.1.0"
     kotlin("jvm") version kotlinVersion
@@ -43,6 +43,7 @@ configurations {
 
 repositories {
     mavenCentral()
+    mavenLocal()
     maven {
         name = "Github"
         url = uri("https://maven.pkg.github.com/navikt/nav-foedselsnummer")
@@ -86,8 +87,8 @@ dependencies {
     implementation("javax.inject:javax.inject:1")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("org.springdoc:springdoc-openapi-ui:$springdocVersion")
-    implementation("org.springdoc:springdoc-openapi-kotlin:$springdocVersion")
+    implementation("org.springdoc:springdoc-openapi-starter-common:$springdocVersion")
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:$springdocVersion")
     implementation("net.logstash.logback:logstash-logback-encoder:7.3")
     implementation("no.nav.familie.eksterne.kontrakter:skatteetaten:$skattKontraktVersjon")
     implementation("org.springframework.boot:spring-boot-starter-jdbc")

src/main/kotlin/no/nav/familie/ba/infotrygd/config/ValidateConfig.kt

@@ -3,7 +3,7 @@ package no.nav.familie.ba.infotrygd.config
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.stereotype.Component
 import org.springframework.validation.annotation.Validated
-import javax.validation.constraints.NotEmpty
+import jakarta.validation.constraints.NotEmpty
 
 @Validated
 @Component

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractCharConverter.kt

@@ -1,7 +1,7 @@
 package no.nav.familie.ba.infotrygd.model.converters
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 abstract class AbstractCharConverter(private val size: Int) : AttributeConverter<String?, String?> {
     override fun convertToDatabaseColumn(attribute: String?): String? {

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractNavLocalDateConverter.kt

@@ -3,7 +3,7 @@ package no.nav.familie.ba.infotrygd.model.converters
 import org.slf4j.LoggerFactory
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
-import javax.persistence.AttributeConverter
+import jakarta.persistence.AttributeConverter
 
 open class AbstractNavLocalDateConverter(datePattern: String) : AttributeConverter<LocalDate?, Int?> {
     private val logger = LoggerFactory.getLogger(javaClass)

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/FoedselNrConverter.kt

@@ -1,7 +1,7 @@
 package no.nav.familie.ba.infotrygd.model.converters
 
 import no.nav.commons.foedselsnummer.FoedselsNr
-import javax.persistence.AttributeConverter
+import jakarta.persistence.AttributeConverter
 
 class FoedselNrConverter  : AttributeConverter<FoedselsNr?, String?> {
     override fun convertToDatabaseColumn(attribute: FoedselsNr?): String? {

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/KodeConverter.kt

@@ -3,8 +3,8 @@ package no.nav.familie.ba.infotrygd.model.converters
 import no.nav.familie.ba.infotrygd.exception.UkjentDatabaseverdiException
 import no.nav.familie.ba.infotrygd.model.kodeverk.Kode
 import no.nav.familie.ba.infotrygd.model.kodeverk.SakStatus
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 abstract class KodeConverter<T : Kode>(private val koder: List<T>, val fieldSize: Int = 0, val padChar: Char = ' ') : AttributeConverter<T?, String?> {
 

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavCharDateConverter.kt

@@ -1,8 +1,8 @@
 package no.nav.familie.ba.infotrygd.model.converters
 
 import java.time.LocalDate
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 @Converter
 class NavCharDateConverter : AttributeConverter<LocalDate?, String?> {

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavLocalDateConverter.kt

@@ -1,6 +1,6 @@
 package no.nav.familie.ba.infotrygd.model.converters
 
-import javax.persistence.Converter
+import jakarta.persistence.Converter
 
 @Converter
 class NavLocalDateConverter : AbstractNavLocalDateConverter("yyyyMMdd")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavReversedLocalDateConverter.kt

@@ -1,6 +1,6 @@
 package no.nav.familie.ba.infotrygd.model.converters
 
-import javax.persistence.Converter
+import jakarta.persistence.Converter
 
 @Converter
 class NavReversedLocalDateConverter : AbstractNavLocalDateConverter("ddMMyyyy")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedFoedselNrConverter.kt

@@ -3,7 +3,7 @@ package no.nav.familie.ba.infotrygd.model.converters
 import no.nav.commons.foedselsnummer.FoedselsNr
 import no.nav.familie.ba.infotrygd.utils.fraReversert
 import no.nav.familie.ba.infotrygd.utils.reversert
-import javax.persistence.AttributeConverter
+import jakarta.persistence.AttributeConverter
 
 class ReversedFoedselNrConverter : AttributeConverter<FoedselsNr?, String?> {
     override fun convertToDatabaseColumn(attribute: FoedselsNr?): String? {

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedLongFoedselNrConverter.kt

@@ -1,7 +1,7 @@
 package no.nav.familie.ba.infotrygd.model.converters
 
 import no.nav.commons.foedselsnummer.FoedselsNr
-import javax.persistence.AttributeConverter
+import jakarta.persistence.AttributeConverter
 
 class ReversedLongFoedselNrConverter : AttributeConverter<FoedselsNr?, Long?> {
     private val converter = ReversedFoedselNrConverter()

src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/StatusLopenrConverter.kt

@@ -1,6 +1,6 @@
 package no.nav.familie.ba.infotrygd.model.converters
 
-import javax.persistence.AttributeConverter
+import jakarta.persistence.AttributeConverter
 
 class StatusLopenrConverter : AttributeConverter<Long?, String?> {
     override fun convertToDatabaseColumn(attribute: Long?): String? {

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Beslutning.kt

@@ -1,6 +1,6 @@
 package no.nav.familie.ba.infotrygd.model.db2
 
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 @Table(name = "T_BESLUT")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Delytelse.kt

@@ -4,11 +4,11 @@ package no.nav.familie.ba.infotrygd.model.db2
 import no.nav.familie.ba.infotrygd.model.converters.Char2Converter
 import no.nav.familie.ba.infotrygd.model.converters.CharConverter
 import java.time.LocalDate
-import javax.persistence.Column
-import javax.persistence.Convert
-import javax.persistence.EmbeddedId
-import javax.persistence.Entity
-import javax.persistence.Table
+import jakarta.persistence.Column
+import jakarta.persistence.Convert
+import jakarta.persistence.EmbeddedId
+import jakarta.persistence.Entity
+import jakarta.persistence.Table
 import no.nav.familie.kontrakter.ba.infotrygd.Delytelse as DelytelseDto
 
 

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/DelytelseId.kt

@@ -1,8 +1,8 @@
 package no.nav.familie.ba.infotrygd.model.db2
 
 import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Embeddable
+import jakarta.persistence.Column
+import jakarta.persistence.Embeddable
 
 @Embeddable
 data class DelytelseId(

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Endring.kt

@@ -1,6 +1,6 @@
 package no.nav.familie.ba.infotrygd.model.db2
 
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 @Table(name = "T_ENDRING")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/LøpeNrFnr.kt

@@ -1,10 +1,10 @@
 package no.nav.familie.ba.infotrygd.model.db2
 
 import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Table
+import jakarta.persistence.Column
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Table
 
 
 @Entity

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/StønadDb2.kt

@@ -1,7 +1,7 @@
 package no.nav.familie.ba.infotrygd.model.db2
 
 import no.nav.familie.ba.infotrygd.model.converters.Char2Converter
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 @Table(name = "T_STONAD")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Stønadsklasse.kt

@@ -1,7 +1,7 @@
 package no.nav.familie.ba.infotrygd.model.db2
 
 import java.io.Serializable
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 @Table(name = "T_STONADSKLASSE")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Utbetaling.kt

@@ -7,7 +7,7 @@ import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter
 import no.nav.familie.ba.infotrygd.utils.DatoUtils.seqDatoTilYearMonth
 import no.nav.familie.ba.infotrygd.utils.DatoUtils.stringDatoMMyyyyTilYearMonth
 import java.time.YearMonth
-import javax.persistence.*
+import jakarta.persistence.*
 
 
 @Entity

src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Vedtak.kt

@@ -5,7 +5,7 @@ import no.nav.familie.ba.infotrygd.model.converters.Char2Converter
 import no.nav.familie.ba.infotrygd.model.converters.CharConverter
 import org.hibernate.annotations.Cascade
 import org.hibernate.annotations.CascadeType
-import javax.persistence.*
+import jakarta.persistence.*
 
 
 @Entity

src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Barn.kt

@@ -6,7 +6,7 @@ import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter
 import no.nav.familie.ba.infotrygd.model.converters.ReversedLongFoedselNrConverter
 import no.nav.familie.ba.infotrygd.utils.DatoUtils
 import java.time.YearMonth
-import javax.persistence.*
+import jakarta.persistence.*
 import no.nav.familie.kontrakter.ba.infotrygd.Barn as BarnDto
 
 @Entity

src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Hendelse.kt

@@ -2,11 +2,11 @@ package no.nav.familie.ba.infotrygd.model.dl1
 
 import no.nav.commons.foedselsnummer.FoedselsNr
 import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter
-import javax.persistence.Column
-import javax.persistence.Convert
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Table
+import jakarta.persistence.Column
+import jakarta.persistence.Convert
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Table
 
 @Entity
 @Table(name = "SA_HENDELSE_20")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Person.kt

@@ -2,7 +2,7 @@ package no.nav.familie.ba.infotrygd.model.dl1
 
 import no.nav.commons.foedselsnummer.FoedselsNr
 import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter
-import javax.persistence.*
+import jakarta.persistence.*
 import java.io.Serializable
 
 @Entity

src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Sak.kt

@@ -4,7 +4,7 @@ import no.nav.commons.foedselsnummer.FoedselsNr
 import no.nav.familie.ba.infotrygd.model.converters.*
 import java.io.Serializable
 import java.time.LocalDate
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 @Table(name = "SA_SAK_10")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Status.kt

@@ -3,7 +3,7 @@ package no.nav.familie.ba.infotrygd.model.dl1
 import no.nav.familie.ba.infotrygd.model.converters.SakStatusConverter
 import no.nav.familie.ba.infotrygd.model.converters.StatusLopenrConverter
 import no.nav.familie.ba.infotrygd.model.kodeverk.SakStatus
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 @Table(name = "SA_STATUS_15")

src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Stønad.kt

@@ -4,11 +4,11 @@ import no.nav.commons.foedselsnummer.FoedselsNr
 import no.nav.familie.ba.infotrygd.model.converters.CharConverter
 import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter
 import java.io.Serializable
-import javax.persistence.Column
-import javax.persistence.Convert
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.Table
+import jakarta.persistence.Column
+import jakarta.persistence.Convert
+import jakarta.persistence.Entity
+import jakarta.persistence.Id
+import jakarta.persistence.Table
 
 @Entity
 @Table(name = "BA_STOENAD_20")

src/main/kotlin/no/nav/familie/ba/infotrygd/rest/controller/TableController.kt

@@ -4,7 +4,7 @@ import no.nav.familie.ba.infotrygd.integration.TableIntegrator
 import no.nav.security.token.support.core.api.Unprotected
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RestController
-import javax.transaction.Transactional
+import jakarta.transaction.Transactional
 
 @RestController
 @Unprotected

src/main/kotlin/no/nav/familie/ba/infotrygd/rest/filter/AccessLogFilter.kt

@@ -1,12 +1,12 @@
 package no.nav.familie.ba.infotrygd.rest.filter
 
 import org.slf4j.LoggerFactory
-import javax.servlet.FilterChain
-import javax.servlet.ServletRequest
-import javax.servlet.ServletResponse
-import javax.servlet.http.HttpFilter
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
+import jakarta.servlet.FilterChain
+import jakarta.servlet.ServletRequest
+import jakarta.servlet.ServletResponse
+import jakarta.servlet.http.HttpFilter
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
 
 
 class AccessLogFilter(private val applicationName: String) : HttpFilter() {