From bc31fd5d1fddb75acf082ee7218d45ee75f14e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kjetil=20Sk=C3=A5r?=
 <43172034+s148719@users.noreply.github.com>
Date: Wed, 8 Nov 2023 14:33:40 +0100
Subject: [PATCH] Java 21 (#80)

* Java 21
---
 .github/workflows/deploy_feature.yaml | 4 +++-
 .github/workflows/pr.yaml             | 1 +
 .github/workflows/release.yaml        | 4 +++-
 .github/workflows/rollback_prod.yaml  | 3 ++-
 Dockerfile                            | 2 +-
 pom.xml                               | 6 ++++--
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy_feature.yaml b/.github/workflows/deploy_feature.yaml
index ffd4b7109..a12316497 100644
--- a/.github/workflows/deploy_feature.yaml
+++ b/.github/workflows/deploy_feature.yaml
@@ -14,4 +14,6 @@ jobs:
       contents: "read"
       id-token: "write"
     uses: navikt/bidrag-workflow/.github/workflows/deploy.yaml@main
-    secrets: inherit
\ No newline at end of file
+    secrets: inherit
+    with:
+      maven_options: -B -q -fae -Pit
\ No newline at end of file
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 068a1d2ee..a4d7ef289 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -14,5 +14,6 @@ jobs:
     secrets: inherit
     with:
       nais_variabler_filnavn: main.yaml
+      maven_options: -B -q -fae -Pit
 
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d443504a0..70a6b182c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,4 +11,6 @@ jobs:
       contents: "write"
       id-token: "write"
     uses: navikt/bidrag-workflow/.github/workflows/deploy_prod.yaml@main
-    secrets: inherit
\ No newline at end of file
+    secrets: inherit
+    with:
+      maven_options: -B -q -fae -Pit
\ No newline at end of file
diff --git a/.github/workflows/rollback_prod.yaml b/.github/workflows/rollback_prod.yaml
index 4e5d09ed1..4176ad452 100644
--- a/.github/workflows/rollback_prod.yaml
+++ b/.github/workflows/rollback_prod.yaml
@@ -15,4 +15,5 @@ jobs:
     uses: navikt/bidrag-workflow/.github/workflows/rollback_prod.yaml@main
     secrets: inherit
     with:
-      deploy_tag: ${{inputs.deploy_tag}}
\ No newline at end of file
+      deploy_tag: ${{inputs.deploy_tag}}
+      maven_options: -B -q -fae -Pit
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 5d2272956..bb6162ea3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/navikt/baseimages/temurin:17
+FROM ghcr.io/navikt/baseimages/temurin:21
 LABEL maintainer="Team Bidrag" \
       email="bidrag@nav.no"
 
diff --git a/pom.xml b/pom.xml
index fa47c1319..1aa3d305f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   <version>0.0.1-SNAPSHOT</version>
   <name>bidrag-behandling</name>
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <kotlin.version>1.9.20</kotlin.version>
     <bidrag-commons.version>20231103132440_edabbf8</bidrag-commons.version>
     <bidrag-transport.version>20231106083046_e69b4f4</bidrag-transport.version>
@@ -30,6 +30,7 @@
     <jackson.version>2.15.3</jackson.version>
     <testcontainers.version>1.19.1</testcontainers.version>
     <tomcat-embed-core.version>10.1.15</tomcat-embed-core.version>
+    <skipOwasp>false</skipOwasp>
   </properties>
 
   <repositories>
@@ -340,7 +341,8 @@
         <artifactId>dependency-check-maven</artifactId>
         <version>8.4.2</version>
         <configuration>
-          <failBuildOnCVSS>7</failBuildOnCVSS>
+          <failBuildOnCVSS>8</failBuildOnCVSS>
+          <skip>${skipOwasp}</skip>
         </configuration>
         <executions>
           <execution>