Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.0</version>
<version>4.0.3</version>
<relativePath/>
</parent>

Expand All @@ -23,20 +23,20 @@

<!-- Dependency versions -->
<!-- Maven plugins -->
<versions.maven.openapi>7.17.0</versions.maven.openapi>
<versions.maven.openapi>7.20.0</versions.maven.openapi>
<versions.maven.build-helper>3.6.1</versions.maven.build-helper>
<versions.maven.enforcer>3.6.2</versions.maven.enforcer>
<versions.maven.ktlint>3.5.0</versions.maven.ktlint>
<versions.maven.flyway>10.10.0</versions.maven.flyway>
<versions.maven.flyway>12.0.3</versions.maven.flyway>

<!-- Library versions -->
<versions.retrofit>2.11.0</versions.retrofit>
<versions.oauth2-oidc-sdk>11.30.1</versions.oauth2-oidc-sdk>
<versions.retrofit>3.0.0</versions.retrofit>
<versions.oauth2-oidc-sdk>11.33</versions.oauth2-oidc-sdk>
<versions.jsonwebtoken>0.13.0</versions.jsonwebtoken>
<versions.springdoc>2.6.0</versions.springdoc>
<versions.springdoc>3.0.2</versions.springdoc>
<versions.wiremock>3.13.2</versions.wiremock>
<versions.mockito>5.21.0</versions.mockito>
<versions.postgresql>42.7.8</versions.postgresql>
<versions.mockito>5.22.0</versions.mockito>
<versions.postgresql>42.7.10</versions.postgresql>

<kotlin.compiler.incremental>true</kotlin.compiler.incremental>

Expand Down Expand Up @@ -165,6 +165,11 @@
<groupId>org.jetbrains.kotlin</groupId>
<!-- version inherited from the Spring Boot parent POM -->
<version>${kotlin.version}</version>
<configuration>
<args>
<arg>-Xannotation-default-target=param-property</arg>
</args>
</configuration>
<executions>
<execution>
<id>compile</id>
Expand Down Expand Up @@ -379,6 +384,11 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion profiles/integration-test/config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading