Updated dependencies.

Fixed jakarta import prefix.
navikt · Aug 1, 2023 · 7a9cc13 · 7a9cc13
1 parent 169518d
commit 7a9cc13
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 30 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,24 +1,29 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
+val jakartaPersistenceApiVersion = "3.1.0"
+val junitJupiterVersion = "5.10.0"
+val assertjCoreVersion = "3.24.2"
+
+
 plugins {
-	kotlin("jvm") version "1.8.0"
+	kotlin("jvm") version "1.9.0"
 	id("maven-publish")
 	id("java-library")
 }
 
 group = "no.nav.klage"
 version = properties["version"] ?: "local-build"
-java.sourceCompatibility = JavaVersion.VERSION_11
+java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
 	mavenCentral()
 }
 
 dependencies {
 	compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	implementation("jakarta.persistence:jakarta.persistence-api:2.2.3")
-	testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
-	testImplementation("org.assertj:assertj-core:3.24.1")
+	implementation("jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceApiVersion")
+	testImplementation("org.junit.jupiter:junit-jupiter:$junitJupiterVersion")
+	testImplementation("org.assertj:assertj-core:$assertjCoreVersion")
 }
 
 tasks.withType<KotlinCompile> {

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/Brevmottakertype.kt b/src/main/kotlin/no/nav/klage/kodeverk/Brevmottakertype.kt
@@ -1,8 +1,7 @@
 package no.nav.klage.kodeverk
 
-
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class Brevmottakertype(override val id: String, override val navn: String, override val beskrivelse: String) :
     Kode {

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/DokumentType.kt b/src/main/kotlin/no/nav/klage/kodeverk/DokumentType.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 
 enum class DokumentType(

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/Fagsystem.kt b/src/main/kotlin/no/nav/klage/kodeverk/Fagsystem.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class Fagsystem(
     override val id: String,

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/MedunderskriverFlyt.kt b/src/main/kotlin/no/nav/klage/kodeverk/MedunderskriverFlyt.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class MedunderskriverFlyt(override val id: String, override val navn: String, override val beskrivelse: String) :
     Kode {

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/PartIdType.kt b/src/main/kotlin/no/nav/klage/kodeverk/PartIdType.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class PartIdType(override val id: String, override val navn: String, override val beskrivelse: String) : Kode {
     PERSON("PERSON", "Person", "Person"),

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/Source.kt b/src/main/kotlin/no/nav/klage/kodeverk/Source.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class Source(override val id: String, override val navn: String, override val beskrivelse: String) : Kode {
     KAKA("1", "KAKA", "KAKA"),

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/Tema.kt b/src/main/kotlin/no/nav/klage/kodeverk/Tema.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class Tema(override val id: String, override val navn: String, override val beskrivelse: String) : Kode {
     AAP("1", "AAP", "Arbeidsavklaringspenger"),

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/Type.kt b/src/main/kotlin/no/nav/klage/kodeverk/Type.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class Type(override val id: String, override val navn: String, override val beskrivelse: String) : Kode {
 

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/Utfall.kt b/src/main/kotlin/no/nav/klage/kodeverk/Utfall.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class Utfall(override val id: String, override val navn: String, override val beskrivelse: String) : Kode {
     TRUKKET("1", "Trukket", "Trukket"),

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/Ytelse.kt b/src/main/kotlin/no/nav/klage/kodeverk/Ytelse.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class Ytelse(override val id: String, override val navn: String, override val beskrivelse: String) : Kode {
     OMS_OMP("1", "Omsorgspenger", "Omsorgspenger"),

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/hjemmel/Hjemmel.kt b/src/main/kotlin/no/nav/klage/kodeverk/hjemmel/Hjemmel.kt
@@ -2,8 +2,8 @@ package no.nav.klage.kodeverk.hjemmel
 
 import no.nav.klage.kodeverk.Tema
 import no.nav.klage.kodeverk.Ytelse
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 /**
  * Used for innsending, search and innstillinger

diff --git a/src/main/kotlin/no/nav/klage/kodeverk/hjemmel/Registreringshjemmel.kt b/src/main/kotlin/no/nav/klage/kodeverk/hjemmel/Registreringshjemmel.kt
@@ -1,7 +1,7 @@
 package no.nav.klage.kodeverk.hjemmel
 
-import javax.persistence.AttributeConverter
-import javax.persistence.Converter
+import jakarta.persistence.AttributeConverter
+import jakarta.persistence.Converter
 
 enum class Registreringshjemmel(
     val id: String,