From 145872f3c3028da18402f0cc520267cc520e3bbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2024 10:21:34 +0000
Subject: [PATCH] Bump the all-dependencies  (14 updates) (#850)

Signed-off-by: dependabot[bot] <support@github.com>

* AccessToken -> access_token

* bumper revision fra 3.0 >  3.4

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Henning Solberg <henning.solberg@nav.no>
---
 .../interceptor/BearerTokenClientInterceptor.kt    |  2 +-
 pom.xml                                            | 14 +++++++-------
 .../tidslinje/utvidelser/TidslinjeUtvidelser.kt    | 10 +++++-----
 unleash/pom.xml                                    |  2 +-
 .../familie/webflux/filter/BearerTokenFilter.kt    |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/http-client/src/main/java/no/nav/familie/http/interceptor/BearerTokenClientInterceptor.kt b/http-client/src/main/java/no/nav/familie/http/interceptor/BearerTokenClientInterceptor.kt
index 7716702a..ced84c73 100644
--- a/http-client/src/main/java/no/nav/familie/http/interceptor/BearerTokenClientInterceptor.kt
+++ b/http-client/src/main/java/no/nav/familie/http/interceptor/BearerTokenClientInterceptor.kt
@@ -143,7 +143,7 @@ private fun genererAccessToken(
     return oAuth2AccessTokenService
         .getAccessToken(
             clientProperties,
-        ).accessToken ?: throw JwtTokenValidatorException("Kunne ikke hente accesstoken")
+        ).access_token ?: throw JwtTokenValidatorException("Kunne ikke hente accesstoken")
 }
 
 /**
diff --git a/pom.xml b/pom.xml
index fa35c602..c03e38a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <url>https://github.com/navikt/familie-felles</url>
 
     <properties>
-        <revision>3.0</revision>
+        <revision>3.4</revision>
         <sha1/>
         <changelist>-SNAPSHOT</changelist>
         <java.version>21</java.version>
@@ -22,12 +22,12 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <kontrakter.version>3.0_20241102131210_d65efd1</kontrakter.version>
+        <kontrakter.version>3.0_20241206132953_18ef9da</kontrakter.version>
         <kotest.version>5.9.1</kotest.version>
-        <kotlin.version>2.0.21</kotlin.version>
+        <kotlin.version>2.1.0</kotlin.version>
         <mockk.version>1.13.13</mockk.version>
-        <nav.security.token.version>5.0.5</nav.security.token.version>
-        <wiremock.version>3.9.2</wiremock.version>        
+        <nav.security.token.version>5.0.13</nav.security.token.version>
+        <wiremock.version>3.10.0</wiremock.version>        
     </properties>
 
     <modules>
@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.3.5</version>
+                <version>3.4.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -324,7 +324,7 @@
                     <dependency>
                         <groupId>com.pinterest.ktlint</groupId>
                         <artifactId>ktlint-cli</artifactId>
-                        <version>1.4.1</version>
+                        <version>1.5.0</version>
                     </dependency>
                     <!-- additional 3rd party ruleset(s) can be specified here -->
                 </dependencies>
diff --git a/tidslinje/src/main/kotlin/no/nav/familie/tidslinje/utvidelser/TidslinjeUtvidelser.kt b/tidslinje/src/main/kotlin/no/nav/familie/tidslinje/utvidelser/TidslinjeUtvidelser.kt
index c6d04aac..d84221ea 100644
--- a/tidslinje/src/main/kotlin/no/nav/familie/tidslinje/utvidelser/TidslinjeUtvidelser.kt
+++ b/tidslinje/src/main/kotlin/no/nav/familie/tidslinje/utvidelser/TidslinjeUtvidelser.kt
@@ -652,11 +652,11 @@ fun <T> Tidslinje<T>.hentVerdier(): List<T?> = this.innhold.slåSammenLike().map
 fun <T> Tidslinje<T>.tilTidslinjePerioderMedDato(): List<TidslinjePeriodeMedDato<T>> {
     val (tidslinjePeriodeMedLocalDateListe, _) =
         this.innhold.fold(Pair(emptyList<TidslinjePeriodeMedDato<T>>(), 0L)) {
-                (
-                    tidslinjePeriodeMedLocalDateListe: List<TidslinjePeriodeMedDato<T>>,
-                    tidFraStarttidspunktFom: Long,
-                ),
-                tidslinjePeriode,
+            (
+                tidslinjePeriodeMedLocalDateListe: List<TidslinjePeriodeMedDato<T>>,
+                tidFraStarttidspunktFom: Long,
+            ),
+            tidslinjePeriode,
             ->
             val tidFraStarttidspunktTilNesteFom = tidFraStarttidspunktFom + tidslinjePeriode.lengde
 
diff --git a/unleash/pom.xml b/unleash/pom.xml
index 3c042ab1..7fafce1d 100644
--- a/unleash/pom.xml
+++ b/unleash/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.getunleash</groupId>
             <artifactId>unleash-client-java</artifactId>
-            <version>9.2.4</version>
+            <version>9.2.6</version>
         </dependency>
     </dependencies>
 
diff --git a/web-client/src/main/java/no/nav/familie/webflux/filter/BearerTokenFilter.kt b/web-client/src/main/java/no/nav/familie/webflux/filter/BearerTokenFilter.kt
index 556a8cd8..2fd6c8b6 100644
--- a/web-client/src/main/java/no/nav/familie/webflux/filter/BearerTokenFilter.kt
+++ b/web-client/src/main/java/no/nav/familie/webflux/filter/BearerTokenFilter.kt
@@ -158,7 +158,7 @@ private fun genererAccessToken(
             clientConfigurationProperties,
             grantType,
         )
-    return oAuth2AccessTokenService.getAccessToken(clientProperties).accessToken ?: throw JwtTokenMissingException()
+    return oAuth2AccessTokenService.getAccessToken(clientProperties).access_token ?: throw JwtTokenMissingException()
 }
 
 /**