diff --git a/pom.xml b/pom.xml
index fda7686..8193e3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.3.0
+ 4.0.3
@@ -23,20 +23,20 @@
- 7.17.0
+ 7.20.0
3.6.1
3.6.2
3.5.0
- 10.10.0
+ 12.0.3
- 2.11.0
- 11.30.1
+ 3.0.0
+ 11.33
0.13.0
- 2.6.0
+ 3.0.2
3.13.2
- 5.21.0
- 42.7.8
+ 5.22.0
+ 42.7.10
true
@@ -165,6 +165,11 @@
org.jetbrains.kotlin
${kotlin.version}
+
+
+ -Xannotation-default-target=param-property
+
+
compile
@@ -379,6 +384,11 @@
spring-boot-starter-test
test
+
+ org.springframework.boot
+ spring-boot-starter-webmvc-test
+ test
+
org.wiremock
wiremock-standalone
diff --git a/profiles/integration-test/config.properties b/profiles/integration-test/config.properties
index 93f701d..423ee68 100644
--- a/profiles/integration-test/config.properties
+++ b/profiles/integration-test/config.properties
@@ -23,7 +23,7 @@ api.path.prefix.public=/external-api/auth
# We don't use persistent sessions in the integration tests, therefore exclude
# the data source initialization.
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
+spring.autoconfigure.exclude=org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration,org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration
############################################
# OIDC 2.0 and authentication
diff --git a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/HasuraApiControllerTest.kt b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/HasuraApiControllerTest.kt
index a3d33c6..c36fe2c 100644
--- a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/HasuraApiControllerTest.kt
+++ b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/HasuraApiControllerTest.kt
@@ -15,7 +15,7 @@ import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Tag
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.mock.web.MockHttpSession
import org.springframework.test.web.servlet.MockMvc
diff --git a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCCodeExchangeApiControllerTest.kt b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCCodeExchangeApiControllerTest.kt
index c6d296f..88a9c71 100644
--- a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCCodeExchangeApiControllerTest.kt
+++ b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCCodeExchangeApiControllerTest.kt
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Tag
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.mock.web.MockHttpSession
import org.springframework.test.web.servlet.MockMvc
diff --git a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLoginApiControllerTest.kt b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLoginApiControllerTest.kt
index a347171..6989fb4 100644
--- a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLoginApiControllerTest.kt
+++ b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLoginApiControllerTest.kt
@@ -20,7 +20,7 @@ import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.Tag
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.mock.web.MockHttpSession
import org.springframework.test.web.servlet.MockMvc
diff --git a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLogoutApiControllerTest.kt b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLogoutApiControllerTest.kt
index 2f8b3f8..a4dfa2b 100644
--- a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLogoutApiControllerTest.kt
+++ b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLogoutApiControllerTest.kt
@@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
import org.mockito.Mockito.mock
import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.mock.web.MockHttpSession
import org.springframework.test.web.servlet.MockMvc
diff --git a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/UserInfoApiControllerTest.kt b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/UserInfoApiControllerTest.kt
index 2967d97..84a12fd 100644
--- a/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/UserInfoApiControllerTest.kt
+++ b/src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/UserInfoApiControllerTest.kt
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Tag
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.mock.web.MockHttpSession
import org.springframework.test.web.servlet.MockMvc
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d650866..b419983 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -25,7 +25,7 @@ management.endpoints.web.exposure.include=health
# We don't use spring security, therefore exclude it from initialization
# Depending on the maven profile, exclude other classes too
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,@spring.autoconfigure.exclude@
+spring.autoconfigure.exclude=org.springframework.boot.security.autoconfigure.SecurityAutoConfiguration,@spring.autoconfigure.exclude@
############################################
# OIDC 2.0 and authentication