1
1
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2
2
3
3
val mockkVersion = " 1.13.9"
4
- val tokenSupportVersion = " 2.1.6 "
4
+ val tokenSupportVersion = " 3.2.0 "
5
5
val springdocVersion = " 1.7.0"
6
6
val navFoedselsnummerVersion = " 1.0-SNAPSHOT.6"
7
- val kontrakterVersion = " 3.0_20240109111848_d97569f"
8
- val fellesVersion = " 1.20221006150009_46021ed"
7
+ val kontrakterVersion = " 3.0_20240116082529_ee44807"
9
8
val mainClass = " no.nav.familie.ef.infotrygd.Main"
10
9
val ktlint by configurations.creating
11
10
12
11
plugins {
13
12
val kotlinVersion = " 1.9.22"
14
- val springBootVersion = " 2.7.18 "
13
+ val springBootVersion = " 3.2.1 "
15
14
id(" org.springframework.boot" ) version springBootVersion
16
15
id(" io.spring.dependency-management" ) version " 1.1.4"
17
16
kotlin(" jvm" ) version kotlinVersion
18
17
kotlin(" plugin.spring" ) version kotlinVersion
19
18
kotlin(" plugin.jpa" ) version kotlinVersion
20
- // id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
21
19
}
22
20
23
21
group = " no.nav"
@@ -42,11 +40,6 @@ repositories {
42
40
}
43
41
}
44
42
45
- allOpen {
46
- annotation(" javax.persistence.Entity" )
47
- annotation(" javax.persistence.MappedSuperclass" )
48
- annotation(" javax.persistence.Embeddable" )
49
- }
50
43
51
44
dependencies {
52
45
@@ -71,31 +64,23 @@ dependencies {
71
64
implementation(" no.nav.familie.kontrakter:enslig-forsorger:$kontrakterVersion " )
72
65
implementation(" no.nav.familie.kontrakter:felles:$kontrakterVersion " )
73
66
testImplementation(" no.nav.security:token-validation-spring-test:$tokenSupportVersion " )
74
- implementation(" javax.inject:javax.inject:1" )
75
67
implementation(" org.jetbrains.kotlin:kotlin-reflect" )
76
68
implementation(" org.jetbrains.kotlin:kotlin-stdlib-jdk8" )
77
69
implementation(" org.springdoc:springdoc-openapi-ui:$springdocVersion " )
78
70
implementation(" org.springdoc:springdoc-openapi-kotlin:$springdocVersion " )
79
- implementation(" net.logstash.logback:logstash-logback-encoder:7.2 " )
71
+ implementation(" net.logstash.logback:logstash-logback-encoder:7.4 " )
80
72
implementation(" org.springframework.boot:spring-boot-starter-jdbc" )
81
73
implementation(" org.springframework.boot:spring-boot-starter-data-jpa" )
82
74
runtimeOnly(" org.postgresql:postgresql" )
83
75
implementation(" com.oracle.database.jdbc:ojdbc8:23.3.0.23.09" )
84
76
annotationProcessor(" org.springframework.boot:spring-boot-configuration-processor" )
85
77
testImplementation(" org.springframework.boot:spring-boot-starter-test" )
86
- testImplementation(" com.github.doyaaaaaken:kotlin-csv-jvm:1.6.0 " )
87
- testImplementation(" org.testcontainers:oracle-xe:1.17.5 " )
78
+ testImplementation(" com.github.doyaaaaaken:kotlin-csv-jvm:1.9.2 " )
79
+ testImplementation(" org.testcontainers:oracle-xe:1.19.3 " )
88
80
testImplementation(" com.h2database:h2" )
89
81
testImplementation(" org.flywaydb:flyway-core" )
90
82
testImplementation(" io.mockk:mockk-jvm:$mockkVersion " )
91
83
92
- // overskrever spring sin versjon, blir brukt av mock-oauth2-server
93
- testImplementation(" com.squareup.okhttp3" , " mockwebserver" ).version {
94
- strictly(" 4.10.0" )
95
- }
96
- testImplementation(" com.squareup.okhttp3" , " okhttp" ).version {
97
- strictly(" 4.9.2" )
98
- }
99
84
100
85
}
101
86
0 commit comments