Skip to content

Commit f4c287f

Browse files
renovate[bot]jannebe
authored andcommitted
Update all dependencies
1 parent 68578dc commit f4c287f

7 files changed

Lines changed: 24 additions & 14 deletions

File tree

.github/workflows/cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343
- run_unit_tests
4444
- check_code_formatting
4545
- publish_docker_image_to_acr
46-
uses: HSLdevcom/jore4-tools/.github/workflows/shared-run-e2e.yml@main
46+
uses: HSLdevcom/jore4-tools/.github/workflows/shared-run-e2e.yml@serverlogs
4747
with:
4848
auth_version: "${{ needs.publish_docker_image_to_acr.outputs.docker_image }}"

pom.xml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>3.3.0</version>
14+
<version>4.0.3</version>
1515
<relativePath/>
1616
</parent>
1717

@@ -23,20 +23,20 @@
2323

2424
<!-- Dependency versions -->
2525
<!-- Maven plugins -->
26-
<versions.maven.openapi>7.17.0</versions.maven.openapi>
26+
<versions.maven.openapi>7.20.0</versions.maven.openapi>
2727
<versions.maven.build-helper>3.6.1</versions.maven.build-helper>
2828
<versions.maven.enforcer>3.6.2</versions.maven.enforcer>
2929
<versions.maven.ktlint>3.5.0</versions.maven.ktlint>
30-
<versions.maven.flyway>10.10.0</versions.maven.flyway>
30+
<versions.maven.flyway>12.0.3</versions.maven.flyway>
3131

3232
<!-- Library versions -->
33-
<versions.retrofit>2.11.0</versions.retrofit>
34-
<versions.oauth2-oidc-sdk>11.30.1</versions.oauth2-oidc-sdk>
33+
<versions.retrofit>3.0.0</versions.retrofit>
34+
<versions.oauth2-oidc-sdk>11.33</versions.oauth2-oidc-sdk>
3535
<versions.jsonwebtoken>0.13.0</versions.jsonwebtoken>
36-
<versions.springdoc>2.6.0</versions.springdoc>
36+
<versions.springdoc>3.0.2</versions.springdoc>
3737
<versions.wiremock>3.13.2</versions.wiremock>
38-
<versions.mockito>5.21.0</versions.mockito>
39-
<versions.postgresql>42.7.8</versions.postgresql>
38+
<versions.mockito>5.22.0</versions.mockito>
39+
<versions.postgresql>42.7.10</versions.postgresql>
4040

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

@@ -165,6 +165,11 @@
165165
<groupId>org.jetbrains.kotlin</groupId>
166166
<!-- version inherited from the Spring Boot parent POM -->
167167
<version>${kotlin.version}</version>
168+
<configuration>
169+
<args>
170+
<arg>-Xannotation-default-target=param-property</arg>
171+
</args>
172+
</configuration>
168173
<executions>
169174
<execution>
170175
<id>compile</id>
@@ -379,6 +384,11 @@
379384
<artifactId>spring-boot-starter-test</artifactId>
380385
<scope>test</scope>
381386
</dependency>
387+
<dependency>
388+
<groupId>org.springframework.boot</groupId>
389+
<artifactId>spring-boot-starter-webmvc-test</artifactId>
390+
<scope>test</scope>
391+
</dependency>
382392
<dependency>
383393
<groupId>org.wiremock</groupId>
384394
<artifactId>wiremock-standalone</artifactId>

src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/HasuraApiControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.junit.jupiter.api.Nested
1515
import org.junit.jupiter.api.Tag
1616
import org.junit.jupiter.api.Test
1717
import org.springframework.beans.factory.annotation.Autowired
18-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
18+
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
1919
import org.springframework.boot.test.context.SpringBootTest
2020
import org.springframework.mock.web.MockHttpSession
2121
import org.springframework.test.web.servlet.MockMvc

src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCCodeExchangeApiControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Nested
2727
import org.junit.jupiter.api.Tag
2828
import org.junit.jupiter.api.Test
2929
import org.springframework.beans.factory.annotation.Autowired
30-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
30+
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
3131
import org.springframework.boot.test.context.SpringBootTest
3232
import org.springframework.mock.web.MockHttpSession
3333
import org.springframework.test.web.servlet.MockMvc

src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLoginApiControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.junit.jupiter.api.DisplayName
2020
import org.junit.jupiter.api.Tag
2121
import org.junit.jupiter.api.Test
2222
import org.springframework.beans.factory.annotation.Autowired
23-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
23+
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
2424
import org.springframework.boot.test.context.SpringBootTest
2525
import org.springframework.mock.web.MockHttpSession
2626
import org.springframework.test.web.servlet.MockMvc

src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/OIDCLogoutApiControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test
1818
import org.junit.jupiter.api.assertThrows
1919
import org.mockito.Mockito.mock
2020
import org.springframework.beans.factory.annotation.Autowired
21-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
21+
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
2222
import org.springframework.boot.test.context.SpringBootTest
2323
import org.springframework.mock.web.MockHttpSession
2424
import org.springframework.test.web.servlet.MockMvc

src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/UserInfoApiControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Nested
4545
import org.junit.jupiter.api.Tag
4646
import org.junit.jupiter.api.Test
4747
import org.springframework.beans.factory.annotation.Autowired
48-
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
48+
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
4949
import org.springframework.boot.test.context.SpringBootTest
5050
import org.springframework.mock.web.MockHttpSession
5151
import org.springframework.test.web.servlet.MockMvc

0 commit comments

Comments
 (0)