From a0f1c353db1a13b5f77bb99a916cccdc06ec9a52 Mon Sep 17 00:00:00 2001
From: Klara M Helgemo <klara.margrethe.helgemo@nav.no>
Date: Mon, 13 May 2024 12:32:01 +0200
Subject: [PATCH] Prodsette oppgradering Java 21 (#154)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bump org.springdoc:springdoc-openapi-ui from 1.7.0 to 1.8.0 (#144)

Bumps org.springdoc:springdoc-openapi-ui from 1.7.0 to 1.8.0.

---
updated-dependencies:
- dependency-name: org.springdoc:springdoc-openapi-ui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0 (#145)

* Bump com.squareup.okhttp3:okhttp from 4.11.0 to 4.12.0

Bumps [com.squareup.okhttp3:okhttp](https://github.com/square/okhttp) from 4.11.0 to 4.12.0.
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.11.0...parent-4.12.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* oppdatering prometheus

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Klara M Helgemo <klara.margrethe.helgemo@nav.no>

* Bump softprops/action-gh-release from 1 to 2 in /.github/workflows (#146)

Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Klara M Helgemo <klara.margrethe.helgemo@nav.no>

* Legg til generativ KI merking

* Oppgrader til Java 21 (#153)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sondre Larsen Ovrid <111113539+slovrid@users.noreply.github.com>
Co-authored-by: Mathias S. Müller <85442404+Mathiamu@users.noreply.github.com>
---
 .github/workflows/codeql.yml          | 2 +-
 .github/workflows/deploy-til-dev.yaml | 8 ++++----
 .github/workflows/main.yml            | 8 ++++----
 Dockerfile                            | 2 +-
 pom.xml                               | 3 ++-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index cf4699e..1917d91 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -53,7 +53,7 @@ jobs:
     - name: Setup Java
       uses: actions/setup-java@v4
       with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
           cache: maven
 
diff --git a/.github/workflows/deploy-til-dev.yaml b/.github/workflows/deploy-til-dev.yaml
index a471c55..c2cc341 100644
--- a/.github/workflows/deploy-til-dev.yaml
+++ b/.github/workflows/deploy-til-dev.yaml
@@ -19,10 +19,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Run maven tests
@@ -37,10 +37,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ab6aaa..ed8e2af 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
@@ -36,10 +36,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 
diff --git a/Dockerfile b/Dockerfile
index bc5ded0..13e1154 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
-FROM ghcr.io/navikt/poao-baseimages/java:17
+FROM ghcr.io/navikt/baseimages/temurin:21
 COPY /target/veilarboppgave.jar app.jar
diff --git a/pom.xml b/pom.xml
index dc8c246..94034d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
     <description>Backend applikasjon for oppgaver</description>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <common.version>3.2023.10.23_12.41-bafec3836d28</common.version>
     </properties>
 
@@ -79,6 +79,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.32</version>
             <optional>true</optional>
         </dependency>
         <dependency>