From a394031ea8a6414b648eb068d82638530d8c702a Mon Sep 17 00:00:00 2001
From: Uy Nguyen <110383605+UyQuangNguyen@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:21:16 +0100
Subject: [PATCH] Oppdaterer til spring 3.4.1 (#1596)

---
 pom.xml                                              | 12 ++++++------
 .../integration/\303\270konomi/OppdragClientTest.kt" |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6826b61c9..ff47d6dfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.1</version>
     </parent>
 
     <properties>
@@ -23,11 +23,11 @@
         <main-class>no.nav.familie.tilbake.LauncherKt</main-class>
         <kotlin.version>2.0.21</kotlin.version>
         <common-java-modules.version>2.2021.09.17_07.09-67428a6422cc</common-java-modules.version>
-        <kontrakter.version>3.0_20241102131210_d65efd1</kontrakter.version>
-        <felles.version>3.20240913110742_adb42f8</felles.version>
+        <kontrakter.version>3.0_20250116111901_78b5a16</kontrakter.version>
+        <felles.version>3.20250106100611_6ae49d2</felles.version>
         <!-- kotest.properties kan antakelig fjernes i versjon 6, for autoscan blir default false -->
         <kotest.version>5.9.1</kotest.version>
-        <token-validation-spring.version>5.0.10</token-validation-spring.version>
+        <token-validation-spring.version>5.0.14</token-validation-spring.version>
         <okhttp3.version>4.9.1</okhttp3.version><!-- Inntil videre nødvendig for token-validation-spring-test-->
         <openhtmltopdf.version>1.1.22</openhtmltopdf.version>
         <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
@@ -41,8 +41,8 @@
         <sonar.coverage.exclusions>**/config/FlywayConfig.kt</sonar.coverage.exclusions>
         <!--suppress UnresolvedMavenProperty Ligger som secret i github-->
         <sonar.login>${SONAR_LOGIN}</sonar.login>
-        <spring.cloud-contract>4.1.4</spring.cloud-contract>
-        <springdoc.version>2.6.0</springdoc.version>
+        <spring.cloud-contract>4.2.0</spring.cloud-contract>
+        <springdoc.version>2.8.3</springdoc.version>
         <testcontainers.version>1.20.3</testcontainers.version>
         <tjenestespesifikasjoner.version>2633.1685ed5</tjenestespesifikasjoner.version>
         <familie-tjenestespesifikasjoner.version>1.0_20241021101018_2aa57cc</familie-tjenestespesifikasjoner.version>
diff --git "a/src/test/kotlin/no/nav/familie/tilbake/integration/\303\270konomi/OppdragClientTest.kt" "b/src/test/kotlin/no/nav/familie/tilbake/integration/\303\270konomi/OppdragClientTest.kt"
index bc53a206d..ad3606cb2 100644
--- "a/src/test/kotlin/no/nav/familie/tilbake/integration/\303\270konomi/OppdragClientTest.kt"
+++ "b/src/test/kotlin/no/nav/familie/tilbake/integration/\303\270konomi/OppdragClientTest.kt"
@@ -11,6 +11,7 @@ import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
+import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.types.shouldBeInstanceOf
 import no.nav.familie.kontrakter.felles.Ressurs
 import no.nav.familie.kontrakter.felles.simulering.FeilutbetalingerFraSimulering
@@ -146,7 +147,7 @@ internal class OppdragClientTest : OppslagSpringRunnerTest() {
         exception.shouldNotBeNull()
         exception.shouldBeInstanceOf<IntegrasjonException>()
         exception.message shouldBe "Noe gikk galt ved iverksetting av behandling=${behandling.id}"
-        exception.cause?.message shouldBe "503 Couldn't send message: [no body]"
+        exception.cause?.message shouldContain "503 Couldn't send message"
     }
 
     @Test
@@ -249,7 +250,7 @@ internal class OppdragClientTest : OppslagSpringRunnerTest() {
         exception.shouldNotBeNull()
         exception.shouldBeInstanceOf<IntegrasjonException>()
         exception.message shouldBe "Noe gikk galt ved henting av kravgrunnlag for kravgrunnlagId=$kravgrunnlagId"
-        exception.cause?.message shouldBe "503 Couldn't send message: [no body]"
+        exception.cause?.message shouldContain "503 Couldn't send message"
     }
 
     @Test
@@ -300,7 +301,7 @@ internal class OppdragClientTest : OppslagSpringRunnerTest() {
         exception.shouldNotBeNull()
         exception.shouldBeInstanceOf<IntegrasjonException>()
         exception.message shouldBe "Noe gikk galt ved henting av feilutbetalinger fra simulering"
-        exception.cause?.message shouldBe "503 Couldn't send message: [no body]"
+        exception.cause?.message shouldContain "503 Couldn't send message"
     }
 
     private fun lagIverksettelseRespons(): TilbakekrevingsvedtakResponse {