From fb257e8bda4e01a6a63dd5c7f3e557c995493b21 Mon Sep 17 00:00:00 2001
From: Jens-Otto Larsen <jens-otto.larsen@nav.no>
Date: Fri, 17 Nov 2023 18:05:30 +0100
Subject: [PATCH] Standard oppset java21

---
 .github/workflows/build.yml                 | 1 -
 .github/workflows/codeql.yml                | 2 --
 .github/workflows/dependency-submission.yml | 2 +-
 .github/workflows/release.yml               | 1 -
 pom.xml                                     | 2 +-
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 782be484..222d6807 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,6 @@ jobs:
         uses: navikt/fp-gha-workflows/.github/workflows/build-feature.yml@main
         with:
             sonar-scan: true # default: false
-            java-version: 21
         secrets: inherit
 
     release-drafter:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c9cc7092..0bfc848b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -16,6 +16,4 @@ jobs:
      contents: read
      security-events: write
    uses: navikt/fp-gha-workflows/.github/workflows/codeql.yml@main
-   with:
-       java-version: 21
    secrets: inherit
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 2fb251fe..16acc303 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -12,5 +12,5 @@ jobs:
   deps:
     permissions:
       contents: write
-    uses: navikt/fp-gha-workflows/.github/workflows/mvn-dependency-submission.yml@main\
+    uses: navikt/fp-gha-workflows/.github/workflows/mvn-dependency-submission.yml@main
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d334d937..0fdf38c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,5 +11,4 @@ jobs:
         uses: navikt/fp-gha-workflows/.github/workflows/release-feature.yml@main
         with:
             release-version: ${{ github.event.release.tag_name }}
-            java-version: 21
         secrets: inherit
diff --git a/pom.xml b/pom.xml
index 64551efc..30c2e749 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <fpsak.nare.version>2.5.3</fpsak.nare.version>
+        <fpsak.nare.version>2.6.1</fpsak.nare.version>
         <jupiter.version>5.10.1</jupiter.version>
         <assertj.version>3.24.2</assertj.version>