Skip to content

Commit 3e10786

Browse files
dependabot[bot]olekvernberg
dependabot[bot]
and
olekvernberg
authored
Bump the all-dependencies group with 13 updates (#1081)
* Bump the all-dependencies group with 13 updates Bumps the all-dependencies group with 13 updates: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) | `3.4.3` | `3.4.4` | | [org.springframework.cloud:spring-cloud-contract-wiremock](https://github.com/spring-cloud/spring-cloud-contract) | `4.2.0` | `4.2.1` | | [no.nav.security:token-client-spring](https://github.com/navikt/token-support) | `5.0.19` | `5.0.20` | | [no.nav.security:token-validation-spring](https://github.com/navikt/token-support) | `5.0.19` | `5.0.20` | | [no.nav.security:token-validation-spring-test](https://github.com/navikt/token-support) | `5.0.19` | `5.0.20` | | [no.nav.familie.felles:log](https://github.com/navikt/familie-felles) | `3.20250312114810_5371990` | `3.20250320122046_7ca9dae` | | [no.nav.familie.felles:http-client](https://github.com/navikt/familie-felles) | `3.20250312114810_5371990` | `3.20250320122046_7ca9dae` | | [no.nav.familie.felles:metrikker](https://github.com/navikt/familie-felles) | `3.20250312114810_5371990` | `3.20250320122046_7ca9dae` | | [org.jetbrains.kotlin:kotlin-stdlib-jdk8](https://github.com/JetBrains/kotlin) | `2.1.10` | `2.1.20` | | [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin) | `2.1.10` | `2.1.20` | | [org.jetbrains.kotlin:kotlin-test-junit5](https://github.com/JetBrains/kotlin) | `2.1.10` | `2.1.20` | | org.jetbrains.kotlin:kotlin-maven-allopen | `2.1.10` | `2.1.20` | | org.jetbrains.kotlin:kotlin-maven-plugin | `2.1.10` | `2.1.20` | Updates `org.springframework.boot:spring-boot-starter-parent` from 3.4.3 to 3.4.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.3...v3.4.4) Updates `org.springframework.cloud:spring-cloud-contract-wiremock` from 4.2.0 to 4.2.1 - [Release notes](https://github.com/spring-cloud/spring-cloud-contract/releases) - [Commits](spring-cloud/spring-cloud-contract@v4.2.0...v4.2.1) Updates `no.nav.security:token-client-spring` from 5.0.19 to 5.0.20 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.19...5.0.20) Updates `no.nav.security:token-validation-spring` from 5.0.19 to 5.0.20 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.19...5.0.20) Updates `no.nav.security:token-validation-spring-test` from 5.0.19 to 5.0.20 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.19...5.0.20) Updates `no.nav.security:token-validation-spring` from 5.0.19 to 5.0.20 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.19...5.0.20) Updates `no.nav.security:token-validation-spring-test` from 5.0.19 to 5.0.20 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.19...5.0.20) Updates `no.nav.familie.felles:log` from 3.20250312114810_5371990 to 3.20250320122046_7ca9dae - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:http-client` from 3.20250312114810_5371990 to 3.20250320122046_7ca9dae - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:metrikker` from 3.20250312114810_5371990 to 3.20250320122046_7ca9dae - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:http-client` from 3.20250312114810_5371990 to 3.20250320122046_7ca9dae - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:metrikker` from 3.20250312114810_5371990 to 3.20250320122046_7ca9dae - [Commits](https://github.com/navikt/familie-felles/commits) Updates `org.jetbrains.kotlin:kotlin-stdlib-jdk8` from 2.1.10 to 2.1.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.1.20) Updates `org.jetbrains.kotlin:kotlin-reflect` from 2.1.10 to 2.1.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.1.20) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 2.1.10 to 2.1.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.1.20) Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 2.1.10 to 2.1.20 Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.1.10 to 2.1.20 Updates `org.jetbrains.kotlin:kotlin-reflect` from 2.1.10 to 2.1.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.1.20) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 2.1.10 to 2.1.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.10...v2.1.20) Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 2.1.10 to 2.1.20 Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.1.10 to 2.1.20 --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.springframework.cloud:spring-cloud-contract-wiremock dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring-test dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring-test dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.familie.felles:log dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.felles:http-client dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.felles:metrikker dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.felles:http-client dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.felles:metrikker dependency-type: direct:production dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-test-junit5 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-maven-allopen dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-test-junit5 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-maven-allopen dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * Endret navn på github actions, for å unngå duplikater. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ole Christian Kvernberg <[email protected]>
1 parent 40e9900 commit 3e10786

File tree

11 files changed

+47
-53
lines changed

11 files changed

+47
-53
lines changed

Diff for: ‎.github/workflows/deploy-preprod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build-Deploy-Preprod
1+
name: Deploy preprod
22
on:
33
workflow_dispatch:
44
pull_request:

Diff for: ‎.github/workflows/deploy-prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy-Prod
1+
name: Deploy prod
22
on:
33
push:
44
branches:

Diff for: ‎.github/workflows/tilbake-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build-Deploy-Preprod
1+
name: Build & push tilbake
22
on:
33
push:
44
branches:

Diff for: ‎pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>3.4.3</version>
10+
<version>3.4.4</version>
1111
</parent>
1212

1313
<groupId>no.nav.familie.integrasjoner</groupId>
@@ -20,15 +20,15 @@
2020
<sha1></sha1>
2121
<changelist>-SNAPSHOT</changelist>
2222
<java.version>21</java.version>
23-
<kotlin.version>2.1.10</kotlin.version>
23+
<kotlin.version>2.1.20</kotlin.version>
2424
<springdoc.version>2.8.5</springdoc.version>
25-
<felles.version>3.20250312114810_5371990</felles.version>
25+
<felles.version>3.20250320122046_7ca9dae</felles.version>
2626
<kontrakt.version>3.0_20250324143109_c04b578</kontrakt.version>
27-
<token-validation-spring.version>5.0.19</token-validation-spring.version>
27+
<token-validation-spring.version>5.0.20</token-validation-spring.version>
2828

2929
<mock-server.version>5.15.0</mock-server.version>
3030

31-
<spring.cloud>4.2.0</spring.cloud>
31+
<spring.cloud>4.2.1</spring.cloud>
3232

3333
</properties>
3434

Diff for: ‎src/main/java/no/nav/familie/integrasjoner/client/rest/AxsysRestClient.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ package no.nav.familie.integrasjoner.client.rest
22

33
import no.nav.familie.http.client.AbstractRestClient
44
import no.nav.familie.integrasjoner.axsys.TilgangV2DTO
5-
import no.nav.familie.integrasjoner.config.incrementLoggFeil
5+
import no.nav.familie.integrasjoner.felles.OppslagException
66
import no.nav.familie.kontrakter.felles.NavIdent
77
import org.springframework.beans.factory.annotation.Qualifier
88
import org.springframework.beans.factory.annotation.Value
9+
import org.springframework.http.HttpStatus
910
import org.springframework.stereotype.Service
1011
import org.springframework.web.client.RestOperations
1112
import org.springframework.web.util.UriComponentsBuilder
1213
import java.net.URI
13-
import no.nav.familie.integrasjoner.felles.OppslagException
14-
import org.springframework.http.HttpStatus
1514

1615
@Service
1716
class AxsysRestClient(
@@ -34,7 +33,7 @@ class AxsysRestClient(
3433
"axsys.hentEnheterNavIdentHarTilgangTil",
3534
OppslagException.Level.MEDIUM,
3635
HttpStatus.INTERNAL_SERVER_ERROR,
37-
e
36+
e,
3837
)
3938
}
4039
}

Diff for: ‎src/main/java/no/nav/familie/integrasjoner/client/rest/AzureGraphRestClient.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ package no.nav.familie.integrasjoner.client.rest
33
import no.nav.familie.http.client.AbstractRestClient
44
import no.nav.familie.integrasjoner.azure.domene.AzureAdBruker
55
import no.nav.familie.integrasjoner.azure.domene.AzureAdBrukere
6-
import no.nav.familie.integrasjoner.config.incrementLoggFeil
6+
import no.nav.familie.integrasjoner.felles.OppslagException
77
import org.springframework.beans.factory.annotation.Qualifier
88
import org.springframework.beans.factory.annotation.Value
99
import org.springframework.http.HttpHeaders
10+
import org.springframework.http.HttpStatus
1011
import org.springframework.stereotype.Service
1112
import org.springframework.web.client.RestOperations
1213
import org.springframework.web.util.UriComponentsBuilder
1314
import java.net.URI
14-
import no.nav.familie.integrasjoner.felles.OppslagException
15-
import org.springframework.http.HttpStatus
1615

1716
@Service
1817
class AzureGraphRestClient(
@@ -50,7 +49,7 @@ class AzureGraphRestClient(
5049
"azure.saksbehandler.navIdent",
5150
OppslagException.Level.MEDIUM,
5251
HttpStatus.INTERNAL_SERVER_ERROR,
53-
e
52+
e,
5453
)
5554
}
5655

@@ -63,7 +62,7 @@ class AzureGraphRestClient(
6362
"azure.saksbehandler.id",
6463
OppslagException.Level.MEDIUM,
6564
HttpStatus.INTERNAL_SERVER_ERROR,
66-
e
65+
e,
6766
)
6867
}
6968

Diff for: ‎src/main/java/no/nav/familie/integrasjoner/client/rest/DokarkivRestClient.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package no.nav.familie.integrasjoner.client.rest
22

33
import no.nav.familie.http.client.AbstractPingableRestClient
44
import no.nav.familie.http.client.AbstractRestClient
5-
import no.nav.familie.integrasjoner.config.incrementLoggFeil
65
import no.nav.familie.integrasjoner.dokarkiv.client.KanIkkeFerdigstilleJournalpostException
76
import no.nav.familie.integrasjoner.dokarkiv.client.domene.FerdigstillJournalPost
87
import no.nav.familie.integrasjoner.dokarkiv.client.domene.OpprettJournalpostRequest
@@ -148,7 +147,7 @@ class DokarkivRestClient(
148147
"dokarkiv.ferdigstill.feil",
149148
OppslagException.Level.MEDIUM,
150149
HttpStatus.INTERNAL_SERVER_ERROR,
151-
e
150+
e,
152151
)
153152
}
154153
}

Diff for: ‎src/main/java/no/nav/familie/integrasjoner/personopplysning/internal/PdlResponse.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ data class PdlResponse<T>(
1919

2020
fun harUnauthorizedFeil(): Boolean = errors?.any { it.extensions?.unauthorized() == true } ?: false
2121

22-
fun tilPdlUnauthorizedDetails(): List<PdlUnauthorizedDetails> =
23-
errors?.filter { it.extensions?.unauthorized() == true }?.mapNotNull { it.extensions?.details?.let { details -> objectMapper.convertValue(details, PdlUnauthorizedDetails::class.java) } } ?: emptyList()
22+
fun tilPdlUnauthorizedDetails(): List<PdlUnauthorizedDetails> = errors?.filter { it.extensions?.unauthorized() == true }?.mapNotNull { it.extensions?.details?.let { details -> objectMapper.convertValue(details, PdlUnauthorizedDetails::class.java) } } ?: emptyList()
2423
}
2524

2625
data class PersonDataBolk<T>(

Diff for: ‎src/test/java/no/nav/familie/integrasjoner/client/rest/AxsysRestClientTest.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package no.nav.familie.integrasjoner.client.rest
22

33
import io.mockk.every
44
import io.mockk.mockk
5-
import java.net.URI
65
import no.nav.familie.integrasjoner.axsys.TilgangV2DTO
76
import no.nav.familie.integrasjoner.felles.OppslagException
87
import no.nav.familie.kontrakter.felles.NavIdent
9-
import no.nav.familie.kontrakter.felles.navkontor.NavKontorEnhet
108
import org.assertj.core.api.Assertions.assertThat
119
import org.junit.jupiter.api.Nested
1210
import org.junit.jupiter.api.Test
@@ -16,13 +14,15 @@ import org.springframework.http.HttpMethod
1614
import org.springframework.http.HttpStatus
1715
import org.springframework.web.client.RestOperations
1816
import org.springframework.web.client.exchange
17+
import java.net.URI
1918

2019
class AxsysRestClientTest {
2120
private val restOperations: RestOperations = mockk()
22-
private val axsysRestClient: AxsysRestClient = AxsysRestClient(
23-
enhetBaseUrl = URI("http://localhost:8080"),
24-
restTemplate = restOperations
25-
)
21+
private val axsysRestClient: AxsysRestClient =
22+
AxsysRestClient(
23+
enhetBaseUrl = URI("http://localhost:8080"),
24+
restTemplate = restOperations,
25+
)
2626

2727
@Nested
2828
inner class HentEnheterNavIdentHarTilgangTil {
@@ -40,4 +40,4 @@ class AxsysRestClientTest {
4040
assertThat(oppslagException.httpStatus).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR)
4141
}
4242
}
43-
}
43+
}

Diff for: ‎src/test/java/no/nav/familie/integrasjoner/client/rest/AzureGraphRestClientTest.kt

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ package no.nav.familie.integrasjoner.client.rest
22

33
import io.mockk.every
44
import io.mockk.mockk
5-
import java.net.URI
6-
import no.nav.familie.integrasjoner.axsys.TilgangV2DTO
75
import no.nav.familie.integrasjoner.azure.domene.AzureAdBruker
86
import no.nav.familie.integrasjoner.azure.domene.AzureAdBrukere
97
import no.nav.familie.integrasjoner.felles.OppslagException
10-
import no.nav.familie.kontrakter.felles.NavIdent
118
import org.assertj.core.api.Assertions.assertThat
129
import org.junit.jupiter.api.Nested
1310
import org.junit.jupiter.api.Test
@@ -17,13 +14,15 @@ import org.springframework.http.HttpMethod
1714
import org.springframework.http.HttpStatus
1815
import org.springframework.web.client.RestOperations
1916
import org.springframework.web.client.exchange
17+
import java.net.URI
2018

2119
class AzureGraphRestClientTest {
2220
private val restOperations: RestOperations = mockk()
23-
private val azureGraphRestClient: AzureGraphRestClient = AzureGraphRestClient(
24-
restTemplate = restOperations,
25-
aadGraphURI = URI("http://localhost:8080"),
26-
)
21+
private val azureGraphRestClient: AzureGraphRestClient =
22+
AzureGraphRestClient(
23+
restTemplate = restOperations,
24+
aadGraphURI = URI("http://localhost:8080"),
25+
)
2726

2827
@Nested
2928
inner class FinnSaksbehandler {
@@ -58,4 +57,4 @@ class AzureGraphRestClientTest {
5857
assertThat(oppslagException.httpStatus).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR)
5958
}
6059
}
61-
}
60+
}

Diff for: ‎src/test/java/no/nav/familie/integrasjoner/client/rest/DokarkivRestClientTest.kt

+16-17
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ import io.mockk.every
44
import io.mockk.mockk
55
import io.mockk.mockkStatic
66
import io.mockk.unmockkStatic
7-
import java.net.URI
8-
import no.nav.familie.integrasjoner.azure.domene.AzureAdBrukere
97
import no.nav.familie.integrasjoner.dokarkiv.client.domene.FerdigstillJournalPost
10-
import no.nav.familie.integrasjoner.felles.MDCOperations
118
import no.nav.familie.integrasjoner.felles.OppslagException
129
import no.nav.familie.log.mdc.MDCConstants.MDC_CALL_ID
1310
import org.assertj.core.api.Assertions.assertThat
@@ -18,19 +15,20 @@ import org.junit.jupiter.api.Test
1815
import org.junit.jupiter.api.assertThrows
1916
import org.slf4j.MDC
2017
import org.springframework.http.HttpEntity
21-
import org.springframework.http.HttpHeaders
2218
import org.springframework.http.HttpMethod
2319
import org.springframework.http.HttpStatus
2420
import org.springframework.web.client.RestClientResponseException
2521
import org.springframework.web.client.RestOperations
2622
import org.springframework.web.client.exchange
23+
import java.net.URI
2724

2825
class DokarkivRestClientTest {
2926
private val restOperations: RestOperations = mockk()
30-
private val dokarkivRestClient: DokarkivRestClient = DokarkivRestClient(
31-
dokarkivUrl = URI("http://localhost:8080/dokarkiv"),
32-
restOperations = restOperations,
33-
)
27+
private val dokarkivRestClient: DokarkivRestClient =
28+
DokarkivRestClient(
29+
dokarkivUrl = URI("http://localhost:8080/dokarkiv"),
30+
restOperations = restOperations,
31+
)
3432

3533
@BeforeEach
3634
fun setUp() {
@@ -48,14 +46,15 @@ class DokarkivRestClientTest {
4846
@Test
4947
fun `skal kaste OppslagException ved feil mot dokarkiv`() {
5048
// Arrange
51-
every { restOperations.exchange<String>(any<URI>(), eq(HttpMethod.PATCH), any<HttpEntity<FerdigstillJournalPost>>()) } throws RestClientResponseException(
52-
"Noe gikk galt",
53-
HttpStatus.NOT_FOUND,
54-
"bad request",
55-
null,
56-
null,
57-
null
58-
)
49+
every { restOperations.exchange<String>(any<URI>(), eq(HttpMethod.PATCH), any<HttpEntity<FerdigstillJournalPost>>()) } throws
50+
RestClientResponseException(
51+
"Noe gikk galt",
52+
HttpStatus.NOT_FOUND,
53+
"bad request",
54+
null,
55+
null,
56+
null,
57+
)
5958

6059
// Act & Assert
6160
val oppslagException = assertThrows<OppslagException> { dokarkivRestClient.ferdigstillJournalpost("1234", "oslo", "4321") }
@@ -66,4 +65,4 @@ class DokarkivRestClientTest {
6665
assertThat(oppslagException.httpStatus).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR)
6766
}
6867
}
69-
}
68+
}

0 commit comments

Comments
 (0)