Oppgraderer til JDK 21 (#966)

navikt · Nov 7, 2023 · 41175ac · 41175ac
1 parent ba1779e
commit 41175ac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Kjør ktlint
@@ -39,7 +39,7 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
 

diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Bygg med maven + sonar

diff --git a/.github/workflows/krise-rett-i-prod.yml b/.github/workflows/krise-rett-i-prod.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Bygg med maven

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/navikt/baseimages/temurin:17
+FROM ghcr.io/navikt/baseimages/temurin:21
 
 ENV APP_NAME=familie-baks-mottak
 ENV JAVA_OPTS="-XX:MaxRAMPercentage=75"

diff --git a/pom.xml b/pom.xml
@@ -18,8 +18,8 @@
         <revision>1.0</revision>
         <sha1/>
         <changelist>-SNAPSHOT</changelist>
-        <java.version>17</java.version>
-        <jvmTarget>17</jvmTarget>
+        <java.version>21</java.version>
+        <jvmTarget>21</jvmTarget>
         <kotlin.version>1.9.20</kotlin.version>
         <mockk.version>1.13.8</mockk.version>
         <confluent.version>7.5.1</confluent.version>
@@ -319,7 +319,7 @@
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <jvmTarget>17</jvmTarget>
+                    <jvmTarget>21</jvmTarget>
                     <compilerPlugins>
                         <plugin>spring</plugin>
                         <plugin>jpa</plugin>