From a4f406a5898e000dc9d664b840c072334796cd75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 05:31:27 +0000
Subject: [PATCH 1/6] [dependency] Bump flyway.version from 10.21.0 to 11.0.0

Bumps `flyway.version` from 10.21.0 to 11.0.0.

Updates `org.flywaydb:flyway-core` from 10.21.0 to 11.0.0
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](https://github.com/flyway/flyway/compare/flyway-10.21.0...flyway-11.0.0)

Updates `org.flywaydb:flyway-database-postgresql` from 10.21.0 to 11.0.0

---
updated-dependencies:
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: org.flywaydb:flyway-database-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6f44a8532..95ae057c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <kotest.version>5.9.1</kotest.version>
         <mockk.version>4.0.2</mockk.version>
         <kotlin-logging-jvm.version>7.0.0</kotlin-logging-jvm.version>
-        <flyway.version>10.21.0</flyway.version>
+        <flyway.version>11.0.0</flyway.version>
         <jackson.version>2.18.1</jackson.version>
         <testcontainers.version>1.20.3</testcontainers.version>
         <spring-boot-testcontainers.version>3.3.5</spring-boot-testcontainers.version>

From c47b72ec139fe1a1adcf7217749dc174eb3785d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 05:31:18 +0000
Subject: [PATCH 2/6] [dependency] Bump io.swagger.core.v3:swagger-annotations

Bumps io.swagger.core.v3:swagger-annotations from 2.2.25 to 2.2.26.

---
updated-dependencies:
- dependency-name: io.swagger.core.v3:swagger-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 95ae057c9..17ad5ceaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <arrow-core.version>1.2.4</arrow-core.version>
         <checker-qual.version>3.48.2</checker-qual.version>
         <asm.version>9.7.1</asm.version>
-        <swagger.version>2.2.25</swagger.version>
+        <swagger.version>2.2.26</swagger.version>
         <jetbrains.annotations.version>26.0.1</jetbrains.annotations.version>
         <nimbus-jose-jwt.version>9.47</nimbus-jose-jwt.version>
     </properties>

From 34de5db17b4711873e745a44c3b11daf7c40fa30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 05:31:11 +0000
Subject: [PATCH 3/6] [dependency] Bump
 org.springframework.boot:spring-boot-starter-parent

Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.3.5 to 3.4.0.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 17ad5ceaf..2b0206481 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>no.nav</groupId>

From 1296e40671520892ddd2c911801bfb35587c992b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 05:30:48 +0000
Subject: [PATCH 4/6] [dependency] Bump testcontainers.version from 1.20.3 to
 1.20.4

Bumps `testcontainers.version` from 1.20.3 to 1.20.4.

Updates `org.testcontainers:postgresql` from 1.20.3 to 1.20.4
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.3...1.20.4)

Updates `org.testcontainers:junit-jupiter` from 1.20.3 to 1.20.4
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.3...1.20.4)

---
updated-dependencies:
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2b0206481..c350d1dd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <kotlin-logging-jvm.version>7.0.0</kotlin-logging-jvm.version>
         <flyway.version>11.0.0</flyway.version>
         <jackson.version>2.18.1</jackson.version>
-        <testcontainers.version>1.20.3</testcontainers.version>
+        <testcontainers.version>1.20.4</testcontainers.version>
         <spring-boot-testcontainers.version>3.3.5</spring-boot-testcontainers.version>
         <tomcat-embed-core.version>10.1.16</tomcat-embed-core.version>
         <snakeyaml.version>2.3</snakeyaml.version>

From 39004e3e9f597321c72097776952193bbb1f500a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 05:30:32 +0000
Subject: [PATCH 5/6] [dependency] Bump bidrag-beregn-felles.version

Bumps `bidrag-beregn-felles.version` from 2024.11.22.122931 to 2024.11.22.162511.

Updates `no.nav.bidrag:bidrag-inntekt` from 2024.11.22.122931 to 2024.11.22.162511

Updates `no.nav.bidrag:bidrag-beregn-core` from 2024.11.22.122931 to 2024.11.22.162511

Updates `no.nav.bidrag:bidrag-sivilstand` from 2024.11.22.122931 to 2024.11.22.162511

Updates `no.nav.bidrag:bidrag-vedtak` from 2024.11.22.122931 to 2024.11.22.162511

Updates `no.nav.bidrag:bidrag-boforhold` from 2024.11.22.122931 to 2024.11.22.162511

Updates `no.nav.bidrag:bidrag-beregn-forskudd` from 2024.11.22.122931 to 2024.11.22.162511

Updates `no.nav.bidrag:bidrag-beregn-saerbidrag` from 2024.11.22.122931 to 2024.11.22.162511

Updates `no.nav.bidrag:bidrag-beregn-barnebidrag` from 2024.11.22.122931 to 2024.11.22.162511

---
updated-dependencies:
- dependency-name: no.nav.bidrag:bidrag-inntekt
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: no.nav.bidrag:bidrag-beregn-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: no.nav.bidrag:bidrag-sivilstand
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: no.nav.bidrag:bidrag-vedtak
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: no.nav.bidrag:bidrag-boforhold
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: no.nav.bidrag:bidrag-beregn-forskudd
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: no.nav.bidrag:bidrag-beregn-saerbidrag
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: no.nav.bidrag:bidrag-beregn-barnebidrag
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c350d1dd9..54d68014a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <java.version>21</java.version>
         <kotlin.version>2.0.21</kotlin.version>
         <bidrag-felles.version>2024.11.22.114035</bidrag-felles.version>
-        <bidrag-beregn-felles.version>2024.11.22.122931</bidrag-beregn-felles.version>
+        <bidrag-beregn-felles.version>2024.11.22.162511</bidrag-beregn-felles.version>
         <h2.version>2.3.232</h2.version>
         <logback-encoder.version>8.0</logback-encoder.version>
         <token-support.version>3.2.0</token-support.version>

From 1360b981f999610c0e949561181148603eff15c0 Mon Sep 17 00:00:00 2001
From: s148719 <jan.kjetil.skar@nav.no>
Date: Mon, 25 Nov 2024 08:57:10 +0100
Subject: [PATCH 6/6] Update pom.xml

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 54d68014a..f37b7cdea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <java.version>21</java.version>
         <kotlin.version>2.0.21</kotlin.version>
         <bidrag-felles.version>2024.11.22.114035</bidrag-felles.version>
-        <bidrag-beregn-felles.version>2024.11.22.162511</bidrag-beregn-felles.version>
+        <bidrag-beregn-felles.version>2024.11.22.122931</bidrag-beregn-felles.version>
         <h2.version>2.3.232</h2.version>
         <logback-encoder.version>8.0</logback-encoder.version>
         <token-support.version>3.2.0</token-support.version>
@@ -436,6 +436,12 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.getunleash</groupId>