Bump the all-dependencies group across 1 directory with 21 updates (#…

…2764) * Bump the all-dependencies group across 1 directory with 21 updates Bumps the all-dependencies group with 21 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) | `3.4.1` | `3.4.2` | | [org.jetbrains.kotlin:kotlin-stdlib](https://github.com/JetBrains/kotlin) | `2.1.0` | `2.1.10` | | [org.jetbrains.kotlin:kotlin-test-junit5](https://github.com/JetBrains/kotlin) | `2.1.0` | `2.1.10` | | org.jetbrains.kotlin:kotlin-maven-allopen | `2.1.0` | `2.1.10` | | org.jetbrains.kotlin:kotlin-maven-plugin | `2.1.0` | `2.1.10` | | [no.nav.security:token-client-core](https://github.com/navikt/token-support) | `5.0.14` | `5.0.16` | | [no.nav.security:token-validation-core](https://github.com/navikt/token-support) | `5.0.14` | `5.0.16` | | org.flywaydb:flyway-database-postgresql | `11.1.1` | `11.3.0` | | [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) | `2.8.1` | `2.8.4` | | [org.springdoc:springdoc-openapi-starter-common](https://github.com/springdoc/springdoc-openapi) | `2.8.1` | `2.8.4` | | [no.nav.familie.felles:log](https://github.com/navikt/familie-felles) | `3.20250106100611_6ae49d2` | `3.20250122103549_5bcb4dc` | | [no.nav.familie.felles:util](https://github.com/navikt/familie-felles) | `3.20250106100611_6ae49d2` | `3.20250122103549_5bcb4dc` | | [no.nav.familie.felles:http-client](https://github.com/navikt/familie-felles) | `3.20250106100611_6ae49d2` | `3.20250122103549_5bcb4dc` | | [no.nav.familie.felles:unleash](https://github.com/navikt/familie-felles) | `3.20250106100611_6ae49d2` | `3.20250122103549_5bcb4dc` | | [no.nav.familie.felles:leader](https://github.com/navikt/familie-felles) | `3.20250106100611_6ae49d2` | `3.20250122103549_5bcb4dc` | | [no.nav.familie:prosessering-core](https://github.com/navikt/familie-prosessering-backend) | `2.20250102104603_293d453` | `2.20250128112334_99d3496` | | [no.nav.familie.kontrakter:enslig-forsorger](https://github.com/navikt/familie-kontrakter) | `3.0_20250110083551_c4fbcaf` | `3.0_20250113155636_bb71360` | | [no.nav.familie.kontrakter:felles](https://github.com/navikt/familie-kontrakter) | `3.0_20250110083551_c4fbcaf` | `3.0_20250113155636_bb71360` | | [no.nav.familie.kontrakter:enslig-forsorger-test](https://github.com/navikt/familie-kontrakter) | `3.0_20250110083551_c4fbcaf` | `3.0_20250113155636_bb71360` | | [org.wiremock:wiremock-standalone](https://github.com/wiremock/wiremock) | `3.10.0` | `3.11.0` | | [no.nav.security:token-validation-spring-test](https://github.com/navikt/token-support) | `5.0.14` | `5.0.16` | Updates `org.springframework.boot:spring-boot-starter-parent` from 3.4.1 to 3.4.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.1...v3.4.2) Updates `org.jetbrains.kotlin:kotlin-stdlib` from 2.1.0 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.0...v2.1.10) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 2.1.0 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.0...v2.1.10) Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 2.1.0 to 2.1.10 Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.1.0 to 2.1.10 Updates `no.nav.security:token-client-core` from 5.0.14 to 5.0.16 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.14...5.0.16) Updates `no.nav.security:token-validation-core` from 5.0.14 to 5.0.16 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.14...5.0.16) Updates `no.nav.security:token-validation-core` from 5.0.14 to 5.0.16 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.14...5.0.16) Updates `org.flywaydb:flyway-database-postgresql` from 11.1.1 to 11.3.0 Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 2.8.1 to 2.8.4 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](springdoc/springdoc-openapi@v2.8.1...v2.8.4) Updates `org.springdoc:springdoc-openapi-starter-common` from 2.8.1 to 2.8.4 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](springdoc/springdoc-openapi@v2.8.1...v2.8.4) Updates `org.springdoc:springdoc-openapi-starter-common` from 2.8.1 to 2.8.4 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](springdoc/springdoc-openapi@v2.8.1...v2.8.4) Updates `no.nav.familie.felles:log` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:util` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:http-client` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:unleash` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:leader` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:util` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:http-client` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:unleash` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie.felles:leader` from 3.20250106100611_6ae49d2 to 3.20250122103549_5bcb4dc - [Commits](https://github.com/navikt/familie-felles/commits) Updates `no.nav.familie:prosessering-core` from 2.20250102104603_293d453 to 2.20250128112334_99d3496 - [Commits](https://github.com/navikt/familie-prosessering-backend/commits) Updates `no.nav.familie.kontrakter:enslig-forsorger` from 3.0_20250110083551_c4fbcaf to 3.0_20250113155636_bb71360 - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `no.nav.familie.kontrakter:felles` from 3.0_20250110083551_c4fbcaf to 3.0_20250113155636_bb71360 - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `no.nav.familie.kontrakter:enslig-forsorger-test` from 3.0_20250110083551_c4fbcaf to 3.0_20250113155636_bb71360 - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `no.nav.familie.kontrakter:felles` from 3.0_20250110083551_c4fbcaf to 3.0_20250113155636_bb71360 - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `org.wiremock:wiremock-standalone` from 3.10.0 to 3.11.0 - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](wiremock/wiremock@3.10.0...3.11.0) Updates `no.nav.familie.kontrakter:enslig-forsorger-test` from 3.0_20250110083551_c4fbcaf to 3.0_20250113155636_bb71360 - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 2.1.0 to 2.1.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.1.0...v2.1.10) Updates `no.nav.security:token-validation-spring-test` from 5.0.14 to 5.0.16 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@5.0.14...5.0.16) Updates `org.jetbrains.kotlin:kotlin-maven-allopen` from 2.1.0 to 2.1.10 Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 2.1.0 to 2.1.10 --- 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.jetbrains.kotlin:kotlin-stdlib 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: no.nav.security:token-client-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.flywaydb:flyway-database-postgresql dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.springdoc:springdoc-openapi-starter-common dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.springdoc:springdoc-openapi-starter-common dependency-type: direct:production 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:util 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:unleash dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.felles:leader dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.felles:util 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:unleash dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.felles:leader dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie:prosessering-core dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:enslig-forsorger dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:felles dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:enslig-forsorger-test dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:felles dependency-type: direct:production dependency-group: all-dependencies - dependency-name: org.wiremock:wiremock-standalone dependency-type: direct:development update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:enslig-forsorger-test dependency-type: direct:production 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: no.nav.security:token-validation-spring-test 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]> * Vil legge til påkrevd systemtype i LogFilter. Oppdaterer kontrakter til siste versjon. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mattis Janitz <[email protected]>
navikt · Feb 4, 2025 · cb0cb7e · cb0cb7e
1 parent 4bd577a
commit cb0cb7e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.1</version>
+        <version>3.4.2</version>
     </parent>
     <repositories>
         <repository>
@@ -29,16 +29,16 @@
         <sha1/>
         <changelist>-SNAPSHOT</changelist>
         <java.version>21</java.version>
-        <kotlin.version>2.1.0</kotlin.version>
+        <kotlin.version>2.1.10</kotlin.version>
         <kotlin-coroutines.version>1.10.1</kotlin-coroutines.version>
-        <springdoc.version>2.8.1</springdoc.version>
+        <springdoc.version>2.8.4</springdoc.version>
         <mockk.version>1.13.16</mockk.version>
-        <felles.version>3.20250106100611_6ae49d2</felles.version>
-        <prosessering.version>2.20250102104603_293d453</prosessering.version>
-        <token-validation-spring.version>5.0.14</token-validation-spring.version>
+        <felles.version>3.20250122103549_5bcb4dc</felles.version>
+        <prosessering.version>2.20250128112334_99d3496</prosessering.version>
+        <token-validation-spring.version>5.0.16</token-validation-spring.version>
 
         <start-class>no.nav.familie.ef.sak.ApplicationKt</start-class>
-        <kontrakter.version>3.0_20250110083551_c4fbcaf</kontrakter.version>
+        <kontrakter.version>3.0_20250121154645_1b256a5</kontrakter.version>
         <mikrofrontend.builder.version>20230704114948-74aa2e9</mikrofrontend.builder.version>
         <eksterne.kontrakter.bisys.version>2.0_20230214104704_706e9c0</eksterne.kontrakter.bisys.version>
         <cucumber.version>7.20.1</cucumber.version>
@@ -48,7 +48,7 @@
         <sonar.projectKey>${SONAR_PROJECTKEY}</sonar.projectKey>
         <sonar.organization>navit</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-        <nav.security.version>5.0.14</nav.security.version> <!-- Denne burde være samme versjon som i felles -->
+        <nav.security.version>5.0.16</nav.security.version> <!-- Denne burde være samme versjon som i felles -->
         <okhttp3.version>4.9.1</okhttp3.version> <!-- overskrever spring sin versjon, blir brukt av mock-oauth2-server -->
         <brukervarsel-builder.version>2.1.1</brukervarsel-builder.version>
         <!--suppress UnresolvedMavenProperty -->
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-database-postgresql</artifactId>
-            <version>11.1.1</version>
+            <version>11.3.0</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock-standalone</artifactId>
-            <version>3.10.0</version>
+            <version>3.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/kotlin/no/nav/familie/ef/sak/infrastruktur/config/ApplicationConfig.kt b/src/main/kotlin/no/nav/familie/ef/sak/infrastruktur/config/ApplicationConfig.kt
@@ -7,6 +7,7 @@ import no.nav.familie.http.client.RetryOAuth2HttpClient
 import no.nav.familie.http.config.RestTemplateAzure
 import no.nav.familie.http.interceptor.ConsumerIdClientInterceptor
 import no.nav.familie.http.interceptor.MdcValuesPropagatingClientInterceptor
+import no.nav.familie.log.NavSystemtype
 import no.nav.familie.log.filter.LogFilter
 import no.nav.familie.log.filter.RequestTimeFilter
 import no.nav.familie.prosessering.config.ProsesseringInfoProvider
@@ -59,7 +60,7 @@ class ApplicationConfig {
     fun logFilter(): FilterRegistrationBean<LogFilter> {
         logger.info("Registering LogFilter filter")
         val filterRegistration = FilterRegistrationBean<LogFilter>()
-        filterRegistration.filter = LogFilter()
+        filterRegistration.filter = LogFilter(systemtype = NavSystemtype.NAV_SAKSBEHANDLINGSSYSTEM)
         filterRegistration.order = 1
         return filterRegistration
     }
@@ -81,8 +82,8 @@ class ApplicationConfig {
     fun restTemplateBuilder(objectMapper: ObjectMapper): RestTemplateBuilder {
         val jackson2HttpMessageConverter = MappingJackson2HttpMessageConverter(objectMapper)
         return RestTemplateBuilder()
-            .setConnectTimeout(Duration.of(2, ChronoUnit.SECONDS))
-            .setReadTimeout(Duration.of(30, ChronoUnit.SECONDS))
+            .connectTimeout(Duration.of(2, ChronoUnit.SECONDS))
+            .readTimeout(Duration.of(30, ChronoUnit.SECONDS))
             .additionalMessageConverters(listOf(jackson2HttpMessageConverter) + RestTemplate().messageConverters)
     }
 
@@ -108,8 +109,8 @@ class ApplicationConfig {
         RetryOAuth2HttpClient(
             RestClient.create(
                 RestTemplateBuilder()
-                    .setConnectTimeout(Duration.of(2, ChronoUnit.SECONDS))
-                    .setReadTimeout(Duration.of(2, ChronoUnit.SECONDS))
+                    .connectTimeout(Duration.of(2, ChronoUnit.SECONDS))
+                    .readTimeout(Duration.of(2, ChronoUnit.SECONDS))
                     .build(),
             ),
         )